From f3d6c69826ab936a976d298be15b1a1536b6880e Mon Sep 17 00:00:00 2001 From: Steffen Sledz Date: Fri, 12 Mar 2010 09:34:32 +0100 Subject: angstrom: add hipox machine to feed sorter --- contrib/angstrom/sort.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/angstrom/sort.sh b/contrib/angstrom/sort.sh index ce2959b134..2e2cefaac6 100755 --- a/contrib/angstrom/sort.sh +++ b/contrib/angstrom/sort.sh @@ -48,7 +48,7 @@ case "$arch" in "armv4t") machines="micro2440 ep93xx h6300 om-gta01 om-gta02 fic-gta01 fic-gta02" ;; "armv5te") - machines="hawkboard da850-omapl138-evm da830-omapl137-evm htcalpine dm6446-evm dm6467-evm dm6467t-evm dm355-evm dm365-evm dm357-evm topas910 sheevaplug openrd-client openrd-base dm355-leopard n2100 dns323 mv2120 kuropro lspro tsx09 ts409 davinci-dvevm davinci-sffsdr neuros-osd neuros-osd2 gumstix-connex gumstix-verdex gumstix e680 a780 a1200 at91sam9263ek rokre6 rokre2 rokr-e2 akita c7x0 h2200 h3900 h4000 h5000 htcapache htctornado htcblueangel htcuniversal hx4700 nslu2le hx2000 ixp4xxle magician netbook-pro nokia770 palmt650 palmt680 palmld palmtx palmtt3 palmz72 qemuarm omap5912osk poodle spitz tosa mx27ads at91sam9g20ek mainstone" ;; + machines="hawkboard da850-omapl138-evm da830-omapl137-evm htcalpine dm6446-evm dm6467-evm dm6467t-evm dm355-evm dm365-evm dm357-evm topas910 sheevaplug openrd-client openrd-base dm355-leopard n2100 dns323 mv2120 kuropro lspro tsx09 ts409 davinci-dvevm davinci-sffsdr neuros-osd neuros-osd2 gumstix-connex gumstix-verdex gumstix e680 a780 a1200 at91sam9263ek rokre6 rokre2 rokr-e2 akita c7x0 h2200 h3900 h4000 h5000 htcapache htctornado htcblueangel htcuniversal hx4700 nslu2le hx2000 ixp4xxle magician netbook-pro nokia770 palmt650 palmt680 palmld palmtx palmtt3 palmz72 qemuarm omap5912osk poodle spitz tosa mx27ads at91sam9g20ek mainstone hipox" ;; "armv5teb") machines="ixp4xxbe nslu2be" ;; "armv6-novfp") -- cgit v1.2.3 From c20d845b556e18a45e6e6b0edea5a9df11eaa8ba Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Fri, 12 Mar 2010 10:01:29 +0100 Subject: linux-libc-headers-2.6.32: forgot to add patch Signed-off-by: Martin Jansa --- .../linux-libc-headers-2.6.32/scsi-use-__u8.patch | 26 ++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 recipes/linux-libc-headers/linux-libc-headers-2.6.32/scsi-use-__u8.patch diff --git a/recipes/linux-libc-headers/linux-libc-headers-2.6.32/scsi-use-__u8.patch b/recipes/linux-libc-headers/linux-libc-headers-2.6.32/scsi-use-__u8.patch new file mode 100644 index 0000000000..b75487965a --- /dev/null +++ b/recipes/linux-libc-headers/linux-libc-headers-2.6.32/scsi-use-__u8.patch @@ -0,0 +1,26 @@ +This patch is from +http://patchwork.kernel.org/patch/38102/ +It seems its still under discussion and it will involve glibc to get it fixed correctly. +for now OE uses scsi headers from kernel and not from glibc. + +-Khem + +Index: linux-2.6.31/include/scsi/scsi.h +=================================================================== +--- linux-2.6.31.orig/include/scsi/scsi.h 2010-03-11 19:44:49.134590561 -0800 ++++ linux-2.6.31/include/scsi/scsi.h 2010-03-11 19:45:12.744466326 -0800 +@@ -142,10 +142,10 @@ struct scsi_cmnd; + + /* defined in T10 SCSI Primary Commands-2 (SPC2) */ + struct scsi_varlen_cdb_hdr { +- u8 opcode; /* opcode always == VARIABLE_LENGTH_CMD */ +- u8 control; +- u8 misc[5]; +- u8 additional_cdb_length; /* total cdb length - 8 */ ++ __u8 opcode; /* opcode always == VARIABLE_LENGTH_CMD */ ++ __u8 control; ++ __u8 misc[5]; ++ __u8 additional_cdb_length; /* total cdb length - 8 */ + __be16 service_action; + /* service specific data follows */ + }; -- cgit v1.2.3 From 00cb5a7688c9cc4cea5beec891117dcc6a159811 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 12 Mar 2010 10:23:12 +0100 Subject: cdparanoia svn: convert to new style staging --- recipes/cdparanoia/cdparanoia_svn.bb | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/recipes/cdparanoia/cdparanoia_svn.bb b/recipes/cdparanoia/cdparanoia_svn.bb index 71fafee281..783d5071ff 100644 --- a/recipes/cdparanoia/cdparanoia_svn.bb +++ b/recipes/cdparanoia/cdparanoia_svn.bb @@ -2,19 +2,19 @@ # Copyright (C) 2005, Advanced Micro Devices, Inc. All Rights Reserved # Released under the MIT license (see packages/COPYING) -PR ="r1" -LICENSE="GPL" +PR = "r2" +LICENSE = "GPL" PV = "10.2+svnr${SRCPV}" -SRC_URI="svn://svn.xiph.org/trunk;module=cdparanoia;proto=http \ +SRC_URI = "svn://svn.xiph.org/trunk;module=cdparanoia;proto=http \ file://fixes10.patch;patch=1 \ file://Makefile.in.patch;patch=1 \ file://interface_Makefile.in.patch;patch=1 \ file://paranoia_Makefile.in.patch;patch=1 \ - file://configure.in.patch;patch=1 " + file://configure.in.patch;patch=1 " -S="${WORKDIR}/cdparanoia" +S = "${WORKDIR}/cdparanoia" PARALLEL_MAKE = "" @@ -25,12 +25,3 @@ do_install() { INCLUDEDIR="${D}/usr/include/" LIBDIR="${D}/usr/lib" install } -do_stage() { - install -d ${STAGING_INCDIR} ${STAGING_LIBDIR} - - install -m 0644 paranoia/cdda_paranoia.h ${STAGING_INCDIR} - install -m 0644 interface/cdda_interface.h ${STAGING_INCDIR} - - oe_libinstall -C interface libcdda_interface ${STAGING_LIBDIR} - oe_libinstall -C paranoia libcdda_paranoia ${STAGING_LIBDIR} -} -- cgit v1.2.3 From f4b036e09afe9f79396e657a6c2f576b569328d7 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 12 Mar 2010 10:49:02 +0100 Subject: angstrom-uboot-scripts: add scripts for using pico DLP + DSP and gumstix palo43 + DSP --- recipes/angstrom/angstrom-uboot-scripts/palo43-dsplink.cmd | 4 ++++ recipes/angstrom/angstrom-uboot-scripts/pico-dsplink.cmd | 3 +++ 2 files changed, 7 insertions(+) create mode 100644 recipes/angstrom/angstrom-uboot-scripts/palo43-dsplink.cmd create mode 100644 recipes/angstrom/angstrom-uboot-scripts/pico-dsplink.cmd diff --git a/recipes/angstrom/angstrom-uboot-scripts/palo43-dsplink.cmd b/recipes/angstrom/angstrom-uboot-scripts/palo43-dsplink.cmd new file mode 100644 index 0000000000..b182bee9a2 --- /dev/null +++ b/recipes/angstrom/angstrom-uboot-scripts/palo43-dsplink.cmd @@ -0,0 +1,4 @@ +setenv vram '12M' +setenv defaultdisplay 'lcd43 mem=99M@0x80000000 mem=128M@0x88000000 omapfb.vram=0:8M,1:2M,2:2M' +run loaduimage +run mmcboot diff --git a/recipes/angstrom/angstrom-uboot-scripts/pico-dsplink.cmd b/recipes/angstrom/angstrom-uboot-scripts/pico-dsplink.cmd new file mode 100644 index 0000000000..da6ea75f89 --- /dev/null +++ b/recipes/angstrom/angstrom-uboot-scripts/pico-dsplink.cmd @@ -0,0 +1,3 @@ +setenv dvimode '640x480MR-24@60 mem=99M@0x80000000 mem=128M@0x88000000 omapfb.vram=0:6M,1:3M,2:3M' +run loaduimage +run mmcboot -- cgit v1.2.3 From 6c42256befb30ecaa6433ca2f8bdc0ff5a72b63b Mon Sep 17 00:00:00 2001 From: Frans Meulenbroeks Date: Fri, 12 Mar 2010 12:01:45 +0100 Subject: cups: explicitly disable ssl explicitly disable ssl. If not if openssl is build first configure will enable it resulting in a cross compile badness ultimate solution is add a depends on openssl and fix the badness, but time does not permit this at the moment Signed-off-by: Frans Meulenbroeks --- recipes/cups/cups.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes/cups/cups.inc b/recipes/cups/cups.inc index db4475cd5c..36e76c34fd 100644 --- a/recipes/cups/cups.inc +++ b/recipes/cups/cups.inc @@ -16,6 +16,7 @@ EXTRA_OECONF = " \ --enable-browsing \ --disable-openssl \ --disable-tiff \ + --disable-ssl \ --without-php \ --without-perl \ --without-python \ -- cgit v1.2.3 From 03ffd91b16aa445190359dc21711c1b2a9d33ae0 Mon Sep 17 00:00:00 2001 From: Michael 'Mickey' Lauer Date: Fri, 12 Mar 2010 14:15:24 +0100 Subject: msmcommd: add sane srcrev --- recipes/freesmartphone/msmcommd_git.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/recipes/freesmartphone/msmcommd_git.bb b/recipes/freesmartphone/msmcommd_git.bb index a9676c4870..084ebe2f75 100644 --- a/recipes/freesmartphone/msmcommd_git.bb +++ b/recipes/freesmartphone/msmcommd_git.bb @@ -3,8 +3,9 @@ HOMEPAGE = "http://www.freesmartphone.org" AUTHOR = "Simon Busch " SECTION = "console/network" LICENSE = "GPL" +SRCREV = "c3ee57be664e480951b052cd080321b999c2ba4c" PV = "0.1.0+gitr${SRCREV}" -PR = "r0" +PR = "r1" SRC_URI = "${FREESMARTPHONE_GIT}/msmcomm.git;protocol=git;branch=master" S = "${WORKDIR}/git" -- cgit v1.2.3 From 578a475a6c27f8ee5daee812065d71c929c932f8 Mon Sep 17 00:00:00 2001 From: Michael 'Mickey' Lauer Date: Fri, 12 Mar 2010 14:19:50 +0100 Subject: msmcommd: add missing dependencies --- recipes/freesmartphone/msmcommd_git.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/recipes/freesmartphone/msmcommd_git.bb b/recipes/freesmartphone/msmcommd_git.bb index 084ebe2f75..1a7a8ae48b 100644 --- a/recipes/freesmartphone/msmcommd_git.bb +++ b/recipes/freesmartphone/msmcommd_git.bb @@ -3,9 +3,10 @@ HOMEPAGE = "http://www.freesmartphone.org" AUTHOR = "Simon Busch " SECTION = "console/network" LICENSE = "GPL" +DEPENDS = "libgee libfsotransport" SRCREV = "c3ee57be664e480951b052cd080321b999c2ba4c" PV = "0.1.0+gitr${SRCREV}" -PR = "r1" +PR = "r2" SRC_URI = "${FREESMARTPHONE_GIT}/msmcomm.git;protocol=git;branch=master" S = "${WORKDIR}/git" -- cgit v1.2.3 From ad0976afee298079c95262a0c8ca12bee479dd87 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 11 Mar 2010 19:04:09 -0800 Subject: gtk+-native: Override RRECOMMENDS for native recipe * Remove old style native recipes. Signed-off-by: Khem Raj Acked-by: Graeme Gregory --- recipes/gtk+/gtk+-native-1.2_1.2.10.bb | 58 ---------------------------------- recipes/gtk+/gtk+-native_2.12.11.bb | 20 ------------ recipes/gtk+/gtk+_2.18.6.bb | 3 +- 3 files changed, 2 insertions(+), 79 deletions(-) delete mode 100644 recipes/gtk+/gtk+-native-1.2_1.2.10.bb delete mode 100644 recipes/gtk+/gtk+-native_2.12.11.bb diff --git a/recipes/gtk+/gtk+-native-1.2_1.2.10.bb b/recipes/gtk+/gtk+-native-1.2_1.2.10.bb deleted file mode 100644 index f5ad1a58ab..0000000000 --- a/recipes/gtk+/gtk+-native-1.2_1.2.10.bb +++ /dev/null @@ -1,58 +0,0 @@ -DESCRIPTION = "GTK+1.2 is a deprecated library provided for running programs not yet converted to GTK+2.0" -HOMEPAGE = "http://www.gtk.org" -SECTION = "libs" -LICENSE = "LGPL" -PRIORITY = "optional" -DEPENDS = "glib-1.2 jpeg libpng libxext" - -PR = "r1" - -FILESPATH =+ "${FILE_DIRNAME}/gtk+-1.2-1.2.10:" -SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v1.2/gtk+-${PV}.tar.gz \ - file://gtk+1.2-reconf-fix;patch=1 \ - file://no-xwc;patch=1" -S = "${WORKDIR}/gtk+-${PV}" - -inherit autotools pkgconfig flow-lossage - -do_configure_prepend() { - install -d m4 - rm -f ltconfig libtool ltmain.sh - libtoolize --force -} - -FILES_${PN} += "${datadir}/themes" -FILES_${PN}-dev += "${datadir}/gtk-1.2/include ${libdir}/gtk-1.2/include" - - -EXTRA_OECONF = "--enable-debug=no --disable-glibtest --disable-xim" -# --disable-cruft - -LIBV = "1.2.10" - -gtk_include = "fnmatch.h gtk.h gtkaccelgroup.h gtkaccellabel.h gtkadjustment.h gtkalignment.h gtkarg.h gtkarrow.h gtkaspectframe.h gtkbbox.h gtkbin.h gtkbindings.h gtkbox.h gtkbutton.h gtkcalendar.h gtkcheckbutton.h gtkcheckmenuitem.h gtkclist.h gtkcolorsel.h gtkcombo.h gtkcompat.h gtkcontainer.h gtkctree.h gtkcurve.h gtkdata.h gtkdebug.h gtkdialog.h gtkdnd.h gtkdrawingarea.h gtkeditable.h gtkentry.h gtkenums.h gtkeventbox.h gtkfeatures.h gtkfilesel.h gtkfixed.h gtkfontsel.h gtkframe.h gtkgamma.h gtkgc.h gtkhandlebox.h gtkhbbox.h gtkhbox.h gtkhpaned.h gtkhruler.h gtkhscale.h gtkhscrollbar.h gtkhseparator.h gtkimage.h gtkinputdialog.h gtkintl.h gtkinvisible.h gtkitem.h gtkitemfactory.h gtklabel.h gtklayout.h gtklist.h gtklistitem.h gtkmain.h gtkmarshal.h gtkmenu.h gtkmenubar.h gtkmenufactory.h gtkmenuitem.h gtkmenushell.h gtkmisc.h gtknotebook.h gtkobject.h gtkoptionmenu.h gtkpacker.h gtkpaned.h gtkpixmap.h gtkplug.h gtkpreview.h gtkprivate.h gtkprogress.h gtkprogressbar.h gtkradiobutton.h gtkradiomenuitem.h gtkrange.h gtkrc.h gtkruler.h gtkscale.h gtkscrollbar.h gtkscrolledwindow.h gtkselection.h gtkseparator.h gtksignal.h gtksocket.h gtkspinbutton.h gtkstatusbar.h gtkstyle.h gtktable.h gtktearoffmenuitem.h gtktext.h gtkthemes.h gtktipsquery.h gtktogglebutton.h gtktoolbar.h gtktooltips.h gtktree.h gtktreeitem.h gtktypebuiltins.h gtktypeutils.h gtkvbbox.h gtkvbox.h gtkviewport.h gtkvpaned.h gtkvruler.h gtkvscale.h gtkvscrollbar.h gtkvseparator.h gtkwidget.h gtkwindow.h makeenums.h stamp-gtkmarshal.h stamp-gtktypebuiltins.h" -gdk_include = "MwmUtil.h gdk.h gdkcursors.h gdki18n.h gdkinput.h gdkinputcommon.h gdkinputgxi.h gdkinputnone.h gdkinputxfree.h gdkkeysyms.h gdkprivate.h gdkrgb.h gdktypes.h gdkx.h gxid_lib.h gxid_proto.h" - -do_stage () { - oe_libinstall -so -C gtk libgtk-1.2 ${STAGING_LIBDIR} - oe_libinstall -so -C gdk libgdk-1.2 ${STAGING_LIBDIR} - - mkdir -p ${STAGING_INCDIR}/gtk-1.2/gtk - for i in ${gtk_include}; do - install -m 0644 gtk/$i ${STAGING_INCDIR}/gtk-1.2/gtk/$i - done - - mkdir -p ${STAGING_INCDIR}/gtk-1.2/gdk - for i in ${gdk_include}; do - install -m 0644 gdk/$i ${STAGING_INCDIR}/gtk-1.2/gdk/$i - done - - mkdir -p ${STAGING_LIBDIR}/gtk-1.2/include - - install -m 0644 gtk.m4 ${STAGING_DATADIR}/aclocal/ -} - -do_install_append () { - install -d ${D}${sysconfdir}/gtk-1.2 -} - diff --git a/recipes/gtk+/gtk+-native_2.12.11.bb b/recipes/gtk+/gtk+-native_2.12.11.bb deleted file mode 100644 index a53dcdef54..0000000000 --- a/recipes/gtk+/gtk+-native_2.12.11.bb +++ /dev/null @@ -1,20 +0,0 @@ - -require gtk+_2.12.11.bb - -inherit native - -DEPENDS += "atk-native pango-native cairo-native libx11-native libxext-native libxrender-native" -PROVIDES = "gtk+-native" - -EXTRA_OECONF += "--without-libtiff --disable-modules --disable-cups" - -PR = "r3" - -do_install_append() { - - # this tool is required by gnome-keyring 2.26.0 to get built - # it is written in Python and use only Python xml - install -d ${STAGING_BINDIR_NATIVE} - install -m 0755 ${S}/gtk/gtk-builder-convert ${STAGING_BINDIR_NATIVE} -} - diff --git a/recipes/gtk+/gtk+_2.18.6.bb b/recipes/gtk+/gtk+_2.18.6.bb index 1c2ca79016..69f8ff5e59 100644 --- a/recipes/gtk+/gtk+_2.18.6.bb +++ b/recipes/gtk+/gtk+_2.18.6.bb @@ -3,11 +3,12 @@ require gtk+.inc SRC_URI_append_virtclass-native = " file://no-demos.patch;patch=1 \ " -PR = "${INC_PR}.3" +PR = "${INC_PR}.4" BBCLASSEXTEND = "native" DEPENDS_virtclass-native = "libpng-native atk-native pango-native cairo-native libxrender-native libxext-native" +RRECOMMENDS_${PN}_virtclass-native = "" PROVIDES_virtclass-native = "gdk-pixbuf-csource-native" # Enable xkb selectively -- cgit v1.2.3 From 8c6131dc17cadb3279bc64729dc95e51734eac9b Mon Sep 17 00:00:00 2001 From: Michael 'Mickey' Lauer Date: Sat, 13 Mar 2010 01:29:20 +0100 Subject: dbus 1.3.0: add patch to improve threading stability --- .../dbus-1.3.0/improve-threading-stability.patch | 38 ++++++++++++++++++++++ recipes/dbus/dbus_1.3.0.bb | 3 +- 2 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 recipes/dbus/dbus-1.3.0/improve-threading-stability.patch diff --git a/recipes/dbus/dbus-1.3.0/improve-threading-stability.patch b/recipes/dbus/dbus-1.3.0/improve-threading-stability.patch new file mode 100644 index 0000000000..59de6ef27f --- /dev/null +++ b/recipes/dbus/dbus-1.3.0/improve-threading-stability.patch @@ -0,0 +1,38 @@ +From ae95a0ff9651a774cd983436d7e656c62492659c Mon Sep 17 00:00:00 2001 +From: Michael Meeks +Date: Fri, 12 Mar 2010 16:50:27 +0000 +Subject: [DBusConnection] When handling a watch, return if another thread is doing I/O + +http://lists.freedesktop.org/archives/dbus/2010-March/012337.html + +Previously, the watch handler would block until the I/O path was available. +However, if another non-main thread was doing a synchronous call, this would +cause the main thread to block on that thread, a highly undesirable +thing because it's important for the main thread to remain responsive +for user interfaces. + +Signed-off-by: Colin Walters +Signed-off-by: Thiago Macieira +--- +diff --git a/dbus/dbus-connection.c b/dbus/dbus-connection.c +index 5fb234d..69fdf53 100644 +--- a/dbus/dbus-connection.c ++++ b/dbus/dbus-connection.c +@@ -1435,7 +1435,14 @@ _dbus_connection_handle_watch (DBusWatch *watch, + _dbus_verbose ("%s start\n", _DBUS_FUNCTION_NAME); + + CONNECTION_LOCK (connection); +- _dbus_connection_acquire_io_path (connection, -1); ++ ++ if (!_dbus_connection_acquire_io_path (connection, 1)) ++ { ++ /* another thread is handling the message */ ++ CONNECTION_UNLOCK (connection); ++ return TRUE; ++ } ++ + HAVE_LOCK_CHECK (connection); + retval = _dbus_transport_handle_watch (connection->transport, + watch, condition); +-- +cgit v0.8.3-6-g21f6 diff --git a/recipes/dbus/dbus_1.3.0.bb b/recipes/dbus/dbus_1.3.0.bb index 3abc40a0d4..a06d9dc479 100644 --- a/recipes/dbus/dbus_1.3.0.bb +++ b/recipes/dbus/dbus_1.3.0.bb @@ -10,6 +10,7 @@ SRC_URI = "\ file://will-5.patch;patch=1 \ file://will-6.patch;patch=1 \ \ + file://improve-threading-stability.patch;patch=1 \ file://tmpdir.patch;patch=1 \ file://fix-install-daemon.patch;patch=1 \ file://0001-Make-the-default-DBus-reply-timeout-configurable.patch;patch=1 \ @@ -19,4 +20,4 @@ SRC_URI = "\ # This is the development version of dbus that will lead to 1.4.x DEFAULT_PREFERENCE = "-1" -PR = "r1" +PR = "r2" -- cgit v1.2.3 From 865848a34a1b9531c17ec399576e5078e4b048ba Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 12 Mar 2010 19:16:37 -0800 Subject: recipes.xml: Fix typo. Signed-off-by: Bernhard Reutner-Fischer Signed-off-by: Khem Raj --- docs/usermanual/chapters/recipes.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/usermanual/chapters/recipes.xml b/docs/usermanual/chapters/recipes.xml index cad1d80a68..90a181060b 100644 --- a/docs/usermanual/chapters/recipes.xml +++ b/docs/usermanual/chapters/recipes.xml @@ -1406,7 +1406,7 @@ inherit autotools -
+
Dependencies: What's needed to build and/or run the package? -- cgit v1.2.3 From 00d64e7b010a2218e6b1bf3bd30abb68caa8f81d Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 12 Mar 2010 23:56:20 -0800 Subject: uclibc-0.9.30.3: New recipe. Signed-off-by: Khem Raj --- recipes/uclibc/uclibc-0.9.30.3/a780/uClibc.machine | 70 ++++++++ .../uclibc/uclibc-0.9.30.3/akita/uClibc.machine | 70 ++++++++ recipes/uclibc/uclibc-0.9.30.3/arm/uClibc.machine | 69 ++++++++ .../uclibc/uclibc-0.9.30.3/armeb/uClibc.machine | 70 ++++++++ .../uclibc/uclibc-0.9.30.3/armv4t/uClibc.machine | 69 ++++++++ .../uclibc/uclibc-0.9.30.3/armv5te/uClibc.machine | 70 ++++++++ .../uclibc/uclibc-0.9.30.3/armv6/uClibc.machine | 70 ++++++++ .../uclibc/uclibc-0.9.30.3/armv7a/uClibc.machine | 70 ++++++++ .../uclibc/uclibc-0.9.30.3/avr32/uClibc.machine | 54 ++++++ recipes/uclibc/uclibc-0.9.30.3/bfin/uClibc.config | 0 recipes/uclibc/uclibc-0.9.30.3/bfin/uClibc.distro | 0 recipes/uclibc/uclibc-0.9.30.3/bfin/uClibc.machine | 192 +++++++++++++++++++++ recipes/uclibc/uclibc-0.9.30.3/c7x0/uClibc.machine | 70 ++++++++ .../uclibc/uclibc-0.9.30.3/cm-x270/uClibc.machine | 70 ++++++++ .../uclibc/uclibc-0.9.30.3/collie/uClibc.machine | 70 ++++++++ .../uclibc-0.9.30.3/dht-walnut/uClibc.machine | 54 ++++++ .../uclibc/uclibc-0.9.30.3/efika/uClibc.machine | 53 ++++++ .../uclibc/uclibc-0.9.30.3/ep93xx/uClibc.machine | 69 ++++++++ .../uclibc-0.9.30.3/gumstix-connex/uClibc.machine | 70 ++++++++ .../uclibc-0.9.30.3/gumstix-verdex/uClibc.machine | 70 ++++++++ .../uclibc/uclibc-0.9.30.3/h2200/uClibc.machine | 70 ++++++++ .../uclibc/uclibc-0.9.30.3/h3600/uClibc.machine | 70 ++++++++ .../uclibc/uclibc-0.9.30.3/h3800/uClibc.machine | 70 ++++++++ .../uclibc/uclibc-0.9.30.3/h3900/uClibc.machine | 70 ++++++++ .../uclibc/uclibc-0.9.30.3/h4000/uClibc.machine | 70 ++++++++ .../uclibc/uclibc-0.9.30.3/h5000/uClibc.machine | 70 ++++++++ .../uclibc/uclibc-0.9.30.3/hx4700/uClibc.machine | 70 ++++++++ .../uclibc/uclibc-0.9.30.3/iwmmxt/uClibc.machine | 70 ++++++++ .../uclibc/uclibc-0.9.30.3/ixp4xxbe/uClibc.machine | 70 ++++++++ .../uclibc/uclibc-0.9.30.3/kilauea/uClibc.machine | 55 ++++++ .../uclibc/uclibc-0.9.30.3/mipsel/uClibc.machine | 63 +++++++ .../uclibc-0.9.30.3/mpc8313e-rdb/uClibc.machine | 53 ++++++ .../uclibc-0.9.30.3/mpc8315e-rdb/uClibc.machine | 53 ++++++ .../uclibc-0.9.30.3/mpc8323e-rdb/uClibc.machine | 54 ++++++ .../uclibc/uclibc-0.9.30.3/n1200/uClibc.machine | 53 ++++++ .../uclibc/uclibc-0.9.30.3/om-gta01/uClibc.machine | 69 ++++++++ .../uclibc/uclibc-0.9.30.3/palmld/uClibc.machine | 70 ++++++++ .../uclibc/uclibc-0.9.30.3/palmz31/uClibc.machine | 70 ++++++++ .../uclibc/uclibc-0.9.30.3/palmz72/uClibc.machine | 70 ++++++++ .../uclibc/uclibc-0.9.30.3/poodle/uClibc.machine | 70 ++++++++ .../uclibc/uclibc-0.9.30.3/qemumips/uClibc.machine | 63 +++++++ .../uclibc/uclibc-0.9.30.3/qemux86/uClibc.machine | 68 ++++++++ .../uclibc/uclibc-0.9.30.3/sequoia/uClibc.machine | 53 ++++++ .../uclibc/uclibc-0.9.30.3/simpad/uClibc.machine | 70 ++++++++ .../uclibc/uclibc-0.9.30.3/spitz/uClibc.machine | 70 ++++++++ .../uclibc/uclibc-0.9.30.3/titan/uClibc.machine | 52 ++++++ recipes/uclibc/uclibc-0.9.30.3/uClibc.config | 0 recipes/uclibc/uclibc-0.9.30.3/uClibc.distro | 148 ++++++++++++++++ .../uclibc/uclibc-0.9.30.3/uClibc.machine.armv4t | 69 ++++++++ .../uclibc/uclibc-0.9.30.3/uClibc.machine.armv5te | 70 ++++++++ .../uclibc/uclibc-0.9.30.3/uClibc.machine.iwmmxt | 70 ++++++++ .../uclibc-0.9.30.3/uClibc.machine.strongarm | 70 ++++++++ recipes/uclibc/uclibc-0.9.30.3/wrap/uClibc.machine | 73 ++++++++ recipes/uclibc/uclibc-0.9.30.3/x86/uClibc.machine | 72 ++++++++ recipes/uclibc/uclibc-initial_0.9.30.3.bb | 26 +++ recipes/uclibc/uclibc_0.9.30.3.bb | 32 ++++ 56 files changed, 3646 insertions(+) create mode 100644 recipes/uclibc/uclibc-0.9.30.3/a780/uClibc.machine create mode 100644 recipes/uclibc/uclibc-0.9.30.3/akita/uClibc.machine create mode 100644 recipes/uclibc/uclibc-0.9.30.3/arm/uClibc.machine create mode 100644 recipes/uclibc/uclibc-0.9.30.3/armeb/uClibc.machine create mode 100644 recipes/uclibc/uclibc-0.9.30.3/armv4t/uClibc.machine create mode 100644 recipes/uclibc/uclibc-0.9.30.3/armv5te/uClibc.machine create mode 100644 recipes/uclibc/uclibc-0.9.30.3/armv6/uClibc.machine create mode 100644 recipes/uclibc/uclibc-0.9.30.3/armv7a/uClibc.machine create mode 100644 recipes/uclibc/uclibc-0.9.30.3/avr32/uClibc.machine create mode 100644 recipes/uclibc/uclibc-0.9.30.3/bfin/uClibc.config create mode 100644 recipes/uclibc/uclibc-0.9.30.3/bfin/uClibc.distro create mode 100644 recipes/uclibc/uclibc-0.9.30.3/bfin/uClibc.machine create mode 100644 recipes/uclibc/uclibc-0.9.30.3/c7x0/uClibc.machine create mode 100644 recipes/uclibc/uclibc-0.9.30.3/cm-x270/uClibc.machine create mode 100644 recipes/uclibc/uclibc-0.9.30.3/collie/uClibc.machine create mode 100644 recipes/uclibc/uclibc-0.9.30.3/dht-walnut/uClibc.machine create mode 100644 recipes/uclibc/uclibc-0.9.30.3/efika/uClibc.machine create mode 100644 recipes/uclibc/uclibc-0.9.30.3/ep93xx/uClibc.machine create mode 100644 recipes/uclibc/uclibc-0.9.30.3/gumstix-connex/uClibc.machine create mode 100644 recipes/uclibc/uclibc-0.9.30.3/gumstix-verdex/uClibc.machine create mode 100644 recipes/uclibc/uclibc-0.9.30.3/h2200/uClibc.machine create mode 100644 recipes/uclibc/uclibc-0.9.30.3/h3600/uClibc.machine create mode 100644 recipes/uclibc/uclibc-0.9.30.3/h3800/uClibc.machine create mode 100644 recipes/uclibc/uclibc-0.9.30.3/h3900/uClibc.machine create mode 100644 recipes/uclibc/uclibc-0.9.30.3/h4000/uClibc.machine create mode 100644 recipes/uclibc/uclibc-0.9.30.3/h5000/uClibc.machine create mode 100644 recipes/uclibc/uclibc-0.9.30.3/hx4700/uClibc.machine create mode 100644 recipes/uclibc/uclibc-0.9.30.3/iwmmxt/uClibc.machine create mode 100644 recipes/uclibc/uclibc-0.9.30.3/ixp4xxbe/uClibc.machine create mode 100644 recipes/uclibc/uclibc-0.9.30.3/kilauea/uClibc.machine create mode 100644 recipes/uclibc/uclibc-0.9.30.3/mipsel/uClibc.machine create mode 100644 recipes/uclibc/uclibc-0.9.30.3/mpc8313e-rdb/uClibc.machine create mode 100644 recipes/uclibc/uclibc-0.9.30.3/mpc8315e-rdb/uClibc.machine create mode 100644 recipes/uclibc/uclibc-0.9.30.3/mpc8323e-rdb/uClibc.machine create mode 100644 recipes/uclibc/uclibc-0.9.30.3/n1200/uClibc.machine create mode 100644 recipes/uclibc/uclibc-0.9.30.3/om-gta01/uClibc.machine create mode 100644 recipes/uclibc/uclibc-0.9.30.3/palmld/uClibc.machine create mode 100644 recipes/uclibc/uclibc-0.9.30.3/palmz31/uClibc.machine create mode 100644 recipes/uclibc/uclibc-0.9.30.3/palmz72/uClibc.machine create mode 100644 recipes/uclibc/uclibc-0.9.30.3/poodle/uClibc.machine create mode 100644 recipes/uclibc/uclibc-0.9.30.3/qemumips/uClibc.machine create mode 100644 recipes/uclibc/uclibc-0.9.30.3/qemux86/uClibc.machine create mode 100644 recipes/uclibc/uclibc-0.9.30.3/sequoia/uClibc.machine create mode 100644 recipes/uclibc/uclibc-0.9.30.3/simpad/uClibc.machine create mode 100644 recipes/uclibc/uclibc-0.9.30.3/spitz/uClibc.machine create mode 100644 recipes/uclibc/uclibc-0.9.30.3/titan/uClibc.machine create mode 100644 recipes/uclibc/uclibc-0.9.30.3/uClibc.config create mode 100644 recipes/uclibc/uclibc-0.9.30.3/uClibc.distro create mode 100644 recipes/uclibc/uclibc-0.9.30.3/uClibc.machine.armv4t create mode 100644 recipes/uclibc/uclibc-0.9.30.3/uClibc.machine.armv5te create mode 100644 recipes/uclibc/uclibc-0.9.30.3/uClibc.machine.iwmmxt create mode 100644 recipes/uclibc/uclibc-0.9.30.3/uClibc.machine.strongarm create mode 100644 recipes/uclibc/uclibc-0.9.30.3/wrap/uClibc.machine create mode 100644 recipes/uclibc/uclibc-0.9.30.3/x86/uClibc.machine create mode 100644 recipes/uclibc/uclibc-initial_0.9.30.3.bb create mode 100644 recipes/uclibc/uclibc_0.9.30.3.bb diff --git a/recipes/uclibc/uclibc-0.9.30.3/a780/uClibc.machine b/recipes/uclibc/uclibc-0.9.30.3/a780/uClibc.machine new file mode 100644 index 0000000000..e27931cf6b --- /dev/null +++ b/recipes/uclibc/uclibc-0.9.30.3/a780/uClibc.machine @@ -0,0 +1,70 @@ +# +# Automatically generated make config: don't edit +# Sat May 12 23:18:41 2007 +# +# TARGET_alpha is not set +TARGET_arm=y +# TARGET_bfin is not set +# TARGET_cris is not set +# TARGET_e1 is not set +# TARGET_frv is not set +# TARGET_h8300 is not set +# TARGET_hppa is not set +# TARGET_i386 is not set +# TARGET_i960 is not set +# TARGET_ia64 is not set +# TARGET_m68k is not set +# TARGET_microblaze is not set +# TARGET_mips is not set +# TARGET_nios is not set +# TARGET_nios2 is not set +# TARGET_powerpc is not set +# TARGET_sh is not set +# TARGET_sh64 is not set +# TARGET_sparc is not set +# TARGET_v850 is not set +# TARGET_vax is not set +# TARGET_x86_64 is not set + +# +# Target Architecture Features and Options +# +TARGET_ARCH="arm" +FORCE_OPTIONS_FOR_ARCH=y +# CONFIG_ARM_OABI is not set +CONFIG_ARM_EABI=y +USE_BX=y +# CONFIG_GENERIC_ARM is not set +# CONFIG_ARM610 is not set +# CONFIG_ARM710 is not set +# CONFIG_ARM7TDMI is not set +# CONFIG_ARM720T is not set +# CONFIG_ARM920T is not set +# CONFIG_ARM922T is not set +# CONFIG_ARM926T is not set +# CONFIG_ARM10T is not set +# CONFIG_ARM1136JF_S is not set +# CONFIG_ARM1176JZ_S is not set +# CONFIG_ARM1176JZF_S is not set +# CONFIG_ARM_SA110 is not set +# CONFIG_ARM_SA1100 is not set +# CONFIG_ARM_XSCALE is not set +CONFIG_ARM_IWMMXT=y +TARGET_SUBARCH="" + +# +# Using ELF file format +# +ARCH_ANY_ENDIAN=y +ARCH_LITTLE_ENDIAN=y +# ARCH_WANTS_BIG_ENDIAN is not set +ARCH_WANTS_LITTLE_ENDIAN=y +ARCH_HAS_MMU=y +ARCH_USE_MMU=y +UCLIBC_HAS_FLOATS=y +# UCLIBC_HAS_FPU is not set +UCLIBC_HAS_SOFT_FLOAT=y +DO_C99_MATH=y +KERNEL_HEADERS="/usr/include" +HAVE_DOT_CONFIG=y + diff --git a/recipes/uclibc/uclibc-0.9.30.3/akita/uClibc.machine b/recipes/uclibc/uclibc-0.9.30.3/akita/uClibc.machine new file mode 100644 index 0000000000..e27931cf6b --- /dev/null +++ b/recipes/uclibc/uclibc-0.9.30.3/akita/uClibc.machine @@ -0,0 +1,70 @@ +# +# Automatically generated make config: don't edit +# Sat May 12 23:18:41 2007 +# +# TARGET_alpha is not set +TARGET_arm=y +# TARGET_bfin is not set +# TARGET_cris is not set +# TARGET_e1 is not set +# TARGET_frv is not set +# TARGET_h8300 is not set +# TARGET_hppa is not set +# TARGET_i386 is not set +# TARGET_i960 is not set +# TARGET_ia64 is not set +# TARGET_m68k is not set +# TARGET_microblaze is not set +# TARGET_mips is not set +# TARGET_nios is not set +# TARGET_nios2 is not set +# TARGET_powerpc is not set +# TARGET_sh is not set +# TARGET_sh64 is not set +# TARGET_sparc is not set +# TARGET_v850 is not set +# TARGET_vax is not set +# TARGET_x86_64 is not set + +# +# Target Architecture Features and Options +# +TARGET_ARCH="arm" +FORCE_OPTIONS_FOR_ARCH=y +# CONFIG_ARM_OABI is not set +CONFIG_ARM_EABI=y +USE_BX=y +# CONFIG_GENERIC_ARM is not set +# CONFIG_ARM610 is not set +# CONFIG_ARM710 is not set +# CONFIG_ARM7TDMI is not set +# CONFIG_ARM720T is not set +# CONFIG_ARM920T is not set +# CONFIG_ARM922T is not set +# CONFIG_ARM926T is not set +# CONFIG_ARM10T is not set +# CONFIG_ARM1136JF_S is not set +# CONFIG_ARM1176JZ_S is not set +# CONFIG_ARM1176JZF_S is not set +# CONFIG_ARM_SA110 is not set +# CONFIG_ARM_SA1100 is not set +# CONFIG_ARM_XSCALE is not set +CONFIG_ARM_IWMMXT=y +TARGET_SUBARCH="" + +# +# Using ELF file format +# +ARCH_ANY_ENDIAN=y +ARCH_LITTLE_ENDIAN=y +# ARCH_WANTS_BIG_ENDIAN is not set +ARCH_WANTS_LITTLE_ENDIAN=y +ARCH_HAS_MMU=y +ARCH_USE_MMU=y +UCLIBC_HAS_FLOATS=y +# UCLIBC_HAS_FPU is not set +UCLIBC_HAS_SOFT_FLOAT=y +DO_C99_MATH=y +KERNEL_HEADERS="/usr/include" +HAVE_DOT_CONFIG=y + diff --git a/recipes/uclibc/uclibc-0.9.30.3/arm/uClibc.machine b/recipes/uclibc/uclibc-0.9.30.3/arm/uClibc.machine new file mode 100644 index 0000000000..898b73a33b --- /dev/null +++ b/recipes/uclibc/uclibc-0.9.30.3/arm/uClibc.machine @@ -0,0 +1,69 @@ +# +# Automatically generated make config: don't edit +# Mon May 14 10:23:14 2007 +# +# TARGET_alpha is not set +TARGET_arm=y +# TARGET_bfin is not set +# TARGET_cris is not set +# TARGET_e1 is not set +# TARGET_frv is not set +# TARGET_h8300 is not set +# TARGET_hppa is not set +# TARGET_i386 is not set +# TARGET_i960 is not set +# TARGET_ia64 is not set +# TARGET_m68k is not set +# TARGET_microblaze is not set +# TARGET_mips is not set +# TARGET_nios is not set +# TARGET_nios2 is not set +# TARGET_powerpc is not set +# TARGET_sh is not set +# TARGET_sh64 is not set +# TARGET_sparc is not set +# TARGET_v850 is not set +# TARGET_vax is not set +# TARGET_x86_64 is not set + +# +# Target Architecture Features and Options +# +TARGET_ARCH="arm" +FORCE_OPTIONS_FOR_ARCH=y +# CONFIG_ARM_OABI is not set +CONFIG_ARM_EABI=y +USE_BX=y +# CONFIG_GENERIC_ARM is not set +# CONFIG_ARM610 is not set +# CONFIG_ARM710 is not set +# CONFIG_ARM7TDMI is not set +# CONFIG_ARM720T is not set +CONFIG_ARM920T=y +# CONFIG_ARM922T is not set +# CONFIG_ARM926T is not set +# CONFIG_ARM10T is not set +# CONFIG_ARM1136JF_S is not set +# CONFIG_ARM1176JZ_S is not set +# CONFIG_ARM1176JZF_S is not set +# CONFIG_ARM_SA110 is not set +# CONFIG_ARM_SA1100 is not set +# CONFIG_ARM_XSCALE is not set +# CONFIG_ARM_IWMMXT is not set +TARGET_SUBARCH="" + +# +# Using ELF file format +# +ARCH_ANY_ENDIAN=y +ARCH_LITTLE_ENDIAN=y +# ARCH_WANTS_BIG_ENDIAN is not set +ARCH_WANTS_LITTLE_ENDIAN=y +ARCH_HAS_MMU=y +ARCH_USE_MMU=y +UCLIBC_HAS_FLOATS=y +# UCLIBC_HAS_FPU is not set +UCLIBC_HAS_SOFT_FLOAT=y +KERNEL_HEADERS="/usr/include" +HAVE_DOT_CONFIG=y + diff --git a/recipes/uclibc/uclibc-0.9.30.3/armeb/uClibc.machine b/recipes/uclibc/uclibc-0.9.30.3/armeb/uClibc.machine new file mode 100644 index 0000000000..2d9f63e531 --- /dev/null +++ b/recipes/uclibc/uclibc-0.9.30.3/armeb/uClibc.machine @@ -0,0 +1,70 @@ +# +# Automatically generated make config: don't edit +# Sat May 12 22:07:03 2007 +# +# TARGET_alpha is not set +TARGET_arm=y +# TARGET_bfin is not set +# TARGET_cris is not set +# TARGET_e1 is not set +# TARGET_frv is not set +# TARGET_h8300 is not set +# TARGET_hppa is not set +# TARGET_i386 is not set +# TARGET_i960 is not set +# TARGET_ia64 is not set +# TARGET_m68k is not set +# TARGET_microblaze is not set +# TARGET_mips is not set +# TARGET_nios is not set +# TARGET_nios2 is not set +# TARGET_powerpc is not set +# TARGET_sh is not set +# TARGET_sh64 is not set +# TARGET_sparc is not set +# TARGET_v850 is not set +# TARGET_vax is not set +# TARGET_x86_64 is not set + +# +# Target Architecture Features and Options +# +TARGET_ARCH="arm" +FORCE_OPTIONS_FOR_ARCH=y +# CONFIG_ARM_OABI is not set +CONFIG_ARM_EABI=y +USE_BX=y +# CONFIG_GENERIC_ARM is not set +# CONFIG_ARM610 is not set +# CONFIG_ARM710 is not set +# CONFIG_ARM7TDMI is not set +# CONFIG_ARM720T is not set +# CONFIG_ARM920T is not set +# CONFIG_ARM922T is not set +# CONFIG_ARM926T is not set +# CONFIG_ARM10T is not set +# CONFIG_ARM1136JF_S is not set +# CONFIG_ARM1176JZ_S is not set +# CONFIG_ARM1176JZF_S is not set +# CONFIG_ARM_SA110 is not set +# CONFIG_ARM_SA1100 is not set +CONFIG_ARM_XSCALE=y +# CONFIG_ARM_IWMMXT is not set +TARGET_SUBARCH="" + +# +# Using ELF file format +# +ARCH_ANY_ENDIAN=y +ARCH_BIG_ENDIAN=y +ARCH_WANTS_BIG_ENDIAN=y +# ARCH_WANTS_LITTLE_ENDIAN is not set +ARCH_HAS_MMU=y +ARCH_USE_MMU=y +UCLIBC_HAS_FLOATS=y +# UCLIBC_HAS_FPU is not set +UCLIBC_HAS_SOFT_FLOAT=y +DO_C99_MATH=y +KERNEL_HEADERS="/usr/include" +HAVE_DOT_CONFIG=y + diff --git a/recipes/uclibc/uclibc-0.9.30.3/armv4t/uClibc.machine b/recipes/uclibc/uclibc-0.9.30.3/armv4t/uClibc.machine new file mode 100644 index 0000000000..898b73a33b --- /dev/null +++ b/recipes/uclibc/uclibc-0.9.30.3/armv4t/uClibc.machine @@ -0,0 +1,69 @@ +# +# Automatically generated make config: don't edit +# Mon May 14 10:23:14 2007 +# +# TARGET_alpha is not set +TARGET_arm=y +# TARGET_bfin is not set +# TARGET_cris is not set +# TARGET_e1 is not set +# TARGET_frv is not set +# TARGET_h8300 is not set +# TARGET_hppa is not set +# TARGET_i386 is not set +# TARGET_i960 is not set +# TARGET_ia64 is not set +# TARGET_m68k is not set +# TARGET_microblaze is not set +# TARGET_mips is not set +# TARGET_nios is not set +# TARGET_nios2 is not set +# TARGET_powerpc is not set +# TARGET_sh is not set +# TARGET_sh64 is not set +# TARGET_sparc is not set +# TARGET_v850 is not set +# TARGET_vax is not set +# TARGET_x86_64 is not set + +# +# Target Architecture Features and Options +# +TARGET_ARCH="arm" +FORCE_OPTIONS_FOR_ARCH=y +# CONFIG_ARM_OABI is not set +CONFIG_ARM_EABI=y +USE_BX=y +# CONFIG_GENERIC_ARM is not set +# CONFIG_ARM610 is not set +# CONFIG_ARM710 is not set +# CONFIG_ARM7TDMI is not set +# CONFIG_ARM720T is not set +CONFIG_ARM920T=y +# CONFIG_ARM922T is not set +# CONFIG_ARM926T is not set +# CONFIG_ARM10T is not set +# CONFIG_ARM1136JF_S is not set +# CONFIG_ARM1176JZ_S is not set +# CONFIG_ARM1176JZF_S is not set +# CONFIG_ARM_SA110 is not set +# CONFIG_ARM_SA1100 is not set +# CONFIG_ARM_XSCALE is not set +# CONFIG_ARM_IWMMXT is not set +TARGET_SUBARCH="" + +# +# Using ELF file format +# +ARCH_ANY_ENDIAN=y +ARCH_LITTLE_ENDIAN=y +# ARCH_WANTS_BIG_ENDIAN is not set +ARCH_WANTS_LITTLE_ENDIAN=y +ARCH_HAS_MMU=y +ARCH_USE_MMU=y +UCLIBC_HAS_FLOATS=y +# UCLIBC_HAS_FPU is not set +UCLIBC_HAS_SOFT_FLOAT=y +KERNEL_HEADERS="/usr/include" +HAVE_DOT_CONFIG=y + diff --git a/recipes/uclibc/uclibc-0.9.30.3/armv5te/uClibc.machine b/recipes/uclibc/uclibc-0.9.30.3/armv5te/uClibc.machine new file mode 100644 index 0000000000..ec0385bc0f --- /dev/null +++ b/recipes/uclibc/uclibc-0.9.30.3/armv5te/uClibc.machine @@ -0,0 +1,70 @@ +# +# Automatically generated make config: don't edit +# Sun May 13 11:16:02 2007 +# +# TARGET_alpha is not set +TARGET_arm=y +# TARGET_bfin is not set +# TARGET_cris is not set +# TARGET_e1 is not set +# TARGET_frv is not set +# TARGET_h8300 is not set +# TARGET_hppa is not set +# TARGET_i386 is not set +# TARGET_i960 is not set +# TARGET_ia64 is not set +# TARGET_m68k is not set +# TARGET_microblaze is not set +# TARGET_mips is not set +# TARGET_nios is not set +# TARGET_nios2 is not set +# TARGET_powerpc is not set +# TARGET_sh is not set +# TARGET_sh64 is not set +# TARGET_sparc is not set +# TARGET_v850 is not set +# TARGET_vax is not set +# TARGET_x86_64 is not set + +# +# Target Architecture Features and Options +# +TARGET_ARCH="arm" +FORCE_OPTIONS_FOR_ARCH=y +# CONFIG_ARM_OABI is not set +CONFIG_ARM_EABI=y +USE_BX=y +# CONFIG_GENERIC_ARM is not set +# CONFIG_ARM610 is not set +# CONFIG_ARM710 is not set +# CONFIG_ARM7TDMI is not set +# CONFIG_ARM720T is not set +# CONFIG_ARM920T is not set +# CONFIG_ARM922T is not set +# CONFIG_ARM926T is not set +# CONFIG_ARM10T is not set +# CONFIG_ARM1136JF_S is not set +# CONFIG_ARM1176JZ_S is not set +# CONFIG_ARM1176JZF_S is not set +# CONFIG_ARM_SA110 is not set +# CONFIG_ARM_SA1100 is not set +CONFIG_ARM_XSCALE=y +# CONFIG_ARM_IWMMXT is not set +TARGET_SUBARCH="" + +# +# Using ELF file format +# +ARCH_ANY_ENDIAN=y +ARCH_LITTLE_ENDIAN=y +# ARCH_WANTS_BIG_ENDIAN is not set +ARCH_WANTS_LITTLE_ENDIAN=y +ARCH_HAS_MMU=y +ARCH_USE_MMU=y +UCLIBC_HAS_FLOATS=y +# UCLIBC_HAS_FPU is not set +UCLIBC_HAS_SOFT_FLOAT=y +DO_C99_MATH=y +KERNEL_HEADERS="/data/build/koen/OE/build/tmp/angstrom/cross/arm-angstrom-linux-uclibcgnueabi/include" +HAVE_DOT_CONFIG=y + diff --git a/recipes/uclibc/uclibc-0.9.30.3/armv6/uClibc.machine b/recipes/uclibc/uclibc-0.9.30.3/armv6/uClibc.machine new file mode 100644 index 0000000000..85f70f70c7 --- /dev/null +++ b/recipes/uclibc/uclibc-0.9.30.3/armv6/uClibc.machine @@ -0,0 +1,70 @@ +# +# Automatically generated make config: don't edit +# Sun May 13 11:16:02 2007 +# +# TARGET_alpha is not set +TARGET_arm=y +# TARGET_bfin is not set +# TARGET_cris is not set +# TARGET_e1 is not set +# TARGET_frv is not set +# TARGET_h8300 is not set +# TARGET_hppa is not set +# TARGET_i386 is not set +# TARGET_i960 is not set +# TARGET_ia64 is not set +# TARGET_m68k is not set +# TARGET_microblaze is not set +# TARGET_mips is not set +# TARGET_nios is not set +# TARGET_nios2 is not set +# TARGET_powerpc is not set +# TARGET_sh is not set +# TARGET_sh64 is not set +# TARGET_sparc is not set +# TARGET_v850 is not set +# TARGET_vax is not set +# TARGET_x86_64 is not set + +# +# Target Architecture Features and Options +# +TARGET_ARCH="arm" +FORCE_OPTIONS_FOR_ARCH=y +# CONFIG_ARM_OABI is not set +CONFIG_ARM_EABI=y +USE_BX=y +# CONFIG_GENERIC_ARM is not set +# CONFIG_ARM610 is not set +# CONFIG_ARM710 is not set +# CONFIG_ARM7TDMI is not set +# CONFIG_ARM720T is not set +# CONFIG_ARM920T is not set +# CONFIG_ARM922T is not set +# CONFIG_ARM926T is not set +# CONFIG_ARM10T is not set +# CONFIG_ARM1136JF_S is not set +# CONFIG_ARM1176JZ_S is not set +# CONFIG_ARM1176JZF_S is not set +# CONFIG_ARM_SA110 is not set +# CONFIG_ARM_SA1100 is not set +CONFIG_ARM_XSCALE=y +# CONFIG_ARM_IWMMXT is not set +TARGET_SUBARCH="" + +# +# Using ELF file format +# +ARCH_ANY_ENDIAN=y +ARCH_LITTLE_ENDIAN=y +# ARCH_WANTS_BIG_ENDIAN is not set +ARCH_WANTS_LITTLE_ENDIAN=y +ARCH_HAS_MMU=y +ARCH_USE_MMU=y +UCLIBC_HAS_FLOATS=y +UCLIBC_HAS_FPU=y +UCLIBC_HAS_SOFT_FLOAT=n +DO_C99_MATH=y +KERNEL_HEADERS="/data/build/koen/OE/build/tmp/angstrom/cross/arm-angstrom-linux-uclibcgnueabi/include" +HAVE_DOT_CONFIG=y + diff --git a/recipes/uclibc/uclibc-0.9.30.3/armv7a/uClibc.machine b/recipes/uclibc/uclibc-0.9.30.3/armv7a/uClibc.machine new file mode 100644 index 0000000000..85f70f70c7 --- /dev/null +++ b/recipes/uclibc/uclibc-0.9.30.3/armv7a/uClibc.machine @@ -0,0 +1,70 @@ +# +# Automatically generated make config: don't edit +# Sun May 13 11:16:02 2007 +# +# TARGET_alpha is not set +TARGET_arm=y +# TARGET_bfin is not set +# TARGET_cris is not set +# TARGET_e1 is not set +# TARGET_frv is not set +# TARGET_h8300 is not set +# TARGET_hppa is not set +# TARGET_i386 is not set +# TARGET_i960 is not set +# TARGET_ia64 is not set +# TARGET_m68k is not set +# TARGET_microblaze is not set +# TARGET_mips is not set +# TARGET_nios is not set +# TARGET_nios2 is not set +# TARGET_powerpc is not set +# TARGET_sh is not set +# TARGET_sh64 is not set +# TARGET_sparc is not set +# TARGET_v850 is not set +# TARGET_vax is not set +# TARGET_x86_64 is not set + +# +# Target Architecture Features and Options +# +TARGET_ARCH="arm" +FORCE_OPTIONS_FOR_ARCH=y +# CONFIG_ARM_OABI is not set +CONFIG_ARM_EABI=y +USE_BX=y +# CONFIG_GENERIC_ARM is not set +# CONFIG_ARM610 is not set +# CONFIG_ARM710 is not set +# CONFIG_ARM7TDMI is not set +# CONFIG_ARM720T is not set +# CONFIG_ARM920T is not set +# CONFIG_ARM922T is not set +# CONFIG_ARM926T is not set +# CONFIG_ARM10T is not set +# CONFIG_ARM1136JF_S is not set +# CONFIG_ARM1176JZ_S is not set +# CONFIG_ARM1176JZF_S is not set +# CONFIG_ARM_SA110 is not set +# CONFIG_ARM_SA1100 is not set +CONFIG_ARM_XSCALE=y +# CONFIG_ARM_IWMMXT is not set +TARGET_SUBARCH="" + +# +# Using ELF file format +# +ARCH_ANY_ENDIAN=y +ARCH_LITTLE_ENDIAN=y +# ARCH_WANTS_BIG_ENDIAN is not set +ARCH_WANTS_LITTLE_ENDIAN=y +ARCH_HAS_MMU=y +ARCH_USE_MMU=y +UCLIBC_HAS_FLOATS=y +UCLIBC_HAS_FPU=y +UCLIBC_HAS_SOFT_FLOAT=n +DO_C99_MATH=y +KERNEL_HEADERS="/data/build/koen/OE/build/tmp/angstrom/cross/arm-angstrom-linux-uclibcgnueabi/include" +HAVE_DOT_CONFIG=y + diff --git a/recipes/uclibc/uclibc-0.9.30.3/avr32/uClibc.machine b/recipes/uclibc/uclibc-0.9.30.3/avr32/uClibc.machine new file mode 100644 index 0000000000..ed8b1a447e --- /dev/null +++ b/recipes/uclibc/uclibc-0.9.30.3/avr32/uClibc.machine @@ -0,0 +1,54 @@ +# +# Automatically generated make config: don't edit +# Thu May 1 16:06:57 2008 +# +# TARGET_alpha is not set +# TARGET_arm is not set +TARGET_avr32=y +# TARGET_bfin is not set +# TARGET_cris is not set +# TARGET_e1 is not set +# TARGET_frv is not set +# TARGET_h8300 is not set +# TARGET_hppa is not set +# TARGET_i386 is not set +# TARGET_i960 is not set +# TARGET_ia64 is not set +# TARGET_m68k is not set +# TARGET_microblaze is not set +# TARGET_mips is not set +# TARGET_nios is not set +# TARGET_nios2 is not set +# TARGET_powerpc is not set +# TARGET_sh is not set +# TARGET_sh64 is not set +# TARGET_sparc is not set +# TARGET_v850 is not set +# TARGET_vax is not set +# TARGET_x86_64 is not set + +# +# Target Architecture Features and Options +# +TARGET_ARCH="avr32" +FORCE_OPTIONS_FOR_ARCH=y +CONFIG_AVR32_AP7=y +LINKRELAX=y +TARGET_SUBARCH="" + +# +# Using ELF file format +# +ARCH_BIG_ENDIAN=y + +# +# Using Big Endian +# +ARCH_HAS_MMU=y +ARCH_USE_MMU=y +UCLIBC_HAS_FLOATS=y +# UCLIBC_HAS_FPU is not set +UCLIBC_HAS_SOFT_FLOAT=y +DO_C99_MATH=y +KERNEL_HEADERS="/home/stelios/proj/OE/tmp/uclibc/staging/avr32-angstrom-linux-uclibc/usr/include" +HAVE_DOT_CONFIG=y diff --git a/recipes/uclibc/uclibc-0.9.30.3/bfin/uClibc.config b/recipes/uclibc/uclibc-0.9.30.3/bfin/uClibc.config new file mode 100644 index 0000000000..e69de29bb2 diff --git a/recipes/uclibc/uclibc-0.9.30.3/bfin/uClibc.distro b/recipes/uclibc/uclibc-0.9.30.3/bfin/uClibc.distro new file mode 100644 index 0000000000..e69de29bb2 diff --git a/recipes/uclibc/uclibc-0.9.30.3/bfin/uClibc.machine b/recipes/uclibc/uclibc-0.9.30.3/bfin/uClibc.machine new file mode 100644 index 0000000000..33a294f009 --- /dev/null +++ b/recipes/uclibc/uclibc-0.9.30.3/bfin/uClibc.machine @@ -0,0 +1,192 @@ +# +# Automatically generated make config: don't edit +# Sat Oct 20 20:22:28 2007 +# +# TARGET_alpha is not set +# TARGET_arm is not set +TARGET_bfin=y +# TARGET_cris is not set +# TARGET_e1 is not set +# TARGET_frv is not set +# TARGET_h8300 is not set +# TARGET_hppa is not set +# TARGET_i386 is not set +# TARGET_i960 is not set +# TARGET_ia64 is not set +# TARGET_m68k is not set +# TARGET_microblaze is not set +# TARGET_mips is not set +# TARGET_nios is not set +# TARGET_nios2 is not set +# TARGET_powerpc is not set +# TARGET_sh is not set +# TARGET_sh64 is not set +# TARGET_sparc is not set +# TARGET_v850 is not set +# TARGET_vax is not set +# TARGET_x86_64 is not set + +# +# Target Architecture Features and Options +# +TARGET_ARCH="bfin" +FORCE_OPTIONS_FOR_ARCH=y +TARGET_SUBARCH="" +# UCLIBC_FORMAT_ELF is not set +UCLIBC_FORMAT_FDPIC_ELF=y +# UCLIBC_FORMAT_FLAT is not set +# UCLIBC_FORMAT_FLAT_SEP_DATA is not set +# UCLIBC_FORMAT_SHARED_FLAT is not set +ARCH_LITTLE_ENDIAN=y + +# +# Using Little Endian +# +ARCH_HAS_NO_MMU=y + +# +# Target CPU lacks a memory management unit (MMU) +# +UCLIBC_HAS_FLOATS=y +UCLIBC_HAS_FPU=y +# DO_C99_MATH is not set +KERNEL_HEADERS="/usr/include" +# UCLIBC_UCLINUX_BROKEN_MUNMAP is not set +EXCLUDE_BRK=y +HAVE_DOT_CONFIG=y + +# +# General Library Settings +# +# HAVE_NO_PIC is not set +DOPIC=y +# HAVE_NO_SHARED is not set +# ARCH_HAS_NO_LDSO is not set +HAVE_SHARED=y +# FORCE_SHAREABLE_TEXT_SEGMENTS is not set +LDSO_LDD_SUPPORT=y +LDSO_CACHE_SUPPORT=y +# LDSO_PRELOAD_FILE_SUPPORT is not set +LDSO_BASE_FILENAME="ld.so" +UCLIBC_STATIC_LDCONFIG=y +LDSO_RUNPATH=y +UCLIBC_CTOR_DTOR=y +# HAS_NO_THREADS is not set +UCLIBC_HAS_THREADS=y +PTHREADS_DEBUG_SUPPORT=y +LINUXTHREADS_OLD=y +UCLIBC_HAS_LFS=y +MALLOC=y +# MALLOC_SIMPLE is not set +# MALLOC_STANDARD is not set +# MALLOC_GLIBC_COMPAT is not set +UCLIBC_DYNAMIC_ATEXIT=y +# COMPAT_ATEXIT is not set +# UCLIBC_SUSV3_LEGACY is not set +# UCLIBC_SUSV3_LEGACY_MACROS is not set +UCLIBC_HAS_SHADOW=y +# UCLIBC_HAS_PROGRAM_INVOCATION_NAME is not set +UCLIBC_HAS___PROGNAME=y +UNIX98PTY_ONLY=y +ASSUME_DEVPTS=y +UCLIBC_HAS_TM_EXTENSIONS=y +UCLIBC_HAS_TZ_CACHING=y +UCLIBC_HAS_TZ_FILE=y +UCLIBC_HAS_TZ_FILE_READ_MANY=y +UCLIBC_TZ_FILE_PATH="/etc/TZ" + +# +# Networking Support +# +# UCLIBC_HAS_IPV6 is not set +# UCLIBC_HAS_RPC is not set +# UCLIBC_USE_NETLINK is not set + +# +# String and Stdio Support +# +UCLIBC_HAS_STRING_GENERIC_OPT=y +UCLIBC_HAS_STRING_ARCH_OPT=y +UCLIBC_HAS_CTYPE_TABLES=y +UCLIBC_HAS_CTYPE_SIGNED=y +UCLIBC_HAS_CTYPE_UNSAFE=y +# UCLIBC_HAS_CTYPE_CHECKED is not set +# UCLIBC_HAS_CTYPE_ENFORCED is not set +# UCLIBC_HAS_WCHAR is not set +# UCLIBC_HAS_LOCALE is not set +# UCLIBC_HAS_HEXADECIMAL_FLOATS is not set +# UCLIBC_HAS_GLIBC_CUSTOM_PRINTF is not set +# USE_OLD_VFPRINTF is not set +UCLIBC_PRINTF_SCANF_POSITIONAL_ARGS=9 +# UCLIBC_HAS_SCANF_GLIBC_A_FLAG is not set +# UCLIBC_HAS_STDIO_BUFSIZ_NONE is not set +# UCLIBC_HAS_STDIO_BUFSIZ_256 is not set +# UCLIBC_HAS_STDIO_BUFSIZ_512 is not set +# UCLIBC_HAS_STDIO_BUFSIZ_1024 is not set +# UCLIBC_HAS_STDIO_BUFSIZ_2048 is not set +UCLIBC_HAS_STDIO_BUFSIZ_4096=y +# UCLIBC_HAS_STDIO_BUFSIZ_8192 is not set +UCLIBC_HAS_STDIO_BUILTIN_BUFFER_NONE=y +# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_4 is not set +# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_8 is not set +# UCLIBC_HAS_STDIO_SHUTDOWN_ON_ABORT is not set +UCLIBC_HAS_STDIO_GETC_MACRO=y +UCLIBC_HAS_STDIO_PUTC_MACRO=y +UCLIBC_HAS_STDIO_AUTO_RW_TRANSITION=y +# UCLIBC_HAS_FOPEN_LARGEFILE_MODE is not set +# UCLIBC_HAS_FOPEN_EXCLUSIVE_MODE is not set +# UCLIBC_HAS_GLIBC_CUSTOM_STREAMS is not set +# UCLIBC_HAS_PRINTF_M_SPEC is not set +UCLIBC_HAS_ERRNO_MESSAGES=y +# UCLIBC_HAS_SYS_ERRLIST is not set +UCLIBC_HAS_SIGNUM_MESSAGES=y +# UCLIBC_HAS_SYS_SIGLIST is not set +UCLIBC_HAS_GNU_GETOPT=y +UCLIBC_HAS_GNU_GETSUBOPT=y + +# +# Big and Tall +# +UCLIBC_HAS_REGEX=y +UCLIBC_HAS_REGEX_OLD=y +UCLIBC_HAS_FNMATCH=y +UCLIBC_HAS_FNMATCH_OLD=y +# UCLIBC_HAS_WORDEXP is not set +# UCLIBC_HAS_FTW is not set +UCLIBC_HAS_GLOB=y +# UCLIBC_HAS_GNU_GLOB is not set + +# +# Library Installation Options +# +SHARED_LIB_LOADER_PREFIX="$(RUNTIME_PREFIX)lib" +RUNTIME_PREFIX="/usr/$(TARGET_ARCH)-linux-uclibc/" +DEVEL_PREFIX="/usr/$(TARGET_ARCH)-linux-uclibc/usr/" +MULTILIB="" + +# +# Security options +# +# UCLIBC_HAS_ARC4RANDOM is not set +# HAVE_NO_SSP is not set +# UCLIBC_HAS_SSP is not set +UCLIBC_BUILD_RELRO=y +# UCLIBC_BUILD_NOW is not set +UCLIBC_BUILD_NOEXECSTACK=y + +# +# uClibc development/debugging options +# +CROSS_COMPILER_PREFIX="" +UCLIBC_EXTRA_CFLAGS="" +# DODEBUG is not set +# DODEBUG_PT is not set +DOSTRIP=y +# DOASSERTS is not set +# SUPPORT_LD_DEBUG is not set +# SUPPORT_LD_DEBUG_EARLY is not set +# UCLIBC_MALLOC_DEBUGGING is not set +WARNINGS="-Wall" +# EXTRA_WARNINGS is not set +# DOMULTI is not set +# UCLIBC_MJN3_ONLY is not set diff --git a/recipes/uclibc/uclibc-0.9.30.3/c7x0/uClibc.machine b/recipes/uclibc/uclibc-0.9.30.3/c7x0/uClibc.machine new file mode 100644 index 0000000000..ec0385bc0f --- /dev/null +++ b/recipes/uclibc/uclibc-0.9.30.3/c7x0/uClibc.machine @@ -0,0 +1,70 @@ +# +# Automatically generated make config: don't edit +# Sun May 13 11:16:02 2007 +# +# TARGET_alpha is not set +TARGET_arm=y +# TARGET_bfin is not set +# TARGET_cris is not set +# TARGET_e1 is not set +# TARGET_frv is not set +# TARGET_h8300 is not set +# TARGET_hppa is not set +# TARGET_i386 is not set +# TARGET_i960 is not set +# TARGET_ia64 is not set +# TARGET_m68k is not set +# TARGET_microblaze is not set +# TARGET_mips is not set +# TARGET_nios is not set +# TARGET_nios2 is not set +# TARGET_powerpc is not set +# TARGET_sh is not set +# TARGET_sh64 is not set +# TARGET_sparc is not set +# TARGET_v850 is not set +# TARGET_vax is not set +# TARGET_x86_64 is not set + +# +# Target Architecture Features and Options +# +TARGET_ARCH="arm" +FORCE_OPTIONS_FOR_ARCH=y +# CONFIG_ARM_OABI is not set +CONFIG_ARM_EABI=y +USE_BX=y +# CONFIG_GENERIC_ARM is not set +# CONFIG_ARM610 is not set +# CONFIG_ARM710 is not set +# CONFIG_ARM7TDMI is not set +# CONFIG_ARM720T is not set +# CONFIG_ARM920T is not set +# CONFIG_ARM922T is not set +# CONFIG_ARM926T is not set +# CONFIG_ARM10T is not set +# CONFIG_ARM1136JF_S is not set +# CONFIG_ARM1176JZ_S is not set +# CONFIG_ARM1176JZF_S is not set +# CONFIG_ARM_SA110 is not set +# CONFIG_ARM_SA1100 is not set +CONFIG_ARM_XSCALE=y +# CONFIG_ARM_IWMMXT is not set +TARGET_SUBARCH="" + +# +# Using ELF file format +# +ARCH_ANY_ENDIAN=y +ARCH_LITTLE_ENDIAN=y +# ARCH_WANTS_BIG_ENDIAN is not set +ARCH_WANTS_LITTLE_ENDIAN=y +ARCH_HAS_MMU=y +ARCH_USE_MMU=y +UCLIBC_HAS_FLOATS=y +# UCLIBC_HAS_FPU is not set +UCLIBC_HAS_SOFT_FLOAT=y +DO_C99_MATH=y +KERNEL_HEADERS="/data/build/koen/OE/build/tmp/angstrom/cross/arm-angstrom-linux-uclibcgnueabi/include" +HAVE_DOT_CONFIG=y + diff --git a/recipes/uclibc/uclibc-0.9.30.3/cm-x270/uClibc.machine b/recipes/uclibc/uclibc-0.9.30.3/cm-x270/uClibc.machine new file mode 100644 index 0000000000..e27931cf6b --- /dev/null +++ b/recipes/uclibc/uclibc-0.9.30.3/cm-x270/uClibc.machine @@ -0,0 +1,70 @@ +# +# Automatically generated make config: don't edit +# Sat May 12 23:18:41 2007 +# +# TARGET_alpha is not set +TARGET_arm=y +# TARGET_bfin is not set +# TARGET_cris is not set +# TARGET_e1 is not set +# TARGET_frv is not set +# TARGET_h8300 is not set +# TARGET_hppa is not set +# TARGET_i386 is not set +# TARGET_i960 is not set +# TARGET_ia64 is not set +# TARGET_m68k is not set +# TARGET_microblaze is not set +# TARGET_mips is not set +# TARGET_nios is not set +# TARGET_nios2 is not set +# TARGET_powerpc is not set +# TARGET_sh is not set +# TARGET_sh64 is not set +# TARGET_sparc is not set +# TARGET_v850 is not set +# TARGET_vax is not set +# TARGET_x86_64 is not set + +# +# Target Architecture Features and Options +# +TARGET_ARCH="arm" +FORCE_OPTIONS_FOR_ARCH=y +# CONFIG_ARM_OABI is not set +CONFIG_ARM_EABI=y +USE_BX=y +# CONFIG_GENERIC_ARM is not set +# CONFIG_ARM610 is not set +# CONFIG_ARM710 is not set +# CONFIG_ARM7TDMI is not set +# CONFIG_ARM720T is not set +# CONFIG_ARM920T is not set +# CONFIG_ARM922T is not set +# CONFIG_ARM926T is not set +# CONFIG_ARM10T is not set +# CONFIG_ARM1136JF_S is not set +# CONFIG_ARM1176JZ_S is not set +# CONFIG_ARM1176JZF_S is not set +# CONFIG_ARM_SA110 is not set +# CONFIG_ARM_SA1100 is not set +# CONFIG_ARM_XSCALE is not set +CONFIG_ARM_IWMMXT=y +TARGET_SUBARCH="" + +# +# Using ELF file format +# +ARCH_ANY_ENDIAN=y +ARCH_LITTLE_ENDIAN=y +# ARCH_WANTS_BIG_ENDIAN is not set +ARCH_WANTS_LITTLE_ENDIAN=y +ARCH_HAS_MMU=y +ARCH_USE_MMU=y +UCLIBC_HAS_FLOATS=y +# UCLIBC_HAS_FPU is not set +UCLIBC_HAS_SOFT_FLOAT=y +DO_C99_MATH=y +KERNEL_HEADERS="/usr/include" +HAVE_DOT_CONFIG=y + diff --git a/recipes/uclibc/uclibc-0.9.30.3/collie/uClibc.machine b/recipes/uclibc/uclibc-0.9.30.3/collie/uClibc.machine new file mode 100644 index 0000000000..6e89444a64 --- /dev/null +++ b/recipes/uclibc/uclibc-0.9.30.3/collie/uClibc.machine @@ -0,0 +1,70 @@ +# +# Automatically generated make config: don't edit +# Sun May 13 11:29:51 2007 +# +# TARGET_alpha is not set +TARGET_arm=y +# TARGET_bfin is not set +# TARGET_cris is not set +# TARGET_e1 is not set +# TARGET_frv is not set +# TARGET_h8300 is not set +# TARGET_hppa is not set +# TARGET_i386 is not set +# TARGET_i960 is not set +# TARGET_ia64 is not set +# TARGET_m68k is not set +# TARGET_microblaze is not set +# TARGET_mips is not set +# TARGET_nios is not set +# TARGET_nios2 is not set +# TARGET_powerpc is not set +# TARGET_sh is not set +# TARGET_sh64 is not set +# TARGET_sparc is not set +# TARGET_v850 is not set +# TARGET_vax is not set +# TARGET_x86_64 is not set + +# +# Target Architecture Features and Options +# +TARGET_ARCH="arm" +FORCE_OPTIONS_FOR_ARCH=y +CONFIG_ARM_OABI=y +# CONFIG_ARM_EABI is not set +# USE_BX is not set +# CONFIG_GENERIC_ARM is not set +# CONFIG_ARM610 is not set +# CONFIG_ARM710 is not set +# CONFIG_ARM7TDMI is not set +# CONFIG_ARM720T is not set +# CONFIG_ARM920T is not set +# CONFIG_ARM922T is not set +# CONFIG_ARM926T is not set +# CONFIG_ARM10T is not set +# CONFIG_ARM1136JF_S is not set +# CONFIG_ARM1176JZ_S is not set +# CONFIG_ARM1176JZF_S is not set +# CONFIG_ARM_SA110 is not set +CONFIG_ARM_SA1100=y +# CONFIG_ARM_XSCALE is not set +# CONFIG_ARM_IWMMXT is not set +TARGET_SUBARCH="" + +# +# Using ELF file format +# +ARCH_ANY_ENDIAN=y +ARCH_LITTLE_ENDIAN=y +# ARCH_WANTS_BIG_ENDIAN is not set +ARCH_WANTS_LITTLE_ENDIAN=y +ARCH_HAS_MMU=y +ARCH_USE_MMU=y +UCLIBC_HAS_FLOATS=y +# UCLIBC_HAS_FPU is not set +UCLIBC_HAS_SOFT_FLOAT=y +DO_C99_MATH=y +KERNEL_HEADERS="/usr/include" +HAVE_DOT_CONFIG=y + diff --git a/recipes/uclibc/uclibc-0.9.30.3/dht-walnut/uClibc.machine b/recipes/uclibc/uclibc-0.9.30.3/dht-walnut/uClibc.machine new file mode 100644 index 0000000000..2a38cfdd74 --- /dev/null +++ b/recipes/uclibc/uclibc-0.9.30.3/dht-walnut/uClibc.machine @@ -0,0 +1,54 @@ +# +# Automatically generated make config: don't edit +# Sun May 4 23:50:48 2008 +# +# TARGET_alpha is not set +# TARGET_arm is not set +# TARGET_avr32 is not set +# TARGET_bfin is not set +# TARGET_cris is not set +# TARGET_e1 is not set +# TARGET_frv is not set +# TARGET_h8300 is not set +# TARGET_hppa is not set +# TARGET_i386 is not set +# TARGET_i960 is not set +# TARGET_ia64 is not set +# TARGET_m68k is not set +# TARGET_microblaze is not set +# TARGET_mips is not set +# TARGET_nios is not set +# TARGET_nios2 is not set +TARGET_powerpc=y +# TARGET_sh is not set +# TARGET_sh64 is not set +# TARGET_sparc is not set +# TARGET_v850 is not set +# TARGET_vax is not set +# TARGET_x86_64 is not set + +# +# Target Architecture Features and Options +# +TARGET_ARCH="powerpc" +FORCE_OPTIONS_FOR_ARCH=y +CONFIG_CLASSIC=y +# CONFIG_E500 is not set +TARGET_SUBARCH="classic" + +# +# Using ELF file format +# +ARCH_BIG_ENDIAN=y + +# +# Using Big Endian +# +ARCH_HAS_MMU=y +ARCH_USE_MMU=y +UCLIBC_HAS_FLOATS=y +# UCLIBC_HAS_FPU is not set +UCLIBC_HAS_SOFT_FLOAT=y +DO_C99_MATH=y +KERNEL_HEADERS="/home/stelios/proj/OE/tmp/uclibc/staging/powerpc-angstrom-linux-uclibc/usr/include" +HAVE_DOT_CONFIG=y diff --git a/recipes/uclibc/uclibc-0.9.30.3/efika/uClibc.machine b/recipes/uclibc/uclibc-0.9.30.3/efika/uClibc.machine new file mode 100644 index 0000000000..e059257c09 --- /dev/null +++ b/recipes/uclibc/uclibc-0.9.30.3/efika/uClibc.machine @@ -0,0 +1,53 @@ +# +# Automatically generated make config: don't edit +# Sun May 13 11:25:50 2007 +# +# TARGET_alpha is not set +# TARGET_arm is not set +# TARGET_bfin is not set +# TARGET_cris is not set +# TARGET_e1 is not set +# TARGET_frv is not set +# TARGET_h8300 is not set +# TARGET_hppa is not set +# TARGET_i386 is not set +# TARGET_i960 is not set +# TARGET_ia64 is not set +# TARGET_m68k is not set +# TARGET_microblaze is not set +# TARGET_mips is not set +# TARGET_nios is not set +# TARGET_nios2 is not set +TARGET_powerpc=y +# TARGET_sh is not set +# TARGET_sh64 is not set +# TARGET_sparc is not set +# TARGET_v850 is not set +# TARGET_vax is not set +# TARGET_x86_64 is not set + +# +# Target Architecture Features and Options +# +TARGET_ARCH="powerpc" +FORCE_OPTIONS_FOR_ARCH=y +CONFIG_CLASSIC=y +# CONFIG_E500 is not set +TARGET_SUBARCH="classic" + +# +# Using ELF file format +# +ARCH_BIG_ENDIAN=y + +# +# Using Big Endian +# +ARCH_HAS_MMU=y +ARCH_USE_MMU=y +UCLIBC_HAS_FLOATS=y +UCLIBC_HAS_FPU=y +DO_C99_MATH=y +KERNEL_HEADERS="/data/build/koen/OE/build/tmp/angstrom/cross/powerpc-angstrom-linux-uclibc/include" +HAVE_DOT_CONFIG=y + diff --git a/recipes/uclibc/uclibc-0.9.30.3/ep93xx/uClibc.machine b/recipes/uclibc/uclibc-0.9.30.3/ep93xx/uClibc.machine new file mode 100644 index 0000000000..898b73a33b --- /dev/null +++ b/recipes/uclibc/uclibc-0.9.30.3/ep93xx/uClibc.machine @@ -0,0 +1,69 @@ +# +# Automatically generated make config: don't edit +# Mon May 14 10:23:14 2007 +# +# TARGET_alpha is not set +TARGET_arm=y +# TARGET_bfin is not set +# TARGET_cris is not set +# TARGET_e1 is not set +# TARGET_frv is not set +# TARGET_h8300 is not set +# TARGET_hppa is not set +# TARGET_i386 is not set +# TARGET_i960 is not set +# TARGET_ia64 is not set +# TARGET_m68k is not set +# TARGET_microblaze is not set +# TARGET_mips is not set +# TARGET_nios is not set +# TARGET_nios2 is not set +# TARGET_powerpc is not set +# TARGET_sh is not set +# TARGET_sh64 is not set +# TARGET_sparc is not set +# TARGET_v850 is not set +# TARGET_vax is not set +# TARGET_x86_64 is not set + +# +# Target Architecture Features and Options +# +TARGET_ARCH="arm" +FORCE_OPTIONS_FOR_ARCH=y +# CONFIG_ARM_OABI is not set +CONFIG_ARM_EABI=y +USE_BX=y +# CONFIG_GENERIC_ARM is not set +# CONFIG_ARM610 is not set +# CONFIG_ARM710 is not set +# CONFIG_ARM7TDMI is not set +# CONFIG_ARM720T is not set +CONFIG_ARM920T=y +# CONFIG_ARM922T is not set +# CONFIG_ARM926T is not set +# CONFIG_ARM10T is not set +# CONFIG_ARM1136JF_S is not set +# CONFIG_ARM1176JZ_S is not set +# CONFIG_ARM1176JZF_S is not set +# CONFIG_ARM_SA110 is not set +# CONFIG_ARM_SA1100 is not set +# CONFIG_ARM_XSCALE is not set +# CONFIG_ARM_IWMMXT is not set +TARGET_SUBARCH="" + +# +# Using ELF file format +# +ARCH_ANY_ENDIAN=y +ARCH_LITTLE_ENDIAN=y +# ARCH_WANTS_BIG_ENDIAN is not set +ARCH_WANTS_LITTLE_ENDIAN=y +ARCH_HAS_MMU=y +ARCH_USE_MMU=y +UCLIBC_HAS_FLOATS=y +# UCLIBC_HAS_FPU is not set +UCLIBC_HAS_SOFT_FLOAT=y +KERNEL_HEADERS="/usr/include" +HAVE_DOT_CONFIG=y + diff --git a/recipes/uclibc/uclibc-0.9.30.3/gumstix-connex/uClibc.machine b/recipes/uclibc/uclibc-0.9.30.3/gumstix-connex/uClibc.machine new file mode 100644 index 0000000000..ec0385bc0f --- /dev/null +++ b/recipes/uclibc/uclibc-0.9.30.3/gumstix-connex/uClibc.machine @@ -0,0 +1,70 @@ +# +# Automatically generated make config: don't edit +# Sun May 13 11:16:02 2007 +# +# TARGET_alpha is not set +TARGET_arm=y +# TARGET_bfin is not set +# TARGET_cris is not set +# TARGET_e1 is not set +# TARGET_frv is not set +# TARGET_h8300 is not set +# TARGET_hppa is not set +# TARGET_i386 is not set +# TARGET_i960 is not set +# TARGET_ia64 is not set +# TARGET_m68k is not set +# TARGET_microblaze is not set +# TARGET_mips is not set +# TARGET_nios is not set +# TARGET_nios2 is not set +# TARGET_powerpc is not set +# TARGET_sh is not set +# TARGET_sh64 is not set +# TARGET_sparc is not set +# TARGET_v850 is not set +# TARGET_vax is not set +# TARGET_x86_64 is not set + +# +# Target Architecture Features and Options +# +TARGET_ARCH="arm" +FORCE_OPTIONS_FOR_ARCH=y +# CONFIG_ARM_OABI is not set +CONFIG_ARM_EABI=y +USE_BX=y +# CONFIG_GENERIC_ARM is not set +# CONFIG_ARM610 is not set +# CONFIG_ARM710 is not set +# CONFIG_ARM7TDMI is not set +# CONFIG_ARM720T is not set +# CONFIG_ARM920T is not set +# CONFIG_ARM922T is not set +# CONFIG_ARM926T is not set +# CONFIG_ARM10T is not set +# CONFIG_ARM1136JF_S is not set +# CONFIG_ARM1176JZ_S is not set +# CONFIG_ARM1176JZF_S is not set +# CONFIG_ARM_SA110 is not set +# CONFIG_ARM_SA1100 is not set +CONFIG_ARM_XSCALE=y +# CONFIG_ARM_IWMMXT is not set +TARGET_SUBARCH="" + +# +# Using ELF file format +# +ARCH_ANY_ENDIAN=y +ARCH_LITTLE_ENDIAN=y +# ARCH_WANTS_BIG_ENDIAN is not set +ARCH_WANTS_LITTLE_ENDIAN=y +ARCH_HAS_MMU=y +ARCH_USE_MMU=y +UCLIBC_HAS_FLOATS=y +# UCLIBC_HAS_FPU is not set +UCLIBC_HAS_SOFT_FLOAT=y +DO_C99_MATH=y +KERNEL_HEADERS="/data/build/koen/OE/build/tmp/angstrom/cross/arm-angstrom-linux-uclibcgnueabi/include" +HAVE_DOT_CONFIG=y + diff --git a/recipes/uclibc/uclibc-0.9.30.3/gumstix-verdex/uClibc.machine b/recipes/uclibc/uclibc-0.9.30.3/gumstix-verdex/uClibc.machine new file mode 100644 index 0000000000..e27931cf6b --- /dev/null +++ b/recipes/uclibc/uclibc-0.9.30.3/gumstix-verdex/uClibc.machine @@ -0,0 +1,70 @@ +# +# Automatically generated make config: don't edit +# Sat May 12 23:18:41 2007 +# +# TARGET_alpha is not set +TARGET_arm=y +# TARGET_bfin is not set +# TARGET_cris is not set +# TARGET_e1 is not set +# TARGET_frv is not set +# TARGET_h8300 is not set +# TARGET_hppa is not set +# TARGET_i386 is not set +# TARGET_i960 is not set +# TARGET_ia64 is not set +# TARGET_m68k is not set +# TARGET_microblaze is not set +# TARGET_mips is not set +# TARGET_nios is not set +# TARGET_nios2 is not set +# TARGET_powerpc is not set +# TARGET_sh is not set +# TARGET_sh64 is not set +# TARGET_sparc is not set +# TARGET_v850 is not set +# TARGET_vax is not set +# TARGET_x86_64 is not set + +# +# Target Architecture Features and Options +# +TARGET_ARCH="arm" +FORCE_OPTIONS_FOR_ARCH=y +# CONFIG_ARM_OABI is not set +CONFIG_ARM_EABI=y +USE_BX=y +# CONFIG_GENERIC_ARM is not set +# CONFIG_ARM610 is not set +# CONFIG_ARM710 is not set +# CONFIG_ARM7TDMI is not set +# CONFIG_ARM720T is not set +# CONFIG_ARM920T is not set +# CONFIG_ARM922T is not set +# CONFIG_ARM926T is not set +# CONFIG_ARM10T is not set +# CONFIG_ARM1136JF_S is not set +# CONFIG_ARM1176JZ_S is not set +# CONFIG_ARM1176JZF_S is not set +# CONFIG_ARM_SA110 is not set +# CONFIG_ARM_SA1100 is not set +# CONFIG_ARM_XSCALE is not set +CONFIG_ARM_IWMMXT=y +TARGET_SUBARCH="" + +# +# Using ELF file format +# +ARCH_ANY_ENDIAN=y +ARCH_LITTLE_ENDIAN=y +# ARCH_WANTS_BIG_ENDIAN is not set +ARCH_WANTS_LITTLE_ENDIAN=y +ARCH_HAS_MMU=y +ARCH_USE_MMU=y +UCLIBC_HAS_FLOATS=y +# UCLIBC_HAS_FPU is not set +UCLIBC_HAS_SOFT_FLOAT=y +DO_C99_MATH=y +KERNEL_HEADERS="/usr/include" +HAVE_DOT_CONFIG=y + diff --git a/recipes/uclibc/uclibc-0.9.30.3/h2200/uClibc.machine b/recipes/uclibc/uclibc-0.9.30.3/h2200/uClibc.machine new file mode 100644 index 0000000000..ec0385bc0f --- /dev/null +++ b/recipes/uclibc/uclibc-0.9.30.3/h2200/uClibc.machine @@ -0,0 +1,70 @@ +# +# Automatically generated make config: don't edit +# Sun May 13 11:16:02 2007 +# +# TARGET_alpha is not set +TARGET_arm=y +# TARGET_bfin is not set +# TARGET_cris is not set +# TARGET_e1 is not set +# TARGET_frv is not set +# TARGET_h8300 is not set +# TARGET_hppa is not set +# TARGET_i386 is not set +# TARGET_i960 is not set +# TARGET_ia64 is not set +# TARGET_m68k is not set +# TARGET_microblaze is not set +# TARGET_mips is not set +# TARGET_nios is not set +# TARGET_nios2 is not set +# TARGET_powerpc is not set +# TARGET_sh is not set +# TARGET_sh64 is not set +# TARGET_sparc is not set +# TARGET_v850 is not set +# TARGET_vax is not set +# TARGET_x86_64 is not set + +# +# Target Architecture Features and Options +# +TARGET_ARCH="arm" +FORCE_OPTIONS_FOR_ARCH=y +# CONFIG_ARM_OABI is not set +CONFIG_ARM_EABI=y +USE_BX=y +# CONFIG_GENERIC_ARM is not set +# CONFIG_ARM610 is not set +# CONFIG_ARM710 is not set +# CONFIG_ARM7TDMI is not set +# CONFIG_ARM720T is not set +# CONFIG_ARM920T is not set +# CONFIG_ARM922T is not set +# CONFIG_ARM926T is not set +# CONFIG_ARM10T is not set +# CONFIG_ARM1136JF_S is not set +# CONFIG_ARM1176JZ_S is not set +# CONFIG_ARM1176JZF_S is not set +# CONFIG_ARM_SA110 is not set +# CONFIG_ARM_SA1100 is not set +CONFIG_ARM_XSCALE=y +# CONFIG_ARM_IWMMXT is not set +TARGET_SUBARCH="" + +# +# Using ELF file format +# +ARCH_ANY_ENDIAN=y +ARCH_LITTLE_ENDIAN=y +# ARCH_WANTS_BIG_ENDIAN is not set +ARCH_WANTS_LITTLE_ENDIAN=y +ARCH_HAS_MMU=y +ARCH_USE_MMU=y +UCLIBC_HAS_FLOATS=y +# UCLIBC_HAS_FPU is not set +UCLIBC_HAS_SOFT_FLOAT=y +DO_C99_MATH=y +KERNEL_HEADERS="/data/build/koen/OE/build/tmp/angstrom/cross/arm-angstrom-linux-uclibcgnueabi/include" +HAVE_DOT_CONFIG=y + diff --git a/recipes/uclibc/uclibc-0.9.30.3/h3600/uClibc.machine b/recipes/uclibc/uclibc-0.9.30.3/h3600/uClibc.machine new file mode 100644 index 0000000000..6e89444a64 --- /dev/null +++ b/recipes/uclibc/uclibc-0.9.30.3/h3600/uClibc.machine @@ -0,0 +1,70 @@ +# +# Automatically generated make config: don't edit +# Sun May 13 11:29:51 2007 +# +# TARGET_alpha is not set +TARGET_arm=y +# TARGET_bfin is not set +# TARGET_cris is not set +# TARGET_e1 is not set +# TARGET_frv is not set +# TARGET_h8300 is not set +# TARGET_hppa is not set +# TARGET_i386 is not set +# TARGET_i960 is not set +# TARGET_ia64 is not set +# TARGET_m68k is not set +# TARGET_microblaze is not set +# TARGET_mips is not set +# TARGET_nios is not set +# TARGET_nios2 is not set +# TARGET_powerpc is not set +# TARGET_sh is not set +# TARGET_sh64 is not set +# TARGET_sparc is not set +# TARGET_v850 is not set +# TARGET_vax is not set +# TARGET_x86_64 is not set + +# +# Target Architecture Features and Options +# +TARGET_ARCH="arm" +FORCE_OPTIONS_FOR_ARCH=y +CONFIG_ARM_OABI=y +# CONFIG_ARM_EABI is not set +# USE_BX is not set +# CONFIG_GENERIC_ARM is not set +# CONFIG_ARM610 is not set +# CONFIG_ARM710 is not set +# CONFIG_ARM7TDMI is not set +# CONFIG_ARM720T is not set +# CONFIG_ARM920T is not set +# CONFIG_ARM922T is not set +# CONFIG_ARM926T is not set +# CONFIG_ARM10T is not set +# CONFIG_ARM1136JF_S is not set +# CONFIG_ARM1176JZ_S is not set +# CONFIG_ARM1176JZF_S is not set +# CONFIG_ARM_SA110 is not set +CONFIG_ARM_SA1100=y +# CONFIG_ARM_XSCALE is not set +# CONFIG_ARM_IWMMXT is not set +TARGET_SUBARCH="" + +# +# Using ELF file format +# +ARCH_ANY_ENDIAN=y +ARCH_LITTLE_ENDIAN=y +# ARCH_WANTS_BIG_ENDIAN is not set +ARCH_WANTS_LITTLE_ENDIAN=y +ARCH_HAS_MMU=y +ARCH_USE_MMU=y +UCLIBC_HAS_FLOATS=y +# UCLIBC_HAS_FPU is not set +UCLIBC_HAS_SOFT_FLOAT=y +DO_C99_MATH=y +KERNEL_HEADERS="/usr/include" +HAVE_DOT_CONFIG=y + diff --git a/recipes/uclibc/uclibc-0.9.30.3/h3800/uClibc.machine b/recipes/uclibc/uclibc-0.9.30.3/h3800/uClibc.machine new file mode 100644 index 0000000000..6e89444a64 --- /dev/null +++ b/recipes/uclibc/uclibc-0.9.30.3/h3800/uClibc.machine @@ -0,0 +1,70 @@ +# +# Automatically generated make config: don't edit +# Sun May 13 11:29:51 2007 +# +# TARGET_alpha is not set +TARGET_arm=y +# TARGET_bfin is not set +# TARGET_cris is not set +# TARGET_e1 is not set +# TARGET_frv is not set +# TARGET_h8300 is not set +# TARGET_hppa is not set +# TARGET_i386 is not set +# TARGET_i960 is not set +# TARGET_ia64 is not set +# TARGET_m68k is not set +# TARGET_microblaze is not set +# TARGET_mips is not set +# TARGET_nios is not set +# TARGET_nios2 is not set +# TARGET_powerpc is not set +# TARGET_sh is not set +# TARGET_sh64 is not set +# TARGET_sparc is not set +# TARGET_v850 is not set +# TARGET_vax is not set +# TARGET_x86_64 is not set + +# +# Target Architecture Features and Options +# +TARGET_ARCH="arm" +FORCE_OPTIONS_FOR_ARCH=y +CONFIG_ARM_OABI=y +# CONFIG_ARM_EABI is not set +# USE_BX is not set +# CONFIG_GENERIC_ARM is not set +# CONFIG_ARM610 is not set +# CONFIG_ARM710 is not set +# CONFIG_ARM7TDMI is not set +# CONFIG_ARM720T is not set +# CONFIG_ARM920T is not set +# CONFIG_ARM922T is not set +# CONFIG_ARM926T is not set +# CONFIG_ARM10T is not set +# CONFIG_ARM1136JF_S is not set +# CONFIG_ARM1176JZ_S is not set +# CONFIG_ARM1176JZF_S is not set +# CONFIG_ARM_SA110 is not set +CONFIG_ARM_SA1100=y +# CONFIG_ARM_XSCALE is not set +# CONFIG_ARM_IWMMXT is not set +TARGET_SUBARCH="" + +# +# Using ELF file format +# +ARCH_ANY_ENDIAN=y +ARCH_LITTLE_ENDIAN=y +# ARCH_WANTS_BIG_ENDIAN is not set +ARCH_WANTS_LITTLE_ENDIAN=y +ARCH_HAS_MMU=y +ARCH_USE_MMU=y +UCLIBC_HAS_FLOATS=y +# UCLIBC_HAS_FPU is not set +UCLIBC_HAS_SOFT_FLOAT=y +DO_C99_MATH=y +KERNEL_HEADERS="/usr/include" +HAVE_DOT_CONFIG=y + diff --git a/recipes/uclibc/uclibc-0.9.30.3/h3900/uClibc.machine b/recipes/uclibc/uclibc-0.9.30.3/h3900/uClibc.machine new file mode 100644 index 0000000000..ec0385bc0f --- /dev/null +++ b/recipes/uclibc/uclibc-0.9.30.3/h3900/uClibc.machine @@ -0,0 +1,70 @@ +# +# Automatically generated make config: don't edit +# Sun May 13 11:16:02 2007 +# +# TARGET_alpha is not set +TARGET_arm=y +# TARGET_bfin is not set +# TARGET_cris is not set +# TARGET_e1 is not set +# TARGET_frv is not set +# TARGET_h8300 is not set +# TARGET_hppa is not set +# TARGET_i386 is not set +# TARGET_i960 is not set +# TARGET_ia64 is not set +# TARGET_m68k is not set +# TARGET_microblaze is not set +# TARGET_mips is not set +# TARGET_nios is not set +# TARGET_nios2 is not set +# TARGET_powerpc is not set +# TARGET_sh is not set +# TARGET_sh64 is not set +# TARGET_sparc is not set +# TARGET_v850 is not set +# TARGET_vax is not set +# TARGET_x86_64 is not set + +# +# Target Architecture Features and Options +# +TARGET_ARCH="arm" +FORCE_OPTIONS_FOR_ARCH=y +# CONFIG_ARM_OABI is not set +CONFIG_ARM_EABI=y +USE_BX=y +# CONFIG_GENERIC_ARM is not set +# CONFIG_ARM610 is not set +# CONFIG_ARM710 is not set +# CONFIG_ARM7TDMI is not set +# CONFIG_ARM720T is not set +# CONFIG_ARM920T is not set +# CONFIG_ARM922T is not set +# CONFIG_ARM926T is not set +# CONFIG_ARM10T is not set +# CONFIG_ARM1136JF_S is not set +# CONFIG_ARM1176JZ_S is not set +# CONFIG_ARM1176JZF_S is not set +# CONFIG_ARM_SA110 is not set +# CONFIG_ARM_SA1100 is not set +CONFIG_ARM_XSCALE=y +# CONFIG_ARM_IWMMXT is not set +TARGET_SUBARCH="" + +# +# Using ELF file format +# +ARCH_ANY_ENDIAN=y +ARCH_LITTLE_ENDIAN=y +# ARCH_WANTS_BIG_ENDIAN is not set +ARCH_WANTS_LITTLE_ENDIAN=y +ARCH_HAS_MMU=y +ARCH_USE_MMU=y +UCLIBC_HAS_FLOATS=y +# UCLIBC_HAS_FPU is not set +UCLIBC_HAS_SOFT_FLOAT=y +DO_C99_MATH=y +KERNEL_HEADERS="/data/build/koen/OE/build/tmp/angstrom/cross/arm-angstrom-linux-uclibcgnueabi/include" +HAVE_DOT_CONFIG=y + diff --git a/recipes/uclibc/uclibc-0.9.30.3/h4000/uClibc.machine b/recipes/uclibc/uclibc-0.9.30.3/h4000/uClibc.machine new file mode 100644 index 0000000000..ec0385bc0f --- /dev/null +++ b/recipes/uclibc/uclibc-0.9.30.3/h4000/uClibc.machine @@ -0,0 +1,70 @@ +# +# Automatically generated make config: don't edit +# Sun May 13 11:16:02 2007 +# +# TARGET_alpha is not set +TARGET_arm=y +# TARGET_bfin is not set +# TARGET_cris is not set +# TARGET_e1 is not set +# TARGET_frv is not set +# TARGET_h8300 is not set +# TARGET_hppa is not set +# TARGET_i386 is not set +# TARGET_i960 is not set +# TARGET_ia64 is not set +# TARGET_m68k is not set +# TARGET_microblaze is not set +# TARGET_mips is not set +# TARGET_nios is not set +# TARGET_nios2 is not set +# TARGET_powerpc is not set +# TARGET_sh is not set +# TARGET_sh64 is not set +# TARGET_sparc is not set +# TARGET_v850 is not set +# TARGET_vax is not set +# TARGET_x86_64 is not set + +# +# Target Architecture Features and Options +# +TARGET_ARCH="arm" +FORCE_OPTIONS_FOR_ARCH=y +# CONFIG_ARM_OABI is not set +CONFIG_ARM_EABI=y +USE_BX=y +# CONFIG_GENERIC_ARM is not set +# CONFIG_ARM610 is not set +# CONFIG_ARM710 is not set +# CONFIG_ARM7TDMI is not set +# CONFIG_ARM720T is not set +# CONFIG_ARM920T is not set +# CONFIG_ARM922T is not set +# CONFIG_ARM926T is not set +# CONFIG_ARM10T is not set +# CONFIG_ARM1136JF_S is not set +# CONFIG_ARM1176JZ_S is not set +# CONFIG_ARM1176JZF_S is not set +# CONFIG_ARM_SA110 is not set +# CONFIG_ARM_SA1100 is not set +CONFIG_ARM_XSCALE=y +# CONFIG_ARM_IWMMXT is not set +TARGET_SUBARCH="" + +# +# Using ELF file format +# +ARCH_ANY_ENDIAN=y +ARCH_LITTLE_ENDIAN=y +# ARCH_WANTS_BIG_ENDIAN is not set +ARCH_WANTS_LITTLE_ENDIAN=y +ARCH_HAS_MMU=y +ARCH_USE_MMU=y +UCLIBC_HAS_FLOATS=y +# UCLIBC_HAS_FPU is not set +UCLIBC_HAS_SOFT_FLOAT=y +DO_C99_MATH=y +KERNEL_HEADERS="/data/build/koen/OE/build/tmp/angstrom/cross/arm-angstrom-linux-uclibcgnueabi/include" +HAVE_DOT_CONFIG=y + diff --git a/recipes/uclibc/uclibc-0.9.30.3/h5000/uClibc.machine b/recipes/uclibc/uclibc-0.9.30.3/h5000/uClibc.machine new file mode 100644 index 0000000000..ec0385bc0f --- /dev/null +++ b/recipes/uclibc/uclibc-0.9.30.3/h5000/uClibc.machine @@ -0,0 +1,70 @@ +# +# Automatically generated make config: don't edit +# Sun May 13 11:16:02 2007 +# +# TARGET_alpha is not set +TARGET_arm=y +# TARGET_bfin is not set +# TARGET_cris is not set +# TARGET_e1 is not set +# TARGET_frv is not set +# TARGET_h8300 is not set +# TARGET_hppa is not set +# TARGET_i386 is not set +# TARGET_i960 is not set +# TARGET_ia64 is not set +# TARGET_m68k is not set +# TARGET_microblaze is not set +# TARGET_mips is not set +# TARGET_nios is not set +# TARGET_nios2 is not set +# TARGET_powerpc is not set +# TARGET_sh is not set +# TARGET_sh64 is not set +# TARGET_sparc is not set +# TARGET_v850 is not set +# TARGET_vax is not set +# TARGET_x86_64 is not set + +# +# Target Architecture Features and Options +# +TARGET_ARCH="arm" +FORCE_OPTIONS_FOR_ARCH=y +# CONFIG_ARM_OABI is not set +CONFIG_ARM_EABI=y +USE_BX=y +# CONFIG_GENERIC_ARM is not set +# CONFIG_ARM610 is not set +# CONFIG_ARM710 is not set +# CONFIG_ARM7TDMI is not set +# CONFIG_ARM720T is not set +# CONFIG_ARM920T is not set +# CONFIG_ARM922T is not set +# CONFIG_ARM926T is not set +# CONFIG_ARM10T is not set +# CONFIG_ARM1136JF_S is not set +# CONFIG_ARM1176JZ_S is not set +# CONFIG_ARM1176JZF_S is not set +# CONFIG_ARM_SA110 is not set +# CONFIG_ARM_SA1100 is not set +CONFIG_ARM_XSCALE=y +# CONFIG_ARM_IWMMXT is not set +TARGET_SUBARCH="" + +# +# Using ELF file format +# +ARCH_ANY_ENDIAN=y +ARCH_LITTLE_ENDIAN=y +# ARCH_WANTS_BIG_ENDIAN is not set +ARCH_WANTS_LITTLE_ENDIAN=y +ARCH_HAS_MMU=y +ARCH_USE_MMU=y +UCLIBC_HAS_FLOATS=y +# UCLIBC_HAS_FPU is not set +UCLIBC_HAS_SOFT_FLOAT=y +DO_C99_MATH=y +KERNEL_HEADERS="/data/build/koen/OE/build/tmp/angstrom/cross/arm-angstrom-linux-uclibcgnueabi/include" +HAVE_DOT_CONFIG=y + diff --git a/recipes/uclibc/uclibc-0.9.30.3/hx4700/uClibc.machine b/recipes/uclibc/uclibc-0.9.30.3/hx4700/uClibc.machine new file mode 100644 index 0000000000..e27931cf6b --- /dev/null +++ b/recipes/uclibc/uclibc-0.9.30.3/hx4700/uClibc.machine @@ -0,0 +1,70 @@ +# +# Automatically generated make config: don't edit +# Sat May 12 23:18:41 2007 +# +# TARGET_alpha is not set +TARGET_arm=y +# TARGET_bfin is not set +# TARGET_cris is not set +# TARGET_e1 is not set +# TARGET_frv is not set +# TARGET_h8300 is not set +# TARGET_hppa is not set +# TARGET_i386 is not set +# TARGET_i960 is not set +# TARGET_ia64 is not set +# TARGET_m68k is not set +# TARGET_microblaze is not set +# TARGET_mips is not set +# TARGET_nios is not set +# TARGET_nios2 is not set +# TARGET_powerpc is not set +# TARGET_sh is not set +# TARGET_sh64 is not set +# TARGET_sparc is not set +# TARGET_v850 is not set +# TARGET_vax is not set +# TARGET_x86_64 is not set + +# +# Target Architecture Features and Options +# +TARGET_ARCH="arm" +FORCE_OPTIONS_FOR_ARCH=y +# CONFIG_ARM_OABI is not set +CONFIG_ARM_EABI=y +USE_BX=y +# CONFIG_GENERIC_ARM is not set +# CONFIG_ARM610 is not set +# CONFIG_ARM710 is not set +# CONFIG_ARM7TDMI is not set +# CONFIG_ARM720T is not set +# CONFIG_ARM920T is not set +# CONFIG_ARM922T is not set +# CONFIG_ARM926T is not set +# CONFIG_ARM10T is not set +# CONFIG_ARM1136JF_S is not set +# CONFIG_ARM1176JZ_S is not set +# CONFIG_ARM1176JZF_S is not set +# CONFIG_ARM_SA110 is not set +# CONFIG_ARM_SA1100 is not set +# CONFIG_ARM_XSCALE is not set +CONFIG_ARM_IWMMXT=y +TARGET_SUBARCH="" + +# +# Using ELF file format +# +ARCH_ANY_ENDIAN=y +ARCH_LITTLE_ENDIAN=y +# ARCH_WANTS_BIG_ENDIAN is not set +ARCH_WANTS_LITTLE_ENDIAN=y +ARCH_HAS_MMU=y +ARCH_USE_MMU=y +UCLIBC_HAS_FLOATS=y +# UCLIBC_HAS_FPU is not set +UCLIBC_HAS_SOFT_FLOAT=y +DO_C99_MATH=y +KERNEL_HEADERS="/usr/include" +HAVE_DOT_CONFIG=y + diff --git a/recipes/uclibc/uclibc-0.9.30.3/iwmmxt/uClibc.machine b/recipes/uclibc/uclibc-0.9.30.3/iwmmxt/uClibc.machine new file mode 100644 index 0000000000..e27931cf6b --- /dev/null +++ b/recipes/uclibc/uclibc-0.9.30.3/iwmmxt/uClibc.machine @@ -0,0 +1,70 @@ +# +# Automatically generated make config: don't edit +# Sat May 12 23:18:41 2007 +# +# TARGET_alpha is not set +TARGET_arm=y +# TARGET_bfin is not set +# TARGET_cris is not set +# TARGET_e1 is not set +# TARGET_frv is not set +# TARGET_h8300 is not set +# TARGET_hppa is not set +# TARGET_i386 is not set +# TARGET_i960 is not set +# TARGET_ia64 is not set +# TARGET_m68k is not set +# TARGET_microblaze is not set +# TARGET_mips is not set +# TARGET_nios is not set +# TARGET_nios2 is not set +# TARGET_powerpc is not set +# TARGET_sh is not set +# TARGET_sh64 is not set +# TARGET_sparc is not set +# TARGET_v850 is not set +# TARGET_vax is not set +# TARGET_x86_64 is not set + +# +# Target Architecture Features and Options +# +TARGET_ARCH="arm" +FORCE_OPTIONS_FOR_ARCH=y +# CONFIG_ARM_OABI is not set +CONFIG_ARM_EABI=y +USE_BX=y +# CONFIG_GENERIC_ARM is not set +# CONFIG_ARM610 is not set +# CONFIG_ARM710 is not set +# CONFIG_ARM7TDMI is not set +# CONFIG_ARM720T is not set +# CONFIG_ARM920T is not set +# CONFIG_ARM922T is not set +# CONFIG_ARM926T is not set +# CONFIG_ARM10T is not set +# CONFIG_ARM1136JF_S is not set +# CONFIG_ARM1176JZ_S is not set +# CONFIG_ARM1176JZF_S is not set +# CONFIG_ARM_SA110 is not set +# CONFIG_ARM_SA1100 is not set +# CONFIG_ARM_XSCALE is not set +CONFIG_ARM_IWMMXT=y +TARGET_SUBARCH="" + +# +# Using ELF file format +# +ARCH_ANY_ENDIAN=y +ARCH_LITTLE_ENDIAN=y +# ARCH_WANTS_BIG_ENDIAN is not set +ARCH_WANTS_LITTLE_ENDIAN=y +ARCH_HAS_MMU=y +ARCH_USE_MMU=y +UCLIBC_HAS_FLOATS=y +# UCLIBC_HAS_FPU is not set +UCLIBC_HAS_SOFT_FLOAT=y +DO_C99_MATH=y +KERNEL_HEADERS="/usr/include" +HAVE_DOT_CONFIG=y + diff --git a/recipes/uclibc/uclibc-0.9.30.3/ixp4xxbe/uClibc.machine b/recipes/uclibc/uclibc-0.9.30.3/ixp4xxbe/uClibc.machine new file mode 100644 index 0000000000..2d9f63e531 --- /dev/null +++ b/recipes/uclibc/uclibc-0.9.30.3/ixp4xxbe/uClibc.machine @@ -0,0 +1,70 @@ +# +# Automatically generated make config: don't edit +# Sat May 12 22:07:03 2007 +# +# TARGET_alpha is not set +TARGET_arm=y +# TARGET_bfin is not set +# TARGET_cris is not set +# TARGET_e1 is not set +# TARGET_frv is not set +# TARGET_h8300 is not set +# TARGET_hppa is not set +# TARGET_i386 is not set +# TARGET_i960 is not set +# TARGET_ia64 is not set +# TARGET_m68k is not set +# TARGET_microblaze is not set +# TARGET_mips is not set +# TARGET_nios is not set +# TARGET_nios2 is not set +# TARGET_powerpc is not set +# TARGET_sh is not set +# TARGET_sh64 is not set +# TARGET_sparc is not set +# TARGET_v850 is not set +# TARGET_vax is not set +# TARGET_x86_64 is not set + +# +# Target Architecture Features and Options +# +TARGET_ARCH="arm" +FORCE_OPTIONS_FOR_ARCH=y +# CONFIG_ARM_OABI is not set +CONFIG_ARM_EABI=y +USE_BX=y +# CONFIG_GENERIC_ARM is not set +# CONFIG_ARM610 is not set +# CONFIG_ARM710 is not set +# CONFIG_ARM7TDMI is not set +# CONFIG_ARM720T is not set +# CONFIG_ARM920T is not set +# CONFIG_ARM922T is not set +# CONFIG_ARM926T is not set +# CONFIG_ARM10T is not set +# CONFIG_ARM1136JF_S is not set +# CONFIG_ARM1176JZ_S is not set +# CONFIG_ARM1176JZF_S is not set +# CONFIG_ARM_SA110 is not set +# CONFIG_ARM_SA1100 is not set +CONFIG_ARM_XSCALE=y +# CONFIG_ARM_IWMMXT is not set +TARGET_SUBARCH="" + +# +# Using ELF file format +# +ARCH_ANY_ENDIAN=y +ARCH_BIG_ENDIAN=y +ARCH_WANTS_BIG_ENDIAN=y +# ARCH_WANTS_LITTLE_ENDIAN is not set +ARCH_HAS_MMU=y +ARCH_USE_MMU=y +UCLIBC_HAS_FLOATS=y +# UCLIBC_HAS_FPU is not set +UCLIBC_HAS_SOFT_FLOAT=y +DO_C99_MATH=y +KERNEL_HEADERS="/usr/include" +HAVE_DOT_CONFIG=y + diff --git a/recipes/uclibc/uclibc-0.9.30.3/kilauea/uClibc.machine b/recipes/uclibc/uclibc-0.9.30.3/kilauea/uClibc.machine new file mode 100644 index 0000000000..effef11099 --- /dev/null +++ b/recipes/uclibc/uclibc-0.9.30.3/kilauea/uClibc.machine @@ -0,0 +1,55 @@ +# +# Automatically generated make config: don't edit +# Sun May 4 23:50:48 2008 +# +# TARGET_alpha is not set +# TARGET_arm is not set +# TARGET_avr32 is not set +# TARGET_bfin is not set +# TARGET_cris is not set +# TARGET_e1 is not set +# TARGET_frv is not set +# TARGET_h8300 is not set +# TARGET_hppa is not set +# TARGET_i386 is not set +# TARGET_i960 is not set +# TARGET_ia64 is not set +# TARGET_m68k is not set +# TARGET_microblaze is not set +# TARGET_mips is not set +# TARGET_nios is not set +# TARGET_nios2 is not set +TARGET_powerpc=y +# TARGET_sh is not set +# TARGET_sh64 is not set +# TARGET_sparc is not set +# TARGET_v850 is not set +# TARGET_vax is not set +# TARGET_x86_64 is not set + +# +# Target Architecture Features and Options +# +TARGET_ARCH="powerpc" +FORCE_OPTIONS_FOR_ARCH=y +CONFIG_CLASSIC=y +# CONFIG_E500 is not set +TARGET_SUBARCH="classic" + +# +# Using ELF file format +# +ARCH_BIG_ENDIAN=y + +# +# Using Big Endian +# +ARCH_HAS_MMU=y +ARCH_USE_MMU=y +UCLIBC_HAS_FLOATS=y +# UCLIBC_HAS_FPU is not set +UCLIBC_HAS_SOFT_FLOAT=y +DO_C99_MATH=y +KERNEL_HEADERS="/home/stelios/proj/OE/tmp/uclibc/staging/powerpc-angstrom-linux-uclibc/usr/include" +HAVE_DOT_CONFIG=y + diff --git a/recipes/uclibc/uclibc-0.9.30.3/mipsel/uClibc.machine b/recipes/uclibc/uclibc-0.9.30.3/mipsel/uClibc.machine new file mode 100644 index 0000000000..07c45f7213 --- /dev/null +++ b/recipes/uclibc/uclibc-0.9.30.3/mipsel/uClibc.machine @@ -0,0 +1,63 @@ +# +# Automatically generated make config: don't edit +# Wed Jul 9 13:37:36 2008 +# +# TARGET_alpha is not set +# TARGET_arm is not set +# TARGET_avr32 is not set +# TARGET_bfin is not set +# TARGET_cris is not set +# TARGET_e1 is not set +# TARGET_frv is not set +# TARGET_h8300 is not set +# TARGET_hppa is not set +# TARGET_i386 is not set +# TARGET_i960 is not set +# TARGET_ia64 is not set +# TARGET_m68k is not set +# TARGET_microblaze is not set +TARGET_mips=y +# TARGET_nios is not set +# TARGET_nios2 is not set +# TARGET_powerpc is not set +# TARGET_sh is not set +# TARGET_sh64 is not set +# TARGET_sparc is not set +# TARGET_v850 is not set +# TARGET_vax is not set +# TARGET_x86_64 is not set +# TARGET_xtensa is not set + +# +# Target Architecture Features and Options +# +TARGET_ARCH="mips" +FORCE_OPTIONS_FOR_ARCH=y +ARCH_CFLAGS="-mno-split-addresses" +CONFIG_MIPS_O32_ABI=y +# CONFIG_MIPS_N32_ABI is not set +# CONFIG_MIPS_N64_ABI is not set +# CONFIG_MIPS_ISA_1 is not set +# CONFIG_MIPS_ISA_2 is not set +# CONFIG_MIPS_ISA_3 is not set +# CONFIG_MIPS_ISA_4 is not set +CONFIG_MIPS_ISA_MIPS32=y +# CONFIG_MIPS_ISA_MIPS64 is not set +TARGET_SUBARCH="" + +# +# Using ELF file format +# +ARCH_ANY_ENDIAN=y +# ARCH_BIG_ENDIAN is not set +# ARCH_WANTS_BIG_ENDIAN is not set +ARCH_WANTS_LITTLE_ENDIAN=y +ARCH_HAS_MMU=y +ARCH_USE_MMU=y +UCLIBC_HAS_FLOATS=y +UCLIBC_HAS_FPU=y +# DO_C99_MATH is not set +# UCLIBC_HAS_FENV is not set +KERNEL_HEADERS="/home/kraj/work/cross/mips-none-linux-uclibc/sysroot/usr/include" +HAVE_DOT_CONFIG=y + diff --git a/recipes/uclibc/uclibc-0.9.30.3/mpc8313e-rdb/uClibc.machine b/recipes/uclibc/uclibc-0.9.30.3/mpc8313e-rdb/uClibc.machine new file mode 100644 index 0000000000..3ad8ff0da1 --- /dev/null +++ b/recipes/uclibc/uclibc-0.9.30.3/mpc8313e-rdb/uClibc.machine @@ -0,0 +1,53 @@ +# +# Automatically generated make config: don't edit +# Sun May 13 11:25:50 2007 +# +# TARGET_alpha is not set +# TARGET_arm is not set +# TARGET_bfin is not set +# TARGET_cris is not set +# TARGET_e1 is not set +# TARGET_frv is not set +# TARGET_h8300 is not set +# TARGET_hppa is not set +# TARGET_i386 is not set +# TARGET_i960 is not set +# TARGET_ia64 is not set +# TARGET_m68k is not set +# TARGET_microblaze is not set +# TARGET_mips is not set +# TARGET_nios is not set +# TARGET_nios2 is not set +TARGET_powerpc=y +# TARGET_sh is not set +# TARGET_sh64 is not set +# TARGET_sparc is not set +# TARGET_v850 is not set +# TARGET_vax is not set +# TARGET_x86_64 is not set + +# +# Target Architecture Features and Options +# +TARGET_ARCH="powerpc" +FORCE_OPTIONS_FOR_ARCH=y +CONFIG_CLASSIC=y +# CONFIG_E500 is not set +TARGET_SUBARCH="classic" + +# +# Using ELF file format +# +ARCH_BIG_ENDIAN=y + +# +# Using Big Endian +# +ARCH_HAS_MMU=y +ARCH_USE_MMU=y +UCLIBC_HAS_FLOATS=y +UCLIBC_HAS_FPU=y +DO_C99_MATH=y +KERNEL_HEADERS="will be mangled in bitbake" +HAVE_DOT_CONFIG=y + diff --git a/recipes/uclibc/uclibc-0.9.30.3/mpc8315e-rdb/uClibc.machine b/recipes/uclibc/uclibc-0.9.30.3/mpc8315e-rdb/uClibc.machine new file mode 100644 index 0000000000..3ad8ff0da1 --- /dev/null +++ b/recipes/uclibc/uclibc-0.9.30.3/mpc8315e-rdb/uClibc.machine @@ -0,0 +1,53 @@ +# +# Automatically generated make config: don't edit +# Sun May 13 11:25:50 2007 +# +# TARGET_alpha is not set +# TARGET_arm is not set +# TARGET_bfin is not set +# TARGET_cris is not set +# TARGET_e1 is not set +# TARGET_frv is not set +# TARGET_h8300 is not set +# TARGET_hppa is not set +# TARGET_i386 is not set +# TARGET_i960 is not set +# TARGET_ia64 is not set +# TARGET_m68k is not set +# TARGET_microblaze is not set +# TARGET_mips is not set +# TARGET_nios is not set +# TARGET_nios2 is not set +TARGET_powerpc=y +# TARGET_sh is not set +# TARGET_sh64 is not set +# TARGET_sparc is not set +# TARGET_v850 is not set +# TARGET_vax is not set +# TARGET_x86_64 is not set + +# +# Target Architecture Features and Options +# +TARGET_ARCH="powerpc" +FORCE_OPTIONS_FOR_ARCH=y +CONFIG_CLASSIC=y +# CONFIG_E500 is not set +TARGET_SUBARCH="classic" + +# +# Using ELF file format +# +ARCH_BIG_ENDIAN=y + +# +# Using Big Endian +# +ARCH_HAS_MMU=y +ARCH_USE_MMU=y +UCLIBC_HAS_FLOATS=y +UCLIBC_HAS_FPU=y +DO_C99_MATH=y +KERNEL_HEADERS="will be mangled in bitbake" +HAVE_DOT_CONFIG=y + diff --git a/recipes/uclibc/uclibc-0.9.30.3/mpc8323e-rdb/uClibc.machine b/recipes/uclibc/uclibc-0.9.30.3/mpc8323e-rdb/uClibc.machine new file mode 100644 index 0000000000..620676918b --- /dev/null +++ b/recipes/uclibc/uclibc-0.9.30.3/mpc8323e-rdb/uClibc.machine @@ -0,0 +1,54 @@ +# +# Automatically generated make config: don't edit +# Sun May 13 11:25:50 2007 +# +# TARGET_alpha is not set +# TARGET_arm is not set +# TARGET_bfin is not set +# TARGET_cris is not set +# TARGET_e1 is not set +# TARGET_frv is not set +# TARGET_h8300 is not set +# TARGET_hppa is not set +# TARGET_i386 is not set +# TARGET_i960 is not set +# TARGET_ia64 is not set +# TARGET_m68k is not set +# TARGET_microblaze is not set +# TARGET_mips is not set +# TARGET_nios is not set +# TARGET_nios2 is not set +TARGET_powerpc=y +# TARGET_sh is not set +# TARGET_sh64 is not set +# TARGET_sparc is not set +# TARGET_v850 is not set +# TARGET_vax is not set +# TARGET_x86_64 is not set + +# +# Target Architecture Features and Options +# +TARGET_ARCH="powerpc" +FORCE_OPTIONS_FOR_ARCH=y +CONFIG_CLASSIC=y +# CONFIG_E500 is not set +TARGET_SUBARCH="classic" + +# +# Using ELF file format +# +ARCH_BIG_ENDIAN=y + +# +# Using Big Endian +# +ARCH_HAS_MMU=y +ARCH_USE_MMU=y +UCLIBC_HAS_FLOATS=y +# UCLIBC_HAS_FPU is not set +UCLIBC_HAS_SOFT_FLOAT=y +DO_C99_MATH=y +KERNEL_HEADERS="to be mangled by uclibc bitbake" +HAVE_DOT_CONFIG=y + diff --git a/recipes/uclibc/uclibc-0.9.30.3/n1200/uClibc.machine b/recipes/uclibc/uclibc-0.9.30.3/n1200/uClibc.machine new file mode 100644 index 0000000000..23ca904520 --- /dev/null +++ b/recipes/uclibc/uclibc-0.9.30.3/n1200/uClibc.machine @@ -0,0 +1,53 @@ +# +# Automatically generated make config: don't edit +# Sun May 13 11:25:50 2007 +# +# TARGET_alpha is not set +# TARGET_arm is not set +# TARGET_bfin is not set +# TARGET_cris is not set +# TARGET_e1 is not set +# TARGET_frv is not set +# TARGET_h8300 is not set +# TARGET_hppa is not set +# TARGET_i386 is not set +# TARGET_i960 is not set +# TARGET_ia64 is not set +# TARGET_m68k is not set +# TARGET_microblaze is not set +# TARGET_mips is not set +# TARGET_nios is not set +# TARGET_nios2 is not set +TARGET_powerpc=y +# TARGET_sh is not set +# TARGET_sh64 is not set +# TARGET_sparc is not set +# TARGET_v850 is not set +# TARGET_vax is not set +# TARGET_x86_64 is not set + +# +# Target Architecture Features and Options +# +TARGET_ARCH="powerpc" +FORCE_OPTIONS_FOR_ARCH=y +CONFIG_CLASSIC=y +# CONFIG_E500 is not set +TARGET_SUBARCH="classic" + +# +# Using ELF file format +# +ARCH_BIG_ENDIAN=y + +# +# Using Big Endian +# +ARCH_HAS_MMU=y +ARCH_USE_MMU=y +UCLIBC_HAS_FLOATS=y +UCLIBC_HAS_FPU=y +DO_C99_MATH=y +KERNEL_HEADERS="/stuff/build/tmp/cross/powerpc-angstrom-linux-uclibc/include" +HAVE_DOT_CONFIG=y + diff --git a/recipes/uclibc/uclibc-0.9.30.3/om-gta01/uClibc.machine b/recipes/uclibc/uclibc-0.9.30.3/om-gta01/uClibc.machine new file mode 100644 index 0000000000..898b73a33b --- /dev/null +++ b/recipes/uclibc/uclibc-0.9.30.3/om-gta01/uClibc.machine @@ -0,0 +1,69 @@ +# +# Automatically generated make config: don't edit +# Mon May 14 10:23:14 2007 +# +# TARGET_alpha is not set +TARGET_arm=y +# TARGET_bfin is not set +# TARGET_cris is not set +# TARGET_e1 is not set +# TARGET_frv is not set +# TARGET_h8300 is not set +# TARGET_hppa is not set +# TARGET_i386 is not set +# TARGET_i960 is not set +# TARGET_ia64 is not set +# TARGET_m68k is not set +# TARGET_microblaze is not set +# TARGET_mips is not set +# TARGET_nios is not set +# TARGET_nios2 is not set +# TARGET_powerpc is not set +# TARGET_sh is not set +# TARGET_sh64 is not set +# TARGET_sparc is not set +# TARGET_v850 is not set +# TARGET_vax is not set +# TARGET_x86_64 is not set + +# +# Target Architecture Features and Options +# +TARGET_ARCH="arm" +FORCE_OPTIONS_FOR_ARCH=y +# CONFIG_ARM_OABI is not set +CONFIG_ARM_EABI=y +USE_BX=y +# CONFIG_GENERIC_ARM is not set +# CONFIG_ARM610 is not set +# CONFIG_ARM710 is not set +# CONFIG_ARM7TDMI is not set +# CONFIG_ARM720T is not set +CONFIG_ARM920T=y +# CONFIG_ARM922T is not set +# CONFIG_ARM926T is not set +# CONFIG_ARM10T is not set +# CONFIG_ARM1136JF_S is not set +# CONFIG_ARM1176JZ_S is not set +# CONFIG_ARM1176JZF_S is not set +# CONFIG_ARM_SA110 is not set +# CONFIG_ARM_SA1100 is not set +# CONFIG_ARM_XSCALE is not set +# CONFIG_ARM_IWMMXT is not set +TARGET_SUBARCH="" + +# +# Using ELF file format +# +ARCH_ANY_ENDIAN=y +ARCH_LITTLE_ENDIAN=y +# ARCH_WANTS_BIG_ENDIAN is not set +ARCH_WANTS_LITTLE_ENDIAN=y +ARCH_HAS_MMU=y +ARCH_USE_MMU=y +UCLIBC_HAS_FLOATS=y +# UCLIBC_HAS_FPU is not set +UCLIBC_HAS_SOFT_FLOAT=y +KERNEL_HEADERS="/usr/include" +HAVE_DOT_CONFIG=y + diff --git a/recipes/uclibc/uclibc-0.9.30.3/palmld/uClibc.machine b/recipes/uclibc/uclibc-0.9.30.3/palmld/uClibc.machine new file mode 100644 index 0000000000..e27931cf6b --- /dev/null +++ b/recipes/uclibc/uclibc-0.9.30.3/palmld/uClibc.machine @@ -0,0 +1,70 @@ +# +# Automatically generated make config: don't edit +# Sat May 12 23:18:41 2007 +# +# TARGET_alpha is not set +TARGET_arm=y +# TARGET_bfin is not set +# TARGET_cris is not set +# TARGET_e1 is not set +# TARGET_frv is not set +# TARGET_h8300 is not set +# TARGET_hppa is not set +# TARGET_i386 is not set +# TARGET_i960 is not set +# TARGET_ia64 is not set +# TARGET_m68k is not set +# TARGET_microblaze is not set +# TARGET_mips is not set +# TARGET_nios is not set +# TARGET_nios2 is not set +# TARGET_powerpc is not set +# TARGET_sh is not set +# TARGET_sh64 is not set +# TARGET_sparc is not set +# TARGET_v850 is not set +# TARGET_vax is not set +# TARGET_x86_64 is not set + +# +# Target Architecture Features and Options +# +TARGET_ARCH="arm" +FORCE_OPTIONS_FOR_ARCH=y +# CONFIG_ARM_OABI is not set +CONFIG_ARM_EABI=y +USE_BX=y +# CONFIG_GENERIC_ARM is not set +# CONFIG_ARM610 is not set +# CONFIG_ARM710 is not set +# CONFIG_ARM7TDMI is not set +# CONFIG_ARM720T is not set +# CONFIG_ARM920T is not set +# CONFIG_ARM922T is not set +# CONFIG_ARM926T is not set +# CONFIG_ARM10T is not set +# CONFIG_ARM1136JF_S is not set +# CONFIG_ARM1176JZ_S is not set +# CONFIG_ARM1176JZF_S is not set +# CONFIG_ARM_SA110 is not set +# CONFIG_ARM_SA1100 is not set +# CONFIG_ARM_XSCALE is not set +CONFIG_ARM_IWMMXT=y +TARGET_SUBARCH="" + +# +# Using ELF file format +# +ARCH_ANY_ENDIAN=y +ARCH_LITTLE_ENDIAN=y +# ARCH_WANTS_BIG_ENDIAN is not set +ARCH_WANTS_LITTLE_ENDIAN=y +ARCH_HAS_MMU=y +ARCH_USE_MMU=y +UCLIBC_HAS_FLOATS=y +# UCLIBC_HAS_FPU is not set +UCLIBC_HAS_SOFT_FLOAT=y +DO_C99_MATH=y +KERNEL_HEADERS="/usr/include" +HAVE_DOT_CONFIG=y + diff --git a/recipes/uclibc/uclibc-0.9.30.3/palmz31/uClibc.machine b/recipes/uclibc/uclibc-0.9.30.3/palmz31/uClibc.machine new file mode 100644 index 0000000000..ec0385bc0f --- /dev/null +++ b/recipes/uclibc/uclibc-0.9.30.3/palmz31/uClibc.machine @@ -0,0 +1,70 @@ +# +# Automatically generated make config: don't edit +# Sun May 13 11:16:02 2007 +# +# TARGET_alpha is not set +TARGET_arm=y +# TARGET_bfin is not set +# TARGET_cris is not set +# TARGET_e1 is not set +# TARGET_frv is not set +# TARGET_h8300 is not set +# TARGET_hppa is not set +# TARGET_i386 is not set +# TARGET_i960 is not set +# TARGET_ia64 is not set +# TARGET_m68k is not set +# TARGET_microblaze is not set +# TARGET_mips is not set +# TARGET_nios is not set +# TARGET_nios2 is not set +# TARGET_powerpc is not set +# TARGET_sh is not set +# TARGET_sh64 is not set +# TARGET_sparc is not set +# TARGET_v850 is not set +# TARGET_vax is not set +# TARGET_x86_64 is not set + +# +# Target Architecture Features and Options +# +TARGET_ARCH="arm" +FORCE_OPTIONS_FOR_ARCH=y +# CONFIG_ARM_OABI is not set +CONFIG_ARM_EABI=y +USE_BX=y +# CONFIG_GENERIC_ARM is not set +# CONFIG_ARM610 is not set +# CONFIG_ARM710 is not set +# CONFIG_ARM7TDMI is not set +# CONFIG_ARM720T is not set +# CONFIG_ARM920T is not set +# CONFIG_ARM922T is not set +# CONFIG_ARM926T is not set +# CONFIG_ARM10T is not set +# CONFIG_ARM1136JF_S is not set +# CONFIG_ARM1176JZ_S is not set +# CONFIG_ARM1176JZF_S is not set +# CONFIG_ARM_SA110 is not set +# CONFIG_ARM_SA1100 is not set +CONFIG_ARM_XSCALE=y +# CONFIG_ARM_IWMMXT is not set +TARGET_SUBARCH="" + +# +# Using ELF file format +# +ARCH_ANY_ENDIAN=y +ARCH_LITTLE_ENDIAN=y +# ARCH_WANTS_BIG_ENDIAN is not set +ARCH_WANTS_LITTLE_ENDIAN=y +ARCH_HAS_MMU=y +ARCH_USE_MMU=y +UCLIBC_HAS_FLOATS=y +# UCLIBC_HAS_FPU is not set +UCLIBC_HAS_SOFT_FLOAT=y +DO_C99_MATH=y +KERNEL_HEADERS="/data/build/koen/OE/build/tmp/angstrom/cross/arm-angstrom-linux-uclibcgnueabi/include" +HAVE_DOT_CONFIG=y + diff --git a/recipes/uclibc/uclibc-0.9.30.3/palmz72/uClibc.machine b/recipes/uclibc/uclibc-0.9.30.3/palmz72/uClibc.machine new file mode 100644 index 0000000000..e27931cf6b --- /dev/null +++ b/recipes/uclibc/uclibc-0.9.30.3/palmz72/uClibc.machine @@ -0,0 +1,70 @@ +# +# Automatically generated make config: don't edit +# Sat May 12 23:18:41 2007 +# +# TARGET_alpha is not set +TARGET_arm=y +# TARGET_bfin is not set +# TARGET_cris is not set +# TARGET_e1 is not set +# TARGET_frv is not set +# TARGET_h8300 is not set +# TARGET_hppa is not set +# TARGET_i386 is not set +# TARGET_i960 is not set +# TARGET_ia64 is not set +# TARGET_m68k is not set +# TARGET_microblaze is not set +# TARGET_mips is not set +# TARGET_nios is not set +# TARGET_nios2 is not set +# TARGET_powerpc is not set +# TARGET_sh is not set +# TARGET_sh64 is not set +# TARGET_sparc is not set +# TARGET_v850 is not set +# TARGET_vax is not set +# TARGET_x86_64 is not set + +# +# Target Architecture Features and Options +# +TARGET_ARCH="arm" +FORCE_OPTIONS_FOR_ARCH=y +# CONFIG_ARM_OABI is not set +CONFIG_ARM_EABI=y +USE_BX=y +# CONFIG_GENERIC_ARM is not set +# CONFIG_ARM610 is not set +# CONFIG_ARM710 is not set +# CONFIG_ARM7TDMI is not set +# CONFIG_ARM720T is not set +# CONFIG_ARM920T is not set +# CONFIG_ARM922T is not set +# CONFIG_ARM926T is not set +# CONFIG_ARM10T is not set +# CONFIG_ARM1136JF_S is not set +# CONFIG_ARM1176JZ_S is not set +# CONFIG_ARM1176JZF_S is not set +# CONFIG_ARM_SA110 is not set +# CONFIG_ARM_SA1100 is not set +# CONFIG_ARM_XSCALE is not set +CONFIG_ARM_IWMMXT=y +TARGET_SUBARCH="" + +# +# Using ELF file format +# +ARCH_ANY_ENDIAN=y +ARCH_LITTLE_ENDIAN=y +# ARCH_WANTS_BIG_ENDIAN is not set +ARCH_WANTS_LITTLE_ENDIAN=y +ARCH_HAS_MMU=y +ARCH_USE_MMU=y +UCLIBC_HAS_FLOATS=y +# UCLIBC_HAS_FPU is not set +UCLIBC_HAS_SOFT_FLOAT=y +DO_C99_MATH=y +KERNEL_HEADERS="/usr/include" +HAVE_DOT_CONFIG=y + diff --git a/recipes/uclibc/uclibc-0.9.30.3/poodle/uClibc.machine b/recipes/uclibc/uclibc-0.9.30.3/poodle/uClibc.machine new file mode 100644 index 0000000000..ec0385bc0f --- /dev/null +++ b/recipes/uclibc/uclibc-0.9.30.3/poodle/uClibc.machine @@ -0,0 +1,70 @@ +# +# Automatically generated make config: don't edit +# Sun May 13 11:16:02 2007 +# +# TARGET_alpha is not set +TARGET_arm=y +# TARGET_bfin is not set +# TARGET_cris is not set +# TARGET_e1 is not set +# TARGET_frv is not set +# TARGET_h8300 is not set +# TARGET_hppa is not set +# TARGET_i386 is not set +# TARGET_i960 is not set +# TARGET_ia64 is not set +# TARGET_m68k is not set +# TARGET_microblaze is not set +# TARGET_mips is not set +# TARGET_nios is not set +# TARGET_nios2 is not set +# TARGET_powerpc is not set +# TARGET_sh is not set +# TARGET_sh64 is not set +# TARGET_sparc is not set +# TARGET_v850 is not set +# TARGET_vax is not set +# TARGET_x86_64 is not set + +# +# Target Architecture Features and Options +# +TARGET_ARCH="arm" +FORCE_OPTIONS_FOR_ARCH=y +# CONFIG_ARM_OABI is not set +CONFIG_ARM_EABI=y +USE_BX=y +# CONFIG_GENERIC_ARM is not set +# CONFIG_ARM610 is not set +# CONFIG_ARM710 is not set +# CONFIG_ARM7TDMI is not set +# CONFIG_ARM720T is not set +# CONFIG_ARM920T is not set +# CONFIG_ARM922T is not set +# CONFIG_ARM926T is not set +# CONFIG_ARM10T is not set +# CONFIG_ARM1136JF_S is not set +# CONFIG_ARM1176JZ_S is not set +# CONFIG_ARM1176JZF_S is not set +# CONFIG_ARM_SA110 is not set +# CONFIG_ARM_SA1100 is not set +CONFIG_ARM_XSCALE=y +# CONFIG_ARM_IWMMXT is not set +TARGET_SUBARCH="" + +# +# Using ELF file format +# +ARCH_ANY_ENDIAN=y +ARCH_LITTLE_ENDIAN=y +# ARCH_WANTS_BIG_ENDIAN is not set +ARCH_WANTS_LITTLE_ENDIAN=y +ARCH_HAS_MMU=y +ARCH_USE_MMU=y +UCLIBC_HAS_FLOATS=y +# UCLIBC_HAS_FPU is not set +UCLIBC_HAS_SOFT_FLOAT=y +DO_C99_MATH=y +KERNEL_HEADERS="/data/build/koen/OE/build/tmp/angstrom/cross/arm-angstrom-linux-uclibcgnueabi/include" +HAVE_DOT_CONFIG=y + diff --git a/recipes/uclibc/uclibc-0.9.30.3/qemumips/uClibc.machine b/recipes/uclibc/uclibc-0.9.30.3/qemumips/uClibc.machine new file mode 100644 index 0000000000..1cf1addca9 --- /dev/null +++ b/recipes/uclibc/uclibc-0.9.30.3/qemumips/uClibc.machine @@ -0,0 +1,63 @@ +# +# Automatically generated make config: don't edit +# Wed Jul 9 13:37:36 2008 +# +# TARGET_alpha is not set +# TARGET_arm is not set +# TARGET_avr32 is not set +# TARGET_bfin is not set +# TARGET_cris is not set +# TARGET_e1 is not set +# TARGET_frv is not set +# TARGET_h8300 is not set +# TARGET_hppa is not set +# TARGET_i386 is not set +# TARGET_i960 is not set +# TARGET_ia64 is not set +# TARGET_m68k is not set +# TARGET_microblaze is not set +TARGET_mips=y +# TARGET_nios is not set +# TARGET_nios2 is not set +# TARGET_powerpc is not set +# TARGET_sh is not set +# TARGET_sh64 is not set +# TARGET_sparc is not set +# TARGET_v850 is not set +# TARGET_vax is not set +# TARGET_x86_64 is not set +# TARGET_xtensa is not set + +# +# Target Architecture Features and Options +# +TARGET_ARCH="mips" +FORCE_OPTIONS_FOR_ARCH=y +ARCH_CFLAGS="-mno-split-addresses" +CONFIG_MIPS_O32_ABI=y +# CONFIG_MIPS_N32_ABI is not set +# CONFIG_MIPS_N64_ABI is not set +# CONFIG_MIPS_ISA_1 is not set +# CONFIG_MIPS_ISA_2 is not set +# CONFIG_MIPS_ISA_3 is not set +# CONFIG_MIPS_ISA_4 is not set +CONFIG_MIPS_ISA_MIPS32=y +# CONFIG_MIPS_ISA_MIPS64 is not set +TARGET_SUBARCH="" + +# +# Using ELF file format +# +ARCH_ANY_ENDIAN=y +# ARCH_BIG_ENDIAN is not set +ARCH_WANTS_BIG_ENDIAN=y +# ARCH_WANTS_LITTLE_ENDIAN=y +ARCH_HAS_MMU=y +ARCH_USE_MMU=y +UCLIBC_HAS_FLOATS=y +UCLIBC_HAS_FPU=y +# DO_C99_MATH is not set +# UCLIBC_HAS_FENV is not set +KERNEL_HEADERS="/usr/include" +HAVE_DOT_CONFIG=y + diff --git a/recipes/uclibc/uclibc-0.9.30.3/qemux86/uClibc.machine b/recipes/uclibc/uclibc-0.9.30.3/qemux86/uClibc.machine new file mode 100644 index 0000000000..44fec169c8 --- /dev/null +++ b/recipes/uclibc/uclibc-0.9.30.3/qemux86/uClibc.machine @@ -0,0 +1,68 @@ +# +# Automatically generated make config: don't edit +# Fri Nov 23 15:49:33 2007 +# +# TARGET_alpha is not set +# TARGET_arm is not set +# TARGET_bfin is not set +# TARGET_cris is not set +# TARGET_e1 is not set +# TARGET_frv is not set +# TARGET_h8300 is not set +# TARGET_hppa is not set +TARGET_i386=y +# TARGET_i960 is not set +# TARGET_ia64 is not set +# TARGET_m68k is not set +# TARGET_microblaze is not set +# TARGET_mips is not set +# TARGET_nios is not set +# TARGET_nios2 is not set +# TARGET_powerpc is not set +# TARGET_sh is not set +# TARGET_sh64 is not set +# TARGET_sparc is not set +# TARGET_v850 is not set +# TARGET_vax is not set +# TARGET_x86_64 is not set + +# +# Target Architecture Features and Options +# +TARGET_ARCH="i386" +FORCE_OPTIONS_FOR_ARCH=y +CONFIG_GENERIC_386=y +# CONFIG_386 is not set +# CONFIG_486 is not set +# CONFIG_586 is not set +# CONFIG_586MMX is not set +# CONFIG_686 is not set +# CONFIG_PENTIUMII is not set +# CONFIG_PENTIUMIII is not set +# CONFIG_PENTIUM4 is not set +# CONFIG_K6 is not set +# CONFIG_K7 is not set +# CONFIG_ELAN is not set +# CONFIG_CRUSOE is not set +# CONFIG_WINCHIPC6 is not set +# CONFIG_WINCHIP2 is not set +# CONFIG_CYRIXIII is not set +# CONFIG_NEHEMIAH is not set +TARGET_SUBARCH="" + +# +# Using ELF file format +# +ARCH_LITTLE_ENDIAN=y + +# +# Using Little Endian +# +ARCH_HAS_MMU=y +ARCH_USE_MMU=y +UCLIBC_HAS_FLOATS=y +UCLIBC_HAS_FPU=y +DO_C99_MATH=y +KERNEL_HEADERS="/usr/include" +HAVE_DOT_CONFIG=y + diff --git a/recipes/uclibc/uclibc-0.9.30.3/sequoia/uClibc.machine b/recipes/uclibc/uclibc-0.9.30.3/sequoia/uClibc.machine new file mode 100644 index 0000000000..e059257c09 --- /dev/null +++ b/recipes/uclibc/uclibc-0.9.30.3/sequoia/uClibc.machine @@ -0,0 +1,53 @@ +# +# Automatically generated make config: don't edit +# Sun May 13 11:25:50 2007 +# +# TARGET_alpha is not set +# TARGET_arm is not set +# TARGET_bfin is not set +# TARGET_cris is not set +# TARGET_e1 is not set +# TARGET_frv is not set +# TARGET_h8300 is not set +# TARGET_hppa is not set +# TARGET_i386 is not set +# TARGET_i960 is not set +# TARGET_ia64 is not set +# TARGET_m68k is not set +# TARGET_microblaze is not set +# TARGET_mips is not set +# TARGET_nios is not set +# TARGET_nios2 is not set +TARGET_powerpc=y +# TARGET_sh is not set +# TARGET_sh64 is not set +# TARGET_sparc is not set +# TARGET_v850 is not set +# TARGET_vax is not set +# TARGET_x86_64 is not set + +# +# Target Architecture Features and Options +# +TARGET_ARCH="powerpc" +FORCE_OPTIONS_FOR_ARCH=y +CONFIG_CLASSIC=y +# CONFIG_E500 is not set +TARGET_SUBARCH="classic" + +# +# Using ELF file format +# +ARCH_BIG_ENDIAN=y + +# +# Using Big Endian +# +ARCH_HAS_MMU=y +ARCH_USE_MMU=y +UCLIBC_HAS_FLOATS=y +UCLIBC_HAS_FPU=y +DO_C99_MATH=y +KERNEL_HEADERS="/data/build/koen/OE/build/tmp/angstrom/cross/powerpc-angstrom-linux-uclibc/include" +HAVE_DOT_CONFIG=y + diff --git a/recipes/uclibc/uclibc-0.9.30.3/simpad/uClibc.machine b/recipes/uclibc/uclibc-0.9.30.3/simpad/uClibc.machine new file mode 100644 index 0000000000..6e89444a64 --- /dev/null +++ b/recipes/uclibc/uclibc-0.9.30.3/simpad/uClibc.machine @@ -0,0 +1,70 @@ +# +# Automatically generated make config: don't edit +# Sun May 13 11:29:51 2007 +# +# TARGET_alpha is not set +TARGET_arm=y +# TARGET_bfin is not set +# TARGET_cris is not set +# TARGET_e1 is not set +# TARGET_frv is not set +# TARGET_h8300 is not set +# TARGET_hppa is not set +# TARGET_i386 is not set +# TARGET_i960 is not set +# TARGET_ia64 is not set +# TARGET_m68k is not set +# TARGET_microblaze is not set +# TARGET_mips is not set +# TARGET_nios is not set +# TARGET_nios2 is not set +# TARGET_powerpc is not set +# TARGET_sh is not set +# TARGET_sh64 is not set +# TARGET_sparc is not set +# TARGET_v850 is not set +# TARGET_vax is not set +# TARGET_x86_64 is not set + +# +# Target Architecture Features and Options +# +TARGET_ARCH="arm" +FORCE_OPTIONS_FOR_ARCH=y +CONFIG_ARM_OABI=y +# CONFIG_ARM_EABI is not set +# USE_BX is not set +# CONFIG_GENERIC_ARM is not set +# CONFIG_ARM610 is not set +# CONFIG_ARM710 is not set +# CONFIG_ARM7TDMI is not set +# CONFIG_ARM720T is not set +# CONFIG_ARM920T is not set +# CONFIG_ARM922T is not set +# CONFIG_ARM926T is not set +# CONFIG_ARM10T is not set +# CONFIG_ARM1136JF_S is not set +# CONFIG_ARM1176JZ_S is not set +# CONFIG_ARM1176JZF_S is not set +# CONFIG_ARM_SA110 is not set +CONFIG_ARM_SA1100=y +# CONFIG_ARM_XSCALE is not set +# CONFIG_ARM_IWMMXT is not set +TARGET_SUBARCH="" + +# +# Using ELF file format +# +ARCH_ANY_ENDIAN=y +ARCH_LITTLE_ENDIAN=y +# ARCH_WANTS_BIG_ENDIAN is not set +ARCH_WANTS_LITTLE_ENDIAN=y +ARCH_HAS_MMU=y +ARCH_USE_MMU=y +UCLIBC_HAS_FLOATS=y +# UCLIBC_HAS_FPU is not set +UCLIBC_HAS_SOFT_FLOAT=y +DO_C99_MATH=y +KERNEL_HEADERS="/usr/include" +HAVE_DOT_CONFIG=y + diff --git a/recipes/uclibc/uclibc-0.9.30.3/spitz/uClibc.machine b/recipes/uclibc/uclibc-0.9.30.3/spitz/uClibc.machine new file mode 100644 index 0000000000..e27931cf6b --- /dev/null +++ b/recipes/uclibc/uclibc-0.9.30.3/spitz/uClibc.machine @@ -0,0 +1,70 @@ +# +# Automatically generated make config: don't edit +# Sat May 12 23:18:41 2007 +# +# TARGET_alpha is not set +TARGET_arm=y +# TARGET_bfin is not set +# TARGET_cris is not set +# TARGET_e1 is not set +# TARGET_frv is not set +# TARGET_h8300 is not set +# TARGET_hppa is not set +# TARGET_i386 is not set +# TARGET_i960 is not set +# TARGET_ia64 is not set +# TARGET_m68k is not set +# TARGET_microblaze is not set +# TARGET_mips is not set +# TARGET_nios is not set +# TARGET_nios2 is not set +# TARGET_powerpc is not set +# TARGET_sh is not set +# TARGET_sh64 is not set +# TARGET_sparc is not set +# TARGET_v850 is not set +# TARGET_vax is not set +# TARGET_x86_64 is not set + +# +# Target Architecture Features and Options +# +TARGET_ARCH="arm" +FORCE_OPTIONS_FOR_ARCH=y +# CONFIG_ARM_OABI is not set +CONFIG_ARM_EABI=y +USE_BX=y +# CONFIG_GENERIC_ARM is not set +# CONFIG_ARM610 is not set +# CONFIG_ARM710 is not set +# CONFIG_ARM7TDMI is not set +# CONFIG_ARM720T is not set +# CONFIG_ARM920T is not set +# CONFIG_ARM922T is not set +# CONFIG_ARM926T is not set +# CONFIG_ARM10T is not set +# CONFIG_ARM1136JF_S is not set +# CONFIG_ARM1176JZ_S is not set +# CONFIG_ARM1176JZF_S is not set +# CONFIG_ARM_SA110 is not set +# CONFIG_ARM_SA1100 is not set +# CONFIG_ARM_XSCALE is not set +CONFIG_ARM_IWMMXT=y +TARGET_SUBARCH="" + +# +# Using ELF file format +# +ARCH_ANY_ENDIAN=y +ARCH_LITTLE_ENDIAN=y +# ARCH_WANTS_BIG_ENDIAN is not set +ARCH_WANTS_LITTLE_ENDIAN=y +ARCH_HAS_MMU=y +ARCH_USE_MMU=y +UCLIBC_HAS_FLOATS=y +# UCLIBC_HAS_FPU is not set +UCLIBC_HAS_SOFT_FLOAT=y +DO_C99_MATH=y +KERNEL_HEADERS="/usr/include" +HAVE_DOT_CONFIG=y + diff --git a/recipes/uclibc/uclibc-0.9.30.3/titan/uClibc.machine b/recipes/uclibc/uclibc-0.9.30.3/titan/uClibc.machine new file mode 100644 index 0000000000..75c5328056 --- /dev/null +++ b/recipes/uclibc/uclibc-0.9.30.3/titan/uClibc.machine @@ -0,0 +1,52 @@ +# +# Automatically generated make config: don't edit +# Wed May 16 12:03:09 2007 +# +# TARGET_alpha is not set +# TARGET_arm is not set +# TARGET_bfin is not set +# TARGET_cris is not set +# TARGET_e1 is not set +# TARGET_frv is not set +# TARGET_h8300 is not set +# TARGET_hppa is not set +# TARGET_i386 is not set +# TARGET_i960 is not set +# TARGET_ia64 is not set +# TARGET_m68k is not set +# TARGET_microblaze is not set +# TARGET_mips is not set +# TARGET_nios is not set +# TARGET_nios2 is not set +# TARGET_powerpc is not set +TARGET_sh=y +# TARGET_sh64 is not set +# TARGET_sparc is not set +# TARGET_v850 is not set +# TARGET_vax is not set +# TARGET_x86_64 is not set + +# +# Target Architecture Features and Options +# +TARGET_ARCH="sh" +FORCE_OPTIONS_FOR_ARCH=y +# CONFIG_SH2A is not set +# CONFIG_SH2 is not set +# CONFIG_SH3 is not set +CONFIG_SH4=y +TARGET_SUBARCH="" + +# +# Using ELF file format +# +ARCH_ANY_ENDIAN=y +ARCH_LITTLE_ENDIAN=y +# ARCH_WANTS_BIG_ENDIAN is not set +ARCH_WANTS_LITTLE_ENDIAN=y +ARCH_HAS_MMU=y +ARCH_USE_MMU=y +UCLIBC_HAS_FLOATS=y +UCLIBC_HAS_FPU=y +KERNEL_HEADERS="/usr/include" +HAVE_DOT_CONFIG=y diff --git a/recipes/uclibc/uclibc-0.9.30.3/uClibc.config b/recipes/uclibc/uclibc-0.9.30.3/uClibc.config new file mode 100644 index 0000000000..e69de29bb2 diff --git a/recipes/uclibc/uclibc-0.9.30.3/uClibc.distro b/recipes/uclibc/uclibc-0.9.30.3/uClibc.distro new file mode 100644 index 0000000000..042ea4c547 --- /dev/null +++ b/recipes/uclibc/uclibc-0.9.30.3/uClibc.distro @@ -0,0 +1,148 @@ +# +# General Library Settings +# +# HAVE_NO_PIC is not set +# DOPIC is not set +# HAVE_NO_SHARED is not set +# ARCH_HAS_NO_LDSO is not set +HAVE_SHARED=y +# FORCE_SHAREABLE_TEXT_SEGMENTS is not set +LDSO_LDD_SUPPORT=y +LDSO_CACHE_SUPPORT=y +# LDSO_PRELOAD_FILE_SUPPORT is not set +LDSO_BASE_FILENAME="ld.so" +# UCLIBC_STATIC_LDCONFIG is not set +LDSO_RUNPATH=y +UCLIBC_CTOR_DTOR=y +LDSO_GNU_HASH_SUPPORT=y +# HAS_NO_THREADS is not set +UCLIBC_HAS_THREADS=y +PTHREADS_DEBUG_SUPPORT=y +LINUXTHREADS_OLD=y +UCLIBC_HAS_LFS=y +# MALLOC is not set +# MALLOC_SIMPLE is not set +MALLOC_STANDARD=y +MALLOC_GLIBC_COMPAT=y +UCLIBC_DYNAMIC_ATEXIT=y +COMPAT_ATEXIT=y +UCLIBC_SUSV3_LEGACY=y +UCLIBC_SUSV3_LEGACY_MACROS=y +UCLIBC_HAS_SHADOW=y +UCLIBC_HAS_PROGRAM_INVOCATION_NAME=y +UCLIBC_HAS___PROGNAME=y +UNIX98PTY_ONLY=y +UCLIBC_HAS_GETPT=y +ASSUME_DEVPTS=y +UCLIBC_HAS_TM_EXTENSIONS=y +UCLIBC_HAS_TZ_CACHING=y +UCLIBC_HAS_TZ_FILE=y +UCLIBC_HAS_TZ_FILE_READ_MANY=y +UCLIBC_TZ_FILE_PATH="/etc/TZ" + +# +# Advanced Library Settings +# +UCLIBC_PWD_BUFFER_SIZE=256 +UCLIBC_GRP_BUFFER_SIZE=256 + +# +# Networking Support +# +UCLIBC_HAS_IPV6=y +UCLIBC_HAS_RPC=y +UCLIBC_HAS_FULL_RPC=y +# UCLIBC_HAS_REENTRANT_RPC is not set +# UCLIBC_USE_NETLINK is not set +# UCLIBC_HAS_BSD_RES_CLOSE is not set + +# +# String and Stdio Support +# +UCLIBC_HAS_STRING_GENERIC_OPT=y +UCLIBC_HAS_STRING_ARCH_OPT=y +UCLIBC_HAS_CTYPE_TABLES=y +UCLIBC_HAS_CTYPE_SIGNED=y +# UCLIBC_HAS_CTYPE_UNSAFE is not set +UCLIBC_HAS_CTYPE_CHECKED=y +# UCLIBC_HAS_CTYPE_ENFORCED is not set +UCLIBC_HAS_WCHAR=y +# UCLIBC_HAS_LOCALE is not set +UCLIBC_HAS_HEXADECIMAL_FLOATS=y +UCLIBC_HAS_GLIBC_CUSTOM_PRINTF=y +UCLIBC_PRINTF_SCANF_POSITIONAL_ARGS=9 +UCLIBC_HAS_SCANF_GLIBC_A_FLAG=y +# UCLIBC_HAS_STDIO_BUFSIZ_NONE is not set +UCLIBC_HAS_STDIO_BUFSIZ_256=y +# UCLIBC_HAS_STDIO_BUFSIZ_512 is not set +# UCLIBC_HAS_STDIO_BUFSIZ_1024 is not set +# UCLIBC_HAS_STDIO_BUFSIZ_2048 is not set +# UCLIBC_HAS_STDIO_BUFSIZ_4096 is not set +# UCLIBC_HAS_STDIO_BUFSIZ_8192 is not set +UCLIBC_HAS_STDIO_BUILTIN_BUFFER_NONE=y +# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_4 is not set +# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_8 is not set +# UCLIBC_HAS_STDIO_SHUTDOWN_ON_ABORT is not set +# UCLIBC_HAS_STDIO_GETC_MACRO is not set +# UCLIBC_HAS_STDIO_PUTC_MACRO is not set +UCLIBC_HAS_STDIO_AUTO_RW_TRANSITION=y +# UCLIBC_HAS_FOPEN_LARGEFILE_MODE is not set +UCLIBC_HAS_FOPEN_EXCLUSIVE_MODE=y +UCLIBC_HAS_GLIBC_CUSTOM_STREAMS=y +UCLIBC_HAS_PRINTF_M_SPEC=y +UCLIBC_HAS_ERRNO_MESSAGES=y +# UCLIBC_HAS_SYS_ERRLIST is not set +UCLIBC_HAS_SIGNUM_MESSAGES=y +# UCLIBC_HAS_SYS_SIGLIST is not set +UCLIBC_HAS_GNU_GETOPT=y +UCLIBC_HAS_GNU_GETSUBOPT=y + +# +# Big and Tall +# +UCLIBC_HAS_REGEX=y +# UCLIBC_HAS_REGEX_OLD is not set +UCLIBC_HAS_FNMATCH=y +# UCLIBC_HAS_FNMATCH_OLD is not set +UCLIBC_HAS_WORDEXP=y +UCLIBC_HAS_FTW=y +UCLIBC_HAS_GLOB=y +UCLIBC_HAS_GNU_GLOB=y + +# +# Library Installation Options +# +SHARED_LIB_LOADER_PREFIX="/lib" +RUNTIME_PREFIX="/" +DEVEL_PREFIX="//usr" + +# +# Security options +# +# UCLIBC_BUILD_PIE is not set +# UCLIBC_HAS_ARC4RANDOM is not set +# HAVE_NO_SSP is not set +# UCLIBC_HAS_SSP is not set +UCLIBC_BUILD_RELRO=y +UCLIBC_BUILD_NOW=y +UCLIBC_BUILD_NOEXECSTACK=y + +# +# uClibc development/debugging options +# +CROSS_COMPILER_PREFIX="" +UCLIBC_EXTRA_CFLAGS="" +# DODEBUG is not set +# DODEBUG_PT is not set +DOSTRIP=n +# DOASSERTS is not set +# SUPPORT_LD_DEBUG is not set +# SUPPORT_LD_DEBUG_EARLY is not set +# UCLIBC_MALLOC_DEBUGGING is not set +WARNINGS="-Wall" +# EXTRA_WARNINGS is not set +# DOMULTI is not set +# UCLIBC_MJN3_ONLY is not set + +# math stuff for perl +DO_C99_MATH=y diff --git a/recipes/uclibc/uclibc-0.9.30.3/uClibc.machine.armv4t b/recipes/uclibc/uclibc-0.9.30.3/uClibc.machine.armv4t new file mode 100644 index 0000000000..898b73a33b --- /dev/null +++ b/recipes/uclibc/uclibc-0.9.30.3/uClibc.machine.armv4t @@ -0,0 +1,69 @@ +# +# Automatically generated make config: don't edit +# Mon May 14 10:23:14 2007 +# +# TARGET_alpha is not set +TARGET_arm=y +# TARGET_bfin is not set +# TARGET_cris is not set +# TARGET_e1 is not set +# TARGET_frv is not set +# TARGET_h8300 is not set +# TARGET_hppa is not set +# TARGET_i386 is not set +# TARGET_i960 is not set +# TARGET_ia64 is not set +# TARGET_m68k is not set +# TARGET_microblaze is not set +# TARGET_mips is not set +# TARGET_nios is not set +# TARGET_nios2 is not set +# TARGET_powerpc is not set +# TARGET_sh is not set +# TARGET_sh64 is not set +# TARGET_sparc is not set +# TARGET_v850 is not set +# TARGET_vax is not set +# TARGET_x86_64 is not set + +# +# Target Architecture Features and Options +# +TARGET_ARCH="arm" +FORCE_OPTIONS_FOR_ARCH=y +# CONFIG_ARM_OABI is not set +CONFIG_ARM_EABI=y +USE_BX=y +# CONFIG_GENERIC_ARM is not set +# CONFIG_ARM610 is not set +# CONFIG_ARM710 is not set +# CONFIG_ARM7TDMI is not set +# CONFIG_ARM720T is not set +CONFIG_ARM920T=y +# CONFIG_ARM922T is not set +# CONFIG_ARM926T is not set +# CONFIG_ARM10T is not set +# CONFIG_ARM1136JF_S is not set +# CONFIG_ARM1176JZ_S is not set +# CONFIG_ARM1176JZF_S is not set +# CONFIG_ARM_SA110 is not set +# CONFIG_ARM_SA1100 is not set +# CONFIG_ARM_XSCALE is not set +# CONFIG_ARM_IWMMXT is not set +TARGET_SUBARCH="" + +# +# Using ELF file format +# +ARCH_ANY_ENDIAN=y +ARCH_LITTLE_ENDIAN=y +# ARCH_WANTS_BIG_ENDIAN is not set +ARCH_WANTS_LITTLE_ENDIAN=y +ARCH_HAS_MMU=y +ARCH_USE_MMU=y +UCLIBC_HAS_FLOATS=y +# UCLIBC_HAS_FPU is not set +UCLIBC_HAS_SOFT_FLOAT=y +KERNEL_HEADERS="/usr/include" +HAVE_DOT_CONFIG=y + diff --git a/recipes/uclibc/uclibc-0.9.30.3/uClibc.machine.armv5te b/recipes/uclibc/uclibc-0.9.30.3/uClibc.machine.armv5te new file mode 100644 index 0000000000..ec0385bc0f --- /dev/null +++ b/recipes/uclibc/uclibc-0.9.30.3/uClibc.machine.armv5te @@ -0,0 +1,70 @@ +# +# Automatically generated make config: don't edit +# Sun May 13 11:16:02 2007 +# +# TARGET_alpha is not set +TARGET_arm=y +# TARGET_bfin is not set +# TARGET_cris is not set +# TARGET_e1 is not set +# TARGET_frv is not set +# TARGET_h8300 is not set +# TARGET_hppa is not set +# TARGET_i386 is not set +# TARGET_i960 is not set +# TARGET_ia64 is not set +# TARGET_m68k is not set +# TARGET_microblaze is not set +# TARGET_mips is not set +# TARGET_nios is not set +# TARGET_nios2 is not set +# TARGET_powerpc is not set +# TARGET_sh is not set +# TARGET_sh64 is not set +# TARGET_sparc is not set +# TARGET_v850 is not set +# TARGET_vax is not set +# TARGET_x86_64 is not set + +# +# Target Architecture Features and Options +# +TARGET_ARCH="arm" +FORCE_OPTIONS_FOR_ARCH=y +# CONFIG_ARM_OABI is not set +CONFIG_ARM_EABI=y +USE_BX=y +# CONFIG_GENERIC_ARM is not set +# CONFIG_ARM610 is not set +# CONFIG_ARM710 is not set +# CONFIG_ARM7TDMI is not set +# CONFIG_ARM720T is not set +# CONFIG_ARM920T is not set +# CONFIG_ARM922T is not set +# CONFIG_ARM926T is not set +# CONFIG_ARM10T is not set +# CONFIG_ARM1136JF_S is not set +# CONFIG_ARM1176JZ_S is not set +# CONFIG_ARM1176JZF_S is not set +# CONFIG_ARM_SA110 is not set +# CONFIG_ARM_SA1100 is not set +CONFIG_ARM_XSCALE=y +# CONFIG_ARM_IWMMXT is not set +TARGET_SUBARCH="" + +# +# Using ELF file format +# +ARCH_ANY_ENDIAN=y +ARCH_LITTLE_ENDIAN=y +# ARCH_WANTS_BIG_ENDIAN is not set +ARCH_WANTS_LITTLE_ENDIAN=y +ARCH_HAS_MMU=y +ARCH_USE_MMU=y +UCLIBC_HAS_FLOATS=y +# UCLIBC_HAS_FPU is not set +UCLIBC_HAS_SOFT_FLOAT=y +DO_C99_MATH=y +KERNEL_HEADERS="/data/build/koen/OE/build/tmp/angstrom/cross/arm-angstrom-linux-uclibcgnueabi/include" +HAVE_DOT_CONFIG=y + diff --git a/recipes/uclibc/uclibc-0.9.30.3/uClibc.machine.iwmmxt b/recipes/uclibc/uclibc-0.9.30.3/uClibc.machine.iwmmxt new file mode 100644 index 0000000000..e27931cf6b --- /dev/null +++ b/recipes/uclibc/uclibc-0.9.30.3/uClibc.machine.iwmmxt @@ -0,0 +1,70 @@ +# +# Automatically generated make config: don't edit +# Sat May 12 23:18:41 2007 +# +# TARGET_alpha is not set +TARGET_arm=y +# TARGET_bfin is not set +# TARGET_cris is not set +# TARGET_e1 is not set +# TARGET_frv is not set +# TARGET_h8300 is not set +# TARGET_hppa is not set +# TARGET_i386 is not set +# TARGET_i960 is not set +# TARGET_ia64 is not set +# TARGET_m68k is not set +# TARGET_microblaze is not set +# TARGET_mips is not set +# TARGET_nios is not set +# TARGET_nios2 is not set +# TARGET_powerpc is not set +# TARGET_sh is not set +# TARGET_sh64 is not set +# TARGET_sparc is not set +# TARGET_v850 is not set +# TARGET_vax is not set +# TARGET_x86_64 is not set + +# +# Target Architecture Features and Options +# +TARGET_ARCH="arm" +FORCE_OPTIONS_FOR_ARCH=y +# CONFIG_ARM_OABI is not set +CONFIG_ARM_EABI=y +USE_BX=y +# CONFIG_GENERIC_ARM is not set +# CONFIG_ARM610 is not set +# CONFIG_ARM710 is not set +# CONFIG_ARM7TDMI is not set +# CONFIG_ARM720T is not set +# CONFIG_ARM920T is not set +# CONFIG_ARM922T is not set +# CONFIG_ARM926T is not set +# CONFIG_ARM10T is not set +# CONFIG_ARM1136JF_S is not set +# CONFIG_ARM1176JZ_S is not set +# CONFIG_ARM1176JZF_S is not set +# CONFIG_ARM_SA110 is not set +# CONFIG_ARM_SA1100 is not set +# CONFIG_ARM_XSCALE is not set +CONFIG_ARM_IWMMXT=y +TARGET_SUBARCH="" + +# +# Using ELF file format +# +ARCH_ANY_ENDIAN=y +ARCH_LITTLE_ENDIAN=y +# ARCH_WANTS_BIG_ENDIAN is not set +ARCH_WANTS_LITTLE_ENDIAN=y +ARCH_HAS_MMU=y +ARCH_USE_MMU=y +UCLIBC_HAS_FLOATS=y +# UCLIBC_HAS_FPU is not set +UCLIBC_HAS_SOFT_FLOAT=y +DO_C99_MATH=y +KERNEL_HEADERS="/usr/include" +HAVE_DOT_CONFIG=y + diff --git a/recipes/uclibc/uclibc-0.9.30.3/uClibc.machine.strongarm b/recipes/uclibc/uclibc-0.9.30.3/uClibc.machine.strongarm new file mode 100644 index 0000000000..6e89444a64 --- /dev/null +++ b/recipes/uclibc/uclibc-0.9.30.3/uClibc.machine.strongarm @@ -0,0 +1,70 @@ +# +# Automatically generated make config: don't edit +# Sun May 13 11:29:51 2007 +# +# TARGET_alpha is not set +TARGET_arm=y +# TARGET_bfin is not set +# TARGET_cris is not set +# TARGET_e1 is not set +# TARGET_frv is not set +# TARGET_h8300 is not set +# TARGET_hppa is not set +# TARGET_i386 is not set +# TARGET_i960 is not set +# TARGET_ia64 is not set +# TARGET_m68k is not set +# TARGET_microblaze is not set +# TARGET_mips is not set +# TARGET_nios is not set +# TARGET_nios2 is not set +# TARGET_powerpc is not set +# TARGET_sh is not set +# TARGET_sh64 is not set +# TARGET_sparc is not set +# TARGET_v850 is not set +# TARGET_vax is not set +# TARGET_x86_64 is not set + +# +# Target Architecture Features and Options +# +TARGET_ARCH="arm" +FORCE_OPTIONS_FOR_ARCH=y +CONFIG_ARM_OABI=y +# CONFIG_ARM_EABI is not set +# USE_BX is not set +# CONFIG_GENERIC_ARM is not set +# CONFIG_ARM610 is not set +# CONFIG_ARM710 is not set +# CONFIG_ARM7TDMI is not set +# CONFIG_ARM720T is not set +# CONFIG_ARM920T is not set +# CONFIG_ARM922T is not set +# CONFIG_ARM926T is not set +# CONFIG_ARM10T is not set +# CONFIG_ARM1136JF_S is not set +# CONFIG_ARM1176JZ_S is not set +# CONFIG_ARM1176JZF_S is not set +# CONFIG_ARM_SA110 is not set +CONFIG_ARM_SA1100=y +# CONFIG_ARM_XSCALE is not set +# CONFIG_ARM_IWMMXT is not set +TARGET_SUBARCH="" + +# +# Using ELF file format +# +ARCH_ANY_ENDIAN=y +ARCH_LITTLE_ENDIAN=y +# ARCH_WANTS_BIG_ENDIAN is not set +ARCH_WANTS_LITTLE_ENDIAN=y +ARCH_HAS_MMU=y +ARCH_USE_MMU=y +UCLIBC_HAS_FLOATS=y +# UCLIBC_HAS_FPU is not set +UCLIBC_HAS_SOFT_FLOAT=y +DO_C99_MATH=y +KERNEL_HEADERS="/usr/include" +HAVE_DOT_CONFIG=y + diff --git a/recipes/uclibc/uclibc-0.9.30.3/wrap/uClibc.machine b/recipes/uclibc/uclibc-0.9.30.3/wrap/uClibc.machine new file mode 100644 index 0000000000..3dcf4b1b69 --- /dev/null +++ b/recipes/uclibc/uclibc-0.9.30.3/wrap/uClibc.machine @@ -0,0 +1,73 @@ +# +# Automatically generated make config: don't edit +# Version: 0.9.30 +# Mon Mar 16 21:38:28 2009 +# +# TARGET_alpha is not set +# TARGET_arm is not set +# TARGET_avr32 is not set +# TARGET_bfin is not set +# TARGET_cris is not set +# TARGET_e1 is not set +# TARGET_frv is not set +# TARGET_h8300 is not set +# TARGET_hppa is not set +TARGET_i386=y +# TARGET_i960 is not set +# TARGET_ia64 is not set +# TARGET_m68k is not set +# TARGET_microblaze is not set +# TARGET_mips is not set +# TARGET_nios is not set +# TARGET_nios2 is not set +# TARGET_powerpc is not set +# TARGET_sh is not set +# TARGET_sh64 is not set +# TARGET_sparc is not set +# TARGET_v850 is not set +# TARGET_vax is not set +# TARGET_x86_64 is not set +# TARGET_xtensa is not set + +# +# Target Architecture Features and Options +# +TARGET_ARCH="i386" +FORCE_OPTIONS_FOR_ARCH=y +# CONFIG_GENERIC_386 is not set +# CONFIG_386 is not set +CONFIG_486=y +# CONFIG_586 is not set +# CONFIG_586MMX is not set +# CONFIG_686 is not set +# CONFIG_PENTIUMII is not set +# CONFIG_PENTIUMIII is not set +# CONFIG_PENTIUM4 is not set +# CONFIG_K6 is not set +# CONFIG_K7 is not set +# CONFIG_ELAN is not set +# CONFIG_CRUSOE is not set +# CONFIG_WINCHIPC6 is not set +# CONFIG_WINCHIP2 is not set +# CONFIG_CYRIXIII is not set +# CONFIG_NEHEMIAH is not set +TARGET_SUBARCH="" + +# +# Using ELF file format +# +ARCH_LITTLE_ENDIAN=y + +# +# Using Little Endian +# +ARCH_HAS_MMU=y +ARCH_USE_MMU=y +UCLIBC_HAS_FLOATS=y +UCLIBC_HAS_FPU=y +DO_C99_MATH=y +UCLIBC_HAS_FENV=y +UCLIBC_HAS_LONG_DOUBLE_MATH=y +KERNEL_HEADERS="/usr/include" +HAVE_DOT_CONFIG=y + diff --git a/recipes/uclibc/uclibc-0.9.30.3/x86/uClibc.machine b/recipes/uclibc/uclibc-0.9.30.3/x86/uClibc.machine new file mode 100644 index 0000000000..6cd19e851e --- /dev/null +++ b/recipes/uclibc/uclibc-0.9.30.3/x86/uClibc.machine @@ -0,0 +1,72 @@ +# +# Automatically generated make config: don't edit +# Version: 0.9.30.1 +# Wed Jul 1 17:04:32 2009 +# +# TARGET_alpha is not set +# TARGET_arm is not set +# TARGET_avr32 is not set +# TARGET_bfin is not set +# TARGET_cris is not set +# TARGET_e1 is not set +# TARGET_frv is not set +# TARGET_h8300 is not set +# TARGET_hppa is not set +TARGET_i386=y +# TARGET_i960 is not set +# TARGET_ia64 is not set +# TARGET_m68k is not set +# TARGET_microblaze is not set +# TARGET_mips is not set +# TARGET_nios is not set +# TARGET_nios2 is not set +# TARGET_powerpc is not set +# TARGET_sh is not set +# TARGET_sh64 is not set +# TARGET_sparc is not set +# TARGET_v850 is not set +# TARGET_vax is not set +# TARGET_x86_64 is not set +# TARGET_xtensa is not set + +# +# Target Architecture Features and Options +# +TARGET_ARCH="i386" +FORCE_OPTIONS_FOR_ARCH=y +CONFIG_GENERIC_386=y +# CONFIG_386 is not set +# CONFIG_486 is not set +# CONFIG_586 is not set +# CONFIG_586MMX is not set +# CONFIG_686 is not set +# CONFIG_PENTIUMII is not set +# CONFIG_PENTIUMIII is not set +# CONFIG_PENTIUM4 is not set +# CONFIG_K6 is not set +# CONFIG_K7 is not set +# CONFIG_ELAN is not set +# CONFIG_CRUSOE is not set +# CONFIG_WINCHIPC6 is not set +# CONFIG_WINCHIP2 is not set +# CONFIG_CYRIXIII is not set +# CONFIG_NEHEMIAH is not set +TARGET_SUBARCH="" + +# +# Using ELF file format +# +ARCH_LITTLE_ENDIAN=y + +# +# Using Little Endian +# +ARCH_HAS_MMU=y +ARCH_USE_MMU=y +UCLIBC_HAS_FLOATS=y +UCLIBC_HAS_FPU=y +DO_C99_MATH=y +# UCLIBC_HAS_FENV is not set +UCLIBC_HAS_LONG_DOUBLE_MATH=y +KERNEL_HEADERS="/bla" +HAVE_DOT_CONFIG=y diff --git a/recipes/uclibc/uclibc-initial_0.9.30.3.bb b/recipes/uclibc/uclibc-initial_0.9.30.3.bb new file mode 100644 index 0000000000..a9fa146023 --- /dev/null +++ b/recipes/uclibc/uclibc-initial_0.9.30.3.bb @@ -0,0 +1,26 @@ +SECTION = "base" +require uclibc_${PV}.bb + +DEPENDS = "linux-libc-headers ncurses-native virtual/${TARGET_PREFIX}gcc-initial" +PROVIDES = "virtual/${TARGET_PREFIX}libc-initial" +PACKAGES = "" + +do_install() { + # Install initial headers into the cross dir + make V=1 CC="${CC}" PREFIX=${D} DEVEL_PREFIX=${prefix}/ RUNTIME_PREFIX=/ \ + install_headers + #ln -sf include ${CROSS_DIR}/${TARGET_SYS}/sys-include + + # This conflicts with the c++ version of this header + rm -f ${D}${includedir}/bits/atomicity.h + install -d ${D}${libdir}/ + install -m 644 lib/crt[1in].o ${D}${libdir}/ + install -m 644 lib/libc.so ${D}${libdir}/ +} + +do_compile () { + make V=1 CC="${CC}" PREFIX=${D} DEVEL_PREFIX=${prefix}/ RUNTIME_PREFIX=/ \ + lib/crt1.o lib/crti.o lib/crtn.o + ${CC} -nostdlib -nostartfiles -shared -x c /dev/null \ + -o lib/libc.so +} diff --git a/recipes/uclibc/uclibc_0.9.30.3.bb b/recipes/uclibc/uclibc_0.9.30.3.bb new file mode 100644 index 0000000000..fa6c3c55f8 --- /dev/null +++ b/recipes/uclibc/uclibc_0.9.30.3.bb @@ -0,0 +1,32 @@ +# UCLIBC_BASE should be the latest released revision of uclibc (that way +# the config files will typically be correct!) uclibc-cvs takes precedence +# over uclibc-${UCLIBC_BASE}, if a config file in uclibc-cvs is out of date +# try removing it +# +# UCLIBC_BASE can be set in a distro file, but whether this works depends +# on whether the base patches apply to the selected (SRCDATE) svn release. +# +UCLIBC_BASE ?= "0.9.30.3" + +require uclibc.inc +PR = "${INC_PR}.0" + +PROVIDES += "virtual/${TARGET_PREFIX}libc-for-gcc" + +SRC_URI += "file://uClibc.machine file://uClibc.distro \ + file://ldso_use_arm_dl_linux_resolve_in_thumb_mode.patch;patch=1 \ + " +SRC_URI[uClibc-0.9.30.2.md5sum] = "e759ec855500082ac3e671dd6cacfdb0" +SRC_URI[uClibc-0.9.30.2.sha256sum] = "ab6e92c91e2f8fad182d3b624b87d6cbf53072678d8fc31ad73e6abd3c852473" + +#recent versions uclibc require real kernel headers +PACKAGE_ARCH = "${MACHINE_ARCH}" + +#as stated above, uclibc needs real kernel-headers +#however: we can't depend on virtual/kernel when nptl hits due to depends deadlocking .... +KERNEL_SOURCE = "${STAGING_DIR_HOST}/${exec_prefix}" + +S = "${WORKDIR}/uClibc-${UCLIBC_BASE}" +SRC_URI[uClibc-0.9.30.3.md5sum] = "73a4bf4a0fa508b01a7a3143574e3d21" +SRC_URI[uClibc-0.9.30.3.sha256sum] = "107c3ac914e9a670a9f501519ed89a647e05e48dc4c474dc3d7cddaa78bb2e38" + -- cgit v1.2.3 From eea3c6d325f8048c87d9744a6dc0becd82b2957f Mon Sep 17 00:00:00 2001 From: Philip Balister Date: Sat, 13 Mar 2010 05:36:31 -0500 Subject: boost_1.34.1 : Remove INC_PR. This recipe does not use an include file. --- recipes/boost/boost_1.34.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/boost/boost_1.34.1.bb b/recipes/boost/boost_1.34.1.bb index 5f351d6ed9..3e1b282b03 100644 --- a/recipes/boost/boost_1.34.1.bb +++ b/recipes/boost/boost_1.34.1.bb @@ -9,7 +9,7 @@ PRIORITY = "optional" LICENSE = "Boost Software License" DEPENDS = "python boost-jam-native zlib bzip2" -PR = "${INC_PR}.1" +PR = "6" SRC_URI = "\ ${SOURCEFORGE_MIRROR}/boost/${BOOST_P}.tar.bz2 \ -- cgit v1.2.3 From e59a08839ee428f7548ff4e6eb01ebb64f2cd6ee Mon Sep 17 00:00:00 2001 From: Philip Balister Date: Sat, 13 Mar 2010 07:42:04 -0500 Subject: boost-1.37 : Add recipe for version 1.37 of boost. * DEFAULT_PREFERENCE = "-1" until we check for impact on other recipes. Boost API changes a lot so difficult to manage recipes. --- recipes/boost/boost_1.37.0.bb | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 recipes/boost/boost_1.37.0.bb diff --git a/recipes/boost/boost_1.37.0.bb b/recipes/boost/boost_1.37.0.bb new file mode 100644 index 0000000000..f21100e62f --- /dev/null +++ b/recipes/boost/boost_1.37.0.bb @@ -0,0 +1,20 @@ +include boost-36.inc + +DEFAULT_PREFERENCE = "-1" + +PR = "${INC_PR}.1" + +SRC_URI = "${SOURCEFORGE_MIRROR}/boost/${BOOST_P}.tar.bz2;name=boost1370tarbz2 \ + file://arm-intrinsics.patch;patch=1 \ + file://02-atomic-count-pthreads-on-arm.patch;patch=1 \ + file://uclibc.patch;patch=1 \ + file://sscanf.patch;patch=1 \ + " + +SRC_URI[boost1370tarbz2.md5sum] = "8d9f990bfb7e83769fa5f1d6f065bc92" +SRC_URI[boost1370tarbz2.sha256sum] = "d52ef49f70b1b9addc4e0d1a3a2a1966227f0d173c3301bac3e6d399eeac5472" + +BJAM_OPTS = '${BJAM_TOOLS} \ + --builddir=${S}/${TARGET_SYS} \ + ${BJAM_EXTRA}' + -- cgit v1.2.3 From 01d8a674763adb95348e45c03c5b0987285cd0a9 Mon Sep 17 00:00:00 2001 From: Michael 'Mickey' Lauer Date: Sat, 13 Mar 2010 17:21:05 +0100 Subject: zhone2: new recipe; demo UI for FSO --- conf/distro/include/fso-autorev.inc | 2 ++ recipes/freesmartphone/zhone2_git.bb | 13 +++++++++++++ 2 files changed, 15 insertions(+) create mode 100644 recipes/freesmartphone/zhone2_git.bb diff --git a/conf/distro/include/fso-autorev.inc b/conf/distro/include/fso-autorev.inc index cd258640fb..fe231d6be6 100644 --- a/conf/distro/include/fso-autorev.inc +++ b/conf/distro/include/fso-autorev.inc @@ -45,3 +45,5 @@ SRCREV_pn-vala-dbus-binding-tool = "${AUTOREV}" SRCREV_pn-vala-native = "${AUTOREV}" SRCREV_pn-vala = "${AUTOREV}" SRCREV_pn-zhone = "${AUTOREV}" +SRCREV_pn-zhone2 = "${AUTOREV}" + diff --git a/recipes/freesmartphone/zhone2_git.bb b/recipes/freesmartphone/zhone2_git.bb new file mode 100644 index 0000000000..6c1a2e6e68 --- /dev/null +++ b/recipes/freesmartphone/zhone2_git.bb @@ -0,0 +1,13 @@ +DESCRIPTION = "A demo phone application based on FSO" +AUTHOR = "Michael 'Mickey' Lauer " +HOMEPAGE = "http://www.freesmartphone.org" +SECTION = "x11" +LICENSE = "GPLv2" +DEPENDS = "edje-native vala-native evas ecore edje libeflvala" +PV = "2.0.0+gitr${SRCREV}" +PR = "r0" + +SRC_URI = "${FREESMARTPHONE_GIT}/aurora.git;protocol=git;branch=master" +S = "${WORKDIR}/git/zhone2" + +inherit autotools_stage -- cgit v1.2.3 From 20a01a4f6edec5f9088098b51a2e9a624f7873d2 Mon Sep 17 00:00:00 2001 From: Michael 'Mickey' Lauer Date: Sun, 14 Mar 2010 14:28:36 +0100 Subject: zhone2: add FSO dependencies --- recipes/freesmartphone/zhone2_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/freesmartphone/zhone2_git.bb b/recipes/freesmartphone/zhone2_git.bb index 6c1a2e6e68..eb19fbaeec 100644 --- a/recipes/freesmartphone/zhone2_git.bb +++ b/recipes/freesmartphone/zhone2_git.bb @@ -3,7 +3,7 @@ AUTHOR = "Michael 'Mickey' Lauer " HOMEPAGE = "http://www.freesmartphone.org" SECTION = "x11" LICENSE = "GPLv2" -DEPENDS = "edje-native vala-native evas ecore edje libeflvala" +DEPENDS = "edje-native vala-native evas ecore edje libeflvala libfsobasics libfsoframework libfso-glib" PV = "2.0.0+gitr${SRCREV}" PR = "r0" -- cgit v1.2.3 From 6fedad5a852c331289aa3acd56a838ec66089ec1 Mon Sep 17 00:00:00 2001 From: Michael 'Mickey' Lauer Date: Sun, 14 Mar 2010 14:27:37 +0100 Subject: android-image-utils-native: new recipe; image utilities to build kernels for android machines --- conf/distro/include/fso-autorev.inc | 2 ++ recipes/android/android-image-utils-native_git.bb | 19 +++++++++++++++++++ 2 files changed, 21 insertions(+) create mode 100644 recipes/android/android-image-utils-native_git.bb diff --git a/conf/distro/include/fso-autorev.inc b/conf/distro/include/fso-autorev.inc index fe231d6be6..cb02400e2f 100644 --- a/conf/distro/include/fso-autorev.inc +++ b/conf/distro/include/fso-autorev.inc @@ -1,4 +1,5 @@ # FSO +SRCREV_pn-android-image-utils-native = "${AUTOREV}" SRCREV_pn-dbus-hlid = "${AUTOREV}" SRCREV_pn-frameworkd = "${AUTOREV}" SRCREV_pn-frameworkd-devel = "${AUTOREV}" @@ -21,6 +22,7 @@ SRCREV_pn-fso-specs = "${AUTOREV}" SRCREV_pn-gsmd2 = "${AUTOREV}" SRCREV_pn-illume-theme-freesmartphone = "${AUTOREV}" SRCREV_pn-libascenario = "${AUTOREV}" +SRCREV_pn-libeflvala = "${AUTOREV}" SRCREV_pn-libfsobasics = "${AUTOREV}" SRCREV_pn-libfsoframework = "${AUTOREV}" SRCREV_pn-libfsoresource = "${AUTOREV}" diff --git a/recipes/android/android-image-utils-native_git.bb b/recipes/android/android-image-utils-native_git.bb new file mode 100644 index 0000000000..3b39886278 --- /dev/null +++ b/recipes/android/android-image-utils-native_git.bb @@ -0,0 +1,19 @@ +DESCRIPTION = "Android Image Creation and Booting Utilities" +SECTION = "console/utils" +LICENSE = "GPL" +PV = "1.0+gitr${SRCREV}" +PR = "r0" + +SRC_URI = "\ + ${FREESMARTPHONE_GIT}/utilities.git;protocol=git;branch=master \ +" +S = "${WORKDIR}/git/android/image-utils" + +inherit autotools_stage native + +do_deploy () { + install -d ${DEPLOY_DIR_IMAGE} + install -m 0755 fastboot ${DEPLOY_DIR_IMAGE} +} +do_deploy[dirs] = "${S}" +addtask deploy before do_build after do_compile -- cgit v1.2.3 From 6615eb994476c9c8e96dd8a00b76af90deb313a3 Mon Sep 17 00:00:00 2001 From: Michael 'Mickey' Lauer Date: Sun, 14 Mar 2010 15:00:46 +0100 Subject: android-image-utils-native: fix deploying fastboot binary --- recipes/android/android-image-utils-native_git.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipes/android/android-image-utils-native_git.bb b/recipes/android/android-image-utils-native_git.bb index 3b39886278..489a69349a 100644 --- a/recipes/android/android-image-utils-native_git.bb +++ b/recipes/android/android-image-utils-native_git.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Android Image Creation and Booting Utilities" SECTION = "console/utils" LICENSE = "GPL" PV = "1.0+gitr${SRCREV}" -PR = "r0" +PR = "r1" SRC_URI = "\ ${FREESMARTPHONE_GIT}/utilities.git;protocol=git;branch=master \ @@ -12,8 +12,8 @@ S = "${WORKDIR}/git/android/image-utils" inherit autotools_stage native do_deploy () { - install -d ${DEPLOY_DIR_IMAGE} - install -m 0755 fastboot ${DEPLOY_DIR_IMAGE} + install -d ${DEPLOY_DIR_TOOLS} + install -m 0755 fastboot/fastboot ${DEPLOY_DIR_TOOLS} } do_deploy[dirs] = "${S}" addtask deploy before do_build after do_compile -- cgit v1.2.3 From e0a5c66df54995c23976707a157537a50d83fc4c Mon Sep 17 00:00:00 2001 From: Michael 'Mickey' Lauer Date: Sun, 14 Mar 2010 15:16:12 +0100 Subject: linux-leviathan: depend on android-image-utils and prepare kernel image that can be booted via fastboot --- recipes/linux/linux-leviathan_git.bb | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/recipes/linux/linux-leviathan_git.bb b/recipes/linux/linux-leviathan_git.bb index 8ea4bfbb7b..a14fb21092 100644 --- a/recipes/linux/linux-leviathan_git.bb +++ b/recipes/linux/linux-leviathan_git.bb @@ -1,10 +1,10 @@ require linux.inc +DEPENDS = "android-image-utils-native" PV = "2.6.32+${PR}+gitr${SRCREV}" -PR = "r0" +PR = "r1" COMPATIBLE_MACHINE = "htcdream" -# CMDLINE is irrelevant on this hardware as we need a special userland tool to cook the image CMDLINE = "console=tty0 no_console_suspend=1 root=/dev/mmcblk0p1 rootdelay=8 fbcon=rotate:1 panic=30 mem=110M" SRCREV_LAST_GOOD = "deabc32225429b3c0db44f7e62d95d0d2525290b" @@ -15,3 +15,11 @@ SRC_URI = "\ file://defconfig \ " S = "${WORKDIR}/git" + +do_deploy_append() { + touch -f empty + mkbootimg --kernel ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.bin \ + --ramdisk empty \ + --cmdline '"${CMDLINE}"' \ + --output ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.fastboot +} -- cgit v1.2.3 From a2da6e643c38721d676ea6dfb31181da8f000522 Mon Sep 17 00:00:00 2001 From: Michael 'Mickey' Lauer Date: Sun, 14 Mar 2010 15:32:02 +0100 Subject: linux-leviathan: remove bogus ' characters that disturb mkbootimg --- recipes/linux/linux-leviathan_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/linux/linux-leviathan_git.bb b/recipes/linux/linux-leviathan_git.bb index a14fb21092..2510a90bdb 100644 --- a/recipes/linux/linux-leviathan_git.bb +++ b/recipes/linux/linux-leviathan_git.bb @@ -20,6 +20,6 @@ do_deploy_append() { touch -f empty mkbootimg --kernel ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.bin \ --ramdisk empty \ - --cmdline '"${CMDLINE}"' \ + --cmdline "${CMDLINE}" \ --output ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.fastboot } -- cgit v1.2.3 From 5a77cf7d7df8155b96bbbf29a21f4de76daa1214 Mon Sep 17 00:00:00 2001 From: Klaus Kurzmann Date: Sun, 14 Mar 2010 20:00:23 +0100 Subject: sane-srcrev-fso.inc: bump rev of libframeworkd-glib Signed-off-by: Klaus Kurzmann --- conf/distro/include/sane-srcrevs-fso.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/distro/include/sane-srcrevs-fso.inc b/conf/distro/include/sane-srcrevs-fso.inc index 2ff99cb370..200ef6aa6f 100644 --- a/conf/distro/include/sane-srcrevs-fso.inc +++ b/conf/distro/include/sane-srcrevs-fso.inc @@ -33,7 +33,7 @@ SRCREV_pn-fso-sounds ?= "3a4767ec01988bd0fd8f72f0c35d6d36e5fbc815" SRCREV_pn-fso-specs ?= "bd8a5d1cf461c6633ddc8f4c91a1101ec835faad" SRCREV_pn-gsmd2 ?= "c16883a079aeff8780e5d461ec4e8348537ab4d8" SRCREV_pn-libfso-glib ?= "a1f2f14946ad154c5fb842fadf081fe377bd9924" -SRCREV_pn-libframeworkd-glib ?= "67e300e32f4b546ba23163109cbab68be8c70ce9" +SRCREV_pn-libframeworkd-glib ?= "1b4c0e21a6fec2c1952deb2bfeb2d85b924c3c36" SRCREV_pn-libgsm0710 ?= "52eea64bdbb79c09002b46e98a5e656509884f72" SRCREV_pn-libpersistence ?= "217ad803745f8ac1f3c72c6715e2c0faefb3fd06" FSO_PYTHONHELPERS_SRCREV ?= "63b1dff1bc8ac22efabcee8a90e957c3b2423317" -- cgit v1.2.3 From f86ca9a3415a7063e3d60d2d7810ac4928e8c9e6 Mon Sep 17 00:00:00 2001 From: Michael 'Mickey' Lauer Date: Sun, 14 Mar 2010 20:52:24 +0100 Subject: elementary: packaging updates --- recipes/efl1/elementary_svn.bb | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/recipes/efl1/elementary_svn.bb b/recipes/efl1/elementary_svn.bb index db75d52160..e3a1e91ee5 100644 --- a/recipes/efl1/elementary_svn.bb +++ b/recipes/efl1/elementary_svn.bb @@ -6,32 +6,42 @@ PR = "r7" inherit efl -EXTRA_OECONF = " \ - --with-eet-eet=${STAGING_BINDIR_NATIVE}/eet \ - --with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc \ +EXTRA_OECONF = "\ + --with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc \ + --with-eet-eet=${STAGING_BINDIR_NATIVE}/eet \ " SRC_URI = "svn://svn.enlightenment.org/svn/e/trunk/TMP/st;module=elementary;proto=http" S = "${WORKDIR}/elementary" -RDEPENDS_${PN} = "elementary-themes" -RSUGGESTS_${PN} = "elementary-tests" - do_compile_append() { sed -i -e s:${STAGING_DIR_TARGET}::g \ -e s:/${TARGET_SYS}::g \ elementary.pc } +PACKAGES =+ "${PN}-configs" + +RDEPENDS_${PN} = "\ + elementary-themes \ + elementary-configs \ +" +RSUGGESTS_${PN} = "elementary-tests" + FILES_${PN}-themes = "\ ${datadir}/elementary/themes \ " +FILES_${PN}-configs = "\ + ${datadir}/elementary/config \ +" + FILES_${PN}-tests = "\ ${bindir}/elementary* \ ${datadir}/elementary/images \ ${datadir}/elementary/objects \ ${datadir}/applications/* \ ${datadir}/icons/* \ + ${libdir}/elementary/modules/test_entry/* \ " -- cgit v1.2.3 From 64eae2b3c9e74a84a3f27ed68bdd91e2da7a3b5b Mon Sep 17 00:00:00 2001 From: Michael 'Mickey' Lauer Date: Sun, 14 Mar 2010 20:52:30 +0100 Subject: ecore: add patch that fixes the ecore-fb touchscreen initialization With this patch, we have a working touchscreen in framebuffer mode again --- recipes/efl1/ecore.inc | 6 ++--- .../efl1/ecore/fix-ecore-fb-initialization.patch | 29 ++++++++++++++++++++++ recipes/efl1/ecore_svn.bb | 11 ++++---- 3 files changed, 38 insertions(+), 8 deletions(-) create mode 100644 recipes/efl1/ecore/fix-ecore-fb-initialization.patch diff --git a/recipes/efl1/ecore.inc b/recipes/efl1/ecore.inc index ef3ba55d55..69d3f7607c 100644 --- a/recipes/efl1/ecore.inc +++ b/recipes/efl1/ecore.inc @@ -5,10 +5,12 @@ DEPENDS = "gettext-native virtual/libiconv curl eet evas tslib glib-2.0 \ # optional # DEPENDS += "directfb libsdl-x11 openssl virtual/libiconv" PV = "0.9.9.060+svnr${SRCPV}" -PR = "r3" +PR = "r4" inherit efl +SRC_URI += "file://fix-ecore-fb-initialization.patch;patch=1" + do_configure_prepend() { touch ${S}/po/Makefile.in.in || true sed -i -e 's: po::g' ${S}/Makefile.am @@ -71,5 +73,3 @@ FILES_${PN}-txt = "${libdir}/libecore_txt*.so.*" FILES_${PN}-x = "${libdir}/libecore_x*.so.*" FILES_${PN}-input = "${libdir}/libecore_input*.so.*" - - diff --git a/recipes/efl1/ecore/fix-ecore-fb-initialization.patch b/recipes/efl1/ecore/fix-ecore-fb-initialization.patch new file mode 100644 index 0000000000..2ac61ca63c --- /dev/null +++ b/recipes/efl1/ecore/fix-ecore-fb-initialization.patch @@ -0,0 +1,29 @@ +# +# The whole ecore-fb init logic is somewhat flawed; with this patch we +# get at least a working touchscreen w/ tslib again. +# +# Signed-off-by: Michael 'Mickey' Lauer +# + +Index: ecore/src/lib/ecore_fb/ecore_fb.c +=================================================================== +--- ecore.orig/src/lib/ecore_fb/ecore_fb.c ++++ ecore/src/lib/ecore_fb/ecore_fb.c +@@ -46,6 +46,9 @@ + + if (!ecore_fb_vt_init()) + return --_ecore_fb_init_count; ++ ++ if (!ecore_fb_ts_init()) ++ return --_ecore_fb_init_count; + + ECORE_FB_EVENT_KEY_DOWN = ecore_event_type_new(); + ECORE_FB_EVENT_KEY_UP = ecore_event_type_new(); +@@ -70,6 +73,7 @@ + if (--_ecore_fb_init_count != 0) + return _ecore_fb_init_count; + ++ ecore_fb_ts_shutdown(); + ecore_fb_vt_shutdown(); + + return _ecore_fb_init_count; diff --git a/recipes/efl1/ecore_svn.bb b/recipes/efl1/ecore_svn.bb index 2354673eb3..6fc4676214 100644 --- a/recipes/efl1/ecore_svn.bb +++ b/recipes/efl1/ecore_svn.bb @@ -1,10 +1,11 @@ require ecore.inc -PR = "r7" +PR = "r8" -SRC_URI += "file://iconv.patch;patch=1;maxrev=43996 \ - file://exit_uclibc_dns.patch;patch=1;maxrev=47076 \ - file://exit_uclibc.patch;patch=1 \ - " +SRC_URI += "\ + file://iconv.patch;patch=1;maxrev=43996 \ + file://exit_uclibc_dns.patch;patch=1;maxrev=47076 \ + file://exit_uclibc.patch;patch=1 \ +" EXTRA_OECONF = "\ --x-includes=${STAGING_INCDIR}/X11 \ -- cgit v1.2.3 From e32f710d17793c2412e69199c0d8b74424f720c6 Mon Sep 17 00:00:00 2001 From: Michael 'Mickey' Lauer Date: Sun, 14 Mar 2010 20:59:12 +0100 Subject: pointercal: add data for htc-msm7 devices --- recipes/pointercal/files/htc-msm7/pointercal | 1 + recipes/pointercal/pointercal_0.0.bb | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 recipes/pointercal/files/htc-msm7/pointercal diff --git a/recipes/pointercal/files/htc-msm7/pointercal b/recipes/pointercal/files/htc-msm7/pointercal new file mode 100644 index 0000000000..1eaf01013a --- /dev/null +++ b/recipes/pointercal/files/htc-msm7/pointercal @@ -0,0 +1 @@ +5881 -59 243084 -214 5990 -70204 65536 diff --git a/recipes/pointercal/pointercal_0.0.bb b/recipes/pointercal/pointercal_0.0.bb index dfe5863726..d98a78f66e 100644 --- a/recipes/pointercal/pointercal_0.0.bb +++ b/recipes/pointercal/pointercal_0.0.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Touchscreen calibration data" SECTION = "base" -PR = "r19" +PR = "r20" SRC_URI = "file://pointercal" S = "${WORKDIR}" -- cgit v1.2.3 From 2d6f65949cb6fbf7c3ee77a9383e54126c84b3b7 Mon Sep 17 00:00:00 2001 From: Michael 'Mickey' Lauer Date: Sun, 14 Mar 2010 21:00:41 +0100 Subject: tslib: add configuration for htc-msm7 devices --- recipes/tslib/tslib/htc-msm7/ts.conf | 25 +++++++++++++++++++++++++ recipes/tslib/tslib/htc-msm7/tslib.sh | 7 +++++++ recipes/tslib/tslib_1.0.bb | 2 +- 3 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 recipes/tslib/tslib/htc-msm7/ts.conf create mode 100644 recipes/tslib/tslib/htc-msm7/tslib.sh diff --git a/recipes/tslib/tslib/htc-msm7/ts.conf b/recipes/tslib/tslib/htc-msm7/ts.conf new file mode 100644 index 0000000000..1b0da937e8 --- /dev/null +++ b/recipes/tslib/tslib/htc-msm7/ts.conf @@ -0,0 +1,25 @@ +# Uncomment if you wish to use the linux input layer event interface +module_raw input + +# Uncomment if you're using a Sharp Zaurus SL-5500/SL-5000d +# module_raw collie + +# Uncomment if you're using a Sharp Zaurus SL-C700/C750/C760/C860 +# module_raw corgi + +# Uncomment if you're using a device with a UCB1200/1300/1400 TS interface +# module_raw ucb1x00 + +# Uncomment if you're using an HP iPaq h3600 or similar +# module_raw h3600 + +# Uncomment if you're using a Hitachi Webpad +# module_raw mk712 + +# Uncomment if you're using an IBM Arctic II +# module_raw arctic2 + +module pthres pmin=1 +module variance delta=30 +module dejitter delta=100 +module linear diff --git a/recipes/tslib/tslib/htc-msm7/tslib.sh b/recipes/tslib/tslib/htc-msm7/tslib.sh new file mode 100644 index 0000000000..d6141f8d66 --- /dev/null +++ b/recipes/tslib/tslib/htc-msm7/tslib.sh @@ -0,0 +1,7 @@ +#!/bin/sh + +# FIXME: Use /dev/input/touchscreen, once we have this logic on all hotplug system +# Yes, hardcoding the event node is wrong, will fix this eventually +TSLIB_TSDEVICE=/dev/input/event1 + +export TSLIB_TSDEVICE diff --git a/recipes/tslib/tslib_1.0.bb b/recipes/tslib/tslib_1.0.bb index 58a0e35bd1..4c2a56c435 100644 --- a/recipes/tslib/tslib_1.0.bb +++ b/recipes/tslib/tslib_1.0.bb @@ -2,6 +2,6 @@ SRC_URI = "http://download.berlios.de/tslib/${BP}.tar.bz2 \ file://fix_version.patch;patch=1 \ file://tslib-nopressure.patch;patch=1 \ file://tslib-pluginsld.patch;patch=1" -PR = "${INC_PR}.3" +PR = "${INC_PR}.4" include tslib.inc -- cgit v1.2.3 From 7d8cd6b4ed5f94411ea4d0a3f901c99c5b9f4364 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Sun, 14 Mar 2010 13:27:49 +0000 Subject: libmusicbrainz: Include header to fix build with g++ 4.4. Patch taken from [1] and adapted. [1] http://bugs.musicbrainz.org/ticket/4301 Signed-off-by: Paul Menzel Signed-off-by: Holger Hans Peter Freyther --- .../musicbrainz/files/libmusicbrainz-3.0.2-gcc-4.4-fix.patch | 12 ++++++++++++ recipes/musicbrainz/libmusicbrainz_3.0.2.bb | 4 ++++ 2 files changed, 16 insertions(+) create mode 100644 recipes/musicbrainz/files/libmusicbrainz-3.0.2-gcc-4.4-fix.patch diff --git a/recipes/musicbrainz/files/libmusicbrainz-3.0.2-gcc-4.4-fix.patch b/recipes/musicbrainz/files/libmusicbrainz-3.0.2-gcc-4.4-fix.patch new file mode 100644 index 0000000000..9500340479 --- /dev/null +++ b/recipes/musicbrainz/files/libmusicbrainz-3.0.2-gcc-4.4-fix.patch @@ -0,0 +1,12 @@ +upstream: http://bugs.musicbrainz.org/ticket/4301 + +--- libmusicbrainz-3.0.2/src/utils_private.cpp.orig 2008-07-02 08:57:10.000000000 +0200 ++++ libmusicbrainz-3.0.2/src/utils_private.cpp 2010-03-14 22:50:02.000000000 +0100 +@@ -20,6 +20,7 @@ + * $Id: utils_private.cpp 9934 2008-07-02 06:57:10Z luks $ + */ + ++#include + #include + #include + #include diff --git a/recipes/musicbrainz/libmusicbrainz_3.0.2.bb b/recipes/musicbrainz/libmusicbrainz_3.0.2.bb index bd54419686..78417a3d8a 100644 --- a/recipes/musicbrainz/libmusicbrainz_3.0.2.bb +++ b/recipes/musicbrainz/libmusicbrainz_3.0.2.bb @@ -1 +1,5 @@ +PR = "r1" + +SRC_URI_append = "file://libmusicbrainz-3.0.2-gcc-4.4-fix.patch;patch=1" + require ${PN}.inc -- cgit v1.2.3 From f24b247cc5bc04cf79aaea2ea8e5dd04c6f0eb4f Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Mon, 15 Mar 2010 12:23:37 +0800 Subject: liboop: Disable www, glib, adns, readline and tcl as it is not in the DEPENDS The configure script searched for tcl in /usr/include/tcl$tclVersion which triggered the configure qa check. The best thing to do seems to disable these features and avoid patching the configure.ac. --- recipes/liboop/liboop_1.0.bb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/recipes/liboop/liboop_1.0.bb b/recipes/liboop/liboop_1.0.bb index 676ecbe700..b27fb5fd42 100644 --- a/recipes/liboop/liboop_1.0.bb +++ b/recipes/liboop/liboop_1.0.bb @@ -8,6 +8,9 @@ S = "${WORKDIR}/liboop-${PV}" inherit autotools pkgconfig +EXTRA_OECONF = "--without-tcl --without-glib \ + --without-readline --without-adns" + headers = "oop.h oop-adns.h oop-glib.h \ oop-tcl.h oop-www.h oop-rl.h \ oop-read.h" -- cgit v1.2.3 From 9e45884d6991cf7264a36966684a4240bde29f71 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Mon, 15 Mar 2010 12:25:02 +0800 Subject: lsh: Upgrade to the latest version to address two CVEs CVE-2003-0826, CVE-2005-0814 --- conf/checksums.ini | 4 ---- recipes/lsh/lsh_1.5.5.bb | 35 ----------------------------------- recipes/lsh/lsh_2.0.4.bb | 37 +++++++++++++++++++++++++++++++++++++ 3 files changed, 37 insertions(+), 39 deletions(-) delete mode 100644 recipes/lsh/lsh_1.5.5.bb create mode 100644 recipes/lsh/lsh_2.0.4.bb diff --git a/conf/checksums.ini b/conf/checksums.ini index 70346bf92c..f1c94f6462 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -18050,10 +18050,6 @@ sha256=b1f136a1d89daa4b1b9711eb81ad120b53c9357d159f262021b84ef8c9d128be md5=b5ce6a74abc9b9eb2af94dffdfd372a4 sha256=c28b36b14bddb014d9e9c97c52459852f97bd405f89113f30bee45ed92728ff1 -[http://www.lysator.liu.se/~nisse/archive/lsh-1.5.5.tar.gz] -md5=a2b1ff6f5dcca6968516b5557c2e7ce7 -sha256=d1c10ca755db2f5fa8aa7c8ef2770d205a9bb9e5a6ed7272a5dda942647df4be - [ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/lsof_4.77.tar.bz2] md5=7b0de0d1283f2d86407a98e5c2f05f04 sha256=fe6fde629a97a2855e608cd6ae1f89e66ae42d7045499b1a6faca5cfb50f5f3b diff --git a/recipes/lsh/lsh_1.5.5.bb b/recipes/lsh/lsh_1.5.5.bb deleted file mode 100644 index 284a0100eb..0000000000 --- a/recipes/lsh/lsh_1.5.5.bb +++ /dev/null @@ -1,35 +0,0 @@ -LICENSE = "GPL" -SECTION = "console/network" -DESCRIPTION = "lsh is a GNU GPL-licensed implementation of the SSH \ -(version 2) protocol. It includes a server, a client, and some \ -utility programs." -DEPENDS = "zlib gmp liboop" - -SRC_URI = "http://www.lysator.liu.se/~nisse/archive/lsh-${PV}.tar.gz" -S = "${WORKDIR}/lsh-${PV}" - -inherit autotools -configopts = " --enable-debug-alloc Enable memory allocation sanity checks \ - --enable-debug-trace Enable tracing support \ - --enable-gcov Instrument for gcov (requires a modern gcc) \ - --without-pty Disable pty support \ - --disable-srp Disable the (experimental) support for SRP \ - --disable-kerberos Don't support kerberos \ - --disable-pam Don't support PAM \ - --disable-datafellows-workarounds \ - --enable-initgroups-workaround \ - --disable-tcp-forward Disable tcp forwarding \ - --disable-x11-forward Disable x11 forwarding (proxy only) \ - --disable-agent-forward Disable auth-agent forwarding (proxy only) \ - --disable-ipv6 Disable IPv6 support \ - --disable-utmp Disable utmp and wtmp support \ - --without-zlib Don't use zlib compression \ - --with-tcpwrappers Use tcp-wrappers for filtering connections \ - --with-sshd1=PROGRAM support fallback to SSH1 daemon \ - --with-scheme=PROGRAM Use a particular scheme implementation \ - --without-system-argp Don't use the system's argp \ - --with-include-path A colon-separated list of directories to search for \ - --with-lib-path A colon-separated list of directories to search for \ - --with-x use the X Window System" -EXTRA_OECONF = "--disable-srp --disable-kerberos --disable-pam \ - --without-x" diff --git a/recipes/lsh/lsh_2.0.4.bb b/recipes/lsh/lsh_2.0.4.bb new file mode 100644 index 0000000000..99d53583a5 --- /dev/null +++ b/recipes/lsh/lsh_2.0.4.bb @@ -0,0 +1,37 @@ +LICENSE = "GPL" +SECTION = "console/network" +DESCRIPTION = "lsh is a GNU GPL-licensed implementation of the SSH \ +(version 2) protocol. It includes a server, a client, and some \ +utility programs." +DEPENDS = "zlib gmp liboop" + +SRC_URI = "http://www.lysator.liu.se/~nisse/archive/lsh-${PV}.tar.gz;name=src" +SRC_URI[src.md5sum] = "621f4442332bb772b92d397d17ccaf02" +SRC_URI[src.sha256sum] = "614b9d63e13ad3e162c82b6405d1f67713fc622a8bc11337e72949d613713091" +S = "${WORKDIR}/lsh-${PV}" + +inherit autotools +configopts = " --enable-debug-alloc Enable memory allocation sanity checks \ + --enable-debug-trace Enable tracing support \ + --enable-gcov Instrument for gcov (requires a modern gcc) \ + --without-pty Disable pty support \ + --disable-srp Disable the (experimental) support for SRP \ + --disable-kerberos Don't support kerberos \ + --disable-pam Don't support PAM \ + --disable-datafellows-workarounds \ + --enable-initgroups-workaround \ + --disable-tcp-forward Disable tcp forwarding \ + --disable-x11-forward Disable x11 forwarding (proxy only) \ + --disable-agent-forward Disable auth-agent forwarding (proxy only) \ + --disable-ipv6 Disable IPv6 support \ + --disable-utmp Disable utmp and wtmp support \ + --without-zlib Don't use zlib compression \ + --with-tcpwrappers Use tcp-wrappers for filtering connections \ + --with-sshd1=PROGRAM support fallback to SSH1 daemon \ + --with-scheme=PROGRAM Use a particular scheme implementation \ + --without-system-argp Don't use the system's argp \ + --with-include-path A colon-separated list of directories to search for \ + --with-lib-path A colon-separated list of directories to search for \ + --with-x use the X Window System" +EXTRA_OECONF = "--disable-srp --disable-kerberos --disable-pam \ + --without-x" -- cgit v1.2.3 From 727ac89c81f9284667acd6e820204e2bad8ccc73 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Mon, 15 Mar 2010 12:36:17 +0800 Subject: libwmf: Apply two patches from Fedora to address known issues CVE-2006-3376, CVE-2009-1364 --- .../libwmf/files/libwmf-0.2.8.4-intoverflow.patch | 31 ++++++++++++++++++++++ .../libwmf/files/libwmf-0.2.8.4-useafterfree.patch | 14 ++++++++++ recipes/libwmf/libwmf-native_0.2.8.4.bb | 4 ++- recipes/libwmf/libwmf_0.2.8.4.bb | 5 +++- 4 files changed, 52 insertions(+), 2 deletions(-) create mode 100644 recipes/libwmf/files/libwmf-0.2.8.4-intoverflow.patch create mode 100644 recipes/libwmf/files/libwmf-0.2.8.4-useafterfree.patch diff --git a/recipes/libwmf/files/libwmf-0.2.8.4-intoverflow.patch b/recipes/libwmf/files/libwmf-0.2.8.4-intoverflow.patch new file mode 100644 index 0000000000..50d915c010 --- /dev/null +++ b/recipes/libwmf/files/libwmf-0.2.8.4-intoverflow.patch @@ -0,0 +1,31 @@ +http://cvs.fedoraproject.org/viewvc/devel/libwmf/libwmf-0.2.8.4-intoverflow.patch?view=log + +CVE-2006-3376 libwmf integer overflow + +--- libwmf-0.2.8.4.orig/src/player.c 2002-12-10 19:30:26.000000000 +0000 ++++ libwmf-0.2.8.4/src/player.c 2006-07-12 15:12:52.000000000 +0100 +@@ -42,6 +42,7 @@ + #include "player/defaults.h" /* Provides: default settings */ + #include "player/record.h" /* Provides: parameter mechanism */ + #include "player/meta.h" /* Provides: record interpreters */ ++#include + + /** + * @internal +@@ -132,8 +134,14 @@ + } + } + +-/* P->Parameters = (unsigned char*) wmf_malloc (API,(MAX_REC_SIZE(API)-3) * 2 * sizeof (unsigned char)); +- */ P->Parameters = (unsigned char*) wmf_malloc (API,(MAX_REC_SIZE(API) ) * 2 * sizeof (unsigned char)); ++ if (MAX_REC_SIZE(API) > UINT32_MAX / 2) ++ { ++ API->err = wmf_E_InsMem; ++ WMF_DEBUG (API,"bailing..."); ++ return (API->err); ++ } ++ ++ P->Parameters = (unsigned char*) wmf_malloc (API,(MAX_REC_SIZE(API) ) * 2 * sizeof (unsigned char)); + + if (ERR (API)) + { WMF_DEBUG (API,"bailing..."); diff --git a/recipes/libwmf/files/libwmf-0.2.8.4-useafterfree.patch b/recipes/libwmf/files/libwmf-0.2.8.4-useafterfree.patch new file mode 100644 index 0000000000..4d2d285641 --- /dev/null +++ b/recipes/libwmf/files/libwmf-0.2.8.4-useafterfree.patch @@ -0,0 +1,14 @@ + +http://cvs.fedoraproject.org/viewvc/devel/libwmf/libwmf-0.2.8.4-useafterfree.patch?view=log +Resolves: CVE-2009-1364 + +--- libwmf-0.2.8.4/src/extra/gd/gd_clip.c.CVE-2009-1364-im-clip-list 2009-04-24 04:06:44.000000000 -0400 ++++ libwmf-0.2.8.4/src/extra/gd/gd_clip.c 2009-04-24 04:08:30.000000000 -0400 +@@ -70,6 +70,7 @@ void gdClipSetAdd(gdImagePtr im,gdClipRe + { more = gdRealloc (im->clip->list,(im->clip->max + 8) * sizeof (gdClipRectangle)); + if (more == 0) return; + im->clip->max += 8; ++ im->clip->list = more; + } + im->clip->list[im->clip->count] = (*rect); + im->clip->count++; diff --git a/recipes/libwmf/libwmf-native_0.2.8.4.bb b/recipes/libwmf/libwmf-native_0.2.8.4.bb index a33461fcdb..4b7c2259b6 100644 --- a/recipes/libwmf/libwmf-native_0.2.8.4.bb +++ b/recipes/libwmf/libwmf-native_0.2.8.4.bb @@ -1,4 +1,6 @@ require libwmf_0.2.8.4.bb inherit native -SRC_URI = "${SOURCEFORGE_MIRROR}/wvware/libwmf/${PV}/libwmf-${PV}.tar.gz;name=tarball" +SRC_URI = "${SOURCEFORGE_MIRROR}/wvware/${PN}/${PV}/libwmf-${PV}.tar.gz;name=tarball \ + file://libwmf-0.2.8.4-intoverflow.patch;patch=1 \ + file://libwmf-0.2.8.4-useafterfree.patch;patch=1" diff --git a/recipes/libwmf/libwmf_0.2.8.4.bb b/recipes/libwmf/libwmf_0.2.8.4.bb index fc02940eb3..37e69e3a2b 100644 --- a/recipes/libwmf/libwmf_0.2.8.4.bb +++ b/recipes/libwmf/libwmf_0.2.8.4.bb @@ -1,6 +1,8 @@ inherit autotools_stage -SRC_URI = "${SOURCEFORGE_MIRROR}/wvware/${PN}/${PV}/${P}.tar.gz;name=tarball" +SRC_URI = "${SOURCEFORGE_MIRROR}/wvware/${PN}/${PV}/${P}.tar.gz;name=tarball \ + file://libwmf-0.2.8.4-intoverflow.patch;patch=1 \ + file://libwmf-0.2.8.4-useafterfree.patch;patch=1" SRC_URI[tarball.md5sum] = "d1177739bf1ceb07f57421f0cee191e0" SRC_URI[tarball.sha256sum] = "5b345c69220545d003ad52bfd035d5d6f4f075e65204114a9e875e84895a7cf8" @@ -10,3 +12,4 @@ LICENSE = "GPL-2" SECTION = "libs" +PR="r1" -- cgit v1.2.3 From dceac37e28932a99894c7e5e1d061635da9be118 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Mon, 15 Mar 2010 13:22:23 +0800 Subject: gzip: Upgrade to 1.3.13 to address multiple issues CVE-2006-4334, CVE-2006-4335, CVE-2006-4336, CVE-2006-4337, CVE-2006-4338 --- conf/checksums.ini | 16 -------------- recipes/gzip/gzip-1.3.13/configure.patch | 15 +++++++++++++ recipes/gzip/gzip-1.3.5/configure.patch | 30 ------------------------- recipes/gzip/gzip_1.3.13.bb | 38 ++++++++++++++++++++++++++++++++ recipes/gzip/gzip_1.3.5.bb | 36 ------------------------------ 5 files changed, 53 insertions(+), 82 deletions(-) create mode 100644 recipes/gzip/gzip-1.3.13/configure.patch delete mode 100644 recipes/gzip/gzip-1.3.5/configure.patch create mode 100644 recipes/gzip/gzip_1.3.13.bb delete mode 100644 recipes/gzip/gzip_1.3.5.bb diff --git a/conf/checksums.ini b/conf/checksums.ini index f1c94f6462..63cf4156f0 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -11830,22 +11830,6 @@ sha256=48d93ef10f17cffe1ecbfec3078932ae48e08e3c172437e4bdfb22ae87d25421 md5=4a04df0d971a8952fb395b6eb0bc8dab sha256=48d93ef10f17cffe1ecbfec3078932ae48e08e3c172437e4bdfb22ae87d25421 -[ftp://ftp.debian.org/debian/pool/main/g/gzip/gzip_1.3.5.orig.tar.gz] -md5=3d6c191dfd2bf307014b421c12dc8469 -sha256=631820e566353eafc4bdc0d9d8221c26c7ef6b5d10a254783dbe9bcac88caa07 - -[ftp://ftp.nl.debian.org/debian/pool/main/g/gzip/gzip_1.3.5.orig.tar.gz] -md5=3d6c191dfd2bf307014b421c12dc8469 -sha256=631820e566353eafc4bdc0d9d8221c26c7ef6b5d10a254783dbe9bcac88caa07 - -[ftp://ftp.pl.debian.org/pub/debian/pool/main/g/gzip/gzip_1.3.5.orig.tar.gz] -md5=3d6c191dfd2bf307014b421c12dc8469 -sha256=631820e566353eafc4bdc0d9d8221c26c7ef6b5d10a254783dbe9bcac88caa07 - -[ftp://ftp.us.debian.org/debian/pool/main/g/gzip/gzip_1.3.5.orig.tar.gz] -md5=3d6c191dfd2bf307014b421c12dc8469 -sha256=631820e566353eafc4bdc0d9d8221c26c7ef6b5d10a254783dbe9bcac88caa07 - [http://rtpnet.nerim.net/ipaq/patches/2.6.17-1/WIP/h1940_batt.patch] md5=2810d6a0aa41a349faf711bfc9facf14 sha256=0d68bfb125997599470dbc4822d43e777a831da2f1cfa5356b5dc791cdd8b27f diff --git a/recipes/gzip/gzip-1.3.13/configure.patch b/recipes/gzip/gzip-1.3.13/configure.patch new file mode 100644 index 0000000000..55e8c77345 --- /dev/null +++ b/recipes/gzip/gzip-1.3.13/configure.patch @@ -0,0 +1,15 @@ +Index: gzip-1.3.13/configure.ac +=================================================================== +--- gzip-1.3.13.orig/configure.ac 2010-03-15 13:15:37.457912205 +0800 ++++ gzip-1.3.13/configure.ac 2010-03-15 13:17:46.497912101 +0800 +@@ -27,8 +27,8 @@ + AC_CONFIG_SRCDIR(gzip.c) + AC_CONFIG_AUX_DIR(build-aux) + AC_CONFIG_HEADERS([lib/config.h:lib/config.hin]) +-AM_INIT_AUTOMAKE([1.11 dist-xz]) +-AM_SILENT_RULES([yes]) # make --enable-silent-rules the default. ++AM_INIT_AUTOMAKE([1.10]) ++m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) + + AC_PROG_CC_STDC + AM_PROG_CC_C_O diff --git a/recipes/gzip/gzip-1.3.5/configure.patch b/recipes/gzip/gzip-1.3.5/configure.patch deleted file mode 100644 index 64e901a9a4..0000000000 --- a/recipes/gzip/gzip-1.3.5/configure.patch +++ /dev/null @@ -1,30 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- gzip-1.3.5/./configure.in~configure -+++ gzip-1.3.5/./configure.in -@@ -18,8 +18,8 @@ - # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - # 02111-1307, USA. - --AC_PREREQ(2.54) --AC_INIT(gzip, 1.3.5, bug-gzip@gnu.org) -+AC_PREREQ(2.57) -+AC_INIT([gzip],[1.3.5],[bug-gzip@gnu.org]) - AC_CONFIG_SRCDIR(gzip.c) - AM_INIT_AUTOMAKE - -@@ -39,9 +39,8 @@ - - AC_CACHE_CHECK([for underline in external names], [gzip_cv_underline], - [gzip_cv_underline=yes -- AC_TRY_COMPILE([int foo() {return 0;}], [], -- [nm conftest.$OBJEXT | grep _foo >/dev/null 2>&1 || -- gzip_cv_underline=no])]) -+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[int foo() {return 0;}]], [[]])],[nm conftest.$OBJEXT | grep _foo >/dev/null 2>&1 || -+ gzip_cv_underline=no],[])]) - if test $gzip_cv_underline = no; then - ASCPP="${ASCPP} -DNO_UNDERLINE" - fi diff --git a/recipes/gzip/gzip_1.3.13.bb b/recipes/gzip/gzip_1.3.13.bb new file mode 100644 index 0000000000..86c1abede6 --- /dev/null +++ b/recipes/gzip/gzip_1.3.13.bb @@ -0,0 +1,38 @@ +LICENSE = "GPL" +SECTION = "console/utils" +PRIORITY = "required" +DESCRIPTION = "gzip (GNU zip) is a compression utility designed \ +to be a replacement for 'compress'. The GNU Project uses it as \ +the standard compression program for its system." +PR = "r1" + +SRC_URI = "${GNU_MIRROR}/gzip/gzip-${PV}.tar.gz;name=src \ + file://configure.patch;patch=1" +SRC_URI[src.md5sum] = "c54a31b93e865f6a4410b2dc64662706" +SRC_URI[src.sha256sum] = "1d06ff9f5c523651bed3dcde6e6aa8118eee48b22534a157a2588705fa517ca3" + +S = "${WORKDIR}/gzip-${PV}" + +inherit autotools + +do_install () { + autotools_do_install + # Rename and move files into /bin (FHS) + install -d ${D}${base_bindir} + mv ${D}${bindir}/gunzip ${D}${base_bindir}/gunzip.${PN} + mv ${D}${bindir}/gzip ${D}${base_bindir}/gzip.${PN} + mv ${D}${bindir}/zcat ${D}${base_bindir}/zcat.${PN} +} + +pkg_postinst_${PN} () { + update-alternatives --install ${base_bindir}/gunzip gunzip gunzip.${PN} 100 + update-alternatives --install ${base_bindir}/gzip gzip gzip.${PN} 100 + update-alternatives --install ${base_bindir}/zcat zcat zcat.${PN} 100 +} + +pkg_prerm_${PN} () { + update-alternatives --remove gunzip gunzip.${PN} + update-alternatives --remove gzip gzip.${PN} + update-alternatives --remove zcat zcat.${PN} +} + diff --git a/recipes/gzip/gzip_1.3.5.bb b/recipes/gzip/gzip_1.3.5.bb deleted file mode 100644 index a0c49864b4..0000000000 --- a/recipes/gzip/gzip_1.3.5.bb +++ /dev/null @@ -1,36 +0,0 @@ -LICENSE = "GPL" -SECTION = "console/utils" -PRIORITY = "required" -DESCRIPTION = "gzip (GNU zip) is a compression utility designed \ -to be a replacement for 'compress'. The GNU Project uses it as \ -the standard compression program for its system." -PR = "r1" - -SRC_URI = "${DEBIAN_MIRROR}/main/g/gzip/gzip_${PV}.orig.tar.gz \ - file://configure.patch;patch=1" - -S = "${WORKDIR}/gzip-${PV}" - -inherit autotools - -do_install () { - autotools_do_install - # Rename and move files into /bin (FHS) - install -d ${D}${base_bindir} - mv ${D}${bindir}/gunzip ${D}${base_bindir}/gunzip.${PN} - mv ${D}${bindir}/gzip ${D}${base_bindir}/gzip.${PN} - mv ${D}${bindir}/zcat ${D}${base_bindir}/zcat.${PN} -} - -pkg_postinst_${PN} () { - update-alternatives --install ${base_bindir}/gunzip gunzip gunzip.${PN} 100 - update-alternatives --install ${base_bindir}/gzip gzip gzip.${PN} 100 - update-alternatives --install ${base_bindir}/zcat zcat zcat.${PN} 100 -} - -pkg_prerm_${PN} () { - update-alternatives --remove gunzip gunzip.${PN} - update-alternatives --remove gzip gzip.${PN} - update-alternatives --remove zcat zcat.${PN} -} - -- cgit v1.2.3 From 548aea3b52f68af8da7f8fbd8067fc4600c8526b Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 23 Oct 2008 21:08:42 +0100 Subject: base.bbclass/bitbake.conf: Fix some string quoting to handle more unusual URLs (from Poky) --- classes/base.bbclass | 2 +- conf/bitbake.conf | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/classes/base.bbclass b/classes/base.bbclass index b191940038..a54e6992b6 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -813,7 +813,7 @@ def oe_unpack_file(file, data, url = None): (type, host, path, user, pswd, parm) = bb.decodeurl(url) if 'dos' in parm: cmd = '%s -a' % cmd - cmd = '%s %s' % (cmd, file) + cmd = "%s '%s'" % (cmd, file) elif os.path.isdir(file): destdir = "." filespath = bb.data.getVar("FILESPATH", data, 1).split(":") diff --git a/conf/bitbake.conf b/conf/bitbake.conf index 1151f4cc68..0886587edc 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -565,11 +565,11 @@ FETCHCMD_bzr = "/usr/bin/env bzr" FETCHCMD_hg = "/usr/bin/env hg" FETCHCOMMAND = "ERROR, this must be a BitBake bug" -FETCHCOMMAND_wget = "/usr/bin/env 'PATH=${PATH}' wget -t 5 --passive-ftp --no-check-certificate -P ${DL_DIR} ${URI}" +FETCHCOMMAND_wget = "/usr/bin/env 'PATH=${PATH}' wget -t 5 --passive-ftp --no-check-certificate -P ${DL_DIR} '${URI}'" FETCHCOMMAND_cvs = "/usr/bin/env 'PATH=${PATH}' cvs '-d${CVSROOT}' co ${CVSCOOPTS} ${CVSMODULE}" FETCHCOMMAND_svn = "/usr/bin/env svn co ${SVNCOOPTS} ${SVNROOT} ${SVNMODULE}" RESUMECOMMAND = "ERROR, this must be a BitBake bug" -RESUMECOMMAND_wget = "/usr/bin/env 'PATH=${PATH}' wget -c -t 5 --passive-ftp --no-check-certificate -P ${DL_DIR} ${URI}" +RESUMECOMMAND_wget = "/usr/bin/env 'PATH=${PATH}' wget -c -t 5 --passive-ftp --no-check-certificate -P ${DL_DIR} '${URI}'" UPDATECOMMAND = "ERROR, this must be a BitBake bug" UPDATECOMMAND_cvs = "/usr/bin/env 'PATH=${PATH}' cvs -d${CVSROOT} update -d -P ${CVSCOOPTS}" UPDATECOMMAND_svn = "/usr/bin/env svn update ${SVNCOOPTS}" -- cgit v1.2.3 From f362c9bb1ec5a010917a155b1649de890720d9c8 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Mon, 15 Mar 2010 07:55:49 +0100 Subject: base.bbclass: fix quoting for md5/sha256 checksums checking Signed-off-by: Marcin Juszkiewicz --- classes/base.bbclass | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/classes/base.bbclass b/classes/base.bbclass index a54e6992b6..2f363127c6 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -81,7 +81,7 @@ def base_chk_file_vars(parser, localpath, params, data): if want_md5sum: try: - md5pipe = os.popen('PATH=%s md5sum %s' % (bb.data.getVar('PATH', data, True), localpath)) + md5pipe = os.popen('PATH=%s md5sum "%s"' % (bb.data.getVar('PATH', data, True), localpath)) md5data = (md5pipe.readline().split() or [ "" ])[0] md5pipe.close() except OSError, e: @@ -92,7 +92,7 @@ def base_chk_file_vars(parser, localpath, params, data): if want_sha256sum: try: - shapipe = os.popen('PATH=%s oe_sha256sum %s' % (bb.data.getVar('PATH', data, True), localpath)) + shapipe = os.popen('PATH=%s oe_sha256sum "%s"' % (bb.data.getVar('PATH', data, True), localpath)) sha256data = (shapipe.readline().split() or [ "" ])[0] shapipe.close() except OSError, e: @@ -131,14 +131,14 @@ def base_chk_file(parser, pn, pv, src_uri, localpath, data): # call md5(sum) and shasum try: - md5pipe = os.popen('PATH=%s md5sum %s' % (bb.data.getVar('PATH', data, True), localpath)) + md5pipe = os.popen('PATH=%s md5sum "%s"' % (bb.data.getVar('PATH', data, True), localpath)) md5data = (md5pipe.readline().split() or [ "" ])[0] md5pipe.close() except OSError: raise Exception("Executing md5sum failed") try: - shapipe = os.popen('PATH=%s oe_sha256sum %s' % (bb.data.getVar('PATH', data, True), localpath)) + shapipe = os.popen('PATH=%s oe_sha256sum "%s"' % (bb.data.getVar('PATH', data, True), localpath)) shadata = (shapipe.readline().split() or [ "" ])[0] shapipe.close() except OSError: -- cgit v1.2.3 From 50c9da4c353cde2afdc142674593c56d1f1d484f Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 23 Oct 2008 21:10:28 +0100 Subject: spectrum-fw: Use the standard fetcher process (from Poky) Signed-off-by: Marcin Juszkiewicz --- recipes/orinoco/spectrum-fw.bb | 7 ++++--- recipes/orinoco/spectrum-fw/get_symbol_fw | 22 ++++------------------ 2 files changed, 8 insertions(+), 21 deletions(-) diff --git a/recipes/orinoco/spectrum-fw.bb b/recipes/orinoco/spectrum-fw.bb index cedb0e35fe..2799878b6e 100644 --- a/recipes/orinoco/spectrum-fw.bb +++ b/recipes/orinoco/spectrum-fw.bb @@ -1,9 +1,10 @@ DESCRIPTION = "Firmware for Spectrum Wireless LAN cards" -do_unpack[depends] += "unzip-native:do_populate_staging" +DEPENDS += " unzip-native " LICENSE = "unknown" -PR = "r1" +PR = "r2" -SRC_URI = "file://get_symbol_fw \ +SRC_URI = "ftp://symstore.longisland.com/Symstore/services_download/wirless_prod/MC&DriverOnlyInstallers.zip \ + file://get_symbol_fw \ file://parse_symbol_fw" S = "${WORKDIR}" diff --git a/recipes/orinoco/spectrum-fw/get_symbol_fw b/recipes/orinoco/spectrum-fw/get_symbol_fw index e7b0bf2d44..80420b01a8 100755 --- a/recipes/orinoco/spectrum-fw/get_symbol_fw +++ b/recipes/orinoco/spectrum-fw/get_symbol_fw @@ -15,29 +15,15 @@ set -e -URL_BASE='ftp://symstore.longisland.com/Symstore/services_download/wirless_prod/' -DL_FILE='MC&DriverOnlyInstallers.zip' DL_INT1='S24DRVR392B67-01.exe' DL_INT2='Driver Only Installer/NetWLan5.sys' DRIVER1=symbol1.drv DRIVER2=symbol2.drv -get_file() { - curl --remote-name "$1" || \ - wget --passive-ftp "$1" || \ - wget "$1" || \ - ftp "$1" $DRIVER1 -unzip -p $DRIVER1 "$DL_INT2" >$DRIVER2 - +unzip -p $DL_INT1 "$DL_INT2" >$DRIVER2 + perl parse_symbol_fw $DRIVER2 spectrum_fw.h symbol_sp24t_prim_fw \ symbol_sp24t_sec_fw -rm -f $DRIVER1 $DRIVER2 \ No newline at end of file +rm -f $DRIVER1 $DRIVER2 + -- cgit v1.2.3 From a9ecfad820594837aa3a0610b7d718c5dd8904dd Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Mon, 15 Mar 2010 08:05:41 +0100 Subject: src_distribute_local: fix quoting Signed-off-by: Marcin Juszkiewicz --- classes/src_distribute_local.bbclass | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/classes/src_distribute_local.bbclass b/classes/src_distribute_local.bbclass index 5cec2880aa..8cf0b426c0 100644 --- a/classes/src_distribute_local.bbclass +++ b/classes/src_distribute_local.bbclass @@ -6,24 +6,24 @@ SRC_DISTRIBUTECOMMAND[dirs] = "${SRC_DISTRIBUTEDIR}/${LIC}/${PN}" # symlinks the files to the SRC_DISTRIBUTEDIR SRC_DISTRIBUTECOMMAND-symlink () { - test -e ${SRC}.md5 && ln -sf ${SRC}.md5 . - ln -sf ${SRC} . + test -e "${SRC}.md5" && ln -sf "${SRC}.md5" . + ln -sf "${SRC}" . } # copies the files to the SRC_DISTRIBUTEDIR SRC_DISTRIBUTECOMMAND-copy () { - test -e ${SRC}.md5 && cp -f ${SRC}.md5 . - cp -fr ${SRC} . + test -e "${SRC}.md5" && cp -f "${SRC}.md5" . + cp -fr "${SRC}" . } # moves the files to the SRC_DISTRIBUTEDIR and symlinks them back SRC_DISTRIBUTECOMMAND-move+symlink () { if ! [ -L ${SRC} ]; then mv ${SRC} . - ln -sf $PWD/`basename ${SRC}` ${SRC} + ln -sf $PWD/`basename "${SRC}"` "${SRC}" if [ -e ${SRC}.md5 ]; then mv ${SRC}.md5 . - ln -sf $PWD/`basename ${SRC}.md5` ${SRC}.md5 + ln -sf $PWD/`basename "${SRC}.md5"` "${SRC}.md5" fi fi } -- cgit v1.2.3 From 743b1ba2c46a8bf623e41eba64278afa70a63504 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Mon, 15 Mar 2010 08:08:49 +0100 Subject: spectrum-fw: added checksums Signed-off-by: Marcin Juszkiewicz --- recipes/orinoco/spectrum-fw.bb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/recipes/orinoco/spectrum-fw.bb b/recipes/orinoco/spectrum-fw.bb index 2799878b6e..66ec16ed83 100644 --- a/recipes/orinoco/spectrum-fw.bb +++ b/recipes/orinoco/spectrum-fw.bb @@ -3,7 +3,7 @@ DEPENDS += " unzip-native " LICENSE = "unknown" PR = "r2" -SRC_URI = "ftp://symstore.longisland.com/Symstore/services_download/wirless_prod/MC&DriverOnlyInstallers.zip \ +SRC_URI = "ftp://symstore.longisland.com/Symstore/services_download/wirless_prod/MC&DriverOnlyInstallers.zip;name=zip \ file://get_symbol_fw \ file://parse_symbol_fw" S = "${WORKDIR}" @@ -20,3 +20,6 @@ do_install() { PACKAGE_ARCH = "all" FILES_${PN} += "${base_libdir}/firmware/symbol*" + +SRC_URI[zip.md5sum] = "48ad5e824af83d4d7a38ef0a3eab0c3b" +SRC_URI[zip.sha256sum] = "c4a960651f91e4485bb74770ab8611fc6b03a677c69d7256422bc56604624982" -- cgit v1.2.3 From dbaf57b418ad4c9160406113b9060d3c69b4900a Mon Sep 17 00:00:00 2001 From: Frans Meulenbroeks Date: Sun, 14 Mar 2010 22:29:21 +0100 Subject: mythtv: updated SRCREV Signed-off-by: Frans Meulenbroeks --- recipes/mythtv/mythplugins_0.22+fixes.bb | 4 ++-- recipes/mythtv/myththemes_0.22+fixes.bb | 4 ++-- recipes/mythtv/mythtv_0.22+fixes.bb | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/recipes/mythtv/mythplugins_0.22+fixes.bb b/recipes/mythtv/mythplugins_0.22+fixes.bb index 7161ef3b08..eaf4fff132 100644 --- a/recipes/mythtv/mythplugins_0.22+fixes.bb +++ b/recipes/mythtv/mythplugins_0.22+fixes.bb @@ -11,10 +11,10 @@ DEPENDS_mythweb_lighttpd = "mythweb" RDEPENDS_mythweb_lighttpd = "lighttpd lighttpd-module-cgi lighttpd-module-fastcgi \ lighttpd-module-rewrite php-cgi lighttpd-module-auth" -PR = "svnr${SRCPV}+r2" +PR = "svnr${SRCPV}+r0" PV = "0.22" -SRCREV = "23565" +SRCREV = "23710" SRC_URI = "svn://svn.mythtv.org/svn/branches/release-0-22-fixes;module=mythplugins;proto=http \ file://sysroot.patch;patch=1 \ file://mythplugins_wo_qtopengl.diff;patch=1 \ diff --git a/recipes/mythtv/myththemes_0.22+fixes.bb b/recipes/mythtv/myththemes_0.22+fixes.bb index 53464c126d..2b4d8de943 100644 --- a/recipes/mythtv/myththemes_0.22+fixes.bb +++ b/recipes/mythtv/myththemes_0.22+fixes.bb @@ -1,10 +1,10 @@ DEPENDS = "mythtv" inherit qmake2 -PR = "svnr${SRCPV}+r2" +PR = "svnr${SRCPV}+r0" PV = "0.22" -SRCREV = "23565" +SRCREV = "23710" SRC_URI = \ "svn://svn.mythtv.org/svn/branches/release-0-22-fixes;module=myththemes;proto=http" diff --git a/recipes/mythtv/mythtv_0.22+fixes.bb b/recipes/mythtv/mythtv_0.22+fixes.bb index b4575b5ffc..35b884b2b1 100644 --- a/recipes/mythtv/mythtv_0.22+fixes.bb +++ b/recipes/mythtv/mythtv_0.22+fixes.bb @@ -8,7 +8,7 @@ RDEPENDS_${PN} = "mythtv-backend mythtv-frontend mythtv-bin mythtv-filters mytht mysql5-server mysql5-client libmysqlclient qt4-plugin-sqldriver-sqlmysql xmltv" RDEPENDS_${PN}_append_libc-glibc = " glibc-gconv-utf-16" -PR = "svnr${SRCPV}+r8" +PR = "svnr${SRCPV}+r0" PV = "0.22" # REALPV is here to support release candidates @@ -16,7 +16,7 @@ PV = "0.22" # but for packaging the real PV is needed REALPV = "0.22" -SRCREV = "23565" +SRCREV = "23710" SRC_URI = "svn://svn.mythtv.org/svn/branches/release-0-22-fixes;module=mythtv;proto=http" S = "${WORKDIR}/mythtv" -- cgit v1.2.3 From 084e6a701f3cd7a6256976b45d4ef5073f29e44e Mon Sep 17 00:00:00 2001 From: Frans Meulenbroeks Date: Sun, 14 Mar 2010 15:54:14 +0100 Subject: evas-native_svn: removed old_stage code this code was called by no-one --- recipes/efl1/evas-native_svn.bb | 54 ----------------------------------------- 1 file changed, 54 deletions(-) diff --git a/recipes/efl1/evas-native_svn.bb b/recipes/efl1/evas-native_svn.bb index 0cb192ca9f..5c46a01234 100644 --- a/recipes/efl1/evas-native_svn.bb +++ b/recipes/efl1/evas-native_svn.bb @@ -62,57 +62,3 @@ EXTRA_OECONF = "\ --disable-convert-32-rgb-rot-270" -# evas needs a different oe_libinstall, so copy/paste autotools_stage_all -do_oldstage() { - rm -rf ${STAGE_TEMP} - mkdir -p ${STAGE_TEMP} - oe_runmake DESTDIR="${STAGE_TEMP}" install - autotools_stage_dir ${STAGE_TEMP}/${includedir} ${STAGING_INCDIR} - if [ "${BUILD_SYS}" = "${HOST_SYS}" ]; then - autotools_stage_dir ${STAGE_TEMP}/${bindir} ${STAGING_DIR_HOST}${layout_bindir} - autotools_stage_dir ${STAGE_TEMP}/${sbindir} ${STAGING_DIR_HOST}${layout_sbindir} - autotools_stage_dir ${STAGE_TEMP}/${base_bindir} ${STAGING_DIR_HOST}${layout_base_bindir} - autotools_stage_dir ${STAGE_TEMP}/${base_sbindir} ${STAGING_DIR_HOST}${layout_base_sbindir} - autotools_stage_dir ${STAGE_TEMP}/${libexecdir} ${STAGING_DIR_HOST}${layout_libexecdir} - fi - if [ -d ${STAGE_TEMP}/${libdir} ] - then - olddir=`pwd` - cd ${STAGE_TEMP}/${libdir} - las=$(find . -name \*.la -type f) - cd $olddir - echo "Found la files: $las" - if [ -n "$las" ]; then - # If there are .la files then libtool was used in the - # build, so install them with magic mangling. - for i in $las - do - dir=$(dirname $i) - echo "oe_libinstall -C ${STAGE_TEMP}/${libdir}/${dir} -so $(basename $i .la) ${STAGING_LIBDIR}/${dir}" - oe_libinstall -C ${STAGE_TEMP}/${libdir}/${dir} -so $(basename $i .la) ${STAGING_LIBDIR}/${dir} - done - else - # Otherwise libtool wasn't used, and lib/ can be copied - # directly. - echo "cp -fpPR ${STAGE_TEMP}/${libdir}/* ${STAGING_LIBDIR}" - cp -fpPR ${STAGE_TEMP}/${libdir}/* ${STAGING_LIBDIR} - fi - - fi - # Ok, this is nasty. pkgconfig.bbclass is usually used to install .pc files, - # however some packages rely on the presence of .pc files to enable/disable - # their configurataions in which case we better should not install everything - # unconditionally, but rather depend on the actual results of make install. - # The good news though: a) there are not many packages doing this and - # b) packaged staging will fix that anyways. :M: - if [ "${AUTOTOOLS_STAGE_PKGCONFIG}" = "1" ] - then - echo "cp -f ${STAGE_TEMP}/${libdir}/pkgconfig/*.pc ${STAGING_LIBDIR}/pkgconfig/" - cp -f ${STAGE_TEMP}/${libdir}/pkgconfig/*.pc ${STAGING_LIBDIR}/pkgconfig/ - fi - rm -rf ${STAGE_TEMP}/${mandir} || true - rm -rf ${STAGE_TEMP}/${infodir} || true - autotools_stage_dir ${STAGE_TEMP}/${datadir} ${STAGING_DATADIR} - rm -rf ${STAGE_TEMP} - -} -- cgit v1.2.3 From 996e4eec8b7c55f81c3346da4b30aebe1308afbc Mon Sep 17 00:00:00 2001 From: Frans Meulenbroeks Date: Sun, 14 Mar 2010 15:07:27 +0100 Subject: ffmpeg: updated to latest svn version, added targetos flag to configure Signed-off-by: Frans Meulenbroeks --- recipes/ffmpeg/ffmpeg_svn.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/recipes/ffmpeg/ffmpeg_svn.bb b/recipes/ffmpeg/ffmpeg_svn.bb index 0414e138b2..ec3082179a 100644 --- a/recipes/ffmpeg/ffmpeg_svn.bb +++ b/recipes/ffmpeg/ffmpeg_svn.bb @@ -2,7 +2,7 @@ require ffmpeg.inc DEPENDS += "schroedinger libgsm" -SRCREV = "21107" +SRCREV = "22521" PE = "1" PV = "0.5.0+${PR}+svnr${SRCPV}" @@ -44,6 +44,7 @@ EXTRA_OECONF = " \ --enable-libtheora \ --enable-libvorbis \ --arch=${TARGET_ARCH} \ + --target-os="linux" \ --enable-cross-compile \ --extra-cflags="${TARGET_CFLAGS} ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" \ --extra-ldflags="${TARGET_LDFLAGS}" \ -- cgit v1.2.3 From b3cab2498b0217b8792942b7b9091581478781e7 Mon Sep 17 00:00:00 2001 From: Frans Meulenbroeks Date: Sun, 14 Mar 2010 14:23:50 +0100 Subject: orc: created recipe incorporated patches from debian Signed-off-by: Frans Meulenbroeks --- recipes/orc/files/03_orcutils.patch | 185 + recipes/orc/files/99_autoreconf.patch | 20549 ++++++++++++++++++++++++++++++++ recipes/orc/orc_0.4.3.bb | 18 + 3 files changed, 20752 insertions(+) create mode 100644 recipes/orc/files/03_orcutils.patch create mode 100644 recipes/orc/files/99_autoreconf.patch create mode 100644 recipes/orc/orc_0.4.3.bb diff --git a/recipes/orc/files/03_orcutils.patch b/recipes/orc/files/03_orcutils.patch new file mode 100644 index 0000000000..9d298a9578 --- /dev/null +++ b/recipes/orc/files/03_orcutils.patch @@ -0,0 +1,185 @@ +--- /dev/null 2010-02-01 20:37:03.729168572 +0100 ++++ b/orc/orcutils.c 2010-02-02 12:12:07.071430049 +0100 +@@ -0,0 +1,172 @@ ++/* ++ * ORC - Library of Optimized Inner Loops ++ * Copyright (c) 2003,2004 David A. Schleef ++ * All rights reserved. ++ * ++ * Redistribution and use in source and binary forms, with or without ++ * modification, are permitted provided that the following conditions ++ * are met: ++ * 1. Redistributions of source code must retain the above copyright ++ * notice, this list of conditions and the following disclaimer. ++ * 2. Redistributions in binary form must reproduce the above copyright ++ * notice, this list of conditions and the following disclaimer in the ++ * documentation and/or other materials provided with the distribution. ++ * ++ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR ++ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED ++ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ++ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, ++ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES ++ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR ++ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) ++ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, ++ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING ++ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE ++ * POSSIBILITY OF SUCH DAMAGE. ++ */ ++ ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++#include ++#include ++ ++#include ++#include ++#include ++ ++/** ++ * SECTION:orcutils ++ * @title: Utility functions ++ * @short_description: Orc utility functions ++ */ ++ ++int ++get_file_int (const char *file, int *value) ++{ ++ char buffer[20]; ++ char *endptr; ++ int fd; ++ int n; ++ ++ fd = open (file, O_RDONLY); ++ if (fd < 0) return 0; ++ ++ n = read(fd, buffer, 19); ++ close(fd); ++ if (n < 0) { ++ return 0; ++ } ++ buffer[n] = 0; ++ ++ *value = strtol (buffer, &endptr, 0); ++ ++ if (endptr[0] == 0 || endptr[0] == '\n') return 1; ++ return 0; ++} ++ ++char * ++get_file (const char *filename) ++{ ++ char *cpuinfo; ++ int fd; ++ int n; ++ ++ cpuinfo = malloc(4096); ++ if (cpuinfo == NULL) return NULL; ++ ++ fd = open(filename, O_RDONLY); ++ if (fd < 0) { ++ free (cpuinfo); ++ return NULL; ++ } ++ ++ n = read(fd, cpuinfo, 4095); ++ if (n < 0) { ++ free (cpuinfo); ++ close (fd); ++ return NULL; ++ } ++ cpuinfo[n] = 0; ++ ++ close (fd); ++ ++ return cpuinfo; ++} ++ ++char * ++get_cpuinfo_line (char *cpuinfo, const char *tag) ++{ ++ char *flags; ++ char *end; ++ char *colon; ++ ++ flags = strstr(cpuinfo,tag); ++ if (flags == NULL) return NULL; ++ ++ end = strchr(flags, '\n'); ++ if (end == NULL) return NULL; ++ colon = strchr (flags, ':'); ++ if (colon == NULL) return NULL; ++ colon++; ++ if(colon >= end) return NULL; ++ ++ return _strndup (colon, end-colon); ++} ++ ++char * ++_strndup (const char *s, int n) ++{ ++ char *r; ++ r = malloc (n+1); ++ memcpy(r,s,n); ++ r[n]=0; ++ ++ return r; ++} ++ ++char ** ++strsplit (char *s) ++{ ++ char **list = NULL; ++ char *tok; ++ int n = 0; ++ ++ while (*s == ' ') s++; ++ ++ list = malloc (1 * sizeof(char *)); ++ while (*s) { ++ tok = s; ++ while (*s && *s != ' ') s++; ++ ++ list[n] = _strndup (tok, s - tok); ++ while (*s && *s == ' ') s++; ++ list = realloc (list, (n + 2) * sizeof(char *)); ++ n++; ++ } ++ ++ list[n] = NULL; ++ return list; ++} ++ ++char * ++get_tag_value (char *s, const char *tag) ++{ ++ char *flags; ++ char *end; ++ char *colon; ++ ++ flags = strstr(s,tag); ++ if (flags == NULL) return NULL; ++ ++ end = strchr(flags, '\n'); ++ if (end == NULL) return NULL; ++ colon = strchr (flags, ':'); ++ if (colon == NULL) return NULL; ++ colon++; ++ if(colon >= end) return NULL; ++ ++ return _strndup (colon, end-colon); ++} ++ ++ +--- a/orc/Makefile.am 2010-02-02 12:13:47.091383078 +0100 ++++ b/orc/Makefile.am 2010-02-02 12:13:53.087383965 +0100 +@@ -13,6 +13,7 @@ + orc.c \ + orcexecutor.c \ + orcfunctions.c \ ++ orcutils.c \ + orcrule.c \ + orccodemem.c \ + orcprogram.c \ diff --git a/recipes/orc/files/99_autoreconf.patch b/recipes/orc/files/99_autoreconf.patch new file mode 100644 index 0000000000..7a2de2033c --- /dev/null +++ b/recipes/orc/files/99_autoreconf.patch @@ -0,0 +1,20549 @@ +diff -x'*config.sub' -x'*config.guess' -Naur orc-0.4.3.old/aclocal.m4 orc-0.4.3/aclocal.m4 +--- orc-0.4.3.old/aclocal.m4 2009-12-14 02:20:07.000000000 +0100 ++++ orc-0.4.3/aclocal.m4 2010-02-02 12:18:12.191382009 +0100 +@@ -1,7 +1,7 @@ +-# generated automatically by aclocal 1.10.2 -*- Autoconf -*- ++# generated automatically by aclocal 1.11.1 -*- Autoconf -*- + + # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +-# 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -13,8 +13,8 @@ + + m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.63],, +-[m4_warning([this file was generated for autoconf 2.63. ++m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],, ++[m4_warning([this file was generated for autoconf 2.65. + You have another version of autoconf. It may work, but is not guaranteed to. + If you have problems, you may need to regenerate the build system entirely. + To do so, use the procedure documented by the package, typically `autoreconf'.])]) +@@ -31,10 +31,10 @@ + # generated from the m4 files accompanying Automake X.Y. + # (This private macro should not be called outside this file.) + AC_DEFUN([AM_AUTOMAKE_VERSION], +-[am__api_version='1.10' ++[am__api_version='1.11' + dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to + dnl require some minimum version. Point them to the right macro. +-m4_if([$1], [1.10.2], [], ++m4_if([$1], [1.11.1], [], + [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl + ]) + +@@ -50,7 +50,7 @@ + # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. + # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. + AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], +-[AM_AUTOMAKE_VERSION([1.10.2])dnl ++[AM_AUTOMAKE_VERSION([1.11.1])dnl + m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl + _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) +@@ -132,14 +132,14 @@ + + # AM_CONDITIONAL -*- Autoconf -*- + +-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006 ++# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008 + # Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. + +-# serial 8 ++# serial 9 + + # AM_CONDITIONAL(NAME, SHELL-CONDITION) + # ------------------------------------- +@@ -152,6 +152,7 @@ + AC_SUBST([$1_FALSE])dnl + _AM_SUBST_NOTMAKE([$1_TRUE])dnl + _AM_SUBST_NOTMAKE([$1_FALSE])dnl ++m4_define([_AM_COND_VALUE_$1], [$2])dnl + if $2; then + $1_TRUE= + $1_FALSE='#' +@@ -165,14 +166,14 @@ + Usually this means the macro was only invoked conditionally.]]) + fi])]) + +-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 ++# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009 + # Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. + +-# serial 9 ++# serial 10 + + # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be + # written in clear, in which case automake, when reading aclocal.m4, +@@ -229,6 +230,16 @@ + if test "$am_compiler_list" = ""; then + am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` + fi ++ am__universal=false ++ m4_case([$1], [CC], ++ [case " $depcc " in #( ++ *\ -arch\ *\ -arch\ *) am__universal=true ;; ++ esac], ++ [CXX], ++ [case " $depcc " in #( ++ *\ -arch\ *\ -arch\ *) am__universal=true ;; ++ esac]) ++ + for depmode in $am_compiler_list; do + # Setup a source with many dependencies, because some compilers + # like to wrap large dependency lists on column 80 (with \), and +@@ -246,7 +257,17 @@ + done + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + ++ # We check with `-c' and `-o' for the sake of the "dashmstdout" ++ # mode. It turns out that the SunPro C++ compiler does not properly ++ # handle `-M -o', and we need to detect this. Also, some Intel ++ # versions had trouble with output in subdirs ++ am__obj=sub/conftest.${OBJEXT-o} ++ am__minus_obj="-o $am__obj" + case $depmode in ++ gcc) ++ # This depmode causes a compiler race in universal mode. ++ test "$am__universal" = false || continue ++ ;; + nosideeffect) + # after this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested +@@ -256,19 +277,23 @@ + break + fi + ;; ++ msvisualcpp | msvcmsys) ++ # This compiler won't grok `-c -o', but also, the minuso test has ++ # not run yet. These depmodes are late enough in the game, and ++ # so weak that their functioning should not be impacted. ++ am__obj=conftest.${OBJEXT-o} ++ am__minus_obj= ++ ;; + none) break ;; + esac +- # We check with `-c' and `-o' for the sake of the "dashmstdout" +- # mode. It turns out that the SunPro C++ compiler does not properly +- # handle `-M -o', and we need to detect this. + if depmode=$depmode \ +- source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ ++ source=sub/conftest.c object=$am__obj \ + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ +- $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ ++ $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ + >/dev/null 2>conftest.err && + grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && +- grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && ++ grep $am__obj sub/conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then + # icc doesn't choke on unknown options, it will just issue warnings + # or remarks (even with -Werror). So we grep stderr for any message +@@ -418,13 +443,13 @@ + # Do all the work for Automake. -*- Autoconf -*- + + # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +-# 2005, 2006, 2008 Free Software Foundation, Inc. ++# 2005, 2006, 2008, 2009 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. + +-# serial 13 ++# serial 16 + + # This macro actually does too much. Some checks are only needed if + # your package does certain things. But this isn't really a big deal. +@@ -441,7 +466,7 @@ + # arguments mandatory, and then we can depend on a new Autoconf + # release and drop the old call support. + AC_DEFUN([AM_INIT_AUTOMAKE], +-[AC_PREREQ([2.60])dnl ++[AC_PREREQ([2.62])dnl + dnl Autoconf wants to disallow AM_ names. We explicitly allow + dnl the ones we care about. + m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl +@@ -492,8 +517,8 @@ + AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) + AM_MISSING_PROG(AUTOHEADER, autoheader) + AM_MISSING_PROG(MAKEINFO, makeinfo) +-AM_PROG_INSTALL_SH +-AM_PROG_INSTALL_STRIP ++AC_REQUIRE([AM_PROG_INSTALL_SH])dnl ++AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl + AC_REQUIRE([AM_PROG_MKDIR_P])dnl + # We need awk for the "check" target. The system "awk" is bad on + # some platforms. +@@ -501,24 +526,37 @@ + AC_REQUIRE([AC_PROG_MAKE_SET])dnl + AC_REQUIRE([AM_SET_LEADING_DOT])dnl + _AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], +- [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], +- [_AM_PROG_TAR([v7])])]) ++ [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], ++ [_AM_PROG_TAR([v7])])]) + _AM_IF_OPTION([no-dependencies],, + [AC_PROVIDE_IFELSE([AC_PROG_CC], +- [_AM_DEPENDENCIES(CC)], +- [define([AC_PROG_CC], +- defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl ++ [_AM_DEPENDENCIES(CC)], ++ [define([AC_PROG_CC], ++ defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl + AC_PROVIDE_IFELSE([AC_PROG_CXX], +- [_AM_DEPENDENCIES(CXX)], +- [define([AC_PROG_CXX], +- defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl ++ [_AM_DEPENDENCIES(CXX)], ++ [define([AC_PROG_CXX], ++ defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl + AC_PROVIDE_IFELSE([AC_PROG_OBJC], +- [_AM_DEPENDENCIES(OBJC)], +- [define([AC_PROG_OBJC], +- defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl ++ [_AM_DEPENDENCIES(OBJC)], ++ [define([AC_PROG_OBJC], ++ defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl + ]) ++_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl ++dnl The `parallel-tests' driver may need to know about EXEEXT, so add the ++dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro ++dnl is hooked onto _AC_COMPILER_EXEEXT early, see below. ++AC_CONFIG_COMMANDS_PRE(dnl ++[m4_provide_if([_AM_COMPILER_EXEEXT], ++ [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl + ]) + ++dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not ++dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further ++dnl mangled by Autoconf and run in a shell conditional statement. ++m4_define([_AC_COMPILER_EXEEXT], ++m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) ++ + + # When config.status generates a header, we must update the stamp-h file. + # This file resides in the same directory as the config header +@@ -541,7 +579,7 @@ + done + echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) + +-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. ++# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, +@@ -552,7 +590,14 @@ + # Define $install_sh. + AC_DEFUN([AM_PROG_INSTALL_SH], + [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +-install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"} ++if test x"${install_sh}" != xset; then ++ case $am_aux_dir in ++ *\ * | *\ *) ++ install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; ++ *) ++ install_sh="\${SHELL} $am_aux_dir/install-sh" ++ esac ++fi + AC_SUBST(install_sh)]) + + # Copyright (C) 2003, 2005 Free Software Foundation, Inc. +@@ -579,27 +624,38 @@ + # Add --enable-maintainer-mode option to configure. -*- Autoconf -*- + # From Jim Meyering + +-# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005 ++# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008 + # Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. + +-# serial 4 ++# serial 5 + ++# AM_MAINTAINER_MODE([DEFAULT-MODE]) ++# ---------------------------------- ++# Control maintainer-specific portions of Makefiles. ++# Default is to disable them, unless `enable' is passed literally. ++# For symmetry, `disable' may be passed as well. Anyway, the user ++# can override the default with the --enable/--disable switch. + AC_DEFUN([AM_MAINTAINER_MODE], +-[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) +- dnl maintainer-mode is disabled by default +- AC_ARG_ENABLE(maintainer-mode, +-[ --enable-maintainer-mode enable make rules and dependencies not useful ++[m4_case(m4_default([$1], [disable]), ++ [enable], [m4_define([am_maintainer_other], [disable])], ++ [disable], [m4_define([am_maintainer_other], [enable])], ++ [m4_define([am_maintainer_other], [enable]) ++ m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])]) ++AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles]) ++ dnl maintainer-mode's default is 'disable' unless 'enable' is passed ++ AC_ARG_ENABLE([maintainer-mode], ++[ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful + (and sometimes confusing) to the casual installer], +- USE_MAINTAINER_MODE=$enableval, +- USE_MAINTAINER_MODE=no) ++ [USE_MAINTAINER_MODE=$enableval], ++ [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes])) + AC_MSG_RESULT([$USE_MAINTAINER_MODE]) +- AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes]) ++ AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes]) + MAINT=$MAINTAINER_MODE_TRUE +- AC_SUBST(MAINT)dnl ++ AC_SUBST([MAINT])dnl + ] + ) + +@@ -607,13 +663,13 @@ + + # Check to see how 'make' treats includes. -*- Autoconf -*- + +-# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. ++# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. + +-# serial 3 ++# serial 4 + + # AM_MAKE_INCLUDE() + # ----------------- +@@ -622,7 +678,7 @@ + [am_make=${MAKE-make} + cat > confinc << 'END' + am__doit: +- @echo done ++ @echo this is the am__doit target + .PHONY: am__doit + END + # If we don't find an include directive, just comment out the code. +@@ -632,24 +688,24 @@ + _am_result=none + # First try GNU make style include. + echo "include confinc" > confmf +-# We grep out `Entering directory' and `Leaving directory' +-# messages which can occur if `w' ends up in MAKEFLAGS. +-# In particular we don't look at `^make:' because GNU make might +-# be invoked under some other name (usually "gmake"), in which +-# case it prints its new name instead of `make'. +-if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then +- am__include=include +- am__quote= +- _am_result=GNU +-fi ++# Ignore all kinds of additional output from `make'. ++case `$am_make -s -f confmf 2> /dev/null` in #( ++*the\ am__doit\ target*) ++ am__include=include ++ am__quote= ++ _am_result=GNU ++ ;; ++esac + # Now try BSD make style include. + if test "$am__include" = "#"; then + echo '.include "confinc"' > confmf +- if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then +- am__include=.include +- am__quote="\"" +- _am_result=BSD +- fi ++ case `$am_make -s -f confmf 2> /dev/null` in #( ++ *the\ am__doit\ target*) ++ am__include=.include ++ am__quote="\"" ++ _am_result=BSD ++ ;; ++ esac + fi + AC_SUBST([am__include]) + AC_SUBST([am__quote]) +@@ -659,14 +715,14 @@ + + # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- + +-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005 ++# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008 + # Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. + +-# serial 5 ++# serial 6 + + # AM_MISSING_PROG(NAME, PROGRAM) + # ------------------------------ +@@ -683,7 +739,14 @@ + AC_DEFUN([AM_MISSING_HAS_RUN], + [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl + AC_REQUIRE_AUX_FILE([missing])dnl +-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" ++if test x"${MISSING+set}" != xset; then ++ case $am_aux_dir in ++ *\ * | *\ *) ++ MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; ++ *) ++ MISSING="\${SHELL} $am_aux_dir/missing" ;; ++ esac ++fi + # Use eval to expand $SHELL + if eval "$MISSING --run true"; then + am_missing_run="$MISSING --run " +@@ -754,14 +817,14 @@ + + # Check to make sure that the build environment is sane. -*- Autoconf -*- + +-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 ++# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008 + # Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. + +-# serial 4 ++# serial 5 + + # AM_SANITY_CHECK + # --------------- +@@ -770,16 +833,29 @@ + # Just in case + sleep 1 + echo timestamp > conftest.file ++# Reject unsafe characters in $srcdir or the absolute working directory ++# name. Accept space and tab only in the latter. ++am_lf=' ++' ++case `pwd` in ++ *[[\\\"\#\$\&\'\`$am_lf]]*) ++ AC_MSG_ERROR([unsafe absolute working directory name]);; ++esac ++case $srcdir in ++ *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) ++ AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);; ++esac ++ + # Do `set' in a subshell so we don't clobber the current shell's + # arguments. Must try -L first in case configure is actually a + # symlink; some systems play weird games with the mod time of symlinks + # (eg FreeBSD returns the mod time of the symlink's containing + # directory). + if ( +- set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null` ++ set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` + if test "$[*]" = "X"; then + # -L didn't work. +- set X `ls -t $srcdir/configure conftest.file` ++ set X `ls -t "$srcdir/configure" conftest.file` + fi + rm -f conftest.file + if test "$[*]" != "X $srcdir/configure conftest.file" \ +@@ -832,18 +908,25 @@ + INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" + AC_SUBST([INSTALL_STRIP_PROGRAM])]) + +-# Copyright (C) 2006 Free Software Foundation, Inc. ++# Copyright (C) 2006, 2008 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. + ++# serial 2 ++ + # _AM_SUBST_NOTMAKE(VARIABLE) + # --------------------------- + # Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. + # This macro is traced by Automake. + AC_DEFUN([_AM_SUBST_NOTMAKE]) + ++# AM_SUBST_NOTMAKE(VARIABLE) ++# --------------------------- ++# Public sister of _AM_SUBST_NOTMAKE. ++AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) ++ + # Check how to create a tarball. -*- Autoconf -*- + + # Copyright (C) 2004, 2005 Free Software Foundation, Inc. +diff -x'*config.sub' -x'*config.guess' -Naur orc-0.4.3.old/config.h.in orc-0.4.3/config.h.in +--- orc-0.4.3.old/config.h.in 2009-12-14 02:20:10.000000000 +0100 ++++ orc-0.4.3/config.h.in 2010-02-02 12:18:13.000000000 +0100 +@@ -69,6 +69,9 @@ + /* Define to 1 if you have the header file. */ + #undef HAVE_STRING_H + ++/* Define to 1 if you have the header file. */ ++#undef HAVE_SYS_PARAM_H ++ + /* Define to 1 if you have the header file. */ + #undef HAVE_SYS_STAT_H + +@@ -109,6 +112,9 @@ + /* Define to the one symbol short name of this package. */ + #undef PACKAGE_TARNAME + ++/* Define to the home page for this package. */ ++#undef PACKAGE_URL ++ + /* Define to the version of this package. */ + #undef PACKAGE_VERSION + +diff -x'*config.sub' -x'*config.guess' -Naur orc-0.4.3.old/configure orc-0.4.3/configure +--- orc-0.4.3.old/configure 2009-12-14 02:20:09.000000000 +0100 ++++ orc-0.4.3/configure 2010-02-02 12:18:13.131377589 +0100 +@@ -1,18 +1,22 @@ + #! /bin/sh + # Guess values for system-dependent variables and create Makefiles. +-# Generated by GNU Autoconf 2.63 for orc 0.4.3. ++# Generated by GNU Autoconf 2.65 for orc 0.4.3. ++# + # + # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, +-# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, ++# Inc. ++# ++# + # This configure script is free software; the Free Software Foundation + # gives unlimited permission to copy, distribute and modify it. +-## --------------------- ## +-## M4sh Initialization. ## +-## --------------------- ## ++## -------------------- ## ++## M4sh Initialization. ## ++## -------------------- ## + + # Be more Bourne compatible + DUALCASE=1; export DUALCASE # for MKS sh +-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then ++if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : + emulate sh + NULLCMD=: + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which +@@ -20,23 +24,15 @@ + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST + else +- case `(set -o) 2>/dev/null` in +- *posix*) set -o posix ;; ++ case `(set -o) 2>/dev/null` in #( ++ *posix*) : ++ set -o posix ;; #( ++ *) : ++ ;; + esac +- + fi + + +- +- +-# PATH needs CR +-# Avoid depending upon Character Ranges. +-as_cr_letters='abcdefghijklmnopqrstuvwxyz' +-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +-as_cr_Letters=$as_cr_letters$as_cr_LETTERS +-as_cr_digits='0123456789' +-as_cr_alnum=$as_cr_Letters$as_cr_digits +- + as_nl=' + ' + export as_nl +@@ -44,7 +40,13 @@ + as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' + as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo + as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo +-if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then ++# Prefer a ksh shell builtin over an external printf program on Solaris, ++# but without wasting forks for bash or zsh. ++if test -z "$BASH_VERSION$ZSH_VERSION" \ ++ && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then ++ as_echo='print -r --' ++ as_echo_n='print -rn --' ++elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='printf %s\n' + as_echo_n='printf %s' + else +@@ -55,7 +57,7 @@ + as_echo_body='eval expr "X$1" : "X\\(.*\\)"' + as_echo_n_body='eval + arg=$1; +- case $arg in ++ case $arg in #( + *"$as_nl"*) + expr "X$arg" : "X\\(.*\\)$as_nl"; + arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; +@@ -78,13 +80,6 @@ + } + fi + +-# Support unset when possible. +-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then +- as_unset=unset +-else +- as_unset=false +-fi +- + + # IFS + # We need space, tab and new line, in precisely that order. Quoting is +@@ -94,15 +89,15 @@ + IFS=" "" $as_nl" + + # Find who we are. Look in the path if we contain no directory separator. +-case $0 in ++case $0 in #(( + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break +-done ++ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break ++ done + IFS=$as_save_IFS + + ;; +@@ -114,12 +109,16 @@ + fi + if test ! -f "$as_myself"; then + $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 +- { (exit 1); exit 1; } ++ exit 1 + fi + +-# Work around bugs in pre-3.0 UWIN ksh. +-for as_var in ENV MAIL MAILPATH +-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var ++# Unset variables that we do not need and which cause bugs (e.g. in ++# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" ++# suppresses any "Segmentation fault" message there. '((' could ++# trigger a bug in pdksh 5.2.14. ++for as_var in BASH_ENV ENV MAIL MAILPATH ++do eval test x\${$as_var+set} = xset \ ++ && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : + done + PS1='$ ' + PS2='> ' +@@ -131,330 +130,299 @@ + LANGUAGE=C + export LANGUAGE + +-# Required to use basename. +-if expr a : '\(a\)' >/dev/null 2>&1 && +- test "X`expr 00001 : '.*\(...\)'`" = X001; then +- as_expr=expr +-else +- as_expr=false +-fi +- +-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then +- as_basename=basename +-else +- as_basename=false +-fi +- +- +-# Name of the executable. +-as_me=`$as_basename -- "$0" || +-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ +- X"$0" : 'X\(//\)$' \| \ +- X"$0" : 'X\(/\)' \| . 2>/dev/null || +-$as_echo X/"$0" | +- sed '/^.*\/\([^/][^/]*\)\/*$/{ +- s//\1/ +- q +- } +- /^X\/\(\/\/\)$/{ +- s//\1/ +- q +- } +- /^X\/\(\/\).*/{ +- s//\1/ +- q +- } +- s/.*/./; q'` +- + # CDPATH. +-$as_unset CDPATH +- ++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH + + if test "x$CONFIG_SHELL" = x; then +- if (eval ":") 2>/dev/null; then +- as_have_required=yes ++ as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : ++ emulate sh ++ NULLCMD=: ++ # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which ++ # is contrary to our usage. Disable this feature. ++ alias -g '\${1+\"\$@\"}'='\"\$@\"' ++ setopt NO_GLOB_SUBST + else +- as_have_required=no ++ case \`(set -o) 2>/dev/null\` in #( ++ *posix*) : ++ set -o posix ;; #( ++ *) : ++ ;; ++esac + fi +- +- if test $as_have_required = yes && (eval ": +-(as_func_return () { +- (exit \$1) +-} +-as_func_success () { +- as_func_return 0 +-} +-as_func_failure () { +- as_func_return 1 +-} +-as_func_ret_success () { +- return 0 +-} +-as_func_ret_failure () { +- return 1 +-} ++" ++ as_required="as_fn_return () { (exit \$1); } ++as_fn_success () { as_fn_return 0; } ++as_fn_failure () { as_fn_return 1; } ++as_fn_ret_success () { return 0; } ++as_fn_ret_failure () { return 1; } + + exitcode=0 +-if as_func_success; then +- : +-else +- exitcode=1 +- echo as_func_success failed. +-fi +- +-if as_func_failure; then +- exitcode=1 +- echo as_func_failure succeeded. +-fi +- +-if as_func_ret_success; then +- : +-else +- exitcode=1 +- echo as_func_ret_success failed. +-fi +- +-if as_func_ret_failure; then +- exitcode=1 +- echo as_func_ret_failure succeeded. +-fi +- +-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then +- : ++as_fn_success || { exitcode=1; echo as_fn_success failed.; } ++as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; } ++as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; } ++as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; } ++if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : ++ ++else ++ exitcode=1; echo positional parameters were not saved. ++fi ++test x\$exitcode = x0 || exit 1" ++ as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO ++ as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO ++ eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && ++ test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1 ++test \$(( 1 + 1 )) = 2 || exit 1" ++ if (eval "$as_required") 2>/dev/null; then : ++ as_have_required=yes + else +- exitcode=1 +- echo positional parameters were not saved. ++ as_have_required=no + fi ++ if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then : + +-test \$exitcode = 0) || { (exit 1); exit 1; } +- +-( +- as_lineno_1=\$LINENO +- as_lineno_2=\$LINENO +- test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" && +- test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; } +-") 2> /dev/null; then +- : + else +- as_candidate_shells= +- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++as_found=false + for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- case $as_dir in ++ as_found=: ++ case $as_dir in #( + /*) + for as_base in sh bash ksh sh5; do +- as_candidate_shells="$as_candidate_shells $as_dir/$as_base" ++ # Try only shells that exist, to save several forks. ++ as_shell=$as_dir/$as_base ++ if { test -f "$as_shell" || test -f "$as_shell.exe"; } && ++ { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then : ++ CONFIG_SHELL=$as_shell as_have_required=yes ++ if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then : ++ break 2 ++fi ++fi + done;; + esac ++ as_found=false + done ++$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } && ++ { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then : ++ CONFIG_SHELL=$SHELL as_have_required=yes ++fi; } + IFS=$as_save_IFS + + +- for as_shell in $as_candidate_shells $SHELL; do +- # Try only shells that exist, to save several forks. +- if { test -f "$as_shell" || test -f "$as_shell.exe"; } && +- { ("$as_shell") 2> /dev/null <<\_ASEOF +-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then +- emulate sh +- NULLCMD=: +- # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which +- # is contrary to our usage. Disable this feature. +- alias -g '${1+"$@"}'='"$@"' +- setopt NO_GLOB_SUBST +-else +- case `(set -o) 2>/dev/null` in +- *posix*) set -o posix ;; +-esac +- +-fi +- +- +-: +-_ASEOF +-}; then +- CONFIG_SHELL=$as_shell +- as_have_required=yes +- if { "$as_shell" 2> /dev/null <<\_ASEOF +-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then +- emulate sh +- NULLCMD=: +- # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which +- # is contrary to our usage. Disable this feature. +- alias -g '${1+"$@"}'='"$@"' +- setopt NO_GLOB_SUBST +-else +- case `(set -o) 2>/dev/null` in +- *posix*) set -o posix ;; +-esac +- +-fi +- +- +-: +-(as_func_return () { +- (exit $1) +-} +-as_func_success () { +- as_func_return 0 +-} +-as_func_failure () { +- as_func_return 1 +-} +-as_func_ret_success () { +- return 0 +-} +-as_func_ret_failure () { +- return 1 +-} +- +-exitcode=0 +-if as_func_success; then +- : +-else +- exitcode=1 +- echo as_func_success failed. +-fi +- +-if as_func_failure; then +- exitcode=1 +- echo as_func_failure succeeded. +-fi +- +-if as_func_ret_success; then +- : +-else +- exitcode=1 +- echo as_func_ret_success failed. +-fi +- +-if as_func_ret_failure; then +- exitcode=1 +- echo as_func_ret_failure succeeded. +-fi +- +-if ( set x; as_func_ret_success y && test x = "$1" ); then +- : +-else +- exitcode=1 +- echo positional parameters were not saved. +-fi +- +-test $exitcode = 0) || { (exit 1); exit 1; } +- +-( +- as_lineno_1=$LINENO +- as_lineno_2=$LINENO +- test "x$as_lineno_1" != "x$as_lineno_2" && +- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; } +- +-_ASEOF +-}; then +- break +-fi +- +-fi +- +- done +- +- if test "x$CONFIG_SHELL" != x; then +- for as_var in BASH_ENV ENV +- do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var +- done ++ if test "x$CONFIG_SHELL" != x; then : ++ # We cannot yet assume a decent shell, so we have to provide a ++ # neutralization value for shells without unset; and this also ++ # works around shells that cannot unset nonexistent variables. ++ BASH_ENV=/dev/null ++ ENV=/dev/null ++ (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV + export CONFIG_SHELL + exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} + fi + +- +- if test $as_have_required = no; then +- echo This script requires a shell more modern than all the +- echo shells that I found on your system. Please install a +- echo modern shell, or manually run the script under such a +- echo shell if you do have one. +- { (exit 1); exit 1; } ++ if test x$as_have_required = xno; then : ++ $as_echo "$0: This script requires a shell more modern than all" ++ $as_echo "$0: the shells that I found on your system." ++ if test x${ZSH_VERSION+set} = xset ; then ++ $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should" ++ $as_echo "$0: be upgraded to zsh 4.3.4 or later." ++ else ++ $as_echo "$0: Please tell bug-autoconf@gnu.org about your system, ++$0: including any error possibly output before this ++$0: message. Then install a modern shell, or manually run ++$0: the script under such a shell if you do have one." ++ fi ++ exit 1 + fi +- +- + fi +- + fi ++SHELL=${CONFIG_SHELL-/bin/sh} ++export SHELL ++# Unset more variables known to interfere with behavior of common tools. ++CLICOLOR_FORCE= GREP_OPTIONS= ++unset CLICOLOR_FORCE GREP_OPTIONS ++ ++## --------------------- ## ++## M4sh Shell Functions. ## ++## --------------------- ## ++# as_fn_unset VAR ++# --------------- ++# Portably unset VAR. ++as_fn_unset () ++{ ++ { eval $1=; unset $1;} ++} ++as_unset=as_fn_unset ++ ++# as_fn_set_status STATUS ++# ----------------------- ++# Set $? to STATUS, without forking. ++as_fn_set_status () ++{ ++ return $1 ++} # as_fn_set_status ++ ++# as_fn_exit STATUS ++# ----------------- ++# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. ++as_fn_exit () ++{ ++ set +e ++ as_fn_set_status $1 ++ exit $1 ++} # as_fn_exit ++ ++# as_fn_mkdir_p ++# ------------- ++# Create "$as_dir" as a directory, including parents if necessary. ++as_fn_mkdir_p () ++{ + ++ case $as_dir in #( ++ -*) as_dir=./$as_dir;; ++ esac ++ test -d "$as_dir" || eval $as_mkdir_p || { ++ as_dirs= ++ while :; do ++ case $as_dir in #( ++ *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( ++ *) as_qdir=$as_dir;; ++ esac ++ as_dirs="'$as_qdir' $as_dirs" ++ as_dir=`$as_dirname -- "$as_dir" || ++$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ ++ X"$as_dir" : 'X\(//\)[^/]' \| \ ++ X"$as_dir" : 'X\(//\)$' \| \ ++ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || ++$as_echo X"$as_dir" | ++ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)[^/].*/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\).*/{ ++ s//\1/ ++ q ++ } ++ s/.*/./; q'` ++ test -d "$as_dir" && break ++ done ++ test -z "$as_dirs" || eval "mkdir $as_dirs" ++ } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" + + +-(eval "as_func_return () { +- (exit \$1) +-} +-as_func_success () { +- as_func_return 0 +-} +-as_func_failure () { +- as_func_return 1 +-} +-as_func_ret_success () { +- return 0 +-} +-as_func_ret_failure () { +- return 1 +-} ++} # as_fn_mkdir_p ++# as_fn_append VAR VALUE ++# ---------------------- ++# Append the text in VALUE to the end of the definition contained in VAR. Take ++# advantage of any shell optimizations that allow amortized linear growth over ++# repeated appends, instead of the typical quadratic growth present in naive ++# implementations. ++if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : ++ eval 'as_fn_append () ++ { ++ eval $1+=\$2 ++ }' ++else ++ as_fn_append () ++ { ++ eval $1=\$$1\$2 ++ } ++fi # as_fn_append + +-exitcode=0 +-if as_func_success; then +- : ++# as_fn_arith ARG... ++# ------------------ ++# Perform arithmetic evaluation on the ARGs, and store the result in the ++# global $as_val. Take advantage of shells that can avoid forks. The arguments ++# must be portable across $(()) and expr. ++if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : ++ eval 'as_fn_arith () ++ { ++ as_val=$(( $* )) ++ }' + else +- exitcode=1 +- echo as_func_success failed. +-fi ++ as_fn_arith () ++ { ++ as_val=`expr "$@" || test $? -eq 1` ++ } ++fi # as_fn_arith + +-if as_func_failure; then +- exitcode=1 +- echo as_func_failure succeeded. +-fi + +-if as_func_ret_success; then +- : ++# as_fn_error ERROR [LINENO LOG_FD] ++# --------------------------------- ++# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are ++# provided, also output the error to LOG_FD, referencing LINENO. Then exit the ++# script with status $?, using 1 if that was 0. ++as_fn_error () ++{ ++ as_status=$?; test $as_status -eq 0 && as_status=1 ++ if test "$3"; then ++ as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 ++ fi ++ $as_echo "$as_me: error: $1" >&2 ++ as_fn_exit $as_status ++} # as_fn_error ++ ++if expr a : '\(a\)' >/dev/null 2>&1 && ++ test "X`expr 00001 : '.*\(...\)'`" = X001; then ++ as_expr=expr + else +- exitcode=1 +- echo as_func_ret_success failed. ++ as_expr=false + fi + +-if as_func_ret_failure; then +- exitcode=1 +- echo as_func_ret_failure succeeded. ++if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then ++ as_basename=basename ++else ++ as_basename=false + fi + +-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then +- : ++if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then ++ as_dirname=dirname + else +- exitcode=1 +- echo positional parameters were not saved. ++ as_dirname=false + fi + +-test \$exitcode = 0") || { +- echo No shell found that supports shell functions. +- echo Please tell bug-autoconf@gnu.org about your system, +- echo including any error possibly output before this message. +- echo This can help us improve future autoconf versions. +- echo Configuration will now proceed without shell functions. +-} ++as_me=`$as_basename -- "$0" || ++$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ ++ X"$0" : 'X\(//\)$' \| \ ++ X"$0" : 'X\(/\)' \| . 2>/dev/null || ++$as_echo X/"$0" | ++ sed '/^.*\/\([^/][^/]*\)\/*$/{ ++ s//\1/ ++ q ++ } ++ /^X\/\(\/\/\)$/{ ++ s//\1/ ++ q ++ } ++ /^X\/\(\/\).*/{ ++ s//\1/ ++ q ++ } ++ s/.*/./; q'` + ++# Avoid depending upon Character Ranges. ++as_cr_letters='abcdefghijklmnopqrstuvwxyz' ++as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' ++as_cr_Letters=$as_cr_letters$as_cr_LETTERS ++as_cr_digits='0123456789' ++as_cr_alnum=$as_cr_Letters$as_cr_digits + + +- as_lineno_1=$LINENO +- as_lineno_2=$LINENO +- test "x$as_lineno_1" != "x$as_lineno_2" && +- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { +- +- # Create $as_me.lineno as a copy of $as_myself, but with $LINENO +- # uniformly replaced by the line number. The first 'sed' inserts a +- # line-number line after each line using $LINENO; the second 'sed' +- # does the real work. The second script uses 'N' to pair each +- # line-number line with the line containing $LINENO, and appends +- # trailing '-' during substitution so that $LINENO is not a special +- # case at line end. +- # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the +- # scripts with optimization help from Paolo Bonzini. Blame Lee +- # E. McMahon (1931-1989) for sed's syntax. :-) ++ as_lineno_1=$LINENO as_lineno_1a=$LINENO ++ as_lineno_2=$LINENO as_lineno_2a=$LINENO ++ eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" && ++ test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || { ++ # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-) + sed -n ' + p + /[$]LINENO/= +@@ -471,8 +439,7 @@ + s/-\n.*// + ' >$as_me.lineno && + chmod +x "$as_me.lineno" || +- { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 +- { (exit 1); exit 1; }; } ++ { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } + + # Don't try to exec as it changes $[0], causing all sort of problems + # (the dirname of $[0] is not the place where we might find the +@@ -482,29 +449,18 @@ + exit + } + +- +-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then +- as_dirname=dirname +-else +- as_dirname=false +-fi +- + ECHO_C= ECHO_N= ECHO_T= +-case `echo -n x` in ++case `echo -n x` in #((((( + -n*) +- case `echo 'x\c'` in ++ case `echo 'xy\c'` in + *c*) ECHO_T=' ';; # ECHO_T is single tab character. +- *) ECHO_C='\c';; ++ xy) ECHO_C='\c';; ++ *) echo `echo ksh88 bug on AIX 6.1` > /dev/null ++ ECHO_T=' ';; + esac;; + *) + ECHO_N='-n';; + esac +-if expr a : '\(a\)' >/dev/null 2>&1 && +- test "X`expr 00001 : '.*\(...\)'`" = X001; then +- as_expr=expr +-else +- as_expr=false +-fi + + rm -f conf$$ conf$$.exe conf$$.file + if test -d conf$$.dir; then +@@ -534,7 +490,7 @@ + rmdir conf$$.dir 2>/dev/null + + if mkdir -p . 2>/dev/null; then +- as_mkdir_p=: ++ as_mkdir_p='mkdir -p "$as_dir"' + else + test -d ./-p && rmdir ./-p + as_mkdir_p=false +@@ -553,10 +509,10 @@ + if test -d "$1"; then + test -d "$1/."; + else +- case $1 in ++ case $1 in #( + -*)set "./$1";; + esac; +- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in ++ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( + ???[sx]*):;;*)false;;esac;fi + '\'' sh + ' +@@ -571,7 +527,6 @@ + + + +- + # Check that we are running under the correct shell. + SHELL=${CONFIG_SHELL-/bin/sh} + +@@ -720,7 +675,8 @@ + + + +-exec 7<&0 &1 ++test -n "$DJDIR" || exec 7<&0 &1 + + # Name of the host. + # hostname on some systems (SVR3.2, Linux) returns a bogus exit status, +@@ -738,7 +694,6 @@ + subdirs= + MFLAGS= + MAKEFLAGS= +-SHELL=${CONFIG_SHELL-/bin/sh} + + # Identity of this package. + PACKAGE_NAME='orc' +@@ -746,6 +701,7 @@ + PACKAGE_VERSION='0.4.3' + PACKAGE_STRING='orc 0.4.3' + PACKAGE_BUGREPORT='' ++PACKAGE_URL='' + + # Factoring default headers for most tests. + ac_includes_default="\ +@@ -784,7 +740,10 @@ + #endif" + + ac_unique_file="orc/orc.h" +-ac_subst_vars='LTLIBOBJS ++ac_header_list= ++ac_subst_vars='am__EXEEXT_FALSE ++am__EXEEXT_TRUE ++LTLIBOBJS + LIBOBJS + orcbindir + pkgconfigdir +@@ -922,6 +881,7 @@ + program_transform_name + prefix + exec_prefix ++PACKAGE_URL + PACKAGE_BUGREPORT + PACKAGE_STRING + PACKAGE_VERSION +@@ -1063,8 +1023,7 @@ + ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` + # Reject names that are not valid shell variable names. + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && +- { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2 +- { (exit 1); exit 1; }; } ++ as_fn_error "invalid feature name: $ac_useropt" + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in +@@ -1090,8 +1049,7 @@ + ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` + # Reject names that are not valid shell variable names. + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && +- { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2 +- { (exit 1); exit 1; }; } ++ as_fn_error "invalid feature name: $ac_useropt" + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in +@@ -1295,8 +1253,7 @@ + ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` + # Reject names that are not valid shell variable names. + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && +- { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2 +- { (exit 1); exit 1; }; } ++ as_fn_error "invalid package name: $ac_useropt" + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in +@@ -1312,8 +1269,7 @@ + ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` + # Reject names that are not valid shell variable names. + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && +- { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2 +- { (exit 1); exit 1; }; } ++ as_fn_error "invalid package name: $ac_useropt" + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in +@@ -1343,17 +1299,17 @@ + | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) + x_libraries=$ac_optarg ;; + +- -*) { $as_echo "$as_me: error: unrecognized option: $ac_option +-Try \`$0 --help' for more information." >&2 +- { (exit 1); exit 1; }; } ++ -*) as_fn_error "unrecognized option: \`$ac_option' ++Try \`$0 --help' for more information." + ;; + + *=*) + ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` + # Reject names that are not valid shell variable names. +- expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && +- { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2 +- { (exit 1); exit 1; }; } ++ case $ac_envvar in #( ++ '' | [0-9]* | *[!_$as_cr_alnum]* ) ++ as_fn_error "invalid variable name: \`$ac_envvar'" ;; ++ esac + eval $ac_envvar=\$ac_optarg + export $ac_envvar ;; + +@@ -1370,15 +1326,13 @@ + + if test -n "$ac_prev"; then + ac_option=--`echo $ac_prev | sed 's/_/-/g'` +- { $as_echo "$as_me: error: missing argument to $ac_option" >&2 +- { (exit 1); exit 1; }; } ++ as_fn_error "missing argument to $ac_option" + fi + + if test -n "$ac_unrecognized_opts"; then + case $enable_option_checking in + no) ;; +- fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2 +- { (exit 1); exit 1; }; } ;; ++ fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;; + *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; + esac + fi +@@ -1401,8 +1355,7 @@ + [\\/$]* | ?:[\\/]* ) continue;; + NONE | '' ) case $ac_var in *prefix ) continue;; esac;; + esac +- { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 +- { (exit 1); exit 1; }; } ++ as_fn_error "expected an absolute directory name for --$ac_var: $ac_val" + done + + # There might be people who depend on the old broken behavior: `$host' +@@ -1432,11 +1385,9 @@ + ac_pwd=`pwd` && test -n "$ac_pwd" && + ac_ls_di=`ls -di .` && + ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || +- { $as_echo "$as_me: error: working directory cannot be determined" >&2 +- { (exit 1); exit 1; }; } ++ as_fn_error "working directory cannot be determined" + test "X$ac_ls_di" = "X$ac_pwd_ls_di" || +- { $as_echo "$as_me: error: pwd does not report name of working directory" >&2 +- { (exit 1); exit 1; }; } ++ as_fn_error "pwd does not report name of working directory" + + + # Find the source files, if location was not specified. +@@ -1475,13 +1426,11 @@ + fi + if test ! -r "$srcdir/$ac_unique_file"; then + test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." +- { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 +- { (exit 1); exit 1; }; } ++ as_fn_error "cannot find sources ($ac_unique_file) in $srcdir" + fi + ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" + ac_abs_confdir=`( +- cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2 +- { (exit 1); exit 1; }; } ++ cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg" + pwd)` + # When building in place, set srcdir=. + if test "$ac_abs_confdir" = "$ac_pwd"; then +@@ -1594,7 +1543,7 @@ + --disable-dependency-tracking speeds up one-time build + --enable-dependency-tracking do not reject slow dependency extractors + --disable-libtool-lock avoid locking (might break parallel builds) +- --enable-gtk-doc use gtk-doc to build documentation [default=no] ++ --enable-gtk-doc use gtk-doc to build documentation [[default=no]] + + Optional Packages: + --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] +@@ -1610,7 +1559,7 @@ + LDFLAGS linker flags, e.g. -L if you have libraries in a + nonstandard directory + LIBS libraries to pass to the linker, e.g. -l +- CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I if ++ CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I if + you have headers in a nonstandard directory + CPP C preprocessor + CCAS assembler compiler command (defaults to CC) +@@ -1620,6 +1569,7 @@ + Use these variables to override the choices made by `configure' or to help + it to find libraries and programs with nonstandard names/locations. + ++Report bugs to the package provider. + _ACEOF + ac_status=$? + fi +@@ -1683,427 +1633,984 @@ + if $ac_init_version; then + cat <<\_ACEOF + orc configure 0.4.3 +-generated by GNU Autoconf 2.63 ++generated by GNU Autoconf 2.65 + +-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, +-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++Copyright (C) 2009 Free Software Foundation, Inc. + This configure script is free software; the Free Software Foundation + gives unlimited permission to copy, distribute and modify it. + _ACEOF + exit + fi +-cat >config.log <<_ACEOF +-This file contains any messages produced by compilers while +-running configure, to aid debugging if configure makes a mistake. + +-It was created by orc $as_me 0.4.3, which was +-generated by GNU Autoconf 2.63. Invocation command line was ++## ------------------------ ## ++## Autoconf initialization. ## ++## ------------------------ ## ++ ++# ac_fn_c_try_compile LINENO ++# -------------------------- ++# Try to compile conftest.$ac_ext, and return whether this succeeded. ++ac_fn_c_try_compile () ++{ ++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ rm -f conftest.$ac_objext ++ if { { ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_compile") 2>conftest.err ++ ac_status=$? ++ if test -s conftest.err; then ++ grep -v '^ *+' conftest.err >conftest.er1 ++ cat conftest.er1 >&5 ++ mv -f conftest.er1 conftest.err ++ fi ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then : ++ ac_retval=0 ++else ++ $as_echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 + +- $ $0 $@ ++ ac_retval=1 ++fi ++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} ++ as_fn_set_status $ac_retval + +-_ACEOF +-exec 5>>config.log ++} # ac_fn_c_try_compile ++ ++# ac_fn_c_try_link LINENO ++# ----------------------- ++# Try to link conftest.$ac_ext, and return whether this succeeded. ++ac_fn_c_try_link () + { +-cat <<_ASUNAME +-## --------- ## +-## Platform. ## +-## --------- ## ++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ rm -f conftest.$ac_objext conftest$ac_exeext ++ if { { ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_link") 2>conftest.err ++ ac_status=$? ++ if test -s conftest.err; then ++ grep -v '^ *+' conftest.err >conftest.er1 ++ cat conftest.er1 >&5 ++ mv -f conftest.er1 conftest.err ++ fi ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && { ++ test "$cross_compiling" = yes || ++ $as_test_x conftest$ac_exeext ++ }; then : ++ ac_retval=0 ++else ++ $as_echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 + +-hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` +-uname -m = `(uname -m) 2>/dev/null || echo unknown` +-uname -r = `(uname -r) 2>/dev/null || echo unknown` +-uname -s = `(uname -s) 2>/dev/null || echo unknown` +-uname -v = `(uname -v) 2>/dev/null || echo unknown` ++ ac_retval=1 ++fi ++ # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information ++ # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would ++ # interfere with the next link command; also delete a directory that is ++ # left behind by Apple's compiler. We do this before executing the actions. ++ rm -rf conftest.dSYM conftest_ipa8_conftest.oo ++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} ++ as_fn_set_status $ac_retval + +-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown` +-/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown` ++} # ac_fn_c_try_link + +-/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` +-/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` +-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` +-/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown` +-/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` +-/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` +-/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` ++# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES ++# ------------------------------------------------------- ++# Tests whether HEADER exists and can be compiled using the include files in ++# INCLUDES, setting the cache variable VAR accordingly. ++ac_fn_c_check_header_compile () ++{ ++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 ++$as_echo_n "checking for $2... " >&6; } ++if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : ++ $as_echo_n "(cached) " >&6 ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++$4 ++#include <$2> ++_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ eval "$3=yes" ++else ++ eval "$3=no" ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++eval ac_res=\$$3 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 ++$as_echo "$ac_res" >&6; } ++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + +-_ASUNAME ++} # ac_fn_c_check_header_compile + +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- $as_echo "PATH: $as_dir" +-done +-IFS=$as_save_IFS ++# ac_fn_c_try_cpp LINENO ++# ---------------------- ++# Try to preprocess conftest.$ac_ext, and return whether this succeeded. ++ac_fn_c_try_cpp () ++{ ++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ if { { ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err ++ ac_status=$? ++ if test -s conftest.err; then ++ grep -v '^ *+' conftest.err >conftest.er1 ++ cat conftest.er1 >&5 ++ mv -f conftest.er1 conftest.err ++ fi ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } >/dev/null && { ++ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || ++ test ! -s conftest.err ++ }; then : ++ ac_retval=0 ++else ++ $as_echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 + +-} >&5 ++ ac_retval=1 ++fi ++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} ++ as_fn_set_status $ac_retval + +-cat >&5 <<_ACEOF ++} # ac_fn_c_try_cpp + ++# ac_fn_c_try_run LINENO ++# ---------------------- ++# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes ++# that executables *can* be run. ++ac_fn_c_try_run () ++{ ++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ if { { ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_link") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } && { ac_try='./conftest$ac_exeext' ++ { { case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; }; then : ++ ac_retval=0 ++else ++ $as_echo "$as_me: program exited with status $ac_status" >&5 ++ $as_echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 + +-## ----------- ## +-## Core tests. ## +-## ----------- ## ++ ac_retval=$ac_status ++fi ++ rm -rf conftest.dSYM conftest_ipa8_conftest.oo ++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} ++ as_fn_set_status $ac_retval + +-_ACEOF ++} # ac_fn_c_try_run + ++# ac_fn_c_check_func LINENO FUNC VAR ++# ---------------------------------- ++# Tests whether FUNC exists, setting the cache variable VAR accordingly ++ac_fn_c_check_func () ++{ ++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 ++$as_echo_n "checking for $2... " >&6; } ++if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : ++ $as_echo_n "(cached) " >&6 ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++/* Define $2 to an innocuous variant, in case declares $2. ++ For example, HP-UX 11i declares gettimeofday. */ ++#define $2 innocuous_$2 + +-# Keep a trace of the command line. +-# Strip out --no-create and --no-recursion so they do not pile up. +-# Strip out --silent because we don't want to record it for future runs. +-# Also quote any args containing shell meta-characters. +-# Make two passes to allow for proper duplicate-argument suppression. +-ac_configure_args= +-ac_configure_args0= +-ac_configure_args1= +-ac_must_keep_next=false +-for ac_pass in 1 2 +-do +- for ac_arg +- do +- case $ac_arg in +- -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;; +- -q | -quiet | --quiet | --quie | --qui | --qu | --q \ +- | -silent | --silent | --silen | --sile | --sil) +- continue ;; +- *\'*) +- ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; +- esac +- case $ac_pass in +- 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; +- 2) +- ac_configure_args1="$ac_configure_args1 '$ac_arg'" +- if test $ac_must_keep_next = true; then +- ac_must_keep_next=false # Got value, back to normal. +- else +- case $ac_arg in +- *=* | --config-cache | -C | -disable-* | --disable-* \ +- | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ +- | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ +- | -with-* | --with-* | -without-* | --without-* | --x) +- case "$ac_configure_args0 " in +- "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; +- esac +- ;; +- -* ) ac_must_keep_next=true ;; +- esac +- fi +- ac_configure_args="$ac_configure_args '$ac_arg'" +- ;; +- esac +- done +-done +-$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; } +-$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; } ++/* System header to define __stub macros and hopefully few prototypes, ++ which can conflict with char $2 (); below. ++ Prefer to if __STDC__ is defined, since ++ exists even on freestanding compilers. */ + +-# When interrupted or exit'd, cleanup temporary files, and complete +-# config.log. We remove comments because anyway the quotes in there +-# would cause problems or look ugly. +-# WARNING: Use '\'' to represent an apostrophe within the trap. +-# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug. +-trap 'exit_status=$? +- # Save into config.log some information that might help in debugging. +- { +- echo ++#ifdef __STDC__ ++# include ++#else ++# include ++#endif + +- cat <<\_ASBOX +-## ---------------- ## +-## Cache variables. ## +-## ---------------- ## +-_ASBOX +- echo +- # The following way of writing the cache mishandles newlines in values, +-( +- for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do +- eval ac_val=\$$ac_var +- case $ac_val in #( +- *${as_nl}*) +- case $ac_var in #( +- *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5 +-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; +- esac +- case $ac_var in #( +- _ | IFS | as_nl) ;; #( +- BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( +- *) $as_unset $ac_var ;; +- esac ;; +- esac +- done +- (set) 2>&1 | +- case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #( +- *${as_nl}ac_space=\ *) +- sed -n \ +- "s/'\''/'\''\\\\'\'''\''/g; +- s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p" +- ;; #( +- *) +- sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" +- ;; +- esac | +- sort +-) +- echo ++#undef $2 + +- cat <<\_ASBOX +-## ----------------- ## +-## Output variables. ## +-## ----------------- ## +-_ASBOX +- echo +- for ac_var in $ac_subst_vars +- do +- eval ac_val=\$$ac_var +- case $ac_val in +- *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; +- esac +- $as_echo "$ac_var='\''$ac_val'\''" +- done | sort +- echo ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char $2 (); ++/* The GNU C library defines this for functions which it implements ++ to always fail with ENOSYS. Some functions are actually named ++ something starting with __ and the normal name is an alias. */ ++#if defined __stub_$2 || defined __stub___$2 ++choke me ++#endif + +- if test -n "$ac_subst_files"; then +- cat <<\_ASBOX +-## ------------------- ## +-## File substitutions. ## +-## ------------------- ## +-_ASBOX +- echo +- for ac_var in $ac_subst_files +- do +- eval ac_val=\$$ac_var +- case $ac_val in +- *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; +- esac +- $as_echo "$ac_var='\''$ac_val'\''" +- done | sort +- echo +- fi ++int ++main () ++{ ++return $2 (); ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_link "$LINENO"; then : ++ eval "$3=yes" ++else ++ eval "$3=no" ++fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++fi ++eval ac_res=\$$3 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 ++$as_echo "$ac_res" >&6; } ++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + +- if test -s confdefs.h; then +- cat <<\_ASBOX +-## ----------- ## +-## confdefs.h. ## +-## ----------- ## +-_ASBOX +- echo +- cat confdefs.h +- echo +- fi +- test "$ac_signal" != 0 && +- $as_echo "$as_me: caught signal $ac_signal" +- $as_echo "$as_me: exit $exit_status" +- } >&5 +- rm -f core *.core core.conftest.* && +- rm -f -r conftest* confdefs* conf$$* $ac_clean_files && +- exit $exit_status +-' 0 +-for ac_signal in 1 2 13 15; do +- trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal +-done +-ac_signal=0 ++} # ac_fn_c_check_func + +-# confdefs.h avoids OS command line length limits that DEFS can exceed. +-rm -f -r conftest* confdefs.h ++# ac_fn_c_check_type LINENO TYPE VAR INCLUDES ++# ------------------------------------------- ++# Tests whether TYPE exists after having included INCLUDES, setting cache ++# variable VAR accordingly. ++ac_fn_c_check_type () ++{ ++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 ++$as_echo_n "checking for $2... " >&6; } ++if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : ++ $as_echo_n "(cached) " >&6 ++else ++ eval "$3=no" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++$4 ++int ++main () ++{ ++if (sizeof ($2)) ++ return 0; ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++$4 ++int ++main () ++{ ++if (sizeof (($2))) ++ return 0; ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : + +-# Predefined preprocessor variables. ++else ++ eval "$3=yes" ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++eval ac_res=\$$3 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 ++$as_echo "$ac_res" >&6; } ++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + +-cat >>confdefs.h <<_ACEOF +-#define PACKAGE_NAME "$PACKAGE_NAME" +-_ACEOF ++} # ac_fn_c_check_type + ++# ac_fn_c_compute_int LINENO EXPR VAR INCLUDES ++# -------------------------------------------- ++# Tries to find the compile-time value of EXPR in a program that includes ++# INCLUDES, setting VAR accordingly. Returns whether the value could be ++# computed ++ac_fn_c_compute_int () ++{ ++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ if test "$cross_compiling" = yes; then ++ # Depending upon the size, compute the lo and hi bounds. ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++$4 ++int ++main () ++{ ++static int test_array [1 - 2 * !(($2) >= 0)]; ++test_array [0] = 0 + +-cat >>confdefs.h <<_ACEOF +-#define PACKAGE_TARNAME "$PACKAGE_TARNAME" ++ ; ++ return 0; ++} + _ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ ac_lo=0 ac_mid=0 ++ while :; do ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++$4 ++int ++main () ++{ ++static int test_array [1 - 2 * !(($2) <= $ac_mid)]; ++test_array [0] = 0 + ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ ac_hi=$ac_mid; break ++else ++ as_fn_arith $ac_mid + 1 && ac_lo=$as_val ++ if test $ac_lo -le $ac_mid; then ++ ac_lo= ac_hi= ++ break ++ fi ++ as_fn_arith 2 '*' $ac_mid + 1 && ac_mid=$as_val ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ done ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++$4 ++int ++main () ++{ ++static int test_array [1 - 2 * !(($2) < 0)]; ++test_array [0] = 0 + +-cat >>confdefs.h <<_ACEOF +-#define PACKAGE_VERSION "$PACKAGE_VERSION" ++ ; ++ return 0; ++} + _ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ ac_hi=-1 ac_mid=-1 ++ while :; do ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++$4 ++int ++main () ++{ ++static int test_array [1 - 2 * !(($2) >= $ac_mid)]; ++test_array [0] = 0 + ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ ac_lo=$ac_mid; break ++else ++ as_fn_arith '(' $ac_mid ')' - 1 && ac_hi=$as_val ++ if test $ac_mid -le $ac_hi; then ++ ac_lo= ac_hi= ++ break ++ fi ++ as_fn_arith 2 '*' $ac_mid && ac_mid=$as_val ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ done ++else ++ ac_lo= ac_hi= ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++# Binary search between lo and hi bounds. ++while test "x$ac_lo" != "x$ac_hi"; do ++ as_fn_arith '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo && ac_mid=$as_val ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++$4 ++int ++main () ++{ ++static int test_array [1 - 2 * !(($2) <= $ac_mid)]; ++test_array [0] = 0 + +-cat >>confdefs.h <<_ACEOF +-#define PACKAGE_STRING "$PACKAGE_STRING" ++ ; ++ return 0; ++} + _ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ ac_hi=$ac_mid ++else ++ as_fn_arith '(' $ac_mid ')' + 1 && ac_lo=$as_val ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++done ++case $ac_lo in #(( ++?*) eval "$3=\$ac_lo"; ac_retval=0 ;; ++'') ac_retval=1 ;; ++esac ++ else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++$4 ++static long int longval () { return $2; } ++static unsigned long int ulongval () { return $2; } ++#include ++#include ++int ++main () ++{ + ++ FILE *f = fopen ("conftest.val", "w"); ++ if (! f) ++ return 1; ++ if (($2) < 0) ++ { ++ long int i = longval (); ++ if (i != ($2)) ++ return 1; ++ fprintf (f, "%ld", i); ++ } ++ else ++ { ++ unsigned long int i = ulongval (); ++ if (i != ($2)) ++ return 1; ++ fprintf (f, "%lu", i); ++ } ++ /* Do not output a trailing newline, as this causes \r\n confusion ++ on some platforms. */ ++ return ferror (f) || fclose (f) != 0; + +-cat >>confdefs.h <<_ACEOF +-#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" ++ ; ++ return 0; ++} + _ACEOF ++if ac_fn_c_try_run "$LINENO"; then : ++ echo >>conftest.val; read $3 &5 ++$as_echo_n "checking for $2... " >&6; } ++if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : ++ $as_echo_n "(cached) " >&6 ++fi ++eval ac_res=\$$3 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 ++$as_echo "$ac_res" >&6; } + else +- ac_site_file1=$ac_default_prefix/share/config.site +- ac_site_file2=$ac_default_prefix/etc/config.site ++ # Is the header compilable? ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5 ++$as_echo_n "checking $2 usability... " >&6; } ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++$4 ++#include <$2> ++_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ ac_header_compiler=yes ++else ++ ac_header_compiler=no + fi +-for ac_site_file in "$ac_site_file1" "$ac_site_file2" +-do +- test "x$ac_site_file" = xNONE && continue +- if test -r "$ac_site_file"; then +- { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 +-$as_echo "$as_me: loading site script $ac_site_file" >&6;} +- sed 's/^/| /' "$ac_site_file" >&5 +- . "$ac_site_file" +- fi +-done ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5 ++$as_echo "$ac_header_compiler" >&6; } + +-if test -r "$cache_file"; then +- # Some versions of bash will fail to source /dev/null (special +- # files actually), so we avoid doing that. +- if test -f "$cache_file"; then +- { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5 +-$as_echo "$as_me: loading cache $cache_file" >&6;} +- case $cache_file in +- [\\/]* | ?:[\\/]* ) . "$cache_file";; +- *) . "./$cache_file";; +- esac +- fi ++# Is the header present? ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5 ++$as_echo_n "checking $2 presence... " >&6; } ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++#include <$2> ++_ACEOF ++if ac_fn_c_try_cpp "$LINENO"; then : ++ ac_header_preproc=yes + else +- { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5 +-$as_echo "$as_me: creating cache $cache_file" >&6;} +- >$cache_file ++ ac_header_preproc=no + fi ++rm -f conftest.err conftest.$ac_ext ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 ++$as_echo "$ac_header_preproc" >&6; } + +-# Check that the precious variables saved in the cache have kept the same +-# value. +-ac_cache_corrupted=false +-for ac_var in $ac_precious_vars; do +- eval ac_old_set=\$ac_cv_env_${ac_var}_set +- eval ac_new_set=\$ac_env_${ac_var}_set +- eval ac_old_val=\$ac_cv_env_${ac_var}_value +- eval ac_new_val=\$ac_env_${ac_var}_value +- case $ac_old_set,$ac_new_set in +- set,) +- { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 +-$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} +- ac_cache_corrupted=: ;; +- ,set) +- { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 +-$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} +- ac_cache_corrupted=: ;; +- ,);; +- *) +- if test "x$ac_old_val" != "x$ac_new_val"; then +- # differences in whitespace do not lead to failure. +- ac_old_val_w=`echo x $ac_old_val` +- ac_new_val_w=`echo x $ac_new_val` +- if test "$ac_old_val_w" != "$ac_new_val_w"; then +- { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 +-$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} +- ac_cache_corrupted=: +- else +- { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 +-$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} +- eval $ac_var=\$ac_old_val +- fi +- { $as_echo "$as_me:$LINENO: former value: \`$ac_old_val'" >&5 +-$as_echo "$as_me: former value: \`$ac_old_val'" >&2;} +- { $as_echo "$as_me:$LINENO: current value: \`$ac_new_val'" >&5 +-$as_echo "$as_me: current value: \`$ac_new_val'" >&2;} +- fi;; +- esac +- # Pass precious variables to config.status. +- if test "$ac_new_set" = set; then +- case $ac_new_val in +- *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; +- *) ac_arg=$ac_var=$ac_new_val ;; +- esac +- case " $ac_configure_args " in +- *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. +- *) ac_configure_args="$ac_configure_args '$ac_arg'" ;; +- esac +- fi +-done +-if $ac_cache_corrupted; then +- { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +- { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 +-$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} +- { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 +-$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} +- { (exit 1); exit 1; }; } ++# So? What about this header? ++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #(( ++ yes:no: ) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5 ++$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 ++$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} ++ ;; ++ no:yes:* ) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5 ++$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;} ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5 ++$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;} ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5 ++$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;} ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5 ++$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 ++$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} ++ ;; ++esac ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 ++$as_echo_n "checking for $2... " >&6; } ++if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : ++ $as_echo_n "(cached) " >&6 ++else ++ eval "$3=\$ac_header_compiler" + fi ++eval ac_res=\$$3 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 ++$as_echo "$ac_res" >&6; } ++fi ++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + ++} # ac_fn_c_check_header_mongrel ++cat >config.log <<_ACEOF ++This file contains any messages produced by compilers while ++running configure, to aid debugging if configure makes a mistake. + ++It was created by orc $as_me 0.4.3, which was ++generated by GNU Autoconf 2.65. Invocation command line was + ++ $ $0 $@ + ++_ACEOF ++exec 5>>config.log ++{ ++cat <<_ASUNAME ++## --------- ## ++## Platform. ## ++## --------- ## + ++hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` ++uname -m = `(uname -m) 2>/dev/null || echo unknown` ++uname -r = `(uname -r) 2>/dev/null || echo unknown` ++uname -s = `(uname -s) 2>/dev/null || echo unknown` ++uname -v = `(uname -v) 2>/dev/null || echo unknown` + ++/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown` ++/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown` + ++/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` ++/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` ++/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` ++/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown` ++/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` ++/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` ++/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` + ++_ASUNAME + ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ $as_echo "PATH: $as_dir" ++ done ++IFS=$as_save_IFS + ++} >&5 + ++cat >&5 <<_ACEOF + + ++## ----------- ## ++## Core tests. ## ++## ----------- ## + ++_ACEOF + + ++# Keep a trace of the command line. ++# Strip out --no-create and --no-recursion so they do not pile up. ++# Strip out --silent because we don't want to record it for future runs. ++# Also quote any args containing shell meta-characters. ++# Make two passes to allow for proper duplicate-argument suppression. ++ac_configure_args= ++ac_configure_args0= ++ac_configure_args1= ++ac_must_keep_next=false ++for ac_pass in 1 2 ++do ++ for ac_arg ++ do ++ case $ac_arg in ++ -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;; ++ -q | -quiet | --quiet | --quie | --qui | --qu | --q \ ++ | -silent | --silent | --silen | --sile | --sil) ++ continue ;; ++ *\'*) ++ ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; ++ esac ++ case $ac_pass in ++ 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;; ++ 2) ++ as_fn_append ac_configure_args1 " '$ac_arg'" ++ if test $ac_must_keep_next = true; then ++ ac_must_keep_next=false # Got value, back to normal. ++ else ++ case $ac_arg in ++ *=* | --config-cache | -C | -disable-* | --disable-* \ ++ | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ ++ | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ ++ | -with-* | --with-* | -without-* | --without-* | --x) ++ case "$ac_configure_args0 " in ++ "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; ++ esac ++ ;; ++ -* ) ac_must_keep_next=true ;; ++ esac ++ fi ++ as_fn_append ac_configure_args " '$ac_arg'" ++ ;; ++ esac ++ done ++done ++{ ac_configure_args0=; unset ac_configure_args0;} ++{ ac_configure_args1=; unset ac_configure_args1;} + ++# When interrupted or exit'd, cleanup temporary files, and complete ++# config.log. We remove comments because anyway the quotes in there ++# would cause problems or look ugly. ++# WARNING: Use '\'' to represent an apostrophe within the trap. ++# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug. ++trap 'exit_status=$? ++ # Save into config.log some information that might help in debugging. ++ { ++ echo + ++ cat <<\_ASBOX ++## ---------------- ## ++## Cache variables. ## ++## ---------------- ## ++_ASBOX ++ echo ++ # The following way of writing the cache mishandles newlines in values, ++( ++ for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do ++ eval ac_val=\$$ac_var ++ case $ac_val in #( ++ *${as_nl}*) ++ case $ac_var in #( ++ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 ++$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; ++ esac ++ case $ac_var in #( ++ _ | IFS | as_nl) ;; #( ++ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( ++ *) { eval $ac_var=; unset $ac_var;} ;; ++ esac ;; ++ esac ++ done ++ (set) 2>&1 | ++ case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #( ++ *${as_nl}ac_space=\ *) ++ sed -n \ ++ "s/'\''/'\''\\\\'\'''\''/g; ++ s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p" ++ ;; #( ++ *) ++ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" ++ ;; ++ esac | ++ sort ++) ++ echo + ++ cat <<\_ASBOX ++## ----------------- ## ++## Output variables. ## ++## ----------------- ## ++_ASBOX ++ echo ++ for ac_var in $ac_subst_vars ++ do ++ eval ac_val=\$$ac_var ++ case $ac_val in ++ *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; ++ esac ++ $as_echo "$ac_var='\''$ac_val'\''" ++ done | sort ++ echo + ++ if test -n "$ac_subst_files"; then ++ cat <<\_ASBOX ++## ------------------- ## ++## File substitutions. ## ++## ------------------- ## ++_ASBOX ++ echo ++ for ac_var in $ac_subst_files ++ do ++ eval ac_val=\$$ac_var ++ case $ac_val in ++ *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; ++ esac ++ $as_echo "$ac_var='\''$ac_val'\''" ++ done | sort ++ echo ++ fi + ++ if test -s confdefs.h; then ++ cat <<\_ASBOX ++## ----------- ## ++## confdefs.h. ## ++## ----------- ## ++_ASBOX ++ echo ++ cat confdefs.h ++ echo ++ fi ++ test "$ac_signal" != 0 && ++ $as_echo "$as_me: caught signal $ac_signal" ++ $as_echo "$as_me: exit $exit_status" ++ } >&5 ++ rm -f core *.core core.conftest.* && ++ rm -f -r conftest* confdefs* conf$$* $ac_clean_files && ++ exit $exit_status ++' 0 ++for ac_signal in 1 2 13 15; do ++ trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal ++done ++ac_signal=0 + ++# confdefs.h avoids OS command line length limits that DEFS can exceed. ++rm -f -r conftest* confdefs.h + ++$as_echo "/* confdefs.h */" > confdefs.h + ++# Predefined preprocessor variables. + +-ac_ext=c +-ac_cpp='$CPP $CPPFLAGS' +-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_c_compiler_gnu +- +- ++cat >>confdefs.h <<_ACEOF ++#define PACKAGE_NAME "$PACKAGE_NAME" ++_ACEOF + ++cat >>confdefs.h <<_ACEOF ++#define PACKAGE_TARNAME "$PACKAGE_TARNAME" ++_ACEOF + +- { $as_echo "$as_me:$LINENO: checking nano version" >&5 +-$as_echo_n "checking nano version... " >&6; } ++cat >>confdefs.h <<_ACEOF ++#define PACKAGE_VERSION "$PACKAGE_VERSION" ++_ACEOF + +- NANO=$(echo 0.4.3 | sed 's/[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.*//') ++cat >>confdefs.h <<_ACEOF ++#define PACKAGE_STRING "$PACKAGE_STRING" ++_ACEOF + ++cat >>confdefs.h <<_ACEOF ++#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" ++_ACEOF + +- if test x"$NANO" = x || test "x$NANO" = "x0" ; then +- { $as_echo "$as_me:$LINENO: result: 0 (release)" >&5 +-$as_echo "0 (release)" >&6; } +- NANO=0 +- ORC_CVS=no +- else +- { $as_echo "$as_me:$LINENO: result: $NANO" >&5 +-$as_echo "$NANO" >&6; } +- ORC_CVS=yes +- fi ++cat >>confdefs.h <<_ACEOF ++#define PACKAGE_URL "$PACKAGE_URL" ++_ACEOF + + +-ac_aux_dir= +-for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do +- if test -f "$ac_dir/install-sh"; then +- ac_aux_dir=$ac_dir +- ac_install_sh="$ac_aux_dir/install-sh -c" +- break +- elif test -f "$ac_dir/install.sh"; then +- ac_aux_dir=$ac_dir +- ac_install_sh="$ac_aux_dir/install.sh -c" +- break +- elif test -f "$ac_dir/shtool"; then +- ac_aux_dir=$ac_dir +- ac_install_sh="$ac_aux_dir/shtool install -c" +- break ++# Let the site file select an alternate cache file if it wants to. ++# Prefer an explicitly selected file to automatically selected ones. ++ac_site_file1=NONE ++ac_site_file2=NONE ++if test -n "$CONFIG_SITE"; then ++ ac_site_file1=$CONFIG_SITE ++elif test "x$prefix" != xNONE; then ++ ac_site_file1=$prefix/share/config.site ++ ac_site_file2=$prefix/etc/config.site ++else ++ ac_site_file1=$ac_default_prefix/share/config.site ++ ac_site_file2=$ac_default_prefix/etc/config.site ++fi ++for ac_site_file in "$ac_site_file1" "$ac_site_file2" ++do ++ test "x$ac_site_file" = xNONE && continue ++ if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 ++$as_echo "$as_me: loading site script $ac_site_file" >&6;} ++ sed 's/^/| /' "$ac_site_file" >&5 ++ . "$ac_site_file" ++ fi ++done ++ ++if test -r "$cache_file"; then ++ # Some versions of bash will fail to source /dev/null (special files ++ # actually), so we avoid doing that. DJGPP emulates it as a regular file. ++ if test /dev/null != "$cache_file" && test -f "$cache_file"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 ++$as_echo "$as_me: loading cache $cache_file" >&6;} ++ case $cache_file in ++ [\\/]* | ?:[\\/]* ) . "$cache_file";; ++ *) . "./$cache_file";; ++ esac ++ fi ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5 ++$as_echo "$as_me: creating cache $cache_file" >&6;} ++ >$cache_file ++fi ++ ++as_fn_append ac_header_list " stdlib.h" ++as_fn_append ac_header_list " unistd.h" ++as_fn_append ac_header_list " sys/param.h" ++# Check that the precious variables saved in the cache have kept the same ++# value. ++ac_cache_corrupted=false ++for ac_var in $ac_precious_vars; do ++ eval ac_old_set=\$ac_cv_env_${ac_var}_set ++ eval ac_new_set=\$ac_env_${ac_var}_set ++ eval ac_old_val=\$ac_cv_env_${ac_var}_value ++ eval ac_new_val=\$ac_env_${ac_var}_value ++ case $ac_old_set,$ac_new_set in ++ set,) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 ++$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} ++ ac_cache_corrupted=: ;; ++ ,set) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 ++$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} ++ ac_cache_corrupted=: ;; ++ ,);; ++ *) ++ if test "x$ac_old_val" != "x$ac_new_val"; then ++ # differences in whitespace do not lead to failure. ++ ac_old_val_w=`echo x $ac_old_val` ++ ac_new_val_w=`echo x $ac_new_val` ++ if test "$ac_old_val_w" != "$ac_new_val_w"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 ++$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} ++ ac_cache_corrupted=: ++ else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 ++$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} ++ eval $ac_var=\$ac_old_val ++ fi ++ { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 ++$as_echo "$as_me: former value: \`$ac_old_val'" >&2;} ++ { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 ++$as_echo "$as_me: current value: \`$ac_new_val'" >&2;} ++ fi;; ++ esac ++ # Pass precious variables to config.status. ++ if test "$ac_new_set" = set; then ++ case $ac_new_val in ++ *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; ++ *) ac_arg=$ac_var=$ac_new_val ;; ++ esac ++ case " $ac_configure_args " in ++ *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. ++ *) as_fn_append ac_configure_args " '$ac_arg'" ;; ++ esac ++ fi ++done ++if $ac_cache_corrupted; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++ { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 ++$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} ++ as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 ++fi ++## -------------------- ## ++## Main body of script. ## ++## -------------------- ## ++ ++ac_ext=c ++ac_cpp='$CPP $CPPFLAGS' ++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ++ac_compiler_gnu=$ac_cv_c_compiler_gnu ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking nano version" >&5 ++$as_echo_n "checking nano version... " >&6; } ++ ++ NANO=$(echo 0.4.3 | sed 's/[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.*//') ++ ++ ++ if test x"$NANO" = x || test "x$NANO" = "x0" ; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: 0 (release)" >&5 ++$as_echo "0 (release)" >&6; } ++ NANO=0 ++ ORC_CVS=no ++ else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NANO" >&5 ++$as_echo "$NANO" >&6; } ++ ORC_CVS=yes + fi ++ ++ ++ac_aux_dir= ++for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do ++ for ac_t in install-sh install.sh shtool; do ++ if test -f "$ac_dir/$ac_t"; then ++ ac_aux_dir=$ac_dir ++ ac_install_sh="$ac_aux_dir/$ac_t -c" ++ break 2 ++ fi ++ done + done + if test -z "$ac_aux_dir"; then +- { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5 +-$as_echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 + fi + + # These three variables are undocumented and unsupported, +@@ -2117,35 +2624,27 @@ + + # Make sure we can run config.sub. + $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || +- { { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5 +-$as_echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 + +-{ $as_echo "$as_me:$LINENO: checking build system type" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 + $as_echo_n "checking build system type... " >&6; } +-if test "${ac_cv_build+set}" = set; then ++if test "${ac_cv_build+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_build_alias=$build_alias + test "x$ac_build_alias" = x && + ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` + test "x$ac_build_alias" = x && +- { { $as_echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 +-$as_echo "$as_me: error: cannot guess build type; you must specify one" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5 + ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || +- { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5 +-$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 + + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_build" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 + $as_echo "$ac_cv_build" >&6; } + case $ac_cv_build in + *-*-*) ;; +-*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical build" >&5 +-$as_echo "$as_me: error: invalid value of canonical build" >&2;} +- { (exit 1); exit 1; }; };; ++*) as_fn_error "invalid value of canonical build" "$LINENO" 5;; + esac + build=$ac_cv_build + ac_save_IFS=$IFS; IFS='-' +@@ -2161,28 +2660,24 @@ + case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac + + +-{ $as_echo "$as_me:$LINENO: checking host system type" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 + $as_echo_n "checking host system type... " >&6; } +-if test "${ac_cv_host+set}" = set; then ++if test "${ac_cv_host+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test "x$host_alias" = x; then + ac_cv_host=$ac_cv_build + else + ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || +- { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5 +-$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 + fi + + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_host" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 + $as_echo "$ac_cv_host" >&6; } + case $ac_cv_host in + *-*-*) ;; +-*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical host" >&5 +-$as_echo "$as_me: error: invalid value of canonical host" >&2;} +- { (exit 1); exit 1; }; };; ++*) as_fn_error "invalid value of canonical host" "$LINENO" 5;; + esac + host=$ac_cv_host + ac_save_IFS=$IFS; IFS='-' +@@ -2198,7 +2693,7 @@ + case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac + + +-am__api_version='1.10' ++am__api_version='1.11' + + # Find a good install program. We prefer a C program (faster), + # so one script is as good as another. But avoid the broken or +@@ -2214,10 +2709,10 @@ + # OS/2's system install, which has a completely different semantic + # ./install, which can be erroneously created by make from ./install.sh. + # Reject install programs that cannot install multiple files. +-{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 + $as_echo_n "checking for a BSD-compatible install... " >&6; } + if test -z "$INSTALL"; then +-if test "${ac_cv_path_install+set}" = set; then ++if test "${ac_cv_path_install+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +@@ -2225,11 +2720,11 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- # Account for people who put trailing slashes in PATH elements. +-case $as_dir/ in +- ./ | .// | /cC/* | \ ++ # Account for people who put trailing slashes in PATH elements. ++case $as_dir/ in #(( ++ ./ | .// | /[cC]/* | \ + /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ +- ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \ ++ ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \ + /usr/ucb/* ) ;; + *) + # OSF1 and SCO ODT 3.0 have their own names for install. +@@ -2266,7 +2761,7 @@ + ;; + esac + +-done ++ done + IFS=$as_save_IFS + + rm -rf conftest.one conftest.two conftest.dir +@@ -2282,7 +2777,7 @@ + INSTALL=$ac_install_sh + fi + fi +-{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5 + $as_echo "$INSTALL" >&6; } + + # Use test -z because SunOS4 sh mishandles braces in ${var-val}. +@@ -2293,21 +2788,34 @@ + + test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' + +-{ $as_echo "$as_me:$LINENO: checking whether build environment is sane" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 + $as_echo_n "checking whether build environment is sane... " >&6; } + # Just in case + sleep 1 + echo timestamp > conftest.file ++# Reject unsafe characters in $srcdir or the absolute working directory ++# name. Accept space and tab only in the latter. ++am_lf=' ++' ++case `pwd` in ++ *[\\\"\#\$\&\'\`$am_lf]*) ++ as_fn_error "unsafe absolute working directory name" "$LINENO" 5;; ++esac ++case $srcdir in ++ *[\\\"\#\$\&\'\`$am_lf\ \ ]*) ++ as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; ++esac ++ + # Do `set' in a subshell so we don't clobber the current shell's + # arguments. Must try -L first in case configure is actually a + # symlink; some systems play weird games with the mod time of symlinks + # (eg FreeBSD returns the mod time of the symlink's containing + # directory). + if ( +- set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null` ++ set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` + if test "$*" = "X"; then + # -L didn't work. +- set X `ls -t $srcdir/configure conftest.file` ++ set X `ls -t "$srcdir/configure" conftest.file` + fi + rm -f conftest.file + if test "$*" != "X $srcdir/configure conftest.file" \ +@@ -2317,11 +2825,8 @@ + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". +- { { $as_echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken +-alias in your environment" >&5 +-$as_echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken +-alias in your environment" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "ls -t appears to fail. Make sure there is not a broken ++alias in your environment" "$LINENO" 5 + fi + + test "$2" = conftest.file +@@ -2330,13 +2835,10 @@ + # Ok. + : + else +- { { $as_echo "$as_me:$LINENO: error: newly created file is older than distributed files! +-Check your system clock" >&5 +-$as_echo "$as_me: error: newly created file is older than distributed files! +-Check your system clock" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "newly created file is older than distributed files! ++Check your system clock" "$LINENO" 5 + fi +-{ $as_echo "$as_me:$LINENO: result: yes" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + test "$program_prefix" != NONE && + program_transform_name="s&^&$program_prefix&;$program_transform_name" +@@ -2351,20 +2853,136 @@ + # expand $ac_aux_dir to an absolute path + am_aux_dir=`cd $ac_aux_dir && pwd` + +-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" ++if test x"${MISSING+set}" != xset; then ++ case $am_aux_dir in ++ *\ * | *\ *) ++ MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; ++ *) ++ MISSING="\${SHELL} $am_aux_dir/missing" ;; ++ esac ++fi + # Use eval to expand $SHELL + if eval "$MISSING --run true"; then + am_missing_run="$MISSING --run " + else + am_missing_run= +- { $as_echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5 + $as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} + fi + +-{ $as_echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5 ++if test x"${install_sh}" != xset; then ++ case $am_aux_dir in ++ *\ * | *\ *) ++ install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; ++ *) ++ install_sh="\${SHELL} $am_aux_dir/install-sh" ++ esac ++fi ++ ++# Installed binaries are usually stripped using `strip' when the user ++# run `make install-strip'. However `strip' might not be the right ++# tool to use in cross-compilation environments, therefore Automake ++# will honor the `STRIP' environment variable to overrule this program. ++if test "$cross_compiling" != no; then ++ if test -n "$ac_tool_prefix"; then ++ # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. ++set dummy ${ac_tool_prefix}strip; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_STRIP+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$STRIP"; then ++ ac_cv_prog_STRIP="$STRIP" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_STRIP="${ac_tool_prefix}strip" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++STRIP=$ac_cv_prog_STRIP ++if test -n "$STRIP"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 ++$as_echo "$STRIP" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++fi ++if test -z "$ac_cv_prog_STRIP"; then ++ ac_ct_STRIP=$STRIP ++ # Extract the first word of "strip", so it can be a program name with args. ++set dummy strip; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$ac_ct_STRIP"; then ++ ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_ac_ct_STRIP="strip" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP ++if test -n "$ac_ct_STRIP"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 ++$as_echo "$ac_ct_STRIP" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ if test "x$ac_ct_STRIP" = x; then ++ STRIP=":" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 ++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ++ac_tool_warned=yes ;; ++esac ++ STRIP=$ac_ct_STRIP ++ fi ++else ++ STRIP="$ac_cv_prog_STRIP" ++fi ++ ++fi ++INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5 + $as_echo_n "checking for a thread-safe mkdir -p... " >&6; } + if test -z "$MKDIR_P"; then +- if test "${ac_cv_path_mkdir+set}" = set; then ++ if test "${ac_cv_path_mkdir+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +@@ -2372,7 +2990,7 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_prog in mkdir gmkdir; do ++ for ac_prog in mkdir gmkdir; do + for ac_exec_ext in '' $ac_executable_extensions; do + { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue + case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( +@@ -2384,11 +3002,12 @@ + esac + done + done +-done ++ done + IFS=$as_save_IFS + + fi + ++ test -d ./--version && rmdir ./--version + if test "${ac_cv_path_mkdir+set}" = set; then + MKDIR_P="$ac_cv_path_mkdir -p" + else +@@ -2396,11 +3015,10 @@ + # value for MKDIR_P within a source directory, because that will + # break other packages using the cache if that directory is + # removed, or if the value is a relative name. +- test -d ./--version && rmdir ./--version + MKDIR_P="$ac_install_sh -d" + fi + fi +-{ $as_echo "$as_me:$LINENO: result: $MKDIR_P" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 + $as_echo "$MKDIR_P" >&6; } + + mkdir_p="$MKDIR_P" +@@ -2413,9 +3031,9 @@ + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_AWK+set}" = set; then ++if test "${ac_cv_prog_AWK+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$AWK"; then +@@ -2426,24 +3044,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_AWK="$ac_prog" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + AWK=$ac_cv_prog_AWK + if test -n "$AWK"; then +- { $as_echo "$as_me:$LINENO: result: $AWK" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5 + $as_echo "$AWK" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -2451,11 +3069,11 @@ + test -n "$AWK" && break + done + +-{ $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5 + $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } + set x ${MAKE-make} + ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` +-if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then ++if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 + else + cat >conftest.make <<\_ACEOF +@@ -2473,11 +3091,11 @@ + rm -f conftest.make + fi + if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then +- { $as_echo "$as_me:$LINENO: result: yes" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + SET_MAKE= + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + SET_MAKE="MAKE=${MAKE-make}" + fi +@@ -2497,9 +3115,7 @@ + am__isrc=' -I$(srcdir)' + # test to see if srcdir already configured + if test -f $srcdir/config.status; then +- { { $as_echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 +-$as_echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 + fi + fi + +@@ -2543,113 +3159,11 @@ + + MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} + +-install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"} ++# We need awk for the "check" target. The system "awk" is bad on ++# some platforms. ++# Always define AMTAR for backward compatibility. + +-# Installed binaries are usually stripped using `strip' when the user +-# run `make install-strip'. However `strip' might not be the right +-# tool to use in cross-compilation environments, therefore Automake +-# will honor the `STRIP' environment variable to overrule this program. +-if test "$cross_compiling" != no; then +- if test -n "$ac_tool_prefix"; then +- # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. +-set dummy ${ac_tool_prefix}strip; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_STRIP+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- if test -n "$STRIP"; then +- ac_cv_prog_STRIP="$STRIP" # Let the user override the test. +-else +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_prog_STRIP="${ac_tool_prefix}strip" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done +-IFS=$as_save_IFS +- +-fi +-fi +-STRIP=$ac_cv_prog_STRIP +-if test -n "$STRIP"; then +- { $as_echo "$as_me:$LINENO: result: $STRIP" >&5 +-$as_echo "$STRIP" >&6; } +-else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } +-fi +- +- +-fi +-if test -z "$ac_cv_prog_STRIP"; then +- ac_ct_STRIP=$STRIP +- # Extract the first word of "strip", so it can be a program name with args. +-set dummy strip; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- if test -n "$ac_ct_STRIP"; then +- ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. +-else +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_prog_ac_ct_STRIP="strip" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done +-IFS=$as_save_IFS +- +-fi +-fi +-ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP +-if test -n "$ac_ct_STRIP"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 +-$as_echo "$ac_ct_STRIP" >&6; } +-else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } +-fi +- +- if test "x$ac_ct_STRIP" = x; then +- STRIP=":" +- else +- case $cross_compiling:$ac_tool_warned in +-yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +-ac_tool_warned=yes ;; +-esac +- STRIP=$ac_ct_STRIP +- fi +-else +- STRIP="$ac_cv_prog_STRIP" +-fi +- +-fi +-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" +- +-# We need awk for the "check" target. The system "awk" is bad on +-# some platforms. +-# Always define AMTAR for backward compatibility. +- +-AMTAR=${AMTAR-"${am_missing_run}tar"} ++AMTAR=${AMTAR-"${am_missing_run}tar"} + + am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -' + +@@ -2658,16 +3172,17 @@ + + + +-{ $as_echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5 ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 + $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } + # Check whether --enable-maintainer-mode was given. +-if test "${enable_maintainer_mode+set}" = set; then ++if test "${enable_maintainer_mode+set}" = set; then : + enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval + else + USE_MAINTAINER_MODE=no + fi + +- { $as_echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5 + $as_echo "$USE_MAINTAINER_MODE" >&6; } + if test $USE_MAINTAINER_MODE = yes; then + MAINTAINER_MODE_TRUE= +@@ -2696,9 +3211,9 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args. + set dummy ${ac_tool_prefix}as; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_AS+set}" = set; then ++if test "${ac_cv_prog_AS+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$AS"; then +@@ -2709,24 +3224,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_AS="${ac_tool_prefix}as" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + AS=$ac_cv_prog_AS + if test -n "$AS"; then +- { $as_echo "$as_me:$LINENO: result: $AS" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AS" >&5 + $as_echo "$AS" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -2736,9 +3251,9 @@ + ac_ct_AS=$AS + # Extract the first word of "as", so it can be a program name with args. + set dummy as; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_ac_ct_AS+set}" = set; then ++if test "${ac_cv_prog_ac_ct_AS+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_AS"; then +@@ -2749,24 +3264,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_AS="as" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + ac_ct_AS=$ac_cv_prog_ac_ct_AS + if test -n "$ac_ct_AS"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_AS" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AS" >&5 + $as_echo "$ac_ct_AS" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -2775,7 +3290,7 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 + $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac +@@ -2788,9 +3303,9 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. + set dummy ${ac_tool_prefix}dlltool; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_DLLTOOL+set}" = set; then ++if test "${ac_cv_prog_DLLTOOL+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$DLLTOOL"; then +@@ -2801,24 +3316,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + DLLTOOL=$ac_cv_prog_DLLTOOL + if test -n "$DLLTOOL"; then +- { $as_echo "$as_me:$LINENO: result: $DLLTOOL" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 + $as_echo "$DLLTOOL" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -2828,9 +3343,9 @@ + ac_ct_DLLTOOL=$DLLTOOL + # Extract the first word of "dlltool", so it can be a program name with args. + set dummy dlltool; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then ++if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_DLLTOOL"; then +@@ -2841,24 +3356,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_DLLTOOL="dlltool" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL + if test -n "$ac_ct_DLLTOOL"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_DLLTOOL" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 + $as_echo "$ac_ct_DLLTOOL" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -2867,7 +3382,7 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 + $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac +@@ -2880,9 +3395,9 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. + set dummy ${ac_tool_prefix}objdump; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_OBJDUMP+set}" = set; then ++if test "${ac_cv_prog_OBJDUMP+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$OBJDUMP"; then +@@ -2893,24 +3408,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + OBJDUMP=$ac_cv_prog_OBJDUMP + if test -n "$OBJDUMP"; then +- { $as_echo "$as_me:$LINENO: result: $OBJDUMP" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5 + $as_echo "$OBJDUMP" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -2920,9 +3435,9 @@ + ac_ct_OBJDUMP=$OBJDUMP + # Extract the first word of "objdump", so it can be a program name with args. + set dummy objdump; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then ++if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_OBJDUMP"; then +@@ -2933,24 +3448,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_OBJDUMP="objdump" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP + if test -n "$ac_ct_OBJDUMP"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5 + $as_echo "$ac_ct_OBJDUMP" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -2959,7 +3474,7 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 + $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac +@@ -2996,7 +3511,7 @@ + + case `pwd` in + *\ * | *\ *) +- { $as_echo "$as_me:$LINENO: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5 + $as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;; + esac + +@@ -3027,44 +3542,44 @@ + am_make=${MAKE-make} + cat > confinc << 'END' + am__doit: +- @echo done ++ @echo this is the am__doit target + .PHONY: am__doit + END + # If we don't find an include directive, just comment out the code. +-{ $as_echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5 + $as_echo_n "checking for style of include used by $am_make... " >&6; } + am__include="#" + am__quote= + _am_result=none + # First try GNU make style include. + echo "include confinc" > confmf +-# We grep out `Entering directory' and `Leaving directory' +-# messages which can occur if `w' ends up in MAKEFLAGS. +-# In particular we don't look at `^make:' because GNU make might +-# be invoked under some other name (usually "gmake"), in which +-# case it prints its new name instead of `make'. +-if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then +- am__include=include +- am__quote= +- _am_result=GNU +-fi ++# Ignore all kinds of additional output from `make'. ++case `$am_make -s -f confmf 2> /dev/null` in #( ++*the\ am__doit\ target*) ++ am__include=include ++ am__quote= ++ _am_result=GNU ++ ;; ++esac + # Now try BSD make style include. + if test "$am__include" = "#"; then + echo '.include "confinc"' > confmf +- if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then +- am__include=.include +- am__quote="\"" +- _am_result=BSD +- fi ++ case `$am_make -s -f confmf 2> /dev/null` in #( ++ *the\ am__doit\ target*) ++ am__include=.include ++ am__quote="\"" ++ _am_result=BSD ++ ;; ++ esac + fi + + +-{ $as_echo "$as_me:$LINENO: result: $_am_result" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5 + $as_echo "$_am_result" >&6; } + rm -f confinc confmf + + # Check whether --enable-dependency-tracking was given. +-if test "${enable_dependency_tracking+set}" = set; then ++if test "${enable_dependency_tracking+set}" = set; then : + enableval=$enable_dependency_tracking; + fi + +@@ -3089,9 +3604,9 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. + set dummy ${ac_tool_prefix}gcc; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_CC+set}" = set; then ++if test "${ac_cv_prog_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$CC"; then +@@ -3102,24 +3617,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_CC="${ac_tool_prefix}gcc" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + CC=$ac_cv_prog_CC + if test -n "$CC"; then +- { $as_echo "$as_me:$LINENO: result: $CC" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 + $as_echo "$CC" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -3129,9 +3644,9 @@ + ac_ct_CC=$CC + # Extract the first word of "gcc", so it can be a program name with args. + set dummy gcc; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then ++if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_CC"; then +@@ -3142,24 +3657,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_CC="gcc" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + ac_ct_CC=$ac_cv_prog_ac_ct_CC + if test -n "$ac_ct_CC"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 + $as_echo "$ac_ct_CC" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -3168,7 +3683,7 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 + $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac +@@ -3182,9 +3697,9 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. + set dummy ${ac_tool_prefix}cc; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_CC+set}" = set; then ++if test "${ac_cv_prog_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$CC"; then +@@ -3195,24 +3710,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_CC="${ac_tool_prefix}cc" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + CC=$ac_cv_prog_CC + if test -n "$CC"; then +- { $as_echo "$as_me:$LINENO: result: $CC" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 + $as_echo "$CC" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -3222,9 +3737,9 @@ + if test -z "$CC"; then + # Extract the first word of "cc", so it can be a program name with args. + set dummy cc; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_CC+set}" = set; then ++if test "${ac_cv_prog_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$CC"; then +@@ -3236,18 +3751,18 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then + ac_prog_rejected=yes + continue + fi + ac_cv_prog_CC="cc" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + if test $ac_prog_rejected = yes; then +@@ -3266,10 +3781,10 @@ + fi + CC=$ac_cv_prog_CC + if test -n "$CC"; then +- { $as_echo "$as_me:$LINENO: result: $CC" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 + $as_echo "$CC" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -3281,9 +3796,9 @@ + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. + set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_CC+set}" = set; then ++if test "${ac_cv_prog_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$CC"; then +@@ -3294,24 +3809,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_CC="$ac_tool_prefix$ac_prog" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + CC=$ac_cv_prog_CC + if test -n "$CC"; then +- { $as_echo "$as_me:$LINENO: result: $CC" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 + $as_echo "$CC" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -3325,9 +3840,9 @@ + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then ++if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_CC"; then +@@ -3338,24 +3853,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_CC="$ac_prog" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + ac_ct_CC=$ac_cv_prog_ac_ct_CC + if test -n "$ac_ct_CC"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 + $as_echo "$ac_ct_CC" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -3368,7 +3883,7 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 + $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac +@@ -3379,57 +3894,37 @@ + fi + + +-test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 ++test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH +-See \`config.log' for more details." >&5 +-$as_echo "$as_me: error: no acceptable C compiler found in \$PATH +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; }; } ++as_fn_error "no acceptable C compiler found in \$PATH ++See \`config.log' for more details." "$LINENO" 5; } + + # Provide some information about the compiler. +-$as_echo "$as_me:$LINENO: checking for C compiler version" >&5 ++$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 + set X $ac_compile + ac_compiler=$2 +-{ (ac_try="$ac_compiler --version >&5" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compiler --version >&5") 2>&5 +- ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } +-{ (ac_try="$ac_compiler -v >&5" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compiler -v >&5") 2>&5 +- ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } +-{ (ac_try="$ac_compiler -V >&5" ++for ac_option in --version -v -V -qversion; do ++ { { ac_try="$ac_compiler $ac_option >&5" + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compiler -V >&5") 2>&5 ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_compiler $ac_option >&5") 2>conftest.err + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } ++ if test -s conftest.err; then ++ sed '10a\ ++... rest of stderr output deleted ... ++ 10q' conftest.err >conftest.er1 ++ cat conftest.er1 >&5 ++ fi ++ rm -f conftest.er1 conftest.err ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } ++done + +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -3445,8 +3940,8 @@ + # Try to create an executable without -o first, disregard a.out. + # It will help us diagnose broken compilers, and finding out an intuition + # of exeext. +-{ $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 +-$as_echo_n "checking for C compiler default output file name... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 ++$as_echo_n "checking whether the C compiler works... " >&6; } + ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` + + # The possible output files: +@@ -3462,17 +3957,17 @@ + done + rm -f $ac_rmfiles + +-if { (ac_try="$ac_link_default" ++if { { ac_try="$ac_link_default" + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link_default") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then : + # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. + # So ignore a value of `no', otherwise this would lead to `EXEEXT = no' + # in a Makefile. We should not override ac_cv_exeext if it was cached, +@@ -3489,7 +3984,7 @@ + # certainly right. + break;; + *.* ) +- if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; ++ if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; + then :; else + ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` + fi +@@ -3508,84 +4003,42 @@ + else + ac_file='' + fi +- +-{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5 +-$as_echo "$ac_file" >&6; } +-if test -z "$ac_file"; then +- $as_echo "$as_me: failed program was:" >&5 ++if test -z "$ac_file"; then : ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++$as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 ++{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables +-See \`config.log' for more details." >&5 +-$as_echo "$as_me: error: C compiler cannot create executables +-See \`config.log' for more details." >&2;} +- { (exit 77); exit 77; }; }; } ++{ as_fn_set_status 77 ++as_fn_error "C compiler cannot create executables ++See \`config.log' for more details." "$LINENO" 5; }; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ++$as_echo "yes" >&6; } + fi +- ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 ++$as_echo_n "checking for C compiler default output file name... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 ++$as_echo "$ac_file" >&6; } + ac_exeext=$ac_cv_exeext + +-# Check that the compiler produces executables we can run. If not, either +-# the compiler is broken, or we cross compile. +-{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5 +-$as_echo_n "checking whether the C compiler works... " >&6; } +-# FIXME: These cross compiler hacks should be removed for Autoconf 3.0 +-# If not cross compiling, check that we can run a simple program. +-if test "$cross_compiling" != yes; then +- if { ac_try='./$ac_file' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- cross_compiling=no +- else +- if test "$cross_compiling" = maybe; then +- cross_compiling=yes +- else +- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs. +-If you meant to cross compile, use \`--host'. +-See \`config.log' for more details." >&5 +-$as_echo "$as_me: error: cannot run C compiled programs. +-If you meant to cross compile, use \`--host'. +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; }; } +- fi +- fi +-fi +-{ $as_echo "$as_me:$LINENO: result: yes" >&5 +-$as_echo "yes" >&6; } +- + rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out + ac_clean_files=$ac_clean_files_save +-# Check that the compiler produces executables we can run. If not, either +-# the compiler is broken, or we cross compile. +-{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 +-$as_echo_n "checking whether we are cross compiling... " >&6; } +-{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5 +-$as_echo "$cross_compiling" >&6; } +- +-{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 + $as_echo_n "checking for suffix of executables... " >&6; } +-if { (ac_try="$ac_link" ++if { { ac_try="$ac_link" + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then : + # If both `conftest.exe' and `conftest' are `present' (well, observable) + # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will + # work properly (i.e., refer to `conftest.exe'), while it won't with +@@ -3600,32 +4053,83 @@ + esac + done + else +- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link +-See \`config.log' for more details." >&5 +-$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; }; } ++as_fn_error "cannot compute suffix of executables: cannot compile and link ++See \`config.log' for more details." "$LINENO" 5; } + fi +- +-rm -f conftest$ac_cv_exeext +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 ++rm -f conftest conftest$ac_cv_exeext ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 + $as_echo "$ac_cv_exeext" >&6; } + + rm -f conftest.$ac_ext + EXEEXT=$ac_cv_exeext + ac_exeext=$EXEEXT +-{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5 ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++#include ++int ++main () ++{ ++FILE *f = fopen ("conftest.out", "w"); ++ return ferror (f) || fclose (f) != 0; ++ ++ ; ++ return 0; ++} ++_ACEOF ++ac_clean_files="$ac_clean_files conftest.out" ++# Check that the compiler produces executables we can run. If not, either ++# the compiler is broken, or we cross compile. ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 ++$as_echo_n "checking whether we are cross compiling... " >&6; } ++if test "$cross_compiling" != yes; then ++ { { ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_link") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } ++ if { ac_try='./conftest$ac_cv_exeext' ++ { { case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; }; then ++ cross_compiling=no ++ else ++ if test "$cross_compiling" = maybe; then ++ cross_compiling=yes ++ else ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++as_fn_error "cannot run C compiled programs. ++If you meant to cross compile, use \`--host'. ++See \`config.log' for more details." "$LINENO" 5; } ++ fi ++ fi ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 ++$as_echo "$cross_compiling" >&6; } ++ ++rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out ++ac_clean_files=$ac_clean_files_save ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 + $as_echo_n "checking for suffix of object files... " >&6; } +-if test "${ac_cv_objext+set}" = set; then ++if test "${ac_cv_objext+set}" = set; then : + $as_echo_n "(cached) " >&6 + else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -3637,17 +4141,17 @@ + } + _ACEOF + rm -f conftest.o conftest.obj +-if { (ac_try="$ac_compile" ++if { { ac_try="$ac_compile" + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compile") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then : + for ac_file in conftest.o conftest.obj conftest.*; do + test -f "$ac_file" || continue; + case $ac_file in +@@ -3660,31 +4164,23 @@ + $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 ++{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile +-See \`config.log' for more details." >&5 +-$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; }; } ++as_fn_error "cannot compute suffix of object files: cannot compile ++See \`config.log' for more details." "$LINENO" 5; } + fi +- + rm -f conftest.$ac_cv_objext conftest.$ac_ext + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 + $as_echo "$ac_cv_objext" >&6; } + OBJEXT=$ac_cv_objext + ac_objext=$OBJEXT +-{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 + $as_echo_n "checking whether we are using the GNU C compiler... " >&6; } +-if test "${ac_cv_c_compiler_gnu+set}" = set; then ++if test "${ac_cv_c_compiler_gnu+set}" = set; then : + $as_echo_n "(cached) " >&6 + else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -3698,37 +4194,16 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then ++if ac_fn_c_try_compile "$LINENO"; then : + ac_compiler_gnu=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_compiler_gnu=no ++ ac_compiler_gnu=no + fi +- + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_cv_c_compiler_gnu=$ac_compiler_gnu + + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 + $as_echo "$ac_cv_c_compiler_gnu" >&6; } + if test $ac_compiler_gnu = yes; then + GCC=yes +@@ -3737,20 +4212,16 @@ + fi + ac_test_CFLAGS=${CFLAGS+set} + ac_save_CFLAGS=$CFLAGS +-{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 + $as_echo_n "checking whether $CC accepts -g... " >&6; } +-if test "${ac_cv_prog_cc_g+set}" = set; then ++if test "${ac_cv_prog_cc_g+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_save_c_werror_flag=$ac_c_werror_flag + ac_c_werror_flag=yes + ac_cv_prog_cc_g=no + CFLAGS="-g" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -3761,35 +4232,11 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then ++if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_prog_cc_g=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- CFLAGS="" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ CFLAGS="" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -3800,36 +4247,12 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- : +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 ++if ac_fn_c_try_compile "$LINENO"; then : + +- ac_c_werror_flag=$ac_save_c_werror_flag ++else ++ ac_c_werror_flag=$ac_save_c_werror_flag + CFLAGS="-g" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -3840,42 +4263,17 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then ++if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_prog_cc_g=yes +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- + fi +- + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi +- + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi +- + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_c_werror_flag=$ac_save_c_werror_flag + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 + $as_echo "$ac_cv_prog_cc_g" >&6; } + if test "$ac_test_CFLAGS" = set; then + CFLAGS=$ac_save_CFLAGS +@@ -3892,18 +4290,14 @@ + CFLAGS= + fi + fi +-{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 + $as_echo_n "checking for $CC option to accept ISO C89... " >&6; } +-if test "${ac_cv_prog_cc_c89+set}" = set; then ++if test "${ac_cv_prog_cc_c89+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_cv_prog_cc_c89=no + ac_save_CC=$CC +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + #include +@@ -3960,32 +4354,9 @@ + -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" + do + CC="$ac_save_CC $ac_arg" +- rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then ++ if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_prog_cc_c89=$ac_arg +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- + fi +- + rm -f core conftest.err conftest.$ac_objext + test "x$ac_cv_prog_cc_c89" != "xno" && break + done +@@ -3996,17 +4367,19 @@ + # AC_CACHE_VAL + case "x$ac_cv_prog_cc_c89" in + x) +- { $as_echo "$as_me:$LINENO: result: none needed" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 + $as_echo "none needed" >&6; } ;; + xno) +- { $as_echo "$as_me:$LINENO: result: unsupported" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 + $as_echo "unsupported" >&6; } ;; + *) + CC="$CC $ac_cv_prog_cc_c89" +- { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 + $as_echo "$ac_cv_prog_cc_c89" >&6; } ;; + esac ++if test "x$ac_cv_prog_cc_c89" != xno; then : + ++fi + + ac_ext=c + ac_cpp='$CPP $CPPFLAGS' +@@ -4016,9 +4389,9 @@ + + depcc="$CC" am_compiler_list= + +-{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 + $as_echo_n "checking dependency style of $depcc... " >&6; } +-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then ++if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then +@@ -4044,6 +4417,11 @@ + if test "$am_compiler_list" = ""; then + am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` + fi ++ am__universal=false ++ case " $depcc " in #( ++ *\ -arch\ *\ -arch\ *) am__universal=true ;; ++ esac ++ + for depmode in $am_compiler_list; do + # Setup a source with many dependencies, because some compilers + # like to wrap large dependency lists on column 80 (with \), and +@@ -4061,7 +4439,17 @@ + done + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + ++ # We check with `-c' and `-o' for the sake of the "dashmstdout" ++ # mode. It turns out that the SunPro C++ compiler does not properly ++ # handle `-M -o', and we need to detect this. Also, some Intel ++ # versions had trouble with output in subdirs ++ am__obj=sub/conftest.${OBJEXT-o} ++ am__minus_obj="-o $am__obj" + case $depmode in ++ gcc) ++ # This depmode causes a compiler race in universal mode. ++ test "$am__universal" = false || continue ++ ;; + nosideeffect) + # after this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested +@@ -4071,19 +4459,23 @@ + break + fi + ;; ++ msvisualcpp | msvcmsys) ++ # This compiler won't grok `-c -o', but also, the minuso test has ++ # not run yet. These depmodes are late enough in the game, and ++ # so weak that their functioning should not be impacted. ++ am__obj=conftest.${OBJEXT-o} ++ am__minus_obj= ++ ;; + none) break ;; + esac +- # We check with `-c' and `-o' for the sake of the "dashmstdout" +- # mode. It turns out that the SunPro C++ compiler does not properly +- # handle `-M -o', and we need to detect this. + if depmode=$depmode \ +- source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ ++ source=sub/conftest.c object=$am__obj \ + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ +- $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ ++ $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ + >/dev/null 2>conftest.err && + grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && +- grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && ++ grep $am__obj sub/conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then + # icc doesn't choke on unknown options, it will just issue warnings + # or remarks (even with -Werror). So we grep stderr for any message +@@ -4107,7 +4499,7 @@ + fi + + fi +-{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5 + $as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } + CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type + +@@ -4122,9 +4514,9 @@ + fi + + +-{ $as_echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 + $as_echo_n "checking for a sed that does not truncate output... " >&6; } +-if test "${ac_cv_path_SED+set}" = set; then ++if test "${ac_cv_path_SED+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ +@@ -4132,7 +4524,7 @@ + ac_script="$ac_script$as_nl$ac_script" + done + echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed +- $as_unset ac_script || ac_script= ++ { ac_script=; unset ac_script;} + if test -z "$SED"; then + ac_path_SED_found=false + # Loop through the user's path and test for each of PROGNAME-LIST +@@ -4141,7 +4533,7 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_prog in sed gsed; do ++ for ac_prog in sed gsed; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" + { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue +@@ -4161,7 +4553,7 @@ + $as_echo '' >> "conftest.nl" + "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break +- ac_count=`expr $ac_count + 1` ++ as_fn_arith $ac_count + 1 && ac_count=$as_val + if test $ac_count -gt ${ac_path_SED_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_SED="$ac_path_SED" +@@ -4176,19 +4568,17 @@ + $ac_path_SED_found && break 3 + done + done +-done ++ done + IFS=$as_save_IFS + if test -z "$ac_cv_path_SED"; then +- { { $as_echo "$as_me:$LINENO: error: no acceptable sed could be found in \$PATH" >&5 +-$as_echo "$as_me: error: no acceptable sed could be found in \$PATH" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "no acceptable sed could be found in \$PATH" "$LINENO" 5 + fi + else + ac_cv_path_SED=$SED + fi + + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_SED" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5 + $as_echo "$ac_cv_path_SED" >&6; } + SED="$ac_cv_path_SED" + rm -f conftest.sed +@@ -4206,9 +4596,9 @@ + + + +-{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 + $as_echo_n "checking for grep that handles long lines and -e... " >&6; } +-if test "${ac_cv_path_GREP+set}" = set; then ++if test "${ac_cv_path_GREP+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -z "$GREP"; then +@@ -4219,7 +4609,7 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_prog in grep ggrep; do ++ for ac_prog in grep ggrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" + { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue +@@ -4239,7 +4629,7 @@ + $as_echo 'GREP' >> "conftest.nl" + "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break +- ac_count=`expr $ac_count + 1` ++ as_fn_arith $ac_count + 1 && ac_count=$as_val + if test $ac_count -gt ${ac_path_GREP_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_GREP="$ac_path_GREP" +@@ -4254,26 +4644,24 @@ + $ac_path_GREP_found && break 3 + done + done +-done ++ done + IFS=$as_save_IFS + if test -z "$ac_cv_path_GREP"; then +- { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 +-$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + fi + else + ac_cv_path_GREP=$GREP + fi + + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 + $as_echo "$ac_cv_path_GREP" >&6; } + GREP="$ac_cv_path_GREP" + + +-{ $as_echo "$as_me:$LINENO: checking for egrep" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 + $as_echo_n "checking for egrep... " >&6; } +-if test "${ac_cv_path_EGREP+set}" = set; then ++if test "${ac_cv_path_EGREP+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 +@@ -4287,7 +4675,7 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_prog in egrep; do ++ for ac_prog in egrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" + { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue +@@ -4307,7 +4695,7 @@ + $as_echo 'EGREP' >> "conftest.nl" + "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break +- ac_count=`expr $ac_count + 1` ++ as_fn_arith $ac_count + 1 && ac_count=$as_val + if test $ac_count -gt ${ac_path_EGREP_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_EGREP="$ac_path_EGREP" +@@ -4322,12 +4710,10 @@ + $ac_path_EGREP_found && break 3 + done + done +-done ++ done + IFS=$as_save_IFS + if test -z "$ac_cv_path_EGREP"; then +- { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 +-$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + fi + else + ac_cv_path_EGREP=$EGREP +@@ -4335,14 +4721,14 @@ + + fi + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 + $as_echo "$ac_cv_path_EGREP" >&6; } + EGREP="$ac_cv_path_EGREP" + + +-{ $as_echo "$as_me:$LINENO: checking for fgrep" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5 + $as_echo_n "checking for fgrep... " >&6; } +-if test "${ac_cv_path_FGREP+set}" = set; then ++if test "${ac_cv_path_FGREP+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1 +@@ -4356,7 +4742,7 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_prog in fgrep; do ++ for ac_prog in fgrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext" + { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue +@@ -4376,7 +4762,7 @@ + $as_echo 'FGREP' >> "conftest.nl" + "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break +- ac_count=`expr $ac_count + 1` ++ as_fn_arith $ac_count + 1 && ac_count=$as_val + if test $ac_count -gt ${ac_path_FGREP_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_FGREP="$ac_path_FGREP" +@@ -4391,12 +4777,10 @@ + $ac_path_FGREP_found && break 3 + done + done +-done ++ done + IFS=$as_save_IFS + if test -z "$ac_cv_path_FGREP"; then +- { { $as_echo "$as_me:$LINENO: error: no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 +-$as_echo "$as_me: error: no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + fi + else + ac_cv_path_FGREP=$FGREP +@@ -4404,7 +4788,7 @@ + + fi + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_FGREP" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5 + $as_echo "$ac_cv_path_FGREP" >&6; } + FGREP="$ac_cv_path_FGREP" + +@@ -4430,7 +4814,7 @@ + + + # Check whether --with-gnu-ld was given. +-if test "${with_gnu_ld+set}" = set; then ++if test "${with_gnu_ld+set}" = set; then : + withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes + else + with_gnu_ld=no +@@ -4439,7 +4823,7 @@ + ac_prog=ld + if test "$GCC" = yes; then + # Check if gcc -print-prog-name=ld gives a path. +- { $as_echo "$as_me:$LINENO: checking for ld used by $CC" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 + $as_echo_n "checking for ld used by $CC... " >&6; } + case $host in + *-*-mingw*) +@@ -4469,13 +4853,13 @@ + ;; + esac + elif test "$with_gnu_ld" = yes; then +- { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 + $as_echo_n "checking for GNU ld... " >&6; } + else +- { $as_echo "$as_me:$LINENO: checking for non-GNU ld" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 + $as_echo_n "checking for non-GNU ld... " >&6; } + fi +-if test "${lt_cv_path_LD+set}" = set; then ++if test "${lt_cv_path_LD+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -z "$LD"; then +@@ -4506,18 +4890,16 @@ + + LD="$lt_cv_path_LD" + if test -n "$LD"; then +- { $as_echo "$as_me:$LINENO: result: $LD" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5 + $as_echo "$LD" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi +-test -z "$LD" && { { $as_echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5 +-$as_echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} +- { (exit 1); exit 1; }; } +-{ $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 ++test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 + $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } +-if test "${lt_cv_prog_gnu_ld+set}" = set; then ++if test "${lt_cv_prog_gnu_ld+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + # I'd rather use --version here, but apparently some GNU lds only accept -v. +@@ -4530,7 +4912,7 @@ + ;; + esac + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5 + $as_echo "$lt_cv_prog_gnu_ld" >&6; } + with_gnu_ld=$lt_cv_prog_gnu_ld + +@@ -4542,9 +4924,9 @@ + + + +-{ $as_echo "$as_me:$LINENO: checking for BSD- or MS-compatible name lister (nm)" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5 + $as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; } +-if test "${lt_cv_path_NM+set}" = set; then ++if test "${lt_cv_path_NM+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$NM"; then +@@ -4591,7 +4973,7 @@ + : ${lt_cv_path_NM=no} + fi + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5 + $as_echo "$lt_cv_path_NM" >&6; } + if test "$lt_cv_path_NM" != "no"; then + NM="$lt_cv_path_NM" +@@ -4602,9 +4984,9 @@ + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. + set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_DUMPBIN+set}" = set; then ++if test "${ac_cv_prog_DUMPBIN+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$DUMPBIN"; then +@@ -4615,24 +4997,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + DUMPBIN=$ac_cv_prog_DUMPBIN + if test -n "$DUMPBIN"; then +- { $as_echo "$as_me:$LINENO: result: $DUMPBIN" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5 + $as_echo "$DUMPBIN" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -4646,9 +5028,9 @@ + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then ++if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_DUMPBIN"; then +@@ -4659,24 +5041,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_DUMPBIN="$ac_prog" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN + if test -n "$ac_ct_DUMPBIN"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_DUMPBIN" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5 + $as_echo "$ac_ct_DUMPBIN" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -4689,7 +5071,7 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 + $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac +@@ -4709,44 +5091,44 @@ + + + +-{ $as_echo "$as_me:$LINENO: checking the name lister ($NM) interface" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5 + $as_echo_n "checking the name lister ($NM) interface... " >&6; } +-if test "${lt_cv_nm_interface+set}" = set; then ++if test "${lt_cv_nm_interface+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + lt_cv_nm_interface="BSD nm" + echo "int some_variable = 0;" > conftest.$ac_ext +- (eval echo "\"\$as_me:4719: $ac_compile\"" >&5) ++ (eval echo "\"\$as_me:5101: $ac_compile\"" >&5) + (eval "$ac_compile" 2>conftest.err) + cat conftest.err >&5 +- (eval echo "\"\$as_me:4722: $NM \\\"conftest.$ac_objext\\\"\"" >&5) ++ (eval echo "\"\$as_me:5104: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) + cat conftest.err >&5 +- (eval echo "\"\$as_me:4725: output\"" >&5) ++ (eval echo "\"\$as_me:5107: output\"" >&5) + cat conftest.out >&5 + if $GREP 'External.*some_variable' conftest.out > /dev/null; then + lt_cv_nm_interface="MS dumpbin" + fi + rm -f conftest* + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_nm_interface" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5 + $as_echo "$lt_cv_nm_interface" >&6; } + +-{ $as_echo "$as_me:$LINENO: checking whether ln -s works" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5 + $as_echo_n "checking whether ln -s works... " >&6; } + LN_S=$as_ln_s + if test "$LN_S" = "ln -s"; then +- { $as_echo "$as_me:$LINENO: result: yes" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no, using $LN_S" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5 + $as_echo "no, using $LN_S" >&6; } + fi + + # find the maximum length of command line arguments +-{ $as_echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5 + $as_echo_n "checking the maximum length of command line arguments... " >&6; } +-if test "${lt_cv_sys_max_cmd_len+set}" = set; then ++if test "${lt_cv_sys_max_cmd_len+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + i=0 +@@ -4864,10 +5246,10 @@ + fi + + if test -n $lt_cv_sys_max_cmd_len ; then +- { $as_echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5 + $as_echo "$lt_cv_sys_max_cmd_len" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: none" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5 + $as_echo "none" >&6; } + fi + max_cmd_len=$lt_cv_sys_max_cmd_len +@@ -4881,7 +5263,7 @@ + : ${MV="mv -f"} + : ${RM="rm -f"} + +-{ $as_echo "$as_me:$LINENO: checking whether the shell understands some XSI constructs" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands some XSI constructs" >&5 + $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; } + # Try some XSI features + xsi_shell=no +@@ -4891,17 +5273,17 @@ + && eval 'test $(( 1 + 1 )) -eq 2 \ + && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ + && xsi_shell=yes +-{ $as_echo "$as_me:$LINENO: result: $xsi_shell" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xsi_shell" >&5 + $as_echo "$xsi_shell" >&6; } + + +-{ $as_echo "$as_me:$LINENO: checking whether the shell understands \"+=\"" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands \"+=\"" >&5 + $as_echo_n "checking whether the shell understands \"+=\"... " >&6; } + lt_shell_append=no + ( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \ + >/dev/null 2>&1 \ + && lt_shell_append=yes +-{ $as_echo "$as_me:$LINENO: result: $lt_shell_append" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5 + $as_echo "$lt_shell_append" >&6; } + + +@@ -4936,14 +5318,14 @@ + + + +-{ $as_echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 + $as_echo_n "checking for $LD option to reload object files... " >&6; } +-if test "${lt_cv_ld_reload_flag+set}" = set; then ++if test "${lt_cv_ld_reload_flag+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + lt_cv_ld_reload_flag='-r' + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5 + $as_echo "$lt_cv_ld_reload_flag" >&6; } + reload_flag=$lt_cv_ld_reload_flag + case $reload_flag in +@@ -4972,9 +5354,9 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. + set dummy ${ac_tool_prefix}objdump; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_OBJDUMP+set}" = set; then ++if test "${ac_cv_prog_OBJDUMP+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$OBJDUMP"; then +@@ -4985,24 +5367,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + OBJDUMP=$ac_cv_prog_OBJDUMP + if test -n "$OBJDUMP"; then +- { $as_echo "$as_me:$LINENO: result: $OBJDUMP" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5 + $as_echo "$OBJDUMP" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -5012,9 +5394,9 @@ + ac_ct_OBJDUMP=$OBJDUMP + # Extract the first word of "objdump", so it can be a program name with args. + set dummy objdump; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then ++if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_OBJDUMP"; then +@@ -5025,24 +5407,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_OBJDUMP="objdump" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP + if test -n "$ac_ct_OBJDUMP"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5 + $as_echo "$ac_ct_OBJDUMP" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -5051,7 +5433,7 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 + $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac +@@ -5068,9 +5450,9 @@ + + + +-{ $as_echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5 + $as_echo_n "checking how to recognize dependent libraries... " >&6; } +-if test "${lt_cv_deplibs_check_method+set}" = set; then ++if test "${lt_cv_deplibs_check_method+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + lt_cv_file_magic_cmd='$MAGIC_CMD' +@@ -5185,11 +5567,11 @@ + ;; + + # This must be Linux ELF. +-linux* | k*bsd*-gnu) ++linux* | k*bsd*-gnu | kopensolaris*-gnu) + lt_cv_deplibs_check_method=pass_all + ;; + +-netbsd*) ++netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then + lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' + else +@@ -5264,7 +5646,7 @@ + esac + + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 + $as_echo "$lt_cv_deplibs_check_method" >&6; } + file_magic_cmd=$lt_cv_file_magic_cmd + deplibs_check_method=$lt_cv_deplibs_check_method +@@ -5284,9 +5666,9 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. + set dummy ${ac_tool_prefix}ar; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_AR+set}" = set; then ++if test "${ac_cv_prog_AR+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$AR"; then +@@ -5297,24 +5679,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_AR="${ac_tool_prefix}ar" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + AR=$ac_cv_prog_AR + if test -n "$AR"; then +- { $as_echo "$as_me:$LINENO: result: $AR" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5 + $as_echo "$AR" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -5324,9 +5706,9 @@ + ac_ct_AR=$AR + # Extract the first word of "ar", so it can be a program name with args. + set dummy ar; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_ac_ct_AR+set}" = set; then ++if test "${ac_cv_prog_ac_ct_AR+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_AR"; then +@@ -5337,24 +5719,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_AR="ar" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + ac_ct_AR=$ac_cv_prog_ac_ct_AR + if test -n "$ac_ct_AR"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_AR" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5 + $as_echo "$ac_ct_AR" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -5363,7 +5745,7 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 + $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac +@@ -5389,9 +5771,9 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. + set dummy ${ac_tool_prefix}strip; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_STRIP+set}" = set; then ++if test "${ac_cv_prog_STRIP+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$STRIP"; then +@@ -5402,24 +5784,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_STRIP="${ac_tool_prefix}strip" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + STRIP=$ac_cv_prog_STRIP + if test -n "$STRIP"; then +- { $as_echo "$as_me:$LINENO: result: $STRIP" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 + $as_echo "$STRIP" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -5429,9 +5811,9 @@ + ac_ct_STRIP=$STRIP + # Extract the first word of "strip", so it can be a program name with args. + set dummy strip; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then ++if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_STRIP"; then +@@ -5442,24 +5824,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_STRIP="strip" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP + if test -n "$ac_ct_STRIP"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 + $as_echo "$ac_ct_STRIP" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -5468,7 +5850,7 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 + $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac +@@ -5488,9 +5870,9 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. + set dummy ${ac_tool_prefix}ranlib; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_RANLIB+set}" = set; then ++if test "${ac_cv_prog_RANLIB+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$RANLIB"; then +@@ -5501,24 +5883,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + RANLIB=$ac_cv_prog_RANLIB + if test -n "$RANLIB"; then +- { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5 + $as_echo "$RANLIB" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -5528,9 +5910,9 @@ + ac_ct_RANLIB=$RANLIB + # Extract the first word of "ranlib", so it can be a program name with args. + set dummy ranlib; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then ++if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_RANLIB"; then +@@ -5541,24 +5923,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_RANLIB="ranlib" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB + if test -n "$ac_ct_RANLIB"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5 + $as_echo "$ac_ct_RANLIB" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -5567,7 +5949,7 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 + $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac +@@ -5645,9 +6027,9 @@ + + + # Check for command to grab the raw symbol name followed by C symbol from nm. +-{ $as_echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5 + $as_echo_n "checking command to parse $NM output from $compiler object... " >&6; } +-if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then ++if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + +@@ -5763,18 +6145,18 @@ + int main(){nm_test_var='a';nm_test_func();return(0);} + _LT_EOF + +- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then + # Now try to grab the symbols. + nlist=conftest.nm +- if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5 ++ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\""; } >&5 + (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && test -s "$nlist"; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } && test -s "$nlist"; then + # Try sorting and uniquifying the output. + if sort "$nlist" | uniq > "$nlist"T; then + mv -f "$nlist"T "$nlist" +@@ -5827,11 +6209,11 @@ + lt_save_CFLAGS="$CFLAGS" + LIBS="conftstm.$ac_objext" + CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" +- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ++ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && test -s conftest${ac_exeext}; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } && test -s conftest${ac_exeext}; then + pipe_works=yes + fi + LIBS="$lt_save_LIBS" +@@ -5865,10 +6247,10 @@ + lt_cv_sys_global_symbol_to_cdecl= + fi + if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then +- { $as_echo "$as_me:$LINENO: result: failed" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5 + $as_echo "failed" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: ok" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 + $as_echo "ok" >&6; } + fi + +@@ -5895,7 +6277,7 @@ + + + # Check whether --enable-libtool-lock was given. +-if test "${enable_libtool_lock+set}" = set; then ++if test "${enable_libtool_lock+set}" = set; then : + enableval=$enable_libtool_lock; + fi + +@@ -5907,11 +6289,11 @@ + ia64-*-hpux*) + # Find out which ABI we are using. + echo 'int i;' > conftest.$ac_ext +- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then + case `/usr/bin/file conftest.$ac_objext` in + *ELF-32*) + HPUX_IA64_MODE="32" +@@ -5925,12 +6307,12 @@ + ;; + *-*-irix6*) + # Find out which ABI we are using. +- echo '#line 5928 "configure"' > conftest.$ac_ext +- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ echo '#line 6310 "configure"' > conftest.$ac_ext ++ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then + if test "$lt_cv_prog_gnu_ld" = yes; then + case `/usr/bin/file conftest.$ac_objext` in + *32-bit*) +@@ -5964,11 +6346,11 @@ + s390*-*linux*|s390*-*tpf*|sparc*-*linux*) + # Find out which ABI we are using. + echo 'int i;' > conftest.$ac_ext +- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then + case `/usr/bin/file conftest.o` in + *32-bit*) + case $host in +@@ -6017,9 +6399,9 @@ + # On SCO OpenServer 5, we need -belf to get full-featured binaries. + SAVE_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -belf" +- { $as_echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5 + $as_echo_n "checking whether the C compiler needs -belf... " >&6; } +-if test "${lt_cv_cc_needs_belf+set}" = set; then ++if test "${lt_cv_cc_needs_belf+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_ext=c +@@ -6028,11 +6410,7 @@ + ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_c_compiler_gnu + +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -6043,38 +6421,13 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_c_try_link "$LINENO"; then : + lt_cv_cc_needs_belf=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- lt_cv_cc_needs_belf=no ++ lt_cv_cc_needs_belf=no + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + ac_ext=c + ac_cpp='$CPP $CPPFLAGS' + ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +@@ -6082,7 +6435,7 @@ + ac_compiler_gnu=$ac_cv_c_compiler_gnu + + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5 + $as_echo "$lt_cv_cc_needs_belf" >&6; } + if test x"$lt_cv_cc_needs_belf" != x"yes"; then + # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf +@@ -6092,11 +6445,11 @@ + sparc*-*solaris*) + # Find out which ABI we are using. + echo 'int i;' > conftest.$ac_ext +- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then + case `/usr/bin/file conftest.o` in + *64-bit*) + case $lt_cv_prog_gnu_ld in +@@ -6122,9 +6475,9 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args. + set dummy ${ac_tool_prefix}dsymutil; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_DSYMUTIL+set}" = set; then ++if test "${ac_cv_prog_DSYMUTIL+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$DSYMUTIL"; then +@@ -6135,24 +6488,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + DSYMUTIL=$ac_cv_prog_DSYMUTIL + if test -n "$DSYMUTIL"; then +- { $as_echo "$as_me:$LINENO: result: $DSYMUTIL" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5 + $as_echo "$DSYMUTIL" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -6162,9 +6515,9 @@ + ac_ct_DSYMUTIL=$DSYMUTIL + # Extract the first word of "dsymutil", so it can be a program name with args. + set dummy dsymutil; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then ++if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_DSYMUTIL"; then +@@ -6175,24 +6528,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_DSYMUTIL="dsymutil" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL + if test -n "$ac_ct_DSYMUTIL"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5 + $as_echo "$ac_ct_DSYMUTIL" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -6201,7 +6554,7 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 + $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac +@@ -6214,9 +6567,9 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args. + set dummy ${ac_tool_prefix}nmedit; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_NMEDIT+set}" = set; then ++if test "${ac_cv_prog_NMEDIT+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$NMEDIT"; then +@@ -6227,24 +6580,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + NMEDIT=$ac_cv_prog_NMEDIT + if test -n "$NMEDIT"; then +- { $as_echo "$as_me:$LINENO: result: $NMEDIT" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5 + $as_echo "$NMEDIT" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -6254,9 +6607,9 @@ + ac_ct_NMEDIT=$NMEDIT + # Extract the first word of "nmedit", so it can be a program name with args. + set dummy nmedit; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then ++if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_NMEDIT"; then +@@ -6267,24 +6620,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_NMEDIT="nmedit" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT + if test -n "$ac_ct_NMEDIT"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5 + $as_echo "$ac_ct_NMEDIT" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -6293,7 +6646,7 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 + $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac +@@ -6306,9 +6659,9 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args. + set dummy ${ac_tool_prefix}lipo; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_LIPO+set}" = set; then ++if test "${ac_cv_prog_LIPO+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$LIPO"; then +@@ -6319,24 +6672,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_LIPO="${ac_tool_prefix}lipo" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + LIPO=$ac_cv_prog_LIPO + if test -n "$LIPO"; then +- { $as_echo "$as_me:$LINENO: result: $LIPO" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5 + $as_echo "$LIPO" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -6346,9 +6699,9 @@ + ac_ct_LIPO=$LIPO + # Extract the first word of "lipo", so it can be a program name with args. + set dummy lipo; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then ++if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_LIPO"; then +@@ -6359,24 +6712,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_LIPO="lipo" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO + if test -n "$ac_ct_LIPO"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_LIPO" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5 + $as_echo "$ac_ct_LIPO" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -6385,7 +6738,7 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 + $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac +@@ -6398,9 +6751,9 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args. + set dummy ${ac_tool_prefix}otool; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_OTOOL+set}" = set; then ++if test "${ac_cv_prog_OTOOL+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$OTOOL"; then +@@ -6411,24 +6764,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_OTOOL="${ac_tool_prefix}otool" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + OTOOL=$ac_cv_prog_OTOOL + if test -n "$OTOOL"; then +- { $as_echo "$as_me:$LINENO: result: $OTOOL" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5 + $as_echo "$OTOOL" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -6438,9 +6791,9 @@ + ac_ct_OTOOL=$OTOOL + # Extract the first word of "otool", so it can be a program name with args. + set dummy otool; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then ++if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_OTOOL"; then +@@ -6451,24 +6804,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_OTOOL="otool" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL + if test -n "$ac_ct_OTOOL"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_OTOOL" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5 + $as_echo "$ac_ct_OTOOL" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -6477,7 +6830,7 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 + $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac +@@ -6490,9 +6843,9 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args. + set dummy ${ac_tool_prefix}otool64; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_OTOOL64+set}" = set; then ++if test "${ac_cv_prog_OTOOL64+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$OTOOL64"; then +@@ -6503,24 +6856,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + OTOOL64=$ac_cv_prog_OTOOL64 + if test -n "$OTOOL64"; then +- { $as_echo "$as_me:$LINENO: result: $OTOOL64" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5 + $as_echo "$OTOOL64" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -6530,9 +6883,9 @@ + ac_ct_OTOOL64=$OTOOL64 + # Extract the first word of "otool64", so it can be a program name with args. + set dummy otool64; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then ++if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_OTOOL64"; then +@@ -6543,24 +6896,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_OTOOL64="otool64" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64 + if test -n "$ac_ct_OTOOL64"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_OTOOL64" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5 + $as_echo "$ac_ct_OTOOL64" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -6569,7 +6922,7 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 + $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac +@@ -6605,9 +6958,9 @@ + + + +- { $as_echo "$as_me:$LINENO: checking for -single_module linker flag" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5 + $as_echo_n "checking for -single_module linker flag... " >&6; } +-if test "${lt_cv_apple_cc_single_mod+set}" = set; then ++if test "${lt_cv_apple_cc_single_mod+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + lt_cv_apple_cc_single_mod=no +@@ -6632,22 +6985,18 @@ + rm -f conftest.* + fi + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5 + $as_echo "$lt_cv_apple_cc_single_mod" >&6; } +- { $as_echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5 + $as_echo_n "checking for -exported_symbols_list linker flag... " >&6; } +-if test "${lt_cv_ld_exported_symbols_list+set}" = set; then ++if test "${lt_cv_ld_exported_symbols_list+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + lt_cv_ld_exported_symbols_list=no + save_LDFLAGS=$LDFLAGS + echo "_main" > conftest.sym + LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -6658,42 +7007,17 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_c_try_link "$LINENO"; then : + lt_cv_ld_exported_symbols_list=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- lt_cv_ld_exported_symbols_list=no ++ lt_cv_ld_exported_symbols_list=no + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LDFLAGS="$save_LDFLAGS" + + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5 + $as_echo "$lt_cv_ld_exported_symbols_list" >&6; } + case $host_os in + rhapsody* | darwin1.[012]) +@@ -6735,14 +7059,14 @@ + ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' + ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_c_compiler_gnu +-{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5 + $as_echo_n "checking how to run the C preprocessor... " >&6; } + # On Suns, sometimes $CPP names a directory. + if test -n "$CPP" && test -d "$CPP"; then + CPP= + fi + if test -z "$CPP"; then +- if test "${ac_cv_prog_CPP+set}" = set; then ++ if test "${ac_cv_prog_CPP+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + # Double quotes because CPP needs to be expanded +@@ -6757,11 +7081,7 @@ + # exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #ifdef __STDC__ + # include +@@ -6770,78 +7090,34 @@ + #endif + Syntax error + _ACEOF +-if { (ac_try="$ac_cpp conftest.$ac_ext" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null && { +- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || +- test ! -s conftest.err +- }; then +- : +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 ++if ac_fn_c_try_cpp "$LINENO"; then : + ++else + # Broken: fails on valid input. + continue + fi +- + rm -f conftest.err conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + _ACEOF +-if { (ac_try="$ac_cpp conftest.$ac_ext" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null && { +- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || +- test ! -s conftest.err +- }; then ++if ac_fn_c_try_cpp "$LINENO"; then : + # Broken: success on invalid input. + continue + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- + # Passes both tests. + ac_preproc_ok=: + break + fi +- + rm -f conftest.err conftest.$ac_ext + + done + # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. + rm -f conftest.err conftest.$ac_ext +-if $ac_preproc_ok; then ++if $ac_preproc_ok; then : + break + fi + +@@ -6853,7 +7129,7 @@ + else + ac_cv_prog_CPP=$CPP + fi +-{ $as_echo "$as_me:$LINENO: result: $CPP" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 + $as_echo "$CPP" >&6; } + ac_preproc_ok=false + for ac_c_preproc_warn_flag in '' yes +@@ -6864,11 +7140,7 @@ + # exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #ifdef __STDC__ + # include +@@ -6877,87 +7149,40 @@ + #endif + Syntax error + _ACEOF +-if { (ac_try="$ac_cpp conftest.$ac_ext" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null && { +- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || +- test ! -s conftest.err +- }; then +- : +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 ++if ac_fn_c_try_cpp "$LINENO"; then : + ++else + # Broken: fails on valid input. + continue + fi +- + rm -f conftest.err conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + _ACEOF +-if { (ac_try="$ac_cpp conftest.$ac_ext" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null && { +- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || +- test ! -s conftest.err +- }; then ++if ac_fn_c_try_cpp "$LINENO"; then : + # Broken: success on invalid input. + continue + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- + # Passes both tests. + ac_preproc_ok=: + break + fi +- + rm -f conftest.err conftest.$ac_ext + + done + # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. + rm -f conftest.err conftest.$ac_ext +-if $ac_preproc_ok; then +- : ++if $ac_preproc_ok; then : ++ + else +- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check +-See \`config.log' for more details." >&5 +-$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; }; } ++as_fn_error "C preprocessor \"$CPP\" fails sanity check ++See \`config.log' for more details." "$LINENO" 5; } + fi + + ac_ext=c +@@ -6967,16 +7192,12 @@ + ac_compiler_gnu=$ac_cv_c_compiler_gnu + + +-{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 + $as_echo_n "checking for ANSI C header files... " >&6; } +-if test "${ac_cv_header_stdc+set}" = set; then ++if test "${ac_cv_header_stdc+set}" = set; then : + $as_echo_n "(cached) " >&6 + else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + #include +@@ -6991,48 +7212,23 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then ++if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_header_stdc=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_header_stdc=no ++ ac_cv_header_stdc=no + fi +- + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + if test $ac_cv_header_stdc = yes; then + # SunOS 4.x string.h does not declare mem*, contrary to ANSI. +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + + _ACEOF + if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +- $EGREP "memchr" >/dev/null 2>&1; then +- : ++ $EGREP "memchr" >/dev/null 2>&1; then : ++ + else + ac_cv_header_stdc=no + fi +@@ -7042,18 +7238,14 @@ + + if test $ac_cv_header_stdc = yes; then + # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + + _ACEOF + if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +- $EGREP "free" >/dev/null 2>&1; then +- : ++ $EGREP "free" >/dev/null 2>&1; then : ++ + else + ac_cv_header_stdc=no + fi +@@ -7063,14 +7255,10 @@ + + if test $ac_cv_header_stdc = yes; then + # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. +- if test "$cross_compiling" = yes; then ++ if test "$cross_compiling" = yes; then : + : + else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + #include +@@ -7097,192 +7285,59 @@ + return 0; + } + _ACEOF +-rm -f conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>&5 +- ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- : +-else +- $as_echo "$as_me: program exited with status $ac_status" >&5 +-$as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 ++if ac_fn_c_try_run "$LINENO"; then : + +-( exit $ac_status ) +-ac_cv_header_stdc=no ++else ++ ac_cv_header_stdc=no + fi +-rm -rf conftest.dSYM +-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext ++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ ++ conftest.$ac_objext conftest.beam conftest.$ac_ext + fi + +- + fi + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 + $as_echo "$ac_cv_header_stdc" >&6; } + if test $ac_cv_header_stdc = yes; then + +-cat >>confdefs.h <<\_ACEOF +-#define STDC_HEADERS 1 +-_ACEOF ++$as_echo "#define STDC_HEADERS 1" >>confdefs.h + + fi + + # On IRIX 5.3, sys/types and inttypes.h are conflicting. ++for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ ++ inttypes.h stdint.h unistd.h ++do : ++ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ++ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default ++" ++eval as_val=\$$as_ac_Header ++ if test "x$as_val" = x""yes; then : ++ cat >>confdefs.h <<_ACEOF ++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++_ACEOF + ++fi + ++done + + ++for ac_header in dlfcn.h ++do : ++ ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default ++" ++if test "x$ac_cv_header_dlfcn_h" = x""yes; then : ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_DLFCN_H 1 ++_ACEOF + ++fi + ++done + + + +-for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ +- inttypes.h stdint.h unistd.h +-do +-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +-$as_echo_n "checking for $ac_header... " >&6; } +-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +- +-#include <$ac_header> +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- eval "$as_ac_Header=yes" +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- eval "$as_ac_Header=no" +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-fi +-ac_res=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +-as_val=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then +- cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +-_ACEOF +- +-fi +- +-done +- +- +- +-for ac_header in dlfcn.h +-do +-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +-$as_echo_n "checking for $ac_header... " >&6; } +-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +- +-#include <$ac_header> +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- eval "$as_ac_Header=yes" +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- eval "$as_ac_Header=no" +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-fi +-ac_res=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +-as_val=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then +- cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +-_ACEOF +- +-fi +- +-done +- +- +- +-# Set options ++# Set options + + + +@@ -7291,7 +7346,7 @@ + + + # Check whether --enable-shared was given. +-if test "${enable_shared+set}" = set; then ++if test "${enable_shared+set}" = set; then : + enableval=$enable_shared; p=${PACKAGE-default} + case $enableval in + yes) enable_shared=yes ;; +@@ -7322,7 +7377,7 @@ + + + # Check whether --enable-static was given. +-if test "${enable_static+set}" = set; then ++if test "${enable_static+set}" = set; then : + enableval=$enable_static; p=${PACKAGE-default} + case $enableval in + yes) enable_static=yes ;; +@@ -7354,7 +7409,7 @@ + + + # Check whether --with-pic was given. +-if test "${with_pic+set}" = set; then ++if test "${with_pic+set}" = set; then : + withval=$with_pic; pic_mode="$withval" + else + pic_mode=default +@@ -7370,7 +7425,7 @@ + + + # Check whether --enable-fast-install was given. +-if test "${enable_fast_install+set}" = set; then ++if test "${enable_fast_install+set}" = set; then : + enableval=$enable_fast_install; p=${PACKAGE-default} + case $enableval in + yes) enable_fast_install=yes ;; +@@ -7451,9 +7506,9 @@ + setopt NO_GLOB_SUBST + fi + +-{ $as_echo "$as_me:$LINENO: checking for objdir" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5 + $as_echo_n "checking for objdir... " >&6; } +-if test "${lt_cv_objdir+set}" = set; then ++if test "${lt_cv_objdir+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + rm -f .libs 2>/dev/null +@@ -7466,7 +7521,7 @@ + fi + rmdir .libs 2>/dev/null + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5 + $as_echo "$lt_cv_objdir" >&6; } + objdir=$lt_cv_objdir + +@@ -7559,9 +7614,9 @@ + case $deplibs_check_method in + file_magic*) + if test "$file_magic_cmd" = '$MAGIC_CMD'; then +- { $as_echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5 + $as_echo_n "checking for ${ac_tool_prefix}file... " >&6; } +-if test "${lt_cv_path_MAGIC_CMD+set}" = set; then ++if test "${lt_cv_path_MAGIC_CMD+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + case $MAGIC_CMD in +@@ -7612,10 +7667,10 @@ + + MAGIC_CMD="$lt_cv_path_MAGIC_CMD" + if test -n "$MAGIC_CMD"; then +- { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 + $as_echo "$MAGIC_CMD" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -7625,9 +7680,9 @@ + + if test -z "$lt_cv_path_MAGIC_CMD"; then + if test -n "$ac_tool_prefix"; then +- { $as_echo "$as_me:$LINENO: checking for file" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5 + $as_echo_n "checking for file... " >&6; } +-if test "${lt_cv_path_MAGIC_CMD+set}" = set; then ++if test "${lt_cv_path_MAGIC_CMD+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + case $MAGIC_CMD in +@@ -7678,10 +7733,10 @@ + + MAGIC_CMD="$lt_cv_path_MAGIC_CMD" + if test -n "$MAGIC_CMD"; then +- { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 + $as_echo "$MAGIC_CMD" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -7762,9 +7817,9 @@ + if test "$GCC" = yes; then + lt_prog_compiler_no_builtin_flag=' -fno-builtin' + +- { $as_echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 + $as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; } +-if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then ++if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + lt_cv_prog_compiler_rtti_exceptions=no +@@ -7780,11 +7835,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:7783: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:7838: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:7787: \$? = $ac_status" >&5 ++ echo "$as_me:7842: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -7797,7 +7852,7 @@ + $RM conftest* + + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 + $as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; } + + if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then +@@ -7817,7 +7872,7 @@ + lt_prog_compiler_pic= + lt_prog_compiler_static= + +-{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 + $as_echo_n "checking for $compiler option to produce PIC... " >&6; } + + if test "$GCC" = yes; then +@@ -7949,7 +8004,7 @@ + lt_prog_compiler_static='-non_shared' + ;; + +- linux* | k*bsd*-gnu) ++ linux* | k*bsd*-gnu | kopensolaris*-gnu) + case $cc_basename in + # old Intel for x86_64 which still supported -KPIC. + ecc*) +@@ -8089,7 +8144,7 @@ + lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" + ;; + esac +-{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 + $as_echo "$lt_prog_compiler_pic" >&6; } + + +@@ -8101,9 +8156,9 @@ + # Check to make sure the PIC flag actually works. + # + if test -n "$lt_prog_compiler_pic"; then +- { $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 + $as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; } +-if test "${lt_cv_prog_compiler_pic_works+set}" = set; then ++if test "${lt_cv_prog_compiler_pic_works+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + lt_cv_prog_compiler_pic_works=no +@@ -8119,11 +8174,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:8122: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:8177: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:8126: \$? = $ac_status" >&5 ++ echo "$as_me:8181: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -8136,7 +8191,7 @@ + $RM conftest* + + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5 + $as_echo "$lt_cv_prog_compiler_pic_works" >&6; } + + if test x"$lt_cv_prog_compiler_pic_works" = xyes; then +@@ -8160,9 +8215,9 @@ + # Check to make sure the static flag actually works. + # + wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" +-{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5 + $as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } +-if test "${lt_cv_prog_compiler_static_works+set}" = set; then ++if test "${lt_cv_prog_compiler_static_works+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + lt_cv_prog_compiler_static_works=no +@@ -8188,7 +8243,7 @@ + LDFLAGS="$save_LDFLAGS" + + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5 + $as_echo "$lt_cv_prog_compiler_static_works" >&6; } + + if test x"$lt_cv_prog_compiler_static_works" = xyes; then +@@ -8203,9 +8258,9 @@ + + + +- { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 + $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } +-if test "${lt_cv_prog_compiler_c_o+set}" = set; then ++if test "${lt_cv_prog_compiler_c_o+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + lt_cv_prog_compiler_c_o=no +@@ -8224,11 +8279,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:8227: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:8282: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:8231: \$? = $ac_status" >&5 ++ echo "$as_me:8286: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -8250,7 +8305,7 @@ + $RM conftest* + + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5 + $as_echo "$lt_cv_prog_compiler_c_o" >&6; } + + +@@ -8258,9 +8313,9 @@ + + + +- { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 + $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } +-if test "${lt_cv_prog_compiler_c_o+set}" = set; then ++if test "${lt_cv_prog_compiler_c_o+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + lt_cv_prog_compiler_c_o=no +@@ -8279,11 +8334,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:8282: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:8337: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:8286: \$? = $ac_status" >&5 ++ echo "$as_me:8341: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -8305,7 +8360,7 @@ + $RM conftest* + + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5 + $as_echo "$lt_cv_prog_compiler_c_o" >&6; } + + +@@ -8314,7 +8369,7 @@ + hard_links="nottested" + if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then + # do not overwrite the value of need_locks provided by the user +- { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5 + $as_echo_n "checking if we can lock with hard links... " >&6; } + hard_links=yes + $RM conftest* +@@ -8322,10 +8377,10 @@ + touch conftest.a + ln conftest.a conftest.b 2>&5 || hard_links=no + ln conftest.a conftest.b 2>/dev/null && hard_links=no +- { $as_echo "$as_me:$LINENO: result: $hard_links" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5 + $as_echo "$hard_links" >&6; } + if test "$hard_links" = no; then +- { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 + $as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} + need_locks=warn + fi +@@ -8338,7 +8393,7 @@ + + + +- { $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5 + $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } + + runpath_var= +@@ -8398,6 +8453,9 @@ + openbsd*) + with_gnu_ld=no + ;; ++ linux* | k*bsd*-gnu) ++ link_all_deplibs=no ++ ;; + esac + + ld_shlibs=yes +@@ -8419,6 +8477,7 @@ + fi + supports_anon_versioning=no + case `$LD -v 2>&1` in ++ *GNU\ gold*) supports_anon_versioning=yes ;; + *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 + *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... + *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... +@@ -8510,7 +8569,7 @@ + archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + ;; + +- gnu* | linux* | tpf* | k*bsd*-gnu) ++ gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) + tmp_diet=no + if test "$host_os" = linux-dietlibc; then + case $cc_basename in +@@ -8580,7 +8639,7 @@ + fi + ;; + +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' + wlarc= +@@ -8755,6 +8814,7 @@ + if test "$aix_use_runtimelinking" = yes; then + shared_flag="$shared_flag "'${wl}-G' + fi ++ link_all_deplibs=no + else + # not using gcc + if test "$host_cpu" = ia64; then +@@ -8780,11 +8840,7 @@ + allow_undefined_flag='-berok' + # Determine the default libpath from the value encoded in an + # empty executable. +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -8795,27 +8851,7 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_c_try_link "$LINENO"; then : + + lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { +@@ -8829,16 +8865,9 @@ + if test -z "$aix_libpath"; then + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + fi +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + + hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" +@@ -8851,11 +8880,7 @@ + else + # Determine the default libpath from the value encoded in an + # empty executable. +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -8866,27 +8891,7 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_c_try_link "$LINENO"; then : + + lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { +@@ -8900,16 +8905,9 @@ + if test -z "$aix_libpath"; then + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + fi +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + + hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" +@@ -8961,7 +8959,8 @@ + # The linker will automatically build a .lib file if we build a DLL. + old_archive_from_new_cmds='true' + # FIXME: Should let the user specify the lib program. +- fix_srcfile_path= ++ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' ++ fix_srcfile_path='`cygpath -w "$srcfile"`' + enable_shared_with_static_runtimes=yes + ;; + +@@ -9120,42 +9119,16 @@ + # implicitly export all symbols. + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" +- cat >conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ + int foo(void) {} + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_c_try_link "$LINENO"; then : + archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' + +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LDFLAGS="$save_LDFLAGS" + else + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' +@@ -9168,7 +9141,7 @@ + link_all_deplibs=yes + ;; + +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out + else +@@ -9411,7 +9384,7 @@ + fi + fi + +-{ $as_echo "$as_me:$LINENO: result: $ld_shlibs" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5 + $as_echo "$ld_shlibs" >&6; } + test "$ld_shlibs" = no && can_build_shared=no + +@@ -9448,16 +9421,16 @@ + # Test whether the compiler implicitly links with -lc since on some + # systems, -lgcc has to come before -lc. If gcc already passes -lc + # to ld, don't add -lc before -lgcc. +- { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5 + $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } + $RM conftest* + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + +- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } 2>conftest.err; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } 2>conftest.err; then + soname=conftest + lib=conftest + libobjs=conftest.$ac_objext +@@ -9471,11 +9444,11 @@ + libname=conftest + lt_save_allow_undefined_flag=$allow_undefined_flag + allow_undefined_flag= +- if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\"") >&5 ++ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5 + (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } + then + archive_cmds_need_lc=no + else +@@ -9486,7 +9459,7 @@ + cat conftest.err 1>&5 + fi + $RM conftest* +- { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc" >&5 + $as_echo "$archive_cmds_need_lc" >&6; } + ;; + esac +@@ -9650,7 +9623,7 @@ + + + +- { $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 + $as_echo_n "checking dynamic linker characteristics... " >&6; } + + if test "$GCC" = yes; then +@@ -9867,7 +9840,7 @@ + ;; + + *) +- library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} ${libname}${versuffix}.lib' ++ library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' + ;; + esac + dynamic_linker='Win32 ld.exe' +@@ -10058,7 +10031,7 @@ + ;; + + # This must be Linux ELF. +-linux* | k*bsd*-gnu) ++linux* | k*bsd*-gnu | kopensolaris*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no +@@ -10072,11 +10045,7 @@ + save_libdir=$libdir + eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \ + LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\"" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -10087,41 +10056,13 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then ++if ac_fn_c_try_link "$LINENO"; then : ++ if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then : + shlibpath_overrides_runpath=yes + fi +- +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LDFLAGS=$save_LDFLAGS + libdir=$save_libdir + +@@ -10145,6 +10086,18 @@ + dynamic_linker='GNU/Linux ld.so' + ;; + ++netbsdelf*-gnu) ++ version_type=linux ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=no ++ hardcode_into_libs=yes ++ dynamic_linker='NetBSD ld.elf_so' ++ ;; ++ + netbsd*) + version_type=sunos + need_lib_prefix=no +@@ -10333,7 +10286,7 @@ + dynamic_linker=no + ;; + esac +-{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5 + $as_echo "$dynamic_linker" >&6; } + test "$dynamic_linker" = no && can_build_shared=no + +@@ -10435,7 +10388,7 @@ + + + +- { $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5 + $as_echo_n "checking how to hardcode library paths into programs... " >&6; } + hardcode_action= + if test -n "$hardcode_libdir_flag_spec" || +@@ -10460,7 +10413,7 @@ + # directories. + hardcode_action=unsupported + fi +-{ $as_echo "$as_me:$LINENO: result: $hardcode_action" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5 + $as_echo "$hardcode_action" >&6; } + + if test "$hardcode_action" = relink || +@@ -10505,18 +10458,14 @@ + + darwin*) + # if libdl is installed we need to link against it +- { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 + $as_echo_n "checking for dlopen in -ldl... " >&6; } +-if test "${ac_cv_lib_dl_dlopen+set}" = set; then ++if test "${ac_cv_lib_dl_dlopen+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-ldl $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. +@@ -10534,43 +10483,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_dl_dlopen=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_lib_dl_dlopen=no ++ ac_cv_lib_dl_dlopen=no + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 + $as_echo "$ac_cv_lib_dl_dlopen" >&6; } +-if test "x$ac_cv_lib_dl_dlopen" = x""yes; then ++if test "x$ac_cv_lib_dl_dlopen" = x""yes; then : + lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" + else + +@@ -10583,33 +10507,19 @@ + ;; + + *) +- { $as_echo "$as_me:$LINENO: checking for shl_load" >&5 +-$as_echo_n "checking for shl_load... " >&6; } +-if test "${ac_cv_func_shl_load+set}" = set; then ++ ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load" ++if test "x$ac_cv_func_shl_load" = x""yes; then : ++ lt_cv_dlopen="shl_load" ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5 ++$as_echo_n "checking for shl_load in -ldld... " >&6; } ++if test "${ac_cv_lib_dld_shl_load+set}" = set; then : + $as_echo_n "(cached) " >&6 + else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-ldld $LIBS" ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +-/* Define shl_load to an innocuous variant, in case declares shl_load. +- For example, HP-UX 11i declares gettimeofday. */ +-#define shl_load innocuous_shl_load +- +-/* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char shl_load (); below. +- Prefer to if __STDC__ is defined, since +- exists even on freestanding compilers. */ +- +-#ifdef __STDC__ +-# include +-#else +-# include +-#endif +- +-#undef shl_load + + /* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC +@@ -10618,13 +10528,6 @@ + extern "C" + #endif + char shl_load (); +-/* The GNU C library defines this for functions which it implements +- to always fail with ENOSYS. Some functions are actually named +- something starting with __ and the normal name is an alias. */ +-#if defined __stub_shl_load || defined __stub___shl_load +-choke me +-#endif +- + int + main () + { +@@ -10633,56 +10536,32 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- ac_cv_func_shl_load=yes ++if ac_fn_c_try_link "$LINENO"; then : ++ ac_cv_lib_dld_shl_load=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_func_shl_load=no ++ ac_cv_lib_dld_shl_load=no + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++LIBS=$ac_check_lib_save_LIBS + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 +-$as_echo "$ac_cv_func_shl_load" >&6; } +-if test "x$ac_cv_func_shl_load" = x""yes; then +- lt_cv_dlopen="shl_load" ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5 ++$as_echo "$ac_cv_lib_dld_shl_load" >&6; } ++if test "x$ac_cv_lib_dld_shl_load" = x""yes; then : ++ lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld" + else +- { $as_echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5 +-$as_echo_n "checking for shl_load in -ldld... " >&6; } +-if test "${ac_cv_lib_dld_shl_load+set}" = set; then ++ ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen" ++if test "x$ac_cv_func_dlopen" = x""yes; then : ++ lt_cv_dlopen="dlopen" ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 ++$as_echo_n "checking for dlopen in -ldl... " >&6; } ++if test "${ac_cv_lib_dl_dlopen+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-ldld $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++LIBS="-ldl $LIBS" ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. +@@ -10691,222 +10570,37 @@ + #ifdef __cplusplus + extern "C" + #endif +-char shl_load (); ++char dlopen (); + int + main () + { +-return shl_load (); ++return dlopen (); + ; + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- ac_cv_lib_dld_shl_load=yes ++if ac_fn_c_try_link "$LINENO"; then : ++ ac_cv_lib_dl_dlopen=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_lib_dld_shl_load=no ++ ac_cv_lib_dl_dlopen=no + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 +-$as_echo "$ac_cv_lib_dld_shl_load" >&6; } +-if test "x$ac_cv_lib_dld_shl_load" = x""yes; then +- lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld" ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 ++$as_echo "$ac_cv_lib_dl_dlopen" >&6; } ++if test "x$ac_cv_lib_dl_dlopen" = x""yes; then : ++ lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" + else +- { $as_echo "$as_me:$LINENO: checking for dlopen" >&5 +-$as_echo_n "checking for dlopen... " >&6; } +-if test "${ac_cv_func_dlopen+set}" = set; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5 ++$as_echo_n "checking for dlopen in -lsvld... " >&6; } ++if test "${ac_cv_lib_svld_dlopen+set}" = set; then : + $as_echo_n "(cached) " >&6 + else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-/* Define dlopen to an innocuous variant, in case declares dlopen. +- For example, HP-UX 11i declares gettimeofday. */ +-#define dlopen innocuous_dlopen +- +-/* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char dlopen (); below. +- Prefer to if __STDC__ is defined, since +- exists even on freestanding compilers. */ +- +-#ifdef __STDC__ +-# include +-#else +-# include +-#endif +- +-#undef dlopen +- +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-char dlopen (); +-/* The GNU C library defines this for functions which it implements +- to always fail with ENOSYS. Some functions are actually named +- something starting with __ and the normal name is an alias. */ +-#if defined __stub_dlopen || defined __stub___dlopen +-choke me +-#endif +- +-int +-main () +-{ +-return dlopen (); +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- ac_cv_func_dlopen=yes +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_func_dlopen=no +-fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext +-fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 +-$as_echo "$ac_cv_func_dlopen" >&6; } +-if test "x$ac_cv_func_dlopen" = x""yes; then +- lt_cv_dlopen="dlopen" +-else +- { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 +-$as_echo_n "checking for dlopen in -ldl... " >&6; } +-if test "${ac_cv_lib_dl_dlopen+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- ac_check_lib_save_LIBS=$LIBS +-LIBS="-ldl $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +- +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-char dlopen (); +-int +-main () +-{ +-return dlopen (); +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- ac_cv_lib_dl_dlopen=yes +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_lib_dl_dlopen=no +-fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext +-LIBS=$ac_check_lib_save_LIBS +-fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 +-$as_echo "$ac_cv_lib_dl_dlopen" >&6; } +-if test "x$ac_cv_lib_dl_dlopen" = x""yes; then +- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" +-else +- { $as_echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5 +-$as_echo_n "checking for dlopen in -lsvld... " >&6; } +-if test "${ac_cv_lib_svld_dlopen+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- ac_check_lib_save_LIBS=$LIBS +-LIBS="-lsvld $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-lsvld $LIBS" ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. +@@ -10924,57 +10618,28 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_svld_dlopen=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_lib_svld_dlopen=no ++ ac_cv_lib_svld_dlopen=no + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5 + $as_echo "$ac_cv_lib_svld_dlopen" >&6; } +-if test "x$ac_cv_lib_svld_dlopen" = x""yes; then ++if test "x$ac_cv_lib_svld_dlopen" = x""yes; then : + lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" + else +- { $as_echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5 + $as_echo_n "checking for dld_link in -ldld... " >&6; } +-if test "${ac_cv_lib_dld_dld_link+set}" = set; then ++if test "${ac_cv_lib_dld_dld_link+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-ldld $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. +@@ -10992,43 +10657,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_dld_dld_link=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_lib_dld_dld_link=no ++ ac_cv_lib_dld_dld_link=no + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5 + $as_echo "$ac_cv_lib_dld_dld_link" >&6; } +-if test "x$ac_cv_lib_dld_dld_link" = x""yes; then ++if test "x$ac_cv_lib_dld_dld_link" = x""yes; then : + lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld" + fi + +@@ -11067,9 +10707,9 @@ + save_LIBS="$LIBS" + LIBS="$lt_cv_dlopen_libs $LIBS" + +- { $as_echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5 + $as_echo_n "checking whether a program can dlopen itself... " >&6; } +-if test "${lt_cv_dlopen_self+set}" = set; then ++if test "${lt_cv_dlopen_self+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test "$cross_compiling" = yes; then : +@@ -11078,7 +10718,7 @@ + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +-#line 11081 "configure" ++#line 10721 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -11137,11 +10777,11 @@ + return status; + } + _LT_EOF +- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ++ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then + (./conftest; exit; ) >&5 2>/dev/null + lt_status=$? + case x$lt_status in +@@ -11158,14 +10798,14 @@ + + + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5 + $as_echo "$lt_cv_dlopen_self" >&6; } + + if test "x$lt_cv_dlopen_self" = xyes; then + wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" +- { $as_echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5 + $as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; } +-if test "${lt_cv_dlopen_self_static+set}" = set; then ++if test "${lt_cv_dlopen_self_static+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test "$cross_compiling" = yes; then : +@@ -11174,7 +10814,7 @@ + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +-#line 11177 "configure" ++#line 10817 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -11233,11 +10873,11 @@ + return status; + } + _LT_EOF +- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ++ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then + (./conftest; exit; ) >&5 2>/dev/null + lt_status=$? + case x$lt_status in +@@ -11254,7 +10894,7 @@ + + + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5 + $as_echo "$lt_cv_dlopen_self_static" >&6; } + fi + +@@ -11293,12 +10933,12 @@ + + striplib= + old_striplib= +-{ $as_echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5 + $as_echo_n "checking whether stripping libraries is possible... " >&6; } + if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then + test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" + test -z "$striplib" && striplib="$STRIP --strip-unneeded" +- { $as_echo "$as_me:$LINENO: result: yes" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + else + # FIXME - insert some real tests, host_os isn't really good enough +@@ -11307,15 +10947,15 @@ + if test -n "$STRIP" ; then + striplib="$STRIP -x" + old_striplib="$STRIP -S" +- { $as_echo "$as_me:$LINENO: result: yes" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + ;; + *) +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + ;; + esac +@@ -11333,12 +10973,12 @@ + + + # Report which library types will actually be built +- { $as_echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5 + $as_echo_n "checking if libtool supports shared libraries... " >&6; } +- { $as_echo "$as_me:$LINENO: result: $can_build_shared" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5 + $as_echo "$can_build_shared" >&6; } + +- { $as_echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5 + $as_echo_n "checking whether to build shared libraries... " >&6; } + test "$can_build_shared" = "no" && enable_shared=no + +@@ -11359,14 +10999,14 @@ + fi + ;; + esac +- { $as_echo "$as_me:$LINENO: result: $enable_shared" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5 + $as_echo "$enable_shared" >&6; } + +- { $as_echo "$as_me:$LINENO: checking whether to build static libraries" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5 + $as_echo_n "checking whether to build static libraries... " >&6; } + # Make sure either enable_shared or enable_static is yes. + test "$enable_shared" = yes || enable_static=yes +- { $as_echo "$as_me:$LINENO: result: $enable_static" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5 + $as_echo "$enable_static" >&6; } + + +@@ -11410,9 +11050,9 @@ + + depcc="$CCAS" am_compiler_list= + +-{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 + $as_echo_n "checking dependency style of $depcc... " >&6; } +-if test "${am_cv_CCAS_dependencies_compiler_type+set}" = set; then ++if test "${am_cv_CCAS_dependencies_compiler_type+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then +@@ -11438,6 +11078,9 @@ + if test "$am_compiler_list" = ""; then + am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` + fi ++ am__universal=false ++ ++ + for depmode in $am_compiler_list; do + # Setup a source with many dependencies, because some compilers + # like to wrap large dependency lists on column 80 (with \), and +@@ -11455,7 +11098,17 @@ + done + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + ++ # We check with `-c' and `-o' for the sake of the "dashmstdout" ++ # mode. It turns out that the SunPro C++ compiler does not properly ++ # handle `-M -o', and we need to detect this. Also, some Intel ++ # versions had trouble with output in subdirs ++ am__obj=sub/conftest.${OBJEXT-o} ++ am__minus_obj="-o $am__obj" + case $depmode in ++ gcc) ++ # This depmode causes a compiler race in universal mode. ++ test "$am__universal" = false || continue ++ ;; + nosideeffect) + # after this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested +@@ -11465,4509 +11118,1091 @@ + break + fi + ;; ++ msvisualcpp | msvcmsys) ++ # This compiler won't grok `-c -o', but also, the minuso test has ++ # not run yet. These depmodes are late enough in the game, and ++ # so weak that their functioning should not be impacted. ++ am__obj=conftest.${OBJEXT-o} ++ am__minus_obj= ++ ;; + none) break ;; + esac +- # We check with `-c' and `-o' for the sake of the "dashmstdout" +- # mode. It turns out that the SunPro C++ compiler does not properly +- # handle `-M -o', and we need to detect this. + if depmode=$depmode \ +- source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ ++ source=sub/conftest.c object=$am__obj \ + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ +- $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ ++ $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ + >/dev/null 2>conftest.err && + grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && +- grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && ++ grep $am__obj sub/conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then + # icc doesn't choke on unknown options, it will just issue warnings + # or remarks (even with -Werror). So we grep stderr for any message + # that says an option was ignored or not supported. + # When given -MP, icc 7.0 and 7.1 complain thusly: + # icc: Command line warning: ignoring option '-M'; no argument required +- # The diagnosis changed in icc 8.0: +- # icc: Command line remark: option '-MP' not supported +- if (grep 'ignoring option' conftest.err || +- grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else +- am_cv_CCAS_dependencies_compiler_type=$depmode +- break +- fi +- fi +- done +- +- cd .. +- rm -rf conftest.dir +-else +- am_cv_CCAS_dependencies_compiler_type=none +-fi +- +-fi +-{ $as_echo "$as_me:$LINENO: result: $am_cv_CCAS_dependencies_compiler_type" >&5 +-$as_echo "$am_cv_CCAS_dependencies_compiler_type" >&6; } +-CCASDEPMODE=depmode=$am_cv_CCAS_dependencies_compiler_type +- +- if +- test "x$enable_dependency_tracking" != xno \ +- && test "$am_cv_CCAS_dependencies_compiler_type" = gcc3; then +- am__fastdepCCAS_TRUE= +- am__fastdepCCAS_FALSE='#' +-else +- am__fastdepCCAS_TRUE='#' +- am__fastdepCCAS_FALSE= +-fi +- +- +- +- +- +-ACLOCAL_AMFLAGS="-I m4 $ACLOCAL_AMFLAGS" +- +- +-################################################## +-# Check for gtk-doc. +-################################################## +- +-if test "x$cross_compiling" = "xyes" ; then +- enable_gtk_doc=no +-fi +- +- +-if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then +- if test -n "$ac_tool_prefix"; then +- # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. +-set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- case $PKG_CONFIG in +- [\\/]* | ?:[\\/]*) +- ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. +- ;; +- *) +- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done +-IFS=$as_save_IFS +- +- ;; +-esac +-fi +-PKG_CONFIG=$ac_cv_path_PKG_CONFIG +-if test -n "$PKG_CONFIG"; then +- { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +-$as_echo "$PKG_CONFIG" >&6; } +-else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } +-fi +- +- +-fi +-if test -z "$ac_cv_path_PKG_CONFIG"; then +- ac_pt_PKG_CONFIG=$PKG_CONFIG +- # Extract the first word of "pkg-config", so it can be a program name with args. +-set dummy pkg-config; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- case $ac_pt_PKG_CONFIG in +- [\\/]* | ?:[\\/]*) +- ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. +- ;; +- *) +- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done +-IFS=$as_save_IFS +- +- ;; +-esac +-fi +-ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG +-if test -n "$ac_pt_PKG_CONFIG"; then +- { $as_echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5 +-$as_echo "$ac_pt_PKG_CONFIG" >&6; } +-else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } +-fi +- +- if test "x$ac_pt_PKG_CONFIG" = x; then +- PKG_CONFIG="" +- else +- case $cross_compiling:$ac_tool_warned in +-yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +-ac_tool_warned=yes ;; +-esac +- PKG_CONFIG=$ac_pt_PKG_CONFIG +- fi +-else +- PKG_CONFIG="$ac_cv_path_PKG_CONFIG" +-fi +- +-fi +-if test -n "$PKG_CONFIG"; then +- _pkg_min_version=0.9.0 +- { $as_echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5 +-$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } +- if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then +- { $as_echo "$as_me:$LINENO: result: yes" >&5 +-$as_echo "yes" >&6; } +- else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } +- PKG_CONFIG="" +- fi +- +-fi +- +- +-# Check whether --with-html-dir was given. +-if test "${with_html_dir+set}" = set; then +- withval=$with_html_dir; +-else +- with_html_dir='${datadir}/gtk-doc/html' +-fi +- +- HTML_DIR="$with_html_dir" +- +- +- # Check whether --enable-gtk-doc was given. +-if test "${enable_gtk_doc+set}" = set; then +- enableval=$enable_gtk_doc; +-else +- enable_gtk_doc=no +-fi +- +- +- if test x$enable_gtk_doc = xyes; then +- if test -n "$PKG_CONFIG" && \ +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk-doc >= 1.0\"") >&5 +- ($PKG_CONFIG --exists --print-errors "gtk-doc >= 1.0") 2>&5 +- ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then +- : +-else +- { { $as_echo "$as_me:$LINENO: error: You need to have gtk-doc >= 1.0 installed to build gtk-doc" >&5 +-$as_echo "$as_me: error: You need to have gtk-doc >= 1.0 installed to build gtk-doc" >&2;} +- { (exit 1); exit 1; }; } +-fi +- fi +- +- { $as_echo "$as_me:$LINENO: checking whether to build gtk-doc documentation" >&5 +-$as_echo_n "checking whether to build gtk-doc documentation... " >&6; } +- { $as_echo "$as_me:$LINENO: result: $enable_gtk_doc" >&5 +-$as_echo "$enable_gtk_doc" >&6; } +- +- for ac_prog in gtkdoc-check +-do +- # Extract the first word of "$ac_prog", so it can be a program name with args. +-set dummy $ac_prog; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_path_GTKDOC_CHECK+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- case $GTKDOC_CHECK in +- [\\/]* | ?:[\\/]*) +- ac_cv_path_GTKDOC_CHECK="$GTKDOC_CHECK" # Let the user override the test with a path. +- ;; +- *) +- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_path_GTKDOC_CHECK="$as_dir/$ac_word$ac_exec_ext" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done +-IFS=$as_save_IFS +- +- ;; +-esac +-fi +-GTKDOC_CHECK=$ac_cv_path_GTKDOC_CHECK +-if test -n "$GTKDOC_CHECK"; then +- { $as_echo "$as_me:$LINENO: result: $GTKDOC_CHECK" >&5 +-$as_echo "$GTKDOC_CHECK" >&6; } +-else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } +-fi +- +- +- test -n "$GTKDOC_CHECK" && break +-done +- +- +- if test x$enable_gtk_doc = xyes; then +- ENABLE_GTK_DOC_TRUE= +- ENABLE_GTK_DOC_FALSE='#' +-else +- ENABLE_GTK_DOC_TRUE='#' +- ENABLE_GTK_DOC_FALSE= +-fi +- +- if test -n "$LIBTOOL"; then +- GTK_DOC_USE_LIBTOOL_TRUE= +- GTK_DOC_USE_LIBTOOL_FALSE='#' +-else +- GTK_DOC_USE_LIBTOOL_TRUE='#' +- GTK_DOC_USE_LIBTOOL_FALSE= +-fi +- +- +- +- +- +- case "x${host_cpu}" in +- xi?86 | k?) +- HAVE_I386=yes +- +-cat >>confdefs.h <<\_ACEOF +-#define HAVE_I386 1 +-_ACEOF +- +- ;; +- xx86_64|xamd64) +- HAVE_AMD64=yes +- +-cat >>confdefs.h <<\_ACEOF +-#define HAVE_AMD64 1 +-_ACEOF +- +- ;; +- xpowerpc|xppc|xpowerpc64|xppc64) +- HAVE_POWERPC=yes +- +-cat >>confdefs.h <<\_ACEOF +-#define HAVE_POWERPC 1 +-_ACEOF +- +- ;; +- xarm) +- HAVE_ARM=yes +- +-cat >>confdefs.h <<\_ACEOF +-#define HAVE_ARM 1 +-_ACEOF +- +- ;; +- esac +- +- if test "x$HAVE_I386" = "xyes"; then +- HAVE_I386_TRUE= +- HAVE_I386_FALSE='#' +-else +- HAVE_I386_TRUE='#' +- HAVE_I386_FALSE= +-fi +- +- if test "x$HAVE_AMD64" = "xyes"; then +- HAVE_AMD64_TRUE= +- HAVE_AMD64_FALSE='#' +-else +- HAVE_AMD64_TRUE='#' +- HAVE_AMD64_FALSE= +-fi +- +- if test "x$HAVE_POWERPC" = "xyes"; then +- HAVE_POWERPC_TRUE= +- HAVE_POWERPC_FALSE='#' +-else +- HAVE_POWERPC_TRUE='#' +- HAVE_POWERPC_FALSE= +-fi +- +- if test "x$HAVE_ARM" = "xyes"; then +- HAVE_ARM_TRUE= +- HAVE_ARM_FALSE='#' +-else +- HAVE_ARM_TRUE='#' +- HAVE_ARM_FALSE= +-fi +- +- +- case "${host_os}" in +- mingw*) +- HAVE_OS_WIN32=yes +- +-cat >>confdefs.h <<\_ACEOF +-#define HAVE_OS_WIN32 1 +-_ACEOF +- +- ;; +- linux*) +- HAVE_OS_LINUX=yes +- +-cat >>confdefs.h <<\_ACEOF +-#define HAVE_OS_LINUX 1 +-_ACEOF +- +- ;; +- esac +- +- if test "$HAVE_OS_WIN32" = "yes"; then +- HAVE_OS_WIN32_TRUE= +- HAVE_OS_WIN32_FALSE='#' +-else +- HAVE_OS_WIN32_TRUE='#' +- HAVE_OS_WIN32_FALSE= +-fi +- +- if test "$HAVE_OS_LINUX" = "yes"; then +- HAVE_OS_LINUX_TRUE= +- HAVE_OS_LINUX_FALSE='#' +-else +- HAVE_OS_LINUX_TRUE='#' +- HAVE_OS_LINUX_FALSE= +-fi +- +- +- +- +- +- { $as_echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5 +-$as_echo_n "checking whether byte ordering is bigendian... " >&6; } +-if test "${ac_cv_c_bigendian+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- ac_cv_c_bigendian=unknown +- # See if we're dealing with a universal compiler. +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#ifndef __APPLE_CC__ +- not a universal capable compiler +- #endif +- typedef int dummy; +- +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- +- # Check for potential -arch flags. It is not universal unless +- # there are some -arch flags. Note that *ppc* also matches +- # ppc64. This check is also rather less than ideal. +- case "${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}" in #( +- *-arch*ppc*|*-arch*i386*|*-arch*x86_64*) ac_cv_c_bigendian=universal;; +- esac +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +- if test $ac_cv_c_bigendian = unknown; then +- # See if sys/param.h defines the BYTE_ORDER macro. +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include +- #include +- +-int +-main () +-{ +-#if ! (defined BYTE_ORDER && defined BIG_ENDIAN \ +- && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \ +- && LITTLE_ENDIAN) +- bogus endian macros +- #endif +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- # It does; now see whether it defined to BIG_ENDIAN or not. +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include +- #include +- +-int +-main () +-{ +-#if BYTE_ORDER != BIG_ENDIAN +- not big endian +- #endif +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- ac_cv_c_bigendian=yes +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_c_bigendian=no +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +- fi +- if test $ac_cv_c_bigendian = unknown; then +- # See if defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris). +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include +- +-int +-main () +-{ +-#if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN) +- bogus endian macros +- #endif +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- # It does; now see whether it defined to _BIG_ENDIAN or not. +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include +- +-int +-main () +-{ +-#ifndef _BIG_ENDIAN +- not big endian +- #endif +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- ac_cv_c_bigendian=yes +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_c_bigendian=no +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +- fi +- if test $ac_cv_c_bigendian = unknown; then +- # Compile a test program. +- if test "$cross_compiling" = yes; then +- # Try to guess by grepping values from an object file. +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-short int ascii_mm[] = +- { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 }; +- short int ascii_ii[] = +- { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 }; +- int use_ascii (int i) { +- return ascii_mm[i] + ascii_ii[i]; +- } +- short int ebcdic_ii[] = +- { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 }; +- short int ebcdic_mm[] = +- { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 }; +- int use_ebcdic (int i) { +- return ebcdic_mm[i] + ebcdic_ii[i]; +- } +- extern int foo; +- +-int +-main () +-{ +-return use_ascii (foo) == use_ebcdic (foo); +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then +- ac_cv_c_bigendian=yes +- fi +- if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then +- if test "$ac_cv_c_bigendian" = unknown; then +- ac_cv_c_bigendian=no +- else +- # finding both strings is unlikely to happen, but who knows? +- ac_cv_c_bigendian=unknown +- fi +- fi +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +-int +-main () +-{ +- +- /* Are we little or big endian? From Harbison&Steele. */ +- union +- { +- long int l; +- char c[sizeof (long int)]; +- } u; +- u.l = 1; +- return u.c[sizeof (long int) - 1] == 1; +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>&5 +- ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_cv_c_bigendian=no +-else +- $as_echo "$as_me: program exited with status $ac_status" >&5 +-$as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-( exit $ac_status ) +-ac_cv_c_bigendian=yes +-fi +-rm -rf conftest.dSYM +-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +-fi +- +- +- fi +-fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5 +-$as_echo "$ac_cv_c_bigendian" >&6; } +- case $ac_cv_c_bigendian in #( +- yes) +- cat >>confdefs.h <<\_ACEOF +-#define WORDS_BIGENDIAN 1 +-_ACEOF +-;; #( +- no) +- ;; #( +- universal) +- +-cat >>confdefs.h <<\_ACEOF +-#define AC_APPLE_UNIVERSAL_BUILD 1 +-_ACEOF +- +- ;; #( +- *) +- { { $as_echo "$as_me:$LINENO: error: unknown endianness +- presetting ac_cv_c_bigendian=no (or yes) will help" >&5 +-$as_echo "$as_me: error: unknown endianness +- presetting ac_cv_c_bigendian=no (or yes) will help" >&2;} +- { (exit 1); exit 1; }; } ;; +- esac +- +- +-# ------ AX CREATE STDINT H ------------------------------------- +-{ $as_echo "$as_me:$LINENO: checking for stdint types" >&5 +-$as_echo_n "checking for stdint types... " >&6; } +-ac_stdint_h=`echo orc/orc-stdint.h` +-# try to shortcircuit - if the default include path of the compiler +-# can find a "stdint.h" header then we assume that all compilers can. +-if test "${ac_cv_header_stdint_t+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- +-old_CXXFLAGS="$CXXFLAGS" ; CXXFLAGS="" +-old_CPPFLAGS="$CPPFLAGS" ; CPPFLAGS="" +-old_CFLAGS="$CFLAGS" ; CFLAGS="" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include +-int +-main () +-{ +-int_least32_t v = 0; +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- ac_cv_stdint_result="(assuming C99 compatible system)" +- ac_cv_header_stdint_t="stdint.h"; +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_header_stdint_t="" +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-if test "$GCC" = "yes" && test ".$ac_cv_header_stdint_t" = "."; then +-CFLAGS="-std=c99" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include +-int +-main () +-{ +-int_least32_t v = 0; +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- { $as_echo "$as_me:$LINENO: WARNING: your GCC compiler has a defunct stdint.h for its default-mode" >&5 +-$as_echo "$as_me: WARNING: your GCC compiler has a defunct stdint.h for its default-mode" >&2;} +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-fi +-CXXFLAGS="$old_CXXFLAGS" +-CPPFLAGS="$old_CPPFLAGS" +-CFLAGS="$old_CFLAGS" +-fi +- +- +-v="... $ac_cv_header_stdint_h" +-if test "$ac_stdint_h" = "stdint.h" ; then +- { $as_echo "$as_me:$LINENO: result: (are you sure you want them in ./stdint.h?)" >&5 +-$as_echo "(are you sure you want them in ./stdint.h?)" >&6; } +-elif test "$ac_stdint_h" = "inttypes.h" ; then +- { $as_echo "$as_me:$LINENO: result: (are you sure you want them in ./inttypes.h?)" >&5 +-$as_echo "(are you sure you want them in ./inttypes.h?)" >&6; } +-elif test "_$ac_cv_header_stdint_t" = "_" ; then +- { $as_echo "$as_me:$LINENO: result: (putting them into $ac_stdint_h)$v" >&5 +-$as_echo "(putting them into $ac_stdint_h)$v" >&6; } +-else +- ac_cv_header_stdint="$ac_cv_header_stdint_t" +- { $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdint (shortcircuit)" >&5 +-$as_echo "$ac_cv_header_stdint (shortcircuit)" >&6; } +-fi +- +-if test "_$ac_cv_header_stdint_t" = "_" ; then # can not shortcircuit.. +- +- +-inttype_headers=`echo | sed -e 's/,/ /g'` +- +-ac_cv_stdint_result="(no helpful system typedefs seen)" +- +-{ $as_echo "$as_me:$LINENO: checking for stdint uintptr_t" >&5 +-$as_echo_n "checking for stdint uintptr_t... " >&6; } +-if test "${ac_cv_header_stdint_x+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- +- ac_cv_header_stdint_x="" # the 1997 typedefs (inttypes.h) +- { $as_echo "$as_me:$LINENO: result: (..)" >&5 +-$as_echo "(..)" >&6; } +- for i in stdint.h inttypes.h sys/inttypes.h $inttype_headers +- do +- unset ac_cv_type_uintptr_t +- unset ac_cv_type_uint64_t +- { $as_echo "$as_me:$LINENO: checking for uintptr_t" >&5 +-$as_echo_n "checking for uintptr_t... " >&6; } +-if test "${ac_cv_type_uintptr_t+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- ac_cv_type_uintptr_t=no +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include <$i> +- +-int +-main () +-{ +-if (sizeof (uintptr_t)) +- return 0; +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include <$i> +- +-int +-main () +-{ +-if (sizeof ((uintptr_t))) +- return 0; +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- : +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_type_uintptr_t=yes +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_uintptr_t" >&5 +-$as_echo "$ac_cv_type_uintptr_t" >&6; } +-if test "x$ac_cv_type_uintptr_t" = x""yes; then +- ac_cv_header_stdint_x=$i +-else +- continue +-fi +- +- { $as_echo "$as_me:$LINENO: checking for uint64_t" >&5 +-$as_echo_n "checking for uint64_t... " >&6; } +-if test "${ac_cv_type_uint64_t+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- ac_cv_type_uint64_t=no +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include<$i> +- +-int +-main () +-{ +-if (sizeof (uint64_t)) +- return 0; +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include<$i> +- +-int +-main () +-{ +-if (sizeof ((uint64_t))) +- return 0; +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- : +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_type_uint64_t=yes +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_uint64_t" >&5 +-$as_echo "$ac_cv_type_uint64_t" >&6; } +-if test "x$ac_cv_type_uint64_t" = x""yes; then +- and64="/uint64_t" +-else +- and64="" +-fi +- +- ac_cv_stdint_result="(seen uintptr_t$and64 in $i)" +- break +- done +- { $as_echo "$as_me:$LINENO: checking for stdint uintptr_t" >&5 +-$as_echo_n "checking for stdint uintptr_t... " >&6; } +- +-fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdint_x" >&5 +-$as_echo "$ac_cv_header_stdint_x" >&6; } +- +- +-if test "_$ac_cv_header_stdint_x" = "_" ; then +- +-{ $as_echo "$as_me:$LINENO: checking for stdint uint32_t" >&5 +-$as_echo_n "checking for stdint uint32_t... " >&6; } +-if test "${ac_cv_header_stdint_o+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- +- ac_cv_header_stdint_o="" # the 1995 typedefs (sys/inttypes.h) +- { $as_echo "$as_me:$LINENO: result: (..)" >&5 +-$as_echo "(..)" >&6; } +- for i in inttypes.h sys/inttypes.h stdint.h $inttype_headers +- do +- unset ac_cv_type_uint32_t +- unset ac_cv_type_uint64_t +- { $as_echo "$as_me:$LINENO: checking for uint32_t" >&5 +-$as_echo_n "checking for uint32_t... " >&6; } +-if test "${ac_cv_type_uint32_t+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- ac_cv_type_uint32_t=no +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include <$i> +- +-int +-main () +-{ +-if (sizeof (uint32_t)) +- return 0; +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include <$i> +- +-int +-main () +-{ +-if (sizeof ((uint32_t))) +- return 0; +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- : +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_type_uint32_t=yes +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_uint32_t" >&5 +-$as_echo "$ac_cv_type_uint32_t" >&6; } +-if test "x$ac_cv_type_uint32_t" = x""yes; then +- ac_cv_header_stdint_o=$i +-else +- continue +-fi +- +- { $as_echo "$as_me:$LINENO: checking for uint64_t" >&5 +-$as_echo_n "checking for uint64_t... " >&6; } +-if test "${ac_cv_type_uint64_t+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- ac_cv_type_uint64_t=no +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include<$i> +- +-int +-main () +-{ +-if (sizeof (uint64_t)) +- return 0; +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include<$i> +- +-int +-main () +-{ +-if (sizeof ((uint64_t))) +- return 0; +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- : +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_type_uint64_t=yes +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_uint64_t" >&5 +-$as_echo "$ac_cv_type_uint64_t" >&6; } +-if test "x$ac_cv_type_uint64_t" = x""yes; then +- and64="/uint64_t" +-else +- and64="" +-fi +- +- ac_cv_stdint_result="(seen uint32_t$and64 in $i)" +- break +- break; +- done +- { $as_echo "$as_me:$LINENO: checking for stdint uint32_t" >&5 +-$as_echo_n "checking for stdint uint32_t... " >&6; } +- +-fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdint_o" >&5 +-$as_echo "$ac_cv_header_stdint_o" >&6; } +- +-fi +- +-if test "_$ac_cv_header_stdint_x" = "_" ; then +-if test "_$ac_cv_header_stdint_o" = "_" ; then +- +-{ $as_echo "$as_me:$LINENO: checking for stdint u_int32_t" >&5 +-$as_echo_n "checking for stdint u_int32_t... " >&6; } +-if test "${ac_cv_header_stdint_u+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- +- ac_cv_header_stdint_u="" # the BSD typedefs (sys/types.h) +- { $as_echo "$as_me:$LINENO: result: (..)" >&5 +-$as_echo "(..)" >&6; } +- for i in sys/types.h inttypes.h sys/inttypes.h $inttype_headers ; do +- unset ac_cv_type_u_int32_t +- unset ac_cv_type_u_int64_t +- { $as_echo "$as_me:$LINENO: checking for u_int32_t" >&5 +-$as_echo_n "checking for u_int32_t... " >&6; } +-if test "${ac_cv_type_u_int32_t+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- ac_cv_type_u_int32_t=no +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include <$i> +- +-int +-main () +-{ +-if (sizeof (u_int32_t)) +- return 0; +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include <$i> +- +-int +-main () +-{ +-if (sizeof ((u_int32_t))) +- return 0; +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- : +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_type_u_int32_t=yes +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_u_int32_t" >&5 +-$as_echo "$ac_cv_type_u_int32_t" >&6; } +-if test "x$ac_cv_type_u_int32_t" = x""yes; then +- ac_cv_header_stdint_u=$i +-else +- continue +-fi +- +- { $as_echo "$as_me:$LINENO: checking for u_int64_t" >&5 +-$as_echo_n "checking for u_int64_t... " >&6; } +-if test "${ac_cv_type_u_int64_t+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- ac_cv_type_u_int64_t=no +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include<$i> +- +-int +-main () +-{ +-if (sizeof (u_int64_t)) +- return 0; +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include<$i> +- +-int +-main () +-{ +-if (sizeof ((u_int64_t))) +- return 0; +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- : +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_type_u_int64_t=yes +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_u_int64_t" >&5 +-$as_echo "$ac_cv_type_u_int64_t" >&6; } +-if test "x$ac_cv_type_u_int64_t" = x""yes; then +- and64="/u_int64_t" +-else +- and64="" +-fi +- +- ac_cv_stdint_result="(seen u_int32_t$and64 in $i)" +- break +- break; +- done +- { $as_echo "$as_me:$LINENO: checking for stdint u_int32_t" >&5 +-$as_echo_n "checking for stdint u_int32_t... " >&6; } +- +-fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdint_u" >&5 +-$as_echo "$ac_cv_header_stdint_u" >&6; } +- +-fi fi +- +-if test "_$ac_cv_header_stdint_x" = "_" ; then +- { $as_echo "$as_me:$LINENO: checking for stdint datatype model" >&5 +-$as_echo_n "checking for stdint datatype model... " >&6; } +- { $as_echo "$as_me:$LINENO: result: (..)" >&5 +-$as_echo "(..)" >&6; } +- +- # The cast to long int works around a bug in the HP C Compiler +-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. +-# This bug is HP SR number 8606223364. +-{ $as_echo "$as_me:$LINENO: checking size of char" >&5 +-$as_echo_n "checking size of char... " >&6; } +-if test "${ac_cv_sizeof_char+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- if test "$cross_compiling" = yes; then +- # Depending upon the size, compute the lo and hi bounds. +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +-int +-main () +-{ +-static int test_array [1 - 2 * !(((long int) (sizeof (char))) >= 0)]; +-test_array [0] = 0 +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- ac_lo=0 ac_mid=0 +- while :; do +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +-int +-main () +-{ +-static int test_array [1 - 2 * !(((long int) (sizeof (char))) <= $ac_mid)]; +-test_array [0] = 0 +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- ac_hi=$ac_mid; break +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_lo=`expr $ac_mid + 1` +- if test $ac_lo -le $ac_mid; then +- ac_lo= ac_hi= +- break +- fi +- ac_mid=`expr 2 '*' $ac_mid + 1` +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +- done +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +-int +-main () +-{ +-static int test_array [1 - 2 * !(((long int) (sizeof (char))) < 0)]; +-test_array [0] = 0 +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- ac_hi=-1 ac_mid=-1 +- while :; do +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +-int +-main () +-{ +-static int test_array [1 - 2 * !(((long int) (sizeof (char))) >= $ac_mid)]; +-test_array [0] = 0 +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- ac_lo=$ac_mid; break +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_hi=`expr '(' $ac_mid ')' - 1` +- if test $ac_mid -le $ac_hi; then +- ac_lo= ac_hi= +- break +- fi +- ac_mid=`expr 2 '*' $ac_mid` +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +- done +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_lo= ac_hi= +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-# Binary search between lo and hi bounds. +-while test "x$ac_lo" != "x$ac_hi"; do +- ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +-int +-main () +-{ +-static int test_array [1 - 2 * !(((long int) (sizeof (char))) <= $ac_mid)]; +-test_array [0] = 0 +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- ac_hi=$ac_mid +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_lo=`expr '(' $ac_mid ')' + 1` +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-done +-case $ac_lo in +-?*) ac_cv_sizeof_char=$ac_lo;; +-'') if test "$ac_cv_type_char" = yes; then +- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (char) +-See \`config.log' for more details." >&5 +-$as_echo "$as_me: error: cannot compute sizeof (char) +-See \`config.log' for more details." >&2;} +- { (exit 77); exit 77; }; }; } +- else +- ac_cv_sizeof_char=0 +- fi ;; +-esac +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +-static long int longval () { return (long int) (sizeof (char)); } +-static unsigned long int ulongval () { return (long int) (sizeof (char)); } +-#include +-#include +-int +-main () +-{ +- +- FILE *f = fopen ("conftest.val", "w"); +- if (! f) +- return 1; +- if (((long int) (sizeof (char))) < 0) +- { +- long int i = longval (); +- if (i != ((long int) (sizeof (char)))) +- return 1; +- fprintf (f, "%ld", i); +- } +- else +- { +- unsigned long int i = ulongval (); +- if (i != ((long int) (sizeof (char)))) +- return 1; +- fprintf (f, "%lu", i); +- } +- /* Do not output a trailing newline, as this causes \r\n confusion +- on some platforms. */ +- return ferror (f) || fclose (f) != 0; +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>&5 +- ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_cv_sizeof_char=`cat conftest.val` +-else +- $as_echo "$as_me: program exited with status $ac_status" >&5 +-$as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-( exit $ac_status ) +-if test "$ac_cv_type_char" = yes; then +- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (char) +-See \`config.log' for more details." >&5 +-$as_echo "$as_me: error: cannot compute sizeof (char) +-See \`config.log' for more details." >&2;} +- { (exit 77); exit 77; }; }; } +- else +- ac_cv_sizeof_char=0 +- fi +-fi +-rm -rf conftest.dSYM +-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +-fi +-rm -f conftest.val +-fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_char" >&5 +-$as_echo "$ac_cv_sizeof_char" >&6; } +- +- +- +-cat >>confdefs.h <<_ACEOF +-#define SIZEOF_CHAR $ac_cv_sizeof_char +-_ACEOF +- +- +- # The cast to long int works around a bug in the HP C Compiler +-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. +-# This bug is HP SR number 8606223364. +-{ $as_echo "$as_me:$LINENO: checking size of short" >&5 +-$as_echo_n "checking size of short... " >&6; } +-if test "${ac_cv_sizeof_short+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- if test "$cross_compiling" = yes; then +- # Depending upon the size, compute the lo and hi bounds. +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +-int +-main () +-{ +-static int test_array [1 - 2 * !(((long int) (sizeof (short))) >= 0)]; +-test_array [0] = 0 +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- ac_lo=0 ac_mid=0 +- while :; do +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +-int +-main () +-{ +-static int test_array [1 - 2 * !(((long int) (sizeof (short))) <= $ac_mid)]; +-test_array [0] = 0 +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- ac_hi=$ac_mid; break +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_lo=`expr $ac_mid + 1` +- if test $ac_lo -le $ac_mid; then +- ac_lo= ac_hi= +- break +- fi +- ac_mid=`expr 2 '*' $ac_mid + 1` +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +- done +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +-int +-main () +-{ +-static int test_array [1 - 2 * !(((long int) (sizeof (short))) < 0)]; +-test_array [0] = 0 +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- ac_hi=-1 ac_mid=-1 +- while :; do +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +-int +-main () +-{ +-static int test_array [1 - 2 * !(((long int) (sizeof (short))) >= $ac_mid)]; +-test_array [0] = 0 +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- ac_lo=$ac_mid; break +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_hi=`expr '(' $ac_mid ')' - 1` +- if test $ac_mid -le $ac_hi; then +- ac_lo= ac_hi= +- break +- fi +- ac_mid=`expr 2 '*' $ac_mid` +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +- done +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_lo= ac_hi= +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-# Binary search between lo and hi bounds. +-while test "x$ac_lo" != "x$ac_hi"; do +- ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +-int +-main () +-{ +-static int test_array [1 - 2 * !(((long int) (sizeof (short))) <= $ac_mid)]; +-test_array [0] = 0 +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- ac_hi=$ac_mid +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_lo=`expr '(' $ac_mid ')' + 1` +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-done +-case $ac_lo in +-?*) ac_cv_sizeof_short=$ac_lo;; +-'') if test "$ac_cv_type_short" = yes; then +- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (short) +-See \`config.log' for more details." >&5 +-$as_echo "$as_me: error: cannot compute sizeof (short) +-See \`config.log' for more details." >&2;} +- { (exit 77); exit 77; }; }; } +- else +- ac_cv_sizeof_short=0 +- fi ;; +-esac +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +-static long int longval () { return (long int) (sizeof (short)); } +-static unsigned long int ulongval () { return (long int) (sizeof (short)); } +-#include +-#include +-int +-main () +-{ +- +- FILE *f = fopen ("conftest.val", "w"); +- if (! f) +- return 1; +- if (((long int) (sizeof (short))) < 0) +- { +- long int i = longval (); +- if (i != ((long int) (sizeof (short)))) +- return 1; +- fprintf (f, "%ld", i); +- } +- else +- { +- unsigned long int i = ulongval (); +- if (i != ((long int) (sizeof (short)))) +- return 1; +- fprintf (f, "%lu", i); +- } +- /* Do not output a trailing newline, as this causes \r\n confusion +- on some platforms. */ +- return ferror (f) || fclose (f) != 0; +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>&5 +- ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_cv_sizeof_short=`cat conftest.val` +-else +- $as_echo "$as_me: program exited with status $ac_status" >&5 +-$as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-( exit $ac_status ) +-if test "$ac_cv_type_short" = yes; then +- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (short) +-See \`config.log' for more details." >&5 +-$as_echo "$as_me: error: cannot compute sizeof (short) +-See \`config.log' for more details." >&2;} +- { (exit 77); exit 77; }; }; } +- else +- ac_cv_sizeof_short=0 +- fi +-fi +-rm -rf conftest.dSYM +-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +-fi +-rm -f conftest.val +-fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5 +-$as_echo "$ac_cv_sizeof_short" >&6; } +- +- +- +-cat >>confdefs.h <<_ACEOF +-#define SIZEOF_SHORT $ac_cv_sizeof_short +-_ACEOF +- +- +- # The cast to long int works around a bug in the HP C Compiler +-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. +-# This bug is HP SR number 8606223364. +-{ $as_echo "$as_me:$LINENO: checking size of int" >&5 +-$as_echo_n "checking size of int... " >&6; } +-if test "${ac_cv_sizeof_int+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- if test "$cross_compiling" = yes; then +- # Depending upon the size, compute the lo and hi bounds. +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +-int +-main () +-{ +-static int test_array [1 - 2 * !(((long int) (sizeof (int))) >= 0)]; +-test_array [0] = 0 +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- ac_lo=0 ac_mid=0 +- while :; do +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +-int +-main () +-{ +-static int test_array [1 - 2 * !(((long int) (sizeof (int))) <= $ac_mid)]; +-test_array [0] = 0 +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- ac_hi=$ac_mid; break +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_lo=`expr $ac_mid + 1` +- if test $ac_lo -le $ac_mid; then +- ac_lo= ac_hi= +- break +- fi +- ac_mid=`expr 2 '*' $ac_mid + 1` +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +- done +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +-int +-main () +-{ +-static int test_array [1 - 2 * !(((long int) (sizeof (int))) < 0)]; +-test_array [0] = 0 +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- ac_hi=-1 ac_mid=-1 +- while :; do +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +-int +-main () +-{ +-static int test_array [1 - 2 * !(((long int) (sizeof (int))) >= $ac_mid)]; +-test_array [0] = 0 +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- ac_lo=$ac_mid; break +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_hi=`expr '(' $ac_mid ')' - 1` +- if test $ac_mid -le $ac_hi; then +- ac_lo= ac_hi= +- break +- fi +- ac_mid=`expr 2 '*' $ac_mid` +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ # The diagnosis changed in icc 8.0: ++ # icc: Command line remark: option '-MP' not supported ++ if (grep 'ignoring option' conftest.err || ++ grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else ++ am_cv_CCAS_dependencies_compiler_type=$depmode ++ break ++ fi ++ fi + done +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 + +- ac_lo= ac_hi= ++ cd .. ++ rm -rf conftest.dir ++else ++ am_cv_CCAS_dependencies_compiler_type=none + fi + +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CCAS_dependencies_compiler_type" >&5 ++$as_echo "$am_cv_CCAS_dependencies_compiler_type" >&6; } ++CCASDEPMODE=depmode=$am_cv_CCAS_dependencies_compiler_type + +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-# Binary search between lo and hi bounds. +-while test "x$ac_lo" != "x$ac_hi"; do +- ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +-int +-main () +-{ +-static int test_array [1 - 2 * !(((long int) (sizeof (int))) <= $ac_mid)]; +-test_array [0] = 0 +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- ac_hi=$ac_mid ++ if ++ test "x$enable_dependency_tracking" != xno \ ++ && test "$am_cv_CCAS_dependencies_compiler_type" = gcc3; then ++ am__fastdepCCAS_TRUE= ++ am__fastdepCCAS_FALSE='#' + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_lo=`expr '(' $ac_mid ')' + 1` ++ am__fastdepCCAS_TRUE='#' ++ am__fastdepCCAS_FALSE= + fi + +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-done +-case $ac_lo in +-?*) ac_cv_sizeof_int=$ac_lo;; +-'') if test "$ac_cv_type_int" = yes; then +- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (int) +-See \`config.log' for more details." >&5 +-$as_echo "$as_me: error: cannot compute sizeof (int) +-See \`config.log' for more details." >&2;} +- { (exit 77); exit 77; }; }; } +- else +- ac_cv_sizeof_int=0 +- fi ;; +-esac +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +-static long int longval () { return (long int) (sizeof (int)); } +-static unsigned long int ulongval () { return (long int) (sizeof (int)); } +-#include +-#include +-int +-main () +-{ + +- FILE *f = fopen ("conftest.val", "w"); +- if (! f) +- return 1; +- if (((long int) (sizeof (int))) < 0) +- { +- long int i = longval (); +- if (i != ((long int) (sizeof (int)))) +- return 1; +- fprintf (f, "%ld", i); +- } +- else +- { +- unsigned long int i = ulongval (); +- if (i != ((long int) (sizeof (int)))) +- return 1; +- fprintf (f, "%lu", i); +- } +- /* Do not output a trailing newline, as this causes \r\n confusion +- on some platforms. */ +- return ferror (f) || fclose (f) != 0; + +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>&5 +- ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_cv_sizeof_int=`cat conftest.val` +-else +- $as_echo "$as_me: program exited with status $ac_status" >&5 +-$as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 + +-( exit $ac_status ) +-if test "$ac_cv_type_int" = yes; then +- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (int) +-See \`config.log' for more details." >&5 +-$as_echo "$as_me: error: cannot compute sizeof (int) +-See \`config.log' for more details." >&2;} +- { (exit 77); exit 77; }; }; } +- else +- ac_cv_sizeof_int=0 +- fi +-fi +-rm -rf conftest.dSYM +-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +-fi +-rm -f conftest.val +-fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5 +-$as_echo "$ac_cv_sizeof_int" >&6; } + ++ACLOCAL_AMFLAGS="-I m4 $ACLOCAL_AMFLAGS" + + +-cat >>confdefs.h <<_ACEOF +-#define SIZEOF_INT $ac_cv_sizeof_int +-_ACEOF ++################################################## ++# Check for gtk-doc. ++################################################## ++ ++if test "x$cross_compiling" = "xyes" ; then ++ enable_gtk_doc=no ++fi + + +- # The cast to long int works around a bug in the HP C Compiler +-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. +-# This bug is HP SR number 8606223364. +-{ $as_echo "$as_me:$LINENO: checking size of long" >&5 +-$as_echo_n "checking size of long... " >&6; } +-if test "${ac_cv_sizeof_long+set}" = set; then ++if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then ++ if test -n "$ac_tool_prefix"; then ++ # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. ++set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_path_PKG_CONFIG+set}" = set; then : + $as_echo_n "(cached) " >&6 + else +- if test "$cross_compiling" = yes; then +- # Depending upon the size, compute the lo and hi bounds. +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +-int +-main () +-{ +-static int test_array [1 - 2 * !(((long int) (sizeof (long))) >= 0)]; +-test_array [0] = 0 +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- ac_lo=0 ac_mid=0 +- while :; do +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +-int +-main () +-{ +-static int test_array [1 - 2 * !(((long int) (sizeof (long))) <= $ac_mid)]; +-test_array [0] = 0 ++ case $PKG_CONFIG in ++ [\\/]* | ?:[\\/]*) ++ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. ++ ;; ++ *) ++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS + +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; ++ ;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- ac_hi=$ac_mid; break +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_lo=`expr $ac_mid + 1` +- if test $ac_lo -le $ac_mid; then +- ac_lo= ac_hi= +- break +- fi +- ac_mid=`expr 2 '*' $ac_mid + 1` + fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +- done ++PKG_CONFIG=$ac_cv_path_PKG_CONFIG ++if test -n "$PKG_CONFIG"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 ++$as_echo "$PKG_CONFIG" >&6; } + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi + +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +-int +-main () +-{ +-static int test_array [1 - 2 * !(((long int) (sizeof (long))) < 0)]; +-test_array [0] = 0 + +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- ac_hi=-1 ac_mid=-1 +- while :; do +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +-int +-main () +-{ +-static int test_array [1 - 2 * !(((long int) (sizeof (long))) >= $ac_mid)]; +-test_array [0] = 0 ++fi ++if test -z "$ac_cv_path_PKG_CONFIG"; then ++ ac_pt_PKG_CONFIG=$PKG_CONFIG ++ # Extract the first word of "pkg-config", so it can be a program name with args. ++set dummy pkg-config; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ case $ac_pt_PKG_CONFIG in ++ [\\/]* | ?:[\\/]*) ++ ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. ++ ;; ++ *) ++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS + +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; ++ ;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- ac_lo=$ac_mid; break ++fi ++ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG ++if test -n "$ac_pt_PKG_CONFIG"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 ++$as_echo "$ac_pt_PKG_CONFIG" >&6; } + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_hi=`expr '(' $ac_mid ')' - 1` +- if test $ac_mid -le $ac_hi; then +- ac_lo= ac_hi= +- break +- fi +- ac_mid=`expr 2 '*' $ac_mid` ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } + fi + +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +- done ++ if test "x$ac_pt_PKG_CONFIG" = x; then ++ PKG_CONFIG="" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 ++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ++ac_tool_warned=yes ;; ++esac ++ PKG_CONFIG=$ac_pt_PKG_CONFIG ++ fi + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 ++ PKG_CONFIG="$ac_cv_path_PKG_CONFIG" ++fi + +- ac_lo= ac_hi= + fi ++if test -n "$PKG_CONFIG"; then ++ _pkg_min_version=0.9.0 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 ++$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } ++ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ++$as_echo "yes" >&6; } ++ else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++ PKG_CONFIG="" ++ fi + +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi + +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-# Binary search between lo and hi bounds. +-while test "x$ac_lo" != "x$ac_hi"; do +- ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +-int +-main () +-{ +-static int test_array [1 - 2 * !(((long int) (sizeof (long))) <= $ac_mid)]; +-test_array [0] = 0 + +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- ac_hi=$ac_mid ++# Check whether --with-html-dir was given. ++if test "${with_html_dir+set}" = set; then : ++ withval=$with_html_dir; + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_lo=`expr '(' $ac_mid ')' + 1` ++ with_html_dir='${datadir}/gtk-doc/html' + fi + +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-done +-case $ac_lo in +-?*) ac_cv_sizeof_long=$ac_lo;; +-'') if test "$ac_cv_type_long" = yes; then +- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (long) +-See \`config.log' for more details." >&5 +-$as_echo "$as_me: error: cannot compute sizeof (long) +-See \`config.log' for more details." >&2;} +- { (exit 77); exit 77; }; }; } +- else +- ac_cv_sizeof_long=0 +- fi ;; +-esac +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +-static long int longval () { return (long int) (sizeof (long)); } +-static unsigned long int ulongval () { return (long int) (sizeof (long)); } +-#include +-#include +-int +-main () +-{ ++ HTML_DIR="$with_html_dir" + +- FILE *f = fopen ("conftest.val", "w"); +- if (! f) +- return 1; +- if (((long int) (sizeof (long))) < 0) +- { +- long int i = longval (); +- if (i != ((long int) (sizeof (long)))) +- return 1; +- fprintf (f, "%ld", i); +- } +- else +- { +- unsigned long int i = ulongval (); +- if (i != ((long int) (sizeof (long)))) +- return 1; +- fprintf (f, "%lu", i); +- } +- /* Do not output a trailing newline, as this causes \r\n confusion +- on some platforms. */ +- return ferror (f) || fclose (f) != 0; + +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>&5 +- ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_cv_sizeof_long=`cat conftest.val` ++ # Check whether --enable-gtk-doc was given. ++if test "${enable_gtk_doc+set}" = set; then : ++ enableval=$enable_gtk_doc; + else +- $as_echo "$as_me: program exited with status $ac_status" >&5 +-$as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-( exit $ac_status ) +-if test "$ac_cv_type_long" = yes; then +- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (long) +-See \`config.log' for more details." >&5 +-$as_echo "$as_me: error: cannot compute sizeof (long) +-See \`config.log' for more details." >&2;} +- { (exit 77); exit 77; }; }; } +- else +- ac_cv_sizeof_long=0 +- fi +-fi +-rm -rf conftest.dSYM +-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +-fi +-rm -f conftest.val ++ enable_gtk_doc=no + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5 +-$as_echo "$ac_cv_sizeof_long" >&6; } +- + + +-cat >>confdefs.h <<_ACEOF +-#define SIZEOF_LONG $ac_cv_sizeof_long +-_ACEOF ++ if test x$enable_gtk_doc = xyes; then ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk-doc >= 1.0\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "gtk-doc >= 1.0") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then ++ : ++else ++ as_fn_error "You need to have gtk-doc >= 1.0 installed to build gtk-doc" "$LINENO" 5 ++fi ++ fi + ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build gtk-doc documentation" >&5 ++$as_echo_n "checking whether to build gtk-doc documentation... " >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_gtk_doc" >&5 ++$as_echo "$enable_gtk_doc" >&6; } + +- # The cast to long int works around a bug in the HP C Compiler +-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. +-# This bug is HP SR number 8606223364. +-{ $as_echo "$as_me:$LINENO: checking size of void*" >&5 +-$as_echo_n "checking size of void*... " >&6; } +-if test "${ac_cv_sizeof_voidp+set}" = set; then ++ for ac_prog in gtkdoc-check ++do ++ # Extract the first word of "$ac_prog", so it can be a program name with args. ++set dummy $ac_prog; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_path_GTKDOC_CHECK+set}" = set; then : + $as_echo_n "(cached) " >&6 + else +- if test "$cross_compiling" = yes; then +- # Depending upon the size, compute the lo and hi bounds. +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +-int +-main () +-{ +-static int test_array [1 - 2 * !(((long int) (sizeof (void*))) >= 0)]; +-test_array [0] = 0 +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- ac_lo=0 ac_mid=0 +- while :; do +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +-int +-main () +-{ +-static int test_array [1 - 2 * !(((long int) (sizeof (void*))) <= $ac_mid)]; +-test_array [0] = 0 ++ case $GTKDOC_CHECK in ++ [\\/]* | ?:[\\/]*) ++ ac_cv_path_GTKDOC_CHECK="$GTKDOC_CHECK" # Let the user override the test with a path. ++ ;; ++ *) ++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_path_GTKDOC_CHECK="$as_dir/$ac_word$ac_exec_ext" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS + +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; ++ ;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- ac_hi=$ac_mid; break ++fi ++GTKDOC_CHECK=$ac_cv_path_GTKDOC_CHECK ++if test -n "$GTKDOC_CHECK"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_CHECK" >&5 ++$as_echo "$GTKDOC_CHECK" >&6; } + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi + +- ac_lo=`expr $ac_mid + 1` +- if test $ac_lo -le $ac_mid; then +- ac_lo= ac_hi= +- break +- fi +- ac_mid=`expr 2 '*' $ac_mid + 1` ++ ++ test -n "$GTKDOC_CHECK" && break ++done ++ ++ ++ if test x$enable_gtk_doc = xyes; then ++ ENABLE_GTK_DOC_TRUE= ++ ENABLE_GTK_DOC_FALSE='#' ++else ++ ENABLE_GTK_DOC_TRUE='#' ++ ENABLE_GTK_DOC_FALSE= + fi + +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +- done ++ if test -n "$LIBTOOL"; then ++ GTK_DOC_USE_LIBTOOL_TRUE= ++ GTK_DOC_USE_LIBTOOL_FALSE='#' + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 ++ GTK_DOC_USE_LIBTOOL_TRUE='#' ++ GTK_DOC_USE_LIBTOOL_FALSE= ++fi + +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +-int +-main () +-{ +-static int test_array [1 - 2 * !(((long int) (sizeof (void*))) < 0)]; +-test_array [0] = 0 + +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- ac_hi=-1 ac_mid=-1 +- while :; do +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +-int +-main () +-{ +-static int test_array [1 - 2 * !(((long int) (sizeof (void*))) >= $ac_mid)]; +-test_array [0] = 0 + +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- ac_lo=$ac_mid; break +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 + +- ac_hi=`expr '(' $ac_mid ')' - 1` +- if test $ac_mid -le $ac_hi; then +- ac_lo= ac_hi= +- break +- fi +- ac_mid=`expr 2 '*' $ac_mid` +-fi + +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +- done +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 ++ case "x${host_cpu}" in ++ xi?86 | k?) ++ HAVE_I386=yes + +- ac_lo= ac_hi= +-fi ++$as_echo "#define HAVE_I386 1" >>confdefs.h + +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-fi ++ ;; ++ xx86_64|xamd64) ++ HAVE_AMD64=yes + +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-# Binary search between lo and hi bounds. +-while test "x$ac_lo" != "x$ac_hi"; do +- ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +-int +-main () +-{ +-static int test_array [1 - 2 * !(((long int) (sizeof (void*))) <= $ac_mid)]; +-test_array [0] = 0 ++$as_echo "#define HAVE_AMD64 1" >>confdefs.h + +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- ac_hi=$ac_mid +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 ++ ;; ++ xpowerpc|xppc|xpowerpc64|xppc64) ++ HAVE_POWERPC=yes + +- ac_lo=`expr '(' $ac_mid ')' + 1` +-fi ++$as_echo "#define HAVE_POWERPC 1" >>confdefs.h + +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-done +-case $ac_lo in +-?*) ac_cv_sizeof_voidp=$ac_lo;; +-'') if test "$ac_cv_type_voidp" = yes; then +- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (void*) +-See \`config.log' for more details." >&5 +-$as_echo "$as_me: error: cannot compute sizeof (void*) +-See \`config.log' for more details." >&2;} +- { (exit 77); exit 77; }; }; } +- else +- ac_cv_sizeof_voidp=0 +- fi ;; +-esac +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +-static long int longval () { return (long int) (sizeof (void*)); } +-static unsigned long int ulongval () { return (long int) (sizeof (void*)); } +-#include +-#include +-int +-main () +-{ ++ ;; ++ xarm) ++ HAVE_ARM=yes + +- FILE *f = fopen ("conftest.val", "w"); +- if (! f) +- return 1; +- if (((long int) (sizeof (void*))) < 0) +- { +- long int i = longval (); +- if (i != ((long int) (sizeof (void*)))) +- return 1; +- fprintf (f, "%ld", i); +- } +- else +- { +- unsigned long int i = ulongval (); +- if (i != ((long int) (sizeof (void*)))) +- return 1; +- fprintf (f, "%lu", i); +- } +- /* Do not output a trailing newline, as this causes \r\n confusion +- on some platforms. */ +- return ferror (f) || fclose (f) != 0; ++$as_echo "#define HAVE_ARM 1" >>confdefs.h + +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>&5 +- ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_cv_sizeof_voidp=`cat conftest.val` ++ ;; ++ esac ++ ++ if test "x$HAVE_I386" = "xyes"; then ++ HAVE_I386_TRUE= ++ HAVE_I386_FALSE='#' + else +- $as_echo "$as_me: program exited with status $ac_status" >&5 +-$as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 ++ HAVE_I386_TRUE='#' ++ HAVE_I386_FALSE= ++fi + +-( exit $ac_status ) +-if test "$ac_cv_type_voidp" = yes; then +- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (void*) +-See \`config.log' for more details." >&5 +-$as_echo "$as_me: error: cannot compute sizeof (void*) +-See \`config.log' for more details." >&2;} +- { (exit 77); exit 77; }; }; } +- else +- ac_cv_sizeof_voidp=0 +- fi ++ if test "x$HAVE_AMD64" = "xyes"; then ++ HAVE_AMD64_TRUE= ++ HAVE_AMD64_FALSE='#' ++else ++ HAVE_AMD64_TRUE='#' ++ HAVE_AMD64_FALSE= + fi +-rm -rf conftest.dSYM +-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext ++ ++ if test "x$HAVE_POWERPC" = "xyes"; then ++ HAVE_POWERPC_TRUE= ++ HAVE_POWERPC_FALSE='#' ++else ++ HAVE_POWERPC_TRUE='#' ++ HAVE_POWERPC_FALSE= + fi +-rm -f conftest.val ++ ++ if test "x$HAVE_ARM" = "xyes"; then ++ HAVE_ARM_TRUE= ++ HAVE_ARM_FALSE='#' ++else ++ HAVE_ARM_TRUE='#' ++ HAVE_ARM_FALSE= + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_voidp" >&5 +-$as_echo "$ac_cv_sizeof_voidp" >&6; } + + ++ case "${host_os}" in ++ mingw*) ++ HAVE_OS_WIN32=yes + +-cat >>confdefs.h <<_ACEOF +-#define SIZEOF_VOIDP $ac_cv_sizeof_voidp +-_ACEOF ++$as_echo "#define HAVE_OS_WIN32 1" >>confdefs.h + ++ ;; ++ linux*) ++ HAVE_OS_LINUX=yes + +- ac_cv_char_data_model="" +- ac_cv_char_data_model="$ac_cv_char_data_model$ac_cv_sizeof_char" +- ac_cv_char_data_model="$ac_cv_char_data_model$ac_cv_sizeof_short" +- ac_cv_char_data_model="$ac_cv_char_data_model$ac_cv_sizeof_int" +- ac_cv_long_data_model="" +- ac_cv_long_data_model="$ac_cv_long_data_model$ac_cv_sizeof_int" +- ac_cv_long_data_model="$ac_cv_long_data_model$ac_cv_sizeof_long" +- ac_cv_long_data_model="$ac_cv_long_data_model$ac_cv_sizeof_voidp" +- { $as_echo "$as_me:$LINENO: checking data model" >&5 +-$as_echo_n "checking data model... " >&6; } +- case "$ac_cv_char_data_model/$ac_cv_long_data_model" in +- 122/242) ac_cv_data_model="IP16" ; n="standard 16bit machine" ;; +- 122/244) ac_cv_data_model="LP32" ; n="standard 32bit machine" ;; +- 122/*) ac_cv_data_model="i16" ; n="unusual int16 model" ;; +- 124/444) ac_cv_data_model="ILP32" ; n="standard 32bit unixish" ;; +- 124/488) ac_cv_data_model="LP64" ; n="standard 64bit unixish" ;; +- 124/448) ac_cv_data_model="LLP64" ; n="unusual 64bit unixish" ;; +- 124/*) ac_cv_data_model="i32" ; n="unusual int32 model" ;; +- 128/888) ac_cv_data_model="ILP64" ; n="unusual 64bit numeric" ;; +- 128/*) ac_cv_data_model="i64" ; n="unusual int64 model" ;; +- 222/*2) ac_cv_data_model="DSP16" ; n="strict 16bit dsptype" ;; +- 333/*3) ac_cv_data_model="DSP24" ; n="strict 24bit dsptype" ;; +- 444/*4) ac_cv_data_model="DSP32" ; n="strict 32bit dsptype" ;; +- 666/*6) ac_cv_data_model="DSP48" ; n="strict 48bit dsptype" ;; +- 888/*8) ac_cv_data_model="DSP64" ; n="strict 64bit dsptype" ;; +- 222/*|333/*|444/*|666/*|888/*) : +- ac_cv_data_model="iDSP" ; n="unusual dsptype" ;; +- *) ac_cv_data_model="none" ; n="very unusual model" ;; +- esac +- { $as_echo "$as_me:$LINENO: result: $ac_cv_data_model ($ac_cv_long_data_model, $n)" >&5 +-$as_echo "$ac_cv_data_model ($ac_cv_long_data_model, $n)" >&6; } ++$as_echo "#define HAVE_OS_LINUX 1" >>confdefs.h ++ ++ ;; ++ esac + ++ if test "$HAVE_OS_WIN32" = "yes"; then ++ HAVE_OS_WIN32_TRUE= ++ HAVE_OS_WIN32_FALSE='#' ++else ++ HAVE_OS_WIN32_TRUE='#' ++ HAVE_OS_WIN32_FALSE= + fi + +-if test "_$ac_cv_header_stdint_x" != "_" ; then +- ac_cv_header_stdint="$ac_cv_header_stdint_x" +-elif test "_$ac_cv_header_stdint_o" != "_" ; then +- ac_cv_header_stdint="$ac_cv_header_stdint_o" +-elif test "_$ac_cv_header_stdint_u" != "_" ; then +- ac_cv_header_stdint="$ac_cv_header_stdint_u" ++ if test "$HAVE_OS_LINUX" = "yes"; then ++ HAVE_OS_LINUX_TRUE= ++ HAVE_OS_LINUX_FALSE='#' + else +- ac_cv_header_stdint="stddef.h" ++ HAVE_OS_LINUX_TRUE='#' ++ HAVE_OS_LINUX_FALSE= + fi + +-{ $as_echo "$as_me:$LINENO: checking for extra inttypes in chosen header" >&5 +-$as_echo_n "checking for extra inttypes in chosen header... " >&6; } +-{ $as_echo "$as_me:$LINENO: result: ($ac_cv_header_stdint)" >&5 +-$as_echo "($ac_cv_header_stdint)" >&6; } +-unset ac_cv_type_int_least32_t +-unset ac_cv_type_int_fast32_t +-{ $as_echo "$as_me:$LINENO: checking for int_least32_t" >&5 +-$as_echo_n "checking for int_least32_t... " >&6; } +-if test "${ac_cv_type_int_least32_t+set}" = set; then ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5 ++$as_echo_n "checking whether byte ordering is bigendian... " >&6; } ++if test "${ac_cv_c_bigendian+set}" = set; then : + $as_echo_n "(cached) " >&6 + else +- ac_cv_type_int_least32_t=no +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ ++ ac_cv_c_bigendian=unknown ++ # See if we're dealing with a universal compiler. ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++#ifndef __APPLE_CC__ ++ not a universal capable compiler ++ #endif ++ typedef int dummy; ++ + _ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ ++ # Check for potential -arch flags. It is not universal unless ++ # there are at least two -arch flags with different values. ++ ac_arch= ++ ac_prev= ++ for ac_word in $CC $CFLAGS $CPPFLAGS $LDFLAGS; do ++ if test -n "$ac_prev"; then ++ case $ac_word in ++ i?86 | x86_64 | ppc | ppc64) ++ if test -z "$ac_arch" || test "$ac_arch" = "$ac_word"; then ++ ac_arch=$ac_word ++ else ++ ac_cv_c_bigendian=universal ++ break ++ fi ++ ;; ++ esac ++ ac_prev= ++ elif test "x$ac_word" = "x-arch"; then ++ ac_prev=arch ++ fi ++ done ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ if test $ac_cv_c_bigendian = unknown; then ++ # See if sys/param.h defines the BYTE_ORDER macro. ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +-#include <$ac_cv_header_stdint> ++#include ++ #include + + int + main () + { +-if (sizeof (int_least32_t)) +- return 0; ++#if ! (defined BYTE_ORDER && defined BIG_ENDIAN \ ++ && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \ ++ && LITTLE_ENDIAN) ++ bogus endian macros ++ #endif ++ + ; + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ # It does; now see whether it defined to BIG_ENDIAN or not. ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +-#include <$ac_cv_header_stdint> ++#include ++ #include + + int + main () + { +-if (sizeof ((int_least32_t))) +- return 0; ++#if BYTE_ORDER != BIG_ENDIAN ++ not big endian ++ #endif ++ + ; + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- : ++if ac_fn_c_try_compile "$LINENO"; then : ++ ac_cv_c_bigendian=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_type_int_least32_t=yes ++ ac_cv_c_bigendian=no + fi +- + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- + fi +- + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_int_least32_t" >&5 +-$as_echo "$ac_cv_type_int_least32_t" >&6; } +- +-{ $as_echo "$as_me:$LINENO: checking for int_fast32_t" >&5 +-$as_echo_n "checking for int_fast32_t... " >&6; } +-if test "${ac_cv_type_int_fast32_t+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- ac_cv_type_int_fast32_t=no +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ fi ++ if test $ac_cv_c_bigendian = unknown; then ++ # See if defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris). ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +-#include<$ac_cv_header_stdint> ++#include + + int + main () + { +-if (sizeof (int_fast32_t)) +- return 0; ++#if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN) ++ bogus endian macros ++ #endif ++ + ; + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ # It does; now see whether it defined to _BIG_ENDIAN or not. ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +-#include<$ac_cv_header_stdint> ++#include + + int + main () + { +-if (sizeof ((int_fast32_t))) +- return 0; ++#ifndef _BIG_ENDIAN ++ not big endian ++ #endif ++ + ; + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- : ++if ac_fn_c_try_compile "$LINENO"; then : ++ ac_cv_c_bigendian=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_type_int_fast32_t=yes ++ ac_cv_c_bigendian=no ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ fi ++ if test $ac_cv_c_bigendian = unknown; then ++ # Compile a test program. ++ if test "$cross_compiling" = yes; then : ++ # Try to guess by grepping values from an object file. ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++short int ascii_mm[] = ++ { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 }; ++ short int ascii_ii[] = ++ { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 }; ++ int use_ascii (int i) { ++ return ascii_mm[i] + ascii_ii[i]; ++ } ++ short int ebcdic_ii[] = ++ { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 }; ++ short int ebcdic_mm[] = ++ { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 }; ++ int use_ebcdic (int i) { ++ return ebcdic_mm[i] + ebcdic_ii[i]; ++ } ++ extern int foo; + ++int ++main () ++{ ++return use_ascii (foo) == use_ebcdic (foo); ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then ++ ac_cv_c_bigendian=yes ++ fi ++ if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then ++ if test "$ac_cv_c_bigendian" = unknown; then ++ ac_cv_c_bigendian=no ++ else ++ # finding both strings is unlikely to happen, but who knows? ++ ac_cv_c_bigendian=unknown ++ fi ++ fi ++fi + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++$ac_includes_default ++int ++main () ++{ + ++ /* Are we little or big endian? From Harbison&Steele. */ ++ union ++ { ++ long int l; ++ char c[sizeof (long int)]; ++ } u; ++ u.l = 1; ++ return u.c[sizeof (long int) - 1] == 1; + ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_run "$LINENO"; then : ++ ac_cv_c_bigendian=no ++else ++ ac_cv_c_bigendian=yes ++fi ++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ ++ conftest.$ac_objext conftest.beam conftest.$ac_ext + fi + +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ fi + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_int_fast32_t" >&5 +-$as_echo "$ac_cv_type_int_fast32_t" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5 ++$as_echo "$ac_cv_c_bigendian" >&6; } ++ case $ac_cv_c_bigendian in #( ++ yes) ++ $as_echo "#define WORDS_BIGENDIAN 1" >>confdefs.h ++;; #( ++ no) ++ ;; #( ++ universal) ++ ++$as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h ++ ++ ;; #( ++ *) ++ as_fn_error "unknown endianness ++ presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;; ++ esac + +-{ $as_echo "$as_me:$LINENO: checking for intmax_t" >&5 +-$as_echo_n "checking for intmax_t... " >&6; } +-if test "${ac_cv_type_intmax_t+set}" = set; then ++ ++# ------ AX CREATE STDINT H ------------------------------------- ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdint types" >&5 ++$as_echo_n "checking for stdint types... " >&6; } ++ac_stdint_h=`echo orc/orc-stdint.h` ++# try to shortcircuit - if the default include path of the compiler ++# can find a "stdint.h" header then we assume that all compilers can. ++if test "${ac_cv_header_stdint_t+set}" = set; then : + $as_echo_n "(cached) " >&6 + else +- ac_cv_type_intmax_t=no +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include <$ac_cv_header_stdint> + ++old_CXXFLAGS="$CXXFLAGS" ; CXXFLAGS="" ++old_CPPFLAGS="$CPPFLAGS" ; CPPFLAGS="" ++old_CFLAGS="$CFLAGS" ; CFLAGS="" ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++#include + int + main () + { +-if (sizeof (intmax_t)) +- return 0; ++int_least32_t v = 0; + ; + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ ac_cv_stdint_result="(assuming C99 compatible system)" ++ ac_cv_header_stdint_t="stdint.h"; ++else ++ ac_cv_header_stdint_t="" ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++if test "$GCC" = "yes" && test ".$ac_cv_header_stdint_t" = "."; then ++CFLAGS="-std=c99" ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +-#include <$ac_cv_header_stdint> +- ++#include + int + main () + { +-if (sizeof ((intmax_t))) +- return 0; ++int_least32_t v = 0; + ; + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- : +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_type_intmax_t=yes ++if ac_fn_c_try_compile "$LINENO"; then : ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: your GCC compiler has a defunct stdint.h for its default-mode" >&5 ++$as_echo "$as_me: WARNING: your GCC compiler has a defunct stdint.h for its default-mode" >&2;} + fi +- + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- + fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++CXXFLAGS="$old_CXXFLAGS" ++CPPFLAGS="$old_CPPFLAGS" ++CFLAGS="$old_CFLAGS" + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_intmax_t" >&5 +-$as_echo "$ac_cv_type_intmax_t" >&6; } + + +-fi # shortcircut to system "stdint.h" +-# ------------------ PREPARE VARIABLES ------------------------------ +-if test "$GCC" = "yes" ; then +-ac_cv_stdint_message="using gnu compiler "`$CC --version | head -1` ++v="... $ac_cv_header_stdint_h" ++if test "$ac_stdint_h" = "stdint.h" ; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: (are you sure you want them in ./stdint.h?)" >&5 ++$as_echo "(are you sure you want them in ./stdint.h?)" >&6; } ++elif test "$ac_stdint_h" = "inttypes.h" ; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: (are you sure you want them in ./inttypes.h?)" >&5 ++$as_echo "(are you sure you want them in ./inttypes.h?)" >&6; } ++elif test "_$ac_cv_header_stdint_t" = "_" ; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: (putting them into $ac_stdint_h)$v" >&5 ++$as_echo "(putting them into $ac_stdint_h)$v" >&6; } + else +-ac_cv_stdint_message="using $CC" ++ ac_cv_header_stdint="$ac_cv_header_stdint_t" ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdint (shortcircuit)" >&5 ++$as_echo "$ac_cv_header_stdint (shortcircuit)" >&6; } + fi + +-{ $as_echo "$as_me:$LINENO: result: make use of $ac_cv_header_stdint in $ac_stdint_h $ac_cv_stdint_result" >&5 +-$as_echo "make use of $ac_cv_header_stdint in $ac_stdint_h $ac_cv_stdint_result" >&6; } +- +-# ----------------- DONE inttypes.h checks START header ------------- +-ac_config_commands="$ac_config_commands $ac_stdint_h" +- ++if test "_$ac_cv_header_stdint_t" = "_" ; then # can not shortcircuit.. + + ++inttype_headers=`echo | sed -e 's/,/ /g'` + ++ac_cv_stdint_result="(no helpful system typedefs seen)" + +-for ac_header in stdlib.h unistd.h +-do +-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +-$as_echo_n "checking for $ac_header... " >&6; } +-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdint uintptr_t" >&5 ++$as_echo_n "checking for stdint uintptr_t... " >&6; } ++if test "${ac_cv_header_stdint_x+set}" = set; then : + $as_echo_n "(cached) " >&6 +-fi +-ac_res=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +-else +- # Is the header compilable? +-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 +-$as_echo_n "checking $ac_header usability... " >&6; } +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +-#include <$ac_header> +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- ac_header_compiler=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_header_compiler=no +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +-$as_echo "$ac_header_compiler" >&6; } + +-# Is the header present? +-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 +-$as_echo_n "checking $ac_header presence... " >&6; } +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include <$ac_header> +-_ACEOF +-if { (ac_try="$ac_cpp conftest.$ac_ext" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null && { +- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || +- test ! -s conftest.err +- }; then +- ac_header_preproc=yes ++ ac_cv_header_stdint_x="" # the 1997 typedefs (inttypes.h) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: (..)" >&5 ++$as_echo "(..)" >&6; } ++ for i in stdint.h inttypes.h sys/inttypes.h $inttype_headers ++ do ++ unset ac_cv_type_uintptr_t ++ unset ac_cv_type_uint64_t ++ ac_fn_c_check_type "$LINENO" "uintptr_t" "ac_cv_type_uintptr_t" "#include <$i> ++" ++if test "x$ac_cv_type_uintptr_t" = x""yes; then : ++ ac_cv_header_stdint_x=$i + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_header_preproc=no ++ continue + fi + +-rm -f conftest.err conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +-$as_echo "$ac_header_preproc" >&6; } +- +-# So? What about this header? +-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in +- yes:no: ) +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} +- ac_header_preproc=yes +- ;; +- no:yes:* ) +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +-$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +-$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} +- +- ;; +-esac +-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +-$as_echo_n "checking for $ac_header... " >&6; } +-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 ++ ac_fn_c_check_type "$LINENO" "uint64_t" "ac_cv_type_uint64_t" "#include<$i> ++" ++if test "x$ac_cv_type_uint64_t" = x""yes; then : ++ and64="/uint64_t" + else +- eval "$as_ac_Header=\$ac_header_preproc" ++ and64="" + fi +-ac_res=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } + +-fi +-as_val=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then +- cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +-_ACEOF ++ ac_cv_stdint_result="(seen uintptr_t$and64 in $i)" ++ break ++ done ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdint uintptr_t" >&5 ++$as_echo_n "checking for stdint uintptr_t... " >&6; } + + fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdint_x" >&5 ++$as_echo "$ac_cv_header_stdint_x" >&6; } + +-done + ++if test "_$ac_cv_header_stdint_x" = "_" ; then + +-for ac_func in getpagesize +-do +-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 +-$as_echo_n "checking for $ac_func... " >&6; } +-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdint uint32_t" >&5 ++$as_echo_n "checking for stdint uint32_t... " >&6; } ++if test "${ac_cv_header_stdint_o+set}" = set; then : + $as_echo_n "(cached) " >&6 + else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-/* Define $ac_func to an innocuous variant, in case declares $ac_func. +- For example, HP-UX 11i declares gettimeofday. */ +-#define $ac_func innocuous_$ac_func +- +-/* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char $ac_func (); below. +- Prefer to if __STDC__ is defined, since +- exists even on freestanding compilers. */ +- +-#ifdef __STDC__ +-# include +-#else +-# include +-#endif +- +-#undef $ac_func +- +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-char $ac_func (); +-/* The GNU C library defines this for functions which it implements +- to always fail with ENOSYS. Some functions are actually named +- something starting with __ and the normal name is an alias. */ +-#if defined __stub_$ac_func || defined __stub___$ac_func +-choke me +-#endif + +-int +-main () +-{ +-return $ac_func (); +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- eval "$as_ac_var=yes" ++ ac_cv_header_stdint_o="" # the 1995 typedefs (sys/inttypes.h) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: (..)" >&5 ++$as_echo "(..)" >&6; } ++ for i in inttypes.h sys/inttypes.h stdint.h $inttype_headers ++ do ++ unset ac_cv_type_uint32_t ++ unset ac_cv_type_uint64_t ++ ac_fn_c_check_type "$LINENO" "uint32_t" "ac_cv_type_uint32_t" "#include <$i> ++" ++if test "x$ac_cv_type_uint32_t" = x""yes; then : ++ ac_cv_header_stdint_o=$i + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 ++ continue ++fi + +- eval "$as_ac_var=no" ++ ac_fn_c_check_type "$LINENO" "uint64_t" "ac_cv_type_uint64_t" "#include<$i> ++" ++if test "x$ac_cv_type_uint64_t" = x""yes; then : ++ and64="/uint64_t" ++else ++ and64="" + fi + +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++ ac_cv_stdint_result="(seen uint32_t$and64 in $i)" ++ break ++ break; ++ done ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdint uint32_t" >&5 ++$as_echo_n "checking for stdint uint32_t... " >&6; } ++ + fi +-ac_res=`eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +-as_val=`eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then +- cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +-_ACEOF ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdint_o" >&5 ++$as_echo "$ac_cv_header_stdint_o" >&6; } + + fi +-done + +-{ $as_echo "$as_me:$LINENO: checking for working mmap" >&5 +-$as_echo_n "checking for working mmap... " >&6; } +-if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then ++if test "_$ac_cv_header_stdint_x" = "_" ; then ++if test "_$ac_cv_header_stdint_o" = "_" ; then ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdint u_int32_t" >&5 ++$as_echo_n "checking for stdint u_int32_t... " >&6; } ++if test "${ac_cv_header_stdint_u+set}" = set; then : + $as_echo_n "(cached) " >&6 + else +- if test "$cross_compiling" = yes; then +- ac_cv_func_mmap_fixed_mapped=no +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +-/* malloc might have been renamed as rpl_malloc. */ +-#undef malloc +- +-/* Thanks to Mike Haertel and Jim Avera for this test. +- Here is a matrix of mmap possibilities: +- mmap private not fixed +- mmap private fixed at somewhere currently unmapped +- mmap private fixed at somewhere already mapped +- mmap shared not fixed +- mmap shared fixed at somewhere currently unmapped +- mmap shared fixed at somewhere already mapped +- For private mappings, we should verify that changes cannot be read() +- back from the file, nor mmap's back from the file at a different +- address. (There have been systems where private was not correctly +- implemented like the infamous i386 svr4.0, and systems where the +- VM page cache was not coherent with the file system buffer cache +- like early versions of FreeBSD and possibly contemporary NetBSD.) +- For shared mappings, we should conversely verify that changes get +- propagated back to all the places they're supposed to be. +- +- Grep wants private fixed already mapped. +- The main things grep needs to know about mmap are: +- * does it exist and is it safe to write into the mmap'd area +- * how to use it (BSD variants) */ +- +-#include +-#include + +-#if !defined STDC_HEADERS && !defined HAVE_STDLIB_H +-char *malloc (); +-#endif ++ ac_cv_header_stdint_u="" # the BSD typedefs (sys/types.h) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: (..)" >&5 ++$as_echo "(..)" >&6; } ++ for i in sys/types.h inttypes.h sys/inttypes.h $inttype_headers ; do ++ unset ac_cv_type_u_int32_t ++ unset ac_cv_type_u_int64_t ++ ac_fn_c_check_type "$LINENO" "u_int32_t" "ac_cv_type_u_int32_t" "#include <$i> ++" ++if test "x$ac_cv_type_u_int32_t" = x""yes; then : ++ ac_cv_header_stdint_u=$i ++else ++ continue ++fi + +-/* This mess was copied from the GNU getpagesize.h. */ +-#ifndef HAVE_GETPAGESIZE +-/* Assume that all systems that can run configure have sys/param.h. */ +-# ifndef HAVE_SYS_PARAM_H +-# define HAVE_SYS_PARAM_H 1 +-# endif ++ ac_fn_c_check_type "$LINENO" "u_int64_t" "ac_cv_type_u_int64_t" "#include<$i> ++" ++if test "x$ac_cv_type_u_int64_t" = x""yes; then : ++ and64="/u_int64_t" ++else ++ and64="" ++fi + +-# ifdef _SC_PAGESIZE +-# define getpagesize() sysconf(_SC_PAGESIZE) +-# else /* no _SC_PAGESIZE */ +-# ifdef HAVE_SYS_PARAM_H +-# include +-# ifdef EXEC_PAGESIZE +-# define getpagesize() EXEC_PAGESIZE +-# else /* no EXEC_PAGESIZE */ +-# ifdef NBPG +-# define getpagesize() NBPG * CLSIZE +-# ifndef CLSIZE +-# define CLSIZE 1 +-# endif /* no CLSIZE */ +-# else /* no NBPG */ +-# ifdef NBPC +-# define getpagesize() NBPC +-# else /* no NBPC */ +-# ifdef PAGESIZE +-# define getpagesize() PAGESIZE +-# endif /* PAGESIZE */ +-# endif /* no NBPC */ +-# endif /* no NBPG */ +-# endif /* no EXEC_PAGESIZE */ +-# else /* no HAVE_SYS_PARAM_H */ +-# define getpagesize() 8192 /* punt totally */ +-# endif /* no HAVE_SYS_PARAM_H */ +-# endif /* no _SC_PAGESIZE */ ++ ac_cv_stdint_result="(seen u_int32_t$and64 in $i)" ++ break ++ break; ++ done ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdint u_int32_t" >&5 ++$as_echo_n "checking for stdint u_int32_t... " >&6; } + +-#endif /* no HAVE_GETPAGESIZE */ ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdint_u" >&5 ++$as_echo "$ac_cv_header_stdint_u" >&6; } + +-int +-main () +-{ +- char *data, *data2, *data3; +- int i, pagesize; +- int fd; ++fi fi + +- pagesize = getpagesize (); ++if test "_$ac_cv_header_stdint_x" = "_" ; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdint datatype model" >&5 ++$as_echo_n "checking for stdint datatype model... " >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: (..)" >&5 ++$as_echo "(..)" >&6; } + +- /* First, make a file with some known garbage in it. */ +- data = (char *) malloc (pagesize); +- if (!data) +- return 1; +- for (i = 0; i < pagesize; ++i) +- *(data + i) = rand (); +- umask (0); +- fd = creat ("conftest.mmap", 0600); +- if (fd < 0) +- return 1; +- if (write (fd, data, pagesize) != pagesize) +- return 1; +- close (fd); ++ # The cast to long int works around a bug in the HP C Compiler ++# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects ++# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. ++# This bug is HP SR number 8606223364. ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of char" >&5 ++$as_echo_n "checking size of char... " >&6; } ++if test "${ac_cv_sizeof_char+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (char))" "ac_cv_sizeof_char" "$ac_includes_default"; then : + +- /* Next, try to mmap the file at a fixed address which already has +- something else allocated at it. If we can, also make sure that +- we see the same garbage. */ +- fd = open ("conftest.mmap", O_RDWR); +- if (fd < 0) +- return 1; +- data2 = (char *) malloc (2 * pagesize); +- if (!data2) +- return 1; +- data2 += (pagesize - ((long int) data2 & (pagesize - 1))) & (pagesize - 1); +- if (data2 != mmap (data2, pagesize, PROT_READ | PROT_WRITE, +- MAP_PRIVATE | MAP_FIXED, fd, 0L)) +- return 1; +- for (i = 0; i < pagesize; ++i) +- if (*(data + i) != *(data2 + i)) +- return 1; ++else ++ if test "$ac_cv_type_char" = yes; then ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++{ as_fn_set_status 77 ++as_fn_error "cannot compute sizeof (char) ++See \`config.log' for more details." "$LINENO" 5; }; } ++ else ++ ac_cv_sizeof_char=0 ++ fi ++fi + +- /* Finally, make sure that changes to the mapped area do not +- percolate back to the file as seen by read(). (This is a bug on +- some variants of i386 svr4.0.) */ +- for (i = 0; i < pagesize; ++i) +- *(data2 + i) = *(data2 + i) + 1; +- data3 = (char *) malloc (pagesize); +- if (!data3) +- return 1; +- if (read (fd, data3, pagesize) != pagesize) +- return 1; +- for (i = 0; i < pagesize; ++i) +- if (*(data + i) != *(data3 + i)) +- return 1; +- close (fd); +- return 0; +-} ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_char" >&5 ++$as_echo "$ac_cv_sizeof_char" >&6; } ++ ++ ++ ++cat >>confdefs.h <<_ACEOF ++#define SIZEOF_CHAR $ac_cv_sizeof_char + _ACEOF +-rm -f conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>&5 +- ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_cv_func_mmap_fixed_mapped=yes ++ ++ ++ # The cast to long int works around a bug in the HP C Compiler ++# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects ++# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. ++# This bug is HP SR number 8606223364. ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of short" >&5 ++$as_echo_n "checking size of short... " >&6; } ++if test "${ac_cv_sizeof_short+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else +- $as_echo "$as_me: program exited with status $ac_status" >&5 +-$as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 ++ if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (short))" "ac_cv_sizeof_short" "$ac_includes_default"; then : + +-( exit $ac_status ) +-ac_cv_func_mmap_fixed_mapped=no ++else ++ if test "$ac_cv_type_short" = yes; then ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++{ as_fn_set_status 77 ++as_fn_error "cannot compute sizeof (short) ++See \`config.log' for more details." "$LINENO" 5; }; } ++ else ++ ac_cv_sizeof_short=0 ++ fi + fi +-rm -rf conftest.dSYM +-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext ++ + fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_short" >&5 ++$as_echo "$ac_cv_sizeof_short" >&6; } + + +-fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_mmap_fixed_mapped" >&5 +-$as_echo "$ac_cv_func_mmap_fixed_mapped" >&6; } +-if test $ac_cv_func_mmap_fixed_mapped = yes; then + +-cat >>confdefs.h <<\_ACEOF +-#define HAVE_MMAP 1 ++cat >>confdefs.h <<_ACEOF ++#define SIZEOF_SHORT $ac_cv_sizeof_short + _ACEOF + ++ ++ # The cast to long int works around a bug in the HP C Compiler ++# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects ++# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. ++# This bug is HP SR number 8606223364. ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int" >&5 ++$as_echo_n "checking size of int... " >&6; } ++if test "${ac_cv_sizeof_int+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int))" "ac_cv_sizeof_int" "$ac_includes_default"; then : ++ ++else ++ if test "$ac_cv_type_int" = yes; then ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++{ as_fn_set_status 77 ++as_fn_error "cannot compute sizeof (int) ++See \`config.log' for more details." "$LINENO" 5; }; } ++ else ++ ac_cv_sizeof_int=0 ++ fi ++fi ++ + fi +-rm -f conftest.mmap ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_int" >&5 ++$as_echo "$ac_cv_sizeof_int" >&6; } + + + +-for ac_header in inttypes.h +-do +-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +-$as_echo_n "checking for $ac_header... " >&6; } +-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then ++cat >>confdefs.h <<_ACEOF ++#define SIZEOF_INT $ac_cv_sizeof_int ++_ACEOF ++ ++ ++ # The cast to long int works around a bug in the HP C Compiler ++# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects ++# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. ++# This bug is HP SR number 8606223364. ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long" >&5 ++$as_echo_n "checking size of long... " >&6; } ++if test "${ac_cv_sizeof_long+set}" = set; then : + $as_echo_n "(cached) " >&6 +-fi +-ac_res=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } + else +- # Is the header compilable? +-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 +-$as_echo_n "checking $ac_header usability... " >&6; } +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +-#include <$ac_header> +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- ac_header_compiler=yes ++ if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long" "$ac_includes_default"; then : ++ + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 ++ if test "$ac_cv_type_long" = yes; then ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++{ as_fn_set_status 77 ++as_fn_error "cannot compute sizeof (long) ++See \`config.log' for more details." "$LINENO" 5; }; } ++ else ++ ac_cv_sizeof_long=0 ++ fi ++fi + +- ac_header_compiler=no + fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5 ++$as_echo "$ac_cv_sizeof_long" >&6; } + +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +-$as_echo "$ac_header_compiler" >&6; } + +-# Is the header present? +-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 +-$as_echo_n "checking $ac_header presence... " >&6; } +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include <$ac_header> ++ ++cat >>confdefs.h <<_ACEOF ++#define SIZEOF_LONG $ac_cv_sizeof_long + _ACEOF +-if { (ac_try="$ac_cpp conftest.$ac_ext" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null && { +- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || +- test ! -s conftest.err +- }; then +- ac_header_preproc=yes ++ ++ ++ # The cast to long int works around a bug in the HP C Compiler ++# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects ++# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. ++# This bug is HP SR number 8606223364. ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of void*" >&5 ++$as_echo_n "checking size of void*... " >&6; } ++if test "${ac_cv_sizeof_voidp+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 ++ if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (void*))" "ac_cv_sizeof_voidp" "$ac_includes_default"; then : + +- ac_header_preproc=no ++else ++ if test "$ac_cv_type_voidp" = yes; then ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++{ as_fn_set_status 77 ++as_fn_error "cannot compute sizeof (void*) ++See \`config.log' for more details." "$LINENO" 5; }; } ++ else ++ ac_cv_sizeof_voidp=0 ++ fi + fi + +-rm -f conftest.err conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +-$as_echo "$ac_header_preproc" >&6; } ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_voidp" >&5 ++$as_echo "$ac_cv_sizeof_voidp" >&6; } + +-# So? What about this header? +-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in +- yes:no: ) +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} +- ac_header_preproc=yes +- ;; +- no:yes:* ) +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +-$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +-$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} + +- ;; +-esac +-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +-$as_echo_n "checking for $ac_header... " >&6; } +-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 ++ ++cat >>confdefs.h <<_ACEOF ++#define SIZEOF_VOIDP $ac_cv_sizeof_voidp ++_ACEOF ++ ++ ++ ac_cv_char_data_model="" ++ ac_cv_char_data_model="$ac_cv_char_data_model$ac_cv_sizeof_char" ++ ac_cv_char_data_model="$ac_cv_char_data_model$ac_cv_sizeof_short" ++ ac_cv_char_data_model="$ac_cv_char_data_model$ac_cv_sizeof_int" ++ ac_cv_long_data_model="" ++ ac_cv_long_data_model="$ac_cv_long_data_model$ac_cv_sizeof_int" ++ ac_cv_long_data_model="$ac_cv_long_data_model$ac_cv_sizeof_long" ++ ac_cv_long_data_model="$ac_cv_long_data_model$ac_cv_sizeof_voidp" ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking data model" >&5 ++$as_echo_n "checking data model... " >&6; } ++ case "$ac_cv_char_data_model/$ac_cv_long_data_model" in ++ 122/242) ac_cv_data_model="IP16" ; n="standard 16bit machine" ;; ++ 122/244) ac_cv_data_model="LP32" ; n="standard 32bit machine" ;; ++ 122/*) ac_cv_data_model="i16" ; n="unusual int16 model" ;; ++ 124/444) ac_cv_data_model="ILP32" ; n="standard 32bit unixish" ;; ++ 124/488) ac_cv_data_model="LP64" ; n="standard 64bit unixish" ;; ++ 124/448) ac_cv_data_model="LLP64" ; n="unusual 64bit unixish" ;; ++ 124/*) ac_cv_data_model="i32" ; n="unusual int32 model" ;; ++ 128/888) ac_cv_data_model="ILP64" ; n="unusual 64bit numeric" ;; ++ 128/*) ac_cv_data_model="i64" ; n="unusual int64 model" ;; ++ 222/*2) ac_cv_data_model="DSP16" ; n="strict 16bit dsptype" ;; ++ 333/*3) ac_cv_data_model="DSP24" ; n="strict 24bit dsptype" ;; ++ 444/*4) ac_cv_data_model="DSP32" ; n="strict 32bit dsptype" ;; ++ 666/*6) ac_cv_data_model="DSP48" ; n="strict 48bit dsptype" ;; ++ 888/*8) ac_cv_data_model="DSP64" ; n="strict 64bit dsptype" ;; ++ 222/*|333/*|444/*|666/*|888/*) : ++ ac_cv_data_model="iDSP" ; n="unusual dsptype" ;; ++ *) ac_cv_data_model="none" ; n="very unusual model" ;; ++ esac ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_data_model ($ac_cv_long_data_model, $n)" >&5 ++$as_echo "$ac_cv_data_model ($ac_cv_long_data_model, $n)" >&6; } ++ ++fi ++ ++if test "_$ac_cv_header_stdint_x" != "_" ; then ++ ac_cv_header_stdint="$ac_cv_header_stdint_x" ++elif test "_$ac_cv_header_stdint_o" != "_" ; then ++ ac_cv_header_stdint="$ac_cv_header_stdint_o" ++elif test "_$ac_cv_header_stdint_u" != "_" ; then ++ ac_cv_header_stdint="$ac_cv_header_stdint_u" + else +- eval "$as_ac_Header=\$ac_header_preproc" ++ ac_cv_header_stdint="stddef.h" + fi +-ac_res=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for extra inttypes in chosen header" >&5 ++$as_echo_n "checking for extra inttypes in chosen header... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ($ac_cv_header_stdint)" >&5 ++$as_echo "($ac_cv_header_stdint)" >&6; } ++unset ac_cv_type_int_least32_t ++unset ac_cv_type_int_fast32_t ++ac_fn_c_check_type "$LINENO" "int_least32_t" "ac_cv_type_int_least32_t" "#include <$ac_cv_header_stdint> ++" ++if test "x$ac_cv_type_int_least32_t" = x""yes; then : + + fi +-as_val=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then +- cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +-_ACEOF + +-fi ++ac_fn_c_check_type "$LINENO" "int_fast32_t" "ac_cv_type_int_fast32_t" "#include<$ac_cv_header_stdint> ++" ++if test "x$ac_cv_type_int_fast32_t" = x""yes; then : + +-done ++fi + ++ac_fn_c_check_type "$LINENO" "intmax_t" "ac_cv_type_intmax_t" "#include <$ac_cv_header_stdint> ++" ++if test "x$ac_cv_type_intmax_t" = x""yes; then : + +-for ac_header in sys/time.h +-do +-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +-$as_echo_n "checking for $ac_header... " >&6; } +-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 + fi +-ac_res=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +-else +- # Is the header compilable? +-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 +-$as_echo_n "checking $ac_header usability... " >&6; } +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +-#include <$ac_header> +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- ac_header_compiler=yes +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 + +- ac_header_compiler=no ++ ++fi # shortcircut to system "stdint.h" ++# ------------------ PREPARE VARIABLES ------------------------------ ++if test "$GCC" = "yes" ; then ++ac_cv_stdint_message="using gnu compiler "`$CC --version | head -1` ++else ++ac_cv_stdint_message="using $CC" + fi + +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +-$as_echo "$ac_header_compiler" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: make use of $ac_cv_header_stdint in $ac_stdint_h $ac_cv_stdint_result" >&5 ++$as_echo "make use of $ac_cv_header_stdint in $ac_stdint_h $ac_cv_stdint_result" >&6; } + +-# Is the header present? +-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 +-$as_echo_n "checking $ac_header presence... " >&6; } +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include <$ac_header> +-_ACEOF +-if { (ac_try="$ac_cpp conftest.$ac_ext" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null && { +- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || +- test ! -s conftest.err +- }; then +- ac_header_preproc=yes +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 ++# ----------------- DONE inttypes.h checks START header ------------- ++ac_config_commands="$ac_config_commands $ac_stdint_h" + +- ac_header_preproc=no +-fi + +-rm -f conftest.err conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +-$as_echo "$ac_header_preproc" >&6; } + +-# So? What about this header? +-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in +- yes:no: ) +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} +- ac_header_preproc=yes +- ;; +- no:yes:* ) +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +-$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +-$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} + +- ;; +-esac +-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +-$as_echo_n "checking for $ac_header... " >&6; } +-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 +-else +- eval "$as_ac_Header=\$ac_header_preproc" +-fi +-ac_res=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } + +-fi +-as_val=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then ++ ++ for ac_header in $ac_header_list ++do : ++ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ++ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default ++" ++eval as_val=\$$as_ac_Header ++ if test "x$as_val" = x""yes; then : + cat >>confdefs.h <<_ACEOF + #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 + _ACEOF +@@ -15977,450 +12212,255 @@ + done + + +-for ac_header in unistd.h +-do +-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +-$as_echo_n "checking for $ac_header... " >&6; } +-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 +-fi +-ac_res=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +-else +- # Is the header compilable? +-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 +-$as_echo_n "checking $ac_header usability... " >&6; } +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +-#include <$ac_header> +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- ac_header_compiler=yes +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_header_compiler=no +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +-$as_echo "$ac_header_compiler" >&6; } + +-# Is the header present? +-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 +-$as_echo_n "checking $ac_header presence... " >&6; } +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include <$ac_header> +-_ACEOF +-if { (ac_try="$ac_cpp conftest.$ac_ext" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null && { +- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || +- test ! -s conftest.err +- }; then +- ac_header_preproc=yes +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 + +- ac_header_preproc=no +-fi + +-rm -f conftest.err conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +-$as_echo "$ac_header_preproc" >&6; } + +-# So? What about this header? +-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in +- yes:no: ) +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} +- ac_header_preproc=yes +- ;; +- no:yes:* ) +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +-$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +-$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} + +- ;; +-esac +-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +-$as_echo_n "checking for $ac_header... " >&6; } +-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 +-else +- eval "$as_ac_Header=\$ac_header_preproc" +-fi +-ac_res=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } + +-fi +-as_val=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then ++for ac_func in getpagesize ++do : ++ ac_fn_c_check_func "$LINENO" "getpagesize" "ac_cv_func_getpagesize" ++if test "x$ac_cv_func_getpagesize" = x""yes; then : + cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++#define HAVE_GETPAGESIZE 1 + _ACEOF + + fi +- + done + +- +- +-for ac_func in gettimeofday +-do +-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 +-$as_echo_n "checking for $ac_func... " >&6; } +-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working mmap" >&5 ++$as_echo_n "checking for working mmap... " >&6; } ++if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then : + $as_echo_n "(cached) " >&6 + else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ if test "$cross_compiling" = yes; then : ++ ac_cv_func_mmap_fixed_mapped=no ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +-/* Define $ac_func to an innocuous variant, in case declares $ac_func. +- For example, HP-UX 11i declares gettimeofday. */ +-#define $ac_func innocuous_$ac_func ++$ac_includes_default ++/* malloc might have been renamed as rpl_malloc. */ ++#undef malloc + +-/* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char $ac_func (); below. +- Prefer to if __STDC__ is defined, since +- exists even on freestanding compilers. */ ++/* Thanks to Mike Haertel and Jim Avera for this test. ++ Here is a matrix of mmap possibilities: ++ mmap private not fixed ++ mmap private fixed at somewhere currently unmapped ++ mmap private fixed at somewhere already mapped ++ mmap shared not fixed ++ mmap shared fixed at somewhere currently unmapped ++ mmap shared fixed at somewhere already mapped ++ For private mappings, we should verify that changes cannot be read() ++ back from the file, nor mmap's back from the file at a different ++ address. (There have been systems where private was not correctly ++ implemented like the infamous i386 svr4.0, and systems where the ++ VM page cache was not coherent with the file system buffer cache ++ like early versions of FreeBSD and possibly contemporary NetBSD.) ++ For shared mappings, we should conversely verify that changes get ++ propagated back to all the places they're supposed to be. + +-#ifdef __STDC__ +-# include +-#else +-# include +-#endif ++ Grep wants private fixed already mapped. ++ The main things grep needs to know about mmap are: ++ * does it exist and is it safe to write into the mmap'd area ++ * how to use it (BSD variants) */ + +-#undef $ac_func ++#include ++#include + +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-char $ac_func (); +-/* The GNU C library defines this for functions which it implements +- to always fail with ENOSYS. Some functions are actually named +- something starting with __ and the normal name is an alias. */ +-#if defined __stub_$ac_func || defined __stub___$ac_func +-choke me ++#if !defined STDC_HEADERS && !defined HAVE_STDLIB_H ++char *malloc (); + #endif + ++/* This mess was copied from the GNU getpagesize.h. */ ++#ifndef HAVE_GETPAGESIZE ++# ifdef _SC_PAGESIZE ++# define getpagesize() sysconf(_SC_PAGESIZE) ++# else /* no _SC_PAGESIZE */ ++# ifdef HAVE_SYS_PARAM_H ++# include ++# ifdef EXEC_PAGESIZE ++# define getpagesize() EXEC_PAGESIZE ++# else /* no EXEC_PAGESIZE */ ++# ifdef NBPG ++# define getpagesize() NBPG * CLSIZE ++# ifndef CLSIZE ++# define CLSIZE 1 ++# endif /* no CLSIZE */ ++# else /* no NBPG */ ++# ifdef NBPC ++# define getpagesize() NBPC ++# else /* no NBPC */ ++# ifdef PAGESIZE ++# define getpagesize() PAGESIZE ++# endif /* PAGESIZE */ ++# endif /* no NBPC */ ++# endif /* no NBPG */ ++# endif /* no EXEC_PAGESIZE */ ++# else /* no HAVE_SYS_PARAM_H */ ++# define getpagesize() 8192 /* punt totally */ ++# endif /* no HAVE_SYS_PARAM_H */ ++# endif /* no _SC_PAGESIZE */ ++ ++#endif /* no HAVE_GETPAGESIZE */ ++ + int + main () + { +-return $ac_func (); +- ; ++ char *data, *data2, *data3; ++ const char *cdata2; ++ int i, pagesize; ++ int fd, fd2; ++ ++ pagesize = getpagesize (); ++ ++ /* First, make a file with some known garbage in it. */ ++ data = (char *) malloc (pagesize); ++ if (!data) ++ return 1; ++ for (i = 0; i < pagesize; ++i) ++ *(data + i) = rand (); ++ umask (0); ++ fd = creat ("conftest.mmap", 0600); ++ if (fd < 0) ++ return 2; ++ if (write (fd, data, pagesize) != pagesize) ++ return 3; ++ close (fd); ++ ++ /* Next, check that the tail of a page is zero-filled. File must have ++ non-zero length, otherwise we risk SIGBUS for entire page. */ ++ fd2 = open ("conftest.txt", O_RDWR | O_CREAT | O_TRUNC, 0600); ++ if (fd2 < 0) ++ return 4; ++ cdata2 = ""; ++ if (write (fd2, cdata2, 1) != 1) ++ return 5; ++ data2 = (char *) mmap (0, pagesize, PROT_READ | PROT_WRITE, MAP_SHARED, fd2, 0L); ++ if (data2 == MAP_FAILED) ++ return 6; ++ for (i = 0; i < pagesize; ++i) ++ if (*(data2 + i)) ++ return 7; ++ close (fd2); ++ if (munmap (data2, pagesize)) ++ return 8; ++ ++ /* Next, try to mmap the file at a fixed address which already has ++ something else allocated at it. If we can, also make sure that ++ we see the same garbage. */ ++ fd = open ("conftest.mmap", O_RDWR); ++ if (fd < 0) ++ return 9; ++ if (data2 != mmap (data2, pagesize, PROT_READ | PROT_WRITE, ++ MAP_PRIVATE | MAP_FIXED, fd, 0L)) ++ return 10; ++ for (i = 0; i < pagesize; ++i) ++ if (*(data + i) != *(data2 + i)) ++ return 11; ++ ++ /* Finally, make sure that changes to the mapped area do not ++ percolate back to the file as seen by read(). (This is a bug on ++ some variants of i386 svr4.0.) */ ++ for (i = 0; i < pagesize; ++i) ++ *(data2 + i) = *(data2 + i) + 1; ++ data3 = (char *) malloc (pagesize); ++ if (!data3) ++ return 12; ++ if (read (fd, data3, pagesize) != pagesize) ++ return 13; ++ for (i = 0; i < pagesize; ++i) ++ if (*(data + i) != *(data3 + i)) ++ return 14; ++ close (fd); + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- eval "$as_ac_var=yes" ++if ac_fn_c_try_run "$LINENO"; then : ++ ac_cv_func_mmap_fixed_mapped=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- eval "$as_ac_var=no" ++ ac_cv_func_mmap_fixed_mapped=no + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ ++ conftest.$ac_objext conftest.beam conftest.$ac_ext + fi +-ac_res=`eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +-as_val=`eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then +- cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +-_ACEOF + + fi +-done ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_mmap_fixed_mapped" >&5 ++$as_echo "$ac_cv_func_mmap_fixed_mapped" >&6; } ++if test $ac_cv_func_mmap_fixed_mapped = yes; then + ++$as_echo "#define HAVE_MMAP 1" >>confdefs.h + +-for ac_func in sigaction +-do +-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 +-$as_echo_n "checking for $ac_func... " >&6; } +-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-/* Define $ac_func to an innocuous variant, in case declares $ac_func. +- For example, HP-UX 11i declares gettimeofday. */ +-#define $ac_func innocuous_$ac_func ++fi ++rm -f conftest.mmap conftest.txt + +-/* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char $ac_func (); below. +- Prefer to if __STDC__ is defined, since +- exists even on freestanding compilers. */ + +-#ifdef __STDC__ +-# include +-#else +-# include +-#endif ++for ac_header in inttypes.h ++do : ++ ac_fn_c_check_header_mongrel "$LINENO" "inttypes.h" "ac_cv_header_inttypes_h" "$ac_includes_default" ++if test "x$ac_cv_header_inttypes_h" = x""yes; then : ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_INTTYPES_H 1 ++_ACEOF + +-#undef $ac_func ++fi + +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-char $ac_func (); +-/* The GNU C library defines this for functions which it implements +- to always fail with ENOSYS. Some functions are actually named +- something starting with __ and the normal name is an alias. */ +-#if defined __stub_$ac_func || defined __stub___$ac_func +-choke me +-#endif ++done + +-int +-main () +-{ +-return $ac_func (); +- ; +- return 0; +-} ++for ac_header in sys/time.h ++do : ++ ac_fn_c_check_header_mongrel "$LINENO" "sys/time.h" "ac_cv_header_sys_time_h" "$ac_includes_default" ++if test "x$ac_cv_header_sys_time_h" = x""yes; then : ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_SYS_TIME_H 1 + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- eval "$as_ac_var=yes" +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 + +- eval "$as_ac_var=no" + fi + +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext +-fi +-ac_res=`eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +-as_val=`eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then ++done ++ ++for ac_header in unistd.h ++do : ++ ac_fn_c_check_header_mongrel "$LINENO" "unistd.h" "ac_cv_header_unistd_h" "$ac_includes_default" ++if test "x$ac_cv_header_unistd_h" = x""yes; then : + cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 ++#define HAVE_UNISTD_H 1 + _ACEOF + + fi ++ + done + + +-for ac_func in sigsetjmp +-do +-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 +-$as_echo_n "checking for $ac_func... " >&6; } +-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ ++for ac_func in gettimeofday ++do : ++ ac_fn_c_check_func "$LINENO" "gettimeofday" "ac_cv_func_gettimeofday" ++if test "x$ac_cv_func_gettimeofday" = x""yes; then : ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_GETTIMEOFDAY 1 + _ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-/* Define $ac_func to an innocuous variant, in case declares $ac_func. +- For example, HP-UX 11i declares gettimeofday. */ +-#define $ac_func innocuous_$ac_func +- +-/* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char $ac_func (); below. +- Prefer to if __STDC__ is defined, since +- exists even on freestanding compilers. */ +- +-#ifdef __STDC__ +-# include +-#else +-# include +-#endif + +-#undef $ac_func +- +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-char $ac_func (); +-/* The GNU C library defines this for functions which it implements +- to always fail with ENOSYS. Some functions are actually named +- something starting with __ and the normal name is an alias. */ +-#if defined __stub_$ac_func || defined __stub___$ac_func +-choke me +-#endif ++fi ++done + +-int +-main () +-{ +-return $ac_func (); +- ; +- return 0; +-} ++for ac_func in sigaction ++do : ++ ac_fn_c_check_func "$LINENO" "sigaction" "ac_cv_func_sigaction" ++if test "x$ac_cv_func_sigaction" = x""yes; then : ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_SIGACTION 1 + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- eval "$as_ac_var=yes" +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 + +- eval "$as_ac_var=no" + fi ++done + +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext +-fi +-ac_res=`eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +-as_val=`eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then ++for ac_func in sigsetjmp ++do : ++ ac_fn_c_check_func "$LINENO" "sigsetjmp" "ac_cv_func_sigsetjmp" ++if test "x$ac_cv_func_sigsetjmp" = x""yes; then : + cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 ++#define HAVE_SIGSETJMP 1 + _ACEOF + + fi +@@ -16433,18 +12473,14 @@ + # These system don't have libm, or don't need it + ;; + *-ncr-sysv4.3*) +- { $as_echo "$as_me:$LINENO: checking for _mwvalidcheckl in -lmw" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _mwvalidcheckl in -lmw" >&5 + $as_echo_n "checking for _mwvalidcheckl in -lmw... " >&6; } +-if test "${ac_cv_lib_mw__mwvalidcheckl+set}" = set; then ++if test "${ac_cv_lib_mw__mwvalidcheckl+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lmw $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. +@@ -16462,58 +12498,29 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_mw__mwvalidcheckl=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_lib_mw__mwvalidcheckl=no ++ ac_cv_lib_mw__mwvalidcheckl=no + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_mw__mwvalidcheckl" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mw__mwvalidcheckl" >&5 + $as_echo "$ac_cv_lib_mw__mwvalidcheckl" >&6; } +-if test "x$ac_cv_lib_mw__mwvalidcheckl" = x""yes; then ++if test "x$ac_cv_lib_mw__mwvalidcheckl" = x""yes; then : + LIBM="-lmw" + fi + +- { $as_echo "$as_me:$LINENO: checking for cos in -lm" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cos in -lm" >&5 + $as_echo_n "checking for cos in -lm... " >&6; } +-if test "${ac_cv_lib_m_cos+set}" = set; then ++if test "${ac_cv_lib_m_cos+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lm $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. +@@ -16531,60 +12538,31 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_m_cos=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_lib_m_cos=no ++ ac_cv_lib_m_cos=no + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_m_cos" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_cos" >&5 + $as_echo "$ac_cv_lib_m_cos" >&6; } +-if test "x$ac_cv_lib_m_cos" = x""yes; then ++if test "x$ac_cv_lib_m_cos" = x""yes; then : + LIBM="$LIBM -lm" + fi + + ;; + *) +- { $as_echo "$as_me:$LINENO: checking for cos in -lm" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cos in -lm" >&5 + $as_echo_n "checking for cos in -lm... " >&6; } +-if test "${ac_cv_lib_m_cos+set}" = set; then ++if test "${ac_cv_lib_m_cos+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lm $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. +@@ -16602,43 +12580,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_m_cos=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_lib_m_cos=no ++ ac_cv_lib_m_cos=no + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_m_cos" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_cos" >&5 + $as_echo "$ac_cv_lib_m_cos" >&6; } +-if test "x$ac_cv_lib_m_cos" = x""yes; then ++if test "x$ac_cv_lib_m_cos" = x""yes; then : + LIBM="-lm" + fi + +@@ -16648,18 +12601,14 @@ + + + +-{ $as_echo "$as_me:$LINENO: checking for clock_gettime in -lrt" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for clock_gettime in -lrt" >&5 + $as_echo_n "checking for clock_gettime in -lrt... " >&6; } +-if test "${ac_cv_lib_rt_clock_gettime+set}" = set; then ++if test "${ac_cv_lib_rt_clock_gettime+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lrt $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. +@@ -16677,47 +12626,20 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_rt_clock_gettime=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_lib_rt_clock_gettime=no ++ ac_cv_lib_rt_clock_gettime=no + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_rt_clock_gettime" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_clock_gettime" >&5 + $as_echo "$ac_cv_lib_rt_clock_gettime" >&6; } +-if test "x$ac_cv_lib_rt_clock_gettime" = x""yes; then ++if test "x$ac_cv_lib_rt_clock_gettime" = x""yes; then : + +-cat >>confdefs.h <<\_ACEOF +-#define HAVE_CLOCK_GETTIME 1 +-_ACEOF ++$as_echo "#define HAVE_CLOCK_GETTIME 1" >>confdefs.h + + LIBRT=-lrt + +@@ -16725,16 +12647,12 @@ + + + +-{ $as_echo "$as_me:$LINENO: checking for monotonic clocks" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for monotonic clocks" >&5 + $as_echo_n "checking for monotonic clocks... " >&6; } +-if test "${orc_cv_monotonic_clock+set}" = set; then ++if test "${orc_cv_monotonic_clock+set}" = set; then : + $as_echo_n "(cached) " >&6 + else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -16747,56 +12665,29 @@ + } + + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then ++if ac_fn_c_try_compile "$LINENO"; then : + orc_cv_monotonic_clock=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- orc_cv_monotonic_clock=no ++ orc_cv_monotonic_clock=no + fi +- + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi +-{ $as_echo "$as_me:$LINENO: result: $orc_cv_monotonic_clock" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $orc_cv_monotonic_clock" >&5 + $as_echo "$orc_cv_monotonic_clock" >&6; } + if test "$orc_cv_monotonic_clock" = "yes"; then + +-cat >>confdefs.h <<\_ACEOF +-#define HAVE_MONOTONIC_CLOCK 1 +-_ACEOF ++$as_echo "#define HAVE_MONOTONIC_CLOCK 1" >>confdefs.h + + fi + + +- { $as_echo "$as_me:$LINENO: checking to see if compiler understands -Wall" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking to see if compiler understands -Wall" >&5 + $as_echo_n "checking to see if compiler understands -Wall... " >&6; } + + save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -Wall" + +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -16807,32 +12698,11 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then ++if ac_fn_c_try_compile "$LINENO"; then : + flag_ok=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- flag_ok=no ++ flag_ok=no + fi +- + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + CFLAGS="$save_CFLAGS" + +@@ -16843,23 +12713,19 @@ + + true + fi +- { $as_echo "$as_me:$LINENO: result: $flag_ok" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $flag_ok" >&5 + $as_echo "$flag_ok" >&6; } + + if test "x$ORC_CVS" = "xyes" + then + +- { $as_echo "$as_me:$LINENO: checking to see if compiler understands -Werror" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking to see if compiler understands -Werror" >&5 + $as_echo_n "checking to see if compiler understands -Werror... " >&6; } + + save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -Werror" + +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -16870,32 +12736,11 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then ++if ac_fn_c_try_compile "$LINENO"; then : + flag_ok=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- flag_ok=no ++ flag_ok=no + fi +- + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + CFLAGS="$save_CFLAGS" + +@@ -16906,7 +12751,7 @@ + + true + fi +- { $as_echo "$as_me:$LINENO: result: $flag_ok" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $flag_ok" >&5 + $as_echo "$flag_ok" >&6; } + + fi +@@ -16914,47 +12759,35 @@ + case "${host_os}" in + mingw*|pw32*|cygwin*) + +-cat >>confdefs.h <<\_ACEOF +-#define HAVE_CODEMEM_MALLOC 1 +-_ACEOF ++$as_echo "#define HAVE_CODEMEM_MALLOC 1" >>confdefs.h + + ;; +- linux*|darwin*|solaris*|netbsd*|freebsd*|openbsd*) ++ linux*|darwin*|solaris*|netbsd*|freebsd*|openbsd*|kfreebsd*|gnu*) + +-cat >>confdefs.h <<\_ACEOF +-#define HAVE_CODEMEM_MMAP 1 +-_ACEOF ++$as_echo "#define HAVE_CODEMEM_MMAP 1" >>confdefs.h + + ;; + *) +- { { $as_echo "$as_me:$LINENO: error: no code allocation backend" >&5 +-$as_echo "$as_me: error: no code allocation backend" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "no code allocation backend" "$LINENO" 5 + ;; + esac + + case "${host_os}" in + mingw*|pw32*|cygwin*) + +-cat >>confdefs.h <<\_ACEOF +-#define HAVE_THREAD_WIN32 1 +-_ACEOF ++$as_echo "#define HAVE_THREAD_WIN32 1" >>confdefs.h + + ;; + *) + +-cat >>confdefs.h <<\_ACEOF +-#define HAVE_THREAD_PTHREAD 1 +-_ACEOF ++$as_echo "#define HAVE_THREAD_PTHREAD 1" >>confdefs.h + + ;; + esac + + + +-cat >>confdefs.h <<\_ACEOF +-#define ORC_EXPORTS 1 +-_ACEOF ++$as_echo "#define ORC_EXPORTS 1" >>confdefs.h + + + ORC_CFLAGS="$ORC_CFLAGS -I\$(top_srcdir)" +@@ -17000,13 +12833,13 @@ + case $ac_val in #( + *${as_nl}*) + case $ac_var in #( +- *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5 ++ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 + $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; + esac + case $ac_var in #( + _ | IFS | as_nl) ;; #( + BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( +- *) $as_unset $ac_var ;; ++ *) { eval $ac_var=; unset $ac_var;} ;; + esac ;; + esac + done +@@ -17014,8 +12847,8 @@ + (set) 2>&1 | + case $as_nl`(ac_space=' '; set) 2>&1` in #( + *${as_nl}ac_space=\ *) +- # `set' does not quote correctly, so add quotes (double-quote +- # substitution turns \\\\ into \\, and sed turns \\ into \). ++ # `set' does not quote correctly, so add quotes: double-quote ++ # substitution turns \\\\ into \\, and sed turns \\ into \. + sed -n \ + "s/'/'\\\\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" +@@ -17038,11 +12871,11 @@ + if diff "$cache_file" confcache >/dev/null 2>&1; then :; else + if test -w "$cache_file"; then + test "x$cache_file" != "x/dev/null" && +- { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 + $as_echo "$as_me: updating cache $cache_file" >&6;} + cat confcache >$cache_file + else +- { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 + $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} + fi + fi +@@ -17062,97 +12895,69 @@ + ac_i=`$as_echo "$ac_i" | sed "$ac_script"` + # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR + # will be set to the directory where LIBOBJS objects are built. +- ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext" +- ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo' ++ as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext" ++ as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo' + done + LIBOBJS=$ac_libobjs + + LTLIBOBJS=$ac_ltlibobjs + + ++ if test -n "$EXEEXT"; then ++ am__EXEEXT_TRUE= ++ am__EXEEXT_FALSE='#' ++else ++ am__EXEEXT_TRUE='#' ++ am__EXEEXT_FALSE= ++fi ++ + if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "conditional \"MAINTAINER_MODE\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"AMDEP\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "conditional \"AMDEP\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "conditional \"am__fastdepCC\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${am__fastdepCCAS_TRUE}" && test -z "${am__fastdepCCAS_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCCAS\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"am__fastdepCCAS\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "conditional \"am__fastdepCCAS\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${ENABLE_GTK_DOC_TRUE}" && test -z "${ENABLE_GTK_DOC_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_GTK_DOC\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"ENABLE_GTK_DOC\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "conditional \"ENABLE_GTK_DOC\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${GTK_DOC_USE_LIBTOOL_TRUE}" && test -z "${GTK_DOC_USE_LIBTOOL_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"GTK_DOC_USE_LIBTOOL\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"GTK_DOC_USE_LIBTOOL\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "conditional \"GTK_DOC_USE_LIBTOOL\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${HAVE_I386_TRUE}" && test -z "${HAVE_I386_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_I386\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"HAVE_I386\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "conditional \"HAVE_I386\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${HAVE_AMD64_TRUE}" && test -z "${HAVE_AMD64_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_AMD64\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"HAVE_AMD64\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "conditional \"HAVE_AMD64\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${HAVE_POWERPC_TRUE}" && test -z "${HAVE_POWERPC_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_POWERPC\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"HAVE_POWERPC\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "conditional \"HAVE_POWERPC\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${HAVE_ARM_TRUE}" && test -z "${HAVE_ARM_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_ARM\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"HAVE_ARM\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "conditional \"HAVE_ARM\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${HAVE_OS_WIN32_TRUE}" && test -z "${HAVE_OS_WIN32_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_OS_WIN32\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"HAVE_OS_WIN32\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "conditional \"HAVE_OS_WIN32\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${HAVE_OS_LINUX_TRUE}" && test -z "${HAVE_OS_LINUX_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_OS_LINUX\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"HAVE_OS_LINUX\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "conditional \"HAVE_OS_LINUX\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + + +@@ -17160,9 +12965,10 @@ + ac_write_fail=0 + ac_clean_files_save=$ac_clean_files + ac_clean_files="$ac_clean_files $CONFIG_STATUS" +-{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 + $as_echo "$as_me: creating $CONFIG_STATUS" >&6;} +-cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ++as_write_fail=0 ++cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1 + #! $SHELL + # Generated by $as_me. + # Run this file to recreate the current configuration. +@@ -17172,17 +12978,18 @@ + debug=false + ac_cs_recheck=false + ac_cs_silent=false +-SHELL=\${CONFIG_SHELL-$SHELL} +-_ACEOF + +-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +-## --------------------- ## +-## M4sh Initialization. ## +-## --------------------- ## ++SHELL=\${CONFIG_SHELL-$SHELL} ++export SHELL ++_ASEOF ++cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1 ++## -------------------- ## ++## M4sh Initialization. ## ++## -------------------- ## + + # Be more Bourne compatible + DUALCASE=1; export DUALCASE # for MKS sh +-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then ++if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : + emulate sh + NULLCMD=: + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which +@@ -17190,23 +12997,15 @@ + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST + else +- case `(set -o) 2>/dev/null` in +- *posix*) set -o posix ;; ++ case `(set -o) 2>/dev/null` in #( ++ *posix*) : ++ set -o posix ;; #( ++ *) : ++ ;; + esac +- + fi + + +- +- +-# PATH needs CR +-# Avoid depending upon Character Ranges. +-as_cr_letters='abcdefghijklmnopqrstuvwxyz' +-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +-as_cr_Letters=$as_cr_letters$as_cr_LETTERS +-as_cr_digits='0123456789' +-as_cr_alnum=$as_cr_Letters$as_cr_digits +- + as_nl=' + ' + export as_nl +@@ -17214,7 +13013,13 @@ + as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' + as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo + as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo +-if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then ++# Prefer a ksh shell builtin over an external printf program on Solaris, ++# but without wasting forks for bash or zsh. ++if test -z "$BASH_VERSION$ZSH_VERSION" \ ++ && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then ++ as_echo='print -r --' ++ as_echo_n='print -rn --' ++elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='printf %s\n' + as_echo_n='printf %s' + else +@@ -17225,7 +13030,7 @@ + as_echo_body='eval expr "X$1" : "X\\(.*\\)"' + as_echo_n_body='eval + arg=$1; +- case $arg in ++ case $arg in #( + *"$as_nl"*) + expr "X$arg" : "X\\(.*\\)$as_nl"; + arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; +@@ -17248,13 +13053,6 @@ + } + fi + +-# Support unset when possible. +-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then +- as_unset=unset +-else +- as_unset=false +-fi +- + + # IFS + # We need space, tab and new line, in precisely that order. Quoting is +@@ -17264,15 +13062,15 @@ + IFS=" "" $as_nl" + + # Find who we are. Look in the path if we contain no directory separator. +-case $0 in ++case $0 in #(( + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break +-done ++ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break ++ done + IFS=$as_save_IFS + + ;; +@@ -17284,12 +13082,16 @@ + fi + if test ! -f "$as_myself"; then + $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 +- { (exit 1); exit 1; } ++ exit 1 + fi + +-# Work around bugs in pre-3.0 UWIN ksh. +-for as_var in ENV MAIL MAILPATH +-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var ++# Unset variables that we do not need and which cause bugs (e.g. in ++# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" ++# suppresses any "Segmentation fault" message there. '((' could ++# trigger a bug in pdksh 5.2.14. ++for as_var in BASH_ENV ENV MAIL MAILPATH ++do eval test x\${$as_var+set} = xset \ ++ && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : + done + PS1='$ ' + PS2='> ' +@@ -17301,7 +13103,89 @@ + LANGUAGE=C + export LANGUAGE + +-# Required to use basename. ++# CDPATH. ++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH ++ ++ ++# as_fn_error ERROR [LINENO LOG_FD] ++# --------------------------------- ++# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are ++# provided, also output the error to LOG_FD, referencing LINENO. Then exit the ++# script with status $?, using 1 if that was 0. ++as_fn_error () ++{ ++ as_status=$?; test $as_status -eq 0 && as_status=1 ++ if test "$3"; then ++ as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 ++ fi ++ $as_echo "$as_me: error: $1" >&2 ++ as_fn_exit $as_status ++} # as_fn_error ++ ++ ++# as_fn_set_status STATUS ++# ----------------------- ++# Set $? to STATUS, without forking. ++as_fn_set_status () ++{ ++ return $1 ++} # as_fn_set_status ++ ++# as_fn_exit STATUS ++# ----------------- ++# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. ++as_fn_exit () ++{ ++ set +e ++ as_fn_set_status $1 ++ exit $1 ++} # as_fn_exit ++ ++# as_fn_unset VAR ++# --------------- ++# Portably unset VAR. ++as_fn_unset () ++{ ++ { eval $1=; unset $1;} ++} ++as_unset=as_fn_unset ++# as_fn_append VAR VALUE ++# ---------------------- ++# Append the text in VALUE to the end of the definition contained in VAR. Take ++# advantage of any shell optimizations that allow amortized linear growth over ++# repeated appends, instead of the typical quadratic growth present in naive ++# implementations. ++if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : ++ eval 'as_fn_append () ++ { ++ eval $1+=\$2 ++ }' ++else ++ as_fn_append () ++ { ++ eval $1=\$$1\$2 ++ } ++fi # as_fn_append ++ ++# as_fn_arith ARG... ++# ------------------ ++# Perform arithmetic evaluation on the ARGs, and store the result in the ++# global $as_val. Take advantage of shells that can avoid forks. The arguments ++# must be portable across $(()) and expr. ++if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : ++ eval 'as_fn_arith () ++ { ++ as_val=$(( $* )) ++ }' ++else ++ as_fn_arith () ++ { ++ as_val=`expr "$@" || test $? -eq 1` ++ } ++fi # as_fn_arith ++ ++ + if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then + as_expr=expr +@@ -17315,8 +13199,12 @@ + as_basename=false + fi + ++if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then ++ as_dirname=dirname ++else ++ as_dirname=false ++fi + +-# Name of the executable. + as_me=`$as_basename -- "$0" || + $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ + X"$0" : 'X\(//\)$' \| \ +@@ -17336,76 +13224,25 @@ + } + s/.*/./; q'` + +-# CDPATH. +-$as_unset CDPATH +- +- +- +- as_lineno_1=$LINENO +- as_lineno_2=$LINENO +- test "x$as_lineno_1" != "x$as_lineno_2" && +- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { +- +- # Create $as_me.lineno as a copy of $as_myself, but with $LINENO +- # uniformly replaced by the line number. The first 'sed' inserts a +- # line-number line after each line using $LINENO; the second 'sed' +- # does the real work. The second script uses 'N' to pair each +- # line-number line with the line containing $LINENO, and appends +- # trailing '-' during substitution so that $LINENO is not a special +- # case at line end. +- # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the +- # scripts with optimization help from Paolo Bonzini. Blame Lee +- # E. McMahon (1931-1989) for sed's syntax. :-) +- sed -n ' +- p +- /[$]LINENO/= +- ' <$as_myself | +- sed ' +- s/[$]LINENO.*/&-/ +- t lineno +- b +- :lineno +- N +- :loop +- s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ +- t loop +- s/-\n.*// +- ' >$as_me.lineno && +- chmod +x "$as_me.lineno" || +- { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 +- { (exit 1); exit 1; }; } +- +- # Don't try to exec as it changes $[0], causing all sort of problems +- # (the dirname of $[0] is not the place where we might find the +- # original and so on. Autoconf is especially sensitive to this). +- . "./$as_me.lineno" +- # Exit status is that of the last command. +- exit +-} +- +- +-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then +- as_dirname=dirname +-else +- as_dirname=false +-fi ++# Avoid depending upon Character Ranges. ++as_cr_letters='abcdefghijklmnopqrstuvwxyz' ++as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' ++as_cr_Letters=$as_cr_letters$as_cr_LETTERS ++as_cr_digits='0123456789' ++as_cr_alnum=$as_cr_Letters$as_cr_digits + + ECHO_C= ECHO_N= ECHO_T= +-case `echo -n x` in ++case `echo -n x` in #((((( + -n*) +- case `echo 'x\c'` in ++ case `echo 'xy\c'` in + *c*) ECHO_T=' ';; # ECHO_T is single tab character. +- *) ECHO_C='\c';; ++ xy) ECHO_C='\c';; ++ *) echo `echo ksh88 bug on AIX 6.1` > /dev/null ++ ECHO_T=' ';; + esac;; + *) + ECHO_N='-n';; + esac +-if expr a : '\(a\)' >/dev/null 2>&1 && +- test "X`expr 00001 : '.*\(...\)'`" = X001; then +- as_expr=expr +-else +- as_expr=false +-fi + + rm -f conf$$ conf$$.exe conf$$.file + if test -d conf$$.dir; then +@@ -17434,8 +13271,56 @@ + rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file + rmdir conf$$.dir 2>/dev/null + ++ ++# as_fn_mkdir_p ++# ------------- ++# Create "$as_dir" as a directory, including parents if necessary. ++as_fn_mkdir_p () ++{ ++ ++ case $as_dir in #( ++ -*) as_dir=./$as_dir;; ++ esac ++ test -d "$as_dir" || eval $as_mkdir_p || { ++ as_dirs= ++ while :; do ++ case $as_dir in #( ++ *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( ++ *) as_qdir=$as_dir;; ++ esac ++ as_dirs="'$as_qdir' $as_dirs" ++ as_dir=`$as_dirname -- "$as_dir" || ++$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ ++ X"$as_dir" : 'X\(//\)[^/]' \| \ ++ X"$as_dir" : 'X\(//\)$' \| \ ++ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || ++$as_echo X"$as_dir" | ++ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)[^/].*/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\).*/{ ++ s//\1/ ++ q ++ } ++ s/.*/./; q'` ++ test -d "$as_dir" && break ++ done ++ test -z "$as_dirs" || eval "mkdir $as_dirs" ++ } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" ++ ++ ++} # as_fn_mkdir_p + if mkdir -p . 2>/dev/null; then +- as_mkdir_p=: ++ as_mkdir_p='mkdir -p "$as_dir"' + else + test -d ./-p && rmdir ./-p + as_mkdir_p=false +@@ -17454,10 +13339,10 @@ + if test -d "$1"; then + test -d "$1/."; + else +- case $1 in ++ case $1 in #( + -*)set "./$1";; + esac; +- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in ++ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( + ???[sx]*):;;*)false;;esac;fi + '\'' sh + ' +@@ -17472,13 +13357,19 @@ + + + exec 6>&1 ++## ----------------------------------- ## ++## Main body of $CONFIG_STATUS script. ## ++## ----------------------------------- ## ++_ASEOF ++test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1 + +-# Save the log message, to keep $[0] and so on meaningful, and to ++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ++# Save the log message, to keep $0 and so on meaningful, and to + # report actual input values of CONFIG_FILES etc. instead of their + # values after options handling. + ac_log=" + This file was extended by orc $as_me 0.4.3, which was +-generated by GNU Autoconf 2.63. Invocation command line was ++generated by GNU Autoconf 2.65. Invocation command line was + + CONFIG_FILES = $CONFIG_FILES + CONFIG_HEADERS = $CONFIG_HEADERS +@@ -17510,13 +13401,15 @@ + + cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 + ac_cs_usage="\ +-\`$as_me' instantiates files from templates according to the +-current configuration. ++\`$as_me' instantiates files and other configuration actions ++from templates according to the current configuration. Unless the files ++and actions are specified as TAGs, all are instantiated by default. + +-Usage: $0 [OPTION]... [FILE]... ++Usage: $0 [OPTION]... [TAG]... + + -h, --help print this help, then exit + -V, --version print version number and configuration settings, then exit ++ --config print configuration, then exit + -q, --quiet, --silent + do not print progress messages + -d, --debug don't remove temporary files +@@ -17535,16 +13428,17 @@ + Configuration commands: + $config_commands + +-Report bugs to ." ++Report bugs to the package provider." + + _ACEOF + cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ++ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" + ac_cs_version="\\ + orc config.status 0.4.3 +-configured by $0, generated by GNU Autoconf 2.63, +- with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" ++configured by $0, generated by GNU Autoconf 2.65, ++ with options \\"\$ac_cs_config\\" + +-Copyright (C) 2008 Free Software Foundation, Inc. ++Copyright (C) 2009 Free Software Foundation, Inc. + This config.status script is free software; the Free Software Foundation + gives unlimited permission to copy, distribute and modify it." + +@@ -17580,6 +13474,8 @@ + ac_cs_recheck=: ;; + --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) + $as_echo "$ac_cs_version"; exit ;; ++ --config | --confi | --conf | --con | --co | --c ) ++ $as_echo "$ac_cs_config"; exit ;; + --debug | --debu | --deb | --de | --d | -d ) + debug=: ;; + --file | --fil | --fi | --f ) +@@ -17587,20 +13483,19 @@ + case $ac_optarg in + *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac +- CONFIG_FILES="$CONFIG_FILES '$ac_optarg'" ++ as_fn_append CONFIG_FILES " '$ac_optarg'" + ac_need_defaults=false;; + --header | --heade | --head | --hea ) + $ac_shift + case $ac_optarg in + *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac +- CONFIG_HEADERS="$CONFIG_HEADERS '$ac_optarg'" ++ as_fn_append CONFIG_HEADERS " '$ac_optarg'" + ac_need_defaults=false;; + --he | --h) + # Conflict between --help and --header +- { $as_echo "$as_me: error: ambiguous option: $1 +-Try \`$0 --help' for more information." >&2 +- { (exit 1); exit 1; }; };; ++ as_fn_error "ambiguous option: \`$1' ++Try \`$0 --help' for more information.";; + --help | --hel | -h ) + $as_echo "$ac_cs_usage"; exit ;; + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ +@@ -17608,11 +13503,10 @@ + ac_cs_silent=: ;; + + # This is an error. +- -*) { $as_echo "$as_me: error: unrecognized option: $1 +-Try \`$0 --help' for more information." >&2 +- { (exit 1); exit 1; }; } ;; ++ -*) as_fn_error "unrecognized option: \`$1' ++Try \`$0 --help' for more information." ;; + +- *) ac_config_targets="$ac_config_targets $1" ++ *) as_fn_append ac_config_targets " $1" + ac_need_defaults=false ;; + + esac +@@ -17955,9 +13849,7 @@ + "orc-uninstalled.pc") CONFIG_FILES="$CONFIG_FILES orc-uninstalled.pc" ;; + "orc.pc") CONFIG_FILES="$CONFIG_FILES orc.pc" ;; + +- *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 +-$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;} +- { (exit 1); exit 1; }; };; ++ *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;; + esac + done + +@@ -17984,7 +13876,7 @@ + trap 'exit_status=$? + { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status + ' 0 +- trap '{ (exit 1); exit 1; }' 1 2 13 15 ++ trap 'as_fn_exit 1' 1 2 13 15 + } + # Create a (secure) tmp directory for tmp files. + +@@ -17995,11 +13887,7 @@ + { + tmp=./conf$$-$RANDOM + (umask 077 && mkdir "$tmp") +-} || +-{ +- $as_echo "$as_me: cannot create a temporary directory in ." >&2 +- { (exit 1); exit 1; } +-} ++} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5 + + # Set up the scripts for CONFIG_FILES section. + # No need to generate them if there are no CONFIG_FILES. +@@ -18007,10 +13895,16 @@ + if test -n "$CONFIG_FILES"; then + + +-ac_cr=' ' ++ac_cr=`echo X | tr X '\015'` ++# On cygwin, bash can eat \r inside `` if the user requested igncr. ++# But we know of no other shell where ac_cr would be empty at this ++# point, so we can use a bashism as a fallback. ++if test "x$ac_cr" = x; then ++ eval ac_cr=\$\'\\r\' ++fi + ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' /dev/null` + if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then +- ac_cs_awk_cr='\\r' ++ ac_cs_awk_cr='\r' + else + ac_cs_awk_cr=$ac_cr + fi +@@ -18024,24 +13918,18 @@ + echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && + echo "_ACEOF" + } >conf$$subs.sh || +- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 + ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'` + ac_delim='%!_!# ' + for ac_last_try in false false false false false :; do + . ./conf$$subs.sh || +- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 + + ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` + if test $ac_delim_n = $ac_delim_num; then + break + elif $ac_last_try; then +- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 + else + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " + fi +@@ -18063,7 +13951,7 @@ + t delim + :nl + h +-s/\(.\{148\}\).*/\1/ ++s/\(.\{148\}\)..*/\1/ + t more1 + s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/ + p +@@ -18077,7 +13965,7 @@ + t nl + :delim + h +-s/\(.\{148\}\).*/\1/ ++s/\(.\{148\}\)..*/\1/ + t more2 + s/["\\]/\\&/g; s/^/"/; s/$/"/ + p +@@ -18130,9 +14018,7 @@ + else + cat + fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ +- || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5 +-$as_echo "$as_me: error: could not setup config files machinery" >&2;} +- { (exit 1); exit 1; }; } ++ || as_fn_error "could not setup config files machinery" "$LINENO" 5 + _ACEOF + + # VPATH may cause trouble with some makes, so we remove $(srcdir), +@@ -18173,9 +14059,7 @@ + if test -z "$ac_t"; then + break + elif $ac_last_try; then +- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_HEADERS" >&5 +-$as_echo "$as_me: error: could not make $CONFIG_HEADERS" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5 + else + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " + fi +@@ -18260,9 +14144,7 @@ + _ACAWK + _ACEOF + cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +- { { $as_echo "$as_me:$LINENO: error: could not setup config headers machinery" >&5 +-$as_echo "$as_me: error: could not setup config headers machinery" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "could not setup config headers machinery" "$LINENO" 5 + fi # test -n "$CONFIG_HEADERS" + + +@@ -18275,9 +14157,7 @@ + esac + case $ac_mode$ac_tag in + :[FHL]*:*);; +- :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5 +-$as_echo "$as_me: error: invalid tag $ac_tag" >&2;} +- { (exit 1); exit 1; }; };; ++ :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;; + :[FH]-) ac_tag=-:-;; + :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; + esac +@@ -18305,12 +14185,10 @@ + [\\/$]*) false;; + *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; + esac || +- { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5 +-$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;} +- { (exit 1); exit 1; }; };; ++ as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;; + esac + case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac +- ac_file_inputs="$ac_file_inputs '$ac_f'" ++ as_fn_append ac_file_inputs " '$ac_f'" + done + + # Let's still pretend it is `configure' which instantiates (i.e., don't +@@ -18321,7 +14199,7 @@ + `' by configure.' + if test x"$ac_file" != x-; then + configure_input="$ac_file. $configure_input" +- { $as_echo "$as_me:$LINENO: creating $ac_file" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5 + $as_echo "$as_me: creating $ac_file" >&6;} + fi + # Neutralize special characters interpreted by sed in replacement strings. +@@ -18334,9 +14212,7 @@ + + case $ac_tag in + *:-:* | *:-) cat >"$tmp/stdin" \ +- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 +-$as_echo "$as_me: error: could not create $ac_file" >&2;} +- { (exit 1); exit 1; }; } ;; ++ || as_fn_error "could not create $ac_file" "$LINENO" 5 ;; + esac + ;; + esac +@@ -18364,47 +14240,7 @@ + q + } + s/.*/./; q'` +- { as_dir="$ac_dir" +- case $as_dir in #( +- -*) as_dir=./$as_dir;; +- esac +- test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { +- as_dirs= +- while :; do +- case $as_dir in #( +- *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( +- *) as_qdir=$as_dir;; +- esac +- as_dirs="'$as_qdir' $as_dirs" +- as_dir=`$as_dirname -- "$as_dir" || +-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ +- X"$as_dir" : 'X\(//\)[^/]' \| \ +- X"$as_dir" : 'X\(//\)$' \| \ +- X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || +-$as_echo X"$as_dir" | +- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ +- s//\1/ +- q +- } +- /^X\(\/\/\)[^/].*/{ +- s//\1/ +- q +- } +- /^X\(\/\/\)$/{ +- s//\1/ +- q +- } +- /^X\(\/\).*/{ +- s//\1/ +- q +- } +- s/.*/./; q'` +- test -d "$as_dir" && break +- done +- test -z "$as_dirs" || eval "mkdir $as_dirs" +- } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 +-$as_echo "$as_me: error: cannot create directory $as_dir" >&2;} +- { (exit 1); exit 1; }; }; } ++ as_dir="$ac_dir"; as_fn_mkdir_p + ac_builddir=. + + case "$ac_dir" in +@@ -18461,7 +14297,6 @@ + # If the template does not know about datarootdir, expand it. + # FIXME: This hack should be removed a few years after 2.60. + ac_datarootdir_hack=; ac_datarootdir_seen= +- + ac_sed_dataroot=' + /datarootdir/ { + p +@@ -18471,12 +14306,11 @@ + /@docdir@/p + /@infodir@/p + /@localedir@/p +-/@mandir@/p +-' ++/@mandir@/p' + case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in + *datarootdir*) ac_datarootdir_seen=yes;; + *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) +- { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 + $as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} + _ACEOF + cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +@@ -18486,7 +14320,7 @@ + s&@infodir@&$infodir&g + s&@localedir@&$localedir&g + s&@mandir@&$mandir&g +- s&\\\${datarootdir}&$datarootdir&g' ;; ++ s&\\\${datarootdir}&$datarootdir&g' ;; + esac + _ACEOF + +@@ -18515,14 +14349,12 @@ + $ac_datarootdir_hack + " + eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ +- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 +-$as_echo "$as_me: error: could not create $ac_file" >&2;} +- { (exit 1); exit 1; }; } ++ || as_fn_error "could not create $ac_file" "$LINENO" 5 + + test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && + { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && + { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && +- { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir' ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' + which seems to be undefined. Please make sure it is defined." >&5 + $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' + which seems to be undefined. Please make sure it is defined." >&2;} +@@ -18532,9 +14364,7 @@ + -) cat "$tmp/out" && rm -f "$tmp/out";; + *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; + esac \ +- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 +-$as_echo "$as_me: error: could not create $ac_file" >&2;} +- { (exit 1); exit 1; }; } ++ || as_fn_error "could not create $ac_file" "$LINENO" 5 + ;; + :H) + # +@@ -18545,25 +14375,19 @@ + $as_echo "/* $configure_input */" \ + && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" + } >"$tmp/config.h" \ +- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 +-$as_echo "$as_me: error: could not create $ac_file" >&2;} +- { (exit 1); exit 1; }; } ++ || as_fn_error "could not create $ac_file" "$LINENO" 5 + if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then +- { $as_echo "$as_me:$LINENO: $ac_file is unchanged" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 + $as_echo "$as_me: $ac_file is unchanged" >&6;} + else + rm -f "$ac_file" + mv "$tmp/config.h" "$ac_file" \ +- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 +-$as_echo "$as_me: error: could not create $ac_file" >&2;} +- { (exit 1); exit 1; }; } ++ || as_fn_error "could not create $ac_file" "$LINENO" 5 + fi + else + $as_echo "/* $configure_input */" \ + && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ +- || { { $as_echo "$as_me:$LINENO: error: could not create -" >&5 +-$as_echo "$as_me: error: could not create -" >&2;} +- { (exit 1); exit 1; }; } ++ || as_fn_error "could not create -" "$LINENO" 5 + fi + # Compute "$ac_file"'s index in $config_headers. + _am_arg="$ac_file" +@@ -18601,7 +14425,7 @@ + s/.*/./; q'`/stamp-h$_am_stamp_count + ;; + +- :C) { $as_echo "$as_me:$LINENO: executing $ac_file commands" >&5 ++ :C) { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5 + $as_echo "$as_me: executing $ac_file commands" >&6;} + ;; + esac +@@ -18696,47 +14520,7 @@ + q + } + s/.*/./; q'` +- { as_dir=$dirpart/$fdir +- case $as_dir in #( +- -*) as_dir=./$as_dir;; +- esac +- test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { +- as_dirs= +- while :; do +- case $as_dir in #( +- *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( +- *) as_qdir=$as_dir;; +- esac +- as_dirs="'$as_qdir' $as_dirs" +- as_dir=`$as_dirname -- "$as_dir" || +-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ +- X"$as_dir" : 'X\(//\)[^/]' \| \ +- X"$as_dir" : 'X\(//\)$' \| \ +- X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || +-$as_echo X"$as_dir" | +- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ +- s//\1/ +- q +- } +- /^X\(\/\/\)[^/].*/{ +- s//\1/ +- q +- } +- /^X\(\/\/\)$/{ +- s//\1/ +- q +- } +- /^X\(\/\).*/{ +- s//\1/ +- q +- } +- s/.*/./; q'` +- test -d "$as_dir" && break +- done +- test -z "$as_dirs" || eval "mkdir $as_dirs" +- } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 +-$as_echo "$as_me: error: cannot create directory $as_dir" >&2;} +- { (exit 1); exit 1; }; }; } ++ as_dir=$dirpart/$fdir; as_fn_mkdir_p + # echo "creating $dirpart/$file" + echo '# dummy' > "$dirpart/$file" + done +@@ -19385,7 +15169,7 @@ + + ;; + "$ac_stdint_h":C) +-{ $as_echo "$as_me:$LINENO: creating $ac_stdint_h : $_ac_stdint_h" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_stdint_h : $_ac_stdint_h" >&5 + $as_echo "$as_me: creating $ac_stdint_h : $_ac_stdint_h" >&6;} + ac_stdint=$tmp/_stdint.h + +@@ -19817,7 +15601,7 @@ + STDINT_EOF + fi + if cmp -s $ac_stdint_h $ac_stdint 2>/dev/null; then +- { $as_echo "$as_me:$LINENO: $ac_stdint_h is unchanged" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_stdint_h is unchanged" >&5 + $as_echo "$as_me: $ac_stdint_h is unchanged" >&6;} + else + ac_dir=`$as_dirname -- "$ac_stdint_h" || +@@ -19843,47 +15627,7 @@ + q + } + s/.*/./; q'` +- { as_dir="$ac_dir" +- case $as_dir in #( +- -*) as_dir=./$as_dir;; +- esac +- test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { +- as_dirs= +- while :; do +- case $as_dir in #( +- *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( +- *) as_qdir=$as_dir;; +- esac +- as_dirs="'$as_qdir' $as_dirs" +- as_dir=`$as_dirname -- "$as_dir" || +-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ +- X"$as_dir" : 'X\(//\)[^/]' \| \ +- X"$as_dir" : 'X\(//\)$' \| \ +- X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || +-$as_echo X"$as_dir" | +- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ +- s//\1/ +- q +- } +- /^X\(\/\/\)[^/].*/{ +- s//\1/ +- q +- } +- /^X\(\/\/\)$/{ +- s//\1/ +- q +- } +- /^X\(\/\).*/{ +- s//\1/ +- q +- } +- s/.*/./; q'` +- test -d "$as_dir" && break +- done +- test -z "$as_dirs" || eval "mkdir $as_dirs" +- } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 +-$as_echo "$as_me: error: cannot create directory $as_dir" >&2;} +- { (exit 1); exit 1; }; }; } ++ as_dir="$ac_dir"; as_fn_mkdir_p + rm -f $ac_stdint_h + mv $ac_stdint $ac_stdint_h + fi +@@ -19893,15 +15637,12 @@ + done # for ac_tag + + +-{ (exit 0); exit 0; } ++as_fn_exit 0 + _ACEOF +-chmod +x $CONFIG_STATUS + ac_clean_files=$ac_clean_files_save + + test $ac_write_fail = 0 || +- { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5 +-$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5 + + + # configure is writing to config.log, and then calls config.status. +@@ -19922,10 +15663,10 @@ + exec 5>>config.log + # Use ||, not &&, to avoid exiting from the if with $? = 1, which + # would make configure fail if this is the last instruction. +- $ac_cs_success || { (exit 1); exit 1; } ++ $ac_cs_success || as_fn_exit $? + fi + if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then +- { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 + $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} + fi + +diff -x'*config.sub' -x'*config.guess' -Naur orc-0.4.3.old/depcomp orc-0.4.3/depcomp +--- orc-0.4.3.old/depcomp 2009-12-14 02:20:11.000000000 +0100 ++++ orc-0.4.3/depcomp 2010-02-02 12:18:15.047398687 +0100 +@@ -1,10 +1,10 @@ + #! /bin/sh + # depcomp - compile a program generating dependencies as side-effects + +-scriptversion=2007-03-29.01 ++scriptversion=2009-04-28.21; # UTC + +-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007 Free Software +-# Foundation, Inc. ++# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free ++# Software Foundation, Inc. + + # 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 +@@ -17,9 +17,7 @@ + # 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. ++# along with this program. If not, see . + + # As a special exception to the GNU General Public License, if you + # distribute this file as part of a program that contains a +@@ -87,6 +85,15 @@ + depmode=dashmstdout + fi + ++cygpath_u="cygpath -u -f -" ++if test "$depmode" = msvcmsys; then ++ # This is just like msvisualcpp but w/o cygpath translation. ++ # Just convert the backslash-escaped backslashes to single forward ++ # slashes to satisfy depend.m4 ++ cygpath_u="sed s,\\\\\\\\,/,g" ++ depmode=msvisualcpp ++fi ++ + case "$depmode" in + gcc3) + ## gcc 3 implements dependency tracking that does exactly what +@@ -192,14 +199,14 @@ + ' < "$tmpdepfile" \ + | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \ + tr ' +-' ' ' >> $depfile +- echo >> $depfile ++' ' ' >> "$depfile" ++ echo >> "$depfile" + + # The second pass generates a dummy entry for each header file. + tr ' ' ' + ' < "$tmpdepfile" \ + | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ +- >> $depfile ++ >> "$depfile" + else + # The sourcefile does not contain any dependencies, so just + # store a dummy comment line, to avoid errors with the Makefile +@@ -328,7 +335,12 @@ + if test -f "$tmpdepfile"; then + sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile" + # Add `dependent.h:' lines. +- sed -ne '2,${; s/^ *//; s/ \\*$//; s/$/:/; p;}' "$tmpdepfile" >> "$depfile" ++ sed -ne '2,${ ++ s/^ *// ++ s/ \\*$// ++ s/$/:/ ++ p ++ }' "$tmpdepfile" >> "$depfile" + else + echo "#dummy" > "$depfile" + fi +@@ -404,7 +416,7 @@ + + # Remove the call to Libtool. + if test "$libtool" = yes; then +- while test $1 != '--mode=compile'; do ++ while test "X$1" != 'X--mode=compile'; do + shift + done + shift +@@ -455,32 +467,39 @@ + "$@" || exit $? + # Remove any Libtool call + if test "$libtool" = yes; then +- while test $1 != '--mode=compile'; do ++ while test "X$1" != 'X--mode=compile'; do + shift + done + shift + fi + # X makedepend + shift +- cleared=no +- for arg in "$@"; do ++ cleared=no eat=no ++ for arg ++ do + case $cleared in + no) + set ""; shift + cleared=yes ;; + esac ++ if test $eat = yes; then ++ eat=no ++ continue ++ fi + case "$arg" in + -D*|-I*) + set fnord "$@" "$arg"; shift ;; + # Strip any option that makedepend may not understand. Remove + # the object too, otherwise makedepend will parse it as a source file. ++ -arch) ++ eat=yes ;; + -*|$object) + ;; + *) + set fnord "$@" "$arg"; shift ;; + esac + done +- obj_suffix="`echo $object | sed 's/^.*\././'`" ++ obj_suffix=`echo "$object" | sed 's/^.*\././'` + touch "$tmpdepfile" + ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@" + rm -f "$depfile" +@@ -500,7 +519,7 @@ + + # Remove the call to Libtool. + if test "$libtool" = yes; then +- while test $1 != '--mode=compile'; do ++ while test "X$1" != 'X--mode=compile'; do + shift + done + shift +@@ -538,13 +557,27 @@ + + msvisualcpp) + # Important note: in order to support this mode, a compiler *must* +- # always write the preprocessed file to stdout, regardless of -o, +- # because we must use -o when running libtool. ++ # always write the preprocessed file to stdout. + "$@" || exit $? ++ ++ # Remove the call to Libtool. ++ if test "$libtool" = yes; then ++ while test "X$1" != 'X--mode=compile'; do ++ shift ++ done ++ shift ++ fi ++ + IFS=" " + for arg + do + case "$arg" in ++ -o) ++ shift ++ ;; ++ $object) ++ shift ++ ;; + "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI") + set fnord "$@" + shift +@@ -557,16 +590,23 @@ + ;; + esac + done +- "$@" -E | +- sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile" ++ "$@" -E 2>/dev/null | ++ sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile" + rm -f "$depfile" + echo "$object : \\" > "$depfile" +- . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile" ++ sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile" + echo " " >> "$depfile" +- . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile" ++ sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile" + rm -f "$tmpdepfile" + ;; + ++msvcmsys) ++ # This case exists only to let depend.m4 do its work. It works by ++ # looking at the text of this script. This case will never be run, ++ # since it is checked for above. ++ exit 1 ++ ;; ++ + none) + exec "$@" + ;; +@@ -585,5 +625,6 @@ + # eval: (add-hook 'write-file-hooks 'time-stamp) + # time-stamp-start: "scriptversion=" + # time-stamp-format: "%:y-%02m-%02d.%02H" +-# time-stamp-end: "$" ++# time-stamp-time-zone: "UTC" ++# time-stamp-end: "; # UTC" + # End: +diff -x'*config.sub' -x'*config.guess' -Naur orc-0.4.3.old/doc/Makefile.in orc-0.4.3/doc/Makefile.in +--- orc-0.4.3.old/doc/Makefile.in 2009-12-14 02:20:10.000000000 +0100 ++++ orc-0.4.3/doc/Makefile.in 2010-02-02 12:18:14.463377390 +0100 +@@ -1,8 +1,9 @@ +-# Makefile.in generated by automake 1.10.2 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, ++# Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -21,8 +22,9 @@ + #################################### + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ +-pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ ++pkglibdir = $(libdir)/@PACKAGE@ ++pkglibexecdir = $(libexecdir)/@PACKAGE@ + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c +@@ -55,6 +57,7 @@ + mkinstalldirs = $(install_sh) -d + CONFIG_HEADER = $(top_builddir)/config.h + CONFIG_CLEAN_FILES = version.entities ++CONFIG_CLEAN_VPATH_FILES = + SOURCES = + DIST_SOURCES = + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +@@ -124,6 +127,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ +@@ -295,9 +299,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile'; \ +- cd $(top_srcdir) && \ +- $(AUTOMAKE) --gnu doc/Makefile ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile'; \ ++ $(am__cd) $(top_srcdir) && \ ++ $(AUTOMAKE) --gnu doc/Makefile + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ +@@ -315,6 +319,7 @@ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(am__aclocal_m4_deps): + version.entities: $(top_builddir)/config.status $(srcdir)/version.entities.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ + +@@ -346,13 +351,17 @@ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ ++ if test -d "$(distdir)/$$file"; then \ ++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ ++ fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ ++ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ ++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ +- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ ++ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ +- test -f $(distdir)/$$file \ +- || cp -p $$d/$$file $(distdir)/$$file \ ++ test -f "$(distdir)/$$file" \ ++ || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +@@ -384,6 +393,7 @@ + + distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -402,6 +412,8 @@ + + html: html-am + ++html-am: ++ + info: info-am + + info-am: +@@ -410,18 +422,28 @@ + + install-dvi: install-dvi-am + ++install-dvi-am: ++ + install-exec-am: + + install-html: install-html-am + ++install-html-am: ++ + install-info: install-info-am + ++install-info-am: ++ + install-man: + + install-pdf: install-pdf-am + ++install-pdf-am: ++ + install-ps: install-ps-am + ++install-ps-am: ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -581,6 +603,7 @@ + + sync: + cd html && rsync -a . home.schleef.org:/srv/schleef.org/www/orc/documentation/ ++ + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: +diff -x'*config.sub' -x'*config.guess' -Naur orc-0.4.3.old/examples/Makefile.in orc-0.4.3/examples/Makefile.in +--- orc-0.4.3.old/examples/Makefile.in 2009-12-14 02:20:10.000000000 +0100 ++++ orc-0.4.3/examples/Makefile.in 2010-02-02 12:18:14.519377667 +0100 +@@ -1,8 +1,9 @@ +-# Makefile.in generated by automake 1.10.2 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, ++# Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -16,8 +17,9 @@ + + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ +-pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ ++pkglibdir = $(libdir)/@PACKAGE@ ++pkglibexecdir = $(libexecdir)/@PACKAGE@ + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c +@@ -51,8 +53,8 @@ + mkinstalldirs = $(install_sh) -d + CONFIG_HEADER = $(top_builddir)/config.h + CONFIG_CLEAN_FILES = ++CONFIG_CLEAN_VPATH_FILES = + am__installdirs = "$(DESTDIR)$(orcbindir)" +-orcbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM) + PROGRAMS = $(orcbin_PROGRAMS) + example1_SOURCES = example1.c + example1_OBJECTS = example1.$(OBJEXT) +@@ -66,6 +68,7 @@ + DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles ++am__mv = mv -f + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +@@ -146,6 +149,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ +@@ -224,9 +228,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu examples/Makefile'; \ +- cd $(top_srcdir) && \ +- $(AUTOMAKE) --gnu examples/Makefile ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu examples/Makefile'; \ ++ $(am__cd) $(top_srcdir) && \ ++ $(AUTOMAKE) --gnu examples/Makefile + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ +@@ -244,34 +248,50 @@ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(am__aclocal_m4_deps): + install-orcbinPROGRAMS: $(orcbin_PROGRAMS) + @$(NORMAL_INSTALL) + test -z "$(orcbindir)" || $(MKDIR_P) "$(DESTDIR)$(orcbindir)" +- @list='$(orcbin_PROGRAMS)'; for p in $$list; do \ +- p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ +- if test -f $$p \ +- || test -f $$p1 \ +- ; then \ +- f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ +- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(orcbinPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(orcbindir)/$$f'"; \ +- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(orcbinPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(orcbindir)/$$f" || exit 1; \ +- else :; fi; \ +- done ++ @list='$(orcbin_PROGRAMS)'; test -n "$(orcbindir)" || list=; \ ++ for p in $$list; do echo "$$p $$p"; done | \ ++ sed 's/$(EXEEXT)$$//' | \ ++ while read p p1; do if test -f $$p || test -f $$p1; \ ++ then echo "$$p"; echo "$$p"; else :; fi; \ ++ done | \ ++ sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ ++ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ ++ sed 'N;N;N;s,\n, ,g' | \ ++ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ ++ { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ ++ if ($$2 == $$4) files[d] = files[d] " " $$1; \ ++ else { print "f", $$3 "/" $$4, $$1; } } \ ++ END { for (d in files) print "f", d, files[d] }' | \ ++ while read type dir files; do \ ++ if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ ++ test -z "$$files" || { \ ++ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(orcbindir)$$dir'"; \ ++ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(orcbindir)$$dir" || exit $$?; \ ++ } \ ++ ; done + + uninstall-orcbinPROGRAMS: + @$(NORMAL_UNINSTALL) +- @list='$(orcbin_PROGRAMS)'; for p in $$list; do \ +- f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ +- echo " rm -f '$(DESTDIR)$(orcbindir)/$$f'"; \ +- rm -f "$(DESTDIR)$(orcbindir)/$$f"; \ +- done ++ @list='$(orcbin_PROGRAMS)'; test -n "$(orcbindir)" || list=; \ ++ files=`for p in $$list; do echo "$$p"; done | \ ++ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ ++ -e 's/$$/$(EXEEXT)/' `; \ ++ test -n "$$list" || exit 0; \ ++ echo " ( cd '$(DESTDIR)$(orcbindir)' && rm -f" $$files ")"; \ ++ cd "$(DESTDIR)$(orcbindir)" && rm -f $$files + + clean-orcbinPROGRAMS: +- @list='$(orcbin_PROGRAMS)'; for p in $$list; do \ +- f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ +- echo " rm -f $$p $$f"; \ +- rm -f $$p $$f ; \ +- done ++ @list='$(orcbin_PROGRAMS)'; test -n "$$list" || exit 0; \ ++ echo " rm -f" $$list; \ ++ rm -f $$list || exit $$?; \ ++ test -n "$(EXEEXT)" || exit 0; \ ++ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ ++ echo " rm -f" $$list; \ ++ rm -f $$list + example1$(EXEEXT): $(example1_OBJECTS) $(example1_DEPENDENCIES) + @rm -f example1$(EXEEXT) + $(LINK) $(example1_OBJECTS) $(example1_LDADD) $(LIBS) +@@ -294,21 +314,21 @@ + + .c.o: + @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c $< + + .c.obj: + @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + + .c.lo: + @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@@ -331,7 +351,7 @@ + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +- tags=; \ ++ set x; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ +@@ -339,29 +359,34 @@ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ +- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ ++ shift; \ ++ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique; \ ++ if test $$# -gt 0; then \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ "$$@" $$unique; \ ++ else \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$unique; \ ++ fi; \ + fi + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +- tags=; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ +- test -z "$(CTAGS_ARGS)$$tags$$unique" \ ++ test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ +- $$tags $$unique ++ $$unique + + GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ +- && cd $(top_srcdir) \ +- && gtags -i $(GTAGS_ARGS) $$here ++ && $(am__cd) $(top_srcdir) \ ++ && gtags -i $(GTAGS_ARGS) "$$here" + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +@@ -382,13 +407,17 @@ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ ++ if test -d "$(distdir)/$$file"; then \ ++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ ++ fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ ++ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ ++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ +- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ ++ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ +- test -f $(distdir)/$$file \ +- || cp -p $$d/$$file $(distdir)/$$file \ ++ test -f "$(distdir)/$$file" \ ++ || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +@@ -419,6 +448,7 @@ + + distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -440,6 +470,8 @@ + + html: html-am + ++html-am: ++ + info: info-am + + info-am: +@@ -448,18 +480,28 @@ + + install-dvi: install-dvi-am + ++install-dvi-am: ++ + install-exec-am: + + install-html: install-html-am + ++install-html-am: ++ + install-info: install-info-am + ++install-info-am: ++ + install-man: + + install-pdf: install-pdf-am + ++install-pdf-am: ++ + install-ps: install-ps-am + ++install-ps-am: ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -498,6 +540,7 @@ + mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ + uninstall-am uninstall-orcbinPROGRAMS + ++ + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: +diff -x'*config.sub' -x'*config.guess' -Naur orc-0.4.3.old/install-sh orc-0.4.3/install-sh +--- orc-0.4.3.old/install-sh 2009-12-14 02:20:10.000000000 +0100 ++++ orc-0.4.3/install-sh 2010-02-02 12:18:14.391412590 +0100 +@@ -1,7 +1,7 @@ + #!/bin/sh + # install - install a program, script, or datafile + +-scriptversion=2006-12-25.00 ++scriptversion=2009-04-28.21; # UTC + + # This originates from X11R5 (mit/util/scripts/install.sh), which was + # later released in X11R6 (xc/config/util/install.sh) with the +@@ -515,5 +515,6 @@ + # eval: (add-hook 'write-file-hooks 'time-stamp) + # time-stamp-start: "scriptversion=" + # time-stamp-format: "%:y-%02m-%02d.%02H" +-# time-stamp-end: "$" ++# time-stamp-time-zone: "UTC" ++# time-stamp-end: "; # UTC" + # End: +diff -x'*config.sub' -x'*config.guess' -Naur orc-0.4.3.old/ltmain.sh orc-0.4.3/ltmain.sh +--- orc-0.4.3.old/ltmain.sh 2009-12-14 02:20:03.000000000 +0100 ++++ orc-0.4.3/ltmain.sh 2010-02-02 12:18:08.828405777 +0100 +@@ -65,7 +65,7 @@ + # compiler: $LTCC + # compiler flags: $LTCFLAGS + # linker: $LD (gnu? $with_gnu_ld) +-# $progname: (GNU libtool) 2.2.6b ++# $progname: (GNU libtool) 2.2.6b Debian-2.2.6b-2 + # automake: $automake_version + # autoconf: $autoconf_version + # +@@ -73,7 +73,7 @@ + + PROGRAM=ltmain.sh + PACKAGE=libtool +-VERSION=2.2.6b ++VERSION="2.2.6b Debian-2.2.6b-2" + TIMESTAMP="" + package_revision=1.3017 + +@@ -5033,7 +5033,10 @@ + case $pass in + dlopen) libs="$dlfiles" ;; + dlpreopen) libs="$dlprefiles" ;; +- link) libs="$deplibs %DEPLIBS% $dependency_libs" ;; ++ link) ++ libs="$deplibs %DEPLIBS%" ++ test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs" ++ ;; + esac + fi + if test "$linkmode,$pass" = "lib,dlpreopen"; then +@@ -5344,19 +5347,19 @@ + # It is a libtool convenience library, so add in its objects. + convenience="$convenience $ladir/$objdir/$old_library" + old_convenience="$old_convenience $ladir/$objdir/$old_library" ++ tmp_libs= ++ for deplib in $dependency_libs; do ++ deplibs="$deplib $deplibs" ++ if $opt_duplicate_deps ; then ++ case "$tmp_libs " in ++ *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; ++ esac ++ fi ++ tmp_libs="$tmp_libs $deplib" ++ done + elif test "$linkmode" != prog && test "$linkmode" != lib; then + func_fatal_error "\`$lib' is not a convenience library" + fi +- tmp_libs= +- for deplib in $dependency_libs; do +- deplibs="$deplib $deplibs" +- if $opt_duplicate_deps ; then +- case "$tmp_libs " in +- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; +- esac +- fi +- tmp_libs="$tmp_libs $deplib" +- done + continue + fi # $pass = conv + +@@ -5893,6 +5896,7 @@ + if test "$link_all_deplibs" != no; then + # Add the search paths of all dependency libraries + for deplib in $dependency_libs; do ++ path= + case $deplib in + -L*) path="$deplib" ;; + *.la) +@@ -6206,6 +6210,9 @@ + revision="$number_minor" + lt_irix_increment=no + ;; ++ *) ++ func_fatal_configuration "$modename: unknown library version type \`$version_type'" ++ ;; + esac + ;; + no) +diff -x'*config.sub' -x'*config.guess' -Naur orc-0.4.3.old/m4/libtool.m4 orc-0.4.3/m4/libtool.m4 +--- orc-0.4.3.old/m4/libtool.m4 2009-12-14 02:20:03.000000000 +0100 ++++ orc-0.4.3/m4/libtool.m4 2010-02-02 12:18:08.928379157 +0100 +@@ -2254,7 +2254,7 @@ + ;; + + *) +- library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} ${libname}${versuffix}.lib' ++ library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib' + ;; + esac + dynamic_linker='Win32 ld.exe' +@@ -2445,7 +2445,7 @@ + ;; + + # This must be Linux ELF. +-linux* | k*bsd*-gnu) ++linux* | k*bsd*-gnu | kopensolaris*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no +@@ -2485,6 +2485,18 @@ + dynamic_linker='GNU/Linux ld.so' + ;; + ++netbsdelf*-gnu) ++ version_type=linux ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=no ++ hardcode_into_libs=yes ++ dynamic_linker='NetBSD ld.elf_so' ++ ;; ++ + netbsd*) + version_type=sunos + need_lib_prefix=no +@@ -3072,11 +3084,11 @@ + ;; + + # This must be Linux ELF. +-linux* | k*bsd*-gnu) ++linux* | k*bsd*-gnu | kopensolaris*-gnu) + lt_cv_deplibs_check_method=pass_all + ;; + +-netbsd*) ++netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then + lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' + else +@@ -3693,7 +3705,7 @@ + ;; + esac + ;; +- linux* | k*bsd*-gnu) ++ linux* | k*bsd*-gnu | kopensolaris*-gnu) + case $cc_basename in + KCC*) + # KAI C++ Compiler +@@ -3757,7 +3769,7 @@ + ;; + esac + ;; +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + ;; + *qnx* | *nto*) + # QNX uses GNU C++, but need to define -shared option too, otherwise +@@ -3977,7 +3989,7 @@ + _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + ;; + +- linux* | k*bsd*-gnu) ++ linux* | k*bsd*-gnu | kopensolaris*-gnu) + case $cc_basename in + # old Intel for x86_64 which still supported -KPIC. + ecc*) +@@ -4182,6 +4194,9 @@ + cygwin* | mingw* | cegcc*) + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' + ;; ++ linux* | k*bsd*-gnu) ++ _LT_TAGVAR(link_all_deplibs, $1)=no ++ ;; + *) + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + ;; +@@ -4246,6 +4261,9 @@ + openbsd*) + with_gnu_ld=no + ;; ++ linux* | k*bsd*-gnu) ++ _LT_TAGVAR(link_all_deplibs, $1)=no ++ ;; + esac + + _LT_TAGVAR(ld_shlibs, $1)=yes +@@ -4267,6 +4285,7 @@ + fi + supports_anon_versioning=no + case `$LD -v 2>&1` in ++ *GNU\ gold*) supports_anon_versioning=yes ;; + *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 + *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... + *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... +@@ -4358,7 +4377,7 @@ + _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + ;; + +- gnu* | linux* | tpf* | k*bsd*-gnu) ++ gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) + tmp_diet=no + if test "$host_os" = linux-dietlibc; then + case $cc_basename in +@@ -4428,7 +4447,7 @@ + fi + ;; + +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' + wlarc= +@@ -4603,6 +4622,7 @@ + if test "$aix_use_runtimelinking" = yes; then + shared_flag="$shared_flag "'${wl}-G' + fi ++ _LT_TAGVAR(link_all_deplibs, $1)=no + else + # not using gcc + if test "$host_cpu" = ia64; then +@@ -4689,7 +4709,8 @@ + # The linker will automatically build a .lib file if we build a DLL. + _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' + # FIXME: Should let the user specify the lib program. +- _LT_TAGVAR(fix_srcfile_path, $1)= ++ _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' ++ _LT_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`' + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + ;; + +@@ -4840,7 +4861,7 @@ + _LT_TAGVAR(link_all_deplibs, $1)=yes + ;; + +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out + else +@@ -5840,7 +5861,7 @@ + _LT_TAGVAR(inherit_rpath, $1)=yes + ;; + +- linux* | k*bsd*-gnu) ++ linux* | k*bsd*-gnu | kopensolaris*-gnu) + case $cc_basename in + KCC*) + # Kuck and Associates, Inc. (KAI) C++ Compiler +diff -x'*config.sub' -x'*config.guess' -Naur orc-0.4.3.old/Makefile.in orc-0.4.3/Makefile.in +--- orc-0.4.3.old/Makefile.in 2009-12-14 02:20:11.000000000 +0100 ++++ orc-0.4.3/Makefile.in 2010-02-02 12:18:15.131377659 +0100 +@@ -1,8 +1,9 @@ +-# Makefile.in generated by automake 1.10.2 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, ++# Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -16,8 +17,9 @@ + + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ +-pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ ++pkglibdir = $(libdir)/@PACKAGE@ ++pkglibexecdir = $(libexecdir)/@PACKAGE@ + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c +@@ -55,6 +57,7 @@ + mkinstalldirs = $(install_sh) -d + CONFIG_HEADER = config.h + CONFIG_CLEAN_FILES = orc-uninstalled.pc orc.pc ++CONFIG_CLEAN_VPATH_FILES = + SOURCES = + DIST_SOURCES = + RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ +@@ -69,12 +72,29 @@ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; ++am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; ++am__install_max = 40 ++am__nobase_strip_setup = \ ++ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` ++am__nobase_strip = \ ++ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" ++am__nobase_list = $(am__nobase_strip_setup); \ ++ for p in $$list; do echo "$$p $$p"; done | \ ++ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ ++ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ ++ if (++n[$$2] == $(am__install_max)) \ ++ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ ++ END { for (dir in files) print dir, files[dir] }' ++am__base_list = \ ++ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ ++ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' + am__installdirs = "$(DESTDIR)$(pkgconfigdir)" +-pkgconfigDATA_INSTALL = $(INSTALL_DATA) + DATA = $(pkgconfig_DATA) + RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive ++AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ ++ $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ ++ distdir dist dist-all distcheck + ETAGS = etags + CTAGS = ctags + DIST_SUBDIRS = $(SUBDIRS) +@@ -82,9 +102,34 @@ + distdir = $(PACKAGE)-$(VERSION) + top_distdir = $(distdir) + am__remove_distdir = \ +- { test ! -d $(distdir) \ +- || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ +- && rm -fr $(distdir); }; } ++ { test ! -d "$(distdir)" \ ++ || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ ++ && rm -fr "$(distdir)"; }; } ++am__relativize = \ ++ dir0=`pwd`; \ ++ sed_first='s,^\([^/]*\)/.*$$,\1,'; \ ++ sed_rest='s,^[^/]*/*,,'; \ ++ sed_last='s,^.*/\([^/]*\)$$,\1,'; \ ++ sed_butlast='s,/*[^/]*$$,,'; \ ++ while test -n "$$dir1"; do \ ++ first=`echo "$$dir1" | sed -e "$$sed_first"`; \ ++ if test "$$first" != "."; then \ ++ if test "$$first" = ".."; then \ ++ dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ ++ dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ ++ else \ ++ first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ ++ if test "$$first2" = "$$first"; then \ ++ dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ ++ else \ ++ dir2="../$$dir2"; \ ++ fi; \ ++ dir0="$$dir0"/"$$first"; \ ++ fi; \ ++ fi; \ ++ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ ++ done; \ ++ reldir="$$dir2" + DIST_ARCHIVES = $(distdir).tar.gz + GZIP_ENV = --best + distuninstallcheck_listfiles = find . -type f -print +@@ -155,6 +200,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ +@@ -236,15 +282,15 @@ + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \ +- cd $(srcdir) && $(AUTOMAKE) --foreign \ ++ echo ' cd $(srcdir) && $(AUTOMAKE) --foreign'; \ ++ $(am__cd) $(srcdir) && $(AUTOMAKE) --foreign \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \ +- cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign Makefile ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \ ++ $(am__cd) $(top_srcdir) && \ ++ $(AUTOMAKE) --foreign Makefile + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ +@@ -260,9 +306,10 @@ + $(SHELL) ./config.status --recheck + + $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(srcdir) && $(AUTOCONF) ++ $(am__cd) $(srcdir) && $(AUTOCONF) + $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) ++ $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) ++$(am__aclocal_m4_deps): + + config.h: stamp-h1 + @if test ! -f $@; then \ +@@ -274,7 +321,7 @@ + @rm -f stamp-h1 + cd $(top_builddir) && $(SHELL) ./config.status config.h + $(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_srcdir) && $(AUTOHEADER) ++ ($(am__cd) $(top_srcdir) && $(AUTOHEADER)) + rm -f stamp-h1 + touch $@ + +@@ -296,20 +343,23 @@ + install-pkgconfigDATA: $(pkgconfig_DATA) + @$(NORMAL_INSTALL) + test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" +- @list='$(pkgconfig_DATA)'; for p in $$list; do \ ++ @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ ++ for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(pkgconfigDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgconfigdir)/$$f'"; \ +- $(pkgconfigDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgconfigdir)/$$f"; \ ++ echo "$$d$$p"; \ ++ done | $(am__base_list) | \ ++ while read files; do \ ++ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgconfigdir)'"; \ ++ $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgconfigdir)" || exit $$?; \ + done + + uninstall-pkgconfigDATA: + @$(NORMAL_UNINSTALL) +- @list='$(pkgconfig_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(pkgconfigdir)/$$f'"; \ +- rm -f "$(DESTDIR)$(pkgconfigdir)/$$f"; \ +- done ++ @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ ++ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ ++ test -n "$$files" || exit 0; \ ++ echo " ( cd '$(DESTDIR)$(pkgconfigdir)' && rm -f" $$files ")"; \ ++ cd "$(DESTDIR)$(pkgconfigdir)" && rm -f $$files + + # This directory's subdirectories are mostly independent; you can cd + # into them and run `make' without going through this Makefile. +@@ -318,7 +368,7 @@ + # (which will cause the Makefiles to be regenerated when you run `make'); + # (2) otherwise, pass the desired values on the `make' command line. + $(RECURSIVE_TARGETS): +- @failcom='exit 1'; \ ++ @fail= failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ +@@ -335,7 +385,7 @@ + else \ + local_target="$$target"; \ + fi; \ +- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ ++ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done; \ + if test "$$dot_seen" = "no"; then \ +@@ -343,7 +393,7 @@ + fi; test -z "$$fail" + + $(RECURSIVE_CLEAN_TARGETS): +- @failcom='exit 1'; \ ++ @fail= failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ +@@ -369,16 +419,16 @@ + else \ + local_target="$$target"; \ + fi; \ +- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ ++ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done && test -z "$$fail" + tags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ +- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ ++ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ + done + ctags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ +- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ ++ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + done + + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) +@@ -393,7 +443,7 @@ + + TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +- tags=; \ ++ set x; \ + here=`pwd`; \ + if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ +@@ -405,7 +455,7 @@ + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test ! -f $$subdir/TAGS || \ +- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ ++ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ + fi; \ + done; \ + list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ +@@ -414,36 +464,41 @@ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ +- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ ++ shift; \ ++ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique; \ ++ if test $$# -gt 0; then \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ "$$@" $$unique; \ ++ else \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$unique; \ ++ fi; \ + fi + ctags: CTAGS + CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +- tags=; \ + list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ +- test -z "$(CTAGS_ARGS)$$tags$$unique" \ ++ test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ +- $$tags $$unique ++ $$unique + + GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ +- && cd $(top_srcdir) \ +- && gtags -i $(GTAGS_ARGS) $$here ++ && $(am__cd) $(top_srcdir) \ ++ && gtags -i $(GTAGS_ARGS) "$$here" + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + + distdir: $(DISTFILES) + $(am__remove_distdir) +- test -d $(distdir) || mkdir $(distdir) ++ test -d "$(distdir)" || mkdir "$(distdir)" + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ +@@ -459,38 +514,55 @@ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ ++ if test -d "$(distdir)/$$file"; then \ ++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ ++ fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ ++ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ ++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ +- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ ++ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ +- test -f $(distdir)/$$file \ +- || cp -p $$d/$$file $(distdir)/$$file \ ++ test -f "$(distdir)/$$file" \ ++ || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ ++ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ +- distdir=`$(am__cd) $(distdir) && pwd`; \ +- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ +- (cd $$subdir && \ ++ fi; \ ++ done ++ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ ++ if test "$$subdir" = .; then :; else \ ++ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ ++ $(am__relativize); \ ++ new_distdir=$$reldir; \ ++ dir1=$$subdir; dir2="$(top_distdir)"; \ ++ $(am__relativize); \ ++ new_top_distdir=$$reldir; \ ++ echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ ++ echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ ++ ($(am__cd) $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ +- top_distdir="$$top_distdir" \ +- distdir="$$distdir/$$subdir" \ ++ top_distdir="$$new_top_distdir" \ ++ distdir="$$new_distdir" \ + am__remove_distdir=: \ + am__skip_length_check=: \ ++ am__skip_mode_fix=: \ + distdir) \ + || exit 1; \ + fi; \ + done +- -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ ++ -test -n "$(am__skip_mode_fix)" \ ++ || find "$(distdir)" -type d ! -perm -755 \ ++ -exec chmod u+rwx,go+rx {} \; -o \ + ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ + ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ + ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ +- || chmod -R a+r $(distdir) ++ || chmod -R a+r "$(distdir)" + dist-gzip: distdir + tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz + $(am__remove_distdir) +@@ -503,6 +575,10 @@ + tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma + $(am__remove_distdir) + ++dist-xz: distdir ++ tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz ++ $(am__remove_distdir) ++ + dist-tarZ: distdir + tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z + $(am__remove_distdir) +@@ -526,15 +602,17 @@ + distcheck: dist + case '$(DIST_ARCHIVES)' in \ + *.tar.gz*) \ +- GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ ++ GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ + *.tar.bz2*) \ +- bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ ++ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ + *.tar.lzma*) \ +- unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\ ++ lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ ++ *.tar.xz*) \ ++ xz -dc $(distdir).tar.xz | $(am__untar) ;;\ + *.tar.Z*) \ + uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ + *.shar.gz*) \ +- GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\ ++ GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\ + *.zip*) \ + unzip $(distdir).zip ;;\ + esac +@@ -542,9 +620,11 @@ + mkdir $(distdir)/_build + mkdir $(distdir)/_inst + chmod a-w $(distdir) ++ test -d $(distdir)/_build || exit 0; \ + dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ + && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ +- && cd $(distdir)/_build \ ++ && am__cwd=`pwd` \ ++ && $(am__cd) $(distdir)/_build \ + && ../configure --srcdir=.. --prefix="$$dc_install_base" \ + $(DISTCHECK_CONFIGURE_FLAGS) \ + && $(MAKE) $(AM_MAKEFLAGS) \ +@@ -566,13 +646,15 @@ + && rm -rf "$$dc_destdir" \ + && $(MAKE) $(AM_MAKEFLAGS) dist \ + && rm -rf $(DIST_ARCHIVES) \ +- && $(MAKE) $(AM_MAKEFLAGS) distcleancheck ++ && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \ ++ && cd "$$am__cwd" \ ++ || exit 1 + $(am__remove_distdir) + @(echo "$(distdir) archives ready for distribution: "; \ + list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ + sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' + distuninstallcheck: +- @cd $(distuninstallcheck_dir) \ ++ @$(am__cd) '$(distuninstallcheck_dir)' \ + && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ + || { echo "ERROR: files left after uninstall:" ; \ + if test -n "$(DESTDIR)"; then \ +@@ -620,6 +702,7 @@ + + distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -641,6 +724,8 @@ + + html: html-recursive + ++html-am: ++ + info: info-recursive + + info-am: +@@ -649,18 +734,28 @@ + + install-dvi: install-dvi-recursive + ++install-dvi-am: ++ + install-exec-am: + + install-html: install-html-recursive + ++install-html-am: ++ + install-info: install-info-recursive + ++install-info-am: ++ + install-man: + + install-pdf: install-pdf-recursive + ++install-pdf-am: ++ + install-ps: install-ps-recursive + ++install-ps-am: ++ + installcheck-am: + + maintainer-clean: maintainer-clean-recursive +@@ -683,25 +778,26 @@ + + uninstall-am: uninstall-pkgconfigDATA + +-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ +- install-strip ++.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all check \ ++ ctags-recursive install install-am install-strip \ ++ tags-recursive + + .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ + all all-am am--refresh check check-am clean clean-generic \ + clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \ +- dist-gzip dist-lzma dist-shar dist-tarZ dist-zip distcheck \ +- distclean distclean-generic distclean-hdr distclean-libtool \ +- distclean-tags distcleancheck distdir distuninstallcheck dvi \ +- dvi-am html html-am info info-am install install-am \ +- install-data install-data-am install-dvi install-dvi-am \ +- install-exec install-exec-am install-html install-html-am \ +- install-info install-info-am install-man install-pdf \ +- install-pdf-am install-pkgconfigDATA install-ps install-ps-am \ +- install-strip installcheck installcheck-am installdirs \ +- installdirs-am maintainer-clean maintainer-clean-generic \ +- mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ +- ps ps-am tags tags-recursive uninstall uninstall-am \ +- uninstall-pkgconfigDATA ++ dist-gzip dist-lzma dist-shar dist-tarZ dist-xz dist-zip \ ++ distcheck distclean distclean-generic distclean-hdr \ ++ distclean-libtool distclean-tags distcleancheck distdir \ ++ distuninstallcheck dvi dvi-am html html-am info info-am \ ++ install install-am install-data install-data-am install-dvi \ ++ install-dvi-am install-exec install-exec-am install-html \ ++ install-html-am install-info install-info-am install-man \ ++ install-pdf install-pdf-am install-pkgconfigDATA install-ps \ ++ install-ps-am install-strip installcheck installcheck-am \ ++ installdirs installdirs-am maintainer-clean \ ++ maintainer-clean-generic mostlyclean mostlyclean-generic \ ++ mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ ++ uninstall uninstall-am uninstall-pkgconfigDATA + + + orc-$(ORC_MAJORMINOR).pc: orc.pc +@@ -709,6 +805,7 @@ + + orc-$(ORC_MAJORMINOR)-uninstalled.pc: orc-uninstalled.pc + cp orc-uninstalled.pc orc-$(ORC_MAJORMINOR)-uninstalled.pc ++ + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: +diff -x'*config.sub' -x'*config.guess' -Naur orc-0.4.3.old/missing orc-0.4.3/missing +--- orc-0.4.3.old/missing 2009-12-14 02:20:10.000000000 +0100 ++++ orc-0.4.3/missing 2010-02-02 12:18:14.395380273 +0100 +@@ -1,10 +1,10 @@ + #! /bin/sh + # Common stub for a few missing GNU programs while installing. + +-scriptversion=2006-05-10.23 ++scriptversion=2009-04-28.21; # UTC + +-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 +-# Free Software Foundation, Inc. ++# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, ++# 2008, 2009 Free Software Foundation, Inc. + # Originally by Fran,cois Pinard , 1996. + + # This program is free software; you can redistribute it and/or modify +@@ -18,9 +18,7 @@ + # 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. ++# along with this program. If not, see . + + # As a special exception to the GNU General Public License, if you + # distribute this file as part of a program that contains a +@@ -89,6 +87,9 @@ + tar try tar, gnutar, gtar, then tar without non-portable flags + yacc create \`y.tab.[ch]', if possible, from existing .[ch] + ++Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and ++\`g' are ignored when checking the name. ++ + Send bug reports to ." + exit $? + ;; +@@ -106,15 +107,22 @@ + + esac + ++# normalize program name to check for. ++program=`echo "$1" | sed ' ++ s/^gnu-//; t ++ s/^gnu//; t ++ s/^g//; t'` ++ + # Now exit if we have it, but it failed. Also exit now if we + # don't have it and --version was passed (most likely to detect +-# the program). ++# the program). This is about non-GNU programs, so use $1 not ++# $program. + case $1 in +- lex|yacc) ++ lex*|yacc*) + # Not GNU programs, they don't have --version. + ;; + +- tar) ++ tar*) + if test -n "$run"; then + echo 1>&2 "ERROR: \`tar' requires --run" + exit 1 +@@ -138,7 +146,7 @@ + + # If it does not exist, or fails to run (possibly an outdated version), + # try to emulate it. +-case $1 in ++case $program in + aclocal*) + echo 1>&2 "\ + WARNING: \`$1' is $msg. You should only need it if +@@ -148,7 +156,7 @@ + touch aclocal.m4 + ;; + +- autoconf) ++ autoconf*) + echo 1>&2 "\ + WARNING: \`$1' is $msg. You should only need it if + you modified \`${configure_ac}'. You might want to install the +@@ -157,7 +165,7 @@ + touch configure + ;; + +- autoheader) ++ autoheader*) + echo 1>&2 "\ + WARNING: \`$1' is $msg. You should only need it if + you modified \`acconfig.h' or \`${configure_ac}'. You might want +@@ -187,7 +195,7 @@ + while read f; do touch "$f"; done + ;; + +- autom4te) ++ autom4te*) + echo 1>&2 "\ + WARNING: \`$1' is needed, but is $msg. + You might have modified some files without having the +@@ -210,7 +218,7 @@ + fi + ;; + +- bison|yacc) ++ bison*|yacc*) + echo 1>&2 "\ + WARNING: \`$1' $msg. You should only need it if + you modified a \`.y' file. You may need the \`Bison' package +@@ -240,7 +248,7 @@ + fi + ;; + +- lex|flex) ++ lex*|flex*) + echo 1>&2 "\ + WARNING: \`$1' is $msg. You should only need it if + you modified a \`.l' file. You may need the \`Flex' package +@@ -263,7 +271,7 @@ + fi + ;; + +- help2man) ++ help2man*) + echo 1>&2 "\ + WARNING: \`$1' is $msg. You should only need it if + you modified a dependency of a manual page. You may need the +@@ -277,11 +285,11 @@ + else + test -z "$file" || exec >$file + echo ".ab help2man is required to generate this page" +- exit 1 ++ exit $? + fi + ;; + +- makeinfo) ++ makeinfo*) + echo 1>&2 "\ + WARNING: \`$1' is $msg. You should only need it if + you modified a \`.texi' or \`.texinfo' file, or any other file +@@ -310,7 +318,7 @@ + touch $file + ;; + +- tar) ++ tar*) + shift + + # We have already tried tar in the generic part. +@@ -363,5 +371,6 @@ + # eval: (add-hook 'write-file-hooks 'time-stamp) + # time-stamp-start: "scriptversion=" + # time-stamp-format: "%:y-%02m-%02d.%02H" +-# time-stamp-end: "$" ++# time-stamp-time-zone: "UTC" ++# time-stamp-end: "; # UTC" + # End: +diff -x'*config.sub' -x'*config.guess' -Naur orc-0.4.3.old/orc/Makefile.in orc-0.4.3/orc/Makefile.in +--- orc-0.4.3.old/orc/Makefile.in 2009-12-14 02:20:11.000000000 +0100 ++++ orc-0.4.3/orc/Makefile.in 2010-02-02 12:18:14.891377460 +0100 +@@ -1,8 +1,9 @@ +-# Makefile.in generated by automake 1.10.2 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, ++# Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -18,6 +19,7 @@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ ++pkglibexecdir = $(libexecdir)/@PACKAGE@ + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c +@@ -54,19 +56,34 @@ + mkinstalldirs = $(install_sh) -d + CONFIG_HEADER = $(top_builddir)/config.h + CONFIG_CLEAN_FILES = ++CONFIG_CLEAN_VPATH_FILES = + am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; + am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; ++am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; ++am__install_max = 40 ++am__nobase_strip_setup = \ ++ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` ++am__nobase_strip = \ ++ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" ++am__nobase_list = $(am__nobase_strip_setup); \ ++ for p in $$list; do echo "$$p $$p"; done | \ ++ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ ++ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ ++ if (++n[$$2] == $(am__install_max)) \ ++ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ ++ END { for (dir in files) print dir, files[dir] }' ++am__base_list = \ ++ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ ++ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' + am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgincludedir)" \ + "$(DESTDIR)$(pkgincludedir)" +-libLTLIBRARIES_INSTALL = $(INSTALL) + LTLIBRARIES = $(lib_LTLIBRARIES) + liborc_@ORC_MAJORMINOR@_la_LIBADD = + am__liborc_@ORC_MAJORMINOR@_la_SOURCES_DIST = orc.c orcexecutor.c \ +- orcfunctions.c orcrule.c orccodemem.c orcprogram.c \ ++ orcfunctions.c orcutils.c orcrule.c orccodemem.c orcprogram.c \ + orccompiler.c orcprogram-arm.c orcprogram-c.c \ + orcprogram-c64x-c.c orcprogram-altivec.c orcprogram-mmx.c \ + orcprogram-sse.c orcprogram.h orcopcodes.c orcparse.c \ +@@ -84,6 +101,7 @@ + liborc_@ORC_MAJORMINOR@_la-orc.lo \ + liborc_@ORC_MAJORMINOR@_la-orcexecutor.lo \ + liborc_@ORC_MAJORMINOR@_la-orcfunctions.lo \ ++ liborc_@ORC_MAJORMINOR@_la-orcutils.lo \ + liborc_@ORC_MAJORMINOR@_la-orcrule.lo \ + liborc_@ORC_MAJORMINOR@_la-orccodemem.lo \ + liborc_@ORC_MAJORMINOR@_la-orcprogram.lo \ +@@ -117,6 +135,7 @@ + DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles ++am__mv = mv -f + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +@@ -128,8 +147,6 @@ + $(LDFLAGS) -o $@ + SOURCES = $(liborc_@ORC_MAJORMINOR@_la_SOURCES) + DIST_SOURCES = $(am__liborc_@ORC_MAJORMINOR@_la_SOURCES_DIST) +-nodist_pkgincludeHEADERS_INSTALL = $(INSTALL_HEADER) +-pkgincludeHEADERS_INSTALL = $(INSTALL_HEADER) + HEADERS = $(nodist_pkginclude_HEADERS) $(pkginclude_HEADERS) + ETAGS = etags + CTAGS = ctags +@@ -201,6 +218,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ +@@ -273,7 +291,7 @@ + -DORC_ENABLE_UNSTABLE_API + + liborc_@ORC_MAJORMINOR@_la_SOURCES = orc.c orcexecutor.c \ +- orcfunctions.c orcrule.c orccodemem.c orcprogram.c \ ++ orcfunctions.c orcutils.c orcrule.c orccodemem.c orcprogram.c \ + orccompiler.c orcprogram-arm.c orcprogram-c.c \ + orcprogram-c64x-c.c orcprogram-altivec.c orcprogram-mmx.c \ + orcprogram-sse.c orcprogram.h orcopcodes.c orcparse.c \ +@@ -311,9 +329,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu orc/Makefile'; \ +- cd $(top_srcdir) && \ +- $(AUTOMAKE) --gnu orc/Makefile ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu orc/Makefile'; \ ++ $(am__cd) $(top_srcdir) && \ ++ $(AUTOMAKE) --gnu orc/Makefile + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ +@@ -331,23 +349,28 @@ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(am__aclocal_m4_deps): + install-libLTLIBRARIES: $(lib_LTLIBRARIES) + @$(NORMAL_INSTALL) + test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" +- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ ++ @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ ++ list2=; for p in $$list; do \ + if test -f $$p; then \ +- f=$(am__strip_dir) \ +- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \ +- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \ ++ list2="$$list2 $$p"; \ + else :; fi; \ +- done ++ done; \ ++ test -z "$$list2" || { \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \ ++ } + + uninstall-libLTLIBRARIES: + @$(NORMAL_UNINSTALL) +- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ +- p=$(am__strip_dir) \ +- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \ +- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \ ++ @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ ++ for p in $$list; do \ ++ $(am__strip_dir) \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \ + done + + clean-libLTLIBRARIES: +@@ -395,231 +418,239 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcrules-mmx.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcrules-sse.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcsse.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcutils.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcx86.Plo@am__quote@ + + .c.o: + @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c $< + + .c.obj: + @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + + .c.lo: + @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< + + liborc_@ORC_MAJORMINOR@_la-orc.lo: orc.c +-@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_@ORC_MAJORMINOR@_la-orc.lo -MD -MP -MF $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orc.Tpo -c -o liborc_@ORC_MAJORMINOR@_la-orc.lo `test -f 'orc.c' || echo '$(srcdir)/'`orc.c +-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orc.Tpo $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orc.Plo ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_@ORC_MAJORMINOR@_la-orc.lo -MD -MP -MF $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orc.Tpo -c -o liborc_@ORC_MAJORMINOR@_la-orc.lo `test -f 'orc.c' || echo '$(srcdir)/'`orc.c ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orc.Tpo $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orc.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='orc.c' object='liborc_@ORC_MAJORMINOR@_la-orc.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_@ORC_MAJORMINOR@_la-orc.lo `test -f 'orc.c' || echo '$(srcdir)/'`orc.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_@ORC_MAJORMINOR@_la-orc.lo `test -f 'orc.c' || echo '$(srcdir)/'`orc.c + + liborc_@ORC_MAJORMINOR@_la-orcexecutor.lo: orcexecutor.c +-@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_@ORC_MAJORMINOR@_la-orcexecutor.lo -MD -MP -MF $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcexecutor.Tpo -c -o liborc_@ORC_MAJORMINOR@_la-orcexecutor.lo `test -f 'orcexecutor.c' || echo '$(srcdir)/'`orcexecutor.c +-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcexecutor.Tpo $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcexecutor.Plo ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_@ORC_MAJORMINOR@_la-orcexecutor.lo -MD -MP -MF $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcexecutor.Tpo -c -o liborc_@ORC_MAJORMINOR@_la-orcexecutor.lo `test -f 'orcexecutor.c' || echo '$(srcdir)/'`orcexecutor.c ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcexecutor.Tpo $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcexecutor.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='orcexecutor.c' object='liborc_@ORC_MAJORMINOR@_la-orcexecutor.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_@ORC_MAJORMINOR@_la-orcexecutor.lo `test -f 'orcexecutor.c' || echo '$(srcdir)/'`orcexecutor.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_@ORC_MAJORMINOR@_la-orcexecutor.lo `test -f 'orcexecutor.c' || echo '$(srcdir)/'`orcexecutor.c + + liborc_@ORC_MAJORMINOR@_la-orcfunctions.lo: orcfunctions.c +-@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_@ORC_MAJORMINOR@_la-orcfunctions.lo -MD -MP -MF $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcfunctions.Tpo -c -o liborc_@ORC_MAJORMINOR@_la-orcfunctions.lo `test -f 'orcfunctions.c' || echo '$(srcdir)/'`orcfunctions.c +-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcfunctions.Tpo $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcfunctions.Plo ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_@ORC_MAJORMINOR@_la-orcfunctions.lo -MD -MP -MF $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcfunctions.Tpo -c -o liborc_@ORC_MAJORMINOR@_la-orcfunctions.lo `test -f 'orcfunctions.c' || echo '$(srcdir)/'`orcfunctions.c ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcfunctions.Tpo $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcfunctions.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='orcfunctions.c' object='liborc_@ORC_MAJORMINOR@_la-orcfunctions.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_@ORC_MAJORMINOR@_la-orcfunctions.lo `test -f 'orcfunctions.c' || echo '$(srcdir)/'`orcfunctions.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_@ORC_MAJORMINOR@_la-orcfunctions.lo `test -f 'orcfunctions.c' || echo '$(srcdir)/'`orcfunctions.c ++ ++liborc_@ORC_MAJORMINOR@_la-orcutils.lo: orcutils.c ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_@ORC_MAJORMINOR@_la-orcutils.lo -MD -MP -MF $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcutils.Tpo -c -o liborc_@ORC_MAJORMINOR@_la-orcutils.lo `test -f 'orcutils.c' || echo '$(srcdir)/'`orcutils.c ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcutils.Tpo $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcutils.Plo ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='orcutils.c' object='liborc_@ORC_MAJORMINOR@_la-orcutils.lo' libtool=yes @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_@ORC_MAJORMINOR@_la-orcutils.lo `test -f 'orcutils.c' || echo '$(srcdir)/'`orcutils.c + + liborc_@ORC_MAJORMINOR@_la-orcrule.lo: orcrule.c +-@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_@ORC_MAJORMINOR@_la-orcrule.lo -MD -MP -MF $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcrule.Tpo -c -o liborc_@ORC_MAJORMINOR@_la-orcrule.lo `test -f 'orcrule.c' || echo '$(srcdir)/'`orcrule.c +-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcrule.Tpo $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcrule.Plo ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_@ORC_MAJORMINOR@_la-orcrule.lo -MD -MP -MF $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcrule.Tpo -c -o liborc_@ORC_MAJORMINOR@_la-orcrule.lo `test -f 'orcrule.c' || echo '$(srcdir)/'`orcrule.c ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcrule.Tpo $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcrule.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='orcrule.c' object='liborc_@ORC_MAJORMINOR@_la-orcrule.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_@ORC_MAJORMINOR@_la-orcrule.lo `test -f 'orcrule.c' || echo '$(srcdir)/'`orcrule.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_@ORC_MAJORMINOR@_la-orcrule.lo `test -f 'orcrule.c' || echo '$(srcdir)/'`orcrule.c + + liborc_@ORC_MAJORMINOR@_la-orccodemem.lo: orccodemem.c +-@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_@ORC_MAJORMINOR@_la-orccodemem.lo -MD -MP -MF $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orccodemem.Tpo -c -o liborc_@ORC_MAJORMINOR@_la-orccodemem.lo `test -f 'orccodemem.c' || echo '$(srcdir)/'`orccodemem.c +-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orccodemem.Tpo $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orccodemem.Plo ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_@ORC_MAJORMINOR@_la-orccodemem.lo -MD -MP -MF $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orccodemem.Tpo -c -o liborc_@ORC_MAJORMINOR@_la-orccodemem.lo `test -f 'orccodemem.c' || echo '$(srcdir)/'`orccodemem.c ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orccodemem.Tpo $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orccodemem.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='orccodemem.c' object='liborc_@ORC_MAJORMINOR@_la-orccodemem.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_@ORC_MAJORMINOR@_la-orccodemem.lo `test -f 'orccodemem.c' || echo '$(srcdir)/'`orccodemem.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_@ORC_MAJORMINOR@_la-orccodemem.lo `test -f 'orccodemem.c' || echo '$(srcdir)/'`orccodemem.c + + liborc_@ORC_MAJORMINOR@_la-orcprogram.lo: orcprogram.c +-@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_@ORC_MAJORMINOR@_la-orcprogram.lo -MD -MP -MF $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcprogram.Tpo -c -o liborc_@ORC_MAJORMINOR@_la-orcprogram.lo `test -f 'orcprogram.c' || echo '$(srcdir)/'`orcprogram.c +-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcprogram.Tpo $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcprogram.Plo ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_@ORC_MAJORMINOR@_la-orcprogram.lo -MD -MP -MF $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcprogram.Tpo -c -o liborc_@ORC_MAJORMINOR@_la-orcprogram.lo `test -f 'orcprogram.c' || echo '$(srcdir)/'`orcprogram.c ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcprogram.Tpo $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcprogram.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='orcprogram.c' object='liborc_@ORC_MAJORMINOR@_la-orcprogram.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_@ORC_MAJORMINOR@_la-orcprogram.lo `test -f 'orcprogram.c' || echo '$(srcdir)/'`orcprogram.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_@ORC_MAJORMINOR@_la-orcprogram.lo `test -f 'orcprogram.c' || echo '$(srcdir)/'`orcprogram.c + + liborc_@ORC_MAJORMINOR@_la-orccompiler.lo: orccompiler.c +-@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_@ORC_MAJORMINOR@_la-orccompiler.lo -MD -MP -MF $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orccompiler.Tpo -c -o liborc_@ORC_MAJORMINOR@_la-orccompiler.lo `test -f 'orccompiler.c' || echo '$(srcdir)/'`orccompiler.c +-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orccompiler.Tpo $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orccompiler.Plo ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_@ORC_MAJORMINOR@_la-orccompiler.lo -MD -MP -MF $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orccompiler.Tpo -c -o liborc_@ORC_MAJORMINOR@_la-orccompiler.lo `test -f 'orccompiler.c' || echo '$(srcdir)/'`orccompiler.c ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orccompiler.Tpo $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orccompiler.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='orccompiler.c' object='liborc_@ORC_MAJORMINOR@_la-orccompiler.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_@ORC_MAJORMINOR@_la-orccompiler.lo `test -f 'orccompiler.c' || echo '$(srcdir)/'`orccompiler.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_@ORC_MAJORMINOR@_la-orccompiler.lo `test -f 'orccompiler.c' || echo '$(srcdir)/'`orccompiler.c + + liborc_@ORC_MAJORMINOR@_la-orcprogram-arm.lo: orcprogram-arm.c +-@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_@ORC_MAJORMINOR@_la-orcprogram-arm.lo -MD -MP -MF $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcprogram-arm.Tpo -c -o liborc_@ORC_MAJORMINOR@_la-orcprogram-arm.lo `test -f 'orcprogram-arm.c' || echo '$(srcdir)/'`orcprogram-arm.c +-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcprogram-arm.Tpo $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcprogram-arm.Plo ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_@ORC_MAJORMINOR@_la-orcprogram-arm.lo -MD -MP -MF $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcprogram-arm.Tpo -c -o liborc_@ORC_MAJORMINOR@_la-orcprogram-arm.lo `test -f 'orcprogram-arm.c' || echo '$(srcdir)/'`orcprogram-arm.c ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcprogram-arm.Tpo $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcprogram-arm.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='orcprogram-arm.c' object='liborc_@ORC_MAJORMINOR@_la-orcprogram-arm.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_@ORC_MAJORMINOR@_la-orcprogram-arm.lo `test -f 'orcprogram-arm.c' || echo '$(srcdir)/'`orcprogram-arm.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_@ORC_MAJORMINOR@_la-orcprogram-arm.lo `test -f 'orcprogram-arm.c' || echo '$(srcdir)/'`orcprogram-arm.c + + liborc_@ORC_MAJORMINOR@_la-orcprogram-c.lo: orcprogram-c.c +-@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_@ORC_MAJORMINOR@_la-orcprogram-c.lo -MD -MP -MF $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcprogram-c.Tpo -c -o liborc_@ORC_MAJORMINOR@_la-orcprogram-c.lo `test -f 'orcprogram-c.c' || echo '$(srcdir)/'`orcprogram-c.c +-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcprogram-c.Tpo $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcprogram-c.Plo ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_@ORC_MAJORMINOR@_la-orcprogram-c.lo -MD -MP -MF $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcprogram-c.Tpo -c -o liborc_@ORC_MAJORMINOR@_la-orcprogram-c.lo `test -f 'orcprogram-c.c' || echo '$(srcdir)/'`orcprogram-c.c ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcprogram-c.Tpo $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcprogram-c.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='orcprogram-c.c' object='liborc_@ORC_MAJORMINOR@_la-orcprogram-c.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_@ORC_MAJORMINOR@_la-orcprogram-c.lo `test -f 'orcprogram-c.c' || echo '$(srcdir)/'`orcprogram-c.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_@ORC_MAJORMINOR@_la-orcprogram-c.lo `test -f 'orcprogram-c.c' || echo '$(srcdir)/'`orcprogram-c.c + + liborc_@ORC_MAJORMINOR@_la-orcprogram-c64x-c.lo: orcprogram-c64x-c.c +-@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_@ORC_MAJORMINOR@_la-orcprogram-c64x-c.lo -MD -MP -MF $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcprogram-c64x-c.Tpo -c -o liborc_@ORC_MAJORMINOR@_la-orcprogram-c64x-c.lo `test -f 'orcprogram-c64x-c.c' || echo '$(srcdir)/'`orcprogram-c64x-c.c +-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcprogram-c64x-c.Tpo $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcprogram-c64x-c.Plo ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_@ORC_MAJORMINOR@_la-orcprogram-c64x-c.lo -MD -MP -MF $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcprogram-c64x-c.Tpo -c -o liborc_@ORC_MAJORMINOR@_la-orcprogram-c64x-c.lo `test -f 'orcprogram-c64x-c.c' || echo '$(srcdir)/'`orcprogram-c64x-c.c ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcprogram-c64x-c.Tpo $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcprogram-c64x-c.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='orcprogram-c64x-c.c' object='liborc_@ORC_MAJORMINOR@_la-orcprogram-c64x-c.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_@ORC_MAJORMINOR@_la-orcprogram-c64x-c.lo `test -f 'orcprogram-c64x-c.c' || echo '$(srcdir)/'`orcprogram-c64x-c.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_@ORC_MAJORMINOR@_la-orcprogram-c64x-c.lo `test -f 'orcprogram-c64x-c.c' || echo '$(srcdir)/'`orcprogram-c64x-c.c + + liborc_@ORC_MAJORMINOR@_la-orcprogram-altivec.lo: orcprogram-altivec.c +-@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_@ORC_MAJORMINOR@_la-orcprogram-altivec.lo -MD -MP -MF $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcprogram-altivec.Tpo -c -o liborc_@ORC_MAJORMINOR@_la-orcprogram-altivec.lo `test -f 'orcprogram-altivec.c' || echo '$(srcdir)/'`orcprogram-altivec.c +-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcprogram-altivec.Tpo $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcprogram-altivec.Plo ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_@ORC_MAJORMINOR@_la-orcprogram-altivec.lo -MD -MP -MF $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcprogram-altivec.Tpo -c -o liborc_@ORC_MAJORMINOR@_la-orcprogram-altivec.lo `test -f 'orcprogram-altivec.c' || echo '$(srcdir)/'`orcprogram-altivec.c ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcprogram-altivec.Tpo $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcprogram-altivec.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='orcprogram-altivec.c' object='liborc_@ORC_MAJORMINOR@_la-orcprogram-altivec.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_@ORC_MAJORMINOR@_la-orcprogram-altivec.lo `test -f 'orcprogram-altivec.c' || echo '$(srcdir)/'`orcprogram-altivec.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_@ORC_MAJORMINOR@_la-orcprogram-altivec.lo `test -f 'orcprogram-altivec.c' || echo '$(srcdir)/'`orcprogram-altivec.c + + liborc_@ORC_MAJORMINOR@_la-orcprogram-mmx.lo: orcprogram-mmx.c +-@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_@ORC_MAJORMINOR@_la-orcprogram-mmx.lo -MD -MP -MF $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcprogram-mmx.Tpo -c -o liborc_@ORC_MAJORMINOR@_la-orcprogram-mmx.lo `test -f 'orcprogram-mmx.c' || echo '$(srcdir)/'`orcprogram-mmx.c +-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcprogram-mmx.Tpo $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcprogram-mmx.Plo ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_@ORC_MAJORMINOR@_la-orcprogram-mmx.lo -MD -MP -MF $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcprogram-mmx.Tpo -c -o liborc_@ORC_MAJORMINOR@_la-orcprogram-mmx.lo `test -f 'orcprogram-mmx.c' || echo '$(srcdir)/'`orcprogram-mmx.c ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcprogram-mmx.Tpo $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcprogram-mmx.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='orcprogram-mmx.c' object='liborc_@ORC_MAJORMINOR@_la-orcprogram-mmx.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_@ORC_MAJORMINOR@_la-orcprogram-mmx.lo `test -f 'orcprogram-mmx.c' || echo '$(srcdir)/'`orcprogram-mmx.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_@ORC_MAJORMINOR@_la-orcprogram-mmx.lo `test -f 'orcprogram-mmx.c' || echo '$(srcdir)/'`orcprogram-mmx.c + + liborc_@ORC_MAJORMINOR@_la-orcprogram-sse.lo: orcprogram-sse.c +-@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_@ORC_MAJORMINOR@_la-orcprogram-sse.lo -MD -MP -MF $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcprogram-sse.Tpo -c -o liborc_@ORC_MAJORMINOR@_la-orcprogram-sse.lo `test -f 'orcprogram-sse.c' || echo '$(srcdir)/'`orcprogram-sse.c +-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcprogram-sse.Tpo $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcprogram-sse.Plo ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_@ORC_MAJORMINOR@_la-orcprogram-sse.lo -MD -MP -MF $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcprogram-sse.Tpo -c -o liborc_@ORC_MAJORMINOR@_la-orcprogram-sse.lo `test -f 'orcprogram-sse.c' || echo '$(srcdir)/'`orcprogram-sse.c ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcprogram-sse.Tpo $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcprogram-sse.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='orcprogram-sse.c' object='liborc_@ORC_MAJORMINOR@_la-orcprogram-sse.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_@ORC_MAJORMINOR@_la-orcprogram-sse.lo `test -f 'orcprogram-sse.c' || echo '$(srcdir)/'`orcprogram-sse.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_@ORC_MAJORMINOR@_la-orcprogram-sse.lo `test -f 'orcprogram-sse.c' || echo '$(srcdir)/'`orcprogram-sse.c + + liborc_@ORC_MAJORMINOR@_la-orcopcodes.lo: orcopcodes.c +-@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_@ORC_MAJORMINOR@_la-orcopcodes.lo -MD -MP -MF $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcopcodes.Tpo -c -o liborc_@ORC_MAJORMINOR@_la-orcopcodes.lo `test -f 'orcopcodes.c' || echo '$(srcdir)/'`orcopcodes.c +-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcopcodes.Tpo $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcopcodes.Plo ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_@ORC_MAJORMINOR@_la-orcopcodes.lo -MD -MP -MF $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcopcodes.Tpo -c -o liborc_@ORC_MAJORMINOR@_la-orcopcodes.lo `test -f 'orcopcodes.c' || echo '$(srcdir)/'`orcopcodes.c ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcopcodes.Tpo $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcopcodes.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='orcopcodes.c' object='liborc_@ORC_MAJORMINOR@_la-orcopcodes.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_@ORC_MAJORMINOR@_la-orcopcodes.lo `test -f 'orcopcodes.c' || echo '$(srcdir)/'`orcopcodes.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_@ORC_MAJORMINOR@_la-orcopcodes.lo `test -f 'orcopcodes.c' || echo '$(srcdir)/'`orcopcodes.c + + liborc_@ORC_MAJORMINOR@_la-orcparse.lo: orcparse.c +-@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_@ORC_MAJORMINOR@_la-orcparse.lo -MD -MP -MF $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcparse.Tpo -c -o liborc_@ORC_MAJORMINOR@_la-orcparse.lo `test -f 'orcparse.c' || echo '$(srcdir)/'`orcparse.c +-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcparse.Tpo $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcparse.Plo ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_@ORC_MAJORMINOR@_la-orcparse.lo -MD -MP -MF $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcparse.Tpo -c -o liborc_@ORC_MAJORMINOR@_la-orcparse.lo `test -f 'orcparse.c' || echo '$(srcdir)/'`orcparse.c ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcparse.Tpo $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcparse.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='orcparse.c' object='liborc_@ORC_MAJORMINOR@_la-orcparse.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_@ORC_MAJORMINOR@_la-orcparse.lo `test -f 'orcparse.c' || echo '$(srcdir)/'`orcparse.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_@ORC_MAJORMINOR@_la-orcparse.lo `test -f 'orcparse.c' || echo '$(srcdir)/'`orcparse.c + + liborc_@ORC_MAJORMINOR@_la-orconce.lo: orconce.c +-@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_@ORC_MAJORMINOR@_la-orconce.lo -MD -MP -MF $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orconce.Tpo -c -o liborc_@ORC_MAJORMINOR@_la-orconce.lo `test -f 'orconce.c' || echo '$(srcdir)/'`orconce.c +-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orconce.Tpo $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orconce.Plo ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_@ORC_MAJORMINOR@_la-orconce.lo -MD -MP -MF $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orconce.Tpo -c -o liborc_@ORC_MAJORMINOR@_la-orconce.lo `test -f 'orconce.c' || echo '$(srcdir)/'`orconce.c ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orconce.Tpo $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orconce.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='orconce.c' object='liborc_@ORC_MAJORMINOR@_la-orconce.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_@ORC_MAJORMINOR@_la-orconce.lo `test -f 'orconce.c' || echo '$(srcdir)/'`orconce.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_@ORC_MAJORMINOR@_la-orconce.lo `test -f 'orconce.c' || echo '$(srcdir)/'`orconce.c + + liborc_@ORC_MAJORMINOR@_la-orcrules-altivec.lo: orcrules-altivec.c +-@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_@ORC_MAJORMINOR@_la-orcrules-altivec.lo -MD -MP -MF $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcrules-altivec.Tpo -c -o liborc_@ORC_MAJORMINOR@_la-orcrules-altivec.lo `test -f 'orcrules-altivec.c' || echo '$(srcdir)/'`orcrules-altivec.c +-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcrules-altivec.Tpo $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcrules-altivec.Plo ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_@ORC_MAJORMINOR@_la-orcrules-altivec.lo -MD -MP -MF $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcrules-altivec.Tpo -c -o liborc_@ORC_MAJORMINOR@_la-orcrules-altivec.lo `test -f 'orcrules-altivec.c' || echo '$(srcdir)/'`orcrules-altivec.c ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcrules-altivec.Tpo $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcrules-altivec.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='orcrules-altivec.c' object='liborc_@ORC_MAJORMINOR@_la-orcrules-altivec.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_@ORC_MAJORMINOR@_la-orcrules-altivec.lo `test -f 'orcrules-altivec.c' || echo '$(srcdir)/'`orcrules-altivec.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_@ORC_MAJORMINOR@_la-orcrules-altivec.lo `test -f 'orcrules-altivec.c' || echo '$(srcdir)/'`orcrules-altivec.c + + liborc_@ORC_MAJORMINOR@_la-orcrules-mmx.lo: orcrules-mmx.c +-@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_@ORC_MAJORMINOR@_la-orcrules-mmx.lo -MD -MP -MF $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcrules-mmx.Tpo -c -o liborc_@ORC_MAJORMINOR@_la-orcrules-mmx.lo `test -f 'orcrules-mmx.c' || echo '$(srcdir)/'`orcrules-mmx.c +-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcrules-mmx.Tpo $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcrules-mmx.Plo ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_@ORC_MAJORMINOR@_la-orcrules-mmx.lo -MD -MP -MF $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcrules-mmx.Tpo -c -o liborc_@ORC_MAJORMINOR@_la-orcrules-mmx.lo `test -f 'orcrules-mmx.c' || echo '$(srcdir)/'`orcrules-mmx.c ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcrules-mmx.Tpo $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcrules-mmx.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='orcrules-mmx.c' object='liborc_@ORC_MAJORMINOR@_la-orcrules-mmx.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_@ORC_MAJORMINOR@_la-orcrules-mmx.lo `test -f 'orcrules-mmx.c' || echo '$(srcdir)/'`orcrules-mmx.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_@ORC_MAJORMINOR@_la-orcrules-mmx.lo `test -f 'orcrules-mmx.c' || echo '$(srcdir)/'`orcrules-mmx.c + + liborc_@ORC_MAJORMINOR@_la-orcrules-sse.lo: orcrules-sse.c +-@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_@ORC_MAJORMINOR@_la-orcrules-sse.lo -MD -MP -MF $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcrules-sse.Tpo -c -o liborc_@ORC_MAJORMINOR@_la-orcrules-sse.lo `test -f 'orcrules-sse.c' || echo '$(srcdir)/'`orcrules-sse.c +-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcrules-sse.Tpo $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcrules-sse.Plo ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_@ORC_MAJORMINOR@_la-orcrules-sse.lo -MD -MP -MF $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcrules-sse.Tpo -c -o liborc_@ORC_MAJORMINOR@_la-orcrules-sse.lo `test -f 'orcrules-sse.c' || echo '$(srcdir)/'`orcrules-sse.c ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcrules-sse.Tpo $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcrules-sse.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='orcrules-sse.c' object='liborc_@ORC_MAJORMINOR@_la-orcrules-sse.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_@ORC_MAJORMINOR@_la-orcrules-sse.lo `test -f 'orcrules-sse.c' || echo '$(srcdir)/'`orcrules-sse.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_@ORC_MAJORMINOR@_la-orcrules-sse.lo `test -f 'orcrules-sse.c' || echo '$(srcdir)/'`orcrules-sse.c + + liborc_@ORC_MAJORMINOR@_la-orcrules-arm.lo: orcrules-arm.c +-@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_@ORC_MAJORMINOR@_la-orcrules-arm.lo -MD -MP -MF $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcrules-arm.Tpo -c -o liborc_@ORC_MAJORMINOR@_la-orcrules-arm.lo `test -f 'orcrules-arm.c' || echo '$(srcdir)/'`orcrules-arm.c +-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcrules-arm.Tpo $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcrules-arm.Plo ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_@ORC_MAJORMINOR@_la-orcrules-arm.lo -MD -MP -MF $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcrules-arm.Tpo -c -o liborc_@ORC_MAJORMINOR@_la-orcrules-arm.lo `test -f 'orcrules-arm.c' || echo '$(srcdir)/'`orcrules-arm.c ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcrules-arm.Tpo $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcrules-arm.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='orcrules-arm.c' object='liborc_@ORC_MAJORMINOR@_la-orcrules-arm.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_@ORC_MAJORMINOR@_la-orcrules-arm.lo `test -f 'orcrules-arm.c' || echo '$(srcdir)/'`orcrules-arm.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_@ORC_MAJORMINOR@_la-orcrules-arm.lo `test -f 'orcrules-arm.c' || echo '$(srcdir)/'`orcrules-arm.c + + liborc_@ORC_MAJORMINOR@_la-orcdebug.lo: orcdebug.c +-@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_@ORC_MAJORMINOR@_la-orcdebug.lo -MD -MP -MF $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcdebug.Tpo -c -o liborc_@ORC_MAJORMINOR@_la-orcdebug.lo `test -f 'orcdebug.c' || echo '$(srcdir)/'`orcdebug.c +-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcdebug.Tpo $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcdebug.Plo ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_@ORC_MAJORMINOR@_la-orcdebug.lo -MD -MP -MF $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcdebug.Tpo -c -o liborc_@ORC_MAJORMINOR@_la-orcdebug.lo `test -f 'orcdebug.c' || echo '$(srcdir)/'`orcdebug.c ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcdebug.Tpo $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcdebug.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='orcdebug.c' object='liborc_@ORC_MAJORMINOR@_la-orcdebug.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_@ORC_MAJORMINOR@_la-orcdebug.lo `test -f 'orcdebug.c' || echo '$(srcdir)/'`orcdebug.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_@ORC_MAJORMINOR@_la-orcdebug.lo `test -f 'orcdebug.c' || echo '$(srcdir)/'`orcdebug.c + + liborc_@ORC_MAJORMINOR@_la-orcpowerpc.lo: orcpowerpc.c +-@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_@ORC_MAJORMINOR@_la-orcpowerpc.lo -MD -MP -MF $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcpowerpc.Tpo -c -o liborc_@ORC_MAJORMINOR@_la-orcpowerpc.lo `test -f 'orcpowerpc.c' || echo '$(srcdir)/'`orcpowerpc.c +-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcpowerpc.Tpo $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcpowerpc.Plo ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_@ORC_MAJORMINOR@_la-orcpowerpc.lo -MD -MP -MF $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcpowerpc.Tpo -c -o liborc_@ORC_MAJORMINOR@_la-orcpowerpc.lo `test -f 'orcpowerpc.c' || echo '$(srcdir)/'`orcpowerpc.c ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcpowerpc.Tpo $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcpowerpc.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='orcpowerpc.c' object='liborc_@ORC_MAJORMINOR@_la-orcpowerpc.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_@ORC_MAJORMINOR@_la-orcpowerpc.lo `test -f 'orcpowerpc.c' || echo '$(srcdir)/'`orcpowerpc.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_@ORC_MAJORMINOR@_la-orcpowerpc.lo `test -f 'orcpowerpc.c' || echo '$(srcdir)/'`orcpowerpc.c + + liborc_@ORC_MAJORMINOR@_la-orcsse.lo: orcsse.c +-@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_@ORC_MAJORMINOR@_la-orcsse.lo -MD -MP -MF $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcsse.Tpo -c -o liborc_@ORC_MAJORMINOR@_la-orcsse.lo `test -f 'orcsse.c' || echo '$(srcdir)/'`orcsse.c +-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcsse.Tpo $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcsse.Plo ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_@ORC_MAJORMINOR@_la-orcsse.lo -MD -MP -MF $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcsse.Tpo -c -o liborc_@ORC_MAJORMINOR@_la-orcsse.lo `test -f 'orcsse.c' || echo '$(srcdir)/'`orcsse.c ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcsse.Tpo $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcsse.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='orcsse.c' object='liborc_@ORC_MAJORMINOR@_la-orcsse.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_@ORC_MAJORMINOR@_la-orcsse.lo `test -f 'orcsse.c' || echo '$(srcdir)/'`orcsse.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_@ORC_MAJORMINOR@_la-orcsse.lo `test -f 'orcsse.c' || echo '$(srcdir)/'`orcsse.c + + liborc_@ORC_MAJORMINOR@_la-orcmmx.lo: orcmmx.c +-@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_@ORC_MAJORMINOR@_la-orcmmx.lo -MD -MP -MF $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcmmx.Tpo -c -o liborc_@ORC_MAJORMINOR@_la-orcmmx.lo `test -f 'orcmmx.c' || echo '$(srcdir)/'`orcmmx.c +-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcmmx.Tpo $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcmmx.Plo ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_@ORC_MAJORMINOR@_la-orcmmx.lo -MD -MP -MF $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcmmx.Tpo -c -o liborc_@ORC_MAJORMINOR@_la-orcmmx.lo `test -f 'orcmmx.c' || echo '$(srcdir)/'`orcmmx.c ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcmmx.Tpo $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcmmx.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='orcmmx.c' object='liborc_@ORC_MAJORMINOR@_la-orcmmx.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_@ORC_MAJORMINOR@_la-orcmmx.lo `test -f 'orcmmx.c' || echo '$(srcdir)/'`orcmmx.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_@ORC_MAJORMINOR@_la-orcmmx.lo `test -f 'orcmmx.c' || echo '$(srcdir)/'`orcmmx.c + + liborc_@ORC_MAJORMINOR@_la-orcx86.lo: orcx86.c +-@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_@ORC_MAJORMINOR@_la-orcx86.lo -MD -MP -MF $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcx86.Tpo -c -o liborc_@ORC_MAJORMINOR@_la-orcx86.lo `test -f 'orcx86.c' || echo '$(srcdir)/'`orcx86.c +-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcx86.Tpo $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcx86.Plo ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_@ORC_MAJORMINOR@_la-orcx86.lo -MD -MP -MF $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcx86.Tpo -c -o liborc_@ORC_MAJORMINOR@_la-orcx86.lo `test -f 'orcx86.c' || echo '$(srcdir)/'`orcx86.c ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcx86.Tpo $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcx86.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='orcx86.c' object='liborc_@ORC_MAJORMINOR@_la-orcx86.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_@ORC_MAJORMINOR@_la-orcx86.lo `test -f 'orcx86.c' || echo '$(srcdir)/'`orcx86.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_@ORC_MAJORMINOR@_la-orcx86.lo `test -f 'orcx86.c' || echo '$(srcdir)/'`orcx86.c + + liborc_@ORC_MAJORMINOR@_la-orcarm.lo: orcarm.c +-@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_@ORC_MAJORMINOR@_la-orcarm.lo -MD -MP -MF $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcarm.Tpo -c -o liborc_@ORC_MAJORMINOR@_la-orcarm.lo `test -f 'orcarm.c' || echo '$(srcdir)/'`orcarm.c +-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcarm.Tpo $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcarm.Plo ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_@ORC_MAJORMINOR@_la-orcarm.lo -MD -MP -MF $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcarm.Tpo -c -o liborc_@ORC_MAJORMINOR@_la-orcarm.lo `test -f 'orcarm.c' || echo '$(srcdir)/'`orcarm.c ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcarm.Tpo $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcarm.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='orcarm.c' object='liborc_@ORC_MAJORMINOR@_la-orcarm.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_@ORC_MAJORMINOR@_la-orcarm.lo `test -f 'orcarm.c' || echo '$(srcdir)/'`orcarm.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_@ORC_MAJORMINOR@_la-orcarm.lo `test -f 'orcarm.c' || echo '$(srcdir)/'`orcarm.c + + liborc_@ORC_MAJORMINOR@_la-orccpu-x86.lo: orccpu-x86.c +-@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_@ORC_MAJORMINOR@_la-orccpu-x86.lo -MD -MP -MF $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orccpu-x86.Tpo -c -o liborc_@ORC_MAJORMINOR@_la-orccpu-x86.lo `test -f 'orccpu-x86.c' || echo '$(srcdir)/'`orccpu-x86.c +-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orccpu-x86.Tpo $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orccpu-x86.Plo ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_@ORC_MAJORMINOR@_la-orccpu-x86.lo -MD -MP -MF $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orccpu-x86.Tpo -c -o liborc_@ORC_MAJORMINOR@_la-orccpu-x86.lo `test -f 'orccpu-x86.c' || echo '$(srcdir)/'`orccpu-x86.c ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orccpu-x86.Tpo $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orccpu-x86.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='orccpu-x86.c' object='liborc_@ORC_MAJORMINOR@_la-orccpu-x86.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_@ORC_MAJORMINOR@_la-orccpu-x86.lo `test -f 'orccpu-x86.c' || echo '$(srcdir)/'`orccpu-x86.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_@ORC_MAJORMINOR@_la-orccpu-x86.lo `test -f 'orccpu-x86.c' || echo '$(srcdir)/'`orccpu-x86.c + + liborc_@ORC_MAJORMINOR@_la-orccpu-powerpc.lo: orccpu-powerpc.c +-@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_@ORC_MAJORMINOR@_la-orccpu-powerpc.lo -MD -MP -MF $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orccpu-powerpc.Tpo -c -o liborc_@ORC_MAJORMINOR@_la-orccpu-powerpc.lo `test -f 'orccpu-powerpc.c' || echo '$(srcdir)/'`orccpu-powerpc.c +-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orccpu-powerpc.Tpo $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orccpu-powerpc.Plo ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_@ORC_MAJORMINOR@_la-orccpu-powerpc.lo -MD -MP -MF $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orccpu-powerpc.Tpo -c -o liborc_@ORC_MAJORMINOR@_la-orccpu-powerpc.lo `test -f 'orccpu-powerpc.c' || echo '$(srcdir)/'`orccpu-powerpc.c ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orccpu-powerpc.Tpo $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orccpu-powerpc.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='orccpu-powerpc.c' object='liborc_@ORC_MAJORMINOR@_la-orccpu-powerpc.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_@ORC_MAJORMINOR@_la-orccpu-powerpc.lo `test -f 'orccpu-powerpc.c' || echo '$(srcdir)/'`orccpu-powerpc.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_@ORC_MAJORMINOR@_la-orccpu-powerpc.lo `test -f 'orccpu-powerpc.c' || echo '$(srcdir)/'`orccpu-powerpc.c + + liborc_@ORC_MAJORMINOR@_la-orccpu-arm.lo: orccpu-arm.c +-@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_@ORC_MAJORMINOR@_la-orccpu-arm.lo -MD -MP -MF $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orccpu-arm.Tpo -c -o liborc_@ORC_MAJORMINOR@_la-orccpu-arm.lo `test -f 'orccpu-arm.c' || echo '$(srcdir)/'`orccpu-arm.c +-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orccpu-arm.Tpo $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orccpu-arm.Plo ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_@ORC_MAJORMINOR@_la-orccpu-arm.lo -MD -MP -MF $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orccpu-arm.Tpo -c -o liborc_@ORC_MAJORMINOR@_la-orccpu-arm.lo `test -f 'orccpu-arm.c' || echo '$(srcdir)/'`orccpu-arm.c ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orccpu-arm.Tpo $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orccpu-arm.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='orccpu-arm.c' object='liborc_@ORC_MAJORMINOR@_la-orccpu-arm.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_@ORC_MAJORMINOR@_la-orccpu-arm.lo `test -f 'orccpu-arm.c' || echo '$(srcdir)/'`orccpu-arm.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_@ORC_MAJORMINOR@_la-orccpu-arm.lo `test -f 'orccpu-arm.c' || echo '$(srcdir)/'`orccpu-arm.c + + mostlyclean-libtool: + -rm -f *.lo +@@ -629,37 +660,43 @@ + install-nodist_pkgincludeHEADERS: $(nodist_pkginclude_HEADERS) + @$(NORMAL_INSTALL) + test -z "$(pkgincludedir)" || $(MKDIR_P) "$(DESTDIR)$(pkgincludedir)" +- @list='$(nodist_pkginclude_HEADERS)'; for p in $$list; do \ ++ @list='$(nodist_pkginclude_HEADERS)'; test -n "$(pkgincludedir)" || list=; \ ++ for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(nodist_pkgincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgincludedir)/$$f'"; \ +- $(nodist_pkgincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgincludedir)/$$f"; \ ++ echo "$$d$$p"; \ ++ done | $(am__base_list) | \ ++ while read files; do \ ++ echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(pkgincludedir)'"; \ ++ $(INSTALL_HEADER) $$files "$(DESTDIR)$(pkgincludedir)" || exit $$?; \ + done + + uninstall-nodist_pkgincludeHEADERS: + @$(NORMAL_UNINSTALL) +- @list='$(nodist_pkginclude_HEADERS)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(pkgincludedir)/$$f'"; \ +- rm -f "$(DESTDIR)$(pkgincludedir)/$$f"; \ +- done ++ @list='$(nodist_pkginclude_HEADERS)'; test -n "$(pkgincludedir)" || list=; \ ++ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ ++ test -n "$$files" || exit 0; \ ++ echo " ( cd '$(DESTDIR)$(pkgincludedir)' && rm -f" $$files ")"; \ ++ cd "$(DESTDIR)$(pkgincludedir)" && rm -f $$files + install-pkgincludeHEADERS: $(pkginclude_HEADERS) + @$(NORMAL_INSTALL) + test -z "$(pkgincludedir)" || $(MKDIR_P) "$(DESTDIR)$(pkgincludedir)" +- @list='$(pkginclude_HEADERS)'; for p in $$list; do \ ++ @list='$(pkginclude_HEADERS)'; test -n "$(pkgincludedir)" || list=; \ ++ for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(pkgincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgincludedir)/$$f'"; \ +- $(pkgincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgincludedir)/$$f"; \ ++ echo "$$d$$p"; \ ++ done | $(am__base_list) | \ ++ while read files; do \ ++ echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(pkgincludedir)'"; \ ++ $(INSTALL_HEADER) $$files "$(DESTDIR)$(pkgincludedir)" || exit $$?; \ + done + + uninstall-pkgincludeHEADERS: + @$(NORMAL_UNINSTALL) +- @list='$(pkginclude_HEADERS)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(pkgincludedir)/$$f'"; \ +- rm -f "$(DESTDIR)$(pkgincludedir)/$$f"; \ +- done ++ @list='$(pkginclude_HEADERS)'; test -n "$(pkgincludedir)" || list=; \ ++ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ ++ test -n "$$files" || exit 0; \ ++ echo " ( cd '$(DESTDIR)$(pkgincludedir)' && rm -f" $$files ")"; \ ++ cd "$(DESTDIR)$(pkgincludedir)" && rm -f $$files + + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ +@@ -673,7 +710,7 @@ + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +- tags=; \ ++ set x; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ +@@ -681,29 +718,34 @@ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ +- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ ++ shift; \ ++ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique; \ ++ if test $$# -gt 0; then \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ "$$@" $$unique; \ ++ else \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$unique; \ ++ fi; \ + fi + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +- tags=; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ +- test -z "$(CTAGS_ARGS)$$tags$$unique" \ ++ test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ +- $$tags $$unique ++ $$unique + + GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ +- && cd $(top_srcdir) \ +- && gtags -i $(GTAGS_ARGS) $$here ++ && $(am__cd) $(top_srcdir) \ ++ && gtags -i $(GTAGS_ARGS) "$$here" + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +@@ -724,13 +766,17 @@ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ ++ if test -d "$(distdir)/$$file"; then \ ++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ ++ fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ ++ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ ++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ +- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ ++ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ +- test -f $(distdir)/$$file \ +- || cp -p $$d/$$file $(distdir)/$$file \ ++ test -f "$(distdir)/$$file" \ ++ || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +@@ -761,6 +807,7 @@ + + distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) + + maintainer-clean-generic: +@@ -783,6 +830,8 @@ + + html: html-am + ++html-am: ++ + info: info-am + + info-am: +@@ -792,18 +841,28 @@ + + install-dvi: install-dvi-am + ++install-dvi-am: ++ + install-exec-am: install-libLTLIBRARIES + + install-html: install-html-am + ++install-html-am: ++ + install-info: install-info-am + ++install-info-am: ++ + install-man: + + install-pdf: install-pdf-am + ++install-pdf-am: ++ + install-ps: install-ps-am + ++install-ps-am: ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -850,6 +909,7 @@ + orcfunctions: + $(top_builddir)/tools/orcc$(EXEEXT) --implementation -o orcfunctions.c orcfunctions.orc + $(top_builddir)/tools/orcc$(EXEEXT) --header -o orcfunctions.h orcfunctions.orc ++ + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: +diff -x'*config.sub' -x'*config.guess' -Naur orc-0.4.3.old/orc-float/Makefile.in orc-0.4.3/orc-float/Makefile.in +--- orc-0.4.3.old/orc-float/Makefile.in 2009-12-14 02:20:11.000000000 +0100 ++++ orc-0.4.3/orc-float/Makefile.in 2010-02-02 12:18:14.587377512 +0100 +@@ -1,8 +1,9 @@ +-# Makefile.in generated by automake 1.10.2 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, ++# Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -18,6 +19,7 @@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ ++pkglibexecdir = $(libexecdir)/@PACKAGE@ + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c +@@ -50,14 +52,29 @@ + mkinstalldirs = $(install_sh) -d + CONFIG_HEADER = $(top_builddir)/config.h + CONFIG_CLEAN_FILES = ++CONFIG_CLEAN_VPATH_FILES = + am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; + am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; ++am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; ++am__install_max = 40 ++am__nobase_strip_setup = \ ++ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` ++am__nobase_strip = \ ++ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" ++am__nobase_list = $(am__nobase_strip_setup); \ ++ for p in $$list; do echo "$$p $$p"; done | \ ++ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ ++ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ ++ if (++n[$$2] == $(am__install_max)) \ ++ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ ++ END { for (dir in files) print dir, files[dir] }' ++am__base_list = \ ++ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ ++ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' + am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgincludedir)" +-libLTLIBRARIES_INSTALL = $(INSTALL) + LTLIBRARIES = $(lib_LTLIBRARIES) + am__DEPENDENCIES_1 = + liborc_float_@ORC_MAJORMINOR@_la_DEPENDENCIES = $(am__DEPENDENCIES_1) +@@ -73,6 +90,7 @@ + DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles ++am__mv = mv -f + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +@@ -84,7 +102,6 @@ + $(LDFLAGS) -o $@ + SOURCES = $(liborc_float_@ORC_MAJORMINOR@_la_SOURCES) + DIST_SOURCES = $(liborc_float_@ORC_MAJORMINOR@_la_SOURCES) +-pkgincludeHEADERS_INSTALL = $(INSTALL_HEADER) + HEADERS = $(pkginclude_HEADERS) + ETAGS = etags + CTAGS = ctags +@@ -156,6 +173,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ +@@ -244,9 +262,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu orc-float/Makefile'; \ +- cd $(top_srcdir) && \ +- $(AUTOMAKE) --gnu orc-float/Makefile ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu orc-float/Makefile'; \ ++ $(am__cd) $(top_srcdir) && \ ++ $(AUTOMAKE) --gnu orc-float/Makefile + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ +@@ -264,23 +282,28 @@ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(am__aclocal_m4_deps): + install-libLTLIBRARIES: $(lib_LTLIBRARIES) + @$(NORMAL_INSTALL) + test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" +- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ ++ @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ ++ list2=; for p in $$list; do \ + if test -f $$p; then \ +- f=$(am__strip_dir) \ +- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \ +- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \ ++ list2="$$list2 $$p"; \ + else :; fi; \ +- done ++ done; \ ++ test -z "$$list2" || { \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \ ++ } + + uninstall-libLTLIBRARIES: + @$(NORMAL_UNINSTALL) +- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ +- p=$(am__strip_dir) \ +- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \ +- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \ ++ @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ ++ for p in $$list; do \ ++ $(am__strip_dir) \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \ + done + + clean-libLTLIBRARIES: +@@ -305,38 +328,38 @@ + + .c.o: + @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c $< + + .c.obj: + @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + + .c.lo: + @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< + + liborc_float_@ORC_MAJORMINOR@_la-orcfloat.lo: orcfloat.c +-@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_float_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_float_@ORC_MAJORMINOR@_la-orcfloat.lo -MD -MP -MF $(DEPDIR)/liborc_float_@ORC_MAJORMINOR@_la-orcfloat.Tpo -c -o liborc_float_@ORC_MAJORMINOR@_la-orcfloat.lo `test -f 'orcfloat.c' || echo '$(srcdir)/'`orcfloat.c +-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/liborc_float_@ORC_MAJORMINOR@_la-orcfloat.Tpo $(DEPDIR)/liborc_float_@ORC_MAJORMINOR@_la-orcfloat.Plo ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_float_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_float_@ORC_MAJORMINOR@_la-orcfloat.lo -MD -MP -MF $(DEPDIR)/liborc_float_@ORC_MAJORMINOR@_la-orcfloat.Tpo -c -o liborc_float_@ORC_MAJORMINOR@_la-orcfloat.lo `test -f 'orcfloat.c' || echo '$(srcdir)/'`orcfloat.c ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liborc_float_@ORC_MAJORMINOR@_la-orcfloat.Tpo $(DEPDIR)/liborc_float_@ORC_MAJORMINOR@_la-orcfloat.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='orcfloat.c' object='liborc_float_@ORC_MAJORMINOR@_la-orcfloat.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_float_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_float_@ORC_MAJORMINOR@_la-orcfloat.lo `test -f 'orcfloat.c' || echo '$(srcdir)/'`orcfloat.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_float_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_float_@ORC_MAJORMINOR@_la-orcfloat.lo `test -f 'orcfloat.c' || echo '$(srcdir)/'`orcfloat.c + + liborc_float_@ORC_MAJORMINOR@_la-orcfloat-sse.lo: orcfloat-sse.c +-@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_float_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_float_@ORC_MAJORMINOR@_la-orcfloat-sse.lo -MD -MP -MF $(DEPDIR)/liborc_float_@ORC_MAJORMINOR@_la-orcfloat-sse.Tpo -c -o liborc_float_@ORC_MAJORMINOR@_la-orcfloat-sse.lo `test -f 'orcfloat-sse.c' || echo '$(srcdir)/'`orcfloat-sse.c +-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/liborc_float_@ORC_MAJORMINOR@_la-orcfloat-sse.Tpo $(DEPDIR)/liborc_float_@ORC_MAJORMINOR@_la-orcfloat-sse.Plo ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_float_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_float_@ORC_MAJORMINOR@_la-orcfloat-sse.lo -MD -MP -MF $(DEPDIR)/liborc_float_@ORC_MAJORMINOR@_la-orcfloat-sse.Tpo -c -o liborc_float_@ORC_MAJORMINOR@_la-orcfloat-sse.lo `test -f 'orcfloat-sse.c' || echo '$(srcdir)/'`orcfloat-sse.c ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liborc_float_@ORC_MAJORMINOR@_la-orcfloat-sse.Tpo $(DEPDIR)/liborc_float_@ORC_MAJORMINOR@_la-orcfloat-sse.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='orcfloat-sse.c' object='liborc_float_@ORC_MAJORMINOR@_la-orcfloat-sse.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_float_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_float_@ORC_MAJORMINOR@_la-orcfloat-sse.lo `test -f 'orcfloat-sse.c' || echo '$(srcdir)/'`orcfloat-sse.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_float_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_float_@ORC_MAJORMINOR@_la-orcfloat-sse.lo `test -f 'orcfloat-sse.c' || echo '$(srcdir)/'`orcfloat-sse.c + + mostlyclean-libtool: + -rm -f *.lo +@@ -346,20 +369,23 @@ + install-pkgincludeHEADERS: $(pkginclude_HEADERS) + @$(NORMAL_INSTALL) + test -z "$(pkgincludedir)" || $(MKDIR_P) "$(DESTDIR)$(pkgincludedir)" +- @list='$(pkginclude_HEADERS)'; for p in $$list; do \ ++ @list='$(pkginclude_HEADERS)'; test -n "$(pkgincludedir)" || list=; \ ++ for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(pkgincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgincludedir)/$$f'"; \ +- $(pkgincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgincludedir)/$$f"; \ ++ echo "$$d$$p"; \ ++ done | $(am__base_list) | \ ++ while read files; do \ ++ echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(pkgincludedir)'"; \ ++ $(INSTALL_HEADER) $$files "$(DESTDIR)$(pkgincludedir)" || exit $$?; \ + done + + uninstall-pkgincludeHEADERS: + @$(NORMAL_UNINSTALL) +- @list='$(pkginclude_HEADERS)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(pkgincludedir)/$$f'"; \ +- rm -f "$(DESTDIR)$(pkgincludedir)/$$f"; \ +- done ++ @list='$(pkginclude_HEADERS)'; test -n "$(pkgincludedir)" || list=; \ ++ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ ++ test -n "$$files" || exit 0; \ ++ echo " ( cd '$(DESTDIR)$(pkgincludedir)' && rm -f" $$files ")"; \ ++ cd "$(DESTDIR)$(pkgincludedir)" && rm -f $$files + + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ +@@ -373,7 +399,7 @@ + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +- tags=; \ ++ set x; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ +@@ -381,29 +407,34 @@ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ +- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ ++ shift; \ ++ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique; \ ++ if test $$# -gt 0; then \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ "$$@" $$unique; \ ++ else \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$unique; \ ++ fi; \ + fi + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +- tags=; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ +- test -z "$(CTAGS_ARGS)$$tags$$unique" \ ++ test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ +- $$tags $$unique ++ $$unique + + GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ +- && cd $(top_srcdir) \ +- && gtags -i $(GTAGS_ARGS) $$here ++ && $(am__cd) $(top_srcdir) \ ++ && gtags -i $(GTAGS_ARGS) "$$here" + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +@@ -424,13 +455,17 @@ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ ++ if test -d "$(distdir)/$$file"; then \ ++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ ++ fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ ++ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ ++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ +- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ ++ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ +- test -f $(distdir)/$$file \ +- || cp -p $$d/$$file $(distdir)/$$file \ ++ test -f "$(distdir)/$$file" \ ++ || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +@@ -461,6 +496,7 @@ + + distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -482,6 +518,8 @@ + + html: html-am + ++html-am: ++ + info: info-am + + info-am: +@@ -490,18 +528,28 @@ + + install-dvi: install-dvi-am + ++install-dvi-am: ++ + install-exec-am: install-libLTLIBRARIES + + install-html: install-html-am + ++install-html-am: ++ + install-info: install-info-am + ++install-info-am: ++ + install-man: + + install-pdf: install-pdf-am + ++install-pdf-am: ++ + install-ps: install-ps-am + ++install-ps-am: ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -541,6 +589,7 @@ + pdf pdf-am ps ps-am tags uninstall uninstall-am \ + uninstall-libLTLIBRARIES uninstall-pkgincludeHEADERS + ++ + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: +diff -x'*config.sub' -x'*config.guess' -Naur orc-0.4.3.old/orc-pixel/Makefile.in orc-0.4.3/orc-pixel/Makefile.in +--- orc-0.4.3.old/orc-pixel/Makefile.in 2009-12-14 02:20:11.000000000 +0100 ++++ orc-0.4.3/orc-pixel/Makefile.in 2010-02-02 12:18:14.651377550 +0100 +@@ -1,8 +1,9 @@ +-# Makefile.in generated by automake 1.10.2 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, ++# Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -18,6 +19,7 @@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ ++pkglibexecdir = $(libexecdir)/@PACKAGE@ + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c +@@ -50,14 +52,29 @@ + mkinstalldirs = $(install_sh) -d + CONFIG_HEADER = $(top_builddir)/config.h + CONFIG_CLEAN_FILES = ++CONFIG_CLEAN_VPATH_FILES = + am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; + am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; ++am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; ++am__install_max = 40 ++am__nobase_strip_setup = \ ++ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` ++am__nobase_strip = \ ++ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" ++am__nobase_list = $(am__nobase_strip_setup); \ ++ for p in $$list; do echo "$$p $$p"; done | \ ++ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ ++ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ ++ if (++n[$$2] == $(am__install_max)) \ ++ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ ++ END { for (dir in files) print dir, files[dir] }' ++am__base_list = \ ++ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ ++ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' + am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgincludedir)" +-libLTLIBRARIES_INSTALL = $(INSTALL) + LTLIBRARIES = $(lib_LTLIBRARIES) + am__DEPENDENCIES_1 = + liborc_pixel_@ORC_MAJORMINOR@_la_DEPENDENCIES = $(am__DEPENDENCIES_1) +@@ -73,6 +90,7 @@ + DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles ++am__mv = mv -f + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +@@ -84,7 +102,6 @@ + $(LDFLAGS) -o $@ + SOURCES = $(liborc_pixel_@ORC_MAJORMINOR@_la_SOURCES) + DIST_SOURCES = $(liborc_pixel_@ORC_MAJORMINOR@_la_SOURCES) +-pkgincludeHEADERS_INSTALL = $(INSTALL_HEADER) + HEADERS = $(pkginclude_HEADERS) + ETAGS = etags + CTAGS = ctags +@@ -156,6 +173,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ +@@ -244,9 +262,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu orc-pixel/Makefile'; \ +- cd $(top_srcdir) && \ +- $(AUTOMAKE) --gnu orc-pixel/Makefile ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu orc-pixel/Makefile'; \ ++ $(am__cd) $(top_srcdir) && \ ++ $(AUTOMAKE) --gnu orc-pixel/Makefile + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ +@@ -264,23 +282,28 @@ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(am__aclocal_m4_deps): + install-libLTLIBRARIES: $(lib_LTLIBRARIES) + @$(NORMAL_INSTALL) + test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" +- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ ++ @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ ++ list2=; for p in $$list; do \ + if test -f $$p; then \ +- f=$(am__strip_dir) \ +- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \ +- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \ ++ list2="$$list2 $$p"; \ + else :; fi; \ +- done ++ done; \ ++ test -z "$$list2" || { \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \ ++ } + + uninstall-libLTLIBRARIES: + @$(NORMAL_UNINSTALL) +- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ +- p=$(am__strip_dir) \ +- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \ +- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \ ++ @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ ++ for p in $$list; do \ ++ $(am__strip_dir) \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \ + done + + clean-libLTLIBRARIES: +@@ -305,38 +328,38 @@ + + .c.o: + @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c $< + + .c.obj: + @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + + .c.lo: + @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< + + liborc_pixel_@ORC_MAJORMINOR@_la-orcpixel.lo: orcpixel.c +-@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_pixel_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_pixel_@ORC_MAJORMINOR@_la-orcpixel.lo -MD -MP -MF $(DEPDIR)/liborc_pixel_@ORC_MAJORMINOR@_la-orcpixel.Tpo -c -o liborc_pixel_@ORC_MAJORMINOR@_la-orcpixel.lo `test -f 'orcpixel.c' || echo '$(srcdir)/'`orcpixel.c +-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/liborc_pixel_@ORC_MAJORMINOR@_la-orcpixel.Tpo $(DEPDIR)/liborc_pixel_@ORC_MAJORMINOR@_la-orcpixel.Plo ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_pixel_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_pixel_@ORC_MAJORMINOR@_la-orcpixel.lo -MD -MP -MF $(DEPDIR)/liborc_pixel_@ORC_MAJORMINOR@_la-orcpixel.Tpo -c -o liborc_pixel_@ORC_MAJORMINOR@_la-orcpixel.lo `test -f 'orcpixel.c' || echo '$(srcdir)/'`orcpixel.c ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liborc_pixel_@ORC_MAJORMINOR@_la-orcpixel.Tpo $(DEPDIR)/liborc_pixel_@ORC_MAJORMINOR@_la-orcpixel.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='orcpixel.c' object='liborc_pixel_@ORC_MAJORMINOR@_la-orcpixel.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_pixel_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_pixel_@ORC_MAJORMINOR@_la-orcpixel.lo `test -f 'orcpixel.c' || echo '$(srcdir)/'`orcpixel.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_pixel_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_pixel_@ORC_MAJORMINOR@_la-orcpixel.lo `test -f 'orcpixel.c' || echo '$(srcdir)/'`orcpixel.c + + liborc_pixel_@ORC_MAJORMINOR@_la-orcpixel-sse.lo: orcpixel-sse.c +-@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_pixel_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_pixel_@ORC_MAJORMINOR@_la-orcpixel-sse.lo -MD -MP -MF $(DEPDIR)/liborc_pixel_@ORC_MAJORMINOR@_la-orcpixel-sse.Tpo -c -o liborc_pixel_@ORC_MAJORMINOR@_la-orcpixel-sse.lo `test -f 'orcpixel-sse.c' || echo '$(srcdir)/'`orcpixel-sse.c +-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/liborc_pixel_@ORC_MAJORMINOR@_la-orcpixel-sse.Tpo $(DEPDIR)/liborc_pixel_@ORC_MAJORMINOR@_la-orcpixel-sse.Plo ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_pixel_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_pixel_@ORC_MAJORMINOR@_la-orcpixel-sse.lo -MD -MP -MF $(DEPDIR)/liborc_pixel_@ORC_MAJORMINOR@_la-orcpixel-sse.Tpo -c -o liborc_pixel_@ORC_MAJORMINOR@_la-orcpixel-sse.lo `test -f 'orcpixel-sse.c' || echo '$(srcdir)/'`orcpixel-sse.c ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liborc_pixel_@ORC_MAJORMINOR@_la-orcpixel-sse.Tpo $(DEPDIR)/liborc_pixel_@ORC_MAJORMINOR@_la-orcpixel-sse.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='orcpixel-sse.c' object='liborc_pixel_@ORC_MAJORMINOR@_la-orcpixel-sse.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_pixel_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_pixel_@ORC_MAJORMINOR@_la-orcpixel-sse.lo `test -f 'orcpixel-sse.c' || echo '$(srcdir)/'`orcpixel-sse.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_pixel_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_pixel_@ORC_MAJORMINOR@_la-orcpixel-sse.lo `test -f 'orcpixel-sse.c' || echo '$(srcdir)/'`orcpixel-sse.c + + mostlyclean-libtool: + -rm -f *.lo +@@ -346,20 +369,23 @@ + install-pkgincludeHEADERS: $(pkginclude_HEADERS) + @$(NORMAL_INSTALL) + test -z "$(pkgincludedir)" || $(MKDIR_P) "$(DESTDIR)$(pkgincludedir)" +- @list='$(pkginclude_HEADERS)'; for p in $$list; do \ ++ @list='$(pkginclude_HEADERS)'; test -n "$(pkgincludedir)" || list=; \ ++ for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(pkgincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgincludedir)/$$f'"; \ +- $(pkgincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgincludedir)/$$f"; \ ++ echo "$$d$$p"; \ ++ done | $(am__base_list) | \ ++ while read files; do \ ++ echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(pkgincludedir)'"; \ ++ $(INSTALL_HEADER) $$files "$(DESTDIR)$(pkgincludedir)" || exit $$?; \ + done + + uninstall-pkgincludeHEADERS: + @$(NORMAL_UNINSTALL) +- @list='$(pkginclude_HEADERS)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(pkgincludedir)/$$f'"; \ +- rm -f "$(DESTDIR)$(pkgincludedir)/$$f"; \ +- done ++ @list='$(pkginclude_HEADERS)'; test -n "$(pkgincludedir)" || list=; \ ++ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ ++ test -n "$$files" || exit 0; \ ++ echo " ( cd '$(DESTDIR)$(pkgincludedir)' && rm -f" $$files ")"; \ ++ cd "$(DESTDIR)$(pkgincludedir)" && rm -f $$files + + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ +@@ -373,7 +399,7 @@ + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +- tags=; \ ++ set x; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ +@@ -381,29 +407,34 @@ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ +- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ ++ shift; \ ++ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique; \ ++ if test $$# -gt 0; then \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ "$$@" $$unique; \ ++ else \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$unique; \ ++ fi; \ + fi + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +- tags=; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ +- test -z "$(CTAGS_ARGS)$$tags$$unique" \ ++ test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ +- $$tags $$unique ++ $$unique + + GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ +- && cd $(top_srcdir) \ +- && gtags -i $(GTAGS_ARGS) $$here ++ && $(am__cd) $(top_srcdir) \ ++ && gtags -i $(GTAGS_ARGS) "$$here" + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +@@ -424,13 +455,17 @@ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ ++ if test -d "$(distdir)/$$file"; then \ ++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ ++ fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ ++ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ ++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ +- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ ++ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ +- test -f $(distdir)/$$file \ +- || cp -p $$d/$$file $(distdir)/$$file \ ++ test -f "$(distdir)/$$file" \ ++ || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +@@ -461,6 +496,7 @@ + + distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -482,6 +518,8 @@ + + html: html-am + ++html-am: ++ + info: info-am + + info-am: +@@ -490,18 +528,28 @@ + + install-dvi: install-dvi-am + ++install-dvi-am: ++ + install-exec-am: install-libLTLIBRARIES + + install-html: install-html-am + ++install-html-am: ++ + install-info: install-info-am + ++install-info-am: ++ + install-man: + + install-pdf: install-pdf-am + ++install-pdf-am: ++ + install-ps: install-ps-am + ++install-ps-am: ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -541,6 +589,7 @@ + pdf pdf-am ps ps-am tags uninstall uninstall-am \ + uninstall-libLTLIBRARIES uninstall-pkgincludeHEADERS + ++ + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: +diff -x'*config.sub' -x'*config.guess' -Naur orc-0.4.3.old/orc-test/Makefile.in orc-0.4.3/orc-test/Makefile.in +--- orc-0.4.3.old/orc-test/Makefile.in 2009-12-14 02:20:11.000000000 +0100 ++++ orc-0.4.3/orc-test/Makefile.in 2010-02-02 12:18:14.723377766 +0100 +@@ -1,8 +1,9 @@ +-# Makefile.in generated by automake 1.10.2 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, ++# Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -18,6 +19,7 @@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ ++pkglibexecdir = $(libexecdir)/@PACKAGE@ + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c +@@ -50,14 +52,29 @@ + mkinstalldirs = $(install_sh) -d + CONFIG_HEADER = $(top_builddir)/config.h + CONFIG_CLEAN_FILES = ++CONFIG_CLEAN_VPATH_FILES = + am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; + am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; ++am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; ++am__install_max = 40 ++am__nobase_strip_setup = \ ++ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` ++am__nobase_strip = \ ++ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" ++am__nobase_list = $(am__nobase_strip_setup); \ ++ for p in $$list; do echo "$$p $$p"; done | \ ++ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ ++ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ ++ if (++n[$$2] == $(am__install_max)) \ ++ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ ++ END { for (dir in files) print dir, files[dir] }' ++am__base_list = \ ++ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ ++ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' + am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgincludedir)" +-libLTLIBRARIES_INSTALL = $(INSTALL) + LTLIBRARIES = $(lib_LTLIBRARIES) + am__DEPENDENCIES_1 = + liborc_test_@ORC_MAJORMINOR@_la_DEPENDENCIES = $(am__DEPENDENCIES_1) +@@ -75,6 +92,7 @@ + DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles ++am__mv = mv -f + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +@@ -86,7 +104,6 @@ + $(LDFLAGS) -o $@ + SOURCES = $(liborc_test_@ORC_MAJORMINOR@_la_SOURCES) + DIST_SOURCES = $(liborc_test_@ORC_MAJORMINOR@_la_SOURCES) +-pkgincludeHEADERS_INSTALL = $(INSTALL_HEADER) + HEADERS = $(pkginclude_HEADERS) + ETAGS = etags + CTAGS = ctags +@@ -158,6 +175,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ +@@ -254,9 +272,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu orc-test/Makefile'; \ +- cd $(top_srcdir) && \ +- $(AUTOMAKE) --gnu orc-test/Makefile ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu orc-test/Makefile'; \ ++ $(am__cd) $(top_srcdir) && \ ++ $(AUTOMAKE) --gnu orc-test/Makefile + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ +@@ -274,23 +292,28 @@ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(am__aclocal_m4_deps): + install-libLTLIBRARIES: $(lib_LTLIBRARIES) + @$(NORMAL_INSTALL) + test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" +- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ ++ @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ ++ list2=; for p in $$list; do \ + if test -f $$p; then \ +- f=$(am__strip_dir) \ +- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \ +- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \ ++ list2="$$list2 $$p"; \ + else :; fi; \ +- done ++ done; \ ++ test -z "$$list2" || { \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \ ++ } + + uninstall-libLTLIBRARIES: + @$(NORMAL_UNINSTALL) +- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ +- p=$(am__strip_dir) \ +- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \ +- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \ ++ @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ ++ for p in $$list; do \ ++ $(am__strip_dir) \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \ + done + + clean-libLTLIBRARIES: +@@ -317,52 +340,52 @@ + + .c.o: + @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c $< + + .c.obj: + @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + + .c.lo: + @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< + + liborc_test_@ORC_MAJORMINOR@_la-orctest.lo: orctest.c +-@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_test_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_test_@ORC_MAJORMINOR@_la-orctest.lo -MD -MP -MF $(DEPDIR)/liborc_test_@ORC_MAJORMINOR@_la-orctest.Tpo -c -o liborc_test_@ORC_MAJORMINOR@_la-orctest.lo `test -f 'orctest.c' || echo '$(srcdir)/'`orctest.c +-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/liborc_test_@ORC_MAJORMINOR@_la-orctest.Tpo $(DEPDIR)/liborc_test_@ORC_MAJORMINOR@_la-orctest.Plo ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_test_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_test_@ORC_MAJORMINOR@_la-orctest.lo -MD -MP -MF $(DEPDIR)/liborc_test_@ORC_MAJORMINOR@_la-orctest.Tpo -c -o liborc_test_@ORC_MAJORMINOR@_la-orctest.lo `test -f 'orctest.c' || echo '$(srcdir)/'`orctest.c ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liborc_test_@ORC_MAJORMINOR@_la-orctest.Tpo $(DEPDIR)/liborc_test_@ORC_MAJORMINOR@_la-orctest.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='orctest.c' object='liborc_test_@ORC_MAJORMINOR@_la-orctest.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_test_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_test_@ORC_MAJORMINOR@_la-orctest.lo `test -f 'orctest.c' || echo '$(srcdir)/'`orctest.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_test_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_test_@ORC_MAJORMINOR@_la-orctest.lo `test -f 'orctest.c' || echo '$(srcdir)/'`orctest.c + + liborc_test_@ORC_MAJORMINOR@_la-orcarray.lo: orcarray.c +-@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_test_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_test_@ORC_MAJORMINOR@_la-orcarray.lo -MD -MP -MF $(DEPDIR)/liborc_test_@ORC_MAJORMINOR@_la-orcarray.Tpo -c -o liborc_test_@ORC_MAJORMINOR@_la-orcarray.lo `test -f 'orcarray.c' || echo '$(srcdir)/'`orcarray.c +-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/liborc_test_@ORC_MAJORMINOR@_la-orcarray.Tpo $(DEPDIR)/liborc_test_@ORC_MAJORMINOR@_la-orcarray.Plo ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_test_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_test_@ORC_MAJORMINOR@_la-orcarray.lo -MD -MP -MF $(DEPDIR)/liborc_test_@ORC_MAJORMINOR@_la-orcarray.Tpo -c -o liborc_test_@ORC_MAJORMINOR@_la-orcarray.lo `test -f 'orcarray.c' || echo '$(srcdir)/'`orcarray.c ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liborc_test_@ORC_MAJORMINOR@_la-orcarray.Tpo $(DEPDIR)/liborc_test_@ORC_MAJORMINOR@_la-orcarray.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='orcarray.c' object='liborc_test_@ORC_MAJORMINOR@_la-orcarray.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_test_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_test_@ORC_MAJORMINOR@_la-orcarray.lo `test -f 'orcarray.c' || echo '$(srcdir)/'`orcarray.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_test_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_test_@ORC_MAJORMINOR@_la-orcarray.lo `test -f 'orcarray.c' || echo '$(srcdir)/'`orcarray.c + + liborc_test_@ORC_MAJORMINOR@_la-orcrandom.lo: orcrandom.c +-@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_test_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_test_@ORC_MAJORMINOR@_la-orcrandom.lo -MD -MP -MF $(DEPDIR)/liborc_test_@ORC_MAJORMINOR@_la-orcrandom.Tpo -c -o liborc_test_@ORC_MAJORMINOR@_la-orcrandom.lo `test -f 'orcrandom.c' || echo '$(srcdir)/'`orcrandom.c +-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/liborc_test_@ORC_MAJORMINOR@_la-orcrandom.Tpo $(DEPDIR)/liborc_test_@ORC_MAJORMINOR@_la-orcrandom.Plo ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_test_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_test_@ORC_MAJORMINOR@_la-orcrandom.lo -MD -MP -MF $(DEPDIR)/liborc_test_@ORC_MAJORMINOR@_la-orcrandom.Tpo -c -o liborc_test_@ORC_MAJORMINOR@_la-orcrandom.lo `test -f 'orcrandom.c' || echo '$(srcdir)/'`orcrandom.c ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liborc_test_@ORC_MAJORMINOR@_la-orcrandom.Tpo $(DEPDIR)/liborc_test_@ORC_MAJORMINOR@_la-orcrandom.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='orcrandom.c' object='liborc_test_@ORC_MAJORMINOR@_la-orcrandom.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_test_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_test_@ORC_MAJORMINOR@_la-orcrandom.lo `test -f 'orcrandom.c' || echo '$(srcdir)/'`orcrandom.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_test_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_test_@ORC_MAJORMINOR@_la-orcrandom.lo `test -f 'orcrandom.c' || echo '$(srcdir)/'`orcrandom.c + + liborc_test_@ORC_MAJORMINOR@_la-orcprofile.lo: orcprofile.c +-@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_test_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_test_@ORC_MAJORMINOR@_la-orcprofile.lo -MD -MP -MF $(DEPDIR)/liborc_test_@ORC_MAJORMINOR@_la-orcprofile.Tpo -c -o liborc_test_@ORC_MAJORMINOR@_la-orcprofile.lo `test -f 'orcprofile.c' || echo '$(srcdir)/'`orcprofile.c +-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/liborc_test_@ORC_MAJORMINOR@_la-orcprofile.Tpo $(DEPDIR)/liborc_test_@ORC_MAJORMINOR@_la-orcprofile.Plo ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_test_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_test_@ORC_MAJORMINOR@_la-orcprofile.lo -MD -MP -MF $(DEPDIR)/liborc_test_@ORC_MAJORMINOR@_la-orcprofile.Tpo -c -o liborc_test_@ORC_MAJORMINOR@_la-orcprofile.lo `test -f 'orcprofile.c' || echo '$(srcdir)/'`orcprofile.c ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liborc_test_@ORC_MAJORMINOR@_la-orcprofile.Tpo $(DEPDIR)/liborc_test_@ORC_MAJORMINOR@_la-orcprofile.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='orcprofile.c' object='liborc_test_@ORC_MAJORMINOR@_la-orcprofile.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_test_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_test_@ORC_MAJORMINOR@_la-orcprofile.lo `test -f 'orcprofile.c' || echo '$(srcdir)/'`orcprofile.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_test_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_test_@ORC_MAJORMINOR@_la-orcprofile.lo `test -f 'orcprofile.c' || echo '$(srcdir)/'`orcprofile.c + + mostlyclean-libtool: + -rm -f *.lo +@@ -372,20 +395,23 @@ + install-pkgincludeHEADERS: $(pkginclude_HEADERS) + @$(NORMAL_INSTALL) + test -z "$(pkgincludedir)" || $(MKDIR_P) "$(DESTDIR)$(pkgincludedir)" +- @list='$(pkginclude_HEADERS)'; for p in $$list; do \ ++ @list='$(pkginclude_HEADERS)'; test -n "$(pkgincludedir)" || list=; \ ++ for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(pkgincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgincludedir)/$$f'"; \ +- $(pkgincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgincludedir)/$$f"; \ ++ echo "$$d$$p"; \ ++ done | $(am__base_list) | \ ++ while read files; do \ ++ echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(pkgincludedir)'"; \ ++ $(INSTALL_HEADER) $$files "$(DESTDIR)$(pkgincludedir)" || exit $$?; \ + done + + uninstall-pkgincludeHEADERS: + @$(NORMAL_UNINSTALL) +- @list='$(pkginclude_HEADERS)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(pkgincludedir)/$$f'"; \ +- rm -f "$(DESTDIR)$(pkgincludedir)/$$f"; \ +- done ++ @list='$(pkginclude_HEADERS)'; test -n "$(pkgincludedir)" || list=; \ ++ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ ++ test -n "$$files" || exit 0; \ ++ echo " ( cd '$(DESTDIR)$(pkgincludedir)' && rm -f" $$files ")"; \ ++ cd "$(DESTDIR)$(pkgincludedir)" && rm -f $$files + + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ +@@ -399,7 +425,7 @@ + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +- tags=; \ ++ set x; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ +@@ -407,29 +433,34 @@ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ +- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ ++ shift; \ ++ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique; \ ++ if test $$# -gt 0; then \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ "$$@" $$unique; \ ++ else \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$unique; \ ++ fi; \ + fi + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +- tags=; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ +- test -z "$(CTAGS_ARGS)$$tags$$unique" \ ++ test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ +- $$tags $$unique ++ $$unique + + GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ +- && cd $(top_srcdir) \ +- && gtags -i $(GTAGS_ARGS) $$here ++ && $(am__cd) $(top_srcdir) \ ++ && gtags -i $(GTAGS_ARGS) "$$here" + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +@@ -450,13 +481,17 @@ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ ++ if test -d "$(distdir)/$$file"; then \ ++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ ++ fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ ++ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ ++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ +- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ ++ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ +- test -f $(distdir)/$$file \ +- || cp -p $$d/$$file $(distdir)/$$file \ ++ test -f "$(distdir)/$$file" \ ++ || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +@@ -487,6 +522,7 @@ + + distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -508,6 +544,8 @@ + + html: html-am + ++html-am: ++ + info: info-am + + info-am: +@@ -516,18 +554,28 @@ + + install-dvi: install-dvi-am + ++install-dvi-am: ++ + install-exec-am: install-libLTLIBRARIES + + install-html: install-html-am + ++install-html-am: ++ + install-info: install-info-am + ++install-info-am: ++ + install-man: + + install-pdf: install-pdf-am + ++install-pdf-am: ++ + install-ps: install-ps-am + ++install-ps-am: ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -567,6 +615,7 @@ + pdf pdf-am ps ps-am tags uninstall uninstall-am \ + uninstall-libLTLIBRARIES uninstall-pkgincludeHEADERS + ++ + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: +diff -x'*config.sub' -x'*config.guess' -Naur orc-0.4.3.old/testsuite/Makefile.in orc-0.4.3/testsuite/Makefile.in +--- orc-0.4.3.old/testsuite/Makefile.in 2009-12-14 02:41:53.000000000 +0100 ++++ orc-0.4.3/testsuite/Makefile.in 2010-02-02 12:18:14.971377639 +0100 +@@ -1,8 +1,9 @@ +-# Makefile.in generated by automake 1.10.2 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, ++# Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -16,8 +17,9 @@ + + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ +-pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ ++pkglibdir = $(libdir)/@PACKAGE@ ++pkglibexecdir = $(libexecdir)/@PACKAGE@ + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c +@@ -63,6 +65,7 @@ + mkinstalldirs = $(install_sh) -d + CONFIG_HEADER = $(top_builddir)/config.h + CONFIG_CLEAN_FILES = ++CONFIG_CLEAN_VPATH_FILES = + am__EXEEXT_1 = compile_opcodes_sys_c$(EXEEXT) \ + compile_opcodes_float_c$(EXEEXT) \ + compile_opcodes_pixel_c$(EXEEXT) test_accsadubl$(EXEEXT) \ +@@ -125,6 +128,7 @@ + DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles ++am__mv = mv -f + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +@@ -155,9 +159,39 @@ + ps-recursive uninstall-recursive + RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive ++AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ ++ $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ ++ distdir + ETAGS = etags + CTAGS = ctags ++am__tty_colors = \ ++red=; grn=; lgn=; blu=; std= + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++am__relativize = \ ++ dir0=`pwd`; \ ++ sed_first='s,^\([^/]*\)/.*$$,\1,'; \ ++ sed_rest='s,^[^/]*/*,,'; \ ++ sed_last='s,^.*/\([^/]*\)$$,\1,'; \ ++ sed_butlast='s,/*[^/]*$$,,'; \ ++ while test -n "$$dir1"; do \ ++ first=`echo "$$dir1" | sed -e "$$sed_first"`; \ ++ if test "$$first" != "."; then \ ++ if test "$$first" = ".."; then \ ++ dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ ++ dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ ++ else \ ++ first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ ++ if test "$$first2" = "$$first"; then \ ++ dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ ++ else \ ++ dir2="../$$dir2"; \ ++ fi; \ ++ dir0="$$dir0"/"$$first"; \ ++ fi; \ ++ fi; \ ++ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ ++ done; \ ++ reldir="$$dir2" + ACLOCAL = @ACLOCAL@ + ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ + AMTAR = @AMTAR@ +@@ -224,6 +258,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ +@@ -322,9 +357,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu testsuite/Makefile'; \ +- cd $(top_srcdir) && \ +- $(AUTOMAKE) --gnu testsuite/Makefile ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu testsuite/Makefile'; \ ++ $(am__cd) $(top_srcdir) && \ ++ $(AUTOMAKE) --gnu testsuite/Makefile + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ +@@ -342,13 +377,16 @@ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(am__aclocal_m4_deps): + + clean-noinstPROGRAMS: +- @list='$(noinst_PROGRAMS)'; for p in $$list; do \ +- f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ +- echo " rm -f $$p $$f"; \ +- rm -f $$p $$f ; \ +- done ++ @list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \ ++ echo " rm -f" $$list; \ ++ rm -f $$list || exit $$?; \ ++ test -n "$(EXEEXT)" || exit 0; \ ++ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ ++ echo " rm -f" $$list; \ ++ rm -f $$list + compile_opcodes_float$(EXEEXT): $(compile_opcodes_float_OBJECTS) $(compile_opcodes_float_DEPENDENCIES) + @rm -f compile_opcodes_float$(EXEEXT) + $(LINK) $(compile_opcodes_float_OBJECTS) $(compile_opcodes_float_LDADD) $(LIBS) +@@ -419,21 +457,21 @@ + + .c.o: + @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c $< + + .c.obj: + @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + + .c.lo: + @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@@ -451,7 +489,7 @@ + # (which will cause the Makefiles to be regenerated when you run `make'); + # (2) otherwise, pass the desired values on the `make' command line. + $(RECURSIVE_TARGETS): +- @failcom='exit 1'; \ ++ @fail= failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ +@@ -468,7 +506,7 @@ + else \ + local_target="$$target"; \ + fi; \ +- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ ++ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done; \ + if test "$$dot_seen" = "no"; then \ +@@ -476,7 +514,7 @@ + fi; test -z "$$fail" + + $(RECURSIVE_CLEAN_TARGETS): +- @failcom='exit 1'; \ ++ @fail= failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ +@@ -502,16 +540,16 @@ + else \ + local_target="$$target"; \ + fi; \ +- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ ++ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done && test -z "$$fail" + tags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ +- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ ++ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ + done + ctags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ +- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ ++ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + done + + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) +@@ -526,7 +564,7 @@ + + TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +- tags=; \ ++ set x; \ + here=`pwd`; \ + if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ +@@ -538,7 +576,7 @@ + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test ! -f $$subdir/TAGS || \ +- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ ++ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ + fi; \ + done; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ +@@ -547,29 +585,34 @@ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ +- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ ++ shift; \ ++ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique; \ ++ if test $$# -gt 0; then \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ "$$@" $$unique; \ ++ else \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$unique; \ ++ fi; \ + fi + ctags: CTAGS + CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +- tags=; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ +- test -z "$(CTAGS_ARGS)$$tags$$unique" \ ++ test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ +- $$tags $$unique ++ $$unique + + GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ +- && cd $(top_srcdir) \ +- && gtags -i $(GTAGS_ARGS) $$here ++ && $(am__cd) $(top_srcdir) \ ++ && gtags -i $(GTAGS_ARGS) "$$here" + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +@@ -578,6 +621,7 @@ + @failed=0; all=0; xfail=0; xpass=0; skip=0; \ + srcdir=$(srcdir); export srcdir; \ + list=' $(TESTS) '; \ ++ $(am__tty_colors); \ + if test -n "$$list"; then \ + for tst in $$list; do \ + if test -f ./$$tst; then dir=./; \ +@@ -589,10 +633,10 @@ + *[\ \ ]$$tst[\ \ ]*) \ + xpass=`expr $$xpass + 1`; \ + failed=`expr $$failed + 1`; \ +- echo "XPASS: $$tst"; \ ++ col=$$red; res=XPASS; \ + ;; \ + *) \ +- echo "PASS: $$tst"; \ ++ col=$$grn; res=PASS; \ + ;; \ + esac; \ + elif test $$? -ne 77; then \ +@@ -600,17 +644,18 @@ + case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$tst[\ \ ]*) \ + xfail=`expr $$xfail + 1`; \ +- echo "XFAIL: $$tst"; \ ++ col=$$lgn; res=XFAIL; \ + ;; \ + *) \ + failed=`expr $$failed + 1`; \ +- echo "FAIL: $$tst"; \ ++ col=$$red; res=FAIL; \ + ;; \ + esac; \ + else \ + skip=`expr $$skip + 1`; \ +- echo "SKIP: $$tst"; \ ++ col=$$blu; res=SKIP; \ + fi; \ ++ echo "$${col}$$res$${std}: $$tst"; \ + done; \ + if test "$$all" -eq 1; then \ + tests="test"; \ +@@ -652,11 +697,15 @@ + dashes="$$report"; \ + fi; \ + dashes=`echo "$$dashes" | sed s/./=/g`; \ +- echo "$$dashes"; \ ++ if test "$$failed" -eq 0; then \ ++ echo "$$grn$$dashes"; \ ++ else \ ++ echo "$$red$$dashes"; \ ++ fi; \ + echo "$$banner"; \ + test -z "$$skipped" || echo "$$skipped"; \ + test -z "$$report" || echo "$$report"; \ +- echo "$$dashes"; \ ++ echo "$$dashes$$std"; \ + test "$$failed" -eq 0; \ + else :; fi + +@@ -676,29 +725,44 @@ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ ++ if test -d "$(distdir)/$$file"; then \ ++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ ++ fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ ++ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ ++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ +- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ ++ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ +- test -f $(distdir)/$$file \ +- || cp -p $$d/$$file $(distdir)/$$file \ ++ test -f "$(distdir)/$$file" \ ++ || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ ++ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ +- distdir=`$(am__cd) $(distdir) && pwd`; \ +- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ +- (cd $$subdir && \ ++ fi; \ ++ done ++ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ ++ if test "$$subdir" = .; then :; else \ ++ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ ++ $(am__relativize); \ ++ new_distdir=$$reldir; \ ++ dir1=$$subdir; dir2="$(top_distdir)"; \ ++ $(am__relativize); \ ++ new_top_distdir=$$reldir; \ ++ echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ ++ echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ ++ ($(am__cd) $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ +- top_distdir="$$top_distdir" \ +- distdir="$$distdir/$$subdir" \ ++ top_distdir="$$new_top_distdir" \ ++ distdir="$$new_distdir" \ + am__remove_distdir=: \ + am__skip_length_check=: \ ++ am__skip_mode_fix=: \ + distdir) \ + || exit 1; \ + fi; \ +@@ -730,6 +794,7 @@ + + distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -751,6 +816,8 @@ + + html: html-recursive + ++html-am: ++ + info: info-recursive + + info-am: +@@ -759,18 +826,28 @@ + + install-dvi: install-dvi-recursive + ++install-dvi-am: ++ + install-exec-am: + + install-html: install-html-recursive + ++install-html-am: ++ + install-info: install-info-recursive + ++install-info-am: ++ + install-man: + + install-pdf: install-pdf-recursive + ++install-pdf-am: ++ + install-ps: install-ps-recursive + ++install-ps-am: ++ + installcheck-am: + + maintainer-clean: maintainer-clean-recursive +@@ -793,8 +870,8 @@ + + uninstall-am: + +-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ +- install-strip ++.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) check-am \ ++ ctags-recursive install-am install-strip tags-recursive + + .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ + all all-am check check-TESTS check-am clean clean-generic \ +@@ -811,6 +888,7 @@ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-recursive uninstall uninstall-am + ++ + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: +diff -x'*config.sub' -x'*config.guess' -Naur orc-0.4.3.old/testsuite/orcc/Makefile.in orc-0.4.3/testsuite/orcc/Makefile.in +--- orc-0.4.3.old/testsuite/orcc/Makefile.in 2009-12-14 02:20:11.000000000 +0100 ++++ orc-0.4.3/testsuite/orcc/Makefile.in 2010-02-02 12:18:15.027377566 +0100 +@@ -1,8 +1,9 @@ +-# Makefile.in generated by automake 1.10.2 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, ++# Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -16,8 +17,9 @@ + + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ +-pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ ++pkglibdir = $(libdir)/@PACKAGE@ ++pkglibexecdir = $(libexecdir)/@PACKAGE@ + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c +@@ -51,6 +53,7 @@ + mkinstalldirs = $(install_sh) -d + CONFIG_HEADER = $(top_builddir)/config.h + CONFIG_CLEAN_FILES = ++CONFIG_CLEAN_VPATH_FILES = + PROGRAMS = $(noinst_PROGRAMS) + orc_test_SOURCES = orc_test.c + orc_test_OBJECTS = orc_test.$(OBJEXT) +@@ -58,6 +61,7 @@ + DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles ++am__mv = mv -f + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +@@ -71,6 +75,8 @@ + DIST_SOURCES = orc_test.c + ETAGS = etags + CTAGS = ctags ++am__tty_colors = \ ++red=; grn=; lgn=; blu=; std= + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ + ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ +@@ -138,6 +144,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ +@@ -218,9 +225,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu testsuite/orcc/Makefile'; \ +- cd $(top_srcdir) && \ +- $(AUTOMAKE) --gnu testsuite/orcc/Makefile ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu testsuite/orcc/Makefile'; \ ++ $(am__cd) $(top_srcdir) && \ ++ $(AUTOMAKE) --gnu testsuite/orcc/Makefile + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ +@@ -238,13 +245,16 @@ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(am__aclocal_m4_deps): + + clean-noinstPROGRAMS: +- @list='$(noinst_PROGRAMS)'; for p in $$list; do \ +- f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ +- echo " rm -f $$p $$f"; \ +- rm -f $$p $$f ; \ +- done ++ @list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \ ++ echo " rm -f" $$list; \ ++ rm -f $$list || exit $$?; \ ++ test -n "$(EXEEXT)" || exit 0; \ ++ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ ++ echo " rm -f" $$list; \ ++ rm -f $$list + orc_test$(EXEEXT): $(orc_test_OBJECTS) $(orc_test_DEPENDENCIES) + @rm -f orc_test$(EXEEXT) + $(LINK) $(orc_test_OBJECTS) $(orc_test_LDADD) $(LIBS) +@@ -259,21 +269,21 @@ + + .c.o: + @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c $< + + .c.obj: + @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + + .c.lo: + @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@@ -296,7 +306,7 @@ + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +- tags=; \ ++ set x; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ +@@ -304,29 +314,34 @@ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ +- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ ++ shift; \ ++ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique; \ ++ if test $$# -gt 0; then \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ "$$@" $$unique; \ ++ else \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$unique; \ ++ fi; \ + fi + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +- tags=; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ +- test -z "$(CTAGS_ARGS)$$tags$$unique" \ ++ test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ +- $$tags $$unique ++ $$unique + + GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ +- && cd $(top_srcdir) \ +- && gtags -i $(GTAGS_ARGS) $$here ++ && $(am__cd) $(top_srcdir) \ ++ && gtags -i $(GTAGS_ARGS) "$$here" + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +@@ -335,6 +350,7 @@ + @failed=0; all=0; xfail=0; xpass=0; skip=0; \ + srcdir=$(srcdir); export srcdir; \ + list=' $(TESTS) '; \ ++ $(am__tty_colors); \ + if test -n "$$list"; then \ + for tst in $$list; do \ + if test -f ./$$tst; then dir=./; \ +@@ -346,10 +362,10 @@ + *[\ \ ]$$tst[\ \ ]*) \ + xpass=`expr $$xpass + 1`; \ + failed=`expr $$failed + 1`; \ +- echo "XPASS: $$tst"; \ ++ col=$$red; res=XPASS; \ + ;; \ + *) \ +- echo "PASS: $$tst"; \ ++ col=$$grn; res=PASS; \ + ;; \ + esac; \ + elif test $$? -ne 77; then \ +@@ -357,17 +373,18 @@ + case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$tst[\ \ ]*) \ + xfail=`expr $$xfail + 1`; \ +- echo "XFAIL: $$tst"; \ ++ col=$$lgn; res=XFAIL; \ + ;; \ + *) \ + failed=`expr $$failed + 1`; \ +- echo "FAIL: $$tst"; \ ++ col=$$red; res=FAIL; \ + ;; \ + esac; \ + else \ + skip=`expr $$skip + 1`; \ +- echo "SKIP: $$tst"; \ ++ col=$$blu; res=SKIP; \ + fi; \ ++ echo "$${col}$$res$${std}: $$tst"; \ + done; \ + if test "$$all" -eq 1; then \ + tests="test"; \ +@@ -409,11 +426,15 @@ + dashes="$$report"; \ + fi; \ + dashes=`echo "$$dashes" | sed s/./=/g`; \ +- echo "$$dashes"; \ ++ if test "$$failed" -eq 0; then \ ++ echo "$$grn$$dashes"; \ ++ else \ ++ echo "$$red$$dashes"; \ ++ fi; \ + echo "$$banner"; \ + test -z "$$skipped" || echo "$$skipped"; \ + test -z "$$report" || echo "$$report"; \ +- echo "$$dashes"; \ ++ echo "$$dashes$$std"; \ + test "$$failed" -eq 0; \ + else :; fi + +@@ -433,13 +454,17 @@ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ ++ if test -d "$(distdir)/$$file"; then \ ++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ ++ fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ ++ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ ++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ +- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ ++ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ +- test -f $(distdir)/$$file \ +- || cp -p $$d/$$file $(distdir)/$$file \ ++ test -f "$(distdir)/$$file" \ ++ || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +@@ -471,6 +496,7 @@ + + distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -493,6 +519,8 @@ + + html: html-am + ++html-am: ++ + info: info-am + + info-am: +@@ -501,18 +529,28 @@ + + install-dvi: install-dvi-am + ++install-dvi-am: ++ + install-exec-am: + + install-html: install-html-am + ++install-html-am: ++ + install-info: install-info-am + ++install-info-am: ++ + install-man: + + install-pdf: install-pdf-am + ++install-pdf-am: ++ + install-ps: install-ps-am + ++install-ps-am: ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -535,7 +573,7 @@ + + uninstall-am: + +-.MAKE: install-am install-strip ++.MAKE: all check check-am install install-am install-strip + + .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ + clean-generic clean-libtool clean-noinstPROGRAMS ctags \ +@@ -556,6 +594,7 @@ + $(top_builddir)/tools/orcc$(EXEEXT) --header -o testorc.h test.orc + $(top_builddir)/tools/orcc$(EXEEXT) --implementation -o testorc.c test.orc + $(top_builddir)/tools/orcc$(EXEEXT) --test -o orc_test.c test.orc ++ + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: +diff -x'*config.sub' -x'*config.guess' -Naur orc-0.4.3.old/tools/Makefile.in orc-0.4.3/tools/Makefile.in +--- orc-0.4.3.old/tools/Makefile.in 2009-12-14 02:20:11.000000000 +0100 ++++ orc-0.4.3/tools/Makefile.in 2010-02-02 12:18:15.079377682 +0100 +@@ -1,8 +1,9 @@ +-# Makefile.in generated by automake 1.10.2 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, ++# Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -16,8 +17,9 @@ + + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ +-pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ ++pkglibdir = $(libdir)/@PACKAGE@ ++pkglibexecdir = $(libexecdir)/@PACKAGE@ + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c +@@ -50,8 +52,8 @@ + mkinstalldirs = $(install_sh) -d + CONFIG_HEADER = $(top_builddir)/config.h + CONFIG_CLEAN_FILES = ++CONFIG_CLEAN_VPATH_FILES = + am__installdirs = "$(DESTDIR)$(bindir)" +-binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) + PROGRAMS = $(bin_PROGRAMS) + orcc_SOURCES = orcc.c + orcc_OBJECTS = orcc.$(OBJEXT) +@@ -62,6 +64,7 @@ + DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles ++am__mv = mv -f + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +@@ -142,6 +145,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ +@@ -221,9 +225,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tools/Makefile'; \ +- cd $(top_srcdir) && \ +- $(AUTOMAKE) --gnu tools/Makefile ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tools/Makefile'; \ ++ $(am__cd) $(top_srcdir) && \ ++ $(AUTOMAKE) --gnu tools/Makefile + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ +@@ -241,34 +245,50 @@ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(am__aclocal_m4_deps): + install-binPROGRAMS: $(bin_PROGRAMS) + @$(NORMAL_INSTALL) + test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" +- @list='$(bin_PROGRAMS)'; for p in $$list; do \ +- p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ +- if test -f $$p \ +- || test -f $$p1 \ +- ; then \ +- f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ +- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ +- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ +- else :; fi; \ +- done ++ @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ ++ for p in $$list; do echo "$$p $$p"; done | \ ++ sed 's/$(EXEEXT)$$//' | \ ++ while read p p1; do if test -f $$p || test -f $$p1; \ ++ then echo "$$p"; echo "$$p"; else :; fi; \ ++ done | \ ++ sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ ++ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ ++ sed 'N;N;N;s,\n, ,g' | \ ++ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ ++ { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ ++ if ($$2 == $$4) files[d] = files[d] " " $$1; \ ++ else { print "f", $$3 "/" $$4, $$1; } } \ ++ END { for (d in files) print "f", d, files[d] }' | \ ++ while read type dir files; do \ ++ if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ ++ test -z "$$files" || { \ ++ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \ ++ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \ ++ } \ ++ ; done + + uninstall-binPROGRAMS: + @$(NORMAL_UNINSTALL) +- @list='$(bin_PROGRAMS)'; for p in $$list; do \ +- f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ +- echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ +- rm -f "$(DESTDIR)$(bindir)/$$f"; \ +- done ++ @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ ++ files=`for p in $$list; do echo "$$p"; done | \ ++ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ ++ -e 's/$$/$(EXEEXT)/' `; \ ++ test -n "$$list" || exit 0; \ ++ echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ ++ cd "$(DESTDIR)$(bindir)" && rm -f $$files + + clean-binPROGRAMS: +- @list='$(bin_PROGRAMS)'; for p in $$list; do \ +- f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ +- echo " rm -f $$p $$f"; \ +- rm -f $$p $$f ; \ +- done ++ @list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \ ++ echo " rm -f" $$list; \ ++ rm -f $$list || exit $$?; \ ++ test -n "$(EXEEXT)" || exit 0; \ ++ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ ++ echo " rm -f" $$list; \ ++ rm -f $$list + orcc$(EXEEXT): $(orcc_OBJECTS) $(orcc_DEPENDENCIES) + @rm -f orcc$(EXEEXT) + $(LINK) $(orcc_OBJECTS) $(orcc_LDADD) $(LIBS) +@@ -283,21 +303,21 @@ + + .c.o: + @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c $< + + .c.obj: + @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + + .c.lo: + @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@@ -320,7 +340,7 @@ + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +- tags=; \ ++ set x; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ +@@ -328,29 +348,34 @@ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ +- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ ++ shift; \ ++ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique; \ ++ if test $$# -gt 0; then \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ "$$@" $$unique; \ ++ else \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$unique; \ ++ fi; \ + fi + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +- tags=; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ +- test -z "$(CTAGS_ARGS)$$tags$$unique" \ ++ test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ +- $$tags $$unique ++ $$unique + + GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ +- && cd $(top_srcdir) \ +- && gtags -i $(GTAGS_ARGS) $$here ++ && $(am__cd) $(top_srcdir) \ ++ && gtags -i $(GTAGS_ARGS) "$$here" + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +@@ -371,13 +396,17 @@ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ ++ if test -d "$(distdir)/$$file"; then \ ++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ ++ fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ ++ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ ++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ +- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ ++ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ +- test -f $(distdir)/$$file \ +- || cp -p $$d/$$file $(distdir)/$$file \ ++ test -f "$(distdir)/$$file" \ ++ || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +@@ -408,6 +437,7 @@ + + distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -428,6 +458,8 @@ + + html: html-am + ++html-am: ++ + info: info-am + + info-am: +@@ -436,18 +468,28 @@ + + install-dvi: install-dvi-am + ++install-dvi-am: ++ + install-exec-am: install-binPROGRAMS + + install-html: install-html-am + ++install-html-am: ++ + install-info: install-info-am + ++install-info-am: ++ + install-man: + + install-pdf: install-pdf-am + ++install-pdf-am: ++ + install-ps: install-ps-am + ++install-ps-am: ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -486,6 +528,7 @@ + pdf pdf-am ps ps-am tags uninstall uninstall-am \ + uninstall-binPROGRAMS + ++ + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: diff --git a/recipes/orc/orc_0.4.3.bb b/recipes/orc/orc_0.4.3.bb new file mode 100644 index 0000000000..be322b79ed --- /dev/null +++ b/recipes/orc/orc_0.4.3.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "orc - The Oil Runtime Compiler" +HOMEPAGE = "http://code.entropywave.com/projects/orc/" +PR = "r0" + +SRC_URI = "http://code.entropywave.com/download/orc/orc-0.4.3.tar.gz;name=orc043targz" +SRC_URI[orc043targz.md5sum] = "9b2e7030c8df8a0d371115869fe5685a" +SRC_URI[orc043targz.sha256sum] = "4c0266d81da67fef0b2abd5e624a9ab0db5de04eb23c3ab24e22f5f9ceeefbfe" + +SRC_URI += "file://03_orcutils.patch;patch=1 \ + file://99_autoreconf.patch;patch=1" + +inherit autotools pkgconfig + +BBCLASSEXTEND = "native" + +PACKAGES += "liborc" + +PACKAGES_liborc = ${libdir} -- cgit v1.2.3 From cb84b138269ed9f3426f4e79f4bb9911e5066387 Mon Sep 17 00:00:00 2001 From: Frans Meulenbroeks Date: Sun, 14 Mar 2010 14:23:12 +0100 Subject: schroedinger: upgraded to 1.0.9 Signed-off-by: Frans Meulenbroeks --- recipes/schroedinger/files/Makefile.patch | 15 +++++++++++++++ recipes/schroedinger/files/configure.ac.patch | 13 +++++++++++++ recipes/schroedinger/gst-plugin-schroedinger_1.0.5.bb | 14 -------------- recipes/schroedinger/gst-plugin-schroedinger_1.0.9.bb | 15 +++++++++++++++ recipes/schroedinger/schroedinger.inc | 11 ++++++++--- recipes/schroedinger/schroedinger_1.0.5.bb | 12 ------------ recipes/schroedinger/schroedinger_1.0.9.bb | 15 +++++++++++++++ 7 files changed, 66 insertions(+), 29 deletions(-) create mode 100644 recipes/schroedinger/files/Makefile.patch create mode 100644 recipes/schroedinger/files/configure.ac.patch delete mode 100644 recipes/schroedinger/gst-plugin-schroedinger_1.0.5.bb create mode 100644 recipes/schroedinger/gst-plugin-schroedinger_1.0.9.bb delete mode 100644 recipes/schroedinger/schroedinger_1.0.5.bb create mode 100644 recipes/schroedinger/schroedinger_1.0.9.bb diff --git a/recipes/schroedinger/files/Makefile.patch b/recipes/schroedinger/files/Makefile.patch new file mode 100644 index 0000000000..d749c884e1 --- /dev/null +++ b/recipes/schroedinger/files/Makefile.patch @@ -0,0 +1,15 @@ +Index: schroedinger-1.0.5/schroedinger/Makefile.am +=================================================================== +--- schroedinger-1.0.5.orig/schroedinger/Makefile.am ++++ schroedinger-1.0.5/schroedinger/Makefile.am +@@ -53,9 +53,7 @@ pkginclude_HEADERS = \ + schroutils.h \ + schrovideoformat.h \ + schrovirtframe.h \ +- schrowavelet.h \ +- schrobitstream.h \ +- schromotion.h ++ schrowavelet.h + + noinst_HEADERS = \ + schrooil.h \ diff --git a/recipes/schroedinger/files/configure.ac.patch b/recipes/schroedinger/files/configure.ac.patch new file mode 100644 index 0000000000..ac5e7eebec --- /dev/null +++ b/recipes/schroedinger/files/configure.ac.patch @@ -0,0 +1,13 @@ +Index: schroedinger-1.0.9/configure.ac +=================================================================== +--- schroedinger-1.0.9.orig/configure.ac ++++ schroedinger-1.0.9/configure.ac +@@ -54,7 +54,7 @@ if test "x${HAVE_ORC}" != xyes ; then + AC_ERROR([orc-0.4 >= $ORC_VER is required]) + fi + SCHRO_PKG_DEPS="$SCHRO_PKG_DEPS orc-0.4 >= $ORC_VER" +-ORCC=`$PKG_CONFIG --variable=orcc orc-0.4` ++ORCC=$STAGING_DIR`$PKG_CONFIG --variable=orcc orc-0.4` + AC_SUBST(ORCC) + + AC_ARG_WITH([thread], diff --git a/recipes/schroedinger/gst-plugin-schroedinger_1.0.5.bb b/recipes/schroedinger/gst-plugin-schroedinger_1.0.5.bb deleted file mode 100644 index 64660bb7f2..0000000000 --- a/recipes/schroedinger/gst-plugin-schroedinger_1.0.5.bb +++ /dev/null @@ -1,14 +0,0 @@ -require schroedinger.inc -PR = "r2" - -DEPENDS += "gstreamer gst-plugins-base" - -SRC_URI = "http://www.diracvideo.org/download/schroedinger/schroedinger-${PV}.tar.gz" - -S = "${WORKDIR}/schroedinger-${PV}" - -PACKAGES = "gst-plugin-schroedinger gst-plugin-schroedinger-dev gst-plugin-schroedinger-dbg" -FILES_gst-plugin-schroedinger += "${libdir}/gstreamer-0.10/libgstschro.so" -FILES_gst-plugin-schroedinger-dev += "${libdir}/gstreamer-0.10/libgstschro.*" -FILES_gst-plugin-schroedinger-dbg += "${libdir}/gstreamer-0.10/.debug/libgstschro.so" - diff --git a/recipes/schroedinger/gst-plugin-schroedinger_1.0.9.bb b/recipes/schroedinger/gst-plugin-schroedinger_1.0.9.bb new file mode 100644 index 0000000000..0a95646a61 --- /dev/null +++ b/recipes/schroedinger/gst-plugin-schroedinger_1.0.9.bb @@ -0,0 +1,15 @@ +require schroedinger.inc +PR = "r0" + +DEPENDS += "gstreamer gst-plugins-base" + +SRC_URI[schroedingertargz.md5sum] = "d67ec48b7c506db8c8b49156bf409e60" +SRC_URI[schroedingertargz.sha256sum] = "345abcaa72ff0f2e9c1075e22f7141475ee4e6eea23a7f568b69ffc13cc1c723" + +S = "${WORKDIR}/schroedinger-${PV}" + +PACKAGES = "gst-plugin-schroedinger gst-plugin-schroedinger-dev gst-plugin-schroedinger-dbg" +FILES_gst-plugin-schroedinger += "${libdir}/gstreamer-0.10/libgstschro.so" +FILES_gst-plugin-schroedinger-dev += "${libdir}/gstreamer-0.10/libgstschro.*" +FILES_gst-plugin-schroedinger-dbg += "${libdir}/gstreamer-0.10/.debug/libgstschro.so" + diff --git a/recipes/schroedinger/schroedinger.inc b/recipes/schroedinger/schroedinger.inc index f907613fd1..90f7ca658b 100644 --- a/recipes/schroedinger/schroedinger.inc +++ b/recipes/schroedinger/schroedinger.inc @@ -1,10 +1,15 @@ HOMEPAGE = "http://schrodinger.sourceforge.net/" LICENSE = "MPL GPL LGPL MIT" -DEPENDS = "liboil" +DEPENDS = "liboil orc-native orc" -PR = "r2" +PR = "r0" -SRC_URI = "http://www.diracvideo.org/download/schroedinger/${P}.tar.gz" +SRC_URI = "http://www.diracvideo.org/download/schroedinger/${P}.tar.gz;name=schroedingertargz" +SRC_URI[schroedingertargz.md5sum] = "d67ec48b7c506db8c8b49156bf409e60" +SRC_URI[schroedingertargz.sha256sum] = "345abcaa72ff0f2e9c1075e22f7141475ee4e6eea23a7f568b69ffc13cc1c723" +SRC_URI += "file://configure.ac.patch;patch=1" + +EXTRA_OECONF += "STAGING_DIR=${STAGING_DIR_NATIVE}" inherit autotools diff --git a/recipes/schroedinger/schroedinger_1.0.5.bb b/recipes/schroedinger/schroedinger_1.0.5.bb deleted file mode 100644 index 476c2965e6..0000000000 --- a/recipes/schroedinger/schroedinger_1.0.5.bb +++ /dev/null @@ -1,12 +0,0 @@ -require schroedinger.inc - -PR = "r3" - -inherit autotools_stage - -AUTOTOOLS_STAGE_PKGCONFIG = "1" - -PACKAGES =+ "gst-plugin-schroedinger-dbg gst-plugin-schroedinger-dev gst-plugin-schroedinger" -FILES_gst-plugin-schroedinger = "${libdir}/gstreamer-0.10/*.so" -FILES_gst-plugin-schroedinger-dbg = "${libdir}/gstreamer-0.10/.debug" -FILES_gst-plugin-schroedinger-dev = "${libdir}/gstreamer-0.10/*.*a" diff --git a/recipes/schroedinger/schroedinger_1.0.9.bb b/recipes/schroedinger/schroedinger_1.0.9.bb new file mode 100644 index 0000000000..d9b919169b --- /dev/null +++ b/recipes/schroedinger/schroedinger_1.0.9.bb @@ -0,0 +1,15 @@ +require schroedinger.inc + +PR = "r0" + +inherit autotools_stage + +SRC_URI[schroedingertargz.md5sum] = "d67ec48b7c506db8c8b49156bf409e60" +SRC_URI[schroedingertargz.sha256sum] = "345abcaa72ff0f2e9c1075e22f7141475ee4e6eea23a7f568b69ffc13cc1c723" + +AUTOTOOLS_STAGE_PKGCONFIG = "1" + +PACKAGES =+ "gst-plugin-schroedinger-dbg gst-plugin-schroedinger-dev gst-plugin-schroedinger" +FILES_gst-plugin-schroedinger = "${libdir}/gstreamer-0.10/*.so" +FILES_gst-plugin-schroedinger-dbg = "${libdir}/gstreamer-0.10/.debug" +FILES_gst-plugin-schroedinger-dev = "${libdir}/gstreamer-0.10/*.*a" -- cgit v1.2.3 From cf0c047a2b6cc747244a31c0a79d5bbb51465708 Mon Sep 17 00:00:00 2001 From: Frans Meulenbroeks Date: Fri, 12 Mar 2010 13:06:33 +0100 Subject: gettext: fixed build with autoconf lifted from patch from Bernhard Reutner-Fischer on oe who found it somewhere on a mailing list Signed-off-by: Frans Meulenbroeks --- recipes/gettext/gettext-0.17/m4_copy.patch | 53 ++++++++++++++++++++++++++++++ recipes/gettext/gettext_0.17.bb | 3 +- 2 files changed, 55 insertions(+), 1 deletion(-) create mode 100644 recipes/gettext/gettext-0.17/m4_copy.patch diff --git a/recipes/gettext/gettext-0.17/m4_copy.patch b/recipes/gettext/gettext-0.17/m4_copy.patch new file mode 100644 index 0000000000..2502221379 --- /dev/null +++ b/recipes/gettext/gettext-0.17/m4_copy.patch @@ -0,0 +1,53 @@ +@ -0,0 +1,52 @@ +Re: _AC_LANG_OPENMP and m4_copy + +Bruno Haible +Wed, 03 Dec 2008 16:33:38 -0800 + +Hello Ralf, + +Thanks for the report and fix. + +Eric Blake wrote: +> Looks fine to me, but let Bruno chime in before committing. I agree with +> your approach of fixing gnulib to avoid the problem by not competing when +> a new-enough autoconf provides the macro + +I agree with this approach. But the patch introduces the use of another +undocumented macro, namely 'm4_version_prereq'. I prefer to get away without +it, and am committing this: + + +2008-12-03 Ralf Wildenhues <[EMAIL PROTECTED]> + Bruno Haible <[EMAIL PROTECTED]> + + * m4/openmp.m4 (AC_OPENMP): Do not define with Autoconf 2.62 or newer. + + +--- gettext-0.17.old/gettext-tools/gnulib-m4/openmp.m4 2007-05-27 21:50:22.000000000 +0200 ++++ gettext-0.17/gettext-tools/gnulib-m4/openmp.m4 2010-02-10 16:48:58.000000000 +0100 +@@ -1,11 +1,15 @@ +-# openmp.m4 serial 4 +-dnl Copyright (C) 2006-2007 Free Software Foundation, Inc. ++# openmp.m4 serial 5 ++dnl Copyright (C) 2006-2008 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, + dnl with or without modifications, as long as this notice is preserved. + + dnl This file can be removed once we assume autoconf >= 2.62. + ++dnl Expand to nothing in autoconf >= 2.62. m4_copy has a different ++dnl semantic in autoconf > 2.63. ++m4_ifdef([AC_OPENMP], [], [ ++ + # _AC_LANG_OPENMP + # --------------- + # Expands to some language dependent source code for testing the presence of +@@ -90,3 +94,6 @@ + fi + AC_SUBST([OPENMP_]_AC_LANG_PREFIX[FLAGS]) + ]) ++ ++]) ++ diff --git a/recipes/gettext/gettext_0.17.bb b/recipes/gettext/gettext_0.17.bb index fbb479a75e..36a99f6dc7 100644 --- a/recipes/gettext/gettext_0.17.bb +++ b/recipes/gettext/gettext_0.17.bb @@ -2,7 +2,7 @@ DESCRIPTION = "The GNU internationalization library." HOMEPAGE = "http://www.gnu.org/software/gettext/gettext.html" SECTION = "libs" LICENSE = "GPLv3" -PR = "r5" +PR = "r6" DEPENDS = "gettext-native virtual/libiconv ncurses expat" DEPENDS_virtclass-native = "libxml2-native" PROVIDES = "virtual/libintl" @@ -16,6 +16,7 @@ SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \ file://wchar-uclibc.patch;patch=1 \ file://use_open_properly.patch;patch=1 \ file://gettext-autoconf-lib-link-no-L.patch;patch=1 \ + file://m4_copy.patch;patch=1 \ " SRC_URI_append_linux-uclibc = " file://gettext-error_print_progname.patch;patch=1" -- cgit v1.2.3 From c860f51f04d41680100a7fecd2341ecf8f657fe1 Mon Sep 17 00:00:00 2001 From: Frans Meulenbroeks Date: Thu, 11 Mar 2010 21:08:45 +0100 Subject: tiff: moved to 4.0.0 beta5 also renamed to 3.9.2 as that is the latest version before 4.0.0 Signed-off-by: Frans Meulenbroeks --- recipes/libtiff/tiff_3.8.2.bb | 17 ----------------- recipes/libtiff/tiff_3.9.2.bb | 20 ++++++++++++++++++++ 2 files changed, 20 insertions(+), 17 deletions(-) delete mode 100644 recipes/libtiff/tiff_3.8.2.bb create mode 100644 recipes/libtiff/tiff_3.9.2.bb diff --git a/recipes/libtiff/tiff_3.8.2.bb b/recipes/libtiff/tiff_3.8.2.bb deleted file mode 100644 index 00edb40eb3..0000000000 --- a/recipes/libtiff/tiff_3.8.2.bb +++ /dev/null @@ -1,17 +0,0 @@ -DESCRIPTION = "This software provides support for the Tag Image File Format (TIFF)" -LICENSE = "${PN}" -HOMEPAGE = "http://www.remotesensing.org/libtiff/" -DEPENDS = "zlib jpeg lzo" -PV = "3.8.2+4.0.0beta2" - -SRC_URI = "ftp://ftp.remotesensing.org/pub/libtiff/tiff-4.0.0beta2.tar.gz" -S = "${WORKDIR}/${PN}-4.0.0beta2" - -inherit autotools_stage - -PACKAGES =+ "tiffxx tiffxx-dbg tiffxx-dev tiff-utils tiff-utils-dbg" -FILES_tiffxx = "${libdir}/libtiffxx.so.*" -FILES_tiffxx-dev = "${libdir}/libtiffxx.so ${libdir}/libtiffxx.*a" -FILES_tiffxx-dbg += "${libdir}/.debug/libtiffxx.so*" -FILES_tiff-utils = "${bindir}/*" -FILES_tiff-utils-dbg += "${bindir}/.debug/" diff --git a/recipes/libtiff/tiff_3.9.2.bb b/recipes/libtiff/tiff_3.9.2.bb new file mode 100644 index 0000000000..9beb444954 --- /dev/null +++ b/recipes/libtiff/tiff_3.9.2.bb @@ -0,0 +1,20 @@ +DESCRIPTION = "This software provides support for the Tag Image File Format (TIFF)" +LICENSE = "${PN}" +HOMEPAGE = "http://www.remotesensing.org/libtiff/" +DEPENDS = "zlib jpeg lzo" +PV = "3.9.2+4.0.0beta5" + +SRC_URI = "ftp://ftp.remotesensing.org/pub/libtiff/tiff-4.0.0beta5.tar.gz;name=tiff400beta5targz" +SRC_URI[tiff400beta5targz.md5sum] = "a0a83604e38a299fae9f0b1a39c04870" +SRC_URI[tiff400beta5targz.sha256sum] = "64b61567782643a841e33a8d031d0d6a9b3e436108829e2e947183f8dcdc6ec7" + +S = "${WORKDIR}/${PN}-4.0.0beta5" + +inherit autotools_stage + +PACKAGES =+ "tiffxx tiffxx-dbg tiffxx-dev tiff-utils tiff-utils-dbg" +FILES_tiffxx = "${libdir}/libtiffxx.so.*" +FILES_tiffxx-dev = "${libdir}/libtiffxx.so ${libdir}/libtiffxx.*a" +FILES_tiffxx-dbg += "${libdir}/.debug/libtiffxx.so*" +FILES_tiff-utils = "${bindir}/*" +FILES_tiff-utils-dbg += "${bindir}/.debug/" -- cgit v1.2.3 From e3e5b61ea4cb938d630b80a7b15394bc38349cb4 Mon Sep 17 00:00:00 2001 From: Frans Meulenbroeks Date: Thu, 11 Mar 2010 21:09:40 +0100 Subject: xorg-proto-common.inc: replaced PN with BPN to avoid native compilation error Signed-off-by: Frans Meulenbroeks --- recipes/xorg-proto/xorg-proto-common.inc | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/recipes/xorg-proto/xorg-proto-common.inc b/recipes/xorg-proto/xorg-proto-common.inc index 17bd6ade9c..7cfd9e87ca 100644 --- a/recipes/xorg-proto/xorg-proto-common.inc +++ b/recipes/xorg-proto/xorg-proto-common.inc @@ -5,13 +5,11 @@ LICENSE = "MIT-X" DEPENDS = "util-macros" -XORG_PN = "${PN}" - ALLOW_EMPTY = "1" -SRC_URI = "${XORG_MIRROR}/individual/proto/${XORG_PN}-${PV}.tar.bz2;name=archive" +SRC_URI = "${XORG_MIRROR}/individual/proto/${BPN}-${PV}.tar.bz2;name=archive" -S = "${WORKDIR}/${XORG_PN}-${PV}" +S = "${WORKDIR}/${BPN}-${PV}" inherit autotools pkgconfig -- cgit v1.2.3 From e2c2c3d636045bf9b292b103a4f4fb0a4c16deab Mon Sep 17 00:00:00 2001 From: Frans Meulenbroeks Date: Wed, 10 Mar 2010 22:28:44 +0100 Subject: libunfig: no need for native variant as no-one uses it Signed-off-by: Frans Meulenbroeks --- recipes/libungif/libungif_4.1.3.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/libungif/libungif_4.1.3.bb b/recipes/libungif/libungif_4.1.3.bb index caf0427551..db16ff931d 100644 --- a/recipes/libungif/libungif_4.1.3.bb +++ b/recipes/libungif/libungif_4.1.3.bb @@ -2,7 +2,7 @@ SECTION = "libs" DESCRIPTION = "shared library for GIF images" SRC_URI = "${SOURCEFORGE_MIRROR}/giflib/libungif-${PV}.tar.bz2" LICENSE = "MIT" -PR = "r1" +PR = "r2" PACKAGES += "${PN}-utils" -- cgit v1.2.3 From 3aec39dd6117e9112876c4b7d88c7324cb296c34 Mon Sep 17 00:00:00 2001 From: Frans Meulenbroeks Date: Mon, 15 Mar 2010 08:49:48 +0100 Subject: xorg-util: used BPN in xorg-util-common as per hrw's suggestion Signed-off-by: Frans Meulenbroeks Conflicts: recipes/xorg-util/xorg-util-common.inc Signed-off-by: Frans Meulenbroeks --- recipes/xorg-util/gccmakedep_1.0.2.bb | 2 +- recipes/xorg-util/imake_1.0.2.bb | 2 +- recipes/xorg-util/lndir_1.0.1.bb | 2 +- recipes/xorg-util/makedepend_1.0.2.bb | 2 +- recipes/xorg-util/util-macros_1.6.0.bb | 1 + recipes/xorg-util/xorg-cf-files_1.0.3.bb | 2 +- recipes/xorg-util/xorg-util-common.inc | 10 ++-------- 7 files changed, 8 insertions(+), 13 deletions(-) diff --git a/recipes/xorg-util/gccmakedep_1.0.2.bb b/recipes/xorg-util/gccmakedep_1.0.2.bb index 3abfa037a2..cb28a86703 100644 --- a/recipes/xorg-util/gccmakedep_1.0.2.bb +++ b/recipes/xorg-util/gccmakedep_1.0.2.bb @@ -3,5 +3,5 @@ require xorg-util-common.inc DESCRIPTION = "create dependencies in makefiles using 'gcc -M'" RDEPENDS = "gcc" -PR = "r2" +PR = "r3" PE = "1" diff --git a/recipes/xorg-util/imake_1.0.2.bb b/recipes/xorg-util/imake_1.0.2.bb index deeb4477a1..b0eda35823 100644 --- a/recipes/xorg-util/imake_1.0.2.bb +++ b/recipes/xorg-util/imake_1.0.2.bb @@ -3,5 +3,5 @@ require xorg-util-common.inc DESCRIPTION = "C preprocessor interface to the make utility" RDEPENDS = "perl xproto" -PR = "r1" +PR = "r2" PE = "1" diff --git a/recipes/xorg-util/lndir_1.0.1.bb b/recipes/xorg-util/lndir_1.0.1.bb index 34309a6487..fffc71034e 100644 --- a/recipes/xorg-util/lndir_1.0.1.bb +++ b/recipes/xorg-util/lndir_1.0.1.bb @@ -1,5 +1,5 @@ require xorg-util-common.inc DESCRIPTION = "create a shadow directory of symbolic links to another directory tree" -PR = "r1" +PR = "r2" PE = "1" diff --git a/recipes/xorg-util/makedepend_1.0.2.bb b/recipes/xorg-util/makedepend_1.0.2.bb index e998bba1b0..a7a2385506 100644 --- a/recipes/xorg-util/makedepend_1.0.2.bb +++ b/recipes/xorg-util/makedepend_1.0.2.bb @@ -2,5 +2,5 @@ require xorg-util-common.inc DESCRIPTION = "create dependencies in makefiles" DEPENDS = "xproto util-macros" -PR = "r2" +PR = "r3" PE = "1" diff --git a/recipes/xorg-util/util-macros_1.6.0.bb b/recipes/xorg-util/util-macros_1.6.0.bb index 661eba4654..0fb42dc55f 100644 --- a/recipes/xorg-util/util-macros_1.6.0.bb +++ b/recipes/xorg-util/util-macros_1.6.0.bb @@ -1,6 +1,7 @@ require xorg-util-common.inc DESCRIPTION = "X autotools macros" +PR = "r1" PE = "1" ALLOW_EMPTY = "1" diff --git a/recipes/xorg-util/xorg-cf-files_1.0.3.bb b/recipes/xorg-util/xorg-cf-files_1.0.3.bb index 7c3fb8d7e9..3f0f4b3f06 100644 --- a/recipes/xorg-util/xorg-cf-files_1.0.3.bb +++ b/recipes/xorg-util/xorg-cf-files_1.0.3.bb @@ -2,7 +2,7 @@ require xorg-util-common.inc DESCRIPTION = "X Window System CF files" -PR = "r1" +PR = "r2" PE = "1" FILES_${PN} += " /usr/lib/X11/config" diff --git a/recipes/xorg-util/xorg-util-common.inc b/recipes/xorg-util/xorg-util-common.inc index 998b37b3c0..b169d9ef58 100644 --- a/recipes/xorg-util/xorg-util-common.inc +++ b/recipes/xorg-util/xorg-util-common.inc @@ -2,14 +2,8 @@ HOMEPAGE = "http://www.x.org" SECTION = "x11/utils" LICENSE = "MIT-X" -XORG_PN = "${PN}" +SRC_URI = "${XORG_MIRROR}/individual/util/${BPN}-${PV}.tar.gz;name=archive" -SRC_URI = "${XORG_MIRROR}/individual/util/${XORG_PN}-${PV}.tar.gz;name=archive" - -S = "${WORKDIR}/${XORG_PN}-${PV}" +S = "${WORKDIR}/${BPN}-${PV}" inherit autotools pkgconfig - -do_stage() { - autotools_stage_all -} -- cgit v1.2.3 From b2e3219cb67b5601675bca4beea8aa45ed2dff25 Mon Sep 17 00:00:00 2001 From: Frans Meulenbroeks Date: Wed, 10 Mar 2010 22:48:16 +0100 Subject: libusb: removed unneeded BBCLASSEXTEND="native" Signed-off-by: Frans Meulenbroeks --- recipes/libusb/libusb_0.1.12.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/libusb/libusb_0.1.12.bb b/recipes/libusb/libusb_0.1.12.bb index ccf4a5850e..ae62cc2b02 100644 --- a/recipes/libusb/libusb_0.1.12.bb +++ b/recipes/libusb/libusb_0.1.12.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://libusb.sf.net" SECTION = "libs" LICENSE = "LGPL" PROVIDES = "virtual/libusb0" -PR = "r3" +PR = "r4" SRC_URI = "${SOURCEFORGE_MIRROR}/libusb/libusb-${PV}.tar.gz \ file://configure_fix.patch;patch=1" -- cgit v1.2.3 From da0036099b326b09b3dc8b845a2ddbe8936009e4 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 15 Mar 2010 10:15:07 +0100 Subject: orc: fix packaging, recipe style issues and factor into .inc --- recipes/orc/orc.inc | 18 ++++++++++++++++++ recipes/orc/orc_0.4.3.bb | 17 +++++------------ 2 files changed, 23 insertions(+), 12 deletions(-) create mode 100644 recipes/orc/orc.inc diff --git a/recipes/orc/orc.inc b/recipes/orc/orc.inc new file mode 100644 index 0000000000..7d48806c0e --- /dev/null +++ b/recipes/orc/orc.inc @@ -0,0 +1,18 @@ +DESCRIPTION = "orc - The Oil Runtime Compiler" +HOMEPAGE = "http://code.entropywave.com/projects/orc/" + +SRC_URI = "http://code.entropywave.com/download/orc/orc-${PV}.tar.gz;name=orc" + +inherit autotools pkgconfig + +BBCLASSEXTEND = "native" + +PACKAGES =+ "orc-examples" +FILES_orc-examples = "${libdir}/orc/*" +FILES_${PN} = "${bindir}/*" + +python populate_packages_prepend () { + libdir = bb.data.expand('${libdir}', d) + do_split_packages(d, libdir, '^lib(.*)\.so\.*', 'lib%s', 'ORC %s library', extra_depends='', allow_links=True) +} + diff --git a/recipes/orc/orc_0.4.3.bb b/recipes/orc/orc_0.4.3.bb index be322b79ed..6da5789e5e 100644 --- a/recipes/orc/orc_0.4.3.bb +++ b/recipes/orc/orc_0.4.3.bb @@ -1,18 +1,11 @@ -DESCRIPTION = "orc - The Oil Runtime Compiler" -HOMEPAGE = "http://code.entropywave.com/projects/orc/" -PR = "r0" +require orc.inc -SRC_URI = "http://code.entropywave.com/download/orc/orc-0.4.3.tar.gz;name=orc043targz" -SRC_URI[orc043targz.md5sum] = "9b2e7030c8df8a0d371115869fe5685a" -SRC_URI[orc043targz.sha256sum] = "4c0266d81da67fef0b2abd5e624a9ab0db5de04eb23c3ab24e22f5f9ceeefbfe" +PR = "r1" + +SRC_URI[orc.md5sum] = "9b2e7030c8df8a0d371115869fe5685a" +SRC_URI[orc.sha256sum] = "4c0266d81da67fef0b2abd5e624a9ab0db5de04eb23c3ab24e22f5f9ceeefbfe" SRC_URI += "file://03_orcutils.patch;patch=1 \ file://99_autoreconf.patch;patch=1" -inherit autotools pkgconfig - -BBCLASSEXTEND = "native" - -PACKAGES += "liborc" -PACKAGES_liborc = ${libdir} -- cgit v1.2.3 From 9db328be3462d26713ca5e92b2b9851836143465 Mon Sep 17 00:00:00 2001 From: Benjamin Schieder Date: Sat, 13 Mar 2010 13:21:24 +0000 Subject: fltkspacetrader: update to version 1.2-stable Signed-off-by: Martin Jansa --- recipes/fltk/fltkspacetrader_svn.bb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/recipes/fltk/fltkspacetrader_svn.bb b/recipes/fltk/fltkspacetrader_svn.bb index f793aa2b77..b19e5928e6 100644 --- a/recipes/fltk/fltkspacetrader_svn.bb +++ b/recipes/fltk/fltkspacetrader_svn.bb @@ -4,11 +4,11 @@ AUTHOR = "Benjamin 'blindcoder' Schieder' LICENSE = "GPLv2" SECTION = "x11/game" DEPENDS = "fltk" -SRCREV = "110" -PV = "1.0+svnr${SRCPV}" +SRCREV = "190" +PV = "1.2+svnr${SRCPV}" PR = "r0" -S = "${WORKDIR}/1.0-stable" +S = "${WORKDIR}/1.2-stable" inherit autotools -SRC_URI = "svn://scavenger.homeip.net/svn/fltkspacetrader/tags;module=1.0-stable;proto=http" +SRC_URI = "svn://scavenger.homeip.net/svn/fltkspacetrader/tags;module=1.2-stable;proto=http" -- cgit v1.2.3 From af193378c397a9fd872445247e60ffb0a1e6399f Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 15 Mar 2010 10:15:57 +0100 Subject: gnome-screensaver: update to 2.28.3 Fixes: CVE name CVE-2010-0414 CVE name CVE-2010-0422 --- recipes/gnome/gnome-screensaver_2.28.0.bb | 27 --------------------------- recipes/gnome/gnome-screensaver_2.28.3.bb | 26 ++++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 27 deletions(-) delete mode 100644 recipes/gnome/gnome-screensaver_2.28.0.bb create mode 100644 recipes/gnome/gnome-screensaver_2.28.3.bb diff --git a/recipes/gnome/gnome-screensaver_2.28.0.bb b/recipes/gnome/gnome-screensaver_2.28.0.bb deleted file mode 100644 index 06a4ffe48e..0000000000 --- a/recipes/gnome/gnome-screensaver_2.28.0.bb +++ /dev/null @@ -1,27 +0,0 @@ -DESCRIPTION = "GNOME utilities" -SECTION = "x11/gnome" -LICENSE = "GPL" -DEPENDS = "gnome-common glib-2.0 gtk+ gconf" - -inherit gnome pkgconfig - -PR = "r1" - -EXTRA_OECONF = " \ - --with-shadow=${STAGING_INCDIR}/.. \ - " - -do_configure_prepend () { - cp ${STAGING_DATADIR}/gnome-common/data/omf.make ${S} - sed -i -e 's:$CPPFLAGS -I$includedir:$CPPFLAGS:g' configure.ac -} - -do_stage () { - autotools_stage_all -} - -FILES_${PN} += "${datadir}/*background* ${datadir}/desktop-directories" - -FILES_${PN}-dbg += "${libexecdir}/gnome-screensaver/.debug " - - diff --git a/recipes/gnome/gnome-screensaver_2.28.3.bb b/recipes/gnome/gnome-screensaver_2.28.3.bb new file mode 100644 index 0000000000..7ce5899b9a --- /dev/null +++ b/recipes/gnome/gnome-screensaver_2.28.3.bb @@ -0,0 +1,26 @@ +DESCRIPTION = "GNOME utilities" +SECTION = "x11/gnome" +LICENSE = "GPL" +DEPENDS = "gnome-menus gnome-desktop gnome-common shadow glib-2.0 gtk+ gconf" + +inherit gnome + +SRC_URI[archive.md5sum] = "e6fb9b206f3470c04e21474ee6d69687" +SRC_URI[archive.sha256sum] = "f2ffec4f637883c7db15fb94c3f85a7d59ade3cf1f0107ecebc01df13f0ad5c3" + +EXTRA_OECONF = " \ + --with-shadow=${STAGING_INCDIR}/.. \ + " +# requires a too recent, non-default autoconf +do_configure () { + cp ${STAGING_DATADIR}/gnome-common/data/omf.make ${S} + sed -i -e 's:$CPPFLAGS -I$includedir:$CPPFLAGS:g' configure.ac + gnu-configize + oe_runconf +} + +FILES_${PN} += "${datadir}/*background* ${datadir}/desktop-directories" + +FILES_${PN}-dbg += "${libexecdir}/gnome-screensaver/.debug " + + -- cgit v1.2.3 From 877336508d3e947c46c0165a52891fe4645ad5c1 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 15 Mar 2010 10:24:23 +0100 Subject: tiff 3.9.2: fix build breakage --- recipes/libtiff/tiff_3.9.2.bb | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/recipes/libtiff/tiff_3.9.2.bb b/recipes/libtiff/tiff_3.9.2.bb index 9beb444954..5f022e0b1d 100644 --- a/recipes/libtiff/tiff_3.9.2.bb +++ b/recipes/libtiff/tiff_3.9.2.bb @@ -4,13 +4,21 @@ HOMEPAGE = "http://www.remotesensing.org/libtiff/" DEPENDS = "zlib jpeg lzo" PV = "3.9.2+4.0.0beta5" +PR = "r1" + SRC_URI = "ftp://ftp.remotesensing.org/pub/libtiff/tiff-4.0.0beta5.tar.gz;name=tiff400beta5targz" SRC_URI[tiff400beta5targz.md5sum] = "a0a83604e38a299fae9f0b1a39c04870" SRC_URI[tiff400beta5targz.sha256sum] = "64b61567782643a841e33a8d031d0d6a9b3e436108829e2e947183f8dcdc6ec7" S = "${WORKDIR}/${PN}-4.0.0beta5" -inherit autotools_stage +inherit autotools + +# requires a too recent, non-default autoconf +do_configure() { + gnu-configize + oe_runconf +} PACKAGES =+ "tiffxx tiffxx-dbg tiffxx-dev tiff-utils tiff-utils-dbg" FILES_tiffxx = "${libdir}/libtiffxx.so.*" -- cgit v1.2.3 From 67464940dd44e89d0430aa252da8145dfe554629 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 15 Mar 2010 11:17:15 +0100 Subject: gnome-screensaver 2.28.3: fix up configure as well now --- recipes/gnome/gnome-screensaver_2.28.3.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipes/gnome/gnome-screensaver_2.28.3.bb b/recipes/gnome/gnome-screensaver_2.28.3.bb index 7ce5899b9a..d6468a3533 100644 --- a/recipes/gnome/gnome-screensaver_2.28.3.bb +++ b/recipes/gnome/gnome-screensaver_2.28.3.bb @@ -15,6 +15,8 @@ EXTRA_OECONF = " \ do_configure () { cp ${STAGING_DATADIR}/gnome-common/data/omf.make ${S} sed -i -e 's:$CPPFLAGS -I$includedir:$CPPFLAGS:g' configure.ac + sed -i -e 's:$CPPFLAGS -I$includedir:$CPPFLAGS:g' configure + gnu-configize oe_runconf } -- cgit v1.2.3 From 155a02d594d23ce68e09bb424589353396c02cb1 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 15 Mar 2010 11:35:05 +0100 Subject: angstrom: our preferred tiff version was removed for some reason, move to 3.9.2+4.0.0beta5 --- conf/distro/include/angstrom-2008-preferred-versions.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc index fe278925bd..2b035cffb2 100644 --- a/conf/distro/include/angstrom-2008-preferred-versions.inc +++ b/conf/distro/include/angstrom-2008-preferred-versions.inc @@ -44,7 +44,7 @@ PREFERRED_VERSION_qt4-x11-free = "${ANGSTROM_QT_VERSION}" PREFERRED_VERSION_qt4-x11-free-gles = "${ANGSTROM_QT_VERSION}" PREFERRED_VERSION_samba = "3.3.9" -PREFERRED_VERSION_tiff = "3.8.2+4.0.0beta2" +PREFERRED_VERSION_tiff = "3.9.2+4.0.0beta5" PREFERRED_VERSION_udev = "151" PREFERRED_VERSION_udev_libc-uclibc = "141" -- cgit v1.2.3 From 6825b1bca785ac10e921359434f3ce37c214c0cd Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 15 Mar 2010 11:50:46 +0100 Subject: faad2: add 2.7 --- recipes/faad2/faad2_2.7.bb | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 recipes/faad2/faad2_2.7.bb diff --git a/recipes/faad2/faad2_2.7.bb b/recipes/faad2/faad2_2.7.bb new file mode 100644 index 0000000000..e778432840 --- /dev/null +++ b/recipes/faad2/faad2_2.7.bb @@ -0,0 +1,23 @@ +DESCRIPTION = "Library for reading some sort of media format." +SECTION = "libs" +LICENSE = "LGPL" +PRIORITY = "optional" + +inherit autotools + +SRC_URI = "${SOURCEFORGE_MIRROR}/faac/faad2-src/faad2-${PV}/${PN}-${PV}.tar.bz2;name=faad2 \ +" + +SRC_URI[faad2.md5sum] = "4c332fa23febc0e4648064685a3d4332" +SRC_URI[faad2.sha256sum] = "14561b5d6bc457e825bfd3921ae50a6648f377a9396eaf16d4b057b39a3f63b5" + +PACKAGES =+ "libfaad libfaad-dev libmp4ff libmp4ff-dev" + +FILES_${PN} = "${bindir}/faad" + +FILES_libfaad = "${libdir}/libfaad.so.*" +FILES_libfaad-dev = "${libdir}/libfaad.so ${libdir}/libfaad.la ${libdir}/libfaad.a ${includedir}/faad.h" + +FILES_libmp4ff = "${libdir}/libmp4ff.so.*" +FILES_libmp4ff-dev = "${libdir}/libmp4ff.so ${libdir}/libmp4ff.la ${libdir}/libmp4ff.a ${includedir}/mp4ff.h" + -- cgit v1.2.3 From 777e10ed24f420cbba22c4850bd514f8d039ca36 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 15 Mar 2010 12:48:15 +0100 Subject: angstrom: move to wget 1.11.4 --- conf/distro/include/angstrom-2008-preferred-versions.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc index 2b035cffb2..f3874192bb 100644 --- a/conf/distro/include/angstrom-2008-preferred-versions.inc +++ b/conf/distro/include/angstrom-2008-preferred-versions.inc @@ -52,6 +52,7 @@ UDEV_GE_141 = "1" PREFERRED_VERSION_usbutils = "0.86" PREFERRED_VERSION_wpa-supplicant = "0.6.9" +PREFERRED_VERSION_wget = "1.11.4" PREFERRED_VERSION_xserver-common = "1.32" PREFERRED_VERSION_xserver-kdrive = "1.4.0.90" -- cgit v1.2.3 From 5ae3348001d680637744864037c8425159bfbc7b Mon Sep 17 00:00:00 2001 From: Michael Lippautz Date: Sun, 14 Mar 2010 20:24:12 +0100 Subject: udns: New recipe * udns is a stub DNS resolver library for sync and async DNS queries --- recipes/udns/files/fix-cc-check.patch | 36 +++++++++++++++++++++++++++++++++++ recipes/udns/udns_0.0.9.bb | 31 ++++++++++++++++++++++++++++++ 2 files changed, 67 insertions(+) create mode 100644 recipes/udns/files/fix-cc-check.patch create mode 100644 recipes/udns/udns_0.0.9.bb diff --git a/recipes/udns/files/fix-cc-check.patch b/recipes/udns/files/fix-cc-check.patch new file mode 100644 index 0000000000..0811849d0a --- /dev/null +++ b/recipes/udns/files/fix-cc-check.patch @@ -0,0 +1,36 @@ +--- a/configure.lib 2007-01-07 21:59:09.000000000 +0100 ++++ b/configure.lib 2010-03-04 11:38:32.000000000 +0100 +@@ -125,7 +125,7 @@ + echo 'int main(int argc, char **argv) { return 0; }' >conftest.c + + if [ -n "$CC" ]; then +- if ac_run $CC -o conftest conftest.c && ac_run ./conftest; then ++ if ac_run $CC -o conftest conftest.c; then + ac_result "\$CC ($CC)" + else + ac_result no +@@ -133,7 +133,7 @@ + fi + else + for cc in gcc cc ; do +- if ac_run $cc -o conftest conftest.c && ac_run ./conftest; then ++ if ac_run $cc -o conftest conftest.c; then + ac_result "$cc" + CC=$cc + break +@@ -161,15 +161,6 @@ + ccld="$cc" + if [ -n "$LDFLAGS" ]; then ccld="$ccld $LDFLAGS"; fi + if [ -n "$LIBS" ]; then ccld="$ccld $LIBS"; fi +- if ac_yesno "whenever the C compiler ($ccld) +- can produce executables" \ +- ac_compile_run < Date: Mon, 15 Mar 2010 13:38:32 +0100 Subject: unrar, unrar-native: Bump to version 3.9.9 * Fixes CVE name CVE-2007-0855 * Remove old recipe, because it neither used current staging, nor native extension --- recipes/unrar/files/makefile.unix.patch | 21 +++++++++++++++++++++ recipes/unrar/unrar-native_3.4.3.bb | 14 -------------- recipes/unrar/unrar.inc | 7 ------- recipes/unrar/unrar_3.4.3.bb | 6 ------ recipes/unrar/unrar_3.9.9.bb | 23 +++++++++++++++++++++++ 5 files changed, 44 insertions(+), 27 deletions(-) create mode 100644 recipes/unrar/files/makefile.unix.patch delete mode 100644 recipes/unrar/unrar-native_3.4.3.bb delete mode 100644 recipes/unrar/unrar.inc delete mode 100644 recipes/unrar/unrar_3.4.3.bb create mode 100644 recipes/unrar/unrar_3.9.9.bb diff --git a/recipes/unrar/files/makefile.unix.patch b/recipes/unrar/files/makefile.unix.patch new file mode 100644 index 0000000000..ce72351d4b --- /dev/null +++ b/recipes/unrar/files/makefile.unix.patch @@ -0,0 +1,21 @@ +--- a/makefile.unix 2009-05-03 07:18:45.000000000 +0200 ++++ b/makefile.unix 2010-03-15 13:31:31.000000000 +0100 +@@ -9,8 +9,8 @@ + #CXX=g++ + #CXXFLAGS=-O2 + DEFINES=-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE +-STRIP=strip +-DESTDIR=/usr ++#STRIP=strip ++#DESTDIR=/usr + + # Linux using LCC + #CXX=lcc +@@ -136,6 +136,7 @@ + $(LINK) -shared -o libunrar.so $(LDFLAGS) $(OBJECTS) $(LIB_OBJ) + + install-unrar: ++ install -d $(DESTDIR)/bin + install unrar $(DESTDIR)/bin + + uninstall-unrar: diff --git a/recipes/unrar/unrar-native_3.4.3.bb b/recipes/unrar/unrar-native_3.4.3.bb deleted file mode 100644 index 4b87691e89..0000000000 --- a/recipes/unrar/unrar-native_3.4.3.bb +++ /dev/null @@ -1,14 +0,0 @@ -require unrar.inc -inherit native - -do_stage() { - install unrar ${STAGING_BINDIR} -} - -do_package() { - : -} - -do_install() { - : -} diff --git a/recipes/unrar/unrar.inc b/recipes/unrar/unrar.inc deleted file mode 100644 index 4887ac9fb2..0000000000 --- a/recipes/unrar/unrar.inc +++ /dev/null @@ -1,7 +0,0 @@ -SRC_URI = "http://www.rarlab.com/rar/unrarsrc-${PV}.tar.gz" -S = "${WORKDIR}/unrar" - -do_compile() { - oe_runmake -f makefile.unix -} - diff --git a/recipes/unrar/unrar_3.4.3.bb b/recipes/unrar/unrar_3.4.3.bb deleted file mode 100644 index 39d81990e2..0000000000 --- a/recipes/unrar/unrar_3.4.3.bb +++ /dev/null @@ -1,6 +0,0 @@ -require unrar.inc - -do_install() { - install -d ${D}${bindir} - install -m 0755 unrar ${D}${bindir} -} diff --git a/recipes/unrar/unrar_3.9.9.bb b/recipes/unrar/unrar_3.9.9.bb new file mode 100644 index 0000000000..21e1f23d53 --- /dev/null +++ b/recipes/unrar/unrar_3.9.9.bb @@ -0,0 +1,23 @@ +DESCRIPTION = "RAR archivers" +HOMEPAGE = "http://www.rarlab.com/" +PR = "r0" + +SRC_URI = "http://www.rarlab.com/rar/unrarsrc-${PV}.tar.gz;name=unrar \ + file://makefile.unix.patch;patch=1" +SRC_URI[unrar.md5sum] = "4271fc8710d299341c969666492b305c" +SRC_URI[unrar.sha256sum] = "460d4c014f5aaaa9b1c810dca180f07e155678b322169e20f4e51c616fa0e7ff" + +S = "${WORKDIR}/unrar" + +BBCLASSEXTEND = "native" +NATIVE_INSTALL_WORKS = "1" + +EXTRA_OEMAKE = "-f makefile.unix DESTDIR=${D}${exec_prefix}" + +do_compile() { + oe_runmake +} + +do_install() { + oe_runmake install +} -- cgit v1.2.3 From fada583c1f2478194f705d65c1b386ddbf33cbfc Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Mon, 15 Mar 2010 13:42:26 +0000 Subject: git-native_1.7.0.2.bb : disable building/installing of python stuff It was zeckes opinion that we dont need the python stuff for OE useage and looking at what is installed I would agree. Disabled it otherwise we need to point it at python-native to stop it using host python. --- recipes/git/git-native_1.7.0.2.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipes/git/git-native_1.7.0.2.bb b/recipes/git/git-native_1.7.0.2.bb index 63b14cbaad..b55070aa71 100644 --- a/recipes/git/git-native_1.7.0.2.bb +++ b/recipes/git/git-native_1.7.0.2.bb @@ -4,3 +4,5 @@ DEPENDS = "openssl-native curl-native zlib-native expat-native" PR = "r4" SRC_URI[src.md5sum] = "76518fa774b36de81d160b85fa4f19c1" SRC_URI[src.sha256sum] = "5601df7fc282fdd66de196b282694eb77dcfc50438f01587de144b3ead1a6b2f" + +EXTRA_OECONF_append = " --without-python" -- cgit v1.2.3 From 2f986116ca46536bdad75433755de1cfc3450847 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 15 Mar 2010 14:45:13 +0100 Subject: musicbrainz: _append needs a leading space --- recipes/musicbrainz/libmusicbrainz_3.0.2.bb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/recipes/musicbrainz/libmusicbrainz_3.0.2.bb b/recipes/musicbrainz/libmusicbrainz_3.0.2.bb index 78417a3d8a..f7231a25b7 100644 --- a/recipes/musicbrainz/libmusicbrainz_3.0.2.bb +++ b/recipes/musicbrainz/libmusicbrainz_3.0.2.bb @@ -1,5 +1,6 @@ +require ${PN}.inc + PR = "r1" -SRC_URI_append = "file://libmusicbrainz-3.0.2-gcc-4.4-fix.patch;patch=1" +SRC_URI_append = " file://libmusicbrainz-3.0.2-gcc-4.4-fix.patch;patch=1" -require ${PN}.inc -- cgit v1.2.3 From d19778d422c02e1d01676148cf9db8be20155bca Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 15 Mar 2010 15:14:15 +0100 Subject: linux kernels: linux is GPLv2, so specify that in LICENSE instead of generic 'GPL' --- recipes/linux/LAB-kernel_2.6.13-hh2.bb | 2 +- recipes/linux/LAB-kernel_cvs.bb | 2 +- recipes/linux/c7x0-kernels-2.4-embedix.bb | 2 +- recipes/linux/chumby-kernel_2.6.16-chumby-1.2.bb | 2 +- recipes/linux/collie-kernels-2.4-embedix.bb | 2 +- recipes/linux/compulab-pxa270_2.6.16.bb | 2 +- recipes/linux/devkitidp-pxa255_2.6.19.bb | 2 +- recipes/linux/ep93xx-kernel_2.6.17+2.6.18-rc1.bb | 2 +- recipes/linux/ep93xx-kernel_2.6.19+2.6.20-rc7.bb | 2 +- recipes/linux/gumstix-linux.inc | 2 +- recipes/linux/gumstix_2.6.5-gnalm1-gum0.bb | 2 +- recipes/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh42.bb | 2 +- recipes/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh42.bb | 2 +- recipes/linux/ipod_2.4.24-ipod0.bb | 2 +- recipes/linux/ixp4xx-kernel.inc | 2 +- recipes/linux/linux-amsdelta-2.6_2.6.16-omap2.bb | 2 +- recipes/linux/linux-bast_2.4.25-vrs1-bast1.bb | 2 +- recipes/linux/linux-bd-neon-2.6_2.6.22.bb | 2 +- recipes/linux/linux-colinux_2.4.28.bb | 2 +- recipes/linux/linux-colinux_2.6.10.bb | 2 +- recipes/linux/linux-ea3250_2.6.27.8.bb | 2 +- recipes/linux/linux-efika_2.6.18+2.6.19-rc6.bb | 2 +- recipes/linux/linux-efika_2.6.20.20.bb | 2 +- recipes/linux/linux-efika_2.6.20.bb | 2 +- recipes/linux/linux-efika_2.6.21+git.bb | 2 +- recipes/linux/linux-epia_2.6.11.bb | 2 +- recipes/linux/linux-epia_2.6.12.bb | 2 +- recipes/linux/linux-epia_2.6.19.2.bb | 2 +- recipes/linux/linux-epia_2.6.8.1.bb | 2 +- recipes/linux/linux-geodegx_2.4.24.bb | 2 +- recipes/linux/linux-geodelx_2.6.11.bb | 2 +- recipes/linux/linux-gumstix_2.6.15.bb | 2 +- recipes/linux/linux-h1940_2.6.11-bk1-h1940.bb | 2 +- recipes/linux/linux-h1940_2.6.14-h1940.bb | 2 +- recipes/linux/linux-h1940_2.6.17-h1940.bb | 2 +- recipes/linux/linux-h6300-omap1_2.6.12-rc5.bb | 2 +- recipes/linux/linux-h6300-omap1_2.6.14.3.bb | 2 +- recipes/linux/linux-h6300-omap1_2.6.16.16.bb | 2 +- recipes/linux/linux-hackndev-2.6_git.bb | 2 +- recipes/linux/linux-handhelds-2.6.inc | 2 +- recipes/linux/linux-handhelds-2.6_2.6.16-hh9.bb | 2 +- recipes/linux/linux-handhelds-2.6_2.6.17-hh4.bb | 2 +- recipes/linux/linux-handhelds-2.6_2.6.18-hh2.bb | 2 +- recipes/linux/linux-handhelds-2.6_2.6.19-hh13.bb | 2 +- recipes/linux/linux-handhelds-2.6_2.6.20-hh10.bb | 2 +- recipes/linux/linux-handhelds-2.6_2.6.21-hh20.bb | 2 +- recipes/linux/linux-handhelds-2.6_cvs.bb | 2 +- recipes/linux/linux-jlime-ben_2.6.32.bb | 2 +- recipes/linux/linux-jlime-current.bb | 2 +- recipes/linux/linux-jlime-jornada6xx_2.6.11.bb | 2 +- recipes/linux/linux-jlime-jornada6xx_2.6.17.bb | 2 +- recipes/linux/linux-jlime-jornada6xx_2.6.21rc5.bb | 2 +- recipes/linux/linux-jlime-jornada6xx_2.6.25.bb | 2 +- recipes/linux/linux-jlime-jornada6xx_2.6.32.bb | 2 +- recipes/linux/linux-jlime-jornada7xx_2.6.17.bb | 2 +- recipes/linux/linux-jlime-jornada7xx_2.6.18.bb | 2 +- recipes/linux/linux-jlime-jornada7xx_2.6.19rc6.bb | 2 +- recipes/linux/linux-jlime-jornada7xx_2.6.32+git.bb | 2 +- recipes/linux/linux-kirkwood_2.6.29.5.bb | 2 +- recipes/linux/linux-kirkwood_2.6.30.5.bb | 2 +- recipes/linux/linux-kirkwood_2.6.31.bb | 2 +- recipes/linux/linux-kirkwood_2.6.33-rc1.bb | 2 +- recipes/linux/linux-kirkwood_2.6.33-rc5.bb | 2 +- recipes/linux/linux-ks8695_2.6.16.bb | 2 +- recipes/linux/linux-linkstationppc_2.6.28.4.bb | 2 +- recipes/linux/linux-magicbox_2.6.18.6.bb | 2 +- recipes/linux/linux-magicbox_2.6.19.2.bb | 2 +- recipes/linux/linux-mainstone_2.6.25.bb | 2 +- recipes/linux/linux-mini2440_2.6.30+git.bb | 2 +- recipes/linux/linux-mini2440_2.6.31+git.bb | 2 +- recipes/linux/linux-ml403-mvista-2.6.x_git.bb | 2 +- recipes/linux/linux-mtx-1_2.4.27.bb | 2 +- recipes/linux/linux-mtx-2_2.4.27.bb | 2 +- recipes/linux/linux-mtx-3_2.6.15.4.bb | 2 +- recipes/linux/linux-mtx-3_2.6.15.bb | 2 +- recipes/linux/linux-n1200_2.6.27-rc9+git.bb | 2 +- recipes/linux/linux-navman_2.6.18.bb | 2 +- recipes/linux/linux-nokia800.inc | 2 +- recipes/linux/linux-omap-2.6_2.6.9-omap1.bb | 2 +- recipes/linux/linux-orion_2.6.28.4.bb | 2 +- recipes/linux/linux-palm-omap1_2.6.22-omap1.bb | 2 +- recipes/linux/linux-rp.inc | 2 +- recipes/linux/linux-sequoia_2.6.21.bb | 2 +- recipes/linux/linux-sgh-i900_2.6.32.bb | 2 +- recipes/linux/linux-smdk2440_2.6.20+git.bb | 2 +- recipes/linux/linux-smdk2443_2.6.20+git.bb | 2 +- recipes/linux/linux-storcenter_2.6.27.7.bb | 2 +- recipes/linux/linux-sun4cdm_2.4.26.bb | 2 +- recipes/linux/linux-sun4cdm_2.6.8.1.bb | 2 +- recipes/linux/linux-titan-sh4_2.6.21.bb | 2 +- recipes/linux/linux-tornado-omap2_2.6.16.16.bb | 2 +- recipes/linux/linux-turbostation_2.6.20.2.bb | 2 +- recipes/linux/linux-wrap-geode_2.6.17.bb | 2 +- recipes/linux/linux-wrt_2.4.20.bb | 2 +- recipes/linux/linux-wrt_2.4.30.bb | 2 +- recipes/linux/linux-x86_2.6.17.9.bb | 2 +- recipes/linux/linux-x86_2.6.20.bb | 2 +- recipes/linux/linux-xilinx-slab_git.bb | 2 +- recipes/linux/linux-xxs1500_2.4.21.bb | 2 +- recipes/linux/linux-z_2.6.20.bb | 2 +- recipes/linux/linux.inc | 2 +- recipes/linux/linux_2.6.14.bb | 2 +- recipes/linux/logicpd-pxa270_2.6.17-rc5.bb | 2 +- recipes/linux/logicpd-pxa270_2.6.19.2.bb | 2 +- recipes/linux/mainstone-kernel_2.6.11.bb | 2 +- recipes/linux/mainstone-kernel_2.6.18.bb | 2 +- recipes/linux/mnci-ramses_2.4.21-rmk2-pxa1.bb | 2 +- recipes/linux/mx21ads-kernel_2.6.19rc6.bb | 2 +- recipes/linux/netbook-pro-kernel_2.6.17.bb | 2 +- recipes/linux/opensimpad_2.4.25-vrs2-pxa1-jpm1.bb | 2 +- recipes/linux/opensimpad_2.4.27-vrs1-pxa1-jpm1.bb | 2 +- recipes/linux/openzaurus-pxa27x_2.4.20-rmk2-embedix20050602.bb | 2 +- recipes/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc | 2 +- recipes/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb | 2 +- recipes/linux/triton-kernel_2.6.11.bb | 2 +- recipes/linux/xanadux-ba-2.6_2.6.12.bb | 2 +- recipes/linux/xanadux-un-2.6_2.6.12.bb | 2 +- 117 files changed, 117 insertions(+), 117 deletions(-) diff --git a/recipes/linux/LAB-kernel_2.6.13-hh2.bb b/recipes/linux/LAB-kernel_2.6.13-hh2.bb index f03a7db402..8340043f82 100644 --- a/recipes/linux/LAB-kernel_2.6.13-hh2.bb +++ b/recipes/linux/LAB-kernel_2.6.13-hh2.bb @@ -1,6 +1,6 @@ SECTION = "kernel" DESCRIPTION = "Liux As Bootloader kernelm" -LICENSE = "GPL" +LICENSE = "GPLv2" COMPATIBLE_HOST = "arm.*-linux" COMPATIBLE_MACHINE = "h2200" diff --git a/recipes/linux/LAB-kernel_cvs.bb b/recipes/linux/LAB-kernel_cvs.bb index 0daa4742f3..2ee43c7ac8 100644 --- a/recipes/linux/LAB-kernel_cvs.bb +++ b/recipes/linux/LAB-kernel_cvs.bb @@ -1,6 +1,6 @@ SECTION = "kernel" DESCRIPTION = "Liux As Bootloader kernelm" -LICENSE = "GPL" +LICENSE = "GPLv2" PV = "${K_MAJOR}.${K_MINOR}.${K_MICRO}-hh${HHV}+cvs${SRCDATE}" #!BIG FAT WARNING: diff --git a/recipes/linux/c7x0-kernels-2.4-embedix.bb b/recipes/linux/c7x0-kernels-2.4-embedix.bb index 60b7a5cafb..95bdfbce61 100644 --- a/recipes/linux/c7x0-kernels-2.4-embedix.bb +++ b/recipes/linux/c7x0-kernels-2.4-embedix.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Build all c7x0 kernels in one go" SECTION = "kernel" -LICENSE = "GPL" +LICENSE = "GPLv2" PROVIDES = "virtual/kernel" PR = "r1" diff --git a/recipes/linux/chumby-kernel_2.6.16-chumby-1.2.bb b/recipes/linux/chumby-kernel_2.6.16-chumby-1.2.bb index 4967c1ec35..91d32c98f6 100644 --- a/recipes/linux/chumby-kernel_2.6.16-chumby-1.2.bb +++ b/recipes/linux/chumby-kernel_2.6.16-chumby-1.2.bb @@ -2,7 +2,7 @@ require linux.inc SECTION = "kernel" DESCRIPTION = "Linux kernel for the Chumby" -LICENSE = "GPL" +LICENSE = "GPLv2" PR = "r4" SRC_URI = "http://files.chumby.com/source/ironforge/build396/linux-2.6.16-chumby-1.2.tar.gz \ diff --git a/recipes/linux/collie-kernels-2.4-embedix.bb b/recipes/linux/collie-kernels-2.4-embedix.bb index 1445e41151..d5f9a7d749 100644 --- a/recipes/linux/collie-kernels-2.4-embedix.bb +++ b/recipes/linux/collie-kernels-2.4-embedix.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Build all collie kernels in one go" SECTION = "kernel" -LICENSE = "GPL" +LICENSE = "GPLv2" PROVIDES = "virtual/kernel" PR = "r2" diff --git a/recipes/linux/compulab-pxa270_2.6.16.bb b/recipes/linux/compulab-pxa270_2.6.16.bb index 6dc92f69b6..71b7c8f009 100644 --- a/recipes/linux/compulab-pxa270_2.6.16.bb +++ b/recipes/linux/compulab-pxa270_2.6.16.bb @@ -1,6 +1,6 @@ SECTION = "kernel" DESCRIPTION = "Linux kernel for the Compulab PXA270 system" -LICENSE = "GPL" +LICENSE = "GPLv2" PR = "r6" do_unpack[depends] += "unzip-native:do_populate_staging" diff --git a/recipes/linux/devkitidp-pxa255_2.6.19.bb b/recipes/linux/devkitidp-pxa255_2.6.19.bb index f9eb6a7777..6f098d9ff3 100644 --- a/recipes/linux/devkitidp-pxa255_2.6.19.bb +++ b/recipes/linux/devkitidp-pxa255_2.6.19.bb @@ -1,6 +1,6 @@ SECTION = "kernel" DESCRIPTION = "Linux kernel for the BSQUARE PXA255 DevKitIDP" -LICENSE = "GPL" +LICENSE = "GPLv2" PR = "r4" DEPENDS = "u-boot" diff --git a/recipes/linux/ep93xx-kernel_2.6.17+2.6.18-rc1.bb b/recipes/linux/ep93xx-kernel_2.6.17+2.6.18-rc1.bb index b233dd7870..d3a079da36 100644 --- a/recipes/linux/ep93xx-kernel_2.6.17+2.6.18-rc1.bb +++ b/recipes/linux/ep93xx-kernel_2.6.17+2.6.18-rc1.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Linux Kernel for Cirrus Logic ep39xx compatible machines" SECTION = "kernel" -LICENSE = "GPL" +LICENSE = "GPLv2" PR = "r1" COMPATIBLE_MACHINE = "ep93xx" diff --git a/recipes/linux/ep93xx-kernel_2.6.19+2.6.20-rc7.bb b/recipes/linux/ep93xx-kernel_2.6.19+2.6.20-rc7.bb index 9aab5d8bed..9bd3a4ad92 100644 --- a/recipes/linux/ep93xx-kernel_2.6.19+2.6.20-rc7.bb +++ b/recipes/linux/ep93xx-kernel_2.6.19+2.6.20-rc7.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Linux Kernel for Cirrus Logic ep39xx compatible machines" SECTION = "kernel" -LICENSE = "GPL" +LICENSE = "GPLv2" PR = "r1" COMPATIBLE_MACHINE = "ep93xx" diff --git a/recipes/linux/gumstix-linux.inc b/recipes/linux/gumstix-linux.inc index 030abf2c88..0b80cc86fe 100644 --- a/recipes/linux/gumstix-linux.inc +++ b/recipes/linux/gumstix-linux.inc @@ -1,6 +1,6 @@ DESCRIPTION = "Linux kernel for custom configurations" SECTION = "kernel" -LICENSE = "GPL" +LICENSE = "GPLv2" PR = "r1" inherit kernel diff --git a/recipes/linux/gumstix_2.6.5-gnalm1-gum0.bb b/recipes/linux/gumstix_2.6.5-gnalm1-gum0.bb index 9af2696d66..2bab58ec43 100644 --- a/recipes/linux/gumstix_2.6.5-gnalm1-gum0.bb +++ b/recipes/linux/gumstix_2.6.5-gnalm1-gum0.bb @@ -3,7 +3,7 @@ BROKEN = "1" SECTION = "kernel" DESCRIPTION = "Linux kernel for OMAP processors" -LICENSE = "GPL" +LICENSE = "GPLv2" COMPATIBLE_MACHINE = "gumstix" diff --git a/recipes/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh42.bb b/recipes/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh42.bb index 21e3c18534..0b76adba52 100644 --- a/recipes/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh42.bb +++ b/recipes/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh42.bb @@ -1,6 +1,6 @@ SECTION = "kernel" DESCRIPTION = "handhelds.org Linux kernel for PXA25x based devices." -LICENSE = "GPL" +LICENSE = "GPLv2" #PR = "r1" diff --git a/recipes/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh42.bb b/recipes/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh42.bb index adca8740de..65fdbda6da 100644 --- a/recipes/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh42.bb +++ b/recipes/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh42.bb @@ -1,6 +1,6 @@ SECTION = "kernel" DESCRIPTION = "handhelds.org Linux kernel for StrongArm processor based devices." -LICENSE = "GPL" +LICENSE = "GPLv2" PR = "r0" DEFAULT_PREFERENCE = "-1" diff --git a/recipes/linux/ipod_2.4.24-ipod0.bb b/recipes/linux/ipod_2.4.24-ipod0.bb index b0fe9886e5..2704d1da38 100644 --- a/recipes/linux/ipod_2.4.24-ipod0.bb +++ b/recipes/linux/ipod_2.4.24-ipod0.bb @@ -1,6 +1,6 @@ SECTION = "kernel" DESCRIPTION = "Linux kernel for Ipods" -LICENSE = "GPL" +LICENSE = "GPLv2" KV = "2.4.24" PV = "${KV}-ipod0" diff --git a/recipes/linux/ixp4xx-kernel.inc b/recipes/linux/ixp4xx-kernel.inc index 910819e666..10779c52c7 100644 --- a/recipes/linux/ixp4xx-kernel.inc +++ b/recipes/linux/ixp4xx-kernel.inc @@ -24,7 +24,7 @@ # SECTION = "kernel" DESCRIPTION = "Linux kernel for the Intel IXP4xx device" -LICENSE = "GPL" +LICENSE = "GPLv2" DEPENDS = "arm-kernel-shim devio-native" diff --git a/recipes/linux/linux-amsdelta-2.6_2.6.16-omap2.bb b/recipes/linux/linux-amsdelta-2.6_2.6.16-omap2.bb index db72fe7d31..d989b831ae 100644 --- a/recipes/linux/linux-amsdelta-2.6_2.6.16-omap2.bb +++ b/recipes/linux/linux-amsdelta-2.6_2.6.16-omap2.bb @@ -1,6 +1,6 @@ SECTION = "kernel" DESCRIPTION = "2.6 Linux kernel for the Amstrad Delta (E3)" -LICENSE = "GPL" +LICENSE = "GPLv2" COMPATIBLE_MACHINE = "amsdelta" diff --git a/recipes/linux/linux-bast_2.4.25-vrs1-bast1.bb b/recipes/linux/linux-bast_2.4.25-vrs1-bast1.bb index 2fbdf1aa9c..04fb39c87e 100644 --- a/recipes/linux/linux-bast_2.4.25-vrs1-bast1.bb +++ b/recipes/linux/linux-bast_2.4.25-vrs1-bast1.bb @@ -1,6 +1,6 @@ SECTION = "kernel" DESCRIPTION = "Linux kernel for Simtec EB2410ITX" -LICENSE = "GPL" +LICENSE = "GPLv2" KV = "2.4.25" KERNEL_CCSUFFIX = "-3.3.3" diff --git a/recipes/linux/linux-bd-neon-2.6_2.6.22.bb b/recipes/linux/linux-bd-neon-2.6_2.6.22.bb index 3fca851ef2..111b43aa7e 100644 --- a/recipes/linux/linux-bd-neon-2.6_2.6.22.bb +++ b/recipes/linux/linux-bd-neon-2.6_2.6.22.bb @@ -1,7 +1,7 @@ DESCRIPTION = "2.6 Linux Kernel for Boundary Devices NEON Board" SECTION = "kernel" HOMEPAGE = "N/A" -LICENSE = "GPL" +LICENSE = "GPLv2" COMPATIBLE_MACHINE = "bd-neon" DEPENDS += "u-boot-utils-native" diff --git a/recipes/linux/linux-colinux_2.4.28.bb b/recipes/linux/linux-colinux_2.4.28.bb index dc052afce1..58ea5889ea 100644 --- a/recipes/linux/linux-colinux_2.4.28.bb +++ b/recipes/linux/linux-colinux_2.4.28.bb @@ -1,6 +1,6 @@ SECTION = "kernel" DESCRIPTION = "User Mode Linux Kernel" -LICENSE = "GPL" +LICENSE = "GPLv2" COLV = "0.6.1" COMPATIBLE_MACHINE = "colinux" diff --git a/recipes/linux/linux-colinux_2.6.10.bb b/recipes/linux/linux-colinux_2.6.10.bb index df06ccdd65..f206c98662 100644 --- a/recipes/linux/linux-colinux_2.6.10.bb +++ b/recipes/linux/linux-colinux_2.6.10.bb @@ -1,6 +1,6 @@ SECTION = "kernel" DESCRIPTION = "User Mode Linux Kernel" -LICENSE = "GPL" +LICENSE = "GPLv2" COLV = "0.6.2" COMPATIBLE_MACHINE = "colinux" diff --git a/recipes/linux/linux-ea3250_2.6.27.8.bb b/recipes/linux/linux-ea3250_2.6.27.8.bb index 37c152da17..4bfbd3e4a3 100644 --- a/recipes/linux/linux-ea3250_2.6.27.8.bb +++ b/recipes/linux/linux-ea3250_2.6.27.8.bb @@ -2,7 +2,7 @@ SECTION = "kernel" DESCRIPTION = "Linux kernel for the EmbeddedArtists LPC3250 development board" HOMEPAGE = "http://embeddedartists.com" # DEPENDS = "" -LICENSE = "GPL" +LICENSE = "GPLv2" PR = "r0" # Location of the base kernel and NXP's patches diff --git a/recipes/linux/linux-efika_2.6.18+2.6.19-rc6.bb b/recipes/linux/linux-efika_2.6.18+2.6.19-rc6.bb index 1907b09f75..a5fba1bc20 100644 --- a/recipes/linux/linux-efika_2.6.18+2.6.19-rc6.bb +++ b/recipes/linux/linux-efika_2.6.18+2.6.19-rc6.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Linux Kernel for the EFIKA dev platform" SECTION = "kernel" -LICENSE = "GPL" +LICENSE = "GPLv2" PR = "r3" COMPATIBLE_MACHINE = "efika" diff --git a/recipes/linux/linux-efika_2.6.20.20.bb b/recipes/linux/linux-efika_2.6.20.20.bb index 2f707a17e3..c51ebc467e 100644 --- a/recipes/linux/linux-efika_2.6.20.20.bb +++ b/recipes/linux/linux-efika_2.6.20.20.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Linux Kernel for the EFIKA dev platform" SECTION = "kernel" -LICENSE = "GPL" +LICENSE = "GPLv2" PR = "r2" COMPATIBLE_MACHINE = "efika" diff --git a/recipes/linux/linux-efika_2.6.20.bb b/recipes/linux/linux-efika_2.6.20.bb index 839d206cd1..4cd121c722 100644 --- a/recipes/linux/linux-efika_2.6.20.bb +++ b/recipes/linux/linux-efika_2.6.20.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Linux Kernel for the EFIKA dev platform" SECTION = "kernel" -LICENSE = "GPL" +LICENSE = "GPLv2" PR = "r2" COMPATIBLE_MACHINE = "efika" diff --git a/recipes/linux/linux-efika_2.6.21+git.bb b/recipes/linux/linux-efika_2.6.21+git.bb index 20b5bf86b6..e4f92c6e09 100644 --- a/recipes/linux/linux-efika_2.6.21+git.bb +++ b/recipes/linux/linux-efika_2.6.21+git.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Linux Kernel for the EFIKA dev platform" SECTION = "kernel" -LICENSE = "GPL" +LICENSE = "GPLv2" PR = "r0" PV = "2.6.21+git${SRCDATE}" diff --git a/recipes/linux/linux-epia_2.6.11.bb b/recipes/linux/linux-epia_2.6.11.bb index 04c47ca397..f5e63ac709 100644 --- a/recipes/linux/linux-epia_2.6.11.bb +++ b/recipes/linux/linux-epia_2.6.11.bb @@ -1,6 +1,6 @@ SECTION = "kernel" DESCRIPTION = "Linux kernel for VIA EPiA" -LICENSE = "GPL" +LICENSE = "GPLv2" PR = "r0" KERNEL_CCSUFFIX = "-3.3.4" diff --git a/recipes/linux/linux-epia_2.6.12.bb b/recipes/linux/linux-epia_2.6.12.bb index 04c47ca397..f5e63ac709 100644 --- a/recipes/linux/linux-epia_2.6.12.bb +++ b/recipes/linux/linux-epia_2.6.12.bb @@ -1,6 +1,6 @@ SECTION = "kernel" DESCRIPTION = "Linux kernel for VIA EPiA" -LICENSE = "GPL" +LICENSE = "GPLv2" PR = "r0" KERNEL_CCSUFFIX = "-3.3.4" diff --git a/recipes/linux/linux-epia_2.6.19.2.bb b/recipes/linux/linux-epia_2.6.19.2.bb index ce253c45c6..0a2d6c70ab 100644 --- a/recipes/linux/linux-epia_2.6.19.2.bb +++ b/recipes/linux/linux-epia_2.6.19.2.bb @@ -1,6 +1,6 @@ SECTION = "kernel" DESCRIPTION = "Linux kernel for VIA EPiA" -LICENSE = "GPL" +LICENSE = "GPLv2" PR = "r1" KERNEL_CCSUFFIX = "-3.3.4" diff --git a/recipes/linux/linux-epia_2.6.8.1.bb b/recipes/linux/linux-epia_2.6.8.1.bb index 315ff118e8..5cf1d4ed7f 100644 --- a/recipes/linux/linux-epia_2.6.8.1.bb +++ b/recipes/linux/linux-epia_2.6.8.1.bb @@ -1,6 +1,6 @@ SECTION = "kernel" DESCRIPTION = "Linux kernel for VIA EPiA" -LICENSE = "GPL" +LICENSE = "GPLv2" PR = "r15" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \ diff --git a/recipes/linux/linux-geodegx_2.4.24.bb b/recipes/linux/linux-geodegx_2.4.24.bb index fb42b562cc..af147a796e 100644 --- a/recipes/linux/linux-geodegx_2.4.24.bb +++ b/recipes/linux/linux-geodegx_2.4.24.bb @@ -6,7 +6,7 @@ COMPATIBLE_MACHINE = "geodegx" KV = "2.4.24" DESCRIPTION = "Linux kernel for the AMD Geode GX processor" -LICENSE = "GPL" +LICENSE = "GPLv2" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.4/linux-${KV}.tar.bz2 \ http://www.amd.com/files/connectivitysolutions/geode/Patches_Linux_${KV}_1.00.tar.gz \ diff --git a/recipes/linux/linux-geodelx_2.6.11.bb b/recipes/linux/linux-geodelx_2.6.11.bb index adfd7475bb..ef287c72ac 100644 --- a/recipes/linux/linux-geodelx_2.6.11.bb +++ b/recipes/linux/linux-geodelx_2.6.11.bb @@ -6,7 +6,7 @@ COMPATIBLE_MACHINE = "geodelx" DESCRIPTION = "Linux kernel for the AMD Geode GX5535/LX5536" HOMEPAGE = "http://www.amd.com/embedded" -LICENSE = "GPL" +LICENSE = "GPLv2" PR = "r0" AMD_DRIVER_VERSION = "02.03.0100" diff --git a/recipes/linux/linux-gumstix_2.6.15.bb b/recipes/linux/linux-gumstix_2.6.15.bb index 1812148f6e..60d269b467 100644 --- a/recipes/linux/linux-gumstix_2.6.15.bb +++ b/recipes/linux/linux-gumstix_2.6.15.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Linux Kernel for the Gumstix" SECTION = "kernel" -LICENSE = "GPL" +LICENSE = "GPLv2" PR = "r2" DEPENDS = "u-boot-utils-native" diff --git a/recipes/linux/linux-h1940_2.6.11-bk1-h1940.bb b/recipes/linux/linux-h1940_2.6.11-bk1-h1940.bb index 7624f32a8a..265788f11a 100644 --- a/recipes/linux/linux-h1940_2.6.11-bk1-h1940.bb +++ b/recipes/linux/linux-h1940_2.6.11-bk1-h1940.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Linux kernel for h1940 devices." SECTION = "kernel" -LICENSE = "GPL" +LICENSE = "GPLv2" COMPATIBLE_HOST = "arm.*-linux" COMPATIBLE_MACHINE = "h1940" diff --git a/recipes/linux/linux-h1940_2.6.14-h1940.bb b/recipes/linux/linux-h1940_2.6.14-h1940.bb index 0669600a98..c0ade59e9a 100644 --- a/recipes/linux/linux-h1940_2.6.14-h1940.bb +++ b/recipes/linux/linux-h1940_2.6.14-h1940.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Linux kernel for h1940 devices." SECTION = "kernel" -LICENSE = "GPL" +LICENSE = "GPLv2" COMPATIBLE_HOST = "arm.*-linux" COMPATIBLE_MACHINE = "h1940" diff --git a/recipes/linux/linux-h1940_2.6.17-h1940.bb b/recipes/linux/linux-h1940_2.6.17-h1940.bb index f7ad0185f3..a82ad8526d 100644 --- a/recipes/linux/linux-h1940_2.6.17-h1940.bb +++ b/recipes/linux/linux-h1940_2.6.17-h1940.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Linux kernel for h1940 devices." SECTION = "kernel" -LICENSE = "GPL" +LICENSE = "GPLv2" PR = "r1" diff --git a/recipes/linux/linux-h6300-omap1_2.6.12-rc5.bb b/recipes/linux/linux-h6300-omap1_2.6.12-rc5.bb index 58e85781a3..2bb3300ad1 100644 --- a/recipes/linux/linux-h6300-omap1_2.6.12-rc5.bb +++ b/recipes/linux/linux-h6300-omap1_2.6.12-rc5.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Linux kernel for h6300 devices." SECTION = "kernel" -LICENSE = "GPL" +LICENSE = "GPLv2" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/linux-2.6.12-rc5.tar.bz2 \ http://www.muru.com/linux/omap/patches/patch-2.6.12-rc5-omap2.bz2;patch=1 \ diff --git a/recipes/linux/linux-h6300-omap1_2.6.14.3.bb b/recipes/linux/linux-h6300-omap1_2.6.14.3.bb index 7726bad494..31ce45dc87 100644 --- a/recipes/linux/linux-h6300-omap1_2.6.14.3.bb +++ b/recipes/linux/linux-h6300-omap1_2.6.14.3.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Linux kernel for h6300 devices." SECTION = "kernel" -LICENSE = "GPL" +LICENSE = "GPLv2" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.14.tar.bz2 \ http://www.muru.com/linux/omap/patches/patch-2.6.14-omap2.bz2;patch=1 \ diff --git a/recipes/linux/linux-h6300-omap1_2.6.16.16.bb b/recipes/linux/linux-h6300-omap1_2.6.16.16.bb index 8b5f627846..0db8ca2d35 100644 --- a/recipes/linux/linux-h6300-omap1_2.6.16.16.bb +++ b/recipes/linux/linux-h6300-omap1_2.6.16.16.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Linux kernel for HP iPAQ h6300 series OMAP1510 based phones." SECTION = "kernel" -LICENSE = "GPL" +LICENSE = "GPLv2" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.16.tar.bz2 \ http://www.muru.com/linux/omap/patches/patch-2.6.16-omap2.bz2;patch=1 \ diff --git a/recipes/linux/linux-hackndev-2.6_git.bb b/recipes/linux/linux-hackndev-2.6_git.bb index 5c093a1674..4c577d247d 100644 --- a/recipes/linux/linux-hackndev-2.6_git.bb +++ b/recipes/linux/linux-hackndev-2.6_git.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Hack&Dev's Linux kernel for Palm devices." HOMEPAGE = "http://www.hackndev.com/" SECTION = "kernel" -LICENSE = "GPL" +LICENSE = "GPLv2" PR = "r14" COMPATIBLE_MACHINE = "(palmld|palmtc|palmtt3|palmtt5|palmtx|palmz31|palmz72|palmt650)" diff --git a/recipes/linux/linux-handhelds-2.6.inc b/recipes/linux/linux-handhelds-2.6.inc index fe482830f8..4a3ed7d23e 100644 --- a/recipes/linux/linux-handhelds-2.6.inc +++ b/recipes/linux/linux-handhelds-2.6.inc @@ -1,6 +1,6 @@ SECTION = "kernel" DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer handheld devices." -LICENSE = "GPL" +LICENSE = "GPLv2" COMPATIBLE_HOST = "arm.*-linux" COMPATIBLE_MACHINE ?= "(asus620|asus730|aximx50|aximx50v|eseries|h1910|h2200|h3600|h3800|h3900|h4000|h5000|htcalpine|htcapache|htcblueangel|htchermes|htchimalaya|htcsable|htcuniversal|htcwallaby|hx4700|ghi270|looxc550|jornada56x|magician|rx1950|rx3000)" diff --git a/recipes/linux/linux-handhelds-2.6_2.6.16-hh9.bb b/recipes/linux/linux-handhelds-2.6_2.6.16-hh9.bb index 8b1f153f11..184464323e 100644 --- a/recipes/linux/linux-handhelds-2.6_2.6.16-hh9.bb +++ b/recipes/linux/linux-handhelds-2.6_2.6.16-hh9.bb @@ -1,6 +1,6 @@ SECTION = "kernel" DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer handheld devices." -LICENSE = "GPL" +LICENSE = "GPLv2" PR = "r0" # Override where to look for defconfigs and patches, diff --git a/recipes/linux/linux-handhelds-2.6_2.6.17-hh4.bb b/recipes/linux/linux-handhelds-2.6_2.6.17-hh4.bb index c19678efe2..58de694232 100644 --- a/recipes/linux/linux-handhelds-2.6_2.6.17-hh4.bb +++ b/recipes/linux/linux-handhelds-2.6_2.6.17-hh4.bb @@ -1,6 +1,6 @@ SECTION = "kernel" DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer handheld devices." -LICENSE = "GPL" +LICENSE = "GPLv2" PR = "r1" DEFAULT_PREFERENCE = "-1" diff --git a/recipes/linux/linux-handhelds-2.6_2.6.18-hh2.bb b/recipes/linux/linux-handhelds-2.6_2.6.18-hh2.bb index 724971cacb..6c93da3598 100644 --- a/recipes/linux/linux-handhelds-2.6_2.6.18-hh2.bb +++ b/recipes/linux/linux-handhelds-2.6_2.6.18-hh2.bb @@ -1,6 +1,6 @@ SECTION = "kernel" DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer handheld devices." -LICENSE = "GPL" +LICENSE = "GPLv2" PR = "r0" DEFAULT_PREFERENCE = "-1" diff --git a/recipes/linux/linux-handhelds-2.6_2.6.19-hh13.bb b/recipes/linux/linux-handhelds-2.6_2.6.19-hh13.bb index 77f55415ba..a8d4438fa3 100644 --- a/recipes/linux/linux-handhelds-2.6_2.6.19-hh13.bb +++ b/recipes/linux/linux-handhelds-2.6_2.6.19-hh13.bb @@ -1,6 +1,6 @@ SECTION = "kernel" DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer handheld devices." -LICENSE = "GPL" +LICENSE = "GPLv2" PR = "r1" DEFAULT_PREFERENCE = "-1" diff --git a/recipes/linux/linux-handhelds-2.6_2.6.20-hh10.bb b/recipes/linux/linux-handhelds-2.6_2.6.20-hh10.bb index 8e760267f4..4ec2aaedf2 100644 --- a/recipes/linux/linux-handhelds-2.6_2.6.20-hh10.bb +++ b/recipes/linux/linux-handhelds-2.6_2.6.20-hh10.bb @@ -1,6 +1,6 @@ SECTION = "kernel" DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer handheld devices." -LICENSE = "GPL" +LICENSE = "GPLv2" PR = "r1" DEFAULT_PREFERENCE = "-1" diff --git a/recipes/linux/linux-handhelds-2.6_2.6.21-hh20.bb b/recipes/linux/linux-handhelds-2.6_2.6.21-hh20.bb index d955c0ab39..c661d7e9b2 100644 --- a/recipes/linux/linux-handhelds-2.6_2.6.21-hh20.bb +++ b/recipes/linux/linux-handhelds-2.6_2.6.21-hh20.bb @@ -1,6 +1,6 @@ SECTION = "kernel" DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer handheld devices." -LICENSE = "GPL" +LICENSE = "GPLv2" PR = "r26" DEFAULT_PREFERENCE = "-1" diff --git a/recipes/linux/linux-handhelds-2.6_cvs.bb b/recipes/linux/linux-handhelds-2.6_cvs.bb index 93e884e994..8ebdb1a994 100644 --- a/recipes/linux/linux-handhelds-2.6_cvs.bb +++ b/recipes/linux/linux-handhelds-2.6_cvs.bb @@ -1,6 +1,6 @@ SECTION = "kernel" DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer handheld devices." -LICENSE = "GPL" +LICENSE = "GPLv2" PV = "${K_MAJOR}.${K_MINOR}.${K_MICRO}-hh${HHV}+cvs${SRCDATE}" PR = "r1" diff --git a/recipes/linux/linux-jlime-ben_2.6.32.bb b/recipes/linux/linux-jlime-ben_2.6.32.bb index 798fac3f87..c2b1a8e1ac 100644 --- a/recipes/linux/linux-jlime-ben_2.6.32.bb +++ b/recipes/linux/linux-jlime-ben_2.6.32.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Linux 2.6.32 kernel for the ben nanonote" SECTION = "kernel" -LICENSE = "GPL" +LICENSE = "GPLv2" SRCREV = "${AUTOREV}" diff --git a/recipes/linux/linux-jlime-current.bb b/recipes/linux/linux-jlime-current.bb index 21cf1a224b..806fd6102c 100644 --- a/recipes/linux/linux-jlime-current.bb +++ b/recipes/linux/linux-jlime-current.bb @@ -7,7 +7,7 @@ DESCRIPTION = "2.6 Linux Development Kernel for JLime supported Machines." SECTION = "kernel" -LICENSE = "GPL" +LICENSE = "GPLv2" COMPATIBLE_MACHINE = "fillmein" diff --git a/recipes/linux/linux-jlime-jornada6xx_2.6.11.bb b/recipes/linux/linux-jlime-jornada6xx_2.6.11.bb index 654b02788c..43b9e00650 100644 --- a/recipes/linux/linux-jlime-jornada6xx_2.6.11.bb +++ b/recipes/linux/linux-jlime-jornada6xx_2.6.11.bb @@ -1,6 +1,6 @@ SECTION = "kernel" DESCRIPTION = "Linux kernel for Hitachi SH3 based Jornada 6xx" -LICENSE = "GPL" +LICENSE = "GPLv2" PR = "r0" diff --git a/recipes/linux/linux-jlime-jornada6xx_2.6.17.bb b/recipes/linux/linux-jlime-jornada6xx_2.6.17.bb index 5bd44ecf68..9b61343238 100644 --- a/recipes/linux/linux-jlime-jornada6xx_2.6.17.bb +++ b/recipes/linux/linux-jlime-jornada6xx_2.6.17.bb @@ -1,6 +1,6 @@ DESCRIPTION = "JLime Linux kernel for SuperH based Jornada 6xx" SECTION = "kernel" -LICENSE = "GPL" +LICENSE = "GPLv2" COMPATIBLE_MACHINE = "jornada6xx" diff --git a/recipes/linux/linux-jlime-jornada6xx_2.6.21rc5.bb b/recipes/linux/linux-jlime-jornada6xx_2.6.21rc5.bb index c7ebe829c4..c932df901f 100644 --- a/recipes/linux/linux-jlime-jornada6xx_2.6.21rc5.bb +++ b/recipes/linux/linux-jlime-jornada6xx_2.6.21rc5.bb @@ -1,6 +1,6 @@ SECTION = "kernel" DESCRIPTION = "JLime Linux kernel for SuperH based Jornada 6xx" -LICENSE = "GPL" +LICENSE = "GPLv2" PR = "r0" COMPATIBLE_HOST = "sh.*-linux" diff --git a/recipes/linux/linux-jlime-jornada6xx_2.6.25.bb b/recipes/linux/linux-jlime-jornada6xx_2.6.25.bb index c55cf1578f..502dc51eb1 100644 --- a/recipes/linux/linux-jlime-jornada6xx_2.6.25.bb +++ b/recipes/linux/linux-jlime-jornada6xx_2.6.25.bb @@ -1,6 +1,6 @@ SECTION = "kernel" DESCRIPTION = "JLime Linux kernel for SuperH based Jornada 6xx" -LICENSE = "GPL" +LICENSE = "GPLv2" PR = "r0" SRCREV = "${AUTOREV}" diff --git a/recipes/linux/linux-jlime-jornada6xx_2.6.32.bb b/recipes/linux/linux-jlime-jornada6xx_2.6.32.bb index d3d1625070..c0c258f027 100644 --- a/recipes/linux/linux-jlime-jornada6xx_2.6.32.bb +++ b/recipes/linux/linux-jlime-jornada6xx_2.6.32.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Linux 2.6.32 kernel for the SuperH-based Jornada 6xx" SECTION = "kernel" -LICENSE = "GPL" +LICENSE = "GPLv2" SRCREV = "${AUTOREV}" diff --git a/recipes/linux/linux-jlime-jornada7xx_2.6.17.bb b/recipes/linux/linux-jlime-jornada7xx_2.6.17.bb index 0d95972010..0018fa2aae 100644 --- a/recipes/linux/linux-jlime-jornada7xx_2.6.17.bb +++ b/recipes/linux/linux-jlime-jornada7xx_2.6.17.bb @@ -1,6 +1,6 @@ SECTION = "kernel" DESCRIPTION = "JLime Linux kernel for Arm based Jornada 7xx" -LICENSE = "GPL" +LICENSE = "GPLv2" PR = "r0" COMPATIBLE_HOST = "arm.*-linux" diff --git a/recipes/linux/linux-jlime-jornada7xx_2.6.18.bb b/recipes/linux/linux-jlime-jornada7xx_2.6.18.bb index 789dddf9b8..f1d0707b70 100644 --- a/recipes/linux/linux-jlime-jornada7xx_2.6.18.bb +++ b/recipes/linux/linux-jlime-jornada7xx_2.6.18.bb @@ -1,6 +1,6 @@ SECTION = "kernel" DESCRIPTION = "JLime Linux kernel for Arm based Jornada 7xx" -LICENSE = "GPL" +LICENSE = "GPLv2" PR = "r0" COMPATIBLE_HOST = "arm.*-linux" diff --git a/recipes/linux/linux-jlime-jornada7xx_2.6.19rc6.bb b/recipes/linux/linux-jlime-jornada7xx_2.6.19rc6.bb index a80f4c91a1..8d688ca54f 100644 --- a/recipes/linux/linux-jlime-jornada7xx_2.6.19rc6.bb +++ b/recipes/linux/linux-jlime-jornada7xx_2.6.19rc6.bb @@ -1,6 +1,6 @@ SECTION = "kernel" DESCRIPTION = "JLime Linux kernel for Arm based Jornada 7xx" -LICENSE = "GPL" +LICENSE = "GPLv2" PR = "r0" COMPATIBLE_HOST = "arm.*-linux" diff --git a/recipes/linux/linux-jlime-jornada7xx_2.6.32+git.bb b/recipes/linux/linux-jlime-jornada7xx_2.6.32+git.bb index d8d09ac9c1..cc39c73925 100644 --- a/recipes/linux/linux-jlime-jornada7xx_2.6.32+git.bb +++ b/recipes/linux/linux-jlime-jornada7xx_2.6.32+git.bb @@ -1,6 +1,6 @@ SECTION = "kernel" DESCRIPTION = "JLime Linux kernel for Arm based Jornada 7xx" -LICENSE = "GPL" +LICENSE = "GPLv2" PR = "r0" COMPATIBLE_HOST = "arm.*-linux" diff --git a/recipes/linux/linux-kirkwood_2.6.29.5.bb b/recipes/linux/linux-kirkwood_2.6.29.5.bb index f503829211..668c06aa81 100644 --- a/recipes/linux/linux-kirkwood_2.6.29.5.bb +++ b/recipes/linux/linux-kirkwood_2.6.29.5.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Linux Kernel for Marvell Kirkwood based devices" SECTION = "kernel" -LICENSE = "GPL" +LICENSE = "GPLv2" COMPATIBLE_MACHINE = "sheevaplug" require linux.inc diff --git a/recipes/linux/linux-kirkwood_2.6.30.5.bb b/recipes/linux/linux-kirkwood_2.6.30.5.bb index 84dbb8dbcc..699d973a72 100644 --- a/recipes/linux/linux-kirkwood_2.6.30.5.bb +++ b/recipes/linux/linux-kirkwood_2.6.30.5.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Linux Kernel for Marvell Kirkwood based devices" SECTION = "kernel" -LICENSE = "GPL" +LICENSE = "GPLv2" COMPATIBLE_MACHINE = "(openrd-base|sheevaplug)" require linux.inc diff --git a/recipes/linux/linux-kirkwood_2.6.31.bb b/recipes/linux/linux-kirkwood_2.6.31.bb index f046feaadd..56d0116bcc 100644 --- a/recipes/linux/linux-kirkwood_2.6.31.bb +++ b/recipes/linux/linux-kirkwood_2.6.31.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Linux Kernel for Marvell Kirkwood based devices" SECTION = "kernel" -LICENSE = "GPL" +LICENSE = "GPLv2" COMPATIBLE_MACHINE = "openrd-base" diff --git a/recipes/linux/linux-kirkwood_2.6.33-rc1.bb b/recipes/linux/linux-kirkwood_2.6.33-rc1.bb index d65eaf9520..893e349aca 100644 --- a/recipes/linux/linux-kirkwood_2.6.33-rc1.bb +++ b/recipes/linux/linux-kirkwood_2.6.33-rc1.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Linux Kernel for Marvell Kirkwood based devices" SECTION = "kernel" -LICENSE = "GPL" +LICENSE = "GPLv2" COMPATIBLE_MACHINE = "openrd-base|openrd-client|sheevaplug" diff --git a/recipes/linux/linux-kirkwood_2.6.33-rc5.bb b/recipes/linux/linux-kirkwood_2.6.33-rc5.bb index b54add9102..cae7554077 100644 --- a/recipes/linux/linux-kirkwood_2.6.33-rc5.bb +++ b/recipes/linux/linux-kirkwood_2.6.33-rc5.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Linux Kernel for Marvell Kirkwood based devices" SECTION = "kernel" -LICENSE = "GPL" +LICENSE = "GPLv2" COMPATIBLE_MACHINE = "openrd-base|openrd-client|sheevaplug" diff --git a/recipes/linux/linux-ks8695_2.6.16.bb b/recipes/linux/linux-ks8695_2.6.16.bb index a357443fdb..81a745f526 100644 --- a/recipes/linux/linux-ks8695_2.6.16.bb +++ b/recipes/linux/linux-ks8695_2.6.16.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Linux kernel for Micrel KS8695(P) based devices" SECTION = "kernel" -LICENSE = "GPL" +LICENSE = "GPLv2" PR = "r0" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \ diff --git a/recipes/linux/linux-linkstationppc_2.6.28.4.bb b/recipes/linux/linux-linkstationppc_2.6.28.4.bb index 3c15d78e42..e86886e435 100644 --- a/recipes/linux/linux-linkstationppc_2.6.28.4.bb +++ b/recipes/linux/linux-linkstationppc_2.6.28.4.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Linux Kernel for the Buffalo Linkstation HD/HG" SECTION = "kernel" -LICENSE = "GPL" +LICENSE = "GPLv2" PR = "r0" DEPENDS = "dtc-native u-boot-mkimage-native" diff --git a/recipes/linux/linux-magicbox_2.6.18.6.bb b/recipes/linux/linux-magicbox_2.6.18.6.bb index bd9a1c4060..66c3e12a1e 100644 --- a/recipes/linux/linux-magicbox_2.6.18.6.bb +++ b/recipes/linux/linux-magicbox_2.6.18.6.bb @@ -1,6 +1,6 @@ SECTION = "kernel" DESCRIPTION = "Linux kernel for Magicbox ver 1.1 and 2.0 router boards" -LICENSE = "GPL" +LICENSE = "GPLv2" PR = "r2" DEPENDS = "u-boot" diff --git a/recipes/linux/linux-magicbox_2.6.19.2.bb b/recipes/linux/linux-magicbox_2.6.19.2.bb index 2c79a94e10..f8f967a990 100644 --- a/recipes/linux/linux-magicbox_2.6.19.2.bb +++ b/recipes/linux/linux-magicbox_2.6.19.2.bb @@ -2,7 +2,7 @@ # Released under the MIT license (see packages/COPYING) SECTION = "kernel" DESCRIPTION = "Linux kernel for Magicbox ver 1.1 and 2.0 router boards" -LICENSE = "GPL" +LICENSE = "GPLv2" PR = "r3" DEPENDS = "u-boot" diff --git a/recipes/linux/linux-mainstone_2.6.25.bb b/recipes/linux/linux-mainstone_2.6.25.bb index f2d972dd78..499a71d09f 100644 --- a/recipes/linux/linux-mainstone_2.6.25.bb +++ b/recipes/linux/linux-mainstone_2.6.25.bb @@ -2,7 +2,7 @@ require linux.inc SECTION = "kernel" DESCRIPTION = "Linux kernel for the Mainstone (PXA270 ref design)" -LICENSE = "GPL" +LICENSE = "GPLv2" PR = "r1" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.24.tar.bz2 \ diff --git a/recipes/linux/linux-mini2440_2.6.30+git.bb b/recipes/linux/linux-mini2440_2.6.30+git.bb index 09706e8bb5..9a87c1dfad 100644 --- a/recipes/linux/linux-mini2440_2.6.30+git.bb +++ b/recipes/linux/linux-mini2440_2.6.30+git.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Linux Kernel for mini2440 development board" SECTION = "kernel" -LICENSE = "GPL" +LICENSE = "GPLv2" MACHINE_KERNEL_PR = "r5" GGSRC = "http://www.xora.org.uk/oe/patches/" diff --git a/recipes/linux/linux-mini2440_2.6.31+git.bb b/recipes/linux/linux-mini2440_2.6.31+git.bb index 012fc07dd5..346ec0a6f2 100644 --- a/recipes/linux/linux-mini2440_2.6.31+git.bb +++ b/recipes/linux/linux-mini2440_2.6.31+git.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Linux Kernel for mini2440 / micro2440 development boards" SECTION = "kernel" -LICENSE = "GPL" +LICENSE = "GPLv2" PR = "r0" require linux.inc diff --git a/recipes/linux/linux-ml403-mvista-2.6.x_git.bb b/recipes/linux/linux-ml403-mvista-2.6.x_git.bb index 59bcff431e..28b670844c 100644 --- a/recipes/linux/linux-ml403-mvista-2.6.x_git.bb +++ b/recipes/linux/linux-ml403-mvista-2.6.x_git.bb @@ -2,7 +2,7 @@ # Released under the MIT license (see packages/COPYING) SECTION = "kernel" DESCRIPTION = "Linux kernel for Xilinx ML403 Virtex 4 fpga board" -LICENSE = "GPL" +LICENSE = "GPLv2" DEPENDS = "git-native" PR = "r1" DEFAULT_PREFERENCE = "-1" diff --git a/recipes/linux/linux-mtx-1_2.4.27.bb b/recipes/linux/linux-mtx-1_2.4.27.bb index 952edb0140..3ed0b22569 100644 --- a/recipes/linux/linux-mtx-1_2.4.27.bb +++ b/recipes/linux/linux-mtx-1_2.4.27.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Linux kernel for MTX-1 (MeshCube)" HOMEPAGE = "http://meshcube.org/meshwiki/" -LICENSE = "GPL" +LICENSE = "GPLv2" KV = "${PV}" PR = "r11" inherit module-base kernel diff --git a/recipes/linux/linux-mtx-2_2.4.27.bb b/recipes/linux/linux-mtx-2_2.4.27.bb index 3379d548a1..4a0c87ecdb 100644 --- a/recipes/linux/linux-mtx-2_2.4.27.bb +++ b/recipes/linux/linux-mtx-2_2.4.27.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Linux kernel for MTX-2 (Surfbox2)" HOMEPAGE = "http://meshcube.org/meshwiki/" -LICENSE = "GPL" +LICENSE = "GPLv2" KV = "${PV}" PR = "r11" inherit module-base kernel diff --git a/recipes/linux/linux-mtx-3_2.6.15.4.bb b/recipes/linux/linux-mtx-3_2.6.15.4.bb index e3b23b1968..40e317a3bd 100644 --- a/recipes/linux/linux-mtx-3_2.6.15.4.bb +++ b/recipes/linux/linux-mtx-3_2.6.15.4.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Linux kernel for MTX-3 (Surfbox3)" HOMEPAGE = "http://meshcube.org/meshwiki/" -LICENSE = "GPL" +LICENSE = "GPLv2" KV = "${PV}" PR = "r11" diff --git a/recipes/linux/linux-mtx-3_2.6.15.bb b/recipes/linux/linux-mtx-3_2.6.15.bb index e1613d6f60..1fc44f4354 100644 --- a/recipes/linux/linux-mtx-3_2.6.15.bb +++ b/recipes/linux/linux-mtx-3_2.6.15.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Linux kernel for MTX-3 (Surfbox3)" HOMEPAGE = "http://meshcube.org/meshwiki/" -LICENSE = "GPL" +LICENSE = "GPLv2" KV = "${PV}" PR = "r11" inherit module-base kernel diff --git a/recipes/linux/linux-n1200_2.6.27-rc9+git.bb b/recipes/linux/linux-n1200_2.6.27-rc9+git.bb index 7674379a6b..cd01720dd0 100644 --- a/recipes/linux/linux-n1200_2.6.27-rc9+git.bb +++ b/recipes/linux/linux-n1200_2.6.27-rc9+git.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Linux Kernel for the Thecus n1200" SECTION = "kernel" -LICENSE = "GPL" +LICENSE = "GPLv2" PR = "r3" DEPENDS = "u-boot-mkimage-native" COMPATIBLE_MACHINE = "n1200" diff --git a/recipes/linux/linux-navman_2.6.18.bb b/recipes/linux/linux-navman_2.6.18.bb index 2c9aef9e62..edeea9c911 100644 --- a/recipes/linux/linux-navman_2.6.18.bb +++ b/recipes/linux/linux-navman_2.6.18.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Linux Kernel for Cirrus Logic ep39xx compatible machines" SECTION = "kernel" -LICENSE = "GPL" +LICENSE = "GPLv2" #DEPENDS = "u-boot" diff --git a/recipes/linux/linux-nokia800.inc b/recipes/linux/linux-nokia800.inc index 0f52b7c3b3..f6d14d58b4 100644 --- a/recipes/linux/linux-nokia800.inc +++ b/recipes/linux/linux-nokia800.inc @@ -1,6 +1,6 @@ SECTION = "kernel" DESCRIPTION = "Linux kernel for Nokia 770/800" -LICENSE = "GPL" +LICENSE = "GPLv2" inherit kernel diff --git a/recipes/linux/linux-omap-2.6_2.6.9-omap1.bb b/recipes/linux/linux-omap-2.6_2.6.9-omap1.bb index cdcdcdf825..e036cf2b56 100644 --- a/recipes/linux/linux-omap-2.6_2.6.9-omap1.bb +++ b/recipes/linux/linux-omap-2.6_2.6.9-omap1.bb @@ -1,6 +1,6 @@ SECTION = "kernel" DESCRIPTION = "Linux kernel for OMAP processors" -LICENSE = "GPL" +LICENSE = "GPLv2" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.9.tar.bz2 \ http://www.muru.com/linux/omap/patches/patch-2.6.9-omap1.bz2;patch=1 \ diff --git a/recipes/linux/linux-orion_2.6.28.4.bb b/recipes/linux/linux-orion_2.6.28.4.bb index c0a7d3c9af..eb27c6a2e4 100644 --- a/recipes/linux/linux-orion_2.6.28.4.bb +++ b/recipes/linux/linux-orion_2.6.28.4.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Linux Kernel for Marvell Orion based devices" SECTION = "kernel" -LICENSE = "GPL" +LICENSE = "GPLv2" PR = "r0" COMPATIBLE_MACHINE = "(dns323|mv2120|kuropro|lspro|tsx09|ts409)" diff --git a/recipes/linux/linux-palm-omap1_2.6.22-omap1.bb b/recipes/linux/linux-palm-omap1_2.6.22-omap1.bb index 16fe38bf5c..e9731734b7 100644 --- a/recipes/linux/linux-palm-omap1_2.6.22-omap1.bb +++ b/recipes/linux/linux-palm-omap1_2.6.22-omap1.bb @@ -1,6 +1,6 @@ SECTION = "kernel" DESCRIPTION = "Linux kernel for OMAP1-based Palm devicess" -LICENSE = "GPL" +LICENSE = "GPLv2" COMPATIBLE_MACHINE = "(palmz71|palmtt|palmtt2)" diff --git a/recipes/linux/linux-rp.inc b/recipes/linux/linux-rp.inc index 041a095d91..18a6426c2f 100644 --- a/recipes/linux/linux-rp.inc +++ b/recipes/linux/linux-rp.inc @@ -1,6 +1,6 @@ DESCRIPTION = "2.6 Linux Development Kernel for Zaurus devices and iPAQ hx2750." SECTION = "kernel" -LICENSE = "GPL" +LICENSE = "GPLv2" inherit kernel diff --git a/recipes/linux/linux-sequoia_2.6.21.bb b/recipes/linux/linux-sequoia_2.6.21.bb index 006fd3a51d..121d53035d 100644 --- a/recipes/linux/linux-sequoia_2.6.21.bb +++ b/recipes/linux/linux-sequoia_2.6.21.bb @@ -2,7 +2,7 @@ # Released under the MIT license (see packages/COPYING) SECTION = "kernel" DESCRIPTION = "Linux kernel for AMCC's Sequoia dev board" -LICENSE = "GPL" +LICENSE = "GPLv2" PR = "r0" #DEPENDS = "u-boot" diff --git a/recipes/linux/linux-sgh-i900_2.6.32.bb b/recipes/linux/linux-sgh-i900_2.6.32.bb index 4b5df5b7aa..f509d124e6 100644 --- a/recipes/linux/linux-sgh-i900_2.6.32.bb +++ b/recipes/linux/linux-sgh-i900_2.6.32.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Linux 2.6.32 kernel for the Samsung Omnia SGH-i900." SECTION = "kernel" -LICENSE = "GPL" +LICENSE = "GPLv2" RDEPENDS += "marvell-gspi-fw" diff --git a/recipes/linux/linux-smdk2440_2.6.20+git.bb b/recipes/linux/linux-smdk2440_2.6.20+git.bb index b86d970e50..e90274bc8b 100644 --- a/recipes/linux/linux-smdk2440_2.6.20+git.bb +++ b/recipes/linux/linux-smdk2440_2.6.20+git.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Linux Kernel for smdk2440 compatible machines" SECTION = "kernel" -LICENSE = "GPL" +LICENSE = "GPLv2" PR = "r1" GGSRC = "http://www.xora.org.uk/oe/patches/" diff --git a/recipes/linux/linux-smdk2443_2.6.20+git.bb b/recipes/linux/linux-smdk2443_2.6.20+git.bb index 034137e89c..136c2ab0b5 100644 --- a/recipes/linux/linux-smdk2443_2.6.20+git.bb +++ b/recipes/linux/linux-smdk2443_2.6.20+git.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Linux Kernel for smdk2443 compatible machines" SECTION = "kernel" -LICENSE = "GPL" +LICENSE = "GPLv2" DEPENDS += "u-boot-mkimage-openmoko-native" PR = "r1" diff --git a/recipes/linux/linux-storcenter_2.6.27.7.bb b/recipes/linux/linux-storcenter_2.6.27.7.bb index b403cda2ab..a6f4ebc34f 100644 --- a/recipes/linux/linux-storcenter_2.6.27.7.bb +++ b/recipes/linux/linux-storcenter_2.6.27.7.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Linux Kernel for the IOMega StorCenter" SECTION = "kernel" -LICENSE = "GPL" +LICENSE = "GPLv2" PR = "r2" DEPENDS = "dtc-native" diff --git a/recipes/linux/linux-sun4cdm_2.4.26.bb b/recipes/linux/linux-sun4cdm_2.4.26.bb index 78a64d7aeb..4bde45fe4a 100644 --- a/recipes/linux/linux-sun4cdm_2.4.26.bb +++ b/recipes/linux/linux-sun4cdm_2.4.26.bb @@ -1,6 +1,6 @@ SECTION = "kernel" DESCRIPTION = "Linux kernel for sparc32/sun4c" -LICENSE = "GPL" +LICENSE = "GPLv2" PR = "r0" DEPENDS += "elftoaout-native" diff --git a/recipes/linux/linux-sun4cdm_2.6.8.1.bb b/recipes/linux/linux-sun4cdm_2.6.8.1.bb index 7b097a1610..55bf3ae5cf 100644 --- a/recipes/linux/linux-sun4cdm_2.6.8.1.bb +++ b/recipes/linux/linux-sun4cdm_2.6.8.1.bb @@ -1,6 +1,6 @@ SECTION = "kernel" DESCRIPTION = "Linux kernel for sparc32/sun4c" -LICENSE = "GPL" +LICENSE = "GPLv2" PR = "r1" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \ diff --git a/recipes/linux/linux-titan-sh4_2.6.21.bb b/recipes/linux/linux-titan-sh4_2.6.21.bb index ef5ffad0db..77db8d177e 100644 --- a/recipes/linux/linux-titan-sh4_2.6.21.bb +++ b/recipes/linux/linux-titan-sh4_2.6.21.bb @@ -1,6 +1,6 @@ SECTION = "kernel" DESCRIPTION = "Linux kernel for SH4 based TITAN (NP51R/LinkGear Series 100) router appliance" -LICENSE = "GPL" +LICENSE = "GPLv2" PR = "r2" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \ diff --git a/recipes/linux/linux-tornado-omap2_2.6.16.16.bb b/recipes/linux/linux-tornado-omap2_2.6.16.16.bb index 9c6e133c28..d7080b0cf3 100644 --- a/recipes/linux/linux-tornado-omap2_2.6.16.16.bb +++ b/recipes/linux/linux-tornado-omap2_2.6.16.16.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Linux kernel for HTC Tornado/Typhoon/Hurricane phones." SECTION = "kernel" -LICENSE = "GPL" +LICENSE = "GPLv2" PR = "r1" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.16.tar.bz2 \ diff --git a/recipes/linux/linux-turbostation_2.6.20.2.bb b/recipes/linux/linux-turbostation_2.6.20.2.bb index 308c5e7a46..9ba6f38eb4 100644 --- a/recipes/linux/linux-turbostation_2.6.20.2.bb +++ b/recipes/linux/linux-turbostation_2.6.20.2.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Linux Kernel for the QNAP TurboStation platform" SECTION = "kernel" -LICENSE = "GPL" +LICENSE = "GPLv2" DEPENDS = "u-boot-utils-native" PR = "r2" diff --git a/recipes/linux/linux-wrap-geode_2.6.17.bb b/recipes/linux/linux-wrap-geode_2.6.17.bb index 3d9b81a936..baf82fc216 100644 --- a/recipes/linux/linux-wrap-geode_2.6.17.bb +++ b/recipes/linux/linux-wrap-geode_2.6.17.bb @@ -1,7 +1,7 @@ SECTION = "kernel" DESCRIPTION = "Linux kernel for PC-Engines WRAP which are \ Geode SC1100 (i486) based wirless router appliance boards" -LICENSE = "GPL" +LICENSE = "GPLv2" PR = "r0" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \ diff --git a/recipes/linux/linux-wrt_2.4.20.bb b/recipes/linux/linux-wrt_2.4.20.bb index 23a5d4f203..8b7450ed10 100644 --- a/recipes/linux/linux-wrt_2.4.20.bb +++ b/recipes/linux/linux-wrt_2.4.20.bb @@ -1,6 +1,6 @@ SECTION = "kernel" DESCRIPTION = "Linux kernel for the Linksys WRT54 devices" -LICENSE = "GPL" +LICENSE = "GPLv2" PR = "r1" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.4/linux-2.4.20.tar.bz2 \ diff --git a/recipes/linux/linux-wrt_2.4.30.bb b/recipes/linux/linux-wrt_2.4.30.bb index db285710b2..a2cd7e0e3b 100644 --- a/recipes/linux/linux-wrt_2.4.30.bb +++ b/recipes/linux/linux-wrt_2.4.30.bb @@ -2,7 +2,7 @@ SECTION = "kernel" DESCRIPTION = "Linux kernel for the Linksys WRT54 devices" HOMEPAGE = "http://openwrt.org" DEPENDS = "lzma-native" -LICENSE = "GPL" +LICENSE = "GPLv2" PR = "r2" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.4/linux-2.4.30.tar.bz2 \ diff --git a/recipes/linux/linux-x86_2.6.17.9.bb b/recipes/linux/linux-x86_2.6.17.9.bb index 829c884560..571492c199 100644 --- a/recipes/linux/linux-x86_2.6.17.9.bb +++ b/recipes/linux/linux-x86_2.6.17.9.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Linux Kernel for x86 compatible machines" SECTION = "kernel" -LICENSE = "GPL" +LICENSE = "GPLv2" PR = "r2" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \ diff --git a/recipes/linux/linux-x86_2.6.20.bb b/recipes/linux/linux-x86_2.6.20.bb index 3872c50cba..bed6e21edf 100644 --- a/recipes/linux/linux-x86_2.6.20.bb +++ b/recipes/linux/linux-x86_2.6.20.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Linux Kernel for x86 compatible machines" SECTION = "kernel" -LICENSE = "GPL" +LICENSE = "GPLv2" PR = "r5" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 " diff --git a/recipes/linux/linux-xilinx-slab_git.bb b/recipes/linux/linux-xilinx-slab_git.bb index 2900ad9516..8e9bfba74f 100644 --- a/recipes/linux/linux-xilinx-slab_git.bb +++ b/recipes/linux/linux-xilinx-slab_git.bb @@ -3,7 +3,7 @@ # Released under the MIT license (see packages/COPYING) SECTION = "kernel" DESCRIPTION = "Linux kernel for Xilinx ML403 Virtex 4 fpga board" -LICENSE = "GPL" +LICENSE = "GPLv2" SRCREV = "d7ed933b578d9c4dec0e23a5a6f78c464b31c47c" diff --git a/recipes/linux/linux-xxs1500_2.4.21.bb b/recipes/linux/linux-xxs1500_2.4.21.bb index b4fab93669..ed6b7a0d90 100644 --- a/recipes/linux/linux-xxs1500_2.4.21.bb +++ b/recipes/linux/linux-xxs1500_2.4.21.bb @@ -1,6 +1,6 @@ SECTION = "kernel" DESCRIPTION = "Linux kernel for mycable xxs1500" -LICENSE = "GPL" +LICENSE = "GPLv2" KV = "2.4.21" PV = "${KV}" diff --git a/recipes/linux/linux-z_2.6.20.bb b/recipes/linux/linux-z_2.6.20.bb index 8c5c940155..faf4ec37d5 100644 --- a/recipes/linux/linux-z_2.6.20.bb +++ b/recipes/linux/linux-z_2.6.20.bb @@ -1,6 +1,6 @@ DESCRIPTION = "2.6 Linux Development Kernel for the DNARD/Shark, SIMpad." SECTION = "kernel" -LICENSE = "GPL" +LICENSE = "GPLv2" inherit kernel diff --git a/recipes/linux/linux.inc b/recipes/linux/linux.inc index 6c2ce3166a..47e52cc879 100644 --- a/recipes/linux/linux.inc +++ b/recipes/linux/linux.inc @@ -1,6 +1,6 @@ DESCRIPTION = "Linux Kernel" SECTION = "kernel" -LICENSE = "GPL" +LICENSE = "GPLv2" inherit kernel diff --git a/recipes/linux/linux_2.6.14.bb b/recipes/linux/linux_2.6.14.bb index 702246bd8f..a7f4b0d3cd 100644 --- a/recipes/linux/linux_2.6.14.bb +++ b/recipes/linux/linux_2.6.14.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Linux Kernel" SECTION = "kernel" -LICENSE = "GPL" +LICENSE = "GPLv2" DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_acern30 = "1" diff --git a/recipes/linux/logicpd-pxa270_2.6.17-rc5.bb b/recipes/linux/logicpd-pxa270_2.6.17-rc5.bb index e7ab462c0b..33521aef9b 100644 --- a/recipes/linux/logicpd-pxa270_2.6.17-rc5.bb +++ b/recipes/linux/logicpd-pxa270_2.6.17-rc5.bb @@ -1,6 +1,6 @@ SECTION = "kernel" DESCRIPTION = "Linux kernel for the LogicPD Zoom(PXA270 ref design)" -LICENSE = "GPL" +LICENSE = "GPLv2" PR = "r3" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/linux-2.6.17-rc5.tar.bz2 \ diff --git a/recipes/linux/logicpd-pxa270_2.6.19.2.bb b/recipes/linux/logicpd-pxa270_2.6.19.2.bb index 7a4eaae99b..5c508fd03a 100644 --- a/recipes/linux/logicpd-pxa270_2.6.19.2.bb +++ b/recipes/linux/logicpd-pxa270_2.6.19.2.bb @@ -1,6 +1,6 @@ SECTION = "kernel" DESCRIPTION = "Linux kernel for the LogicPD Zoom(PXA270 ref design)" -LICENSE = "GPL" +LICENSE = "GPLv2" PR = "r1" SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.19.2.tar.bz2 \ diff --git a/recipes/linux/mainstone-kernel_2.6.11.bb b/recipes/linux/mainstone-kernel_2.6.11.bb index cae3bf799c..e4a15b03c6 100644 --- a/recipes/linux/mainstone-kernel_2.6.11.bb +++ b/recipes/linux/mainstone-kernel_2.6.11.bb @@ -1,6 +1,6 @@ SECTION = "kernel" DESCRIPTION = "Linux kernel for the Mainstone (PXA270 ref design)" -LICENSE = "GPL" +LICENSE = "GPLv2" PR = "r1" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.11.tar.bz2 \ diff --git a/recipes/linux/mainstone-kernel_2.6.18.bb b/recipes/linux/mainstone-kernel_2.6.18.bb index 290bb5911d..b7034f02a5 100644 --- a/recipes/linux/mainstone-kernel_2.6.18.bb +++ b/recipes/linux/mainstone-kernel_2.6.18.bb @@ -2,7 +2,7 @@ require linux.inc SECTION = "kernel" DESCRIPTION = "Linux kernel for the Mainstone (PXA270 ref design)" -LICENSE = "GPL" +LICENSE = "GPLv2" PR = "r2" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.18.tar.bz2 \ diff --git a/recipes/linux/mnci-ramses_2.4.21-rmk2-pxa1.bb b/recipes/linux/mnci-ramses_2.4.21-rmk2-pxa1.bb index b001763710..02dc68a110 100644 --- a/recipes/linux/mnci-ramses_2.4.21-rmk2-pxa1.bb +++ b/recipes/linux/mnci-ramses_2.4.21-rmk2-pxa1.bb @@ -1,6 +1,6 @@ SECTION = "kernel" DESCRIPTION = "Linux kernel for MNCI device" -LICENSE = "GPL" +LICENSE = "GPLv2" DEPENDS = "modutils-cross virtual/${TARGET_PREFIX}gcc${KERNEL_CCSUFFIX}" COMPATIBLE_MACHINE = "mnci" KV = "2.4.21" diff --git a/recipes/linux/mx21ads-kernel_2.6.19rc6.bb b/recipes/linux/mx21ads-kernel_2.6.19rc6.bb index bc8e6242a7..392f5e5b71 100644 --- a/recipes/linux/mx21ads-kernel_2.6.19rc6.bb +++ b/recipes/linux/mx21ads-kernel_2.6.19rc6.bb @@ -1,6 +1,6 @@ SECTION = "kernel" DESCRIPTION = "Linux kernel for the MX21ADS" -LICENSE = "GPL" +LICENSE = "GPLv2" PR = "r2" PV = "2.6.18+2.6.19-rc6" diff --git a/recipes/linux/netbook-pro-kernel_2.6.17.bb b/recipes/linux/netbook-pro-kernel_2.6.17.bb index 37704dcb64..d95c2b10cc 100644 --- a/recipes/linux/netbook-pro-kernel_2.6.17.bb +++ b/recipes/linux/netbook-pro-kernel_2.6.17.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Linux Kernel for Psion/Teklogix netbookpro compatible machines" SECTION = "kernel" -LICENSE = "GPL" +LICENSE = "GPLv2" PR = "r2" COMPATIBLE_MACHINE = "netbook-pro" diff --git a/recipes/linux/opensimpad_2.4.25-vrs2-pxa1-jpm1.bb b/recipes/linux/opensimpad_2.4.25-vrs2-pxa1-jpm1.bb index 547010996d..36eb4dba99 100644 --- a/recipes/linux/opensimpad_2.4.25-vrs2-pxa1-jpm1.bb +++ b/recipes/linux/opensimpad_2.4.25-vrs2-pxa1-jpm1.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Linux kernel for the SIEMENS SIMpad family of devices." SECTION = "kernel" -LICENSE = "GPL" +LICENSE = "GPLv2" KV = "${@bb.data.getVar('PV',d,True).split('-')[0]}" VRSV = "${@bb.data.getVar('PV',d,True).split('-')[1]}" PXAV = "${@bb.data.getVar('PV',d,True).split('-')[2]}" diff --git a/recipes/linux/opensimpad_2.4.27-vrs1-pxa1-jpm1.bb b/recipes/linux/opensimpad_2.4.27-vrs1-pxa1-jpm1.bb index d9324e9883..3ff820a7a9 100644 --- a/recipes/linux/opensimpad_2.4.27-vrs1-pxa1-jpm1.bb +++ b/recipes/linux/opensimpad_2.4.27-vrs1-pxa1-jpm1.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Linux kernel for the SIEMENS SIMpad family of devices." SECTION = "kernel" -LICENSE = "GPL" +LICENSE = "GPLv2" KV = "${@bb.data.getVar('PV',d,True).split('-')[0]}" VRSV = "${@bb.data.getVar('PV',d,True).split('-')[1]}" PXAV = "${@bb.data.getVar('PV',d,True).split('-')[2]}" diff --git a/recipes/linux/openzaurus-pxa27x_2.4.20-rmk2-embedix20050602.bb b/recipes/linux/openzaurus-pxa27x_2.4.20-rmk2-embedix20050602.bb index e65f293de8..daedc2c60b 100644 --- a/recipes/linux/openzaurus-pxa27x_2.4.20-rmk2-embedix20050602.bb +++ b/recipes/linux/openzaurus-pxa27x_2.4.20-rmk2-embedix20050602.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Linux kernel 2.4.20-embedix for Sharp Zaurus SL-C1000 and SL-C300 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/openzaurus-pxa27x-2.4.20-rmk2-embedix20050602" SECTION = "kernel" PV = "2.4.20-rmk2-embedix" -LICENSE = "GPL" +LICENSE = "GPLv2" KV = "2.4.20" PR = "r18" diff --git a/recipes/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc b/recipes/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc index 6428629316..2eb111d009 100644 --- a/recipes/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc +++ b/recipes/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc @@ -1,6 +1,6 @@ DESCRIPTION = "Linux kernel for OpenZaurus PXA processor based devices." SECTION = "kernel" -LICENSE = "GPL" +LICENSE = "GPLv2" PV = "2.4.18-rmk7-pxa3-embedix" PR = "r46" KV = "2.4.18" diff --git a/recipes/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb b/recipes/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb index 4c9e9a1840..afb62e3f96 100644 --- a/recipes/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb +++ b/recipes/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Linux kernel for OpenZaurus StrongArm processor based devices." SECTION = "kernel" PV = "2.4.18-rmk7-pxa3-embedix" -LICENSE = "GPL" +LICENSE = "GPLv2" KV = "2.4.18" RMKV = "7" PXAV = "3" diff --git a/recipes/linux/triton-kernel_2.6.11.bb b/recipes/linux/triton-kernel_2.6.11.bb index c580706b25..d51dc63319 100644 --- a/recipes/linux/triton-kernel_2.6.11.bb +++ b/recipes/linux/triton-kernel_2.6.11.bb @@ -1,6 +1,6 @@ SECTION = "kernel" DESCRIPTION = "Linux kernel for the KARO TRITON XScale Board" -LICENSE = "GPL" +LICENSE = "GPLv2" PR = "r0" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \ diff --git a/recipes/linux/xanadux-ba-2.6_2.6.12.bb b/recipes/linux/xanadux-ba-2.6_2.6.12.bb index 1e8274fa11..ecab935092 100644 --- a/recipes/linux/xanadux-ba-2.6_2.6.12.bb +++ b/recipes/linux/xanadux-ba-2.6_2.6.12.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Xanadux Blueangel kernel based on the hh 2.6.12" -LICENSE = "GPL" +LICENSE = "GPLv2" PR ="r0" SRC_URI = "cvs://anonymous@xanadux.cvs.sourceforge.net/cvsroot/xanadux;method=pserver;module=linux-2.6-xda;tag=K2-6-12-hh2-xda0-ba0" diff --git a/recipes/linux/xanadux-un-2.6_2.6.12.bb b/recipes/linux/xanadux-un-2.6_2.6.12.bb index 1cc983aa77..60e50139be 100644 --- a/recipes/linux/xanadux-un-2.6_2.6.12.bb +++ b/recipes/linux/xanadux-un-2.6_2.6.12.bb @@ -1,7 +1,7 @@ ############## /home/jrs/cvs/oe/org.openembedded.dev/packages/linux/xanadux-un-2.6_2.6.12.bb ############### DESCRIPTION = "Xanadux HTC-Universal kernel based on the hh 2.6.12" -LICENSE = "GPL" +LICENSE = "GPLv2" PR ="r2" SRC_URI = "cvs://anonymous@xanadux.cvs.sourceforge.net/cvsroot/xanadux;method=pserver;module=linux-2.6-xda;tag=K2-6-12-hh2-xda0-un0" -- cgit v1.2.3 From 0241dbf4bfa5c5e762feafa8e6ca580083f01c31 Mon Sep 17 00:00:00 2001 From: Martyn Welch Date: Thu, 11 Mar 2010 02:33:00 +0000 Subject: Add Freescale P2020DS Demo Board This patch adds the Freescale P2020DS demo board, which is based on the p2020 SOC. Signed-off-by: Martyn Welch Acked-by: Tom Rini Signed-off-by: Philip Balister --- conf/machine/p2020ds.conf | 23 + recipes/linux/linux-2.6.33/p2020ds/defconfig | 1986 ++++++++++++++++++++++++++ recipes/linux/linux.inc | 1 + recipes/linux/linux_2.6.33.bb | 1 + recipes/u-boot/u-boot_git.bb | 1 + 5 files changed, 2012 insertions(+) create mode 100644 conf/machine/p2020ds.conf create mode 100644 recipes/linux/linux-2.6.33/p2020ds/defconfig diff --git a/conf/machine/p2020ds.conf b/conf/machine/p2020ds.conf new file mode 100644 index 0000000000..996a3becc0 --- /dev/null +++ b/conf/machine/p2020ds.conf @@ -0,0 +1,23 @@ +#@TYPE: Machine +#@Name: P2020ds +#@DESCRIPTION: Machine configuration for the freescale p2020ds development board + +TARGET_ARCH = "powerpc" + +PREFERRED_PROVIDER_virtual/kernel ?= "linux" + +MACHINE_FEATURES = "kernel26 usbhost pci ext2 vfat nfs uboot" + +KERNEL_IMAGETYPE = "uImage" +UBOOT_ENTRYPOINT = "0" + +UBOOT_MACHINE = "P2020DS_config" + +# Need to create jffs2 images with the correct endianess +EXTRA_IMAGECMD_jffs2 = " --big-endian -e 0x20000" + +#don't try to access tty1 +USE_VT = "0" + +#setup serial console on Com1 +SERIAL_CONSOLE = "-L 115200 ttyS0" diff --git a/recipes/linux/linux-2.6.33/p2020ds/defconfig b/recipes/linux/linux-2.6.33/p2020ds/defconfig new file mode 100644 index 0000000000..7d98bc60d2 --- /dev/null +++ b/recipes/linux/linux-2.6.33/p2020ds/defconfig @@ -0,0 +1,1986 @@ +# +# Automatically generated make config: don't edit +# Linux kernel version: 2.6.33-rc3 +# Wed Jan 6 09:24:07 2010 +# +# CONFIG_PPC64 is not set + +# +# Processor support +# +# CONFIG_PPC_BOOK3S_32 is not set +CONFIG_PPC_85xx=y +# CONFIG_PPC_8xx is not set +# CONFIG_40x is not set +# CONFIG_44x is not set +# CONFIG_E200 is not set +CONFIG_E500=y +# CONFIG_PPC_E500MC is not set +CONFIG_FSL_EMB_PERFMON=y +CONFIG_BOOKE=y +CONFIG_FSL_BOOKE=y +# CONFIG_PHYS_64BIT is not set +CONFIG_SPE=y +CONFIG_PPC_MMU_NOHASH=y +CONFIG_PPC_MMU_NOHASH_32=y +CONFIG_PPC_BOOK3E_MMU=y +# CONFIG_PPC_MM_SLICES is not set +CONFIG_SMP=y +CONFIG_NR_CPUS=8 +CONFIG_PPC32=y +CONFIG_WORD_SIZE=32 +# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set +CONFIG_MMU=y +CONFIG_GENERIC_CMOS_UPDATE=y +CONFIG_GENERIC_TIME=y +CONFIG_GENERIC_TIME_VSYSCALL=y +CONFIG_GENERIC_CLOCKEVENTS=y +CONFIG_GENERIC_HARDIRQS=y +CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y +# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set +# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set +CONFIG_IRQ_PER_CPU=y +CONFIG_NR_IRQS=512 +CONFIG_STACKTRACE_SUPPORT=y +CONFIG_HAVE_LATENCYTOP_SUPPORT=y +CONFIG_TRACE_IRQFLAGS_SUPPORT=y +CONFIG_LOCKDEP_SUPPORT=y +CONFIG_RWSEM_XCHGADD_ALGORITHM=y +CONFIG_ARCH_HAS_ILOG2_U32=y +CONFIG_GENERIC_HWEIGHT=y +CONFIG_GENERIC_FIND_NEXT_BIT=y +CONFIG_GENERIC_GPIO=y +# CONFIG_ARCH_NO_VIRT_TO_BUS is not set +CONFIG_PPC=y +CONFIG_EARLY_PRINTK=y +CONFIG_GENERIC_NVRAM=y +CONFIG_SCHED_OMIT_FRAME_POINTER=y +CONFIG_ARCH_MAY_HAVE_PC_FDC=y +CONFIG_PPC_OF=y +CONFIG_OF=y +CONFIG_PPC_UDBG_16550=y +CONFIG_GENERIC_TBSYNC=y +CONFIG_AUDIT_ARCH=y +CONFIG_GENERIC_BUG=y +CONFIG_DTC=y +CONFIG_DEFAULT_UIMAGE=y +CONFIG_ARCH_HIBERNATION_POSSIBLE=y +CONFIG_ARCH_SUSPEND_POSSIBLE=y +# CONFIG_PPC_DCR_NATIVE is not set +# CONFIG_PPC_DCR_MMIO is not set +CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y +CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" +CONFIG_CONSTRUCTORS=y + +# +# General setup +# +CONFIG_EXPERIMENTAL=y +CONFIG_LOCK_KERNEL=y +CONFIG_INIT_ENV_ARG_LIMIT=32 +CONFIG_LOCALVERSION="" +CONFIG_LOCALVERSION_AUTO=y +CONFIG_SWAP=y +CONFIG_SYSVIPC=y +CONFIG_SYSVIPC_SYSCTL=y +CONFIG_POSIX_MQUEUE=y +CONFIG_POSIX_MQUEUE_SYSCTL=y +CONFIG_BSD_PROCESS_ACCT=y +# CONFIG_BSD_PROCESS_ACCT_V3 is not set +# CONFIG_TASKSTATS is not set +CONFIG_AUDIT=y +# CONFIG_AUDITSYSCALL is not set + +# +# RCU Subsystem +# +CONFIG_TREE_RCU=y +# CONFIG_TREE_PREEMPT_RCU is not set +# CONFIG_TINY_RCU is not set +# CONFIG_RCU_TRACE is not set +CONFIG_RCU_FANOUT=32 +# CONFIG_RCU_FANOUT_EXACT is not set +# CONFIG_TREE_RCU_TRACE is not set +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_LOG_BUF_SHIFT=14 +CONFIG_GROUP_SCHED=y +# CONFIG_FAIR_GROUP_SCHED is not set +# CONFIG_RT_GROUP_SCHED is not set +CONFIG_USER_SCHED=y +# CONFIG_CGROUP_SCHED is not set +# CONFIG_CGROUPS is not set +CONFIG_SYSFS_DEPRECATED=y +CONFIG_SYSFS_DEPRECATED_V2=y +# CONFIG_RELAY is not set +# CONFIG_NAMESPACES is not set +CONFIG_BLK_DEV_INITRD=y +CONFIG_INITRAMFS_SOURCE="" +CONFIG_RD_GZIP=y +# CONFIG_RD_BZIP2 is not set +# CONFIG_RD_LZMA is not set +# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set +CONFIG_SYSCTL=y +CONFIG_ANON_INODES=y +CONFIG_EMBEDDED=y +CONFIG_SYSCTL_SYSCALL=y +CONFIG_KALLSYMS=y +CONFIG_KALLSYMS_ALL=y +CONFIG_KALLSYMS_EXTRA_PASS=y +CONFIG_HOTPLUG=y +CONFIG_PRINTK=y +CONFIG_BUG=y +CONFIG_ELF_CORE=y +CONFIG_BASE_FULL=y +CONFIG_FUTEX=y +CONFIG_EPOLL=y +CONFIG_SIGNALFD=y +CONFIG_TIMERFD=y +CONFIG_EVENTFD=y +CONFIG_SHMEM=y +CONFIG_AIO=y +CONFIG_HAVE_PERF_EVENTS=y + +# +# Kernel Performance Events And Counters +# +# CONFIG_PERF_EVENTS is not set +# CONFIG_PERF_COUNTERS is not set +CONFIG_VM_EVENT_COUNTERS=y +CONFIG_PCI_QUIRKS=y +CONFIG_SLUB_DEBUG=y +CONFIG_COMPAT_BRK=y +# CONFIG_SLAB is not set +CONFIG_SLUB=y +# CONFIG_SLOB is not set +# CONFIG_PROFILING is not set +CONFIG_HAVE_OPROFILE=y +# CONFIG_KPROBES is not set +CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y +CONFIG_HAVE_IOREMAP_PROT=y +CONFIG_HAVE_KPROBES=y +CONFIG_HAVE_KRETPROBES=y +CONFIG_HAVE_ARCH_TRACEHOOK=y +CONFIG_HAVE_DMA_ATTRS=y +CONFIG_USE_GENERIC_SMP_HELPERS=y +CONFIG_HAVE_CLK=y +CONFIG_HAVE_DMA_API_DEBUG=y + +# +# GCOV-based kernel profiling +# +# CONFIG_GCOV_KERNEL is not set +# CONFIG_SLOW_WORK is not set +# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set +CONFIG_SLABINFO=y +CONFIG_RT_MUTEXES=y +CONFIG_BASE_SMALL=0 +CONFIG_MODULES=y +# CONFIG_MODULE_FORCE_LOAD is not set +CONFIG_MODULE_UNLOAD=y +CONFIG_MODULE_FORCE_UNLOAD=y +CONFIG_MODVERSIONS=y +# CONFIG_MODULE_SRCVERSION_ALL is not set +CONFIG_STOP_MACHINE=y +CONFIG_BLOCK=y +CONFIG_LBDAF=y +# CONFIG_BLK_DEV_BSG is not set +# CONFIG_BLK_DEV_INTEGRITY is not set + +# +# IO Schedulers +# +CONFIG_IOSCHED_NOOP=y +CONFIG_IOSCHED_DEADLINE=y +CONFIG_IOSCHED_CFQ=y +# CONFIG_DEFAULT_DEADLINE is not set +CONFIG_DEFAULT_CFQ=y +# CONFIG_DEFAULT_NOOP is not set +CONFIG_DEFAULT_IOSCHED="cfq" +# CONFIG_INLINE_SPIN_TRYLOCK is not set +# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set +# CONFIG_INLINE_SPIN_LOCK is not set +# CONFIG_INLINE_SPIN_LOCK_BH is not set +# CONFIG_INLINE_SPIN_LOCK_IRQ is not set +# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set +CONFIG_INLINE_SPIN_UNLOCK=y +# CONFIG_INLINE_SPIN_UNLOCK_BH is not set +CONFIG_INLINE_SPIN_UNLOCK_IRQ=y +# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set +# CONFIG_INLINE_READ_TRYLOCK is not set +# CONFIG_INLINE_READ_LOCK is not set +# CONFIG_INLINE_READ_LOCK_BH is not set +# CONFIG_INLINE_READ_LOCK_IRQ is not set +# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set +CONFIG_INLINE_READ_UNLOCK=y +# CONFIG_INLINE_READ_UNLOCK_BH is not set +CONFIG_INLINE_READ_UNLOCK_IRQ=y +# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set +# CONFIG_INLINE_WRITE_TRYLOCK is not set +# CONFIG_INLINE_WRITE_LOCK is not set +# CONFIG_INLINE_WRITE_LOCK_BH is not set +# CONFIG_INLINE_WRITE_LOCK_IRQ is not set +# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set +CONFIG_INLINE_WRITE_UNLOCK=y +# CONFIG_INLINE_WRITE_UNLOCK_BH is not set +CONFIG_INLINE_WRITE_UNLOCK_IRQ=y +# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set +CONFIG_MUTEX_SPIN_ON_OWNER=y +# CONFIG_FREEZER is not set +CONFIG_PPC_MSI_BITMAP=y + +# +# Platform support +# +# CONFIG_PPC_CELL is not set +# CONFIG_PPC_CELL_NATIVE is not set +# CONFIG_PQ2ADS is not set +CONFIG_FSL_SOC_BOOKE=y +CONFIG_MPC8540_ADS=y +CONFIG_MPC8560_ADS=y +CONFIG_MPC85xx_CDS=y +CONFIG_MPC85xx_MDS=y +CONFIG_MPC8536_DS=y +CONFIG_MPC85xx_DS=y +CONFIG_MPC85xx_RDB=y +CONFIG_SOCRATES=y +CONFIG_KSI8560=y +CONFIG_XES_MPC85xx=y +CONFIG_STX_GP3=y +CONFIG_TQM8540=y +CONFIG_TQM8541=y +CONFIG_TQM8548=y +CONFIG_TQM8555=y +CONFIG_TQM8560=y +CONFIG_SBC8548=y +# CONFIG_SBC8560 is not set +# CONFIG_P4080_DS is not set +CONFIG_TQM85xx=y +# CONFIG_IPIC is not set +CONFIG_MPIC=y +# CONFIG_MPIC_WEIRD is not set +CONFIG_PPC_I8259=y +# CONFIG_PPC_RTAS is not set +# CONFIG_MMIO_NVRAM is not set +# CONFIG_PPC_MPC106 is not set +# CONFIG_PPC_970_NAP is not set +# CONFIG_PPC_INDIRECT_IO is not set +# CONFIG_GENERIC_IOMAP is not set +# CONFIG_CPU_FREQ is not set +CONFIG_QUICC_ENGINE=y +CONFIG_QE_GPIO=y +CONFIG_CPM2=y +CONFIG_FSL_ULI1575=y +CONFIG_CPM=y +CONFIG_MPC8xxx_GPIO=y +# CONFIG_SIMPLE_GPIO is not set + +# +# Kernel options +# +CONFIG_HIGHMEM=y +CONFIG_TICK_ONESHOT=y +CONFIG_NO_HZ=y +CONFIG_HIGH_RES_TIMERS=y +CONFIG_GENERIC_CLOCKEVENTS_BUILD=y +# CONFIG_HZ_100 is not set +CONFIG_HZ_250=y +# CONFIG_HZ_300 is not set +# CONFIG_HZ_1000 is not set +CONFIG_HZ=250 +CONFIG_SCHED_HRTICK=y +CONFIG_PREEMPT_NONE=y +# CONFIG_PREEMPT_VOLUNTARY is not set +# CONFIG_PREEMPT is not set +CONFIG_BINFMT_ELF=y +# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set +# CONFIG_HAVE_AOUT is not set +CONFIG_BINFMT_MISC=m +CONFIG_MATH_EMULATION=y +CONFIG_IOMMU_HELPER=y +CONFIG_SWIOTLB=y +CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y +CONFIG_ARCH_HAS_WALK_MEMORY=y +CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y +# CONFIG_IRQ_ALL_CPUS is not set +CONFIG_SPARSE_IRQ=y +CONFIG_MAX_ACTIVE_REGIONS=32 +CONFIG_ARCH_FLATMEM_ENABLE=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_PAGEFLAGS_EXTENDED=y +CONFIG_SPLIT_PTLOCK_CPUS=4 +CONFIG_MIGRATION=y +# CONFIG_PHYS_ADDR_T_64BIT is not set +CONFIG_ZONE_DMA_FLAG=1 +CONFIG_BOUNCE=y +CONFIG_VIRT_TO_BUS=y +# CONFIG_KSM is not set +CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 +CONFIG_PPC_4K_PAGES=y +# CONFIG_PPC_16K_PAGES is not set +# CONFIG_PPC_64K_PAGES is not set +# CONFIG_PPC_256K_PAGES is not set +CONFIG_FORCE_MAX_ZONEORDER=11 +CONFIG_PROC_DEVICETREE=y +# CONFIG_CMDLINE_BOOL is not set +CONFIG_EXTRA_TARGETS="" +# CONFIG_PM is not set +CONFIG_SECCOMP=y +CONFIG_ISA_DMA_API=y + +# +# Bus options +# +CONFIG_ZONE_DMA=y +CONFIG_GENERIC_ISA_DMA=y +CONFIG_PPC_INDIRECT_PCI=y +CONFIG_FSL_SOC=y +CONFIG_FSL_PCI=y +CONFIG_PPC_PCI_CHOICE=y +CONFIG_PCI=y +CONFIG_PCI_DOMAINS=y +CONFIG_PCI_SYSCALL=y +# CONFIG_PCIEPORTBUS is not set +CONFIG_ARCH_SUPPORTS_MSI=y +CONFIG_PCI_MSI=y +# CONFIG_PCI_LEGACY is not set +# CONFIG_PCI_DEBUG is not set +# CONFIG_PCI_STUB is not set +# CONFIG_PCI_IOV is not set +# CONFIG_PCCARD is not set +# CONFIG_HOTPLUG_PCI is not set +CONFIG_HAS_RAPIDIO=y +CONFIG_RAPIDIO=y +CONFIG_RAPIDIO_DISC_TIMEOUT=30 + +# +# Advanced setup +# +# CONFIG_ADVANCED_OPTIONS is not set + +# +# Default settings for advanced configuration options are used +# +CONFIG_LOWMEM_SIZE=0x30000000 +CONFIG_LOWMEM_CAM_NUM=3 +CONFIG_PAGE_OFFSET=0xc0000000 +CONFIG_KERNEL_START=0xc0000000 +CONFIG_PHYSICAL_START=0x00000000 +CONFIG_PHYSICAL_ALIGN=0x04000000 +CONFIG_TASK_SIZE=0xc0000000 +CONFIG_NET=y + +# +# Networking options +# +CONFIG_PACKET=y +# CONFIG_PACKET_MMAP is not set +CONFIG_UNIX=y +CONFIG_XFRM=y +CONFIG_XFRM_USER=y +# CONFIG_XFRM_SUB_POLICY is not set +# CONFIG_XFRM_MIGRATE is not set +# CONFIG_XFRM_STATISTICS is not set +CONFIG_NET_KEY=y +# CONFIG_NET_KEY_MIGRATE is not set +CONFIG_INET=y +CONFIG_IP_MULTICAST=y +CONFIG_IP_ADVANCED_ROUTER=y +CONFIG_ASK_IP_FIB_HASH=y +# CONFIG_IP_FIB_TRIE is not set +CONFIG_IP_FIB_HASH=y +CONFIG_IP_MULTIPLE_TABLES=y +CONFIG_IP_ROUTE_MULTIPATH=y +CONFIG_IP_ROUTE_VERBOSE=y +CONFIG_IP_PNP=y +CONFIG_IP_PNP_DHCP=y +CONFIG_IP_PNP_BOOTP=y +CONFIG_IP_PNP_RARP=y +CONFIG_NET_IPIP=y +CONFIG_NET_IPGRE=y +CONFIG_NET_IPGRE_BROADCAST=y +CONFIG_IP_MROUTE=y +CONFIG_IP_PIMSM_V1=y +CONFIG_IP_PIMSM_V2=y +CONFIG_ARPD=y +# CONFIG_SYN_COOKIES is not set +# CONFIG_INET_AH is not set +CONFIG_INET_ESP=y +# CONFIG_INET_IPCOMP is not set +# CONFIG_INET_XFRM_TUNNEL is not set +CONFIG_INET_TUNNEL=y +CONFIG_INET_XFRM_MODE_TRANSPORT=y +CONFIG_INET_XFRM_MODE_TUNNEL=y +# CONFIG_INET_XFRM_MODE_BEET is not set +# CONFIG_INET_LRO is not set +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=y +# CONFIG_IPV6_PRIVACY is not set +# CONFIG_IPV6_ROUTER_PREF is not set +# CONFIG_IPV6_OPTIMISTIC_DAD is not set +# CONFIG_INET6_AH is not set +# CONFIG_INET6_ESP is not set +# CONFIG_INET6_IPCOMP is not set +# CONFIG_IPV6_MIP6 is not set +# CONFIG_INET6_XFRM_TUNNEL is not set +# CONFIG_INET6_TUNNEL is not set +CONFIG_INET6_XFRM_MODE_TRANSPORT=y +CONFIG_INET6_XFRM_MODE_TUNNEL=y +CONFIG_INET6_XFRM_MODE_BEET=y +# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set +CONFIG_IPV6_SIT=y +# CONFIG_IPV6_SIT_6RD is not set +CONFIG_IPV6_NDISC_NODETYPE=y +# CONFIG_IPV6_TUNNEL is not set +# CONFIG_IPV6_MULTIPLE_TABLES is not set +# CONFIG_IPV6_MROUTE is not set +# CONFIG_NETWORK_SECMARK is not set +# CONFIG_NETFILTER is not set +# CONFIG_IP_DCCP is not set +CONFIG_IP_SCTP=m +# CONFIG_SCTP_DBG_MSG is not set +# CONFIG_SCTP_DBG_OBJCNT is not set +# CONFIG_SCTP_HMAC_NONE is not set +# CONFIG_SCTP_HMAC_SHA1 is not set +CONFIG_SCTP_HMAC_MD5=y +# CONFIG_RDS is not set +# CONFIG_TIPC is not set +# CONFIG_ATM is not set +# CONFIG_BRIDGE is not set +# CONFIG_NET_DSA 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 +# CONFIG_PHONET is not set +# CONFIG_IEEE802154 is not set +# CONFIG_NET_SCHED is not set +# CONFIG_DCB is not set + +# +# Network testing +# +# CONFIG_NET_PKTGEN is not set +# CONFIG_HAMRADIO is not set +# CONFIG_CAN is not set +# CONFIG_IRDA is not set +# CONFIG_BT is not set +# CONFIG_AF_RXRPC is not set +CONFIG_FIB_RULES=y +CONFIG_WIRELESS=y +# CONFIG_CFG80211 is not set +# CONFIG_LIB80211 is not set + +# +# CFG80211 needs to be enabled for MAC80211 +# +# CONFIG_WIMAX is not set +# CONFIG_RFKILL is not set +# CONFIG_NET_9P is not set + +# +# Device Drivers +# + +# +# Generic Driver Options +# +CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" +# CONFIG_DEVTMPFS is not set +CONFIG_STANDALONE=y +CONFIG_PREVENT_FIRMWARE_BUILD=y +CONFIG_FW_LOADER=y +CONFIG_FIRMWARE_IN_KERNEL=y +CONFIG_EXTRA_FIRMWARE="" +# CONFIG_DEBUG_DRIVER is not set +# CONFIG_DEBUG_DEVRES is not set +# CONFIG_SYS_HYPERVISOR is not set +# CONFIG_CONNECTOR is not set +CONFIG_MTD=y +# CONFIG_MTD_DEBUG is not set +# CONFIG_MTD_TESTS is not set +CONFIG_MTD_CONCAT=y +CONFIG_MTD_PARTITIONS=y +# CONFIG_MTD_REDBOOT_PARTS is not set +# CONFIG_MTD_CMDLINE_PARTS is not set +CONFIG_MTD_OF_PARTS=y +# CONFIG_MTD_AR7_PARTS is not set + +# +# User Modules And Translation Layers +# +CONFIG_MTD_CHAR=y +CONFIG_MTD_BLKDEVS=y +CONFIG_MTD_BLOCK=y +# CONFIG_FTL is not set +# CONFIG_NFTL is not set +# CONFIG_INFTL is not set +# CONFIG_RFD_FTL is not set +# CONFIG_SSFDC is not set +# CONFIG_MTD_OOPS is not set + +# +# RAM/ROM/Flash chip drivers +# +CONFIG_MTD_CFI=y +CONFIG_MTD_JEDECPROBE=y +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=y +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 + +# +# Mapping drivers for chip access +# +# CONFIG_MTD_COMPLEX_MAPPINGS is not set +# CONFIG_MTD_PHYSMAP is not set +CONFIG_MTD_PHYSMAP_OF=y +# CONFIG_MTD_INTEL_VR_NOR 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 +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_IDS=y +# CONFIG_MTD_NAND_DISKONCHIP is not set +# CONFIG_MTD_NAND_CAFE is not set +# CONFIG_MTD_NAND_NANDSIM is not set +# CONFIG_MTD_NAND_PLATFORM is not set +# CONFIG_MTD_ALAUDA is not set +CONFIG_MTD_NAND_FSL_ELBC=y +# CONFIG_MTD_NAND_FSL_UPM is not set +# CONFIG_MTD_ONENAND is not set + +# +# LPDDR flash memory drivers +# +# CONFIG_MTD_LPDDR is not set + +# +# UBI - Unsorted block images +# +# CONFIG_MTD_UBI is not set +CONFIG_OF_DEVICE=y +CONFIG_OF_GPIO=y +CONFIG_OF_I2C=y +CONFIG_OF_MDIO=y +# CONFIG_PARPORT is not set +CONFIG_BLK_DEV=y +# CONFIG_BLK_DEV_FD 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=y +# CONFIG_BLK_DEV_CRYPTOLOOP is not set + +# +# DRBD disabled because PROC_FS, INET or CONNECTOR not selected +# +CONFIG_BLK_DEV_NBD=y +# 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=131072 +# CONFIG_BLK_DEV_XIP is not set +# CONFIG_CDROM_PKTCDVD is not set +# CONFIG_ATA_OVER_ETH is not set +# CONFIG_BLK_DEV_HD is not set +CONFIG_MISC_DEVICES=y +# CONFIG_AD525X_DPOT is not set +# CONFIG_PHANTOM is not set +# CONFIG_SGI_IOC4 is not set +# CONFIG_TIFM_CORE is not set +# CONFIG_ICS932S401 is not set +# CONFIG_ENCLOSURE_SERVICES is not set +# CONFIG_HP_ILO is not set +# CONFIG_ISL29003 is not set +# CONFIG_DS1682 is not set +# CONFIG_C2PORT is not set + +# +# EEPROM support +# +# CONFIG_EEPROM_AT24 is not set +CONFIG_EEPROM_LEGACY=y +# CONFIG_EEPROM_MAX6875 is not set +# CONFIG_EEPROM_93CX6 is not set +# CONFIG_CB710_CORE is not set +CONFIG_HAVE_IDE=y +# CONFIG_IDE is not set + +# +# SCSI device support +# +# CONFIG_RAID_ATTRS is not set +CONFIG_SCSI=y +CONFIG_SCSI_DMA=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=y +# 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 +CONFIG_SCSI_MULTI_LUN=y +# CONFIG_SCSI_CONSTANTS is not set +CONFIG_SCSI_LOGGING=y +# 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_LIBSAS is not set +# CONFIG_SCSI_SRP_ATTRS is not set +CONFIG_SCSI_LOWLEVEL=y +# CONFIG_ISCSI_TCP is not set +# CONFIG_SCSI_CXGB3_ISCSI is not set +# CONFIG_SCSI_BNX2_ISCSI is not set +# CONFIG_BE2ISCSI is not set +# CONFIG_BLK_DEV_3W_XXXX_RAID is not set +# CONFIG_SCSI_HPSA is not set +# CONFIG_SCSI_3W_9XXX is not set +# CONFIG_SCSI_3W_SAS 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_MVSAS 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_MPT2SAS is not set +# CONFIG_SCSI_HPTIOP is not set +# CONFIG_SCSI_BUSLOGIC is not set +# CONFIG_LIBFC is not set +# CONFIG_LIBFCOE is not set +# CONFIG_FCOE 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_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_PMCRAID is not set +# CONFIG_SCSI_PM8001 is not set +# CONFIG_SCSI_SRP is not set +# CONFIG_SCSI_BFA_FC is not set +# CONFIG_SCSI_DH is not set +# CONFIG_SCSI_OSD_INITIATOR is not set +CONFIG_ATA=y +# CONFIG_ATA_NONSTANDARD is not set +CONFIG_ATA_VERBOSE_ERROR=y +CONFIG_SATA_PMP=y +CONFIG_SATA_AHCI=y +# CONFIG_SATA_SIL24 is not set +CONFIG_SATA_FSL=y +CONFIG_ATA_SFF=y +# 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_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=y +# CONFIG_PATA_AMD is not set +# CONFIG_PATA_ARTOP is not set +# CONFIG_PATA_ATP867X 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_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_NINJA32 is not set +# CONFIG_PATA_NS87410 is not set +# CONFIG_PATA_NS87415 is not set +# CONFIG_PATA_OPTI is not set +# CONFIG_PATA_OPTIDMA is not set +# CONFIG_PATA_PDC2027X is not set +# CONFIG_PATA_PDC_OLD is not set +# CONFIG_PATA_RADISYS is not set +# CONFIG_PATA_RDC is not set +# CONFIG_PATA_RZ1000 is not set +# CONFIG_PATA_SC1200 is not set +# CONFIG_PATA_SERVERWORKS is not set +# CONFIG_PATA_SIL680 is not set +# CONFIG_PATA_SIS is not set +# CONFIG_PATA_TOSHIBA is not set +# CONFIG_PATA_VIA is not set +# CONFIG_PATA_WINBOND is not set +# CONFIG_PATA_PLATFORM is not set +# CONFIG_PATA_SCH is not set +# CONFIG_MD is not set +# CONFIG_FUSION is not set + +# +# IEEE 1394 (FireWire) support +# + +# +# You can enable one or both FireWire driver stacks. +# + +# +# The newer stack is recommended. +# +# CONFIG_FIREWIRE is not set +# CONFIG_IEEE1394 is not set +# CONFIG_I2O is not set +# CONFIG_MACINTOSH_DRIVERS is not set +CONFIG_NETDEVICES=y +CONFIG_DUMMY=y +# CONFIG_BONDING is not set +# CONFIG_MACVLAN is not set +# CONFIG_EQUALIZER is not set +# CONFIG_TUN is not set +# CONFIG_VETH is not set +# CONFIG_ARCNET is not set +CONFIG_PHYLIB=y + +# +# MII PHY device drivers +# +CONFIG_MARVELL_PHY=y +CONFIG_DAVICOM_PHY=y +# CONFIG_QSEMI_PHY is not set +# CONFIG_LXT_PHY is not set +CONFIG_CICADA_PHY=y +CONFIG_VITESSE_PHY=y +# CONFIG_SMSC_PHY is not set +# CONFIG_BROADCOM_PHY is not set +# CONFIG_ICPLUS_PHY is not set +# CONFIG_REALTEK_PHY is not set +# CONFIG_NATIONAL_PHY is not set +# CONFIG_STE10XP is not set +# CONFIG_LSI_ET1011C_PHY is not set +CONFIG_FIXED_PHY=y +# CONFIG_MDIO_BITBANG is not set +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_ETHOC is not set +# CONFIG_DNET is not set +# CONFIG_NET_TULIP is not set +# CONFIG_HP100 is not set +# CONFIG_IBM_NEW_EMAC_ZMII is not set +# CONFIG_IBM_NEW_EMAC_RGMII is not set +# CONFIG_IBM_NEW_EMAC_TAH is not set +# CONFIG_IBM_NEW_EMAC_EMAC4 is not set +# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set +# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set +# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set +# CONFIG_NET_PCI is not set +# CONFIG_B44 is not set +# CONFIG_KS8842 is not set +# CONFIG_KS8851_MLL is not set +# CONFIG_ATL2 is not set +# CONFIG_XILINX_EMACLITE is not set +CONFIG_FS_ENET=y +CONFIG_FS_ENET_HAS_SCC=y +CONFIG_FS_ENET_HAS_FCC=y +# CONFIG_FS_ENET_MDIO_FCC is not set +CONFIG_NETDEV_1000=y +# CONFIG_ACENIC is not set +# CONFIG_DL2K is not set +# CONFIG_E1000 is not set +# CONFIG_E1000E is not set +# CONFIG_IP1000 is not set +# CONFIG_IGB is not set +# CONFIG_IGBVF 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_VIA_VELOCITY is not set +# CONFIG_TIGON3 is not set +# CONFIG_BNX2 is not set +# CONFIG_CNIC is not set +CONFIG_FSL_PQ_MDIO=y +CONFIG_GIANFAR=y +CONFIG_UCC_GETH=y +# CONFIG_UGETH_TX_ON_DEMAND is not set +# CONFIG_MV643XX_ETH is not set +# CONFIG_QLA3XXX is not set +# CONFIG_ATL1 is not set +# CONFIG_ATL1E is not set +# CONFIG_ATL1C is not set +# CONFIG_JME is not set +CONFIG_NETDEV_10000=y +# CONFIG_CHELSIO_T1 is not set +CONFIG_CHELSIO_T3_DEPENDS=y +# CONFIG_CHELSIO_T3 is not set +# CONFIG_ENIC is not set +# CONFIG_IXGBE is not set +# CONFIG_IXGB is not set +# CONFIG_S2IO is not set +# CONFIG_VXGE is not set +# CONFIG_MYRI10GE is not set +# CONFIG_NETXEN_NIC is not set +# CONFIG_NIU is not set +# CONFIG_MLX4_EN is not set +# CONFIG_MLX4_CORE is not set +# CONFIG_TEHUTI is not set +# CONFIG_BNX2X is not set +# CONFIG_QLGE is not set +# CONFIG_SFC is not set +# CONFIG_BE2NET is not set +# CONFIG_TR is not set +CONFIG_WLAN=y +# CONFIG_AIRO is not set +# CONFIG_ATMEL is not set +# CONFIG_PRISM54 is not set +# CONFIG_USB_ZD1201 is not set +# CONFIG_HOSTAP is not set + +# +# Enable WiMAX (Networking options) to see the WiMAX drivers +# + +# +# USB Network Adapters +# +# CONFIG_USB_CATC is not set +# CONFIG_USB_KAWETH is not set +# CONFIG_USB_PEGASUS is not set +# CONFIG_USB_RTL8150 is not set +# CONFIG_USB_USBNET is not set +# CONFIG_WAN is not set +# CONFIG_RIONET 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_NETCONSOLE is not set +# CONFIG_NETPOLL is not set +# CONFIG_NET_POLL_CONTROLLER is not set +# CONFIG_VMXNET3 is not set +# CONFIG_ISDN is not set +# CONFIG_PHONE is not set + +# +# Input device support +# +CONFIG_INPUT=y +CONFIG_INPUT_FF_MEMLESS=m +# CONFIG_INPUT_POLLDEV is not set +# CONFIG_INPUT_SPARSEKMAP is not set + +# +# Userland interfaces +# +# CONFIG_INPUT_MOUSEDEV is not set +# CONFIG_INPUT_JOYDEV is not set +# CONFIG_INPUT_EVDEV is not set +# CONFIG_INPUT_EVBUG is not set + +# +# Input Device Drivers +# +# CONFIG_INPUT_KEYBOARD is not set +# CONFIG_INPUT_MOUSE is not set +# CONFIG_INPUT_JOYSTICK is not set +# CONFIG_INPUT_TABLET is not set +# CONFIG_INPUT_TOUCHSCREEN is not set +# CONFIG_INPUT_MISC is not set + +# +# Hardware I/O ports +# +CONFIG_SERIO=y +CONFIG_SERIO_I8042=y +CONFIG_SERIO_SERPORT=y +# CONFIG_SERIO_PCIPS2 is not set +CONFIG_SERIO_LIBPS2=y +# CONFIG_SERIO_RAW is not set +# CONFIG_SERIO_XILINX_XPS_PS2 is not set +# CONFIG_SERIO_ALTERA_PS2 is not set +# CONFIG_GAMEPORT is not set + +# +# Character devices +# +CONFIG_VT=y +CONFIG_CONSOLE_TRANSLATIONS=y +CONFIG_VT_CONSOLE=y +CONFIG_HW_CONSOLE=y +# CONFIG_VT_HW_CONSOLE_BINDING is not set +CONFIG_DEVKMEM=y +# CONFIG_SERIAL_NONSTANDARD is not set +# CONFIG_NOZOMI is not set + +# +# Serial drivers +# +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_SERIAL_8250_PCI=y +CONFIG_SERIAL_8250_NR_UARTS=2 +CONFIG_SERIAL_8250_RUNTIME_UARTS=2 +CONFIG_SERIAL_8250_EXTENDED=y +CONFIG_SERIAL_8250_MANY_PORTS=y +CONFIG_SERIAL_8250_SHARE_IRQ=y +CONFIG_SERIAL_8250_DETECT_IRQ=y +CONFIG_SERIAL_8250_RSA=y + +# +# Non-8250 serial port support +# +# CONFIG_SERIAL_UARTLITE is not set +CONFIG_SERIAL_CORE=y +CONFIG_SERIAL_CORE_CONSOLE=y +# CONFIG_SERIAL_CPM is not set +# CONFIG_SERIAL_JSM is not set +# CONFIG_SERIAL_OF_PLATFORM is not set +CONFIG_SERIAL_QE=m +# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set +CONFIG_UNIX98_PTYS=y +# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set +CONFIG_LEGACY_PTYS=y +CONFIG_LEGACY_PTY_COUNT=256 +# CONFIG_HVC_UDBG is not set +# CONFIG_IPMI_HANDLER is not set +CONFIG_HW_RANDOM=y +# CONFIG_HW_RANDOM_TIMERIOMEM is not set +CONFIG_NVRAM=y +# CONFIG_R3964 is not set +# CONFIG_APPLICOM is not set +# CONFIG_RAW_DRIVER is not set +# CONFIG_TCG_TPM is not set +CONFIG_DEVPORT=y +CONFIG_I2C=y +CONFIG_I2C_BOARDINFO=y +CONFIG_I2C_COMPAT=y +# CONFIG_I2C_CHARDEV is not set +CONFIG_I2C_HELPER_AUTO=y + +# +# I2C Hardware Bus support +# + +# +# PC SMBus host controller drivers +# +# 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_ISCH is not set +# CONFIG_I2C_PIIX4 is not set +# CONFIG_I2C_NFORCE2 is not set +# CONFIG_I2C_SIS5595 is not set +# CONFIG_I2C_SIS630 is not set +# CONFIG_I2C_SIS96X is not set +# CONFIG_I2C_VIA is not set +# CONFIG_I2C_VIAPRO is not set + +# +# I2C system bus drivers (mostly embedded / system-on-chip) +# +CONFIG_I2C_CPM=m +# CONFIG_I2C_DESIGNWARE is not set +# CONFIG_I2C_GPIO is not set +CONFIG_I2C_MPC=y +# CONFIG_I2C_OCORES is not set +# CONFIG_I2C_SIMTEC is not set + +# +# External I2C/SMBus adapter drivers +# +# CONFIG_I2C_PARPORT_LIGHT is not set +# CONFIG_I2C_TAOS_EVM is not set +# CONFIG_I2C_TINY_USB is not set + +# +# Other I2C/SMBus bus drivers +# +# CONFIG_I2C_PCA_PLATFORM is not set +# CONFIG_I2C_STUB is not set + +# +# Miscellaneous I2C Chip support +# +# CONFIG_SENSORS_TSL2550 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 +# CONFIG_SPI is not set + +# +# PPS support +# +# CONFIG_PPS is not set +CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y +CONFIG_ARCH_REQUIRE_GPIOLIB=y +CONFIG_GPIOLIB=y +# CONFIG_DEBUG_GPIO is not set +# CONFIG_GPIO_SYSFS is not set + +# +# Memory mapped GPIO expanders: +# +# CONFIG_GPIO_XILINX is not set + +# +# I2C GPIO expanders: +# +# CONFIG_GPIO_MAX732X is not set +# CONFIG_GPIO_PCA953X is not set +# CONFIG_GPIO_PCF857X is not set + +# +# PCI GPIO expanders: +# +# CONFIG_GPIO_CS5535 is not set +# CONFIG_GPIO_BT8XX is not set +# CONFIG_GPIO_LANGWELL is not set + +# +# SPI GPIO expanders: +# + +# +# AC97 GPIO expanders: +# +# CONFIG_W1 is not set +# CONFIG_POWER_SUPPLY is not set +# CONFIG_HWMON is not set +# CONFIG_THERMAL is not set +# CONFIG_WATCHDOG is not set +CONFIG_SSB_POSSIBLE=y + +# +# Sonics Silicon Backplane +# +# CONFIG_SSB is not set + +# +# Multifunction device drivers +# +# CONFIG_MFD_CORE is not set +# CONFIG_MFD_SM501 is not set +# CONFIG_HTC_PASIC3 is not set +# CONFIG_UCB1400_CORE is not set +# CONFIG_TPS65010 is not set +# CONFIG_TWL4030_CORE is not set +# CONFIG_MFD_TMIO is not set +# CONFIG_PMIC_DA903X is not set +# CONFIG_PMIC_ADP5520 is not set +# CONFIG_MFD_WM8400 is not set +# CONFIG_MFD_WM831X is not set +# CONFIG_MFD_WM8350_I2C is not set +# CONFIG_MFD_PCF50633 is not set +# CONFIG_AB3100_CORE is not set +# CONFIG_MFD_88PM8607 is not set +# CONFIG_REGULATOR is not set +# CONFIG_MEDIA_SUPPORT is not set + +# +# Graphics support +# +# CONFIG_AGP is not set +CONFIG_VGA_ARB=y +# CONFIG_DRM is not set +# CONFIG_VGASTATE is not set +CONFIG_VIDEO_OUTPUT_CONTROL=y +# CONFIG_FB is not set +# CONFIG_BACKLIGHT_LCD_SUPPORT is not set + +# +# Display device support +# +# CONFIG_DISPLAY_SUPPORT is not set + +# +# Console display driver support +# +CONFIG_VGA_CONSOLE=y +# CONFIG_VGACON_SOFT_SCROLLBACK is not set +CONFIG_DUMMY_CONSOLE=y +CONFIG_SOUND=y +CONFIG_SOUND_OSS_CORE=y +CONFIG_SOUND_OSS_CORE_PRECLAIM=y +CONFIG_SND=y +CONFIG_SND_TIMER=y +CONFIG_SND_PCM=y +# CONFIG_SND_SEQUENCER is not set +CONFIG_SND_OSSEMUL=y +CONFIG_SND_MIXER_OSS=y +CONFIG_SND_PCM_OSS=y +CONFIG_SND_PCM_OSS_PLUGINS=y +# CONFIG_SND_HRTIMER is not set +# CONFIG_SND_DYNAMIC_MINORS is not set +# CONFIG_SND_SUPPORT_OLD_API is not set +CONFIG_SND_VERBOSE_PROCFS=y +# CONFIG_SND_VERBOSE_PRINTK is not set +# CONFIG_SND_DEBUG is not set +CONFIG_SND_VMASTER=y +# CONFIG_SND_RAWMIDI_SEQ is not set +# CONFIG_SND_OPL3_LIB_SEQ is not set +# CONFIG_SND_OPL4_LIB_SEQ is not set +# CONFIG_SND_SBAWE_SEQ is not set +# CONFIG_SND_EMU10K1_SEQ is not set +CONFIG_SND_AC97_CODEC=y +CONFIG_SND_DRIVERS=y +# 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 +# CONFIG_SND_AC97_POWER_SAVE is not set +CONFIG_SND_PCI=y +# 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_AW2 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_OXYGEN is not set +# CONFIG_SND_CS4281 is not set +# CONFIG_SND_CS46XX is not set +# CONFIG_SND_CS5530 is not set +# CONFIG_SND_CS5535AUDIO is not set +# CONFIG_SND_CTXFI 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_INDIGOIOX is not set +# CONFIG_SND_INDIGODJX 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_HIFIER is not set +# CONFIG_SND_ICE1712 is not set +# CONFIG_SND_ICE1724 is not set +CONFIG_SND_INTEL8X0=y +# CONFIG_SND_INTEL8X0M is not set +# CONFIG_SND_KORG1212 is not set +# CONFIG_SND_LX6464ES 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_VIRTUOSO is not set +# CONFIG_SND_VX222 is not set +# CONFIG_SND_YMFPCI is not set +CONFIG_SND_PPC=y +CONFIG_SND_USB=y +# CONFIG_SND_USB_AUDIO is not set +# CONFIG_SND_USB_USX2Y is not set +# CONFIG_SND_USB_CAIAQ is not set +# CONFIG_SND_SOC is not set +# CONFIG_SOUND_PRIME is not set +CONFIG_AC97_BUS=y +CONFIG_HID_SUPPORT=y +CONFIG_HID=y +# CONFIG_HIDRAW is not set + +# +# USB Input Devices +# +CONFIG_USB_HID=y +# CONFIG_HID_PID is not set +# CONFIG_USB_HIDDEV is not set + +# +# Special HID drivers +# +CONFIG_HID_A4TECH=y +CONFIG_HID_APPLE=y +CONFIG_HID_BELKIN=y +CONFIG_HID_CHERRY=y +CONFIG_HID_CHICONY=y +CONFIG_HID_CYPRESS=y +# CONFIG_HID_DRAGONRISE is not set +CONFIG_HID_EZKEY=y +# CONFIG_HID_KYE is not set +CONFIG_HID_GYRATION=y +# CONFIG_HID_TWINHAN is not set +# CONFIG_HID_KENSINGTON is not set +CONFIG_HID_LOGITECH=y +# CONFIG_LOGITECH_FF is not set +# CONFIG_LOGIRUMBLEPAD2_FF is not set +CONFIG_HID_MICROSOFT=y +CONFIG_HID_MONTEREY=y +# CONFIG_HID_NTRIG is not set +CONFIG_HID_PANTHERLORD=y +# CONFIG_PANTHERLORD_FF is not set +CONFIG_HID_PETALYNX=y +CONFIG_HID_SAMSUNG=y +CONFIG_HID_SONY=y +CONFIG_HID_SUNPLUS=y +# CONFIG_HID_GREENASIA is not set +# CONFIG_HID_SMARTJOYPLUS is not set +# CONFIG_HID_TOPSEED is not set +# CONFIG_HID_THRUSTMASTER is not set +# CONFIG_HID_ZEROPLUS is not set +CONFIG_USB_SUPPORT=y +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 +# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set + +# +# Miscellaneous USB options +# +CONFIG_USB_DEVICEFS=y +CONFIG_USB_DEVICE_CLASS=y +# CONFIG_USB_DYNAMIC_MINORS is not set +# CONFIG_USB_OTG is not set +# CONFIG_USB_OTG_WHITELIST is not set +# CONFIG_USB_OTG_BLACKLIST_HUB is not set +CONFIG_USB_MON=y +# CONFIG_USB_WUSB is not set +# CONFIG_USB_WUSB_CBAF is not set + +# +# USB Host Controller Drivers +# +# CONFIG_USB_C67X00_HCD is not set +# CONFIG_USB_XHCI_HCD is not set +CONFIG_USB_EHCI_HCD=y +CONFIG_USB_EHCI_ROOT_HUB_TT=y +# CONFIG_USB_EHCI_TT_NEWSCHED is not set +# CONFIG_XPS_USB_HCD_XILINX is not set +CONFIG_USB_EHCI_FSL=y +CONFIG_USB_EHCI_HCD_PPC_OF=y +# CONFIG_USB_OXU210HP_HCD is not set +# CONFIG_USB_ISP116X_HCD is not set +# CONFIG_USB_ISP1760_HCD is not set +# CONFIG_USB_ISP1362_HCD is not set +CONFIG_USB_OHCI_HCD=y +CONFIG_USB_OHCI_HCD_PPC_OF_BE=y +CONFIG_USB_OHCI_HCD_PPC_OF_LE=y +CONFIG_USB_OHCI_HCD_PPC_OF=y +CONFIG_USB_OHCI_HCD_PCI=y +CONFIG_USB_OHCI_BIG_ENDIAN_DESC=y +CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y +CONFIG_USB_OHCI_LITTLE_ENDIAN=y +# CONFIG_USB_UHCI_HCD is not set +# CONFIG_USB_FHCI_HCD is not set +# CONFIG_USB_SL811_HCD is not set +# CONFIG_USB_R8A66597_HCD is not set +# CONFIG_USB_WHCI_HCD is not set +# CONFIG_USB_HWA_HCD is not set + +# +# USB Device Class drivers +# +# CONFIG_USB_ACM is not set +# CONFIG_USB_PRINTER is not set +# CONFIG_USB_WDM is not set +# CONFIG_USB_TMC is not set + +# +# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may +# + +# +# also be needed; see USB_STORAGE Help for more info +# +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_ISD200 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_STORAGE_CYPRESS_ATACB is not set +# CONFIG_USB_LIBUSUAL is not set + +# +# USB Imaging devices +# +# CONFIG_USB_MDC800 is not set +# CONFIG_USB_MICROTEK is not set + +# +# USB port drivers +# +# 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_SEVSEG 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_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 +# CONFIG_USB_ISIGHTFW is not set +# CONFIG_USB_VST is not set +# CONFIG_USB_GADGET is not set + +# +# OTG and related infrastructure +# +# CONFIG_USB_GPIO_VBUS is not set +# CONFIG_NOP_USB_XCEIV is not set +# CONFIG_UWB is not set +# CONFIG_MMC is not set +# CONFIG_MEMSTICK is not set +# CONFIG_NEW_LEDS is not set +# CONFIG_ACCESSIBILITY is not set +# CONFIG_INFINIBAND is not set +CONFIG_EDAC=y + +# +# Reporting subsystems +# +# CONFIG_EDAC_DEBUG is not set +CONFIG_EDAC_MM_EDAC=y +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 +# CONFIG_RTC_DRV_TEST is not set + +# +# I2C RTC drivers +# +# CONFIG_RTC_DRV_DS1307 is not set +# CONFIG_RTC_DRV_DS1374 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 +# CONFIG_RTC_DRV_M41T80 is not set +# CONFIG_RTC_DRV_BQ32K is not set +# CONFIG_RTC_DRV_S35390A is not set +# CONFIG_RTC_DRV_FM3130 is not set +# CONFIG_RTC_DRV_RX8581 is not set +# CONFIG_RTC_DRV_RX8025 is not set + +# +# SPI RTC drivers +# + +# +# Platform RTC drivers +# +CONFIG_RTC_DRV_CMOS=y +# CONFIG_RTC_DRV_DS1286 is not set +# CONFIG_RTC_DRV_DS1511 is not set +# CONFIG_RTC_DRV_DS1553 is not set +# CONFIG_RTC_DRV_DS1742 is not set +# CONFIG_RTC_DRV_STK17TA8 is not set +# CONFIG_RTC_DRV_M48T86 is not set +# CONFIG_RTC_DRV_M48T35 is not set +# CONFIG_RTC_DRV_M48T59 is not set +# CONFIG_RTC_DRV_MSM6242 is not set +# CONFIG_RTC_DRV_BQ4802 is not set +# CONFIG_RTC_DRV_RP5C01 is not set +# CONFIG_RTC_DRV_V3020 is not set + +# +# on-CPU RTC drivers +# +# CONFIG_RTC_DRV_GENERIC is not set +CONFIG_DMADEVICES=y + +# +# DMA Devices +# +CONFIG_FSL_DMA=y +CONFIG_DMA_ENGINE=y + +# +# DMA Clients +# +# CONFIG_NET_DMA is not set +# CONFIG_ASYNC_TX_DMA is not set +# CONFIG_DMATEST is not set +# CONFIG_AUXDISPLAY is not set +# CONFIG_UIO is not set + +# +# TI VLYNQ +# +# CONFIG_STAGING 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_DEFAULTS_TO_ORDERED is not set +CONFIG_EXT3_FS_XATTR=y +# CONFIG_EXT3_FS_POSIX_ACL is not set +# CONFIG_EXT3_FS_SECURITY is not set +# CONFIG_EXT4_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_BTRFS_FS is not set +# CONFIG_NILFS2_FS is not set +CONFIG_FILE_LOCKING=y +CONFIG_FSNOTIFY=y +CONFIG_DNOTIFY=y +CONFIG_INOTIFY=y +CONFIG_INOTIFY_USER=y +# CONFIG_QUOTA is not set +# CONFIG_AUTOFS_FS is not set +# CONFIG_AUTOFS4_FS is not set +# CONFIG_FUSE_FS is not set + +# +# Caches +# +# CONFIG_FSCACHE is not set + +# +# 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=y +CONFIG_MSDOS_FS=m +CONFIG_VFAT_FS=y +CONFIG_FAT_DEFAULT_CODEPAGE=437 +CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" +CONFIG_NTFS_FS=y +# 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_PROC_PAGE_MONITOR=y +CONFIG_SYSFS=y +CONFIG_TMPFS=y +# CONFIG_TMPFS_POSIX_ACL is not set +# CONFIG_HUGETLB_PAGE is not set +# CONFIG_CONFIGFS_FS is not set +CONFIG_MISC_FILESYSTEMS=y +CONFIG_ADFS_FS=m +# CONFIG_ADFS_FS_RW is not set +CONFIG_AFFS_FS=m +CONFIG_HFS_FS=m +CONFIG_HFSPLUS_FS=m +CONFIG_BEFS_FS=m +# CONFIG_BEFS_DEBUG is not set +CONFIG_BFS_FS=m +CONFIG_EFS_FS=m +CONFIG_CRAMFS=y +# CONFIG_SQUASHFS is not set +CONFIG_VXFS_FS=m +# CONFIG_MINIX_FS is not set +# CONFIG_OMFS_FS is not set +CONFIG_HPFS_FS=m +CONFIG_QNX4FS_FS=m +# CONFIG_ROMFS_FS is not set +CONFIG_SYSV_FS=m +CONFIG_UFS_FS=m +# CONFIG_UFS_FS_WRITE is not set +# CONFIG_UFS_DEBUG is not set +CONFIG_NETWORK_FILESYSTEMS=y +CONFIG_NFS_FS=y +CONFIG_NFS_V3=y +# CONFIG_NFS_V3_ACL is not set +CONFIG_NFS_V4=y +# CONFIG_NFS_V4_1 is not set +CONFIG_ROOT_NFS=y +CONFIG_NFSD=y +# CONFIG_NFSD_V3 is not set +# CONFIG_NFSD_V4 is not set +CONFIG_LOCKD=y +CONFIG_LOCKD_V4=y +CONFIG_EXPORTFS=y +CONFIG_NFS_COMMON=y +CONFIG_SUNRPC=y +CONFIG_SUNRPC_GSS=y +CONFIG_RPCSEC_GSS_KRB5=y +# CONFIG_RPCSEC_GSS_SPKM3 is not set +# CONFIG_SMB_FS is not set +# CONFIG_CIFS is not set +# CONFIG_NCP_FS is not set +# CONFIG_CODA_FS is not set +# CONFIG_AFS_FS is not set + +# +# Partition Types +# +CONFIG_PARTITION_ADVANCED=y +# CONFIG_ACORN_PARTITION is not set +# CONFIG_OSF_PARTITION is not set +# CONFIG_AMIGA_PARTITION is not set +# CONFIG_ATARI_PARTITION is not set +CONFIG_MAC_PARTITION=y +CONFIG_MSDOS_PARTITION=y +# CONFIG_BSD_DISKLABEL is not set +# CONFIG_MINIX_SUBPARTITION is not set +# CONFIG_SOLARIS_X86_PARTITION is not set +# CONFIG_UNIXWARE_DISKLABEL is not set +# CONFIG_LDM_PARTITION is not set +# CONFIG_SGI_PARTITION is not set +# CONFIG_ULTRIX_PARTITION is not set +# CONFIG_SUN_PARTITION is not set +# CONFIG_KARMA_PARTITION is not set +# CONFIG_EFI_PARTITION is not set +# CONFIG_SYSV68_PARTITION is not set +CONFIG_NLS=y +CONFIG_NLS_DEFAULT="iso8859-1" +# CONFIG_NLS_CODEPAGE_437 is not set +# 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 is not set +# 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=m +# CONFIG_DLM is not set +CONFIG_UCC_SLOW=y +CONFIG_UCC_FAST=y +CONFIG_UCC=y +# CONFIG_BINARY_PRINTF is not set + +# +# Library routines +# +CONFIG_BITREVERSE=y +CONFIG_GENERIC_FIND_LAST_BIT=y +# CONFIG_CRC_CCITT is not set +# CONFIG_CRC16 is not set +CONFIG_CRC_T10DIF=y +CONFIG_CRC_ITU_T=m +CONFIG_CRC32=y +# CONFIG_CRC7 is not set +CONFIG_LIBCRC32C=m +CONFIG_ZLIB_INFLATE=y +CONFIG_DECOMPRESS_GZIP=y +CONFIG_HAS_IOMEM=y +CONFIG_HAS_IOPORT=y +CONFIG_HAS_DMA=y +CONFIG_HAVE_LMB=y +CONFIG_NLATTR=y +CONFIG_GENERIC_ATOMIC64=y + +# +# Kernel hacking +# +# CONFIG_PRINTK_TIME is not set +CONFIG_ENABLE_WARN_DEPRECATED=y +CONFIG_ENABLE_MUST_CHECK=y +CONFIG_FRAME_WARN=1024 +# CONFIG_MAGIC_SYSRQ is not set +# CONFIG_STRIP_ASM_SYMS is not set +# CONFIG_UNUSED_SYMBOLS is not set +CONFIG_DEBUG_FS=y +# CONFIG_HEADERS_CHECK is not set +CONFIG_DEBUG_KERNEL=y +# CONFIG_DEBUG_SHIRQ is not set +CONFIG_DETECT_SOFTLOCKUP=y +# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set +CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 +CONFIG_DETECT_HUNG_TASK=y +# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set +CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0 +CONFIG_SCHED_DEBUG=y +# CONFIG_SCHEDSTATS is not set +# CONFIG_TIMER_STATS is not set +# CONFIG_DEBUG_OBJECTS is not set +# CONFIG_SLUB_DEBUG_ON is not set +# CONFIG_SLUB_STATS is not set +# CONFIG_DEBUG_KMEMLEAK 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_LOCK_ALLOC is not set +# CONFIG_PROVE_LOCKING is not set +# CONFIG_LOCK_STAT 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_HIGHMEM is not set +# CONFIG_DEBUG_BUGVERBOSE is not set +CONFIG_DEBUG_INFO=y +# CONFIG_DEBUG_VM is not set +# CONFIG_DEBUG_WRITECOUNT is not set +# CONFIG_DEBUG_MEMORY_INIT is not set +# CONFIG_DEBUG_LIST is not set +# CONFIG_DEBUG_SG is not set +# CONFIG_DEBUG_NOTIFIERS is not set +# CONFIG_DEBUG_CREDENTIALS is not set +# CONFIG_RCU_TORTURE_TEST is not set +# CONFIG_RCU_CPU_STALL_DETECTOR is not set +# CONFIG_BACKTRACE_SELF_TEST is not set +# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set +# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set +# CONFIG_FAULT_INJECTION is not set +# CONFIG_LATENCYTOP is not set +CONFIG_SYSCTL_SYSCALL_CHECK=y +# CONFIG_DEBUG_PAGEALLOC is not set +CONFIG_HAVE_FUNCTION_TRACER=y +CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y +CONFIG_HAVE_DYNAMIC_FTRACE=y +CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y +CONFIG_TRACING_SUPPORT=y +CONFIG_FTRACE=y +# CONFIG_FUNCTION_TRACER is not set +# CONFIG_IRQSOFF_TRACER is not set +# CONFIG_SCHED_TRACER is not set +# CONFIG_ENABLE_DEFAULT_TRACERS is not set +# CONFIG_BOOT_TRACER is not set +CONFIG_BRANCH_PROFILE_NONE=y +# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set +# CONFIG_PROFILE_ALL_BRANCHES is not set +# CONFIG_STACK_TRACER is not set +# CONFIG_KMEMTRACE is not set +# CONFIG_WORKQUEUE_TRACER is not set +# CONFIG_BLK_DEV_IO_TRACE is not set +# CONFIG_DYNAMIC_DEBUG is not set +# CONFIG_DMA_API_DEBUG is not set +# CONFIG_SAMPLES is not set +CONFIG_HAVE_ARCH_KGDB=y +# CONFIG_KGDB is not set +# CONFIG_PPC_DISABLE_WERROR is not set +CONFIG_PPC_WERROR=y +CONFIG_PRINT_STACK_DEPTH=64 +# CONFIG_DEBUG_STACKOVERFLOW is not set +# CONFIG_DEBUG_STACK_USAGE is not set +# CONFIG_PPC_EMULATED_STATS is not set +# CONFIG_CODE_PATCHING_SELFTEST is not set +# CONFIG_FTR_FIXUP_SELFTEST is not set +# CONFIG_MSI_BITMAP_SELFTEST is not set +# CONFIG_XMON is not set +# CONFIG_IRQSTACKS is not set +CONFIG_VIRQ_DEBUG=y +# CONFIG_BDI_SWITCH is not set +# CONFIG_PPC_EARLY_DEBUG is not set + +# +# Security options +# +# CONFIG_KEYS is not set +# CONFIG_SECURITY is not set +# CONFIG_SECURITYFS is not set +# CONFIG_DEFAULT_SECURITY_SELINUX is not set +# CONFIG_DEFAULT_SECURITY_SMACK is not set +# CONFIG_DEFAULT_SECURITY_TOMOYO is not set +CONFIG_DEFAULT_SECURITY_DAC=y +CONFIG_DEFAULT_SECURITY="" +CONFIG_CRYPTO=y + +# +# Crypto core or helper +# +CONFIG_CRYPTO_ALGAPI=y +CONFIG_CRYPTO_ALGAPI2=y +CONFIG_CRYPTO_AEAD=y +CONFIG_CRYPTO_AEAD2=y +CONFIG_CRYPTO_BLKCIPHER=y +CONFIG_CRYPTO_BLKCIPHER2=y +CONFIG_CRYPTO_HASH=y +CONFIG_CRYPTO_HASH2=y +CONFIG_CRYPTO_RNG2=y +CONFIG_CRYPTO_PCOMP=y +CONFIG_CRYPTO_MANAGER=y +CONFIG_CRYPTO_MANAGER2=y +# CONFIG_CRYPTO_GF128MUL is not set +# CONFIG_CRYPTO_NULL is not set +CONFIG_CRYPTO_WORKQUEUE=y +# CONFIG_CRYPTO_CRYPTD is not set +CONFIG_CRYPTO_AUTHENC=y +# CONFIG_CRYPTO_TEST is not set + +# +# Authenticated Encryption with Associated Data +# +# CONFIG_CRYPTO_CCM is not set +# CONFIG_CRYPTO_GCM is not set +# CONFIG_CRYPTO_SEQIV is not set + +# +# Block modes +# +CONFIG_CRYPTO_CBC=y +# CONFIG_CRYPTO_CTR is not set +# CONFIG_CRYPTO_CTS is not set +# CONFIG_CRYPTO_ECB is not set +# CONFIG_CRYPTO_LRW is not set +CONFIG_CRYPTO_PCBC=m +# CONFIG_CRYPTO_XTS is not set + +# +# Hash modes +# +CONFIG_CRYPTO_HMAC=y +# CONFIG_CRYPTO_XCBC is not set +# CONFIG_CRYPTO_VMAC is not set + +# +# Digest +# +CONFIG_CRYPTO_CRC32C=m +# CONFIG_CRYPTO_GHASH is not set +# CONFIG_CRYPTO_MD4 is not set +CONFIG_CRYPTO_MD5=y +# CONFIG_CRYPTO_MICHAEL_MIC is not set +# CONFIG_CRYPTO_RMD128 is not set +# CONFIG_CRYPTO_RMD160 is not set +# CONFIG_CRYPTO_RMD256 is not set +# CONFIG_CRYPTO_RMD320 is not set +CONFIG_CRYPTO_SHA1=y +CONFIG_CRYPTO_SHA256=y +CONFIG_CRYPTO_SHA512=y +# CONFIG_CRYPTO_TGR192 is not set +# CONFIG_CRYPTO_WP512 is not set + +# +# Ciphers +# +CONFIG_CRYPTO_AES=y +# CONFIG_CRYPTO_ANUBIS is not set +# CONFIG_CRYPTO_ARC4 is not set +# CONFIG_CRYPTO_BLOWFISH is not set +# CONFIG_CRYPTO_CAMELLIA is not set +# CONFIG_CRYPTO_CAST5 is not set +# CONFIG_CRYPTO_CAST6 is not set +CONFIG_CRYPTO_DES=y +# CONFIG_CRYPTO_FCRYPT is not set +# CONFIG_CRYPTO_KHAZAD is not set +# CONFIG_CRYPTO_SALSA20 is not set +# CONFIG_CRYPTO_SEED is not set +# CONFIG_CRYPTO_SERPENT is not set +# CONFIG_CRYPTO_TEA is not set +# CONFIG_CRYPTO_TWOFISH is not set + +# +# Compression +# +# CONFIG_CRYPTO_DEFLATE is not set +# CONFIG_CRYPTO_ZLIB is not set +# CONFIG_CRYPTO_LZO is not set + +# +# Random Number Generation +# +# CONFIG_CRYPTO_ANSI_CPRNG is not set +CONFIG_CRYPTO_HW=y +# CONFIG_CRYPTO_DEV_HIFN_795X is not set +CONFIG_CRYPTO_DEV_TALITOS=y +CONFIG_PPC_CLOCK=y +CONFIG_PPC_LIB_RHEAP=y +# CONFIG_VIRTUALIZATION is not set diff --git a/recipes/linux/linux.inc b/recipes/linux/linux.inc index 47e52cc879..8f9b323902 100644 --- a/recipes/linux/linux.inc +++ b/recipes/linux/linux.inc @@ -38,6 +38,7 @@ KERNEL_DEVICETREE_mpc8313e-rdb = "arch/${ARCH}/boot/dts/mpc8313erdb.dts" KERNEL_DEVICETREE_mpc8315e-rdb = "arch/${ARCH}/boot/dts/mpc8315erdb.dts" KERNEL_DEVICETREE_mpc8323e-rdb = "arch/${ARCH}/boot/dts/mpc832x_rdb.dts" KERNEL_DEVICETREE_sequoia = "arch/${ARCH}/boot/dts/sequoia.dts" +KERNEL_DEVICETREE_p2020ds = "arch/${ARCH}/boot/dts/p2020ds.dts" KERNEL_DEVICETREE_FLAGS = "-R 8 -S 0x3000" diff --git a/recipes/linux/linux_2.6.33.bb b/recipes/linux/linux_2.6.33.bb index 589cdeebd2..13a499a4a2 100644 --- a/recipes/linux/linux_2.6.33.bb +++ b/recipes/linux/linux_2.6.33.bb @@ -5,6 +5,7 @@ PR="r1" # Mark archs/machines that this kernel supports DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_ts72xx = "-1" +DEFAULT_PREFERENCE_p2020ds = "1" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/${P}.tar.bz2;name=kernel \ file://defconfig" diff --git a/recipes/u-boot/u-boot_git.bb b/recipes/u-boot/u-boot_git.bb index b63edbdf67..61095613e4 100644 --- a/recipes/u-boot/u-boot_git.bb +++ b/recipes/u-boot/u-boot_git.bb @@ -12,6 +12,7 @@ SRCREV_afeb9260 = "6b8edfde22acc574b5532e9f086e6a7287a9bc78" SRCREV_afeb9260-180 = "6b8edfde22acc574b5532e9f086e6a7287a9bc78" SRCREV_palmpre = "6b8edfde22acc574b5532e9f086e6a7287a9bc78" SRCREV_cm-t35 = "3c014f1586d5bfe30dca7549396915c83f31cd30" +SRCREV_p2020ds = "f20393c5e787b3776c179d20f82a86bda124d651" SRC_URI_append_afeb9260 = " file://AFEB9260-network-fix.patch;patch=1" SRC_URI_append_afeb9260-180 = " file://AFEB9260-network-fix.patch;patch=1" SRC_URI_append_cm-t35 = "file://cm-t35/cm-t35.patch;patch=1" -- cgit v1.2.3 From 9b67465cea384186375d9a31ad498176f7d59de6 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 15 Mar 2010 16:07:07 +0100 Subject: sourcepkg.bbclass: put files in ${PN} subdir to avoid cluttering up the dir and generate diff *after* configure to pick up e.g. sed magic as well --- classes/sourcepkg.bbclass | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/classes/sourcepkg.bbclass b/classes/sourcepkg.bbclass index 5aacf92d10..e11f72b6dd 100644 --- a/classes/sourcepkg.bbclass +++ b/classes/sourcepkg.bbclass @@ -30,7 +30,7 @@ def get_src_tree(d): sourcepkg_do_create_orig_tgz(){ - mkdir -p ${DEPLOY_DIR_SRC} + mkdir -p ${DEPLOY_DIR_SRC}/${PN} cd ${WORKDIR} for i in ${EXCLUDE_FROM}; do echo $i >> temp/exclude-from-file @@ -39,8 +39,8 @@ sourcepkg_do_create_orig_tgz(){ src_tree=${@get_src_tree(d)} echo $src_tree - oenote "Creating .orig.tar.gz in ${DEPLOY_DIR_SRC}/${P}.orig.tar.gz" - tar cvzf ${DEPLOY_DIR_SRC}/${P}.orig.tar.gz --exclude-from temp/exclude-from-file $src_tree + oenote "Creating .orig.tar.gz in ${DEPLOY_DIR_SRC}/${PN}/${P}.orig.tar.gz" + tar cvzf ${DEPLOY_DIR_SRC}/${PN}/${P}.orig.tar.gz --exclude-from temp/exclude-from-file $src_tree cp -pPR $src_tree $src_tree.orig } @@ -93,20 +93,20 @@ sourcepkg_do_create_diff_gz(){ cp $i $src_tree/${DISTRO}/files done - oenote "Creating .diff.gz in ${DEPLOY_DIR_SRC}/${P}-${PR}.diff.gz" - LC_ALL=C TZ=UTC0 diff --exclude-from=temp/exclude-from-file -Naur $src_tree.orig $src_tree | gzip -c > ${DEPLOY_DIR_SRC}/${P}-${PR}.diff.gz + oenote "Creating .diff.gz in ${DEPLOY_DIR_SRC}/${PN}/${P}-${PR}.diff.gz" + LC_ALL=C TZ=UTC0 diff --exclude-from=temp/exclude-from-file -Naur $src_tree.orig $src_tree | gzip -c > ${DEPLOY_DIR_SRC}/${PN}/${P}-${PR}.diff.gz rm -rf $src_tree.orig } EXPORT_FUNCTIONS do_create_orig_tgz do_archive_bb do_dumpdata do_create_diff_gz do_create_orig_tgz[deptask] = "do_unpack" -do_create_diff_gz[deptask] = "do_patch" +do_create_diff_gz[deptask] = "do_configure" do_archive_bb[deptask] = "do_patch" do_dumpdata[deptask] = "do_unpack" addtask create_orig_tgz after do_unpack before do_patch addtask archive_bb after do_patch before do_dumpdata addtask dumpdata after do_archive_bb before do_create_diff_gz -addtask create_diff_gz after do_dumpdata before do_configure +addtask create_diff_gz after do_configure before do_compile -- cgit v1.2.3 From 0b31947db8cc73fb23eecd3a1abaa3b4d465df9a Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 15 Mar 2010 16:13:31 +0100 Subject: sourcepkg.bbclass: OE's quilt now puts patches in patches/ instead of .pc/, so add that to the blacklist as well --- classes/sourcepkg.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/sourcepkg.bbclass b/classes/sourcepkg.bbclass index e11f72b6dd..65b1de5659 100644 --- a/classes/sourcepkg.bbclass +++ b/classes/sourcepkg.bbclass @@ -1,5 +1,5 @@ DEPLOY_DIR_SRC ?= "${DEPLOY_DIR}/sources" -EXCLUDE_FROM ?= ".pc autom4te.cache" +EXCLUDE_FROM ?= ".pc patches autom4te.cache" # used as part of a path. make sure it's set DISTRO ?= "openembedded" -- cgit v1.2.3 From 878bf07cfb2c25a1cc87252f9fb7b1d478fe3d17 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Mon, 15 Mar 2010 16:10:38 +0100 Subject: procps: added 3.2.8 and dropped older This version no longer complain about unknown Hz value during boot. Signed-off-by: Marcin Juszkiewicz --- recipes/procps/procps-3.1.15/install.patch | 16 - recipes/procps/procps-3.1.15/procps_3.1.15-2.diff | 5133 -------------------- recipes/procps/procps-3.2.1/install.patch | 16 - .../procps/procps-3.2.1/pagesz-not-constant.patch | 22 - recipes/procps/procps-3.2.5/install.patch | 27 - .../procps/procps-3.2.5/pagesz-not-constant.patch | 22 - recipes/procps/procps-3.2.5/procmodule.patch | 36 - recipes/procps/procps-3.2.5/psmodule.patch | 21 - recipes/procps/procps-3.2.7/install.patch | 27 - recipes/procps/procps-3.2.7/linux-limits.patch | 13 - .../procps/procps-3.2.7/pagesz-not-constant.patch | 22 - recipes/procps/procps-3.2.7/procmodule.patch | 36 - recipes/procps/procps-3.2.7/procps.init | 6 - recipes/procps/procps-3.2.7/psmodule.patch | 21 - recipes/procps/procps-3.2.7/sysctl.conf | 64 - recipes/procps/procps-3.2.8/install.patch | 27 + recipes/procps/procps-3.2.8/linux-limits.patch | 13 + .../procps/procps-3.2.8/pagesz-not-constant.patch | 22 + recipes/procps/procps-3.2.8/procmodule.patch | 36 + recipes/procps/procps-3.2.8/procps.init | 6 + recipes/procps/procps-3.2.8/psmodule.patch | 21 + recipes/procps/procps-3.2.8/sysctl.conf | 64 + recipes/procps/procps.inc | 61 +- recipes/procps/procps_3.1.15.bb | 9 - recipes/procps/procps_3.2.1.bb | 11 - recipes/procps/procps_3.2.5.bb | 45 - recipes/procps/procps_3.2.7.bb | 67 - recipes/procps/procps_3.2.8.bb | 11 + 28 files changed, 258 insertions(+), 5617 deletions(-) delete mode 100644 recipes/procps/procps-3.1.15/install.patch delete mode 100644 recipes/procps/procps-3.1.15/procps_3.1.15-2.diff delete mode 100644 recipes/procps/procps-3.2.1/install.patch delete mode 100644 recipes/procps/procps-3.2.1/pagesz-not-constant.patch delete mode 100644 recipes/procps/procps-3.2.5/install.patch delete mode 100644 recipes/procps/procps-3.2.5/pagesz-not-constant.patch delete mode 100644 recipes/procps/procps-3.2.5/procmodule.patch delete mode 100644 recipes/procps/procps-3.2.5/psmodule.patch delete mode 100644 recipes/procps/procps-3.2.7/install.patch delete mode 100644 recipes/procps/procps-3.2.7/linux-limits.patch delete mode 100644 recipes/procps/procps-3.2.7/pagesz-not-constant.patch delete mode 100644 recipes/procps/procps-3.2.7/procmodule.patch delete mode 100644 recipes/procps/procps-3.2.7/procps.init delete mode 100644 recipes/procps/procps-3.2.7/psmodule.patch delete mode 100644 recipes/procps/procps-3.2.7/sysctl.conf create mode 100644 recipes/procps/procps-3.2.8/install.patch create mode 100644 recipes/procps/procps-3.2.8/linux-limits.patch create mode 100644 recipes/procps/procps-3.2.8/pagesz-not-constant.patch create mode 100644 recipes/procps/procps-3.2.8/procmodule.patch create mode 100644 recipes/procps/procps-3.2.8/procps.init create mode 100644 recipes/procps/procps-3.2.8/psmodule.patch create mode 100644 recipes/procps/procps-3.2.8/sysctl.conf delete mode 100644 recipes/procps/procps_3.1.15.bb delete mode 100644 recipes/procps/procps_3.2.1.bb delete mode 100644 recipes/procps/procps_3.2.5.bb delete mode 100644 recipes/procps/procps_3.2.7.bb create mode 100644 recipes/procps/procps_3.2.8.bb diff --git a/recipes/procps/procps-3.1.15/install.patch b/recipes/procps/procps-3.1.15/install.patch deleted file mode 100644 index 2d16c26f17..0000000000 --- a/recipes/procps/procps-3.1.15/install.patch +++ /dev/null @@ -1,16 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- procps-3.1.15/Makefile~install 2003-12-24 03:01:55.000000000 +0100 -+++ procps-3.1.15/Makefile 2004-02-11 00:45:59.000000000 +0100 -@@ -147,7 +147,7 @@ - ###### install - - $(BINFILES) : all -- $(install) --mode a=rx --strip $(notdir $@) $@ -+ $(install) --mode a=rx $(notdir $@) $@ - - $(MANFILES) : all - $(install) --mode a=r $(notdir $@) $@ diff --git a/recipes/procps/procps-3.1.15/procps_3.1.15-2.diff b/recipes/procps/procps-3.1.15/procps_3.1.15-2.diff deleted file mode 100644 index 438fd0f664..0000000000 --- a/recipes/procps/procps-3.1.15/procps_3.1.15-2.diff +++ /dev/null @@ -1,5133 +0,0 @@ ---- procps-3.1.15.orig/proc/library.map -+++ procps-3.1.15/proc/library.map -@@ -4,7 +4,7 @@ - - readproc; readtask; readproctab; readproctab2; look_up_our_self; escape_command; - escape_str; escape_strlist; -- openproc; closeproc; -+ openproc; closeproc; freeproc; - tty_to_dev; dev_to_tty; open_psdb_message; open_psdb; wchan; - display_version; procps_version; linux_version_code; - Hertz; smp_num_cpus; ---- procps-3.1.15.orig/proc/readproc.c -+++ procps-3.1.15/proc/readproc.c -@@ -162,7 +162,7 @@ - // examine a field name (hash and compare) - base: - if(unlikely(!*S)) break; -- entry = table[63 & (asso[S[3]] + asso[S[2]] + asso[S[0]])]; -+ entry = table[63 & (asso[(int)S[3]] + asso[(int)S[2]] + asso[(int)S[0]])]; - colon = strchr(S, ':'); - if(unlikely(!colon)) break; - if(unlikely(colon[1]!='\t')) break; -@@ -888,6 +888,8 @@ - else - PT = openproc(flags); - va_end(ap); -+ if (!PT) -+ return 0; - do { /* read table: */ - tab = xrealloc(tab, (n+1)*sizeof(proc_t*));/* realloc as we go, using */ - tab[n] = readproc_direct(PT, NULL); /* final null to terminate */ ---- procps-3.1.15.orig/proc/module.mk -+++ procps-3.1.15/proc/module.mk -@@ -3,7 +3,7 @@ - # for lib$(NAME).so and /usr/include/($NAME) and such - NAME := proc - --SHARED := 1 -+SHARED ?= 1 - - SONAME := lib$(NAME).so.$(LIBVERSION) - ---- procps-3.1.15.orig/debian/README.Debian -+++ procps-3.1.15/debian/README.Debian -@@ -0,0 +1,22 @@ -+README for Debian package of procps -+=================================== -+ -+XConsole gone -+------------- -+ XConsole and other X-based programs have been finally removed. Look in -+ the x packages for their equivalents. -+ -+pgrep -+----- -+pgrep is a new program, using the Unix standard name for something that -+greps for processes. If you are looking for Perl compatible regular -+expression grep, it is called pcregrep. -+ -+forks -+----- -+Procps upstream is forked. This one comes from procps.sf.net I'm really -+not interested when the others have new versions so please don't bug me about -+it. However if you see something neat in the others and would like it in -+the Debian one, report a *wishlist* level bug about it. -+ -+ Craig Small ---- procps-3.1.15.orig/debian/copyright -+++ procps-3.1.15/debian/copyright -@@ -0,0 +1,27 @@ -+This is the Debian Linux prepackaged version of the /proc file -+system utilities. -+ -+This package was downloaded from: -+ http://procps.sourceforge.net/ -+ -+ -+Upstream Authors: -+Werner Almesberger , Roger Binns, Charles -+Blake , Brian Edmonds, David Engel , -+Larry Greenfield , Michael K. Johnson -+, Branko Lankester , -+Robert Nation , Michael Shields -+, Henry Ware , Matt -+Welsh , Albert D. Cahalan and Jim C. Warner -+ -+ -+All programs except ps, skill and snice are copyright by their -+authors and redistributable under the terms of the GNU General -+Public License. On Debian Linux systems, the complete text of -+the GNU General Public License can be found in -+`/usr/share/common-licenses/GPL'. -+ -+ps, skill and snice are copyright by their authors and redistributable under -+the terms of the GNU Library General Public License. On Debian Linux -+systems, the complete text of the GNU Library General Public License can -+be found in `/usr/share/common/licenses/LGPL'. ---- procps-3.1.15.orig/debian/dirs -+++ procps-3.1.15/debian/dirs -@@ -0,0 +1,12 @@ -+etc -+lib -+sbin -+bin -+usr/bin -+usr/sbin -+usr/lib -+usr/include/proc -+usr/share/man/man1 -+usr/share/man/man5 -+usr/share/man/man8 -+ ---- procps-3.1.15.orig/debian/docs -+++ procps-3.1.15/debian/docs -@@ -0,0 +1,4 @@ -+BUGS -+TODO -+README.top -+ ---- procps-3.1.15.orig/debian/examples -+++ procps-3.1.15/debian/examples -@@ -0,0 +1,2 @@ -+debian/sysctl.conf -+ ---- procps-3.1.15.orig/debian/libproc-dev.dirs -+++ procps-3.1.15/debian/libproc-dev.dirs -@@ -0,0 +1,2 @@ -+usr/lib -+usr/include/proc ---- procps-3.1.15.orig/debian/menu -+++ procps-3.1.15/debian/menu -@@ -0,0 +1 @@ -+?package(procps):needs=text section="Apps/System" title="Top" command="/usr/bin/top" hints="Monitoring" ---- procps-3.1.15.orig/debian/postinst -+++ procps-3.1.15/debian/postinst -@@ -0,0 +1,74 @@ -+#!/bin/sh -+# postinst script for procps -+# -+# see: dh_installdeb(1) -+ -+set -e -+ -+# summary of how this script can be called: -+# * `configure' -+# * `abort-upgrade' -+# * `abort-remove' `in-favour' -+# -+# * `abort-deconfigure' `in-favour' -+# `removing' -+# -+# for details, see http://www.debian.org/doc/debian-policy/ or -+# the debian-policy package -+# -+# quoting from the policy: -+# Any necessary prompting should almost always be confined to the -+# post-installation script, and should be protected with a conditional -+# so that unnecessary prompting doesn't happen if a package's -+# installation fails and the `postinst' is called with `abort-upgrade', -+# `abort-remove' or `abort-deconfigure'. -+ -+case "$1" in -+ configure) -+ if [ -e /etc/psdevtab ] ; then -+ rm -f /etc/psdevtab -+ fi -+ if [ -e /etc/psdatabase ] -+ then -+ rm -f /etc/psdatabase -+ fi -+ # Remove old /etc/init.d/procps file, Bug #53818 -+ if [ -e /etc/init.d/procps ] -+ then -+ rm -f /etc/init.d/procps -+ fi -+ # Remove old procps init.d script, if it exists Closes: #55137 -+ if [ -e /etc/rcS.d/S30procps ] -+ then -+ update-rc.d procps remove >/dev/null -+ fi -+ # and if that didn't work Closes: #92184 -+ if [ -e /etc/rcS.d/S30procps ] -+ then -+ rm -f /etc/rcS.d/S30procps -+ fi -+ # -+ # Now to do the alternatives for w and ps -+ update-alternatives --install /usr/bin/w w /usr/bin/w.procps 50 \ -+ --slave /usr/share/man/man1/w.1.gz w.1.gz /usr/share/man/man1/w.procps.1.gz -+ -+ ;; -+ -+ abort-upgrade|abort-remove|abort-deconfigure) -+ -+ ;; -+ -+ *) -+ echo "postinst called with unknown argument \`$1'" >&2 -+ exit 1 -+ ;; -+esac -+ -+# dh_installdeb will replace this with shell code automatically -+# generated by other debhelper scripts. -+ -+#DEBHELPER# -+ -+exit 0 -+ -+ ---- procps-3.1.15.orig/debian/prerm -+++ procps-3.1.15/debian/prerm -@@ -0,0 +1,11 @@ -+#!/bin/sh -+ -+if [ "$1" != "upgrade" ] -+then -+ update-alternatives --remove w /usr/bin/w.procps -+fi -+ -+#DEBHELPER# -+ -+exit 0 -+ ---- procps-3.1.15.orig/debian/sysctl.conf -+++ procps-3.1.15/debian/sysctl.conf -@@ -0,0 +1,6 @@ -+# -+# /etc/sysctl.conf - Configuration file for setting system variables -+# See sysctl.conf (5) for information. -+# -+#kernel.domainname = example.com -+#net/ipv4/icmp_echo_ignore_broadcasts=1 ---- procps-3.1.15.orig/debian/watch -+++ procps-3.1.15/debian/watch -@@ -0,0 +1,6 @@ -+# Example watch control file for uscan -+# Rename this file to "watch" and then you can run the "uscan" command -+# to check for upstream updates and more. -+# Site Directory Pattern Version Script -+sunsite.unc.edu /pub/Linux/Incoming procps-*.tar.gz debian uupdate -+ ---- procps-3.1.15.orig/debian/procps.sh -+++ procps-3.1.15/debian/procps.sh -@@ -0,0 +1,40 @@ -+#! /bin/sh -+# /etc/init.d/procps: Set kernel variables from /etc/sysctl.conf -+# -+# written by Elrond -+ -+# Check for existance of the default file and exit if not there, -+# Closes #52839 for the boot-floppy people -+[ -r /etc/default/rcS ] || exit 0 -+. /etc/default/rcS -+ -+[ -x /sbin/sysctl ] || exit 0 -+ -+ -+case "$1" in -+ start|reload|restart|force-reload) -+ if [ ! -r /etc/sysctl.conf ] -+ then -+ exit 0 -+ fi -+ if [ "$VERBOSE" = "no" ] -+ then -+ n="-n" -+ redir=">/dev/null" -+ else -+ echo -n "Setting kernel variables." -+ n="" -+ redir="" -+ fi -+ eval "/sbin/sysctl $n -p $redir" -+ echo "." -+ ;; -+ stop|show) -+ ;; -+ *) -+ echo "Usage: /etc/init.d/procps.sh {start|stop|reload|restart}" >&2 -+ exit 1 -+ ;; -+esac -+ -+ ---- procps-3.1.15.orig/debian/procps.manpages -+++ procps-3.1.15/debian/procps.manpages -@@ -0,0 +1 @@ -+ps/ps.1 ---- procps-3.1.15.orig/debian/compat -+++ procps-3.1.15/debian/compat -@@ -0,0 +1 @@ -+4 ---- procps-3.1.15.orig/debian/libproc-dev.files -+++ procps-3.1.15/debian/libproc-dev.files -@@ -0,0 +1,2 @@ -+usr/include/proc/*.h -+lib/libproc.so ---- procps-3.1.15.orig/debian/libproc-dev.README -+++ procps-3.1.15/debian/libproc-dev.README -@@ -0,0 +1,12 @@ -+README for libproc-dev -+====================== -+ -+This README is for people who want to use the libraries for their own -+programs. If you just want to use procps tools you don't need to use this -+and you can probably remove libproc-dev too. -+ -+It is generally a bad idea to dynamically link to libproc. The API changes -+a fair bit and I cannot guarantee that it will stay the same between minor -+versions (though it will stay the same between Debian versions). I've now -+re-included the libproc.a file so use that. -+ ---- procps-3.1.15.orig/debian/patches/20_procps-fix+attr.dpatch -+++ procps-3.1.15/debian/patches/20_procps-fix+attr.dpatch -@@ -0,0 +1,55 @@ -+#! /bin/sh -e -+## 20_procps-fix++attr by someone -+## -+## All lines beginning with `## DP:' are a description of the patch. -+## DP: SELINUX Attr value in /proc -+ -+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts -+patch_opts="${patch_opts:--f --no-backup-if-mismatch}" -+ -+if [ $# -ne 1 ]; then -+ echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" -+ exit 1 -+fi -+case "$1" in -+ -patch) patch $patch_opts -p1 < $0;; -+ -unpatch) patch $patch_opts -p1 -R < $0;; -+ *) -+ echo >&2 "`basename $0`: script expects -patch|-unpatch as argum -+ent" -+ exit 1;; -+esac -+ -+exit 0 -+@DPATCH@ -+diff -urN procps-3.1.15/ps/output.c procps-3.1.15.new/ps/output.c -+--- procps-3.1.15/ps/output.c 2003-12-23 19:46:32.000000000 -0600 -++++ procps-3.1.15.new/ps/output.c 2003-12-24 13:31:16.000000000 -0600 -+@@ -944,7 +944,7 @@ -+ -+ // wchan file is suitable for testing -+ //snprintf(filename, sizeof filename, "/proc/%d/task/%d/wchan", pp->tgid, pp->tid); -+- snprintf(filename, sizeof filename, "/proc/%d/task/%d/attr/current", pp->tgid, pp->tid); -++ snprintf(filename, sizeof filename, "/proc/%d/attr/current", pp->tgid); -+ -+ fd = open(filename, O_RDONLY, 0); -+ if(likely(fd==-1)) goto fail; -+diff -urN procps-3.1.15/ps/parser.c procps-3.1.15.new/ps/parser.c -+--- procps-3.1.15/ps/parser.c 2003-12-23 17:58:06.000000000 -0600 -++++ procps-3.1.15.new/ps/parser.c 2003-12-24 13:45:08.000000000 -0600 -+@@ -315,12 +315,10 @@ -+ exclusive("-V"); -+ display_version(); -+ exit(0); -+-#if 0 -+- case 'Z': /* full Mandatory Access Control level info */ -+- trace("-Z shows full MAC info\n"); -+- return "Don't understand MAC on Linux."; -++ case 'Z': -++ trace("-Z shows SELinux contexts\n"); -++ format_flags |= FF_Fc; -+ break; -+-#endif -+ case 'a': -+ trace("-a select all with a tty, but omit session leaders.\n"); -+ simple_select |= SS_U_a; ---- procps-3.1.15.orig/debian/patches/20_ps.1.dpatch -+++ procps-3.1.15/debian/patches/20_ps.1.dpatch -@@ -0,0 +1,376 @@ -+#! /bin/sh -e -+## 20_ps.1.dpatch by Craig Small -+## -+## All lines beginning with `## DP:' are a description of the patch. -+## DP: Fix ps manual page -+ -+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts -+patch_opts="${patch_opts:--f --no-backup-if-mismatch}" -+ -+if [ $# -ne 1 ]; then -+ echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" -+ exit 1 -+fi -+case "$1" in -+ -patch) patch $patch_opts -p1 < $0;; -+ -unpatch) patch $patch_opts -p1 -R < $0;; -+ *) -+ echo >&2 "`basename $0`: script expects -patch|-unpatch as argum -+ent" -+ exit 1;; -+esac -+ -+exit 0 -+@DPATCH@ -+--- procps-3.1.15/ps/ps.1 2003-12-24 12:59:47.000000000 +1100 -++++ procps-3.1.15.newps/ps.1 2003-12-26 18:05:01.000000000 +1100 -+@@ -1,3 +1,5 @@ -++'\" t -++.\" (The preceding line is a note to broken versions of man to tell -+ .\" Man page for ps. -+ .\" Quick hack conversion by Albert Cahalan, 1998. -+ .\" Licensed under version 2 of the Gnu General Public License. -+@@ -10,8 +12,8 @@ -+ .\" invented this crap in 1973. Oh yeah, they did. Sorry. -+ .\" -+ .TH PS 1 "July 5, 1998" "Linux" "Linux User's Manual" -+-.SH \fRNAME\fR -+-ps \- report process status -++.SH NAME -++ps \- report a snapshot of the current processes. -+ .ad r -+ .na -+ .ss 12 0 -+@@ -19,17 +21,17 @@ -+ .nh -+ .nf -+ -+-SYNOPSIS -++.SH SYNOPSIS -+ ps [options] -+ -+ -+-DESCRIPTION -++.SH DESCRIPTION -+ ps gives a snapshot of the current processes. If you want -+ a repetitive update of this status, use top. This man -+ page documents the /proc-based version of ps, or tries to. -+ -+ -+-COMMAND-LINE OPTIONS -++.SH "COMMAND-LINE OPTIONS" -+ -+ This version of ps accepts several kinds of options. -+ -+@@ -43,7 +45,9 @@ -+ when options are preceeded by a dash. The PS_PERSONALITY environment -+ variable (described below) provides more detailed control of ps behavior. -+ -+-SIMPLE PROCESS SELECTION -++.SH "SIMPLE PROCESS SELECTION" -++.TS -++l l. -+ -A select all processes -+ -N negate selection -+ -a select all with a tty except session leaders -+@@ -55,8 +59,11 @@ -+ r restrict output to running processes -+ x select processes without controlling ttys -+ --deselect negate selection -++.TE -+ -+-PROCESS SELECTION BY LIST -++.SH "PROCESS SELECTION BY LIST" -++.TS -++l l. -+ -C select by command name -+ -G select by RGID (supports names) -+ -U select by RUID (supports names) -+@@ -78,8 +85,10 @@ -+ --user select by effective user name or ID -+ -123 implied --sid -+ 123 implied --pid -+- -+-OUTPUT FORMAT CONTROL -++.TE -++.SH "OUTPUT FORMAT CONTROL" -++.TS -++l l. -+ -O is preloaded "-o" -+ -F extra full format -+ -c different scheduler info for -l option -+@@ -98,8 +107,10 @@ -+ v display virtual memory format -+ --format user-defined format -+ --context display security context format (NSA SELinux, etc.) -+- -+-OUTPUT MODIFIERS -++.TE -++.SH "OUTPUT MODIFIERS" -++.TS -++l l. -+ -H show process hierarchy (forest) -+ -n set namelist file -+ -w wide output -+@@ -123,31 +134,40 @@ -+ --rows set screen height -+ --sort specify sorting order -+ --width set screen width -+- -+-THREAD DISPLAY -++.TE -++.SH "THREAD DISPLAY" -++.TS -++l l. -+ -L show threads, possibly with LWP and NLWP columns -+ -T show threads, possibly with SPID column -+ -m show threads after processes -+ H show threads as if they were processes -+ m show threads after processes -++.TE -+ -+-INFORMATION -++.SH INFORMATION -++ -++.TS -++l l. -+ -V print version -+ L list all format specifiers -+ V show version info -+ --help print help message -+ --info print debugging info -+ --version print version -++.TE -++ -++.SH OBSOLETE -+ -+-OBSOLETE -++.TS -++l l. -+ A increases the argument space (DecUnix) -+ M use alternate core (try -n or N instead) -+ W get swap info from ... not /dev/drum (try -n or N instead) -+ k use /vmcore as c-dumpfile (try -n or N instead) -+- -+- -+- -+-NOTES -++.TE -++ -++.SH NOTES -+ -+ User-defined format options ("o", "-o", "O", and "-O") offer -+ a way to specify individual output columns. Headers may be -+@@ -249,14 +269,17 @@ -+ will be destroyed by init(8) if the parent process exits. -+ -+ -+-PROCESS FLAGS -+- -++.SH "PROCESS FLAGS" -++.TS -++l l l. -+ FORKNOEXEC 1 forked but didn't exec -+ SUPERPRIV 4 used super-user privileges -++.TE -+ -++.SH "PROCESS STATE CODES" -+ -+-PROCESS STATE CODES -+- -++.TS -++l l. -+ D uninterruptible sleep (usually IO) -+ R runnable (on run queue) -+ S sleeping -+@@ -264,23 +287,30 @@ -+ W paging -+ X dead -+ Z a defunct ("zombie") process -++.TE -+ -+ For BSD formats and when the "stat" keyword is used, additional -+ letters may be displayed: -+ -+-W has no resident pages -+-< high-priority process -+-N low-priority task -+-L has pages locked into memory (for real-time and custom IO) -++.IP W -++has no resident pages -++.IP < -++high-priority process -++.IP N -++low-priority task -++.IP L -++has pages locked into memory (for real-time and custom IO) -+ -+ -+-SORT KEYS -++.SH "SORT KEYS" -+ -+ Note that the values used in sorting are the internal values ps uses and not -+ the `cooked' values used in some of the output format fields. Pipe ps -+ output into the sort(1) command if you want to sort the cooked values. -+ -+-KEY LONG DESCRIPTION -++.TS -++l l l. -++\fBKEY LONG DESCRIPTION\fR -+ c cmd simple name of executable -+ C cmdline full command line -+ f flags flags as in long format F field -+@@ -307,14 +337,15 @@ -+ u user user name -+ v vsize total VM size in kB -+ y priority kernel scheduling priority -++.TE -+ -+- -+-AIX FORMAT DESCRIPTORS -++.SH "AIX FORMAT DESCRIPTORS" -+ -+ This ps supports AIX format descriptors, which work somewhat like the -+ formatting codes of printf(1) and printf(3). For example, the normal -+ default output can be produced with this: ps -eo "%p %y %x %c" -+- -++.TS -++l l l. -+ CODE NORMAL HEADER -+ %C pcpu %CPU -+ %G group GROUP -+@@ -331,14 +362,16 @@ -+ %x time TIME -+ %y tty TTY -+ %z vsz VSZ -++.TE -+ -+- -+-STANDARD FORMAT SPECIFIERS -++.SH "STANDARD FORMAT SPECIFIERS" -+ -+ These may be used to control both output format and sorting. -+ For example: ps -eo pid,user,args --sort user -+ -+-CODE HEADER -++.TS -++l l. -++\fBCODE HEADER\fR -+ %cpu %CPU -+ %mem %MEM -+ alarm ALARM -+@@ -459,25 +492,51 @@ -+ vsize VSZ -+ vsz VSZ -+ wchan WCHAN -++.TE -+ -++.SH "ENVIRONMENT VARIABLES" -+ -+- -+- -+-ENVIRONMENT VARIABLES -+ The following environment variables could affect ps: -+- COLUMNS Override default display width. -+- LINES Override default display height. -+- PS_PERSONALITY Set to one of posix,old,linux,bsd,sun,digital... -+- CMD_ENV Set to one of posix,old,linux,bsd,sun,digital... -+- I_WANT_A_BROKEN_PS Force obsolete command line interpretation. -+- LC_TIME Date format. -+- PS_COLORS Not currently supported. -+- PS_FORMAT Default output format override. -+- PS_SYSMAP Default namelist (System.map) location. -+- PS_SYSTEM_MAP Default namelist (System.map) location. -+- POSIXLY_CORRECT Don't find excuses to ignore bad "features". -+- UNIX95 Don't find excuses to ignore bad "features". -+- _XPG Cancel CMD_ENV=irix non-standard behavior. -++ -++.TP -++.B COLUMNS -++Override default display width. -++.TP -++.B LINES -++Override default display height. -++.TP -++.B PS_PERSONALITY -++Set to one of posix,old,linux,bsd,sun,digital... -++.TP -++.B CMD_ENV -++Set to one of posix,old,linux,bsd,sun,digital... -++.TP -++.B I_WANT_A_BROKEN_PS -++Force obsolete command line interpretation. -++.TP -++.B LC_TIME -++Date format. -++.TP -++.B PS_COLORS -++Not currently supported. -++.TP -++.B PS_FORMAT -++Default output format override. -++.TP -++.B PS_SYSMAP -++Default namelist (System.map) location. -++.TP -++.B PS_SYSTEM_MAP -++Default namelist (System.map) location. -++.TP -++.B POSIXLY_CORRECT -++Don't find excuses to ignore bad "features". -++.TP -++.B UNIX95 -++Don't find excuses to ignore bad "features". -++.TP -++.B _XPG -++Cancel CMD_ENV=irix non-standard behavior. -+ -+ In general, it is a bad idea to set these variables. The one exception -+ is CMD_ENV or PS_PERSONALITY, which could be set to Linux for normal -+@@ -485,7 +544,9 @@ -+ of the Unix98 standard. -+ -+ -+-PERSONALITY -++.SH "PERSONALITY" -++.TS -++l l. -+ 390 like the S/390 OpenEdition ps -+ aix like AIX ps -+ bsd like FreeBSD ps (totally non-standard) -+@@ -507,9 +568,9 @@ -+ unix standard -+ unix95 standard -+ unix98 standard -++.TE -+ -+- -+-EXAMPLES -++.SH "EXAMPLES" -+ To see every process on the system using standard syntax: -+ ps -e -+ To see every process on the system using BSD syntax: -+@@ -523,13 +584,13 @@ -+ Print only the process IDs of syslogd: -+ ps -C syslogd -o pid= -+ -+-SEE ALSO -+-top(1) pgrep(1) pstree(1) proc(5) -++.SH "SEE ALSO" -++.BR top (1), pgrep (1), pstree (1), proc (5). -+ -+-STANDARDS -++.SH STANDARDS -+ This ps conforms to version 2 of the Single Unix Specification. -+ -+-AUTHOR -++.SH AUTHOR -+ ps was originally written by Branko Lankester . Michael -+ K. Johnson re-wrote it significantly to use the proc -+ filesystem, changing a few things in the process. Michael Shields -+@@ -541,4 +602,4 @@ -+ rewrote ps for full Unix98 and BSD support, along with -+ some ugly hacks for obsolete and foreign syntax. -+ -+-Please send bug reports to -++Please send bug reports to . ---- procps-3.1.15.orig/debian/patches/20_top_manpage.dpatch -+++ procps-3.1.15/debian/patches/20_top_manpage.dpatch -@@ -0,0 +1,384 @@ -+#! /bin/sh -e -+## 20_top_manpage by Randy Hron -+## -+## All lines beginning with `## DP:' are a description of the patch. -+## DP: Fix bold in top manual page -+ -+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts -+patch_opts="${patch_opts:--f --no-backup-if-mismatch}" -+ -+if [ $# -ne 1 ]; then -+ echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" -+ exit 1 -+fi -+case "$1" in -+ -patch) patch $patch_opts -p1 < $0;; -+ -unpatch) patch $patch_opts -p1 -R < $0;; -+ *) -+ echo >&2 "`basename $0`: script expects -patch|-unpatch as argum -+ent" -+ exit 1;; -+esac -+ -+exit 0 -+@DPATCH@ -+--- procps/top.1.orig 2003-12-24 15:51:35.000000000 -0500 -++++ procps/top.1 2003-12-24 18:57:14.564156176 -0500 -+@@ -52,7 +52,7 @@ -+ .ds CF configuration file -+ .ds CI interactive command -+ .ds CO command\-line option -+-.ds CW \'current' window -++.ds CW 'current' window -+ .ds FM full\-screen mode -+ .ds MP \fBphysical\fR memory -+ .ds MS \fBshared\fR memory -+@@ -370,7 +370,7 @@ -+ The task's share of the elapsed \*(PU time since the last screen update, expressed -+ as a percentage of total \*(PU time. -+ In a true SMP environment, if 'Irix mode' is \*F, \*(Me will operate in -+-\'Solaris mode' where a task's \*(Pu usage will be divided by the total -++'Solaris mode' where a task's \*(Pu usage will be divided by the total -+ number of \*(PUs. -+ You toggle 'Irix/Solaris' modes with the 'I' \*(CI. -+ -+@@ -498,7 +498,7 @@ -+ .\" ...................................................................... -+ .SS 2b. SELECTING and ORDERING Columns -+ .\" ---------------------------------------------------------------------- -+-After pressing the \*(CIs 'f' (Fields select) or \'o' (Order fields) you will -++After pressing the \*(CIs 'f' (Fields select) or 'o' (Order fields) you will -+ be shown a screen containing the current \fBfields string\fR followed by names -+ and descriptions for all fields. -+ -+@@ -574,7 +574,7 @@ -+ see current status, -+ -+ .TP 7 -+-\ \ \'\fB?\fR\' or \'\fBh\fR\' :\fIHelp\fR -++\ \ \<\fB?\fR\> or \<\fBh\fR\> :\fIHelp\fR -+ There are two help levels available. -+ The first will provide a reminder of all the basic \*(CIs. -+ If \*(Me is\fI secured\fR, that screen will be abbreviated. -+@@ -583,7 +583,7 @@ -+ applicable to \*(AM. -+ -+ .TP 7 -+-\ \ \'\fB=\fR\' :\fIExit_Task_Limits\fR -++\ \ \<\fB=\fR\> :\fIExit_Task_Limits\fR -+ Removes restrictions on which tasks are shown. -+ This command will reverse any 'i' (idle tasks) and 'n' (max tasks) commands -+ that might be active. -+@@ -593,13 +593,13 @@ -+ When operating in \*(AM this command has a slightly broader meaning. -+ -+ .TP 7 -+-\ \ \'\fBA\fR\' :\fIAlternate_Display_Mode_toggle\fR -++\ \ \<\fBA\fR\> :\fIAlternate_Display_Mode_toggle\fR -+ This command will switch between \*(FM and \*(AM. -+-\*(XT 4. ALTERNATE\-DISPLAY Mode and the 'G' \*(CI for insight into -+-\*(CWs and field groups. -++\*(XT 4. ALTERNATE\-DISPLAY Mode and the 'G' \*(CI for insight -++into \*(CWs and field groups. -+ -+ .TP 7 -+-\ \ \'\fBB\fR\' :\fIBold_Disable/Enable_toggle\fR -++\ \ \<\fBB\fR\> :\fIBold_Disable/Enable_toggle\fR -+ This command will influence use of the 'bold' terminfo capability and -+ alters\fB both\fR the \*(SA and \*(TA for the \*(CW. -+ While it is intended primarily for use with dumb terminals, it can be -+@@ -611,7 +611,7 @@ -+ there will be no visual confirmation that they are even on. -+ -+ .TP 7 -+-*\ \'\fBd\fR\' or \'\fBs\fR\' :\fIChange_Delay_Time_interval\fR -++*\ \<\fBd\fR\> or \<\fBs\fR\> :\fIChange_Delay_Time_interval\fR -+ You will be prompted to enter the delay time, in seconds, between -+ display updates. -+ -+@@ -625,32 +625,32 @@ -+ and view the system summary on the second line. -+ -+ .TP 7 -+-\ \ \'\fBG\fR\' :\fIChoose_Another_Window/Field_Group\fR -++\ \ \<\fBG\fR\> :\fIChoose_Another_Window/Field_Group\fR -+ You will be prompted to enter a number between 1 and 4 designating the -+ window/field group which should be made the \*(CW. -+ You will soon grow comfortable with these 4 windows, especially after -+ experimenting with \*(AM. -+ -+ .TP 7 -+-\ \ \'\fBI\fR\' :\fIIrix/Solaris_Mode_toggle\fR -++\ \ \<\fBI\fR\> :\fIIrix/Solaris_Mode_toggle\fR -+ When operating in 'Solaris mode' ('I' toggled \*F), a task's \*(Pu usage -+ will be divided by the total number of \*(PUs. -+ After issuing this command, you'll be informed of the new state of this toggle. -+ -+ .TP 7 -+-\ \ \'\fBu\fR\' :\fIselect a user\fR -++\ \ \<\fBu\fR\> :\fIselect a user\fR -+ You will be prompted for a UID or username. Only processes -+ belonging to the selected user will be displayed. This option -+ matches on the effective UID. -+ -+ .TP 7 -+-\ \ \'\fBU\fR\' :\fIselect a user\fR -++\ \ \<\fBU\fR\> :\fIselect a user\fR -+ You will be prompted for a UID or username. Only processes -+ belonging to the selected user will be displayed. This option -+ matches on the real, effective, saved, and filesystem UID. -+ -+ .TP 7 -+-*\ \'\fBk\fR\' :\fIKill_a_task\fR -++*\ \<\fBk\fR\> :\fIKill_a_task\fR -+ You will be prompted for a PID and then the signal to send. -+ The default signal, as reflected in the prompt, is SIGTERM. -+ However, you can send any signal, via number or name. -+@@ -661,24 +661,24 @@ -+ 2) at the signal prompt, type 0 -+ -+ .TP 7 -+-\ \ \'\fBq\fR\' :\fIQuit\fR -++\ \ \<\fBq\fR\> :\fIQuit\fR -+ -+ .TP 7 -+-*\ \'\fBr\fR\' :\fIRenice_a_Task\fR -++*\ \<\fBr\fR\> :\fIRenice_a_Task\fR -+ You will be prompted for a PID and then the value to nice it to. -+ Entering a positive value will cause a process to lose priority. -+ Conversely, a negative value will cause a process to be viewed more -+ favorably by the kernel. -+ -+ .TP 7 -+-\ \ \'\fBW\fR\' :\fIWrite_the_Configuration_File\fR -++\ \ \<\fBW\fR\> :\fIWrite_the_Configuration_File\fR -+ This will save all of your options and toggles plus the current -+ display mode and delay time. -+ By issuing this command just before quitting \*(Me, you will be able restart -+ later in exactly that same state. -+ -+ .TP 7 -+-\ \ \'\fBZ\fR\' :\fIChange_Color_Mapping -++\ \ \<\fBZ\fR\> :\fIChange_Color_Mapping -+ This key will take you to a separate screen where you can change the -+ colors for the \*(CW, or for all windows. -+ For details regarding this \*(CI \*(Xt 3d. COLOR Mapping. -+@@ -694,25 +694,25 @@ -+ of messages and prompts. -+ -+ These commands always impact just the \*(CW/field group. -+-\*(XT 4. ALTERNATE\-DISPLAY Mode and the 'G' \*(CI for insight into -+-\*(CWs and field groups. -++\*(XT 4. ALTERNATE\-DISPLAY Mode and the 'G' \*(CI for insight -++into \*(CWs and field groups. -+ -+ .TP 7 -+-\ \ \'\fBl\fR\' :\fIToggle_Load_Average/Uptime\fR \*(EM On/Off -++\ \ \<\fBl\fR\> :\fIToggle_Load_Average/Uptime\fR \*(EM On/Off -+ This is also the line containing the program name (possibly an alias) when -+ operating in \*(FM or the \*(CW name when operating in \*(AM. -+ -+ .TP 7 -+-\ \ \'\fBm\fR\' :\fIToggle_Memory/Swap_Usage\fR \*(EM On/Off -++\ \ \<\fBm\fR\> :\fIToggle_Memory/Swap_Usage\fR \*(EM On/Off -+ This command affects two \*(SA lines. -+ -+ .TP 7 -+-\ \ \'\fBt\fR\' :\fIToggle_Task/Cpu_States\fR \*(EM On/Off -++\ \ \<\fBt\fR\> :\fIToggle_Task/Cpu_States\fR \*(EM On/Off -+ This command affects from 2 to many \*(SA lines, depending on the state -+ of the '1' toggle and whether or not \*(Me is running under true SMP. -+ -+ .TP 7 -+-\ \ \'\fB1\fR\' :\fIToggle_Single/Separate_Cpu_States\fR \*(EM On/Off -++\ \ \<\fB1\fR\> :\fIToggle_Single/Separate_Cpu_States\fR \*(EM On/Off -+ This command affects how the 't' command's Cpu States portion is shown. -+ Although this toggle exists primarily to serve massively-parallel SMP machines, -+ it is not restricted to solely SMP environments. -+@@ -744,12 +744,12 @@ -+ .in -+ -+ .TP 7 -+-\ \ \'\fBb\fR\' :\fIBold/Reverse_toggle\fR -++\ \ \<\fBb\fR\> :\fIBold/Reverse_toggle\fR -+ This command will impact how the 'x' and 'y' toggles are displayed. -+ Further, it will only be available when at least one of those toggles is \*O. -+ -+ .TP 7 -+-\ \ \'\fBx\fR\' :\fIColumn_Highlight_toggle\fR -++\ \ \<\fBx\fR\> :\fIColumn_Highlight_toggle\fR -+ Changes highlighting for the current sort field. -+ You probably don't need a constant visual reminder of the sort field and -+ \*(Me hopes that you always run with 'column highlight' \*F, due to the cost -+@@ -759,7 +759,7 @@ -+ visual reminder. -+ -+ .TP 7 -+-\ \ \'\fBy\fR\' :\fIRow_Highlight_toggle\fR -++\ \ \<\fBy\fR\> :\fIRow_Highlight_toggle\fR -+ Changes highlighting for "running" tasks. -+ For additional insight into this task state, \*(Xt 2a. DESCRIPTIONS of Fields, -+ Process Status. -+@@ -768,7 +768,7 @@ -+ The only costs will be a few additional tty escape sequences. -+ -+ .TP 7 -+-\ \ \'\fBz\fR\' :\fIColor/Monochrome_toggle\fR -++\ \ \<\fBz\fR\> :\fIColor/Monochrome_toggle\fR -+ Switches the \*(CW between your last used color scheme and the older form -+ of black-on-white or white-on-black. -+ This command will alter\fB both\fR the \*(SA and \*(TA but does not affect the -+@@ -779,20 +779,20 @@ -+ .B CONTENT\fR of \*(TW -+ .PD 0 -+ .TP 7 -+-\ \ \'\fBc\fR\' :\fICommand_Line/Program_Name_toggle\fR -++\ \ \<\fBc\fR\> :\fICommand_Line/Program_Name_toggle\fR -+ This command will be honored whether or not the 'Command' column -+ is currently visible. -+ Later, should that field come into view, the change you applied will be seen. -+ -+ .TP 7 -+-\ \ \'\fBf\fR\' and \'\fBo\fR\' :\fIFields_select\fR or \fIOrder_fields\fR -++\ \ \<\fBf\fR\> and \<\fBo\fR\> :\fIFields_select\fR or \fIOrder_fields\fR -+ These keys display separate screens where you can change which -+ fields are displayed and their order. -+ For additional information on these \*(CIs -+ \*(Xt 2b. SELECTING and ORDERING Columns. -+ -+ .TP 7 -+-\ \ \'\fBS\fR\' :\fICumulative_Time_Mode_toggle\fR -++\ \ \<\fBS\fR\> :\fICumulative_Time_Mode_toggle\fR -+ When 'Cumulative mode' is \*O, each process is listed with the \*(Pu -+ time that it and its dead children have used. -+ -+@@ -808,7 +808,7 @@ -+ effect, simply ask for help and view the window summary on the second line. -+ -+ .TP 7 -+-\ \ \'\fBu\fR\' :\fIShow_Specific_User_Only\fR -++\ \ \<\fBu\fR\> :\fIShow_Specific_User_Only\fR -+ You will be prompted to enter the name of the user to display. -+ Thereafter, in that \*(TW only matching User ID's will be shown, or possibly -+ no tasks will be shown. -+@@ -821,7 +821,7 @@ -+ .B SIZE\fR of \*(TW -+ .PD 0 -+ .TP 7 -+-\ \ \'\fBi\fR\' :\fIIdle_Processes_toggle\fR -++\ \ \<\fBi\fR\> :\fIIdle_Processes_toggle\fR -+ Displays all tasks or just active tasks. -+ When this toggle is \*F, idled or zombied processes will not be displayed. -+ -+@@ -829,7 +829,7 @@ -+ affect the window's size, as all prior \*(TDs will have already been painted. -+ -+ .TP 7 -+-\ \ \'\fBn\fR\' or \'#\' :\fISet_Maximum_Tasks\fR -++\ \ \<\fBn\fR\> or \<\fB#\fR\> :\fISet_Maximum_Tasks\fR -+ You will be prompted to enter the number of tasks to display. -+ The lessor of your number and available screen rows will be used. -+ -+@@ -868,12 +868,12 @@ -+ .in -+ -+ .TP 7 -+-\ \ \'\fB<\fR\' :\fIMove_Sort_Field_Left\fR -++\ \ \<\fB<\fR\> :\fIMove_Sort_Field_Left\fR -+ Moves the sort column to the left unless the current sort field is -+ the first field being displayed. -+ -+ .TP 7 -+-\ \ \'\fB>\fR\' :\fIMove_Sort_Field_Right\fR -++\ \ \<\fB>\fR\> :\fIMove_Sort_Field_Right\fR -+ Moves the sort column to the right unless the current sort field is -+ the last field being displayed. -+ -+@@ -884,7 +884,7 @@ -+ .in -+ -+ .TP 7 -+-\ \ \'\fBF\fR\' or \'\fBO\fR\' :\fISelect_Sort_Field\fR -++\ \ \<\fBF\fR\> or \<\fBO\fR\> :\fISelect_Sort_Field\fR -+ These keys display a separate screen where you can change which field -+ is used as the sort column. -+ -+@@ -897,7 +897,7 @@ -+ when running \*(Me with column highlighting turned \*F. -+ -+ .TP 7 -+-\ \ \'\fBR\fR\' :\fIReverse/Normal_Sort_Field_toggle\fR -++\ \ \<\fBR\fR\> :\fIReverse/Normal_Sort_Field_toggle\fR -+ Using this \*(CI you can alternate between high-to-low and low-to-high sorts. -+ -+ .PP -+@@ -974,7 +974,7 @@ -+ .\" ...................................................................... -+ .SS 4b. COMMANDS for Windows -+ .TP 7 -+-\ \ \'\fB-\fR\' and \'\fB_\fR\' :\fIShow/Hide_Window(s)_toggles\fR -++\ \ \<\fB-\fR\> and \<\fB_\fR\> :\fIShow/Hide_Window(s)_toggles\fR -+ The '-' key turns the \*(CW's \*(TD \*O and \*F. -+ When \*O, that \*(TA will show a minimum of the columns header you've -+ established with the 'f' and 'o' commands. -+@@ -988,7 +988,7 @@ -+ as the only display element. -+ -+ .TP 7 -+-*\ \'\fB=\fR\' and \'\fB+\fR\' :\fIEqualize_(re-balance)_Window(s)\fR -++*\ \<\fB=\fR\> and \<\fB+\fR\> :\fIEqualize_(re-balance)_Window(s)\fR -+ The '=' key forces the \*(CW's \*(TD to be visible. -+ It also reverses any 'i' (idle tasks) and 'n' (max tasks) commands that might -+ be active. -+@@ -999,7 +999,7 @@ -+ except for the 'i' (idle tasks) and 'n' (max tasks) commands. -+ -+ .TP 7 -+-*\ \'\fBA\fR\' :\fIAlternate_Display_Mode_toggle\fR -++*\ \<\fBA\fR\> :\fIAlternate_Display_Mode_toggle\fR -+ This command will switch between \*(FM and \*(AM. -+ -+ The first time you issue this command, all four \*(TDs will be shown. -+@@ -1007,7 +1007,7 @@ -+ chosen to make visible. -+ -+ .TP 7 -+-*\ \'\fBa\fR\' and \'\fBw\fR\' :\fINext_Window_Forward/Backward\fR -++*\ \<\fBa\fR\> and \<\fBw\fR\> :\fINext_Window_Forward/Backward\fR -+ This will change the \*(CW, which in turn changes the window to which -+ commands are directed. -+ These keys act in a circular fashion so you can reach any desired \*(CW -+@@ -1018,7 +1018,7 @@ -+ the \*(TD is \*F and many commands will be restricted. -+ -+ .TP 7 -+-*\ \'\fBG\fR\' :\fIChoose_Another_Window/Field_Group\fR -++*\ \<\fBG\fR\> :\fIChoose_Another_Window/Field_Group\fR -+ You will be prompted to enter a number between 1 and 4 designating the -+ window/field group which should be made the \*(CW. -+ -+@@ -1027,15 +1027,15 @@ -+ commands. -+ -+ .TP 7 -+-\ \ \'\fBg\fR\' :\fIChange_Window/Field_Group_Name\fR -++\ \ \<\fBg\fR\> :\fIChange_Window/Field_Group_Name\fR -+ You will be prompted for a new name to be applied to the \*(CW. -+ It does not require that the window name be visible -+ (the 'l' toggle to be \*O). -+ -+ .IP "*" 3 -+ The \*(CIs shown with an \*(AS have use beyond \*(AM. -+- \'=', 'A', 'G' are always available -+- \'a', 'w' act the same when color mapping -++ '=', 'A', 'G' are always available -++ 'a', 'w' act the same when color mapping -+ -+ -+ .\" ---------------------------------------------------------------------- -+ -+ -+ -+ -+ -+ ---- procps-3.1.15.orig/debian/patches/10_sysctl_quiet.dpatch -+++ procps-3.1.15/debian/patches/10_sysctl_quiet.dpatch -@@ -0,0 +1,119 @@ -+#! /bin/sh -e -+## 10_sysctl_quiet by Simon Horman -+## -+## All lines beginning with `## DP:' are a description of the patch. -+## DP: Adds quiet -q flag to sysctl -+ -+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts -+patch_opts="${patch_opts:--f --no-backup-if-mismatch}" -+ -+if [ $# -ne 1 ]; then -+ echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" -+ exit 1 -+fi -+case "$1" in -+ -patch) patch $patch_opts -p1 < $0;; -+ -unpatch) patch $patch_opts -p1 -R < $0;; -+ *) -+ echo >&2 "`basename $0`: script expects -patch|-unpatch as argum -+ent" -+ exit 1;; -+esac -+ -+exit 0 -+@DPATCH@ -+diff -ru procps-3.1.8/sysctl.8 procps-3.1.8.new/sysctl.8 -+--- procps-3.1.8/sysctl.8 2002-12-12 07:51:32.000000000 +0900 -++++ procps-3.1.8.new/sysctl.8 2003-04-15 20:30:46.000000000 +0900 -+@@ -12,9 +12,9 @@ -+ .SH SYNOPSIS -+ .B "sysctl [-n] [-e] variable ..." -+ .br -+-.B "sysctl [-n] [-e] -w variable=value ..." -++.B "sysctl [-n] [-e] [-q] -w variable=value ..." -+ .br -+-.B "sysctl [-n] [-e] -p " -++.B "sysctl [-n] [-e] [-q] -p " -+ .br -+ .B "sysctl [-n] [-e] -a" -+ .br -+@@ -45,6 +45,9 @@ -+ .B "-e" -+ Use this option to ignore errors about unknown keys. -+ .TP -++.B "-q" -++Use this option to not display the values set to stdout. -++.TP -+ .B "-w" -+ Use this option when you want to change a sysctl setting. -+ .TP -+diff -ru procps-3.1.8/sysctl.c procps-3.1.8.new/sysctl.c -+--- procps-3.1.8/sysctl.c 2002-12-29 08:26:50.000000000 +0900 -++++ procps-3.1.8.new/sysctl.c 2003-04-15 20:35:08.000000000 +0900 -+@@ -15,6 +15,8 @@ -+ * Changelog: -+ * v1.01: -+ * - added -p to preload values from a file -++ * Horms: -++ * - added -q to be quiet when modifying values -+ * -+ * Changes by Albert Cahalan, 2002. -+ */ -+@@ -46,6 +48,7 @@ -+ static bool PrintName; -+ static bool PrintNewline; -+ static bool IgnoreError; -++static bool Quiet; -+ -+ /* error messages */ -+ static const char ERR_UNKNOWN_PARAMETER[] = "error: Unknown parameter '%s'\n"; -+@@ -80,9 +83,9 @@ -+ */ -+ static int Usage(const char *restrict const name) { -+ printf("usage: %s [-n] [-e] variable ... \n" -+- " %s [-n] [-e] -w variable=value ... \n" -++ " %s [-n] [-e] [-q] -w variable=value ... \n" -+ " %s [-n] [-e] -a \n" -+- " %s [-n] [-e] -p (default /etc/sysctl.conf) \n" -++ " %s [-n] [-e] [-q] -p (default /etc/sysctl.conf) \n" -+ " %s [-n] [-e] -A\n", name, name, name, name, name); -+ return -1; -+ } -+@@ -290,13 +293,14 @@ -+ fprintf(fp, "%s\n", value); -+ fclose(fp); -+ -+- if (PrintName) { -++ if(Quiet) { -++ ; -++ } else if (PrintName) { -+ fprintf(stdout, "%s = %s\n", outname, value); -++ } else if (PrintNewline) { -++ fprintf(stdout, "%s\n", value); -+ } else { -+- if (PrintNewline) -+- fprintf(stdout, "%s\n", value); -+- else -+- fprintf(stdout, "%s", value); -++ fprintf(stdout, "%s", value); -+ } -+ } -+ -+@@ -377,6 +381,7 @@ -+ PrintName = true; -+ PrintNewline = true; -+ IgnoreError = false; -++ Quiet = false; -+ -+ if (argc < 2) { -+ return Usage(me); -+@@ -419,6 +424,9 @@ -+ preloadfile = *argv; -+ } -+ return Preload(preloadfile); -++ case 'q': -++ Quiet = true; -++ break; -+ case 'a': /* string and integer values (for Linux, all of them) */ -+ case 'A': /* the above, including "opaques" (would be unprintable) */ -+ case 'X': /* the above, with opaques completly printed in hex */ ---- procps-3.1.15.orig/debian/patches/00list -+++ procps-3.1.15/debian/patches/00list -@@ -0,0 +1,5 @@ -+10_sysctl_quiet -+20_procps-fix+attr -+20_ps.1 -+20_top_manpage -+30_remove_test_dir ---- procps-3.1.15.orig/debian/patches/30_remove_test_dir.dpatch -+++ procps-3.1.15/debian/patches/30_remove_test_dir.dpatch -@@ -0,0 +1,2911 @@ -+#! /bin/sh -e -+## 30_remove_test-dir by Craif Small -+## -+## All lines beginning with `## DP:' are a description of the patch. -+## DP: Removing test directory -+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts -+patch_opts="${patch_opts:--f --no-backup-if-mismatch}" -+ -+if [ $# -ne 1 ]; then -+ echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" -+ exit 1 -+fi -+case "$1" in -+ -patch) patch $patch_opts -p1 < $0;; -+ -unpatch) patch $patch_opts -p1 -R < $0;; -+ *) -+ echo >&2 "`basename $0`: script expects -patch|-unpatch as argum -+ent" -+ exit 1;; -+esac -+ -+exit 0 -+@DPATCH@ -+diff -ruN procps-3.1.15.old/test/clone-army.c procps-3.1.15/test/clone-army.c -+--- procps-3.1.15.old/test/clone-army.c 2003-10-05 04:46:34.000000000 +1000 -++++ procps-3.1.15/test/clone-army.c 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,127 +0,0 @@ -+-// ps fTo sess,pgid,pid,tty,ppid,tpgid,args -C a.out -+- -+-#include -+-#include -+-#include -+-//#include -+-//#include -+-//#include -+-#include -+-#include -+- -+-#if 0 -+-#define CLONE_VM 0x00000100 // set if VM shared between processes -+-#define CLONE_FS 0x00000200 // set if fs info shared between processes -+-#define CLONE_FILES 0x00000400 // set if open files shared between processes -+-#define CLONE_SIGHAND 0x00000800 // set if signal handlers and blocked signals shared -+-#define CLONE_IDLETASK 0x00001000 // set if new pid should be 0 (kernel only)*/ -+-#define CLONE_PTRACE 0x00002000 // set if we want to let tracing continue on the child too -+-#define CLONE_VFORK 0x00004000 // set if the parent wants the child to wake it up on mm_release -+-#define CLONE_PARENT 0x00008000 // set if we want to have the same parent as the cloner -+-#define CLONE_THREAD 0x00010000 // Same thread group? -+-#define CLONE_NEWNS 0x00020000 // New namespace group? -+-#define CLONE_SYSVSEM 0x00040000 // share system V SEM_UNDO semantics -+-#define CLONE_SETTLS 0x00080000 // create a new TLS for the child -+-#define CLONE_PARENT_SETTID 0x00100000 // set the TID in the parent -+-#define CLONE_CHILD_CLEARTID 0x00200000 // clear the TID in the child -+-#define CLONE_DETACHED 0x00400000 // parent wants no child-exit signal -+-#define CLONE_UNTRACED 0x00800000 // set if the tracing process can't force CLONE_PTRACE on this clone -+-#define CLONE_CHILD_SETTID 0x01000000 // set the TID in the child -+-#define CLONE_STOPPED 0x02000000 // Start in stopped state -+-#endif -+- -+-#ifndef CLONE_THREAD -+-#define CLONE_THREAD 0x00010000 -+-#endif -+-#ifndef CLONE_DETACHED -+-#define CLONE_DETACHED 0x00400000 -+-#endif -+- -+- -+-// interesting: VM FS FILES SIGHAND PARENT THREAD SYSVSEM DETACHED -+- -+-//#define FLAGS (CLONE_PARENT|CLONE_FS|CLONE_FILES|CLONE_SIGHAND|CLONE_VM|CLONE_THREAD|CLONE_SYSVSEM) -+-#define FLAGS (CLONE_FS|CLONE_FILES|CLONE_SIGHAND|CLONE_VM|CLONE_THREAD|CLONE_DETACHED) -+- -+-// Don't cause rejection: FS FILES SYSVSEM PARENT -+-// Do cause rejection: -+- -+-static void printflags(int pass, unsigned flags){ -+- printf( -+- "%s %08x %s %s %s %s\n", -+- pass?"pass":"FAIL", -+- flags, -+- (flags&CLONE_THREAD) ? "THREAD" : "______", -+- (flags&CLONE_DETACHED) ? "DETACHED" : "________", -+- (flags&CLONE_SIGHAND) ? "SIGHAND" : "_______", -+- (flags&CLONE_SIGHAND) ? "VM" : "__" -+- ); -+-} -+- -+-static unsigned genflags(unsigned flags){ -+- return ( -+- (flags&0x08) ? 0 : CLONE_THREAD -+- )|( -+- (flags&0x04) ? 0 : CLONE_DETACHED -+- )|( -+- (flags&0x02) ? 0 : CLONE_SIGHAND -+- )|( -+- (flags&0x01) ? 0 : CLONE_VM -+- ); -+-} -+- -+-//static pid_t one; -+- -+-//static void die(int signo){ -+-// (void)signo; -+-// _exit(0); -+-//} -+- -+-//static void sigchld_handler(int signo){ -+-// (void)signo; -+-// kill(one,SIGHUP); // kill parent -+-//} -+- -+-static int clone_fn(void *vp){ -+- for(;;) pause(); -+-} -+- -+-static long clone_stack_data[2048]; -+-#ifdef __hppa__ -+-static long *clone_stack = &clone_stack_data[0]; -+-#else -+-static long *clone_stack = &clone_stack_data[2048]; -+-#endif -+- -+-int main(int argc, char *argv[]){ -+- unsigned u; -+- pid_t minime; -+- (void)argc; -+- (void)argv; -+- -+-// one = getpid(); -+-// signal(SIGHUP,die); -+-// if(fork()) hang(); // parent later killed as readyness signal -+- -+- u = 16; -+- -+- while(u--){ -+- unsigned f = genflags(u); -+- minime = clone(clone_fn, clone_stack, f, "arg"); -+- -+- printflags(minime!=-1, f); -+-// if(minime==-1){ -+-// perror("no clone"); -+-// _exit(8); -+-// } -+- -+-// printf("%d begat %d\n",getpid(),minime); -+- } -+- -+- -+-// kill(one,SIGHUP); // let the shell know we're ready -+- -+-// clone_fn(); -+- -+- return 0; -+-} -+diff -ruN procps-3.1.15.old/test/clone-once.c procps-3.1.15/test/clone-once.c -+--- procps-3.1.15.old/test/clone-once.c 2003-10-20 10:56:12.000000000 +1000 -++++ procps-3.1.15/test/clone-once.c 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,97 +0,0 @@ -+-#include -+-#include -+-#include -+-//#include -+-//#include -+-//#include -+-#include -+-#include -+- -+-#if 0 -+-#define CLONE_VM 0x00000100 // set if VM shared between processes -+-#define CLONE_FS 0x00000200 // set if fs info shared between processes -+-#define CLONE_FILES 0x00000400 // set if open files shared between processes -+-#define CLONE_SIGHAND 0x00000800 // set if signal handlers and blocked signals shared -+-#define CLONE_IDLETASK 0x00001000 // set if new pid should be 0 (kernel only)*/ -+-#define CLONE_PTRACE 0x00002000 // set if we want to let tracing continue on the child too -+-#define CLONE_VFORK 0x00004000 // set if the parent wants the child to wake it up on mm_release -+-#define CLONE_PARENT 0x00008000 // set if we want to have the same parent as the cloner -+-#define CLONE_THREAD 0x00010000 // Same thread group? -+-#define CLONE_NEWNS 0x00020000 // New namespace group? -+-#define CLONE_SYSVSEM 0x00040000 // share system V SEM_UNDO semantics -+-#define CLONE_SETTLS 0x00080000 // create a new TLS for the child -+-#define CLONE_PARENT_SETTID 0x00100000 // set the TID in the parent -+-#define CLONE_CHILD_CLEARTID 0x00200000 // clear the TID in the child -+-#define CLONE_DETACHED 0x00400000 // parent wants no child-exit signal -+-#define CLONE_UNTRACED 0x00800000 // set if the tracing process can't force CLONE_PTRACE on this clone -+-#define CLONE_CHILD_SETTID 0x01000000 // set the TID in the child -+-#define CLONE_STOPPED 0x02000000 // Start in stopped state -+-#endif -+- -+-#ifndef CLONE_THREAD -+-#define CLONE_THREAD 0x00010000 -+-#endif -+-#ifndef CLONE_DETACHED -+-#define CLONE_DETACHED 0x00400000 -+-#endif -+- -+-//#define FLAGS (CLONE_PARENT|CLONE_FS|CLONE_FILES|CLONE_SIGHAND|CLONE_VM|CLONE_THREAD|CLONE_SYSVSEM) -+-#define FLAGS (CLONE_FS|CLONE_FILES|CLONE_SIGHAND|CLONE_VM|CLONE_THREAD|CLONE_DETACHED) -+- -+-static pid_t one; -+- -+-static void die(int signo){ -+- (void)signo; -+- _exit(0); -+-} -+- -+-//static void sigchld_handler(int signo){ -+-// (void)signo; -+-// kill(one,SIGHUP); // kill parent -+-//} -+- -+-static void hang(void){ -+- for(;;) pause(); -+-} -+- -+-static int clone_fn(void *vp){ -+-// const char msg[] = "I think I'm a clone now!\n"; -+- (void)vp; -+-// write(STDOUT_FILENO, msg, sizeof(msg)-1); -+- hang(); -+- return 0; // keep gcc happy -+-} -+- -+-static long clone_stack_data[2048]; -+-#ifdef __hppa__ -+-static long *clone_stack = &clone_stack_data[0]; -+-#else -+-static long *clone_stack = &clone_stack_data[2048]; -+-#endif -+- -+-int main(int argc, char *argv[]){ -+- pid_t minime; -+- (void)argc; -+- (void)argv; -+- -+- one = getpid(); -+- signal(SIGHUP,die); -+- if(fork()) hang(); // parent later killed as readyness signal -+- -+- -+- minime = clone(clone_fn, clone_stack, FLAGS, "arg"); -+- -+- if(minime==-1){ -+- perror("no clone"); -+- kill(one,SIGKILL); -+- _exit(8); -+- } -+- -+-// printf("%d begat %d\n",getpid(),minime); -+- -+- kill(one,SIGHUP); // let the shell know we're ready -+- -+- hang(); -+- -+- return 0; -+-} -+diff -ruN procps-3.1.15.old/test/fork-you.c procps-3.1.15/test/fork-you.c -+--- procps-3.1.15.old/test/fork-you.c 2003-09-05 14:18:30.000000000 +1000 -++++ procps-3.1.15/test/fork-you.c 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,27 +0,0 @@ -+-#include -+-#include -+-#include -+- -+-static void die(int signo){ -+- (void)signo; -+- _exit(0); -+-} -+- -+-static void hang(void){ -+- for(;;) pause(); -+-} -+- -+-int main(int argc, char *argv[]){ -+- pid_t pid; -+- -+- (void)argv; -+- -+- pid = getpid(); -+- signal(SIGHUP,die); -+- if(fork()) hang(); // parent later killed as readyness signal -+- kill(1,9); // "kill" unkillable init to touch lib pages -+- while(argc--) if(!fork()) hang(); -+- kill(pid,SIGHUP); // kill parent -+- hang(); -+- return 0; -+-} -+diff -ruN procps-3.1.15.old/test/funny-thing.c procps-3.1.15/test/funny-thing.c -+--- procps-3.1.15.old/test/funny-thing.c 2003-09-08 13:55:57.000000000 +1000 -++++ procps-3.1.15/test/funny-thing.c 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,38 +0,0 @@ -+-#include -+-#include -+-#include -+- -+-static pid_t one; -+- -+-static void die(int signo){ -+- (void)signo; -+- _exit(0); -+-} -+- -+-static void hang(void){ -+- for(;;) pause(); -+-} -+- -+-int main(int argc, char *argv[]){ -+- (void)argc; -+- (void)argv; -+- -+- one = getpid(); -+- signal(SIGHUP,die); -+- if(fork()) hang(); // parent later killed as readyness signal -+- -+- // second one exits, to enable setsid(), and the resulting -+- // zombie will be reaped by init after 1st process killed -+- if(!fork()) _exit(0); -+- -+- if(setsid()==-1){ -+- kill(one,SIGKILL); // hopefully the shell will complain -+- _exit(42); // kind of tough to report errors -+- } -+- -+- kill(one,SIGHUP); // let the shell know we're ready -+- -+- hang(); -+- -+- return 0; -+-} -+diff -ruN procps-3.1.15.old/test/gigabyte.c procps-3.1.15/test/gigabyte.c -+--- procps-3.1.15.old/test/gigabyte.c 2003-09-11 10:23:56.000000000 +1000 -++++ procps-3.1.15/test/gigabyte.c 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,74 +0,0 @@ -+-#include -+-#include -+-#include -+-//#include -+-//#include -+-//#include -+-#include -+-#include -+- -+-static void die(int signo){ -+- (void)signo; -+- _exit(0); -+-} -+- -+-static void hang(void){ -+- for(;;) pause(); -+-} -+- -+-#ifndef MAP_NORESERVE -+-#define MAP_NORESERVE 0 -+-#endif -+- -+-int main(int argc, char *argv[]){ -+- void *vp; -+- pid_t pid; -+- size_t length = 1024*1024*1024; -+- unsigned maps; // how many mappings to do -+- -+- (void)argc; -+- (void)argv; -+- -+- if(sizeof(void*)==8){ -+- maps = 10; -+- puts("64bit"); -+- }else{ -+- maps = 1; -+- puts("32bit"); -+- } -+- fflush(stdout); -+- -+- pid = getpid(); -+- signal(SIGHUP,die); -+- if(fork()) hang(); // parent later killed as readyness signal -+- -+- -+- while(maps){ -+- vp = mmap( -+- 0, // start -+- length, -+- PROT_READ|PROT_WRITE, -+- MAP_PRIVATE|MAP_NORESERVE|MAP_ANONYMOUS, -+- 0, // fd -+- 0 // offset -+- ); -+- if(vp==MAP_FAILED){ -+- // try a smaller size; maybe fragmentation stopped us -+- length /= 2; -+- maps *= 2; -+- }else{ -+- maps--; -+- } -+- if(maps>200 || length<2*1024*1024){ -+- kill(pid,SIGKILL); // hopefully the shell will complain -+- _exit(88); -+- } -+- } -+- -+- close(0); -+- close(1); -+- close(2); -+- kill(pid,SIGHUP); // kill parent -+- hang(); -+- return 0; -+-} -+diff -ruN procps-3.1.15.old/test/got-no-tty.c procps-3.1.15/test/got-no-tty.c -+--- procps-3.1.15.old/test/got-no-tty.c 2003-09-05 14:17:57.000000000 +1000 -++++ procps-3.1.15/test/got-no-tty.c 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,46 +0,0 @@ -+-#include -+-#include -+-#include -+-#include -+-#include -+-#include -+-#include -+- -+-static void die(int signo){ -+- (void)signo; -+- _exit(0); -+-} -+- -+-static void hang(void){ -+- for(;;) pause(); -+-} -+- -+-int main(int argc, char *argv[]){ -+- int fd; -+- pid_t pid; -+- -+- (void)argc; -+- (void)argv; -+- -+- pid = getpid(); -+- signal(SIGHUP,die); -+- if(fork()) hang(); // parent later killed as readyness signal -+- -+- -+- // Use the TIOCNOTTY ioctl to detach from the tty -+- // and, supposedly, set the process group ID to zero. -+- // Reality: PGRP unchanged, TPGID becomes -1, TTY lost. -+- fd = open("/dev/tty", O_RDONLY); -+- if(!fd){ -+- perror("open /dev/tty"); -+- _exit(1); -+- } -+- if(ioctl(fd, TIOCNOTTY)==-1){ -+- perror("open /dev/tty"); -+- _exit(1); -+- } -+- -+- kill(pid,SIGHUP); // kill parent -+- hang(); -+- return 0; -+-} -+diff -ruN procps-3.1.15.old/test/mini-me.c procps-3.1.15/test/mini-me.c -+--- procps-3.1.15.old/test/mini-me.c 2003-09-22 05:50:38.000000000 +1000 -++++ procps-3.1.15/test/mini-me.c 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,97 +0,0 @@ -+-// ps fTo sess,pgid,pid,tty,ppid,tpgid,args -C a.out -+- -+-#include -+-#include -+-#include -+-//#include -+-//#include -+-//#include -+-#include -+-#include -+- -+-#if 0 -+-#define CLONE_VM 0x00000100 // set if VM shared between processes -+-#define CLONE_FS 0x00000200 // set if fs info shared between processes -+-#define CLONE_FILES 0x00000400 // set if open files shared between processes -+-#define CLONE_SIGHAND 0x00000800 // set if signal handlers and blocked signals shared -+-#define CLONE_IDLETASK 0x00001000 // set if new pid should be 0 (kernel only)*/ -+-#define CLONE_PTRACE 0x00002000 // set if we want to let tracing continue on the child too -+-#define CLONE_VFORK 0x00004000 // set if the parent wants the child to wake it up on mm_release -+-#define CLONE_PARENT 0x00008000 // set if we want to have the same parent as the cloner -+-#define CLONE_THREAD 0x00010000 // Same thread group? -+-#define CLONE_NEWNS 0x00020000 // New namespace group? -+-#define CLONE_SYSVSEM 0x00040000 // share system V SEM_UNDO semantics -+-#define CLONE_SETTLS 0x00080000 // create a new TLS for the child -+-#define CLONE_PARENT_SETTID 0x00100000 // set the TID in the parent -+-#define CLONE_CHILD_CLEARTID 0x00200000 // clear the TID in the child -+-#define CLONE_DETACHED 0x00400000 // parent wants no child-exit signal -+-#define CLONE_UNTRACED 0x00800000 // set if the tracing process can't force CLONE_PTRACE on this clone -+-#define CLONE_CHILD_SETTID 0x01000000 // set the TID in the child -+-#define CLONE_STOPPED 0x02000000 // Start in stopped state -+-#endif -+- -+-#ifndef CLONE_THREAD -+-#define CLONE_THREAD 0x00010000 -+-#endif -+-#ifndef CLONE_DETACHED -+-#define CLONE_DETACHED 0x00400000 -+-#endif -+- -+-//#define FLAGS (CLONE_PARENT|CLONE_FS|CLONE_FILES|CLONE_SIGHAND|CLONE_VM|CLONE_THREAD|CLONE_SYSVSEM) -+-#define FLAGS (CLONE_FS|CLONE_FILES|CLONE_SIGHAND|CLONE_VM|CLONE_THREAD|CLONE_DETACHED) -+- -+-//static pid_t one; -+- -+-//static void die(int signo){ -+-// (void)signo; -+-// _exit(0); -+-//} -+- -+-//static void sigchld_handler(int signo){ -+-// (void)signo; -+-// kill(one,SIGHUP); // kill parent -+-//} -+- -+-static void hang(void){ -+- for(;;) pause(); -+-} -+- -+-static int clone_fn(void *vp){ -+- const char msg[] = "I think I'm a clone now!\n"; -+- write(STDOUT_FILENO, msg, sizeof(msg)-1); -+- hang(); -+-} -+- -+-static long clone_stack_data[2048]; -+-#ifdef __hppa__ -+-static long *clone_stack = &clone_stack_data[0]; -+-#else -+-static long *clone_stack = &clone_stack_data[2048]; -+-#endif -+- -+-int main(int argc, char *argv[]){ -+- pid_t minime; -+- (void)argc; -+- (void)argv; -+- -+-// one = getpid(); -+-// signal(SIGHUP,die); -+-// if(fork()) hang(); // parent later killed as readyness signal -+- -+- -+- minime = clone(clone_fn, clone_stack, FLAGS, "arg"); -+- -+- if(minime==-1){ -+-// kill(one,SIGKILL); -+- perror("no clone"); -+- _exit(8); -+- } -+- -+- printf("%d begat %d\n",getpid(),minime); -+- -+-// kill(one,SIGHUP); // let the shell know we're ready -+- -+- hang(); -+- -+- return 0; -+-} -+diff -ruN procps-3.1.15.old/test/module.mk procps-3.1.15/test/module.mk -+--- procps-3.1.15.old/test/module.mk 2003-12-25 02:02:52.000000000 +1100 -++++ procps-3.1.15/test/module.mk 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,36 +0,0 @@ -+-# This file gets included into the main Makefile, in the top directory. -+- -+-#INSTALL += $(bin)test $(man1)test.1 -- some data dump thing maybe? -+- -+-# directories for cleaning -+-DIRS += test/ $(wildcard test/*/*/) -+- -+-TEST_C := fork-you the_living_dead got-no-tty sidious sid-breaks-ttys \ -+- gigabyte mini-me funny-thing clone-army clone-once -+-TESTNAMES := $(addprefix test/,$(TEST_C)) -+-TESTOBJ := $(addsuffix .o,$(TESTNAMES)) -+-TESTSRC := $(addsuffix .c,$(TESTNAMES)) test/th.c -+- -+-# files to create -+-ALL += $(TESTNAMES) -+- -+-# files to remove -+-TEST_JUNK := stderr stdout header stderr.test stderr.good -+-CLEAN += $(addprefix test/,$(TEST_JUNK)) $(TESTNAMES) test/th $(wildcard test/*.tmp) -+- -+-TEST_X := module.mk script-child onetest runtests -+-TARFILES += $(TESTSRC) $(addprefix test/,$(TEST_X)) $(wildcard test/*/*) -+- -+-$(TESTNAMES): %: %.o -+- $(CC) $(ALL_CFLAGS) $(ALL_LDFLAGS) -o $@ $^ -+- -+-# add proc/$(SONAME) on the end later if needed -+-$(TESTOBJ): %.o: %.c -+- $(CC) -c $(ALL_CPPFLAGS) $(ALL_CFLAGS) $< -o $@ -+- -+-test/th: test/th.o -+- $(CC) $(ALL_CFLAGS) $(ALL_LDFLAGS) -o $@ $^ -lpthread -+- -+-test/th.o: test/th.c -+- $(CC) -c $(ALL_CPPFLAGS) $(ALL_CFLAGS) $< -o $@ -+- -+diff -ruN procps-3.1.15.old/test/onetest procps-3.1.15/test/onetest -+--- procps-3.1.15.old/test/onetest 2003-12-25 02:02:08.000000000 +1100 -++++ procps-3.1.15/test/onetest 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,70 +0,0 @@ -+-#!/bin/bash -+- -+-unset I_WANT_A_BROKEN_PS -+-unset PS_PERSONALITY -+-unset CMD_ENV -+-unset PS_FORMAT -+- -+-export LANG=C -+-export LC_ALL=C -+-export TZ=GMT -+- -+-TESTNAME=$1 -+- -+-# enlarge as needed in setup to avoid COMMAND becoming COMMA, etc. -+-export COLUMNS=111 -+- -+-: ${LD_LIBRARY_PATH:=../proc} -+-: ${TESTME:=../ps/ps} -+-export LD_LIBRARY_PATH -+-export DYLD_LIBRARY_PATH=$LD_LIBRARY_PATH # if ever a darwin port -+- -+- -+- -+-. $TESTNAME/setup -+-$TESTME $ARGS > stdout 2> stderr -+-RESULT=$? -+-if [ x$KILLFN == x1 ] ; then -+- killfn -+-fi -+- -+- -+- -+-if [ x$RESULT != x$GOOD ] ; then -+- echo FAIL $TESTNAME err-$RESULT -+- exit 1 -+-fi -+- -+-rm -f stderr.test ; touch stderr.test -+-if [ -f stderr ] ; then -+- head -3 < stderr > stderr.test -+-fi -+-rm -f stderr.good ; touch stderr.good -+-if [ -f $TESTNAME/stderr ] ; then -+- head -3 < $TESTNAME/stderr > stderr.good -+-fi -+-diff -Naurd stderr.test stderr.good >> /dev/null -+-if [ x$? != x0 ] ; then -+- echo FAIL $TESTNAME wrong-stderr -+- exit 1 -+-fi -+- -+-if [ -f $TESTNAME/header ] ; then -+- (printf ' ' ; head -1 stdout) | tr -s ' ' > header -+- diff -Naurd header $TESTNAME/header >> /dev/null -+- if [ x$? != x0 ] ; then -+- echo FAIL $TESTNAME wrong-header -+- exit 1 -+- fi -+-fi -+- -+-if [ x$EVALFN == x1 ] ; then -+- evalfn -+- if [ x$? != x0 ] ; then -+- echo FAIL $TESTNAME eval-fn -+- exit 1 -+- fi -+-fi -+- -+-echo pass $TESTNAME a-ok -+-exit 0 -+diff -ruN procps-3.1.15.old/test/ps/LT-mix/header procps-3.1.15/test/ps/LT-mix/header -+--- procps-3.1.15.old/test/ps/LT-mix/header 2003-10-02 12:38:29.000000000 +1000 -++++ procps-3.1.15/test/ps/LT-mix/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- -+\ No newline at end of file -+diff -ruN procps-3.1.15.old/test/ps/LT-mix/setup procps-3.1.15/test/ps/LT-mix/setup -+--- procps-3.1.15.old/test/ps/LT-mix/setup 2003-10-02 12:39:40.000000000 +1000 -++++ procps-3.1.15/test/ps/LT-mix/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,2 +0,0 @@ -+-ARGS="-L -T" -+-GOOD=1 -+diff -ruN procps-3.1.15.old/test/ps/LT-mix/stderr procps-3.1.15/test/ps/LT-mix/stderr -+--- procps-3.1.15.old/test/ps/LT-mix/stderr 2003-10-02 12:40:03.000000000 +1000 -++++ procps-3.1.15/test/ps/LT-mix/stderr 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,23 +0,0 @@ -+-ERROR: Thread flags conflict; can't use both -L and -T. -+-********* simple selection ********* ********* selection by list ********* -+--A all processes -C by command name -+--N negate selection -G by real group ID (supports names) -+--a all w/ tty except session leaders -U by real user ID (supports names) -+--d all except session leaders -g by session leader OR by group name -+--e all processes -p by process ID -+-T all processes on this terminal -s processes in the sessions given -+-a all w/ tty, including other users -t by tty -+-g all, even group leaders! -u by effective user ID (supports names) -+-r only running processes U processes for specified users -+-x processes w/o controlling ttys t by tty -+-*********** output format ********** *********** long options *********** -+--o,o user-defined -f full --Group --User --pid --cols --ppid -+--j,j job control s signal --group --user --sid --rows -+--O,O preloaded -o v virtual memory --cumulative --format --deselect -+--l,l long u user-oriented --sort --tty --forest --version -+--F extra full X registers --heading --no-heading -+- ********* misc options ********* -+--V,V show version L list format codes f ASCII art forest -+--m,m show threads S children in sum -y change -l format -+--n,N set namelist file c true command name n numeric WCHAN,UID -+--w,w wide output e show environment -H process hierarchy -+diff -ruN procps-3.1.15.old/test/ps/O-O/header procps-3.1.15/test/ps/O-O/header -+--- procps-3.1.15.old/test/ps/O-O/header 2003-10-02 12:01:36.000000000 +1000 -++++ procps-3.1.15/test/ps/O-O/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- -+\ No newline at end of file -+diff -ruN procps-3.1.15.old/test/ps/O-O/setup procps-3.1.15/test/ps/O-O/setup -+--- procps-3.1.15.old/test/ps/O-O/setup 2003-10-02 12:02:01.000000000 +1000 -++++ procps-3.1.15/test/ps/O-O/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,2 +0,0 @@ -+-ARGS="-O wchan -O sess" -+-GOOD=1 -+diff -ruN procps-3.1.15.old/test/ps/O-O/stderr procps-3.1.15/test/ps/O-O/stderr -+--- procps-3.1.15.old/test/ps/O-O/stderr 2003-10-02 12:05:19.000000000 +1000 -++++ procps-3.1.15/test/ps/O-O/stderr 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,23 +0,0 @@ -+-ERROR: option -O can not follow other format options. -+-********* simple selection ********* ********* selection by list ********* -+--A all processes -C by command name -+--N negate selection -G by real group ID (supports names) -+--a all w/ tty except session leaders -U by real user ID (supports names) -+--d all except session leaders -g by session leader OR by group name -+--e all processes -p by process ID -+-T all processes on this terminal -s processes in the sessions given -+-a all w/ tty, including other users -t by tty -+-g all, even group leaders! -u by effective user ID (supports names) -+-r only running processes U processes for specified users -+-x processes w/o controlling ttys t by tty -+-*********** output format ********** *********** long options *********** -+--o,o user-defined -f full --Group --User --pid --cols --ppid -+--j,j job control s signal --group --user --sid --rows -+--O,O preloaded -o v virtual memory --cumulative --format --deselect -+--l,l long u user-oriented --sort --tty --forest --version -+--F extra full X registers --heading --no-heading -+- ********* misc options ********* -+--V,V show version L list format codes f ASCII art forest -+--m,m show threads S children in sum -y change -l format -+--n,N set namelist file c true command name n numeric WCHAN,UID -+--w,w wide output e show environment -H process hierarchy -+diff -ruN procps-3.1.15.old/test/ps/O-o/header procps-3.1.15/test/ps/O-o/header -+--- procps-3.1.15.old/test/ps/O-o/header 2003-10-02 12:06:18.000000000 +1000 -++++ procps-3.1.15/test/ps/O-o/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- PID WCHAN S TTY TIME COMMAND SESS -+diff -ruN procps-3.1.15.old/test/ps/O-o/setup procps-3.1.15/test/ps/O-o/setup -+--- procps-3.1.15.old/test/ps/O-o/setup 2003-10-02 12:05:41.000000000 +1000 -++++ procps-3.1.15/test/ps/O-o/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,2 +0,0 @@ -+-ARGS="-O wchan -o sess" -+-GOOD=0 -+diff -ruN procps-3.1.15.old/test/ps/aix-pcpu-header/header procps-3.1.15/test/ps/aix-pcpu-header/header -+--- procps-3.1.15.old/test/ps/aix-pcpu-header/header 2003-09-03 07:26:05.000000000 +1000 -++++ procps-3.1.15/test/ps/aix-pcpu-header/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- %CPU -+diff -ruN procps-3.1.15.old/test/ps/aix-pcpu-header/setup procps-3.1.15/test/ps/aix-pcpu-header/setup -+--- procps-3.1.15.old/test/ps/aix-pcpu-header/setup 2003-09-03 07:24:28.000000000 +1000 -++++ procps-3.1.15/test/ps/aix-pcpu-header/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,2 +0,0 @@ -+-ARGS="-o %cpu" -+-GOOD=0 -+diff -ruN procps-3.1.15.old/test/ps/aix-pcpu-header2/header procps-3.1.15/test/ps/aix-pcpu-header2/header -+--- procps-3.1.15.old/test/ps/aix-pcpu-header2/header 2003-09-03 07:26:30.000000000 +1000 -++++ procps-3.1.15/test/ps/aix-pcpu-header2/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- COMMAND px -+diff -ruN procps-3.1.15.old/test/ps/aix-pcpu-header2/setup procps-3.1.15/test/ps/aix-pcpu-header2/setup -+--- procps-3.1.15.old/test/ps/aix-pcpu-header2/setup 2003-09-03 07:25:22.000000000 +1000 -++++ procps-3.1.15/test/ps/aix-pcpu-header2/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,2 +0,0 @@ -+-ARGS="-o %cpx" -+-GOOD=0 -+diff -ruN procps-3.1.15.old/test/ps/bad-format-env/header procps-3.1.15/test/ps/bad-format-env/header -+--- procps-3.1.15.old/test/ps/bad-format-env/header 2003-10-02 12:16:37.000000000 +1000 -++++ procps-3.1.15/test/ps/bad-format-env/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- PID TTY TIME CMD -+diff -ruN procps-3.1.15.old/test/ps/bad-format-env/setup procps-3.1.15/test/ps/bad-format-env/setup -+--- procps-3.1.15.old/test/ps/bad-format-env/setup 2003-10-02 12:16:22.000000000 +1000 -++++ procps-3.1.15/test/ps/bad-format-env/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,3 +0,0 @@ -+-ARGS= -+-GOOD=0 -+-export PS_FORMAT=booger -+diff -ruN procps-3.1.15.old/test/ps/bad-format-env/stderr procps-3.1.15/test/ps/bad-format-env/stderr -+--- procps-3.1.15.old/test/ps/bad-format-env/stderr 2003-10-02 12:16:13.000000000 +1000 -++++ procps-3.1.15/test/ps/bad-format-env/stderr 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+-Warning: $PS_FORMAT ignored. (Unknown user-defined format specifier "booger".) -+diff -ruN procps-3.1.15.old/test/ps/bogus-n-header/header procps-3.1.15/test/ps/bogus-n-header/header -+--- procps-3.1.15.old/test/ps/bogus-n-header/header 2003-09-02 09:37:07.000000000 +1000 -++++ procps-3.1.15/test/ps/bogus-n-header/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- PID TTY STAT TIME COMMAND -+diff -ruN procps-3.1.15.old/test/ps/bogus-n-header/setup procps-3.1.15/test/ps/bogus-n-header/setup -+--- procps-3.1.15.old/test/ps/bogus-n-header/setup 2003-09-02 09:34:40.000000000 +1000 -++++ procps-3.1.15/test/ps/bogus-n-header/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,2 +0,0 @@ -+-ARGS="-n" -+-GOOD=0 -+diff -ruN procps-3.1.15.old/test/ps/bogus-n-header/stderr procps-3.1.15/test/ps/bogus-n-header/stderr -+--- procps-3.1.15.old/test/ps/bogus-n-header/stderr 2003-09-02 09:35:37.000000000 +1000 -++++ procps-3.1.15/test/ps/bogus-n-header/stderr 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+-Warning: bad syntax, perhaps a bogus '-'? See http://procps.sf.net/faq.html -+diff -ruN procps-3.1.15.old/test/ps/bsd-T/header procps-3.1.15/test/ps/bsd-T/header -+--- procps-3.1.15.old/test/ps/bsd-T/header 2003-09-02 11:54:41.000000000 +1000 -++++ procps-3.1.15/test/ps/bsd-T/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- PID TTY STAT TIME COMMAND -+diff -ruN procps-3.1.15.old/test/ps/bsd-T/setup procps-3.1.15/test/ps/bsd-T/setup -+--- procps-3.1.15.old/test/ps/bsd-T/setup 2003-09-02 11:53:24.000000000 +1000 -++++ procps-3.1.15/test/ps/bsd-T/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,11 +0,0 @@ -+-ARGS=T -+-GOOD=0 -+-EVALFN=1 -+- -+-# default output is restricted to this tty -+-MYTTY=`tty` -+- -+-evalfn () { -+- PSTTY=`awk '!/TTY/{print $2}' < stdout | uniq` -+- [ /dev/$PSTTY == $MYTTY ] -+-} -+diff -ruN procps-3.1.15.old/test/ps/bsd-j-header/header procps-3.1.15/test/ps/bsd-j-header/header -+--- procps-3.1.15.old/test/ps/bsd-j-header/header 2003-09-02 22:33:49.000000000 +1000 -++++ procps-3.1.15/test/ps/bsd-j-header/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- PPID PID PGID SID TTY TPGID STAT UID TIME COMMAND -+diff -ruN procps-3.1.15.old/test/ps/bsd-j-header/setup procps-3.1.15/test/ps/bsd-j-header/setup -+--- procps-3.1.15.old/test/ps/bsd-j-header/setup 2003-09-02 22:32:53.000000000 +1000 -++++ procps-3.1.15/test/ps/bsd-j-header/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,2 +0,0 @@ -+-ARGS="j" -+-GOOD=0 -+diff -ruN procps-3.1.15.old/test/ps/bsd-j-header2/header procps-3.1.15/test/ps/bsd-j-header2/header -+--- procps-3.1.15.old/test/ps/bsd-j-header2/header 2003-09-02 23:16:25.000000000 +1000 -++++ procps-3.1.15/test/ps/bsd-j-header2/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- USER PID PPID PGID SESS JOBC STAT TT TIME COMMAND -+diff -ruN procps-3.1.15.old/test/ps/bsd-j-header2/setup procps-3.1.15/test/ps/bsd-j-header2/setup -+--- procps-3.1.15.old/test/ps/bsd-j-header2/setup 2003-09-02 23:15:16.000000000 +1000 -++++ procps-3.1.15/test/ps/bsd-j-header2/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,3 +0,0 @@ -+-export CMD_ENV=bsd -+-ARGS="-j" -+-GOOD=0 -+diff -ruN procps-3.1.15.old/test/ps/bsd-l-header/header procps-3.1.15/test/ps/bsd-l-header/header -+--- procps-3.1.15.old/test/ps/bsd-l-header/header 2003-09-02 22:54:09.000000000 +1000 -++++ procps-3.1.15/test/ps/bsd-l-header/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- F UID PID PPID PRI NI VSZ RSS WCHAN STAT TTY TIME COMMAND -+diff -ruN procps-3.1.15.old/test/ps/bsd-l-header/setup procps-3.1.15/test/ps/bsd-l-header/setup -+--- procps-3.1.15.old/test/ps/bsd-l-header/setup 2003-09-02 22:53:45.000000000 +1000 -++++ procps-3.1.15/test/ps/bsd-l-header/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,2 +0,0 @@ -+-ARGS="l" -+-GOOD=0 -+diff -ruN procps-3.1.15.old/test/ps/bsd-l-header2/header procps-3.1.15/test/ps/bsd-l-header2/header -+--- procps-3.1.15.old/test/ps/bsd-l-header2/header 2003-09-03 07:26:56.000000000 +1000 -++++ procps-3.1.15/test/ps/bsd-l-header2/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- UID PID PPID CPU PRI NI VSZ RSS WCHAN STAT TT TIME COMMAND -+diff -ruN procps-3.1.15.old/test/ps/bsd-l-header2/setup procps-3.1.15/test/ps/bsd-l-header2/setup -+--- procps-3.1.15.old/test/ps/bsd-l-header2/setup 2003-09-03 07:21:19.000000000 +1000 -++++ procps-3.1.15/test/ps/bsd-l-header2/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,3 +0,0 @@ -+-export CMD_ENV=bsd -+-ARGS="-l" -+-GOOD=0 -+diff -ruN procps-3.1.15.old/test/ps/bsd-s-header/header procps-3.1.15/test/ps/bsd-s-header/header -+--- procps-3.1.15.old/test/ps/bsd-s-header/header 2003-09-02 22:55:32.000000000 +1000 -++++ procps-3.1.15/test/ps/bsd-s-header/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- UID PID PENDING BLOCKED IGNORED CAUGHT STAT TTY TIME COMMAND -+diff -ruN procps-3.1.15.old/test/ps/bsd-s-header/setup procps-3.1.15/test/ps/bsd-s-header/setup -+--- procps-3.1.15.old/test/ps/bsd-s-header/setup 2003-09-02 22:55:06.000000000 +1000 -++++ procps-3.1.15/test/ps/bsd-s-header/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,2 +0,0 @@ -+-ARGS="s" -+-GOOD=0 -+diff -ruN procps-3.1.15.old/test/ps/bsd-s-header2/header procps-3.1.15/test/ps/bsd-s-header2/header -+--- procps-3.1.15.old/test/ps/bsd-s-header2/header 2003-09-03 07:21:33.000000000 +1000 -++++ procps-3.1.15/test/ps/bsd-s-header2/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- UID PID PENDING BLOCKED IGNORED CAUGHT STAT TTY TIME COMMAND -+diff -ruN procps-3.1.15.old/test/ps/bsd-s-header2/setup procps-3.1.15/test/ps/bsd-s-header2/setup -+--- procps-3.1.15.old/test/ps/bsd-s-header2/setup 2003-09-03 07:21:40.000000000 +1000 -++++ procps-3.1.15/test/ps/bsd-s-header2/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,3 +0,0 @@ -+-export CMD_ENV=bsd -+-ARGS="-s" -+-GOOD=0 -+diff -ruN procps-3.1.15.old/test/ps/bsd-selection/header procps-3.1.15/test/ps/bsd-selection/header -+--- procps-3.1.15.old/test/ps/bsd-selection/header 2003-09-04 16:04:27.000000000 +1000 -++++ procps-3.1.15/test/ps/bsd-selection/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- PID TTY STAT TIME COMMAND -+diff -ruN procps-3.1.15.old/test/ps/bsd-selection/setup procps-3.1.15/test/ps/bsd-selection/setup -+--- procps-3.1.15.old/test/ps/bsd-selection/setup 2003-09-13 13:47:22.000000000 +1000 -++++ procps-3.1.15/test/ps/bsd-selection/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,25 +0,0 @@ -+-ARGS="m" -+-GOOD=0 -+-EVALFN=1 -+-KILLFN=1 -+- -+-rm -f misc.tmp ready.tmp typescript.tmp -+- -+-./got-no-tty -+-# this'll do but... WHERE ARE THE MAN PAGES FOR PTY STUFF??? -+-(SHELL=`pwd`/script-child script typescript.tmp &>/dev/null) & -+-while [ ! -f ready.tmp ] ; do sleep 0.01 ; done -+-. ready.tmp -+- -+-evalfn () { -+- THIS_TTY=`tty | colrm 1 5` -+- lines2=`awk '{print $2}' < stdout | sort -u | egrep "^($SHELL_TTY|$THIS_TTY)$" | wc -l` -+- lines3=`awk '{print $2}' < stdout | sort -u | egrep "^($SHELL_TTY|$THIS_TTY|\?)$" | wc -l` -+- [ $lines2 == 2 ] && [ $lines3 == 2 ] -+-} -+- -+-killfn () { -+- killall -9 got-no-tty -+- kill -9 $SHELL_PID # the others should freely die -+- rm -f misc.tmp ready.tmp typescript.tmp -+-} -+diff -ruN procps-3.1.15.old/test/ps/bsd-t-1/header procps-3.1.15/test/ps/bsd-t-1/header -+--- procps-3.1.15.old/test/ps/bsd-t-1/header 2003-09-02 11:55:23.000000000 +1000 -++++ procps-3.1.15/test/ps/bsd-t-1/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- PID TTY STAT TIME COMMAND -+diff -ruN procps-3.1.15.old/test/ps/bsd-t-1/setup procps-3.1.15/test/ps/bsd-t-1/setup -+--- procps-3.1.15.old/test/ps/bsd-t-1/setup 2003-09-02 11:56:11.000000000 +1000 -++++ procps-3.1.15/test/ps/bsd-t-1/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,11 +0,0 @@ -+-# default output is restricted to this tty -+-MYTTY=`tty` -+- -+-ARGS=t$MYTTY -+-GOOD=0 -+-EVALFN=1 -+- -+-evalfn () { -+- PSTTY=`awk '!/TTY/{print $2}' < stdout | uniq` -+- [ /dev/$PSTTY == $MYTTY ] -+-} -+diff -ruN procps-3.1.15.old/test/ps/bsd-t-2/header procps-3.1.15/test/ps/bsd-t-2/header -+--- procps-3.1.15.old/test/ps/bsd-t-2/header 2003-09-02 11:55:26.000000000 +1000 -++++ procps-3.1.15/test/ps/bsd-t-2/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- PID TTY STAT TIME COMMAND -+diff -ruN procps-3.1.15.old/test/ps/bsd-t-2/setup procps-3.1.15/test/ps/bsd-t-2/setup -+--- procps-3.1.15.old/test/ps/bsd-t-2/setup 2003-09-02 11:56:54.000000000 +1000 -++++ procps-3.1.15/test/ps/bsd-t-2/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,12 +0,0 @@ -+-# Ancient usage: t w/o arg is current tty -+-ARGS=t -+-GOOD=0 -+-EVALFN=1 -+- -+-# default output is restricted to this tty -+-MYTTY=`tty` -+- -+-evalfn () { -+- PSTTY=`awk '!/TTY/{print $2}' < stdout | uniq` -+- [ /dev/$PSTTY == $MYTTY ] -+-} -+diff -ruN procps-3.1.15.old/test/ps/bsd-t-3/header procps-3.1.15/test/ps/bsd-t-3/header -+--- procps-3.1.15.old/test/ps/bsd-t-3/header 2003-09-02 11:55:27.000000000 +1000 -++++ procps-3.1.15/test/ps/bsd-t-3/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- PID TTY STAT TIME COMMAND -+diff -ruN procps-3.1.15.old/test/ps/bsd-t-3/setup procps-3.1.15/test/ps/bsd-t-3/setup -+--- procps-3.1.15.old/test/ps/bsd-t-3/setup 2003-09-02 12:25:44.000000000 +1000 -++++ procps-3.1.15/test/ps/bsd-t-3/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,19 +0,0 @@ -+-MYTTY=`tty` -+- -+-# two ways to interpret "ps t 42" -+-# -+-# 1. as "ps t" with "ps 42" (PID 42) -+-# 2. as "ps t42" (tty /dev/tty42) -+-# -+-# The command doesn't seem to be legal BSD syntax, but we try... -+-# We use interpretation #2, since BSD isn't known for ORing. -+-# We'll assume PID 1 is "init" and not on /dev/tty1, and that -+-# nothing on tty1 is named "init". -+- -+-ARGS="t 1" -+-GOOD=0 -+-EVALFN=1 -+- -+-evalfn () { -+- ! egrep ' init' stdout >> /dev/null -+-} -+diff -ruN procps-3.1.15.old/test/ps/bsd-t-4/header procps-3.1.15/test/ps/bsd-t-4/header -+--- procps-3.1.15.old/test/ps/bsd-t-4/header 2003-09-02 11:55:29.000000000 +1000 -++++ procps-3.1.15/test/ps/bsd-t-4/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- PID TTY STAT TIME COMMAND -+diff -ruN procps-3.1.15.old/test/ps/bsd-t-4/setup procps-3.1.15/test/ps/bsd-t-4/setup -+--- procps-3.1.15.old/test/ps/bsd-t-4/setup 2003-09-02 12:15:34.000000000 +1000 -++++ procps-3.1.15/test/ps/bsd-t-4/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,10 +0,0 @@ -+-ARGS=t- -+-GOOD=0 -+-EVALFN=1 -+- -+-# Use 'Y' to avoid shell wildcard problems. -+- -+-evalfn () { -+- PSTTY=`awk '!/TTY/{print $2}' < stdout | uniq | tr '?' 'Y'` -+- [ $PSTTY == 'Y' ] -+-} -+diff -ruN procps-3.1.15.old/test/ps/bsd-u-header/header procps-3.1.15/test/ps/bsd-u-header/header -+--- procps-3.1.15.old/test/ps/bsd-u-header/header 2003-09-02 22:57:35.000000000 +1000 -++++ procps-3.1.15/test/ps/bsd-u-header/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- USER PID %CPU %MEM VSZ RSS TTY STAT START TIME COMMAND -+diff -ruN procps-3.1.15.old/test/ps/bsd-u-header/setup procps-3.1.15/test/ps/bsd-u-header/setup -+--- procps-3.1.15.old/test/ps/bsd-u-header/setup 2003-09-02 22:57:20.000000000 +1000 -++++ procps-3.1.15/test/ps/bsd-u-header/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,2 +0,0 @@ -+-ARGS="u" -+-GOOD=0 -+diff -ruN procps-3.1.15.old/test/ps/bsd-u-header2/header procps-3.1.15/test/ps/bsd-u-header2/header -+--- procps-3.1.15.old/test/ps/bsd-u-header2/header 2003-09-03 07:27:09.000000000 +1000 -++++ procps-3.1.15/test/ps/bsd-u-header2/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- USER PID %CPU %MEM VSZ RSS TT STAT STARTED TIME COMMAND -+diff -ruN procps-3.1.15.old/test/ps/bsd-u-header2/setup procps-3.1.15/test/ps/bsd-u-header2/setup -+--- procps-3.1.15.old/test/ps/bsd-u-header2/setup 2003-09-03 07:22:00.000000000 +1000 -++++ procps-3.1.15/test/ps/bsd-u-header2/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,3 +0,0 @@ -+-export CMD_ENV=bsd -+-ARGS="-u" -+-GOOD=0 -+diff -ruN procps-3.1.15.old/test/ps/bsd-v-header/header procps-3.1.15/test/ps/bsd-v-header/header -+--- procps-3.1.15.old/test/ps/bsd-v-header/header 2003-09-02 22:56:43.000000000 +1000 -++++ procps-3.1.15/test/ps/bsd-v-header/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- PID TTY STAT TIME MAJFL TRS DRS RSS %MEM COMMAND -+diff -ruN procps-3.1.15.old/test/ps/bsd-v-header/setup procps-3.1.15/test/ps/bsd-v-header/setup -+--- procps-3.1.15.old/test/ps/bsd-v-header/setup 2003-09-02 22:56:10.000000000 +1000 -++++ procps-3.1.15/test/ps/bsd-v-header/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,2 +0,0 @@ -+-ARGS="v" -+-GOOD=0 -+diff -ruN procps-3.1.15.old/test/ps/bsd-v-header2/header procps-3.1.15/test/ps/bsd-v-header2/header -+--- procps-3.1.15.old/test/ps/bsd-v-header2/header 2003-09-03 07:27:16.000000000 +1000 -++++ procps-3.1.15/test/ps/bsd-v-header2/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- PID STAT TIME SL RE PAGEIN VSZ RSS LIM TSIZ %CPU %MEM COMMAND -+diff -ruN procps-3.1.15.old/test/ps/bsd-v-header2/setup procps-3.1.15/test/ps/bsd-v-header2/setup -+--- procps-3.1.15.old/test/ps/bsd-v-header2/setup 2003-09-03 07:22:17.000000000 +1000 -++++ procps-3.1.15/test/ps/bsd-v-header2/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,3 +0,0 @@ -+-export CMD_ENV=bsd -+-ARGS="-v" -+-GOOD=0 -+diff -ruN procps-3.1.15.old/test/ps/dynix-F-header/header procps-3.1.15/test/ps/dynix-F-header/header -+--- procps-3.1.15.old/test/ps/dynix-F-header/header 2003-09-02 22:31:23.000000000 +1000 -++++ procps-3.1.15/test/ps/dynix-F-header/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- UID PID PPID C SZ RSS PSR STIME TTY TIME CMD -+diff -ruN procps-3.1.15.old/test/ps/dynix-F-header/setup procps-3.1.15/test/ps/dynix-F-header/setup -+--- procps-3.1.15.old/test/ps/dynix-F-header/setup 2003-09-02 22:30:43.000000000 +1000 -++++ procps-3.1.15/test/ps/dynix-F-header/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,2 +0,0 @@ -+-ARGS="-F" -+-GOOD=0 -+diff -ruN procps-3.1.15.old/test/ps/fail-aix-Q/header procps-3.1.15/test/ps/fail-aix-Q/header -+--- procps-3.1.15.old/test/ps/fail-aix-Q/header 2003-10-02 11:31:34.000000000 +1000 -++++ procps-3.1.15/test/ps/fail-aix-Q/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- -+\ No newline at end of file -+diff -ruN procps-3.1.15.old/test/ps/fail-aix-Q/setup procps-3.1.15/test/ps/fail-aix-Q/setup -+--- procps-3.1.15.old/test/ps/fail-aix-Q/setup 2003-10-02 11:32:11.000000000 +1000 -++++ procps-3.1.15/test/ps/fail-aix-Q/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,2 +0,0 @@ -+-ARGS="-o %Q" -+-GOOD=1 -+diff -ruN procps-3.1.15.old/test/ps/fail-aix-Q/stderr procps-3.1.15/test/ps/fail-aix-Q/stderr -+--- procps-3.1.15.old/test/ps/fail-aix-Q/stderr 2003-10-02 11:33:07.000000000 +1000 -++++ procps-3.1.15/test/ps/fail-aix-Q/stderr 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,23 +0,0 @@ -+-ERROR: Unknown AIX field descriptor. -+-********* simple selection ********* ********* selection by list ********* -+--A all processes -C by command name -+--N negate selection -G by real group ID (supports names) -+--a all w/ tty except session leaders -U by real user ID (supports names) -+--d all except session leaders -g by session leader OR by group name -+--e all processes -p by process ID -+-T all processes on this terminal -s processes in the sessions given -+-a all w/ tty, including other users -t by tty -+-g all, even group leaders! -u by effective user ID (supports names) -+-r only running processes U processes for specified users -+-x processes w/o controlling ttys t by tty -+-*********** output format ********** *********** long options *********** -+--o,o user-defined -f full --Group --User --pid --cols --ppid -+--j,j job control s signal --group --user --sid --rows -+--O,O preloaded -o v virtual memory --cumulative --format --deselect -+--l,l long u user-oriented --sort --tty --forest --version -+--F extra full X registers --heading --no-heading -+- ********* misc options ********* -+--V,V show version L list format codes f ASCII art forest -+--m,m show threads S children in sum -y change -l format -+--n,N set namelist file c true command name n numeric WCHAN,UID -+--w,w wide output e show environment -H process hierarchy -+diff -ruN procps-3.1.15.old/test/ps/fail-aix-improper/header procps-3.1.15/test/ps/fail-aix-improper/header -+--- procps-3.1.15.old/test/ps/fail-aix-improper/header 2003-10-02 11:34:09.000000000 +1000 -++++ procps-3.1.15/test/ps/fail-aix-improper/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- -+\ No newline at end of file -+diff -ruN procps-3.1.15.old/test/ps/fail-aix-improper/setup procps-3.1.15/test/ps/fail-aix-improper/setup -+--- procps-3.1.15.old/test/ps/fail-aix-improper/setup 2003-10-02 11:34:22.000000000 +1000 -++++ procps-3.1.15/test/ps/fail-aix-improper/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,2 +0,0 @@ -+-ARGS="-o %" -+-GOOD=1 -+diff -ruN procps-3.1.15.old/test/ps/fail-aix-improper/stderr procps-3.1.15/test/ps/fail-aix-improper/stderr -+--- procps-3.1.15.old/test/ps/fail-aix-improper/stderr 2003-10-02 11:34:40.000000000 +1000 -++++ procps-3.1.15/test/ps/fail-aix-improper/stderr 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,23 +0,0 @@ -+-ERROR: Improper AIX field descriptor. -+-********* simple selection ********* ********* selection by list ********* -+--A all processes -C by command name -+--N negate selection -G by real group ID (supports names) -+--a all w/ tty except session leaders -U by real user ID (supports names) -+--d all except session leaders -g by session leader OR by group name -+--e all processes -p by process ID -+-T all processes on this terminal -s processes in the sessions given -+-a all w/ tty, including other users -t by tty -+-g all, even group leaders! -u by effective user ID (supports names) -+-r only running processes U processes for specified users -+-x processes w/o controlling ttys t by tty -+-*********** output format ********** *********** long options *********** -+--o,o user-defined -f full --Group --User --pid --cols --ppid -+--j,j job control s signal --group --user --sid --rows -+--O,O preloaded -o v virtual memory --cumulative --format --deselect -+--l,l long u user-oriented --sort --tty --forest --version -+--F extra full X registers --heading --no-heading -+- ********* misc options ********* -+--V,V show version L list format codes f ASCII art forest -+--m,m show threads S children in sum -y change -l format -+--n,N set namelist file c true command name n numeric WCHAN,UID -+--w,w wide output e show environment -H process hierarchy -+diff -ruN procps-3.1.15.old/test/ps/fail-improper-sort/header procps-3.1.15/test/ps/fail-improper-sort/header -+--- procps-3.1.15.old/test/ps/fail-improper-sort/header 2003-10-02 11:47:57.000000000 +1000 -++++ procps-3.1.15/test/ps/fail-improper-sort/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- -+\ No newline at end of file -+diff -ruN procps-3.1.15.old/test/ps/fail-improper-sort/setup procps-3.1.15/test/ps/fail-improper-sort/setup -+--- procps-3.1.15.old/test/ps/fail-improper-sort/setup 2003-10-02 11:48:15.000000000 +1000 -++++ procps-3.1.15/test/ps/fail-improper-sort/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,2 +0,0 @@ -+-ARGS="--sort ,," -+-GOOD=1 -+diff -ruN procps-3.1.15.old/test/ps/fail-improper-sort/stderr procps-3.1.15/test/ps/fail-improper-sort/stderr -+--- procps-3.1.15.old/test/ps/fail-improper-sort/stderr 2003-10-02 12:22:31.000000000 +1000 -++++ procps-3.1.15/test/ps/fail-improper-sort/stderr 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,23 +0,0 @@ -+-ERROR: Improper sort list -+-********* simple selection ********* ********* selection by list ********* -+--A all processes -C by command name -+--N negate selection -G by real group ID (supports names) -+--a all w/ tty except session leaders -U by real user ID (supports names) -+--d all except session leaders -g by session leader OR by group name -+--e all processes -p by process ID -+-T all processes on this terminal -s processes in the sessions given -+-a all w/ tty, including other users -t by tty -+-g all, even group leaders! -u by effective user ID (supports names) -+-r only running processes U processes for specified users -+-x processes w/o controlling ttys t by tty -+-*********** output format ********** *********** long options *********** -+--o,o user-defined -f full --Group --User --pid --cols --ppid -+--j,j job control s signal --group --user --sid --rows -+--O,O preloaded -o v virtual memory --cumulative --format --deselect -+--l,l long u user-oriented --sort --tty --forest --version -+--F extra full X registers --heading --no-heading -+- ********* misc options ********* -+--V,V show version L list format codes f ASCII art forest -+--m,m show threads S children in sum -y change -l format -+--n,N set namelist file c true command name n numeric WCHAN,UID -+--w,w wide output e show environment -H process hierarchy -+diff -ruN procps-3.1.15.old/test/ps/fail-improper-spec/header procps-3.1.15/test/ps/fail-improper-spec/header -+--- procps-3.1.15.old/test/ps/fail-improper-spec/header 2003-10-02 11:37:17.000000000 +1000 -++++ procps-3.1.15/test/ps/fail-improper-spec/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- -+\ No newline at end of file -+diff -ruN procps-3.1.15.old/test/ps/fail-improper-spec/setup procps-3.1.15/test/ps/fail-improper-spec/setup -+--- procps-3.1.15.old/test/ps/fail-improper-spec/setup 2003-10-02 11:37:34.000000000 +1000 -++++ procps-3.1.15/test/ps/fail-improper-spec/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,2 +0,0 @@ -+-ARGS="-o ," -+-GOOD=1 -+diff -ruN procps-3.1.15.old/test/ps/fail-improper-spec/stderr procps-3.1.15/test/ps/fail-improper-spec/stderr -+--- procps-3.1.15.old/test/ps/fail-improper-spec/stderr 2003-10-02 11:37:52.000000000 +1000 -++++ procps-3.1.15/test/ps/fail-improper-spec/stderr 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,23 +0,0 @@ -+-ERROR: Improper format list. -+-********* simple selection ********* ********* selection by list ********* -+--A all processes -C by command name -+--N negate selection -G by real group ID (supports names) -+--a all w/ tty except session leaders -U by real user ID (supports names) -+--d all except session leaders -g by session leader OR by group name -+--e all processes -p by process ID -+-T all processes on this terminal -s processes in the sessions given -+-a all w/ tty, including other users -t by tty -+-g all, even group leaders! -u by effective user ID (supports names) -+-r only running processes U processes for specified users -+-x processes w/o controlling ttys t by tty -+-*********** output format ********** *********** long options *********** -+--o,o user-defined -f full --Group --User --pid --cols --ppid -+--j,j job control s signal --group --user --sid --rows -+--O,O preloaded -o v virtual memory --cumulative --format --deselect -+--l,l long u user-oriented --sort --tty --forest --version -+--F extra full X registers --heading --no-heading -+- ********* misc options ********* -+--V,V show version L list format codes f ASCII art forest -+--m,m show threads S children in sum -y change -l format -+--n,N set namelist file c true command name n numeric WCHAN,UID -+--w,w wide output e show environment -H process hierarchy -+diff -ruN procps-3.1.15.old/test/ps/fail-macro-width/header procps-3.1.15/test/ps/fail-macro-width/header -+--- procps-3.1.15.old/test/ps/fail-macro-width/header 2003-10-02 11:42:15.000000000 +1000 -++++ procps-3.1.15/test/ps/fail-macro-width/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- -+\ No newline at end of file -+diff -ruN procps-3.1.15.old/test/ps/fail-macro-width/setup procps-3.1.15/test/ps/fail-macro-width/setup -+--- procps-3.1.15.old/test/ps/fail-macro-width/setup 2003-10-02 11:42:30.000000000 +1000 -++++ procps-3.1.15/test/ps/fail-macro-width/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,2 +0,0 @@ -+-ARGS="-o DefBSD:6" -+-GOOD=1 -+diff -ruN procps-3.1.15.old/test/ps/fail-macro-width/stderr procps-3.1.15/test/ps/fail-macro-width/stderr -+--- procps-3.1.15.old/test/ps/fail-macro-width/stderr 2003-10-02 11:42:46.000000000 +1000 -++++ procps-3.1.15/test/ps/fail-macro-width/stderr 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,23 +0,0 @@ -+-ERROR: Can't set width for a macro (multi-column) format specifier. -+-********* simple selection ********* ********* selection by list ********* -+--A all processes -C by command name -+--N negate selection -G by real group ID (supports names) -+--a all w/ tty except session leaders -U by real user ID (supports names) -+--d all except session leaders -g by session leader OR by group name -+--e all processes -p by process ID -+-T all processes on this terminal -s processes in the sessions given -+-a all w/ tty, including other users -t by tty -+-g all, even group leaders! -u by effective user ID (supports names) -+-r only running processes U processes for specified users -+-x processes w/o controlling ttys t by tty -+-*********** output format ********** *********** long options *********** -+--o,o user-defined -f full --Group --User --pid --cols --ppid -+--j,j job control s signal --group --user --sid --rows -+--O,O preloaded -o v virtual memory --cumulative --format --deselect -+--l,l long u user-oriented --sort --tty --forest --version -+--F extra full X registers --heading --no-heading -+- ********* misc options ********* -+--V,V show version L list format codes f ASCII art forest -+--m,m show threads S children in sum -y change -l format -+--n,N set namelist file c true command name n numeric WCHAN,UID -+--w,w wide output e show environment -H process hierarchy -+diff -ruN procps-3.1.15.old/test/ps/fail-no-sort-key/header procps-3.1.15/test/ps/fail-no-sort-key/header -+--- procps-3.1.15.old/test/ps/fail-no-sort-key/header 2003-10-02 11:50:26.000000000 +1000 -++++ procps-3.1.15/test/ps/fail-no-sort-key/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- -+\ No newline at end of file -+diff -ruN procps-3.1.15.old/test/ps/fail-no-sort-key/setup procps-3.1.15/test/ps/fail-no-sort-key/setup -+--- procps-3.1.15.old/test/ps/fail-no-sort-key/setup 2003-10-02 11:50:39.000000000 +1000 -++++ procps-3.1.15/test/ps/fail-no-sort-key/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,2 +0,0 @@ -+-ARGS="--sort" -+-GOOD=1 -+diff -ruN procps-3.1.15.old/test/ps/fail-no-sort-key/stderr procps-3.1.15/test/ps/fail-no-sort-key/stderr -+--- procps-3.1.15.old/test/ps/fail-no-sort-key/stderr 2003-10-02 11:51:05.000000000 +1000 -++++ procps-3.1.15/test/ps/fail-no-sort-key/stderr 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,23 +0,0 @@ -+-ERROR: Long sort specification must follow --sort. -+-********* simple selection ********* ********* selection by list ********* -+--A all processes -C by command name -+--N negate selection -G by real group ID (supports names) -+--a all w/ tty except session leaders -U by real user ID (supports names) -+--d all except session leaders -g by session leader OR by group name -+--e all processes -p by process ID -+-T all processes on this terminal -s processes in the sessions given -+-a all w/ tty, including other users -t by tty -+-g all, even group leaders! -u by effective user ID (supports names) -+-r only running processes U processes for specified users -+-x processes w/o controlling ttys t by tty -+-*********** output format ********** *********** long options *********** -+--o,o user-defined -f full --Group --User --pid --cols --ppid -+--j,j job control s signal --group --user --sid --rows -+--O,O preloaded -o v virtual memory --cumulative --format --deselect -+--l,l long u user-oriented --sort --tty --forest --version -+--F extra full X registers --heading --no-heading -+- ********* misc options ********* -+--V,V show version L list format codes f ASCII art forest -+--m,m show threads S children in sum -y change -l format -+--n,N set namelist file c true command name n numeric WCHAN,UID -+--w,w wide output e show environment -H process hierarchy -+diff -ruN procps-3.1.15.old/test/ps/fail-no-width/header procps-3.1.15/test/ps/fail-no-width/header -+--- procps-3.1.15.old/test/ps/fail-no-width/header 2003-10-02 11:40:56.000000000 +1000 -++++ procps-3.1.15/test/ps/fail-no-width/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- -+\ No newline at end of file -+diff -ruN procps-3.1.15.old/test/ps/fail-no-width/setup procps-3.1.15/test/ps/fail-no-width/setup -+--- procps-3.1.15.old/test/ps/fail-no-width/setup 2003-10-02 11:41:22.000000000 +1000 -++++ procps-3.1.15/test/ps/fail-no-width/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,2 +0,0 @@ -+-ARGS="-o pid:,f,comm" -+-GOOD=1 -+diff -ruN procps-3.1.15.old/test/ps/fail-no-width/stderr procps-3.1.15/test/ps/fail-no-width/stderr -+--- procps-3.1.15.old/test/ps/fail-no-width/stderr 2003-10-02 11:40:56.000000000 +1000 -++++ procps-3.1.15/test/ps/fail-no-width/stderr 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,23 +0,0 @@ -+-ERROR: Column widths must be unsigned decimal numbers. -+-********* simple selection ********* ********* selection by list ********* -+--A all processes -C by command name -+--N negate selection -G by real group ID (supports names) -+--a all w/ tty except session leaders -U by real user ID (supports names) -+--d all except session leaders -g by session leader OR by group name -+--e all processes -p by process ID -+-T all processes on this terminal -s processes in the sessions given -+-a all w/ tty, including other users -t by tty -+-g all, even group leaders! -u by effective user ID (supports names) -+-r only running processes U processes for specified users -+-x processes w/o controlling ttys t by tty -+-*********** output format ********** *********** long options *********** -+--o,o user-defined -f full --Group --User --pid --cols --ppid -+--j,j job control s signal --group --user --sid --rows -+--O,O preloaded -o v virtual memory --cumulative --format --deselect -+--l,l long u user-oriented --sort --tty --forest --version -+--F extra full X registers --heading --no-heading -+- ********* misc options ********* -+--V,V show version L list format codes f ASCII art forest -+--m,m show threads S children in sum -y change -l format -+--n,N set namelist file c true command name n numeric WCHAN,UID -+--w,w wide output e show environment -H process hierarchy -+diff -ruN procps-3.1.15.old/test/ps/fail-nondecimal/header procps-3.1.15/test/ps/fail-nondecimal/header -+--- procps-3.1.15.old/test/ps/fail-nondecimal/header 2003-10-02 11:39:38.000000000 +1000 -++++ procps-3.1.15/test/ps/fail-nondecimal/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- -+\ No newline at end of file -+diff -ruN procps-3.1.15.old/test/ps/fail-nondecimal/setup procps-3.1.15/test/ps/fail-nondecimal/setup -+--- procps-3.1.15.old/test/ps/fail-nondecimal/setup 2003-10-02 11:40:07.000000000 +1000 -++++ procps-3.1.15/test/ps/fail-nondecimal/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,2 +0,0 @@ -+-ARGS="-o pid:f,comm" -+-GOOD=1 -+diff -ruN procps-3.1.15.old/test/ps/fail-nondecimal/stderr procps-3.1.15/test/ps/fail-nondecimal/stderr -+--- procps-3.1.15.old/test/ps/fail-nondecimal/stderr 2003-10-02 11:40:30.000000000 +1000 -++++ procps-3.1.15/test/ps/fail-nondecimal/stderr 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,23 +0,0 @@ -+-ERROR: Column widths must be unsigned decimal numbers. -+-********* simple selection ********* ********* selection by list ********* -+--A all processes -C by command name -+--N negate selection -G by real group ID (supports names) -+--a all w/ tty except session leaders -U by real user ID (supports names) -+--d all except session leaders -g by session leader OR by group name -+--e all processes -p by process ID -+-T all processes on this terminal -s processes in the sessions given -+-a all w/ tty, including other users -t by tty -+-g all, even group leaders! -u by effective user ID (supports names) -+-r only running processes U processes for specified users -+-x processes w/o controlling ttys t by tty -+-*********** output format ********** *********** long options *********** -+--o,o user-defined -f full --Group --User --pid --cols --ppid -+--j,j job control s signal --group --user --sid --rows -+--O,O preloaded -o v virtual memory --cumulative --format --deselect -+--l,l long u user-oriented --sort --tty --forest --version -+--F extra full X registers --heading --no-heading -+- ********* misc options ********* -+--V,V show version L list format codes f ASCII art forest -+--m,m show threads S children in sum -y change -l format -+--n,N set namelist file c true command name n numeric WCHAN,UID -+--w,w wide output e show environment -H process hierarchy -+diff -ruN procps-3.1.15.old/test/ps/fail-oj/header procps-3.1.15/test/ps/fail-oj/header -+--- procps-3.1.15.old/test/ps/fail-oj/header 2003-09-02 13:47:18.000000000 +1000 -++++ procps-3.1.15/test/ps/fail-oj/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- -+\ No newline at end of file -+diff -ruN procps-3.1.15.old/test/ps/fail-oj/setup procps-3.1.15/test/ps/fail-oj/setup -+--- procps-3.1.15.old/test/ps/fail-oj/setup 2003-09-02 13:47:54.000000000 +1000 -++++ procps-3.1.15/test/ps/fail-oj/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,2 +0,0 @@ -+-ARGS="-o pid -j" -+-GOOD=1 -+diff -ruN procps-3.1.15.old/test/ps/fail-oj/stderr procps-3.1.15/test/ps/fail-oj/stderr -+--- procps-3.1.15.old/test/ps/fail-oj/stderr 2003-09-02 13:49:02.000000000 +1000 -++++ procps-3.1.15/test/ps/fail-oj/stderr 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,23 +0,0 @@ -+-ERROR: Can't use output modifiers with user-defined output -+-********* simple selection ********* ********* selection by list ********* -+--A all processes -C by command name -+--N negate selection -G by real group ID (supports names) -+--a all w/ tty except session leaders -U by real user ID (supports names) -+--d all except session leaders -g by session leader OR by group name -+--e all processes -p by process ID -+-T all processes on this terminal -s processes in the sessions given -+-a all w/ tty, including other users -t by tty -+-g all, even group leaders! -u by effective user ID (supports names) -+-r only running processes U processes for specified users -+-x processes w/o controlling ttys t by tty -+-*********** output format ********** *********** long options *********** -+--o,o user-defined -f full --Group --User --pid --cols --ppid -+--j,j job control s signal --group --user --sid --rows -+--O,O preloaded -o v virtual memory --cumulative --format --deselect -+--l,l long u user-oriented --sort --tty --forest --version -+--F extra full X registers --heading --no-heading -+- ********* misc options ********* -+--V,V show version L list format codes f ASCII art forest -+--m,m show threads S children in sum -y change -l format -+--n,N set namelist file c true command name n numeric WCHAN,UID -+--w,w wide output e show environment -H process hierarchy -+diff -ruN procps-3.1.15.old/test/ps/fail-unknown-sort/header procps-3.1.15/test/ps/fail-unknown-sort/header -+--- procps-3.1.15.old/test/ps/fail-unknown-sort/header 2003-10-02 11:49:27.000000000 +1000 -++++ procps-3.1.15/test/ps/fail-unknown-sort/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- -+\ No newline at end of file -+diff -ruN procps-3.1.15.old/test/ps/fail-unknown-sort/setup procps-3.1.15/test/ps/fail-unknown-sort/setup -+--- procps-3.1.15.old/test/ps/fail-unknown-sort/setup 2003-10-02 11:49:41.000000000 +1000 -++++ procps-3.1.15/test/ps/fail-unknown-sort/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,2 +0,0 @@ -+-ARGS="--sort booger" -+-GOOD=1 -+diff -ruN procps-3.1.15.old/test/ps/fail-unknown-sort/stderr procps-3.1.15/test/ps/fail-unknown-sort/stderr -+--- procps-3.1.15.old/test/ps/fail-unknown-sort/stderr 2003-10-02 11:50:09.000000000 +1000 -++++ procps-3.1.15/test/ps/fail-unknown-sort/stderr 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,23 +0,0 @@ -+-ERROR: Unknown sort specifier. -+-********* simple selection ********* ********* selection by list ********* -+--A all processes -C by command name -+--N negate selection -G by real group ID (supports names) -+--a all w/ tty except session leaders -U by real user ID (supports names) -+--d all except session leaders -g by session leader OR by group name -+--e all processes -p by process ID -+-T all processes on this terminal -s processes in the sessions given -+-a all w/ tty, including other users -t by tty -+-g all, even group leaders! -u by effective user ID (supports names) -+-r only running processes U processes for specified users -+-x processes w/o controlling ttys t by tty -+-*********** output format ********** *********** long options *********** -+--o,o user-defined -f full --Group --User --pid --cols --ppid -+--j,j job control s signal --group --user --sid --rows -+--O,O preloaded -o v virtual memory --cumulative --format --deselect -+--l,l long u user-oriented --sort --tty --forest --version -+--F extra full X registers --heading --no-heading -+- ********* misc options ********* -+--V,V show version L list format codes f ASCII art forest -+--m,m show threads S children in sum -y change -l format -+--n,N set namelist file c true command name n numeric WCHAN,UID -+--w,w wide output e show environment -H process hierarchy -+diff -ruN procps-3.1.15.old/test/ps/fail-unknown-spec/header procps-3.1.15/test/ps/fail-unknown-spec/header -+--- procps-3.1.15.old/test/ps/fail-unknown-spec/header 2003-10-02 11:35:33.000000000 +1000 -++++ procps-3.1.15/test/ps/fail-unknown-spec/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- -+\ No newline at end of file -+diff -ruN procps-3.1.15.old/test/ps/fail-unknown-spec/setup procps-3.1.15/test/ps/fail-unknown-spec/setup -+--- procps-3.1.15.old/test/ps/fail-unknown-spec/setup 2003-10-02 11:35:52.000000000 +1000 -++++ procps-3.1.15/test/ps/fail-unknown-spec/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,2 +0,0 @@ -+-ARGS="-o boogers" -+-GOOD=1 -+diff -ruN procps-3.1.15.old/test/ps/fail-unknown-spec/stderr procps-3.1.15/test/ps/fail-unknown-spec/stderr -+--- procps-3.1.15.old/test/ps/fail-unknown-spec/stderr 2003-10-02 11:36:05.000000000 +1000 -++++ procps-3.1.15/test/ps/fail-unknown-spec/stderr 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,23 +0,0 @@ -+-ERROR: Unknown user-defined format specifier "boogers". -+-********* simple selection ********* ********* selection by list ********* -+--A all processes -C by command name -+--N negate selection -G by real group ID (supports names) -+--a all w/ tty except session leaders -U by real user ID (supports names) -+--d all except session leaders -g by session leader OR by group name -+--e all processes -p by process ID -+-T all processes on this terminal -s processes in the sessions given -+-a all w/ tty, including other users -t by tty -+-g all, even group leaders! -u by effective user ID (supports names) -+-r only running processes U processes for specified users -+-x processes w/o controlling ttys t by tty -+-*********** output format ********** *********** long options *********** -+--o,o user-defined -f full --Group --User --pid --cols --ppid -+--j,j job control s signal --group --user --sid --rows -+--O,O preloaded -o v virtual memory --cumulative --format --deselect -+--l,l long u user-oriented --sort --tty --forest --version -+--F extra full X registers --heading --no-heading -+- ********* misc options ********* -+--V,V show version L list format codes f ASCII art forest -+--m,m show threads S children in sum -y change -l format -+--n,N set namelist file c true command name n numeric WCHAN,UID -+--w,w wide output e show environment -H process hierarchy -+diff -ruN procps-3.1.15.old/test/ps/fail-xx/header procps-3.1.15/test/ps/fail-xx/header -+--- procps-3.1.15.old/test/ps/fail-xx/header 2003-09-02 09:43:13.000000000 +1000 -++++ procps-3.1.15/test/ps/fail-xx/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- -+\ No newline at end of file -+diff -ruN procps-3.1.15.old/test/ps/fail-xx/setup procps-3.1.15/test/ps/fail-xx/setup -+--- procps-3.1.15.old/test/ps/fail-xx/setup 2003-09-02 09:41:38.000000000 +1000 -++++ procps-3.1.15/test/ps/fail-xx/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,2 +0,0 @@ -+-ARGS="x -x" -+-GOOD=1 -+diff -ruN procps-3.1.15.old/test/ps/fail-xx/stderr procps-3.1.15/test/ps/fail-xx/stderr -+--- procps-3.1.15.old/test/ps/fail-xx/stderr 2003-09-02 09:42:04.000000000 +1000 -++++ procps-3.1.15/test/ps/fail-xx/stderr 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,23 +0,0 @@ -+-ERROR: Unsupported SysV option. -+-********* simple selection ********* ********* selection by list ********* -+--A all processes -C by command name -+--N negate selection -G by real group ID (supports names) -+--a all w/ tty except session leaders -U by real user ID (supports names) -+--d all except session leaders -g by session leader OR by group name -+--e all processes -p by process ID -+-T all processes on this terminal -s processes in the sessions given -+-a all w/ tty, including other users -t by tty -+-g all, even group leaders! -u by effective user ID (supports names) -+-r only running processes U processes for specified users -+-x processes w/o controlling ttys t by tty -+-*********** output format ********** *********** long options *********** -+--o,o user-defined -f full --Group --User --pid --cols --ppid -+--j,j job control s signal --group --user --sid --rows -+--O,O preloaded -o v virtual memory --cumulative --format --deselect -+--l,l long u user-oriented --sort --tty --forest --version -+--F extra full X registers --heading --no-heading -+- ********* misc options ********* -+--V,V show version L list format codes f ASCII art forest -+--m,m show threads S children in sum -y change -l format -+--n,N set namelist file c true command name n numeric WCHAN,UID -+--w,w wide output e show environment -H process hierarchy -+diff -ruN procps-3.1.15.old/test/ps/hpux-H-simple/setup procps-3.1.15/test/ps/hpux-H-simple/setup -+--- procps-3.1.15.old/test/ps/hpux-H-simple/setup 2003-09-03 10:15:28.000000000 +1000 -++++ procps-3.1.15/test/ps/hpux-H-simple/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,14 +0,0 @@ -+-ARGS="-HC fork-you -o comm=" -+-GOOD=0 -+-EVALFN=1 -+-KILLFN=1 -+- -+-./fork-you 3 4 5 6 7 8 9 -+- -+-evalfn () { -+- diff -Naurd stdout $TESTNAME/stdout >> /dev/null -+-} -+- -+-killfn () { -+- killall -9 fork-you -+-} -+diff -ruN procps-3.1.15.old/test/ps/hpux-H-simple/stdout procps-3.1.15/test/ps/hpux-H-simple/stdout -+--- procps-3.1.15.old/test/ps/hpux-H-simple/stdout 2003-09-03 09:51:00.000000000 +1000 -++++ procps-3.1.15/test/ps/hpux-H-simple/stdout 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,9 +0,0 @@ -+-fork-you -+- fork-you -+- fork-you -+- fork-you -+- fork-you -+- fork-you -+- fork-you -+- fork-you -+- fork-you -+diff -ruN procps-3.1.15.old/test/ps/jyclf-header/header procps-3.1.15/test/ps/jyclf-header/header -+--- procps-3.1.15.old/test/ps/jyclf-header/header 2003-09-02 13:57:34.000000000 +1000 -++++ procps-3.1.15/test/ps/jyclf-header/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- S UID PID PPID PGID SID CLS PRI RSS SZ WCHAN STIME TTY TIME CMD -+diff -ruN procps-3.1.15.old/test/ps/jyclf-header/setup procps-3.1.15/test/ps/jyclf-header/setup -+--- procps-3.1.15.old/test/ps/jyclf-header/setup 2003-09-02 13:55:34.000000000 +1000 -++++ procps-3.1.15/test/ps/jyclf-header/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,2 +0,0 @@ -+-ARGS="-jyclf" -+-GOOD=0 -+diff -ruN procps-3.1.15.old/test/ps/linux-lf-header/header procps-3.1.15/test/ps/linux-lf-header/header -+--- procps-3.1.15.old/test/ps/linux-lf-header/header 2003-09-02 14:03:14.000000000 +1000 -++++ procps-3.1.15/test/ps/linux-lf-header/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- F S USER PID PPID C PRI NI P SZ WCHAN STIME TTY TIME CMD -+diff -ruN procps-3.1.15.old/test/ps/linux-lf-header/setup procps-3.1.15/test/ps/linux-lf-header/setup -+--- procps-3.1.15.old/test/ps/linux-lf-header/setup 2003-09-02 14:04:14.000000000 +1000 -++++ procps-3.1.15/test/ps/linux-lf-header/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,3 +0,0 @@ -+-export CMD_ENV=linux -+-ARGS="-lf" -+-GOOD=0 -+diff -ruN procps-3.1.15.old/test/ps/mH-mix/header procps-3.1.15/test/ps/mH-mix/header -+--- procps-3.1.15.old/test/ps/mH-mix/header 2003-10-02 12:38:52.000000000 +1000 -++++ procps-3.1.15/test/ps/mH-mix/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- -+\ No newline at end of file -+diff -ruN procps-3.1.15.old/test/ps/mH-mix/setup procps-3.1.15/test/ps/mH-mix/setup -+--- procps-3.1.15.old/test/ps/mH-mix/setup 2003-10-02 12:39:25.000000000 +1000 -++++ procps-3.1.15/test/ps/mH-mix/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,2 +0,0 @@ -+-ARGS="mH" -+-GOOD=1 -+diff -ruN procps-3.1.15.old/test/ps/mH-mix/stderr procps-3.1.15/test/ps/mH-mix/stderr -+--- procps-3.1.15.old/test/ps/mH-mix/stderr 2003-10-02 12:40:18.000000000 +1000 -++++ procps-3.1.15/test/ps/mH-mix/stderr 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,23 +0,0 @@ -+-ERROR: Thread flags conflict; can't use H with m or -m. -+-********* simple selection ********* ********* selection by list ********* -+--A all processes -C by command name -+--N negate selection -G by real group ID (supports names) -+--a all w/ tty except session leaders -U by real user ID (supports names) -+--d all except session leaders -g by session leader OR by group name -+--e all processes -p by process ID -+-T all processes on this terminal -s processes in the sessions given -+-a all w/ tty, including other users -t by tty -+-g all, even group leaders! -u by effective user ID (supports names) -+-r only running processes U processes for specified users -+-x processes w/o controlling ttys t by tty -+-*********** output format ********** *********** long options *********** -+--o,o user-defined -f full --Group --User --pid --cols --ppid -+--j,j job control s signal --group --user --sid --rows -+--O,O preloaded -o v virtual memory --cumulative --format --deselect -+--l,l long u user-oriented --sort --tty --forest --version -+--F extra full X registers --heading --no-heading -+- ********* misc options ********* -+--V,V show version L list format codes f ASCII art forest -+--m,m show threads S children in sum -y change -l format -+--n,N set namelist file c true command name n numeric WCHAN,UID -+--w,w wide output e show environment -H process hierarchy -+diff -ruN procps-3.1.15.old/test/ps/mH-mix2/header procps-3.1.15/test/ps/mH-mix2/header -+--- procps-3.1.15.old/test/ps/mH-mix2/header 2003-10-02 12:38:58.000000000 +1000 -++++ procps-3.1.15/test/ps/mH-mix2/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- -+\ No newline at end of file -+diff -ruN procps-3.1.15.old/test/ps/mH-mix2/setup procps-3.1.15/test/ps/mH-mix2/setup -+--- procps-3.1.15.old/test/ps/mH-mix2/setup 2003-10-02 12:39:15.000000000 +1000 -++++ procps-3.1.15/test/ps/mH-mix2/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,2 +0,0 @@ -+-ARGS="-m H" -+-GOOD=1 -+diff -ruN procps-3.1.15.old/test/ps/mH-mix2/stderr procps-3.1.15/test/ps/mH-mix2/stderr -+--- procps-3.1.15.old/test/ps/mH-mix2/stderr 2003-10-02 12:40:20.000000000 +1000 -++++ procps-3.1.15/test/ps/mH-mix2/stderr 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,23 +0,0 @@ -+-ERROR: Thread flags conflict; can't use H with m or -m. -+-********* simple selection ********* ********* selection by list ********* -+--A all processes -C by command name -+--N negate selection -G by real group ID (supports names) -+--a all w/ tty except session leaders -U by real user ID (supports names) -+--d all except session leaders -g by session leader OR by group name -+--e all processes -p by process ID -+-T all processes on this terminal -s processes in the sessions given -+-a all w/ tty, including other users -t by tty -+-g all, even group leaders! -u by effective user ID (supports names) -+-r only running processes U processes for specified users -+-x processes w/o controlling ttys t by tty -+-*********** output format ********** *********** long options *********** -+--o,o user-defined -f full --Group --User --pid --cols --ppid -+--j,j job control s signal --group --user --sid --rows -+--O,O preloaded -o v virtual memory --cumulative --format --deselect -+--l,l long u user-oriented --sort --tty --forest --version -+--F extra full X registers --heading --no-heading -+- ********* misc options ********* -+--V,V show version L list format codes f ASCII art forest -+--m,m show threads S children in sum -y change -l format -+--n,N set namelist file c true command name n numeric WCHAN,UID -+--w,w wide output e show environment -H process hierarchy -+diff -ruN procps-3.1.15.old/test/ps/mm-mix/header procps-3.1.15/test/ps/mm-mix/header -+--- procps-3.1.15.old/test/ps/mm-mix/header 2003-10-02 12:37:41.000000000 +1000 -++++ procps-3.1.15/test/ps/mm-mix/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- -+\ No newline at end of file -+diff -ruN procps-3.1.15.old/test/ps/mm-mix/setup procps-3.1.15/test/ps/mm-mix/setup -+--- procps-3.1.15.old/test/ps/mm-mix/setup 2003-10-02 12:37:57.000000000 +1000 -++++ procps-3.1.15/test/ps/mm-mix/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,2 +0,0 @@ -+-ARGS="-m m" -+-GOOD=1 -+diff -ruN procps-3.1.15.old/test/ps/mm-mix/stderr procps-3.1.15/test/ps/mm-mix/stderr -+--- procps-3.1.15.old/test/ps/mm-mix/stderr 2003-10-02 12:38:11.000000000 +1000 -++++ procps-3.1.15/test/ps/mm-mix/stderr 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,23 +0,0 @@ -+-ERROR: Thread flags conflict; can't use both m and -m. -+-********* simple selection ********* ********* selection by list ********* -+--A all processes -C by command name -+--N negate selection -G by real group ID (supports names) -+--a all w/ tty except session leaders -U by real user ID (supports names) -+--d all except session leaders -g by session leader OR by group name -+--e all processes -p by process ID -+-T all processes on this terminal -s processes in the sessions given -+-a all w/ tty, including other users -t by tty -+-g all, even group leaders! -u by effective user ID (supports names) -+-r only running processes U processes for specified users -+-x processes w/o controlling ttys t by tty -+-*********** output format ********** *********** long options *********** -+--o,o user-defined -f full --Group --User --pid --cols --ppid -+--j,j job control s signal --group --user --sid --rows -+--O,O preloaded -o v virtual memory --cumulative --format --deselect -+--l,l long u user-oriented --sort --tty --forest --version -+--F extra full X registers --heading --no-heading -+- ********* misc options ********* -+--V,V show version L list format codes f ASCII art forest -+--m,m show threads S children in sum -y change -l format -+--n,N set namelist file c true command name n numeric WCHAN,UID -+--w,w wide output e show environment -H process hierarchy -+diff -ruN procps-3.1.15.old/test/ps/multi-sort/header procps-3.1.15/test/ps/multi-sort/header -+--- procps-3.1.15.old/test/ps/multi-sort/header 2003-10-02 12:08:50.000000000 +1000 -++++ procps-3.1.15/test/ps/multi-sort/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- -+\ No newline at end of file -+diff -ruN procps-3.1.15.old/test/ps/multi-sort/setup procps-3.1.15/test/ps/multi-sort/setup -+--- procps-3.1.15.old/test/ps/multi-sort/setup 2003-10-02 12:09:10.000000000 +1000 -++++ procps-3.1.15/test/ps/multi-sort/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,2 +0,0 @@ -+-ARGS="--sort wchan --sort sess" -+-GOOD=1 -+diff -ruN procps-3.1.15.old/test/ps/multi-sort/stderr procps-3.1.15/test/ps/multi-sort/stderr -+--- procps-3.1.15.old/test/ps/multi-sort/stderr 2003-10-02 12:09:23.000000000 +1000 -++++ procps-3.1.15/test/ps/multi-sort/stderr 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,23 +0,0 @@ -+-ERROR: Multiple sort options. -+-********* simple selection ********* ********* selection by list ********* -+--A all processes -C by command name -+--N negate selection -G by real group ID (supports names) -+--a all w/ tty except session leaders -U by real user ID (supports names) -+--d all except session leaders -g by session leader OR by group name -+--e all processes -p by process ID -+-T all processes on this terminal -s processes in the sessions given -+-a all w/ tty, including other users -t by tty -+-g all, even group leaders! -u by effective user ID (supports names) -+-r only running processes U processes for specified users -+-x processes w/o controlling ttys t by tty -+-*********** output format ********** *********** long options *********** -+--o,o user-defined -f full --Group --User --pid --cols --ppid -+--j,j job control s signal --group --user --sid --rows -+--O,O preloaded -o v virtual memory --cumulative --format --deselect -+--l,l long u user-oriented --sort --tty --forest --version -+--F extra full X registers --heading --no-heading -+- ********* misc options ********* -+--V,V show version L list format codes f ASCII art forest -+--m,m show threads S children in sum -y change -l format -+--n,N set namelist file c true command name n numeric WCHAN,UID -+--w,w wide output e show environment -H process hierarchy -+diff -ruN procps-3.1.15.old/test/ps/o-O/header procps-3.1.15/test/ps/o-O/header -+--- procps-3.1.15.old/test/ps/o-O/header 2003-10-02 12:03:27.000000000 +1000 -++++ procps-3.1.15/test/ps/o-O/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- -+\ No newline at end of file -+diff -ruN procps-3.1.15.old/test/ps/o-O/setup procps-3.1.15/test/ps/o-O/setup -+--- procps-3.1.15.old/test/ps/o-O/setup 2003-10-02 12:04:40.000000000 +1000 -++++ procps-3.1.15/test/ps/o-O/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,2 +0,0 @@ -+-ARGS="-o wchan -O sess" -+-GOOD=1 -+diff -ruN procps-3.1.15.old/test/ps/o-O/stderr procps-3.1.15/test/ps/o-O/stderr -+--- procps-3.1.15.old/test/ps/o-O/stderr 2003-10-02 12:06:35.000000000 +1000 -++++ procps-3.1.15/test/ps/o-O/stderr 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,23 +0,0 @@ -+-ERROR: option -O can not follow other format options. -+-********* simple selection ********* ********* selection by list ********* -+--A all processes -C by command name -+--N negate selection -G by real group ID (supports names) -+--a all w/ tty except session leaders -U by real user ID (supports names) -+--d all except session leaders -g by session leader OR by group name -+--e all processes -p by process ID -+-T all processes on this terminal -s processes in the sessions given -+-a all w/ tty, including other users -t by tty -+-g all, even group leaders! -u by effective user ID (supports names) -+-r only running processes U processes for specified users -+-x processes w/o controlling ttys t by tty -+-*********** output format ********** *********** long options *********** -+--o,o user-defined -f full --Group --User --pid --cols --ppid -+--j,j job control s signal --group --user --sid --rows -+--O,O preloaded -o v virtual memory --cumulative --format --deselect -+--l,l long u user-oriented --sort --tty --forest --version -+--F extra full X registers --heading --no-heading -+- ********* misc options ********* -+--V,V show version L list format codes f ASCII art forest -+--m,m show threads S children in sum -y change -l format -+--n,N set namelist file c true command name n numeric WCHAN,UID -+--w,w wide output e show environment -H process hierarchy -+diff -ruN procps-3.1.15.old/test/ps/o-o/header procps-3.1.15/test/ps/o-o/header -+--- procps-3.1.15.old/test/ps/o-o/header 2003-10-02 12:07:18.000000000 +1000 -++++ procps-3.1.15/test/ps/o-o/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- WCHAN SESS -+diff -ruN procps-3.1.15.old/test/ps/o-o/setup procps-3.1.15/test/ps/o-o/setup -+--- procps-3.1.15.old/test/ps/o-o/setup 2003-10-02 12:07:08.000000000 +1000 -++++ procps-3.1.15/test/ps/o-o/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,2 +0,0 @@ -+-ARGS="-o wchan -o sess" -+-GOOD=0 -+diff -ruN procps-3.1.15.old/test/ps/old-m-1/header procps-3.1.15/test/ps/old-m-1/header -+--- procps-3.1.15.old/test/ps/old-m-1/header 2003-09-02 09:46:21.000000000 +1000 -++++ procps-3.1.15/test/ps/old-m-1/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- PID TTY MAJFLT MINFLT TRS DRS SIZE SWAP RSS SHRD LIB DT COMMAND -+diff -ruN procps-3.1.15.old/test/ps/old-m-1/setup procps-3.1.15/test/ps/old-m-1/setup -+--- procps-3.1.15.old/test/ps/old-m-1/setup 2003-09-02 09:46:06.000000000 +1000 -++++ procps-3.1.15/test/ps/old-m-1/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,3 +0,0 @@ -+-export CMD_ENV=old -+-ARGS="-m" -+-GOOD=0 -+diff -ruN procps-3.1.15.old/test/ps/old-m-2/header procps-3.1.15/test/ps/old-m-2/header -+--- procps-3.1.15.old/test/ps/old-m-2/header 2003-09-02 09:47:13.000000000 +1000 -++++ procps-3.1.15/test/ps/old-m-2/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- PID TTY MAJFLT MINFLT TRS DRS SIZE SWAP RSS SHRD LIB DT COMMAND -+diff -ruN procps-3.1.15.old/test/ps/old-m-2/setup procps-3.1.15/test/ps/old-m-2/setup -+--- procps-3.1.15.old/test/ps/old-m-2/setup 2003-09-02 09:47:47.000000000 +1000 -++++ procps-3.1.15/test/ps/old-m-2/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,4 +0,0 @@ -+-export CMD_ENV=unix -+-export PS_PERSONALITY=old -+-ARGS="-m" -+-GOOD=0 -+diff -ruN procps-3.1.15.old/test/ps/old-m-3/header procps-3.1.15/test/ps/old-m-3/header -+--- procps-3.1.15.old/test/ps/old-m-3/header 2003-09-02 09:47:15.000000000 +1000 -++++ procps-3.1.15/test/ps/old-m-3/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- PID TTY MAJFLT MINFLT TRS DRS SIZE SWAP RSS SHRD LIB DT COMMAND -+diff -ruN procps-3.1.15.old/test/ps/old-m-3/setup procps-3.1.15/test/ps/old-m-3/setup -+--- procps-3.1.15.old/test/ps/old-m-3/setup 2003-09-02 09:47:58.000000000 +1000 -++++ procps-3.1.15/test/ps/old-m-3/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,3 +0,0 @@ -+-export CMD_ENV=old -+-ARGS="m" -+-GOOD=0 -+diff -ruN procps-3.1.15.old/test/ps/old-m-4/header procps-3.1.15/test/ps/old-m-4/header -+--- procps-3.1.15.old/test/ps/old-m-4/header 2003-09-02 09:47:16.000000000 +1000 -++++ procps-3.1.15/test/ps/old-m-4/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- PID TTY MAJFLT MINFLT TRS DRS SIZE SWAP RSS SHRD LIB DT COMMAND -+diff -ruN procps-3.1.15.old/test/ps/old-m-4/setup procps-3.1.15/test/ps/old-m-4/setup -+--- procps-3.1.15.old/test/ps/old-m-4/setup 2003-09-02 09:50:11.000000000 +1000 -++++ procps-3.1.15/test/ps/old-m-4/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,3 +0,0 @@ -+-export I_WANT_A_BROKEN_PS= -+-ARGS="-m" -+-GOOD=0 -+diff -ruN procps-3.1.15.old/test/ps/pcpu-sort-threaded/setup procps-3.1.15/test/ps/pcpu-sort-threaded/setup -+--- procps-3.1.15.old/test/ps/pcpu-sort-threaded/setup 2003-10-19 13:48:43.000000000 +1000 -++++ procps-3.1.15/test/ps/pcpu-sort-threaded/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,8 +0,0 @@ -+-ARGS="-e --sort=pcpu -o cp=" -+-GOOD=0 -+-EVALFN=1 -+- -+-evalfn () { -+- sort -n < stdout > sorted.tmp -+- diff -Naurd stdout sorted.tmp >> /dev/null -+-} -+diff -ruN procps-3.1.15.old/test/ps/suv-conflicts/header procps-3.1.15/test/ps/suv-conflicts/header -+--- procps-3.1.15.old/test/ps/suv-conflicts/header 2003-10-02 12:12:30.000000000 +1000 -++++ procps-3.1.15/test/ps/suv-conflicts/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- -+\ No newline at end of file -+diff -ruN procps-3.1.15.old/test/ps/suv-conflicts/setup procps-3.1.15/test/ps/suv-conflicts/setup -+--- procps-3.1.15.old/test/ps/suv-conflicts/setup 2003-10-02 12:13:26.000000000 +1000 -++++ procps-3.1.15/test/ps/suv-conflicts/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,2 +0,0 @@ -+-ARGS="suv" -+-GOOD=1 -+diff -ruN procps-3.1.15.old/test/ps/suv-conflicts/stderr procps-3.1.15/test/ps/suv-conflicts/stderr -+--- procps-3.1.15.old/test/ps/suv-conflicts/stderr 2003-10-02 12:13:41.000000000 +1000 -++++ procps-3.1.15/test/ps/suv-conflicts/stderr 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,23 +0,0 @@ -+-ERROR: Conflicting format options. -+-********* simple selection ********* ********* selection by list ********* -+--A all processes -C by command name -+--N negate selection -G by real group ID (supports names) -+--a all w/ tty except session leaders -U by real user ID (supports names) -+--d all except session leaders -g by session leader OR by group name -+--e all processes -p by process ID -+-T all processes on this terminal -s processes in the sessions given -+-a all w/ tty, including other users -t by tty -+-g all, even group leaders! -u by effective user ID (supports names) -+-r only running processes U processes for specified users -+-x processes w/o controlling ttys t by tty -+-*********** output format ********** *********** long options *********** -+--o,o user-defined -f full --Group --User --pid --cols --ppid -+--j,j job control s signal --group --user --sid --rows -+--O,O preloaded -o v virtual memory --cumulative --format --deselect -+--l,l long u user-oriented --sort --tty --forest --version -+--F extra full X registers --heading --no-heading -+- ********* misc options ********* -+--V,V show version L list format codes f ASCII art forest -+--m,m show threads S children in sum -y change -l format -+--n,N set namelist file c true command name n numeric WCHAN,UID -+--w,w wide output e show environment -H process hierarchy -+diff -ruN procps-3.1.15.old/test/ps/sysv-selection/header procps-3.1.15/test/ps/sysv-selection/header -+--- procps-3.1.15.old/test/ps/sysv-selection/header 2003-09-04 16:13:34.000000000 +1000 -++++ procps-3.1.15/test/ps/sysv-selection/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- PID TTY TIME CMD -+diff -ruN procps-3.1.15.old/test/ps/sysv-selection/setup procps-3.1.15/test/ps/sysv-selection/setup -+--- procps-3.1.15.old/test/ps/sysv-selection/setup 2003-09-13 13:59:04.000000000 +1000 -++++ procps-3.1.15/test/ps/sysv-selection/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,25 +0,0 @@ -+-ARGS="-m" -+-GOOD=0 -+-EVALFN=1 -+-KILLFN=1 -+- -+-rm -f misc.tmp ready.tmp typescript.tmp -+- -+-./got-no-tty -+-# this'll do but... WHERE ARE THE MAN PAGES FOR PTY STUFF??? -+-(SHELL=`pwd`/script-child script typescript.tmp &>/dev/null) & -+-while [ ! -f ready.tmp ] ; do sleep 0.01 ; done -+-. ready.tmp -+- -+-evalfn () { -+- THIS_TTY=`tty | colrm 1 5` -+- lines1=`awk '{print $2}' < stdout | sort -u | egrep "^($THIS_TTY)$" | wc -l` -+- lines3=`awk '{print $2}' < stdout | sort -u | egrep "^($SHELL_TTY|$THIS_TTY|\?)$" | wc -l` -+- [ $lines1 == 1 ] && [ $lines3 == 1 ] -+-} -+- -+-killfn () { -+- killall -9 got-no-tty -+- kill -9 $SHELL_PID # the others should freely die -+- rm -f misc.tmp ready.tmp typescript.tmp -+-} -+diff -ruN procps-3.1.15.old/test/ps/thread-nosort-H/header procps-3.1.15/test/ps/thread-nosort-H/header -+--- procps-3.1.15.old/test/ps/thread-nosort-H/header 2003-10-20 10:57:52.000000000 +1000 -++++ procps-3.1.15/test/ps/thread-nosort-H/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- PID TTY STAT TIME COMMAND -+diff -ruN procps-3.1.15.old/test/ps/thread-nosort-H/setup procps-3.1.15/test/ps/thread-nosort-H/setup -+--- procps-3.1.15.old/test/ps/thread-nosort-H/setup 2003-10-20 10:50:16.000000000 +1000 -++++ procps-3.1.15/test/ps/thread-nosort-H/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,14 +0,0 @@ -+-ARGS="-C clone-once H" -+-GOOD=0 -+-EVALFN=1 -+-KILLFN=1 -+- -+-./clone-once -+- -+-evalfn () { -+- [ `wc -l < stdout` == 3 ] -+-} -+- -+-killfn () { -+- killall -9 clone-once -+-} -+diff -ruN procps-3.1.15.old/test/ps/thread-nosort-HL/header procps-3.1.15/test/ps/thread-nosort-HL/header -+--- procps-3.1.15.old/test/ps/thread-nosort-HL/header 2003-10-20 10:57:52.000000000 +1000 -++++ procps-3.1.15/test/ps/thread-nosort-HL/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- PID LWP TTY STAT TIME COMMAND -+diff -ruN procps-3.1.15.old/test/ps/thread-nosort-HL/setup procps-3.1.15/test/ps/thread-nosort-HL/setup -+--- procps-3.1.15.old/test/ps/thread-nosort-HL/setup 2003-10-20 10:50:16.000000000 +1000 -++++ procps-3.1.15/test/ps/thread-nosort-HL/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,14 +0,0 @@ -+-ARGS="-C clone-once H -L" -+-GOOD=0 -+-EVALFN=1 -+-KILLFN=1 -+- -+-./clone-once -+- -+-evalfn () { -+- [ `wc -l < stdout` == 3 ] -+-} -+- -+-killfn () { -+- killall -9 clone-once -+-} -+diff -ruN procps-3.1.15.old/test/ps/thread-nosort-Hm/setup procps-3.1.15/test/ps/thread-nosort-Hm/setup -+--- procps-3.1.15.old/test/ps/thread-nosort-Hm/setup 2003-10-20 10:50:16.000000000 +1000 -++++ procps-3.1.15/test/ps/thread-nosort-Hm/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,2 +0,0 @@ -+-ARGS="-C clone-once Hm" -+-GOOD=1 -+diff -ruN procps-3.1.15.old/test/ps/thread-nosort-Hm/stderr procps-3.1.15/test/ps/thread-nosort-Hm/stderr -+--- procps-3.1.15.old/test/ps/thread-nosort-Hm/stderr 2003-10-20 10:58:35.000000000 +1000 -++++ procps-3.1.15/test/ps/thread-nosort-Hm/stderr 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,23 +0,0 @@ -+-ERROR: Thread flags conflict; can't use H with m or -m. -+-********* simple selection ********* ********* selection by list ********* -+--A all processes -C by command name -+--N negate selection -G by real group ID (supports names) -+--a all w/ tty except session leaders -U by real user ID (supports names) -+--d all except session leaders -g by session leader OR by group name -+--e all processes -p by process ID -+-T all processes on this terminal -s processes in the sessions given -+-a all w/ tty, including other users -t by tty -+-g all, even group leaders! -u by effective user ID (supports names) -+-r only running processes U processes for specified users -+-x processes w/o controlling ttys t by tty -+-*********** output format ********** *********** long options *********** -+--o,o user-defined -f full --Group --User --pid --cols --ppid -+--j,j job control s signal --group --user --sid --rows -+--O,O preloaded -o v virtual memory --cumulative --format --deselect -+--l,l long u user-oriented --sort --tty --forest --version -+--F extra full X registers --heading --no-heading -+- ********* misc options ********* -+--V,V show version L list format codes f ASCII art forest -+--m,m show threads S children in sum -y change -l format -+--n,N set namelist file c true command name n numeric WCHAN,UID -+--w,w wide output e show environment -H process hierarchy -+diff -ruN procps-3.1.15.old/test/ps/thread-nosort-L/header procps-3.1.15/test/ps/thread-nosort-L/header -+--- procps-3.1.15.old/test/ps/thread-nosort-L/header 2003-10-20 10:57:52.000000000 +1000 -++++ procps-3.1.15/test/ps/thread-nosort-L/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- PID LWP TTY TIME CMD -+diff -ruN procps-3.1.15.old/test/ps/thread-nosort-L/setup procps-3.1.15/test/ps/thread-nosort-L/setup -+--- procps-3.1.15.old/test/ps/thread-nosort-L/setup 2003-10-20 10:50:16.000000000 +1000 -++++ procps-3.1.15/test/ps/thread-nosort-L/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,14 +0,0 @@ -+-ARGS="-C clone-once -L" -+-GOOD=0 -+-EVALFN=1 -+-KILLFN=1 -+- -+-./clone-once -+- -+-evalfn () { -+- [ `wc -l < stdout` == 3 ] -+-} -+- -+-killfn () { -+- killall -9 clone-once -+-} -+diff -ruN procps-3.1.15.old/test/ps/thread-nosort-default/header procps-3.1.15/test/ps/thread-nosort-default/header -+--- procps-3.1.15.old/test/ps/thread-nosort-default/header 2003-10-20 10:57:53.000000000 +1000 -++++ procps-3.1.15/test/ps/thread-nosort-default/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- PID TTY TIME CMD -+diff -ruN procps-3.1.15.old/test/ps/thread-nosort-default/setup procps-3.1.15/test/ps/thread-nosort-default/setup -+--- procps-3.1.15.old/test/ps/thread-nosort-default/setup 2003-10-20 10:50:16.000000000 +1000 -++++ procps-3.1.15/test/ps/thread-nosort-default/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,14 +0,0 @@ -+-ARGS="-C clone-once" -+-GOOD=0 -+-EVALFN=1 -+-KILLFN=1 -+- -+-./clone-once -+- -+-evalfn () { -+- [ `wc -l < stdout` == 2 ] -+-} -+- -+-killfn () { -+- killall -9 clone-once -+-} -+diff -ruN procps-3.1.15.old/test/ps/thread-nosort-m/header procps-3.1.15/test/ps/thread-nosort-m/header -+--- procps-3.1.15.old/test/ps/thread-nosort-m/header 2003-10-20 10:57:53.000000000 +1000 -++++ procps-3.1.15/test/ps/thread-nosort-m/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- PID TTY STAT TIME COMMAND -+diff -ruN procps-3.1.15.old/test/ps/thread-nosort-m/setup procps-3.1.15/test/ps/thread-nosort-m/setup -+--- procps-3.1.15.old/test/ps/thread-nosort-m/setup 2003-10-20 10:50:16.000000000 +1000 -++++ procps-3.1.15/test/ps/thread-nosort-m/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,14 +0,0 @@ -+-ARGS="-C clone-once m" -+-GOOD=0 -+-EVALFN=1 -+-KILLFN=1 -+- -+-./clone-once -+- -+-evalfn () { -+- [ `wc -l < stdout` == 4 ] -+-} -+- -+-killfn () { -+- killall -9 clone-once -+-} -+diff -ruN procps-3.1.15.old/test/ps/thread-nosort-mL/header procps-3.1.15/test/ps/thread-nosort-mL/header -+--- procps-3.1.15.old/test/ps/thread-nosort-mL/header 2003-10-20 10:57:53.000000000 +1000 -++++ procps-3.1.15/test/ps/thread-nosort-mL/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- PID LWP TTY TIME CMD -+diff -ruN procps-3.1.15.old/test/ps/thread-nosort-mL/setup procps-3.1.15/test/ps/thread-nosort-mL/setup -+--- procps-3.1.15.old/test/ps/thread-nosort-mL/setup 2003-10-20 10:50:16.000000000 +1000 -++++ procps-3.1.15/test/ps/thread-nosort-mL/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,14 +0,0 @@ -+-ARGS="-C clone-once -mL" -+-GOOD=0 -+-EVALFN=1 -+-KILLFN=1 -+- -+-./clone-once -+- -+-evalfn () { -+- [ `wc -l < stdout` == 4 ] -+-} -+- -+-killfn () { -+- killall -9 clone-once -+-} -+diff -ruN procps-3.1.15.old/test/ps/thread-sorted-H/header procps-3.1.15/test/ps/thread-sorted-H/header -+--- procps-3.1.15.old/test/ps/thread-sorted-H/header 2003-10-20 10:57:53.000000000 +1000 -++++ procps-3.1.15/test/ps/thread-sorted-H/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- PID TTY STAT TIME COMMAND -+diff -ruN procps-3.1.15.old/test/ps/thread-sorted-H/setup procps-3.1.15/test/ps/thread-sorted-H/setup -+--- procps-3.1.15.old/test/ps/thread-sorted-H/setup 2003-10-20 10:45:59.000000000 +1000 -++++ procps-3.1.15/test/ps/thread-sorted-H/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,14 +0,0 @@ -+-ARGS="-C clone-once --sort=pid H" -+-GOOD=0 -+-EVALFN=1 -+-KILLFN=1 -+- -+-./clone-once -+- -+-evalfn () { -+- [ `wc -l < stdout` == 3 ] -+-} -+- -+-killfn () { -+- killall -9 clone-once -+-} -+diff -ruN procps-3.1.15.old/test/ps/thread-sorted-HL/header procps-3.1.15/test/ps/thread-sorted-HL/header -+--- procps-3.1.15.old/test/ps/thread-sorted-HL/header 2003-10-20 10:57:53.000000000 +1000 -++++ procps-3.1.15/test/ps/thread-sorted-HL/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- PID LWP TTY STAT TIME COMMAND -+diff -ruN procps-3.1.15.old/test/ps/thread-sorted-HL/setup procps-3.1.15/test/ps/thread-sorted-HL/setup -+--- procps-3.1.15.old/test/ps/thread-sorted-HL/setup 2003-10-20 10:45:16.000000000 +1000 -++++ procps-3.1.15/test/ps/thread-sorted-HL/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,14 +0,0 @@ -+-ARGS="-C clone-once --sort=pid H -L" -+-GOOD=0 -+-EVALFN=1 -+-KILLFN=1 -+- -+-./clone-once -+- -+-evalfn () { -+- [ `wc -l < stdout` == 3 ] -+-} -+- -+-killfn () { -+- killall -9 clone-once -+-} -+diff -ruN procps-3.1.15.old/test/ps/thread-sorted-Hm/setup procps-3.1.15/test/ps/thread-sorted-Hm/setup -+--- procps-3.1.15.old/test/ps/thread-sorted-Hm/setup 2003-10-20 10:47:00.000000000 +1000 -++++ procps-3.1.15/test/ps/thread-sorted-Hm/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,2 +0,0 @@ -+-ARGS="-C clone-once --sort=pid Hm" -+-GOOD=1 -+diff -ruN procps-3.1.15.old/test/ps/thread-sorted-Hm/stderr procps-3.1.15/test/ps/thread-sorted-Hm/stderr -+--- procps-3.1.15.old/test/ps/thread-sorted-Hm/stderr 2003-10-20 10:58:47.000000000 +1000 -++++ procps-3.1.15/test/ps/thread-sorted-Hm/stderr 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,23 +0,0 @@ -+-ERROR: Thread flags conflict; can't use H with m or -m. -+-********* simple selection ********* ********* selection by list ********* -+--A all processes -C by command name -+--N negate selection -G by real group ID (supports names) -+--a all w/ tty except session leaders -U by real user ID (supports names) -+--d all except session leaders -g by session leader OR by group name -+--e all processes -p by process ID -+-T all processes on this terminal -s processes in the sessions given -+-a all w/ tty, including other users -t by tty -+-g all, even group leaders! -u by effective user ID (supports names) -+-r only running processes U processes for specified users -+-x processes w/o controlling ttys t by tty -+-*********** output format ********** *********** long options *********** -+--o,o user-defined -f full --Group --User --pid --cols --ppid -+--j,j job control s signal --group --user --sid --rows -+--O,O preloaded -o v virtual memory --cumulative --format --deselect -+--l,l long u user-oriented --sort --tty --forest --version -+--F extra full X registers --heading --no-heading -+- ********* misc options ********* -+--V,V show version L list format codes f ASCII art forest -+--m,m show threads S children in sum -y change -l format -+--n,N set namelist file c true command name n numeric WCHAN,UID -+--w,w wide output e show environment -H process hierarchy -+diff -ruN procps-3.1.15.old/test/ps/thread-sorted-L/header procps-3.1.15/test/ps/thread-sorted-L/header -+--- procps-3.1.15.old/test/ps/thread-sorted-L/header 2003-10-20 10:57:53.000000000 +1000 -++++ procps-3.1.15/test/ps/thread-sorted-L/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- PID LWP TTY TIME CMD -+diff -ruN procps-3.1.15.old/test/ps/thread-sorted-L/setup procps-3.1.15/test/ps/thread-sorted-L/setup -+--- procps-3.1.15.old/test/ps/thread-sorted-L/setup 2003-10-20 10:45:35.000000000 +1000 -++++ procps-3.1.15/test/ps/thread-sorted-L/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,14 +0,0 @@ -+-ARGS="-C clone-once --sort=pid -L" -+-GOOD=0 -+-EVALFN=1 -+-KILLFN=1 -+- -+-./clone-once -+- -+-evalfn () { -+- [ `wc -l < stdout` == 3 ] -+-} -+- -+-killfn () { -+- killall -9 clone-once -+-} -+diff -ruN procps-3.1.15.old/test/ps/thread-sorted-default/header procps-3.1.15/test/ps/thread-sorted-default/header -+--- procps-3.1.15.old/test/ps/thread-sorted-default/header 2003-10-20 10:57:53.000000000 +1000 -++++ procps-3.1.15/test/ps/thread-sorted-default/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- PID TTY TIME CMD -+diff -ruN procps-3.1.15.old/test/ps/thread-sorted-default/setup procps-3.1.15/test/ps/thread-sorted-default/setup -+--- procps-3.1.15.old/test/ps/thread-sorted-default/setup 2003-10-20 10:47:53.000000000 +1000 -++++ procps-3.1.15/test/ps/thread-sorted-default/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,14 +0,0 @@ -+-ARGS="-C clone-once --sort=pid" -+-GOOD=0 -+-EVALFN=1 -+-KILLFN=1 -+- -+-./clone-once -+- -+-evalfn () { -+- [ `wc -l < stdout` == 2 ] -+-} -+- -+-killfn () { -+- killall -9 clone-once -+-} -+diff -ruN procps-3.1.15.old/test/ps/thread-sorted-m/header procps-3.1.15/test/ps/thread-sorted-m/header -+--- procps-3.1.15.old/test/ps/thread-sorted-m/header 2003-10-20 10:57:53.000000000 +1000 -++++ procps-3.1.15/test/ps/thread-sorted-m/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- PID TTY STAT TIME COMMAND -+diff -ruN procps-3.1.15.old/test/ps/thread-sorted-m/setup procps-3.1.15/test/ps/thread-sorted-m/setup -+--- procps-3.1.15.old/test/ps/thread-sorted-m/setup 2003-10-20 10:42:59.000000000 +1000 -++++ procps-3.1.15/test/ps/thread-sorted-m/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,14 +0,0 @@ -+-ARGS="-C clone-once --sort=pid m" -+-GOOD=0 -+-EVALFN=1 -+-KILLFN=1 -+- -+-./clone-once -+- -+-evalfn () { -+- [ `wc -l < stdout` == 4 ] -+-} -+- -+-killfn () { -+- killall -9 clone-once -+-} -+diff -ruN procps-3.1.15.old/test/ps/thread-sorted-mL/header procps-3.1.15/test/ps/thread-sorted-mL/header -+--- procps-3.1.15.old/test/ps/thread-sorted-mL/header 2003-10-20 10:57:54.000000000 +1000 -++++ procps-3.1.15/test/ps/thread-sorted-mL/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- PID LWP TTY TIME CMD -+diff -ruN procps-3.1.15.old/test/ps/thread-sorted-mL/setup procps-3.1.15/test/ps/thread-sorted-mL/setup -+--- procps-3.1.15.old/test/ps/thread-sorted-mL/setup 2003-10-20 10:44:46.000000000 +1000 -++++ procps-3.1.15/test/ps/thread-sorted-mL/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,14 +0,0 @@ -+-ARGS="-C clone-once --sort=pid -mL" -+-GOOD=0 -+-EVALFN=1 -+-KILLFN=1 -+- -+-./clone-once -+- -+-evalfn () { -+- [ `wc -l < stdout` == 4 ] -+-} -+- -+-killfn () { -+- killall -9 clone-once -+-} -+diff -ruN procps-3.1.15.old/test/ps/unix-comm/setup procps-3.1.15/test/ps/unix-comm/setup -+--- procps-3.1.15.old/test/ps/unix-comm/setup 2003-09-02 10:33:46.000000000 +1000 -++++ procps-3.1.15/test/ps/unix-comm/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,7 +0,0 @@ -+-ARGS= -+-GOOD=0 -+-EVALFN=1 -+- -+-evalfn () { -+- grep "ps$" stdout >> /dev/null -+-} -+diff -ruN procps-3.1.15.old/test/ps/unix-doc/setup procps-3.1.15/test/ps/unix-doc/setup -+--- procps-3.1.15.old/test/ps/unix-doc/setup 2003-09-03 13:38:37.000000000 +1000 -++++ procps-3.1.15/test/ps/unix-doc/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,37 +0,0 @@ -+-# The UNIX+POSIX standard requires that, except for "args" and "comm", -+-# the documentation must warn about any implementation-defined -+-# format specifiers that may contain blanks. -+-# -+-# Using "ps L" to grab the list isn't proper, but it's needed. -+-# -+-# This is our list for the man page: -+-# -+-#args COMMAND -+-#cmd CMD -+-#comm COMMAND -+-#command COMMAND -+-#fname COMMAND -+-#ucmd CMD -+-#ucomm COMMAND -+-#lstart STARTED -+-#bsdstart START -+-#start STARTED -+- -+-# It gets to 819 last I checked -+-export COLUMNS=1111 -+- -+-biglist=`$TESTME L \ -+- | egrep -v '^(comm|args|cmd|comm|command|fname|ucmd|ucomm|lstart|bsdstart|start) ' \ -+- | awk '{printf("%s,",$1);}'` -+-numcols=`echo $biglist | tr -dc , | wc -c` -+- -+-ARGS=-eo$biglist -+-GOOD=0 -+-EVALFN=1 -+- -+-evalfn () { -+- while read -a myarray; do -+- [ ${#myarray[*]} == $numcols ] || return 1 -+- done < stdout -+- return 0 -+-} -+diff -ruN procps-3.1.15.old/test/ps/unix-f-args/setup procps-3.1.15/test/ps/unix-f-args/setup -+--- procps-3.1.15.old/test/ps/unix-f-args/setup 2003-09-02 10:33:18.000000000 +1000 -++++ procps-3.1.15/test/ps/unix-f-args/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,7 +0,0 @@ -+-ARGS="-f" -+-GOOD=0 -+-EVALFN=1 -+- -+-evalfn () { -+- grep "ps -f$" stdout >> /dev/null -+-} -+diff -ruN procps-3.1.15.old/test/ps/unix-f-header/header procps-3.1.15/test/ps/unix-f-header/header -+--- procps-3.1.15.old/test/ps/unix-f-header/header 2003-09-02 08:40:35.000000000 +1000 -++++ procps-3.1.15/test/ps/unix-f-header/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- UID PID PPID C STIME TTY TIME CMD -+diff -ruN procps-3.1.15.old/test/ps/unix-f-header/setup procps-3.1.15/test/ps/unix-f-header/setup -+--- procps-3.1.15.old/test/ps/unix-f-header/setup 2003-09-02 08:37:18.000000000 +1000 -++++ procps-3.1.15/test/ps/unix-f-header/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,2 +0,0 @@ -+-ARGS="-f" -+-GOOD=0 -+diff -ruN procps-3.1.15.old/test/ps/unix-fl-header/header procps-3.1.15/test/ps/unix-fl-header/header -+--- procps-3.1.15.old/test/ps/unix-fl-header/header 2003-09-02 08:53:56.000000000 +1000 -++++ procps-3.1.15/test/ps/unix-fl-header/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- F S UID PID PPID C PRI NI ADDR SZ WCHAN STIME TTY TIME CMD -+diff -ruN procps-3.1.15.old/test/ps/unix-fl-header/setup procps-3.1.15/test/ps/unix-fl-header/setup -+--- procps-3.1.15.old/test/ps/unix-fl-header/setup 2003-09-02 08:55:32.000000000 +1000 -++++ procps-3.1.15/test/ps/unix-fl-header/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,2 +0,0 @@ -+-ARGS="-fl" -+-GOOD=0 -+diff -ruN procps-3.1.15.old/test/ps/unix-header/header procps-3.1.15/test/ps/unix-header/header -+--- procps-3.1.15.old/test/ps/unix-header/header 2003-09-02 08:53:56.000000000 +1000 -++++ procps-3.1.15/test/ps/unix-header/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- PID TTY TIME CMD -+diff -ruN procps-3.1.15.old/test/ps/unix-header/setup procps-3.1.15/test/ps/unix-header/setup -+--- procps-3.1.15.old/test/ps/unix-header/setup 2003-09-02 08:55:09.000000000 +1000 -++++ procps-3.1.15/test/ps/unix-header/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,2 +0,0 @@ -+-ARGS= -+-GOOD=0 -+diff -ruN procps-3.1.15.old/test/ps/unix-l-header/header procps-3.1.15/test/ps/unix-l-header/header -+--- procps-3.1.15.old/test/ps/unix-l-header/header 2003-09-02 08:53:56.000000000 +1000 -++++ procps-3.1.15/test/ps/unix-l-header/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- F S UID PID PPID C PRI NI ADDR SZ WCHAN TTY TIME CMD -+diff -ruN procps-3.1.15.old/test/ps/unix-l-header/setup procps-3.1.15/test/ps/unix-l-header/setup -+--- procps-3.1.15.old/test/ps/unix-l-header/setup 2003-09-02 08:55:49.000000000 +1000 -++++ procps-3.1.15/test/ps/unix-l-header/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,2 +0,0 @@ -+-ARGS="-l" -+-GOOD=0 -+diff -ruN procps-3.1.15.old/test/ps/unix-lf-header/header procps-3.1.15/test/ps/unix-lf-header/header -+--- procps-3.1.15.old/test/ps/unix-lf-header/header 2003-09-02 08:53:56.000000000 +1000 -++++ procps-3.1.15/test/ps/unix-lf-header/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- F S UID PID PPID C PRI NI ADDR SZ WCHAN STIME TTY TIME CMD -+diff -ruN procps-3.1.15.old/test/ps/unix-lf-header/setup procps-3.1.15/test/ps/unix-lf-header/setup -+--- procps-3.1.15.old/test/ps/unix-lf-header/setup 2003-09-02 08:55:39.000000000 +1000 -++++ procps-3.1.15/test/ps/unix-lf-header/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,2 +0,0 @@ -+-ARGS="-lf" -+-GOOD=0 -+diff -ruN procps-3.1.15.old/test/ps/unix-o-header-all/header procps-3.1.15/test/ps/unix-o-header-all/header -+--- procps-3.1.15.old/test/ps/unix-o-header-all/header 2003-09-02 09:23:24.000000000 +1000 -++++ procps-3.1.15/test/ps/unix-o-header-all/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- COMMAND COMMAND ELAPSED GROUP NI %CPU PGID PID PPID RGROUP RUSER TIME TT USER VSZ -+diff -ruN procps-3.1.15.old/test/ps/unix-o-header-all/setup procps-3.1.15/test/ps/unix-o-header-all/setup -+--- procps-3.1.15.old/test/ps/unix-o-header-all/setup 2003-09-02 09:23:11.000000000 +1000 -++++ procps-3.1.15/test/ps/unix-o-header-all/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,2 +0,0 @@ -+-ARGS="-o args,comm,etime,group,nice,pcpu,pgid,pid,ppid,rgroup,ruser,time,tty,user,vsz" -+-GOOD=0 -+diff -ruN procps-3.1.15.old/test/ps/unix-o-header-dup/header procps-3.1.15/test/ps/unix-o-header-dup/header -+--- procps-3.1.15.old/test/ps/unix-o-header-dup/header 2003-09-02 09:16:50.000000000 +1000 -++++ procps-3.1.15/test/ps/unix-o-header-dup/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- PID TT PID PPID -+diff -ruN procps-3.1.15.old/test/ps/unix-o-header-dup/setup procps-3.1.15/test/ps/unix-o-header-dup/setup -+--- procps-3.1.15.old/test/ps/unix-o-header-dup/setup 2003-09-02 09:16:22.000000000 +1000 -++++ procps-3.1.15/test/ps/unix-o-header-dup/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,2 +0,0 @@ -+-ARGS="-o pid,tty -o pid,ppid" -+-GOOD=0 -+diff -ruN procps-3.1.15.old/test/ps/unix-o-header-evil/header procps-3.1.15/test/ps/unix-o-header-evil/header -+--- procps-3.1.15.old/test/ps/unix-o-header-evil/header 2003-09-02 12:39:36.000000000 +1000 -++++ procps-3.1.15/test/ps/unix-o-header-evil/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- PPID PID FOO,tty PPID -+diff -ruN procps-3.1.15.old/test/ps/unix-o-header-evil/setup procps-3.1.15/test/ps/unix-o-header-evil/setup -+--- procps-3.1.15.old/test/ps/unix-o-header-evil/setup 2003-09-02 12:39:19.000000000 +1000 -++++ procps-3.1.15/test/ps/unix-o-header-evil/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,2 +0,0 @@ -+-ARGS="-o ppid -o pid,ppid=FOO,tty -o ppid" -+-GOOD=0 -+diff -ruN procps-3.1.15.old/test/ps/unix-o-header-nil/setup procps-3.1.15/test/ps/unix-o-header-nil/setup -+--- procps-3.1.15.old/test/ps/unix-o-header-nil/setup 2003-09-02 10:08:33.000000000 +1000 -++++ procps-3.1.15/test/ps/unix-o-header-nil/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,7 +0,0 @@ -+-ARGS="-o pid=" -+-GOOD=0 -+-EVALFN=1 -+- -+-evalfn () { -+- ! grep PID stdout >> /dev/null -+-} -+diff -ruN procps-3.1.15.old/test/ps/unix-selection/header procps-3.1.15/test/ps/unix-selection/header -+--- procps-3.1.15.old/test/ps/unix-selection/header 2003-09-04 16:13:48.000000000 +1000 -++++ procps-3.1.15/test/ps/unix-selection/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- PID TTY TIME CMD -+diff -ruN procps-3.1.15.old/test/ps/unix-selection/setup procps-3.1.15/test/ps/unix-selection/setup -+--- procps-3.1.15.old/test/ps/unix-selection/setup 2003-09-13 14:00:48.000000000 +1000 -++++ procps-3.1.15/test/ps/unix-selection/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,25 +0,0 @@ -+-ARGS= -+-GOOD=0 -+-EVALFN=1 -+-KILLFN=1 -+- -+-rm -f misc.tmp ready.tmp typescript.tmp -+- -+-./got-no-tty -+-# this'll do but... WHERE ARE THE MAN PAGES FOR PTY STUFF??? -+-(SHELL=`pwd`/script-child script typescript.tmp &>/dev/null) & -+-while [ ! -f ready.tmp ] ; do sleep 0.01 ; done -+-. ready.tmp -+- -+-evalfn () { -+- THIS_TTY=`tty | colrm 1 5` -+- lines1=`awk '{print $2}' < stdout | sort -u | egrep "^($THIS_TTY)$" | wc -l` -+- lines3=`awk '{print $2}' < stdout | sort -u | egrep "^($SHELL_TTY|$THIS_TTY|\?)$" | wc -l` -+- [ $lines1 == 1 ] && [ $lines3 == 1 ] -+-} -+- -+-killfn () { -+- killall -9 got-no-tty -+- kill -9 $SHELL_PID # the others should freely die -+- rm -f misc.tmp ready.tmp typescript.tmp -+-} -+diff -ruN procps-3.1.15.old/test/ps/unix-tty-default/setup procps-3.1.15/test/ps/unix-tty-default/setup -+--- procps-3.1.15.old/test/ps/unix-tty-default/setup 2003-09-02 11:36:37.000000000 +1000 -++++ procps-3.1.15/test/ps/unix-tty-default/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,14 +0,0 @@ -+-ARGS= -+-GOOD=0 -+-EVALFN=1 -+- -+-# default output is restricted to this tty -+-MYTTY=`tty` -+- -+-evalfn () { -+- PSTTY=`awk '!/TTY/{print $2}' < stdout | uniq` -+- if [ /dev/$PSTTY != $MYTTY ] ; then -+- return 1 -+- fi -+- return 0 -+-} -+diff -ruN procps-3.1.15.old/test/ps/unix-tty-name/setup procps-3.1.15/test/ps/unix-tty-name/setup -+--- procps-3.1.15.old/test/ps/unix-tty-name/setup 2003-09-02 10:42:55.000000000 +1000 -++++ procps-3.1.15/test/ps/unix-tty-name/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,9 +0,0 @@ -+-ARGS="-otty= -p$$" -+-GOOD=0 -+-EVALFN=1 -+- -+-evalfn () { -+- MYTTY=`tty` -+- PSTTY=`printf /dev/ ; cat stdout` -+- [ $MYTTY == $PSTTY ] -+-} -+diff -ruN procps-3.1.15.old/test/ps/unix-tty-names/setup procps-3.1.15/test/ps/unix-tty-names/setup -+--- procps-3.1.15.old/test/ps/unix-tty-names/setup 2003-09-02 11:17:09.000000000 +1000 -++++ procps-3.1.15/test/ps/unix-tty-names/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,26 +0,0 @@ -+-ARGS="-eotty=" -+-GOOD=0 -+-EVALFN=1 -+- -+-# the UNIX spec allows: -+-# -+-# /dev/ttyS0 as ttyS0 -+-# /dev/ttyS0 as S0 (OK to chop a leading "tty") -+-# /dev/console as console -+-# /foo/bar as bar or /foo/bar (poorly unspecified) -+-# -nothing- as ? or - (poorly unspecified, we use '?') -+-# -+-# Also, the format must agree with what "who" uses. -+-# Linux "who" doesn't strip "tty" off of /dev/ttyS0, etc., -+-# so that's illegal in a Linux environment. -+-# -+-# junk the '?' to avoid shell wildcard expansion -+- -+-evalfn () { -+- for i in `tr -d '?' < stdout | sort -u` ; do -+- if [ ! -c /dev/$i -a ! -c /$i ] ; then -+- return 1 -+- fi -+- done -+- return 0 -+-} -+diff -ruN procps-3.1.15.old/test/ps/unix-vsz/setup procps-3.1.15/test/ps/unix-vsz/setup -+--- procps-3.1.15.old/test/ps/unix-vsz/setup 2003-09-11 10:24:38.000000000 +1000 -++++ procps-3.1.15/test/ps/unix-vsz/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,27 +0,0 @@ -+-# The standard describes the "vsz" format as: -+-# The size of the process in (virtual) memory -+-# in 1024 byte units as a decimal integer. -+-# -+-# It's hard to tell 1000-byte from 1024-byte units, -+-# but easy to tell 1024-byte from 512-byte or 2 kB. -+-# On a 64-bit system, watch for 4 GB troubles as well. -+- -+-# throw in the PID to ensure whitespace on the left -+-ARGS="-C gigabyte -o pid= -o vsz=" -+-GOOD=0 -+-EVALFN=1 -+-KILLFN=1 -+- -+-BITSIZE=`./gigabyte` -+- -+-evalfn () { -+- if [ $BITSIZE == 32bit ] ; then -+- egrep ' 1......$' stdout >> /dev/null -+- else -+- egrep ' 1.......$' stdout >> /dev/null -+- fi -+-} -+- -+-killfn () { -+- killall -9 gigabyte -+-} -+diff -ruN procps-3.1.15.old/test/ps/unix-wchan/setup procps-3.1.15/test/ps/unix-wchan/setup -+--- procps-3.1.15.old/test/ps/unix-wchan/setup 2003-09-02 12:25:15.000000000 +1000 -++++ procps-3.1.15/test/ps/unix-wchan/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,11 +0,0 @@ -+-ARGS="-eowchan=" -+-GOOD=0 -+-EVALFN=1 -+- -+-# Make sure we're getting back real wchan data, -+-# not just "WCHAN", "-", "0", "*", and hex digits. -+-# Assumes usage of letters [g-z]. -+- -+-evalfn () { -+- egrep '[g-z]' stdout >> /dev/null -+-} -+diff -ruN procps-3.1.15.old/test/ps/y-needs-l/header procps-3.1.15/test/ps/y-needs-l/header -+--- procps-3.1.15.old/test/ps/y-needs-l/header 2003-10-02 12:10:34.000000000 +1000 -++++ procps-3.1.15/test/ps/y-needs-l/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- -+\ No newline at end of file -+diff -ruN procps-3.1.15.old/test/ps/y-needs-l/setup procps-3.1.15/test/ps/y-needs-l/setup -+--- procps-3.1.15.old/test/ps/y-needs-l/setup 2003-10-02 12:10:45.000000000 +1000 -++++ procps-3.1.15/test/ps/y-needs-l/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,2 +0,0 @@ -+-ARGS="-y" -+-GOOD=1 -+diff -ruN procps-3.1.15.old/test/ps/y-needs-l/stderr procps-3.1.15/test/ps/y-needs-l/stderr -+--- procps-3.1.15.old/test/ps/y-needs-l/stderr 2003-10-02 12:10:56.000000000 +1000 -++++ procps-3.1.15/test/ps/y-needs-l/stderr 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,23 +0,0 @@ -+-ERROR: Modifier -y without format -l makes no sense. -+-********* simple selection ********* ********* selection by list ********* -+--A all processes -C by command name -+--N negate selection -G by real group ID (supports names) -+--a all w/ tty except session leaders -U by real user ID (supports names) -+--d all except session leaders -g by session leader OR by group name -+--e all processes -p by process ID -+-T all processes on this terminal -s processes in the sessions given -+-a all w/ tty, including other users -t by tty -+-g all, even group leaders! -u by effective user ID (supports names) -+-r only running processes U processes for specified users -+-x processes w/o controlling ttys t by tty -+-*********** output format ********** *********** long options *********** -+--o,o user-defined -f full --Group --User --pid --cols --ppid -+--j,j job control s signal --group --user --sid --rows -+--O,O preloaded -o v virtual memory --cumulative --format --deselect -+--l,l long u user-oriented --sort --tty --forest --version -+--F extra full X registers --heading --no-heading -+- ********* misc options ********* -+--V,V show version L list format codes f ASCII art forest -+--m,m show threads S children in sum -y change -l format -+--n,N set namelist file c true command name n numeric WCHAN,UID -+--w,w wide output e show environment -H process hierarchy -+diff -ruN procps-3.1.15.old/test/ps/zombie-args/setup procps-3.1.15/test/ps/zombie-args/setup -+--- procps-3.1.15.old/test/ps/zombie-args/setup 2003-09-04 13:43:31.000000000 +1000 -++++ procps-3.1.15/test/ps/zombie-args/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,18 +0,0 @@ -+-ARGS="-H -C the_living_dead -o args" -+-GOOD=0 -+-EVALFN=1 -+-KILLFN=1 -+- -+-# the -H is just to ensure predictable output ordering -+- -+-# assumes that the processes won't get swapped out before ps runs -+- -+-./the_living_dead -+- -+-evalfn () { -+- diff -Naurd stdout $TESTNAME/stdout >> /dev/null -+-} -+- -+-killfn () { -+- killall -9 the_living_dead -+-} -+diff -ruN procps-3.1.15.old/test/ps/zombie-args/stdout procps-3.1.15/test/ps/zombie-args/stdout -+--- procps-3.1.15.old/test/ps/zombie-args/stdout 2003-09-04 13:44:01.000000000 +1000 -++++ procps-3.1.15/test/ps/zombie-args/stdout 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,3 +0,0 @@ -+-COMMAND -+-./the_living_dead -+- [the_living_dead] -+diff -ruN procps-3.1.15.old/test/ps/zombie-comm/setup procps-3.1.15/test/ps/zombie-comm/setup -+--- procps-3.1.15.old/test/ps/zombie-comm/setup 2003-09-04 13:43:44.000000000 +1000 -++++ procps-3.1.15/test/ps/zombie-comm/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,16 +0,0 @@ -+-ARGS="-H -C the_living_dead -o comm" -+-GOOD=0 -+-EVALFN=1 -+-KILLFN=1 -+- -+-# the -H is just to ensure predictable output ordering -+- -+-./the_living_dead -+- -+-evalfn () { -+- diff -Naurd stdout $TESTNAME/stdout >> /dev/null -+-} -+- -+-killfn () { -+- killall -9 the_living_dead -+-} -+diff -ruN procps-3.1.15.old/test/ps/zombie-comm/stdout procps-3.1.15/test/ps/zombie-comm/stdout -+--- procps-3.1.15.old/test/ps/zombie-comm/stdout 2003-09-04 13:44:12.000000000 +1000 -++++ procps-3.1.15/test/ps/zombie-comm/stdout 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,3 +0,0 @@ -+-COMMAND -+-the_living_dead -+- the_living_dead -+diff -ruN procps-3.1.15.old/test/ps/zombie-wchan/setup procps-3.1.15/test/ps/zombie-wchan/setup -+--- procps-3.1.15.old/test/ps/zombie-wchan/setup 2003-09-04 13:52:41.000000000 +1000 -++++ procps-3.1.15/test/ps/zombie-wchan/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,14 +0,0 @@ -+-ARGS="-C the_living_dead -o wchan,stat,comm" -+-GOOD=0 -+-EVALFN=1 -+-KILLFN=1 -+- -+-./the_living_dead -+- -+-evalfn () { -+- egrep 'exit.*Z.*defunct' stdout >> /dev/null -+-} -+- -+-killfn () { -+- killall -9 the_living_dead -+-} -+diff -ruN procps-3.1.15.old/test/runtests procps-3.1.15/test/runtests -+--- procps-3.1.15.old/test/runtests 2003-09-03 12:09:08.000000000 +1000 -++++ procps-3.1.15/test/runtests 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,4 +0,0 @@ -+-#!/bin/bash -+- -+-export TESTME=${PSPROG:-../ps/ps} -+-for i in ps/*-* ; do ./onetest $i ; done -+diff -ruN procps-3.1.15.old/test/script-child procps-3.1.15/test/script-child -+--- procps-3.1.15.old/test/script-child 2003-09-04 14:43:28.000000000 +1000 -++++ procps-3.1.15/test/script-child 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,10 +0,0 @@ -+-#!/bin/bash -+-# -+-# usage: -+-# SHELL=/path/to/this/script script trashfile -+- -+-echo SCRIPT_PID=$PPID > misc.tmp -+-echo SHELL_PID=$$ >> misc.tmp -+-echo SHELL_TTY=`/usr/bin/tty | colrm 1 5` >> misc.tmp -+-mv misc.tmp ready.tmp # atomic op -+-while /bin/true ; do sleep 42 ; done -+diff -ruN procps-3.1.15.old/test/sid-breaks-ttys.c procps-3.1.15/test/sid-breaks-ttys.c -+--- procps-3.1.15.old/test/sid-breaks-ttys.c 2003-09-08 13:28:24.000000000 +1000 -++++ procps-3.1.15/test/sid-breaks-ttys.c 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,38 +0,0 @@ -+-#include -+-#include -+-#include -+- -+-static pid_t one; -+- -+-static void die(int signo){ -+- (void)signo; -+- _exit(0); -+-} -+- -+-static void hang(void){ -+- for(;;) pause(); -+-} -+- -+-int main(int argc, char *argv[]){ -+- (void)argc; -+- (void)argv; -+- -+- one = getpid(); -+- signal(SIGHUP,die); -+- if(fork()) hang(); // parent later killed as readyness signal -+- -+- // second one exits, to enable setsid(), and the resulting -+- // zombie will be reaped by init after 1st process killed -+- if(fork()) _exit(0); -+- -+- if(setsid()==-1){ -+- kill(one,SIGKILL); // hopefully the shell will complain -+- _exit(42); // kind of tough to report errors -+- } -+- -+- kill(one,SIGHUP); // let the shell know we're ready -+- -+- hang(); -+- -+- return 0; -+-} -+diff -ruN procps-3.1.15.old/test/sidious.c procps-3.1.15/test/sidious.c -+--- procps-3.1.15.old/test/sidious.c 2003-09-08 13:58:20.000000000 +1000 -++++ procps-3.1.15/test/sidious.c 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,77 +0,0 @@ -+-// ps fTo sess,pgid,pid,tty,ppid,tpgid,args -C a.out -+- -+-#include -+-#include -+-#include -+-#include -+-#include -+-#include // undocumented grantpt,unlockpt,ptsname,openpt,posix_openpt -+-//#include // undocumented openpty,forkpty -+- -+-static pid_t one; -+- -+-static void die(int signo){ -+- (void)signo; -+- _exit(0); -+-} -+- -+-//static void sigchld_handler(int signo){ -+-// (void)signo; -+-// kill(one,SIGHUP); // kill parent -+-//} -+- -+-static void hang(void){ -+- for(;;) pause(); -+-} -+- -+-int main(int argc, char *argv[]){ -+- int master; -+- int slave; -+- -+- (void)argc; -+- (void)argv; -+- -+- one = getpid(); -+- signal(SIGHUP,die); -+- if(fork()) hang(); // parent later killed as readyness signal -+- -+- // second one exits, to enable setsid(), and the resulting -+- // zombie will be reaped by init after 1st process killed -+- if(fork()) _exit(0); -+- -+- -+- master = open("/dev/ptmx", O_RDWR|O_NOCTTY); -+- -+- // could fork, but don't bother -+- // (won't be doing anything with the master side) -+- -+- // could change child's UID, but don't bother -+- // (would make the tests require running as root) -+- -+- // not in the man pages!!! -+- grantpt(master); -+- unlockpt(master); -+- -+- if(setsid()==-1){ -+- kill(one,SIGKILL); // hopefully the shell will complain -+- _exit(42); // kind of tough to report errors -+- } -+- -+- slave = open(ptsname(master), O_RDWR); -+-#ifdef I_PUSH -+- // push STREAMS tty stuff, just to have an example of it -+- ioctl(slave, I_PUSH, "ptem"); -+- ioctl(slave, I_PUSH, "ldterm"); -+-#endif -+-#ifdef TIOCSCTTY -+- // On SysV, slave open got us a TTY. On BSD, we must do this: -+- ioctl(fd, TIOCSCTTY, NULL); -+-#endif -+- -+- -+- kill(one,SIGHUP); // let the shell know we're ready -+- -+- hang(); -+- -+- return 0; -+-} -+diff -ruN procps-3.1.15.old/test/th.c procps-3.1.15/test/th.c -+--- procps-3.1.15.old/test/th.c 2003-09-14 01:35:42.000000000 +1000 -++++ procps-3.1.15/test/th.c 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,16 +0,0 @@ -+-#include -+-#include -+- -+-void *hanger(void *vp){ -+- (void)vp; -+- for(;;) pause(); -+-} -+- -+-int main(int argc, char *argv[]){ -+- pthread_t thread; -+- (void)argc; -+- (void)argv; -+- pthread_create(&thread, NULL, hanger, NULL); -+- hanger(NULL); -+- return 0; // keep gcc happy -+-} -+diff -ruN procps-3.1.15.old/test/the_living_dead.c procps-3.1.15/test/the_living_dead.c -+--- procps-3.1.15.old/test/the_living_dead.c 2003-09-04 13:36:54.000000000 +1000 -++++ procps-3.1.15/test/the_living_dead.c 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,39 +0,0 @@ -+-#include -+-#include -+-#include -+- -+-static pid_t one; -+- -+-static void die(int signo){ -+- (void)signo; -+- _exit(0); -+-} -+- -+-static void sigchld_handler(int signo){ -+- (void)signo; -+- kill(one,SIGHUP); // kill parent -+-} -+- -+-static void hang(void){ -+- for(;;) pause(); -+-} -+- -+-int main(int argc, char *argv[]){ -+- pid_t three; -+- -+- (void)argc; -+- (void)argv; -+- -+- one = getpid(); -+- signal(SIGHUP,die); -+- if(fork()) hang(); // parent later killed as readyness signal -+- -+- three = fork(); -+- if(three){ -+- signal(SIGCHLD,sigchld_handler); -+- kill(three,SIGHUP); // create the zombie -+- } -+- -+- hang(); -+- return 0; -+-} ---- procps-3.1.15.orig/debian/control -+++ procps-3.1.15/debian/control -@@ -0,0 +1,31 @@ -+Source: procps -+Section: base -+Priority: required -+Maintainer: Craig Small -+Build-Depends: debhelper (>> 4.1.1), libncurses5-dev, make (>= 3.78.1-8), dpatch -+Standards-Version: 3.6.0 -+ -+Package: procps -+Architecture: any -+Provides: watch -+Depends: ${shlibs:Depends} -+Conflicts: watch, libproc-dev (<< 1:1.2.6-2), w-bassman (<< 1.0-3), procps-nonfree, pgrep (<< 3.3-5) -+Replaces: watch, bsdutils (<< 2.9x-1) -+Recommends: psmisc -+Description: The /proc file system utilities -+ These are utilities to browse the /proc filesystem, which is not a real file -+ system but a way for the kernel to provide information about the status of -+ entries in its process table. (e.g. running, stopped or "zombie") -+ Both command line and full screen utilities are provided. Ncurses is needed -+ for the full screen utilities. More information can be found at procps -+ website http://procps.sf.net/ -+ -+Package: libproc-dev -+Architecture: any -+Section: libdevel -+Priority: optional -+Depends: libc6-dev, procps (= ${Source-Version}) -+Description: library for accessing process information from /proc -+ These are the header files for libproc. Some packages using libproc -+ to access process information from /proc need these to compile. -+ ---- procps-3.1.15.orig/debian/rules -+++ procps-3.1.15/debian/rules -@@ -0,0 +1,99 @@ -+#!/usr/bin/make -f -+# Sample debian/rules that uses debhelper. -+# GNU copyright 1997 to 1999 by Joey Hess. -+ -+# Uncomment this to turn on verbose mode. -+#export DH_VERBOSE=1 -+ -+# Include dpatch stuff -+include /usr/share/dpatch/dpatch.make -+ -+PACKAGE="procps" -+ -+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) -+ INSTALL_PROGRAM += -s -+endif -+ -+ -+build: build-stamp -+ -+build-stamp: patch-stamp -+ dh_testdir -+ -+ # Add here commands to compile the package. -+ mkdir static -+ SHARED=0 $(MAKE) proc/libproc.a -+ mv proc/libproc.a static -+ $(MAKE) clean -+ $(MAKE) W_SHOWFROM=\-DW_SHOWFROM -+ -+ touch build-stamp -+ -+clean: clean1 unpatch -+clean1: -+ dh_testdir -+ dh_testroot -+ rm -f build-stamp -+ -+ # Add here commands to clean up after the build process. -+ -$(MAKE) clean -+ -rm -rf static -+ -+ dh_clean -+ -+install: build -+ dh_testdir -+ dh_testroot -+ dh_clean -k -+ dh_installdirs -+ -+ # Add here commands to install the package into debian/procps. -+ $(MAKE) ln_f="ln -sf" ldconfig=echo DESTDIR=$(CURDIR)/debian/procps install -+ install --mode 644 -o root -g root debian/sysctl.conf $(CURDIR)/debian/procps/etc -+ # Rename w as there are two of them -+ (cd $(CURDIR)/debian/procps/usr/bin && mv w w.procps ) -+ (cd $(CURDIR)/debian/procps/usr/share/man/man1 && mv w.1 w.procps.1 ) -+ -+ # Work-around until proc includes fixed -+ (cp proc/*.h $(CURDIR)/debian/procps/usr/include/proc) -+ cp static/libproc.a $(CURDIR)/debian/libproc-dev/usr/lib -+ -+ dh_movefiles --sourcedir=debian/procps -+ rmdir $(CURDIR)/debian/procps/usr/include/proc -+ -+# Build architecture-independent files here. -+binary-indep: build install -+# We have nothing to do by default. -+ -+# Build architecture-dependent files here. -+binary-arch: build install -+ dh_testdir -+ dh_testroot -+# dh_installdebconf -+ dh_installdocs -+ dh_installexamples -+ dh_installmenu -+# dh_installlogrotate -+# dh_installemacsen -+# dh_installpam -+# dh_installmime -+ dh_installinit --update-rcd-params='start 30 S .' --init-script='procps.sh' -+# dh_installcron -+ dh_installman -+ dh_installinfo -+# dh_undocumented -+ dh_installchangelogs NEWS -+ dh_link -+ dh_strip -+ dh_compress -+ dh_fixperms -+ dh_makeshlibs -V "procps (>= 3.1.14), procps (<< 3.1.15)" -+ dh_installdeb -+# dh_perl -+ dh_shlibdeps -Lprocps -ldebian/procps/lib -+ dh_gencontrol -+ dh_md5sums -+ dh_builddeb -+ -+binary: binary-indep binary-arch -+.PHONY: build clean binary-indep binary-arch binary install patch unpatch clean1 ---- procps-3.1.15.orig/debian/changelog -+++ procps-3.1.15/debian/changelog -@@ -0,0 +1,743 @@ -+procps (1:3.1.15-2) unstable; urgency=low -+ -+ * Removed offending test directory Closes: #227933 -+ -+ -- Craig Small Tue, 20 Jan 2004 10:20:44 +1100 -+ -+procps (1:3.1.15-1) unstable; urgency=low -+ -+ * Now uses dpatch to handle the various patches -+ * New upstream release -+ - Supports SELINUX flags for kernel v2.6 Closes: #193648 -+ - Hide kernel PID bug Closes: #217278, #219730, #217525, #224470 -+ - Fixed top auto-margins problem Closes: #217559 -+ * Fix top manual page Closes: #225089 -+ * Patch so SELINUX flags work in v2.4 kernels -+ * Extra +s in ps.1 removed Closes: #218220 -+ * Added patch so sysctl has quiet -q flag Closes: #189100 -+ -+ -- Craig Small Fri, 26 Dec 2003 18:02:59 +1100 -+ -+procps (1:3.1.14-1) unstable; urgency=low -+ -+ * New upstream release -+ -+ -- Craig Small Wed, 22 Oct 2003 11:59:53 +1000 -+ -+procps (1:3.1.13-1) unstable; urgency=low -+ -+ * New upstream release -+ -+ -- Craig Small Wed, 24 Sep 2003 16:10:42 +1000 -+ -+procps (1:3.1.12-1) unstable; urgency=low -+ -+ * New upstream release -+ ps: $PS_FORMAT works properly Closes: #201575 -+ man page: /var/run/utmp, not /etc/utmp Closes: #206583 -+ required flags moved out of CFLAGS Closes: #205429 -+ -+ -+ -- Craig Small Sat, 13 Sep 2003 21:11:09 +1000 -+ -+procps (1:3.1.11-2) unstable; urgency=low -+ -+ * Made shlibs have a specific version Closes: #199118 -+ * libproc.a is back in libproc-dev, use it -+ * Added README to libproc-dev for people who use the library -+ -+ -- Craig Small Wed, 20 Aug 2003 15:31:59 +1000 -+ -+procps (1:3.1.11-1) unstable; urgency=low -+ -+ * 3.1.11 New upstream version -+ - handle GPLONLY_ symbols Closes: #143549, #188374 -+ * freeproc now defined Closes: #189047 -+ * warning in readproc.c fixed Closes: #197346 -+ * Removed optarg and optind defines Closes: #197343 -+ * Fixed saved_start_time warning Closes: #197342 -+ -+ -- Craig Small Thu, 24 Jul 2003 17:02:36 +1000 -+ -+procps (1:3.1.9-1) unstable; urgency=low -+ -+ * New upstream source -+ * memory sizes fixed for 64-bit w/ gcc 3.x Closes: #194376, #191933 -+ * Doesn't segfault if /proc not mounted Closes: #172735 -+ * No warning in top about memory key Closes: #188271 -+ * More info in kill man page Closes: #182414 -+ * Document the different oO options Closes: #169301 -+ * Updated stabndards version to 3.5.9 -+ * Changed disk to backing storage Closes: #175925 -+ -+ -- Craig Small Mon, 2 Jun 2003 02:31:03 +1000 -+ -+procps (1:3.1.8-1) unstable; urgency=low -+ -+ * New upstream release -+ watch man page fixed, Closes #182246 -+ * Changed section for libproc-dev -+ -+ -- Craig Small Tue, 1 Apr 2003 10:19:05 +1000 -+ -+procps (1:3.1.6-1) unstable; urgency=low -+ -+ * New upstream release -+ - watch has --no-title option Closes: #179862 -+ - ps -C can compare very long names Closes: #178127 -+ * Fixed descriptions in manual pages Closes: #179046 -+ * w wont crash if /proc unreadable Closes: #169398 -+ -+ -- Craig Small Sat, 22 Feb 2003 21:33:45 +1100 -+ -+procps (1:3.1.5-1) unstable; urgency=low -+ -+ * New upstream version -+ - watch don't drop empty lines Closes: #171005 -+ - top has old sort keys Closes: #167249 -+ - now count Inact_laundry as needed Closes: #172163 -+ -+ -- Craig Small Mon, 6 Jan 2003 13:49:32 +1100 -+ -+procps (1:3.1.3-1) unstable; urgency=low -+ -+ * New upstream source -+ -+ -- Craig Small Fri, 13 Dec 2002 16:16:36 +1100 -+ -+procps (1:3.1.1-1) unstable; urgency=low -+ -+ * New upstream source -+ - vmstats reports memort counts Closes: #169774 -+ -+ -- Craig Small Wed, 4 Dec 2002 15:57:13 +1100 -+ -+procps (1:3.1.0-1) unstable; urgency=low -+ -+ * New upstream version -+ - vmstat displays IO-wait time instead of bogus "w" -+ - when IO-wait hidden, count as idle, not as sys -+ - pmap command added (like Sun has) -+ * Manual pages cleaned up Closes: #165970, #164481 -+ -+ -- Craig Small Mon, 11 Nov 2002 12:03:46 +1100 -+ -+procps (1:3.0.5-1) unstable; urgency=low -+ -+ * New upstream version -+ - top tolerates super-wide displays Closes: #165497 -+ - ELF note warning gone for some kernels Closes: #165900 -+ - Fix ps and top man pages a bit, dropped bugs severity. -+ -+ -- Craig Small Tue, 29 Oct 2002 22:04:36 +1100 -+ -+procps (1:3.0.4-1) unstable; urgency=low -+ -+ * New upstream version -+ - ELF note warning removed Closes: #165093, #165343 -+ - top works for most TERM= settings Closes: #164864, #164956 -+ * w has FROM column again by default Closes: #165252 -+ * debhelper dependency version fixed Closes: #165083 -+ * ps.1 looks a bit better now Closes: #16448 -+ -+ -- Craig Small Mon, 21 Oct 2002 08:30:04 +1000 -+ -+procps (1:3.0.3-1) unstable; urgency=low -+ -+ * New upstream version -+ - w works with KOI8 locale Closes: #153043 -+ - fix top for non-SMP 2.2.xx and 2.0.xx Closes: #164231 -+ - negative idle time fixed Closes: #126260 -+ - sysctl handles new vlan interface Closes: #140386 -+ - vmstat documentation update Closes: #157935, #155684 -+ - "skill -n blah blah blah" lets you test options Closes: #158630 -+ - fixed ps --sort crash Closes: #164226 -+ - vmstat compiles with latest gcc-3.x Closes: #164348 -+ - bad (int*) cast in top removed Closes: #164468 -+ - Support new/improved statistics interfaces in 2.5 /proc Closes: #164013 -+ - top defaults to old layout and sort by pid Closes: #164277 -+ - rant moved out of top.1 man page Closes: #164520 -+ - top runs much faster Closes: #87779 -+ -+ -- Craig Small Sat, 12 Oct 2002 21:44:23 +1000 -+ -+procps (1:3.0.0-2) unstable; urgency=low -+ -+ * Fixed pkill and skill, auto* is so broken. Closes: #163940, #163944 -+ * Moved libproc.so.3 into /lib as it's needed early Closes: #163981,#163899 -+ -+ -- Craig Small Thu, 10 Oct 2002 07:19:45 +1000 -+ -+procps (1:3.0.0-1) unstable; urgency=low -+ -+ * New upstream source Closes: #163698 -+ - top has SMP Closes: #162316, #62282, #94896, #98277, #117040, #117735 -+ - SELINUX support Closes: #142892 -+ - top defaults to signal 15 to kill pids with Closes: #72158 -+ - 64-bit time reduces the overflow problem Closes: #82382, #155908 -+ - "w" program better at determining what a user is doing -+ Closes: #88758, 115529 -+ - oldps is gone Closes: #101917 -+ - Handles /proc/tty/drivers Closes: #108654, #154046 -+ - Supports scanf where locale uses , for decimal point Closes: #126873 -+ - uptime --help now calls itself uptime Closes: #128880 -+ - ps faster Closes: #147731 -+ - top calculates screen better Closes: #162296 -+ - top allows sorts by pid or swapped memory Closes: #79868, #159446 -+ - support for s/390 Closes: #126295 -+ - statm buffer size increased Closes: #145085 -+ - new top has no typos Closes: #148918 -+ - new top can handle lots of tasks Closes: #70900 -+ * Fixed init.d file so it follows policy Closes: #121945 -+ -+ -- Craig Small Tue, 8 Oct 2002 12:29:45 +1000 -+ -+procps (1:2.0.7-10) unstable; urgency=low -+ -+ * Fixes ps crash when system.map is exact multiple of 1024 -+ Thankyou Colin for the patch! Closes: #109237, #142292 -+ -+ -- Craig Small Fri, 12 Apr 2002 21:02:04 +1000 -+ -+procps (1:2.0.7-9) unstable; urgency=low -+ -+ * Sanity checking for Number of CPU Closes: #127561, #122617 -+ This will keep the m68k and ARM boys happy. -+ * uptime usage fixed Closes: #138351 -+ * kill man page NAME updated Closes: #119400 -+ * Better explanation for load average in uptime(1) Closes: #140902 -+ * utmp in correct location in w(1) Closes: #115725 -+ -+ -- Craig Small Mon, 8 Apr 2002 14:18:20 +1000 -+ -+procps (1:2.0.7-8) unstable; urgency=low -+ -+ * Removed -ggdb Closes: #117203 -+ -+ -- Craig Small Sat, 27 Oct 2001 07:02:38 +1000 -+ -+procps (1:2.0.7-7) unstable; urgency=low -+ -+ * Added os/390 patches Closes: #113494 -+ * w manpage now gives correct location for utmp Closes: #110723 -+ * watch wrap-around problem fixed Closes: #111759 -+ * Programs are compilied -O2 Closes: #108652 -+ -+ -- Craig Small Wed, 26 Sep 2001 08:08:43 +1000 -+ -+procps (1:2.0.7-6) unstable; urgency=low -+ -+ * Re-fixed command line interpretation Closes: #103101 -+ -+ -- Craig Small Tue, 10 Jul 2001 17:32:02 +1000 -+ -+procps (1:2.0.7-5) unstable; urgency=low -+ -+ * watch now copys strings better. Closes: #95404, #97948, #99780 -+ * skill.1 loads tbl Closes: #92242, #67899 -+ * long usernames are shown Closes: #86205, #94957 -+ * Remove /etc/rcS.d/S30procps with good ole rm Closes: #92184 -+ * /etc/init.d/procps.sh calls itself that Closes: #93302 -+ * Cannot write config in secure mode Closes: #93948 -+ -+ -- Craig Small Sun, 29 Apr 2001 14:55:20 +1000 -+ -+procps (1:2.0.7-4) unstable; urgency=low -+ -+ * watch doesnt crash with long command lines Closes: #88592, #87693 -+ * bumped up a buffer in a proc read Closes: #85775 -+ * Now we use 24 hour time Closes: #85640 -+ * pgrep calls itself pgrep Closes: #86630 -+ * Corrected symlink in libproc-dev Closes: #87865 -+ -+ -- Craig Small Mon, 19 Mar 2001 10:13:27 +1100 -+ -+procps (1:2.0.7-3) unstable; urgency=low -+ -+ * Conflicts with pgrep, so no more conflicts Closes: #82835 -+ * Minor fixes to ps.1 manpage Closes: #81921 -+ * watch highlighs correctly Closes: #77737 -+ * top wont die with evil HOMEs, Closes: #81452 -+ * removed reference to suidregister -+ * Remore -L reference in kill.1 Closes: #85913 -+ -+ -- Craig Small Thu, 8 Feb 2001 12:44:58 +1100 -+ -+procps (1:2.0.7-2) unstable; urgency=medium -+ -+ * Moved kill back again, dammit why is the makefile so broken -+ Closes: #82747 -+ * Watch uses locale Closes: #82739 -+ * top's scanf is protected from evil locale problems Closes: #82671, #69128 -+ (Big thankyou to Guillaume for lending a test account) -+ -+ -- Craig Small Fri, 19 Jan 2001 09:15:36 +1100 -+ -+procps (1:2.0.7-1) unstable; urgency=medium -+ -+ * New upstream version (010114) -+ - Merges 2.0.7 code from RedHat Closes: #80832 -+ - Made note that Shared memory report will be junk due to kernel -+ Closes: #77818 -+ - Remove html and null stuff from man page Closes: #81920 -+ - vsize is kB in man page Closes: #82210 -+ - man pages look better Closes: #70055, #70941 -+ - vmstat increase Closes: #77886 -+ - w tries harder to find things Closes: #24531 -+ - 15 char user names Closes: #71211 -+ * No HOME overflow in top Closes: 81452 -+ * Added menu Hints Closes: #80051, #82324 -+ -+ -+ -- Craig Small Wed, 17 Jan 2001 08:57:24 +1100 -+ -+procps (1:2.0.6-9) unstable; urgency=medium -+ -+ * added libncurses5-dev to build-depends, Closes: #67533 -+ * Put kill back into /bin Closes #67580, #67582 -+ * Put 2.0.6-7 ps.1 back in Closes: #67451 -+ -+ -- Craig Small Tue, 25 Jul 2000 08:13:21 +1000 -+ -+procps (1:2.0.6-8) unstable; urgency=low -+ -+ * New upstream source: -+ * - sysctl EOF bug fixed Closes: #62877 -+ * - stop crashes with unmounted /proc Closes: #63512, #55177 -+ * - Versions checking tolerates RH /proc/ksyms Closes: #59798 -+ * - Top works better with SMP Closes: #34734, #56547, #59703 -+ -+ -- Craig Small Fri, 14 Jul 2000 22:33:44 +1000 -+ -+procps (1:2.0.6-7) unstable; urgency=low -+ -+ * Fixed missing version Closes: #62207, #62484, #59112 -+ * Stop crashes with umounted /proc Closes: #63512, #55177 -+ * Nicer man pages Closes: #63495, #59406 -+ * Fixed sysctl eof bug Closes: #62877 -+ * watch wraps properly Closes: #60913 -+ * watch handles tabs Closes: #46213 -+ * watch honors locale settings Closes: #63762 -+ * now versioned replaces line for bsdutils -+ -+ -- Craig Small Mon, 29 May 2000 13:31:54 +1000 -+ -+procps (1:2.0.6-6) unstable; urgency=low -+ -+ * New patchlevel (000221) -+ * ps 'f' ASCII art forest fixed. Closes: #57134, #58644 -+ * let insane people run ps setuid. Closes: #56701 -+ * note that kernel 2.3 is now faster. Closes: #49130 -+ * top with WCHAN was leaking memory. Closes: #58172, #52257, #56889 -+ * can show current CPU. Closes: #37023 -+ * w looks better now. Closes: #55952 -+ * init.d/procps removed if exists. Closes: #55137, #55852 -+ * Fixed skill/snice man page (thanks man-db maint!) Closes: #53736, #46743 -+ * Fixed ps man page Closes: #58365 -+ -+ -- Craig Small Wed, 23 Feb 2000 10:31:37 +1100 -+ -+procps (1:2.0.6-5) unstable; urgency=low -+ -+ * New upstream source -+ * kill "_R(smp_|smp2gig_|2gig_)?[0-9a-fA-F]{8,}" Closes: #54394, #53208 -+ * added type 'S' and scan past machine types Closes: #54396 -+ * Fixed w(1) manpage Closes: #54709 -+ * top now agrees with ps for RSS Closes: #52679 -+ -+ -- Craig Small Tue, 11 Jan 2000 08:23:56 +1100 -+ -+procps (1:2.0.6-4) unstable; urgency=low -+ -+ * procps init.d script quietly dies if not /etc/default/rcS Closes: -+ #52839 -+ * Put the NEWS changelog back in Closes: #52678 -+ * Fixed that damn Rsmp annoying message bug Closes: #48686 -+ * Remove /etc/init.d/procps Closes: #53818 -+ -+ -- Craig Small Mon, 20 Dec 1999 11:14:53 +1100 -+ -+procps (1:2.0.6-3) unstable; urgency=low -+ -+ * Patched ps so it complains if you chmod 711 /proc Closes: #52481 -+ * Did the same for top. -+ * Ditto for oldps. -+ * Changed and int to a char* Closes: #52482 -+ * sysctl.conf file references sysctl.conf (5) not 8 Closes: #52385 -+ * props init.d script changed to procps.sh Closes: #52228 -+ -+ -- Craig Small Mon, 13 Dec 1999 11:57:01 +1100 -+ -+procps (1:2.0.6-2) unstable; urgency=low -+ -+ * Changed psmisc from reccomends to suggests -+ * %MEM now works, Closes: #50010 #50055 #50148 #50356 -+ * top doesn't crash with > 204 processes Closes: #50055 -+ * Another libproc fd leak fixed Closes: #45398 -+ * ps silently ignores m and -m for future compatibility Closes: #48308 -+ * Added a sysctl.conf and other files as suggested Closes: #51098 -+ * Fix start field instability -+ * ps.1 fixed Closes: #35137 -+ -+ -- Craig Small Tue, 7 Dec 1999 14:42:51 +1100 -+ -+procps (1:2.0.6-1) unstable; urgency=low -+ -+ * New upstream -+ * sysctl crash fixed, Closes: #49015 -+ * libproc file descriptor leak fixed, Closes: #45398 -+ * False positive System.map mismatches killed, Closes: #49047 -+ * Supports 64 Hz for StrongARM/Shark Closes: #47461 -+ * pr_time fixed, Closes: #46223 -+ * libc num cpu workaround back in, Closes: #49039 -+ * Fixed kill manpage, Closes: #47018 -+ * This version definitely, absolutely has kill, Closes: #46762 -+ -+ -+ -- Craig Small Fri, 5 Nov 1999 12:46:05 +1100 -+ -+procps (1:2.0.3-5) unstable; urgency=low -+ -+ * Changed conflicts with replaces -+ -+ -- Craig Small Wed, 6 Oct 1999 14:36:48 +1000 -+ -+procps (1:2.0.3-4) unstable; urgency=low -+ -+ * support SMP systems with versioned kernel modules Closes: #45621, #46465 -+ * Added kill to this (it is removed from bsdutils). -+ * We now need kill manpage, Closes: #46004 -+ -+ -- Craig Small Tue, 5 Oct 1999 10:28:01 +1000 -+ -+procps (1:2.0.3-3) unstable; urgency=low -+ -+ * System.map support for non-i386 Closes: #45592, #45250 -+ * Do not require /proc/ksyms Closes: #45128, #45132, #45619 -+ * Alternative w.1 points to the right spot, Closes: #45331 -+ * Copyright for skill and snice and ps fixed, Closes: #45119 -+ -+ -- Craig Small Tue, 21 Sep 1999 16:31:59 +1000 -+ -+procps (1:2.0.3-2) unstable; urgency=medium -+ -+ * Now with top! Closes: #45106 -+ -+ -- Craig Small Wed, 15 Sep 1999 11:12:34 +1000 -+ -+procps (1:2.0.3-1) unstable; urgency=low -+ -+ * New upstream source -+ * Debian personality does m flag Closes: #44832 -+ * Corrected typo in top.1 Closes: #44836 -+ * New improved watch Closes: #29970 -+ -+ -- Craig Small Mon, 13 Sep 1999 16:59:16 +1000 -+ -+procps (1:2.0.2-4) unstable; urgency=high -+ -+ * Fixed the nasty ps formatting problem (Bug #40859 #40856 #40839 ) -+ -+ -- Craig Small Wed, 7 Jul 1999 08:41:54 +1000 -+ -+procps (1:2.0.2-3) unstable; urgency=low -+ -+ * New upstream patches/source -+ * SMB Hz wierdness fixed (Bug #33023 #33284) -+ * non-tty output does not get chopped at 80 columns (bug #36688) -+ * BSD personalities set the default selection and output format (bug #36698) -+ * Fixed collumn spacing problem (Bug #35309) -+ * Work around for borken libs that return 0 processors (Bug #36902) -+ * skill now uses process name not command line (Bug #19208) -+ -+ -- Craig Small Mon, 5 Jul 1999 07:29:47 +1000 -+ -+procps (1:2.0.2-2) unstable; urgency=low -+ -+ * Removed kill and manual page (Bug #36421 #36551 #36375) -+ * Put in patch for bogus sysconf return (Bug #36494 #36532 #36581) -+ -+ -- Craig Small Wed, 28 Apr 1999 09:04:59 +1000 -+ -+procps (1:2.0.2-1) unstable; urgency=low -+ -+ * New upstream version (Bug #34394 #27291 #34250 #34956 #35240 #35247 -+ #35520 #35756 #34580 ) -+ -+ -- Craig Small Mon, 19 Apr 1999 13:26:48 +1000 -+ -+procps (1:2.0.0-1) unstable; urgency=low -+ -+ * New upstream version (Bug #33083 23347 33462 10556 33266 33371 ) -+ -+ -+ -- Craig Small Mon, 15 Mar 1999 14:21:57 +1100 -+ -+procps (1:1.9.0-2) unstable; urgency=low -+ -+ * top now resumes (Bug #32106 ) -+ * debhelper text problem fixed in postinst (Bug #32963 #33122 #33003 33117 ) -+ * oldps and ps now use alternatives (Bug #33083 ) -+ * ps s format now not ugly (Bug #28266 ) -+ * watch command line help and man page correct (Bug #31702 ) -+ * sessreg removed from package (Bug #32294 ) -+ * ps doesn't display extra spaces (Bug #27799 ) -+ * top has spaces in command lines again (Bug #33060 ) -+ * ps now has personality (Bug #22923 #18429 ) -+ * moved non-free skill and snice to non-free package. -+ -+ -- Craig Small Tue, 9 Feb 1999 15:10:58 +1100 -+ -+procps (1:1.9.0-1) unstable; urgency=low -+ -+ * New Upstream source -+ -+ -- Craig Small Thu, 4 Feb 1999 14:48:37 +1100 -+ -+procps (1:1.2.9-3) unstable; urgency=low -+ -+ * Linked to ncurses4 -+ -+ -- Craig Small Fri, 30 Oct 1998 14:13:02 +1100 -+ -+procps (1:1.2.9-2) unstable; urgency=low -+ -+ * top now has spaces in between command lines (Bug #28178 ) -+ * --version or -V now shows proper version. -+ -+ -- Craig Small Mon, 26 Oct 1998 08:55:59 +1100 -+ -+procps (1:1.2.9-1) unstable; urgency=low -+ -+ * New upstream version (Bug #27573 ) -+ * Menu entry changed from System to Menu/System (Bug #27438 ) -+ * Char variables changed to int for powerpc (Bug #26624 ) -+ * libproc now nulls allocated structure (Bug #26225 ) -+ * No longer uses psdevtab (yay!) (Bug #25388 ) -+ * ps doesn't double space command line parameters (Bug #25306 #24293 ) -+ * ps now silently ignores g flag for those BSD heads (Bug #24075 ) -+ -+ -- Craig Small Fri, 9 Oct 1998 09:15:11 +1000 -+ -+procps (1:1.2.7-2) unstable; urgency=low -+ -+ * Top can suspend twice (or three times even) (Bug #22997 ) -+ * Libraries properly built (Bug #20010 ) -+ -+ -- Craig Small Mon, 1 Jun 1998 09:16:09 +1000 -+ -+procps (1:1.2.7-1) frozen unstable; urgency=high -+ -+ * New upstream source, fixes security bug (Bug #21475) -+ -+ -- Craig Small Thu, 23 Apr 1998 08:04:54 +1000 -+ -+procps (1:1.2.6-2) unstable; urgency=low -+ -+ * Fixed Shared library dependencies (bugs #18388 #18394 18392 ) -+ * Conflicts with earlier versions of w-bassman (bug #18389 ) -+ -+ -- Craig Small Mon, 23 Feb 1998 09:05:54 +1100 -+ -+procps (1:1.2.6-1) unstable; urgency=low -+ -+ * New upstream source. -+ * xload is undiverted (Bug #17102 ) -+ * ps_fields.7.gz removed (Bug #18090 ) -+ * Colour patches removed, color-related bugs gone (Bug #18008 #17217 #18090 ) -+ * POSIX patches removed, cmd line bugs gone (Bug #15537 ) -+ * w is now an alternative w.procps (Bug #17960 ) -+ * skill now works with process names (Bug #17087 ) -+ * ps and top man pages have their field descriptions (Bug #17360 ) -+ * ps u fixed (Bug #17313 ) -+ * Source code is no longer FUBAR (Bug #17892 ) -+ * top now redraws screen after config screen (Bug #11896 ) -+ * Circular dependency removed (Bug #16966 ) -+ * top does mess up screens with wrong cmd line (Bug #17230 ) -+ * top suspends with ctrl-Z (Bug #16703 ) -+ -+ -- Craig Small Tue, 17 Feb 1998 08:31:21 +1100 -+ -+procps (1:1.2.5-2) unstable; urgency=low -+ -+ * Moved /bin into /bin/ps (Bug #17001 ) -+ -+ -- Craig Small Tue, 13 Jan 1998 07:50:43 +1100 -+ -+procps (1:1.2.5-1) unstable; urgency=low -+ -+ * TTY selection works ( #16724 ) -+ * top and ps now accept --colour and *_COLOURS -+ * xproc copyright file not compressed ( #14491 ) -+ * All #include now #include "proc/*.h" ( #13482 ) -+ * Copyright doesn't mention psmisc now ( #16704 ) -+ * Moved ps back into /bin ( #16737 #16705 ) -+ * New upstream source ( #16795 ) -+ -+ -- Craig Small Mon, 12 Jan 1998 08:35:10 +1100 -+ -+procps (1:1.2.2-1) unstable; urgency=low -+ -+ * New maintainer -+ * Updated upstream source to 1.2.2 (instead of 1.2) -+ * Merged Helmut's color/command line patches into upstream. -+ * Copyright file is not compressed ( #14493 #14415 ) -+ * psdatabase refreshed when installing ( #10693 ) -+ * Fixed +/- line in free ( #10785 #10870 #11566 #12027 #12245 #12374 ) -+ * w collumns corrected ( #10898 #13117 ) -+ * top saves sort type ( #11553 ) -+ * Linked to libc6 ( #11725 ) -+ * top doesn't coredump with S option ( #11855 ) -+ * skill works with given patch ( #12023 ) -+ * libproc-dev has proper sym link ( #12697 ) -+ * top -h doesn't change terminal settings ( #13513 ) -+ * ps -s has "CAUGHT" not "CATCHED" ( #14342 ) -+ * ps_colors.7 and ps_fields.7 reformatted ( #14109 #14544 #14545 ) -+ * ps checks for tty before using colors ( #14596 ) -+ * top sets stop signal handler later, stopping race ( #14769 ) -+ * When using POSIX personality, processes show up ( #14780 ) -+ * top checks for valid term type ( #15807 ) -+ * xproc now Depends on procps-1.2.*-* ( #10762 #13347 ) -+ * xproc dependencies fixed ( #12698 ) -+ -+ -- Craig Small Tue, 30 Dec 1997 11:33:54 +1100 -+ -+procps (1.12.2.1) unstable; urgency=low -+ -+ * Non-maintainer release, built for libc6. -+ * Added in free.c from new procps version 1.2.3 (from sunsite), seems to -+ fix all the problems with free reporting bogus valus. -+ -+ -- Joey Hess Fri, 24 Oct 1997 13:34:35 -0400 -+ -+procps (1.12.2) stable unstable; urgency=low -+ -+ * fixed meminfo handling again, as the fix wouldn't work on pre-2.1.x -+ kernels. -+ * fixed free to use the meminfo routines from libproc. -+ -+ -- Helmut Geyer Fri, 13 Jun 1997 22:42:14 +0200 -+ -+procps (1.12.1) stable unstable; urgency=low -+ -+ * fixed several bugs -+ * replaced utmp handling to support wrappers. -+ * added /proc/meminfo support for 2.1.x kernels. -+ -+ -- Helmut Geyer Tue, 10 Jun 1997 23:59:41 +0200 -+ -+procps (1.11.6) frozen unstable; urgency=medium -+ -+ * psmisc 1.14 : new upstream version (mainly bugfixes) -+ * added a lot of new serial device major numbers to the device lookup -+ code. Somehow it seems there are new serial devices every other week. -+ * fixed a bug in top: broken .toprc may cause a segmentation fault. -+ -+ -- Helmut Geyer Sun, 4 May 1997 09:50:30 +0200 -+ -+procps (1.11.5) frozen unstable; urgency=medium -+ -+ * minor changes to make it compile with libc6 -+ * fix top behaviour on machines having nonstandard NR_TASKS up to 4k -+ tasks -+ -+ -- Helmut Geyer Fri, 18 Apr 1997 02:07:46 +0200 -+ -+procps (1.11.4) unstable; urgency=medium -+ -+ * strip libproc.so from unneeded symbols (Bug# 8311) -+ * fixed watch.1 example (Bug# 8169) -+ * partly fixed fuser sigsegv core dump (Bug# 8004) -+ * menu entries for xproc and procps (Bug# 8325) -+ * divertions for xmem and xload. (Bug# 7565) -+ -+ -- Helmut Geyer Sun, 13 Apr 1997 20:55:05 +0200 -+ -+procps (1.11.3) unstable; urgency=low -+ -+ * fixed uptime again, minor Makefile changes -+ -+ -- Helmut Geyer Fri, 21 Feb 1997 16:22:04 +0100 -+ -+procps (1.11.2) unstable; urgency=medium -+ -+ * fixed typo in ps_fields.7 (Bug#5457) -+ * fixed typo in debian/rules (Bug #5585) -+ * fixed bug in w introduced in 1.11.1 (Bugs #5489, #5694, #5695, #5705). -+ * added support for non-standard serial devices (long overdue - Bug -+ #5771). -+ * fixed uptime option handling (Bug #6099). -+ * fixed top problems with missing/corrupted utmp (Bug #5819). -+ * fixed manpage problems (Bug #5936). -+ -+ -- Helmut Geyer Wed, 19 Feb 1997 18:49:26 +0100 -+ -+procps (1.11.1) unstable; urgency=low -+ -+ * fixed bug in w -+ * automatic resize if field length is exceeded. This changed the shared -+ library, so popping the major number. -+ * fixed numeric WCHAN output on Alphas and stupid bug in ps (again, -+ thanks to H. Koenig). -+ * fixed top memory statistics for systems with more than 100M memory or -+ swap. -+ -+ -- Helmut Geyer Tue, 12 Nov 1996 02:57:18 +0100 -+ -+procps (1.10.1) unstable; urgency=low -+ -+ * merged in ALPHA & Sparc patches -+ (from ftp.azstarnet.com:/pub/linux/axp/glibc) -+ * fixed ps --deselect/-N for pid lists -+ * use shared libs from now on, install shlibs again -+ * manpages for libproc -+ * static lib compiled without -fPIC -+ * added libproc package for development installing libproc headers, -+ manpages and static library. -+ * fixed PROC_REAL bug when PROC_FILLSTATUS isn't set. -+ * fixed color bug in ps --forest -+ * added xproc package for xload, xmem, xidle, xcpustate -+ (XConsole left out as we use xconsole & klogd on debian) -+ * adapted xload manpage for xidle and xmem -+ * fixed xmem to cope with newer kernels (where shared pages are counted -+ once for each additional reference) -+ * fixed top change_fields bug (a field needs 24, not 21 spaces) -+ * fixed several Alpha bugs (thanks to Harald Koenig) -+ * due to popular demand, the old format for time intervals is back. -+ for all program using this, a toggle command line option has been -+ provided. The default behaviour depends on the compile time option -+ NEW_TIME_DEFAULT (see main Makefile) -+ -+ -- Helmut Geyer Wed, 23 Oct 1996 21:30:54 +0200 -+ -+procps (1.09.2) unstable; urgency=low -+ -+ * fixed cpu nice % in summary -+ * fixed topsetup initialisation in top.h I messed up in last revision -+ * fixed pipe output bug -+ * fixed --deselect bug in SVR4/POSIX mode -+ -+ -- Helmut Geyer Sun, 20 Oct 1996 13:57:11 +0200 -+ -+procps (1.09.1) unstable; urgency=low -+ -+ * fixed ps -w bug displaying too many empty lines -+ * fixed SIGSEGV bug in ps -www -+ * fixed bug in top not calculating length of the command/args/env fields -+ at the field selection screen in some circumstances. -+ * fixed SIGSEGV bug when using environ field -+ -+ -- Helmut Geyer Sat, 12 Oct 1996 07:59:29 +0200 -+ -+procps (1.09) experimental; urgency=low -+ -+ * This is an experimental release of the procps suite. A lot of features have -+ been added since the 1.01(a) release: -+ - support for both BSD and POSIX (SVR4) style command line options. -+ - completely configurable display of information. -+ - colour markup of processes exceeding limits or belonging to a user. -+ Please take a look at /usr/doc/procps/NEWS and the manpages for a concise -+ list. This is how the next upstream release of procps may look -+ (i.e. it will look like this if there is not too much resistance). -+ -+ -- Helmut Geyer Sat, 5 Oct 1996 14:26:57 +0200 ---- procps-3.1.15.orig/kill.1 -+++ procps-3.1.15/kill.1 -@@ -10,16 +10,11 @@ - kill \- send a signal to a process - - .SH SYNOPSIS --.TS --l l. --kill pid ... Send SIGTERM to every process listed. --kill -signal pid ... Send a signal to every process listed. --kill -s signal pid ... Send a signal to every process listed. --kill -l List all signal names. --kill -L List all signal names in a nice table. --kill -l signal Convert a signal number into a name. --kill -V,--version Show version of program --.TE -+\fBkill\fR [ -\fBsignal\fR | -s \fBsignal\fR ] \fBpid\fR ... -+.br -+\fBkill\fR [ -L | -V, --version ] -+.br -+\fBkill\fR -l [ \fBsignal\fR ] - - .SH DESCRIPTION - The default signal for kill is TERM. Use -l or -L to list available signals. -@@ -105,7 +100,7 @@ - .fi - .PP - .SH "SEE ALSO" --pkill(1) skill(1) kill(2) renice(1) nice(1) signal(7) killall(1) -+.BR pkill (1), skill (1), kill (2), renice (1), nice (1), signal (7), killall (1). - - .SH STANDARDS - This command meets appropriate standards. The -L flag is Linux-specific. ---- procps-3.1.15.orig/tload.c -+++ procps-3.1.15/tload.c -@@ -30,9 +30,6 @@ - static int dly=5; - static jmp_buf jb; - --extern int optind; --extern char *optarg; -- - static void alrm(int signo) - { - (void)signo; ---- procps-3.1.15.orig/pgrep.c -+++ procps-3.1.15/pgrep.c -@@ -367,7 +367,8 @@ - preg = do_regcomp (); - - if (opt_newest) saved_start_time = 0ULL; -- if (opt_oldest) saved_start_time = ~0ULL; -+ else -+ saved_start_time = ~0ULL; - if (opt_newest) saved_pid = 0; - if (opt_oldest) saved_pid = INT_MAX; - ---- procps-3.1.15.orig/top.1 -+++ procps-3.1.15/top.1 -@@ -430,8 +430,8 @@ - The number of\fB major\fR page faults that have occurred for a task. - A page fault occurs when a process attempts to read from or write to a virtual - page that is not currently present in its address space. --A major page fault is when disk access is involved in making that --page available. -+A major page fault is when backing storage access (such as a disk) is involved -+in making that page available. - - .TP 3 - v:\fB nDRT\fR \*(EM Dirty Pages count diff --git a/recipes/procps/procps-3.2.1/install.patch b/recipes/procps/procps-3.2.1/install.patch deleted file mode 100644 index 2d16c26f17..0000000000 --- a/recipes/procps/procps-3.2.1/install.patch +++ /dev/null @@ -1,16 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- procps-3.1.15/Makefile~install 2003-12-24 03:01:55.000000000 +0100 -+++ procps-3.1.15/Makefile 2004-02-11 00:45:59.000000000 +0100 -@@ -147,7 +147,7 @@ - ###### install - - $(BINFILES) : all -- $(install) --mode a=rx --strip $(notdir $@) $@ -+ $(install) --mode a=rx $(notdir $@) $@ - - $(MANFILES) : all - $(install) --mode a=r $(notdir $@) $@ diff --git a/recipes/procps/procps-3.2.1/pagesz-not-constant.patch b/recipes/procps/procps-3.2.1/pagesz-not-constant.patch deleted file mode 100644 index 8e9e1ebfe1..0000000000 --- a/recipes/procps/procps-3.2.1/pagesz-not-constant.patch +++ /dev/null @@ -1,22 +0,0 @@ -Index: procps-3.2.1/proc/devname.c -=================================================================== ---- procps-3.2.1.orig/proc/devname.c 2004-03-18 05:43:50.000000000 +1100 -+++ procps-3.2.1/proc/devname.c 2005-04-02 10:40:17.462138000 +1000 -@@ -227,7 +227,7 @@ - - /* number --> name */ - unsigned dev_to_tty(char *restrict ret, unsigned chop, dev_t dev_t_dev, int pid, unsigned int flags) { -- static char buf[PAGE_SIZE]; -+ static char buf[4096]; - char *restrict tmp = buf; - unsigned dev = dev_t_dev; - unsigned i = 0; -@@ -249,7 +249,7 @@ - if((flags&ABBREV_TTY) && !strncmp(tmp,"tty", 3) && tmp[3]) tmp += 3; - if((flags&ABBREV_PTS) && !strncmp(tmp,"pts/", 4) && tmp[4]) tmp += 4; - /* gotta check before we chop or we may chop someone else's memory */ -- if(chop + (unsigned long)(tmp-buf) <= sizeof buf) -+ if(chop + (unsigned long)(tmp-buf) < sizeof buf) - tmp[chop] = '\0'; - /* replace non-ASCII characters with '?' and return the number of chars */ - for(;;){ diff --git a/recipes/procps/procps-3.2.5/install.patch b/recipes/procps/procps-3.2.5/install.patch deleted file mode 100644 index 9f1ef6915d..0000000000 --- a/recipes/procps/procps-3.2.5/install.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- procps-3.2.5.virgin/Makefile 2005-01-26 05:55:26.000000000 +0100 -+++ procps-3.2.5/Makefile 2005-08-03 04:55:26.346984488 +0200 -@@ -30,7 +30,10 @@ - install := install -D --owner 0 --group 0 - - # Lame x86-64 /lib64 and /usr/lib64 abomination: --lib64 := lib$(shell [ -d /lib64 ] && echo 64) -+# lib64 := lib$(shell [ -d /lib64 ] && echo 64) -+ -+# Equally lame hack to work around makefile lameness when the host arch is 64bit, but the target is not. -+lib64 := lib - - usr/bin := $(DESTDIR)/usr/bin/ - bin := $(DESTDIR)/bin/ -@@ -211,10 +214,10 @@ - ###### install - - $(BINFILES) : all -- $(install) --mode a=rx $(notdir $@) $@ -+ $(install) -m 555 $(notdir $@) $@ - - $(MANFILES) : all -- $(install) --mode a=r $(notdir $@) $@ -+ $(install) -m 444 $(notdir $@) $@ - - install: $(filter-out $(SKIP) $(addprefix $(DESTDIR),$(SKIP)),$(INSTALL)) - cd $(usr/bin) && $(ln_f) skill snice diff --git a/recipes/procps/procps-3.2.5/pagesz-not-constant.patch b/recipes/procps/procps-3.2.5/pagesz-not-constant.patch deleted file mode 100644 index 8e9e1ebfe1..0000000000 --- a/recipes/procps/procps-3.2.5/pagesz-not-constant.patch +++ /dev/null @@ -1,22 +0,0 @@ -Index: procps-3.2.1/proc/devname.c -=================================================================== ---- procps-3.2.1.orig/proc/devname.c 2004-03-18 05:43:50.000000000 +1100 -+++ procps-3.2.1/proc/devname.c 2005-04-02 10:40:17.462138000 +1000 -@@ -227,7 +227,7 @@ - - /* number --> name */ - unsigned dev_to_tty(char *restrict ret, unsigned chop, dev_t dev_t_dev, int pid, unsigned int flags) { -- static char buf[PAGE_SIZE]; -+ static char buf[4096]; - char *restrict tmp = buf; - unsigned dev = dev_t_dev; - unsigned i = 0; -@@ -249,7 +249,7 @@ - if((flags&ABBREV_TTY) && !strncmp(tmp,"tty", 3) && tmp[3]) tmp += 3; - if((flags&ABBREV_PTS) && !strncmp(tmp,"pts/", 4) && tmp[4]) tmp += 4; - /* gotta check before we chop or we may chop someone else's memory */ -- if(chop + (unsigned long)(tmp-buf) <= sizeof buf) -+ if(chop + (unsigned long)(tmp-buf) < sizeof buf) - tmp[chop] = '\0'; - /* replace non-ASCII characters with '?' and return the number of chars */ - for(;;){ diff --git a/recipes/procps/procps-3.2.5/procmodule.patch b/recipes/procps/procps-3.2.5/procmodule.patch deleted file mode 100644 index fabfabaa59..0000000000 --- a/recipes/procps/procps-3.2.5/procmodule.patch +++ /dev/null @@ -1,36 +0,0 @@ -*** procps-3.2.5/proc/module.mk.orig Sun Jul 24 11:53:49 2005 ---- procps-3.2.5/proc/module.mk Sun Jul 24 11:54:32 2005 -*************** -*** 96,102 **** - #################### install rules ########################### - - $(lib)$(SOFILE) : proc/$(SONAME) -! $(install) --mode a=rx $< $@ - - ifneq ($(SOLINK),$(SOFILE)) - .PHONY: $(lib)$(SOLINK) ---- 96,102 ---- - #################### install rules ########################### - - $(lib)$(SOFILE) : proc/$(SONAME) -! $(install) -m 555 $< $@ - - ifneq ($(SOLINK),$(SOFILE)) - .PHONY: $(lib)$(SOLINK) -*************** -*** 115,121 **** - $(ldconfig) - - $(usr/lib)$(ANAME) : proc/$(ANAME) -! $(install) --mode a=r $< $@ - - # Junk anyway... supposed to go in /usr/include/$(NAME) - #INSTALL += $(addprefix $(include),$(HDRFILES)) ---- 115,121 ---- - $(ldconfig) - - $(usr/lib)$(ANAME) : proc/$(ANAME) -! $(install) -m 444 $< $@ - - # Junk anyway... supposed to go in /usr/include/$(NAME) - #INSTALL += $(addprefix $(include),$(HDRFILES)) diff --git a/recipes/procps/procps-3.2.5/psmodule.patch b/recipes/procps/procps-3.2.5/psmodule.patch deleted file mode 100644 index f298c1c1c4..0000000000 --- a/recipes/procps/procps-3.2.5/psmodule.patch +++ /dev/null @@ -1,21 +0,0 @@ -*** procps-3.2.5/ps/module.mk.orig Sun Jul 24 11:54:40 2005 ---- procps-3.2.5/ps/module.mk Sun Jul 24 11:55:02 2005 -*************** -*** 33,40 **** - - - $(bin)ps: ps/ps -! $(install) --mode a=rx $< $@ - - $(man1)ps.1 : ps/ps.1 -! $(install) --mode a=r $< $@ - -rm -f $(DESTDIR)/var/catman/cat1/ps.1.gz $(DESTDIR)/var/man/cat1/ps.1.gz ---- 33,40 ---- - - - $(bin)ps: ps/ps -! $(install) -m 555 $< $@ - - $(man1)ps.1 : ps/ps.1 -! $(install) -m 444 $< $@ - -rm -f $(DESTDIR)/var/catman/cat1/ps.1.gz $(DESTDIR)/var/man/cat1/ps.1.gz diff --git a/recipes/procps/procps-3.2.7/install.patch b/recipes/procps/procps-3.2.7/install.patch deleted file mode 100644 index 9f1ef6915d..0000000000 --- a/recipes/procps/procps-3.2.7/install.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- procps-3.2.5.virgin/Makefile 2005-01-26 05:55:26.000000000 +0100 -+++ procps-3.2.5/Makefile 2005-08-03 04:55:26.346984488 +0200 -@@ -30,7 +30,10 @@ - install := install -D --owner 0 --group 0 - - # Lame x86-64 /lib64 and /usr/lib64 abomination: --lib64 := lib$(shell [ -d /lib64 ] && echo 64) -+# lib64 := lib$(shell [ -d /lib64 ] && echo 64) -+ -+# Equally lame hack to work around makefile lameness when the host arch is 64bit, but the target is not. -+lib64 := lib - - usr/bin := $(DESTDIR)/usr/bin/ - bin := $(DESTDIR)/bin/ -@@ -211,10 +214,10 @@ - ###### install - - $(BINFILES) : all -- $(install) --mode a=rx $(notdir $@) $@ -+ $(install) -m 555 $(notdir $@) $@ - - $(MANFILES) : all -- $(install) --mode a=r $(notdir $@) $@ -+ $(install) -m 444 $(notdir $@) $@ - - install: $(filter-out $(SKIP) $(addprefix $(DESTDIR),$(SKIP)),$(INSTALL)) - cd $(usr/bin) && $(ln_f) skill snice diff --git a/recipes/procps/procps-3.2.7/linux-limits.patch b/recipes/procps/procps-3.2.7/linux-limits.patch deleted file mode 100644 index dcd66163ad..0000000000 --- a/recipes/procps/procps-3.2.7/linux-limits.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/pwdx.c b/pwdx.c -index cb96a52..29ebce2 100644 ---- a/pwdx.c -+++ b/pwdx.c -@@ -13,7 +13,7 @@ - #include - #include - #include --#include -+#include - #include - #include - diff --git a/recipes/procps/procps-3.2.7/pagesz-not-constant.patch b/recipes/procps/procps-3.2.7/pagesz-not-constant.patch deleted file mode 100644 index 8e9e1ebfe1..0000000000 --- a/recipes/procps/procps-3.2.7/pagesz-not-constant.patch +++ /dev/null @@ -1,22 +0,0 @@ -Index: procps-3.2.1/proc/devname.c -=================================================================== ---- procps-3.2.1.orig/proc/devname.c 2004-03-18 05:43:50.000000000 +1100 -+++ procps-3.2.1/proc/devname.c 2005-04-02 10:40:17.462138000 +1000 -@@ -227,7 +227,7 @@ - - /* number --> name */ - unsigned dev_to_tty(char *restrict ret, unsigned chop, dev_t dev_t_dev, int pid, unsigned int flags) { -- static char buf[PAGE_SIZE]; -+ static char buf[4096]; - char *restrict tmp = buf; - unsigned dev = dev_t_dev; - unsigned i = 0; -@@ -249,7 +249,7 @@ - if((flags&ABBREV_TTY) && !strncmp(tmp,"tty", 3) && tmp[3]) tmp += 3; - if((flags&ABBREV_PTS) && !strncmp(tmp,"pts/", 4) && tmp[4]) tmp += 4; - /* gotta check before we chop or we may chop someone else's memory */ -- if(chop + (unsigned long)(tmp-buf) <= sizeof buf) -+ if(chop + (unsigned long)(tmp-buf) < sizeof buf) - tmp[chop] = '\0'; - /* replace non-ASCII characters with '?' and return the number of chars */ - for(;;){ diff --git a/recipes/procps/procps-3.2.7/procmodule.patch b/recipes/procps/procps-3.2.7/procmodule.patch deleted file mode 100644 index fabfabaa59..0000000000 --- a/recipes/procps/procps-3.2.7/procmodule.patch +++ /dev/null @@ -1,36 +0,0 @@ -*** procps-3.2.5/proc/module.mk.orig Sun Jul 24 11:53:49 2005 ---- procps-3.2.5/proc/module.mk Sun Jul 24 11:54:32 2005 -*************** -*** 96,102 **** - #################### install rules ########################### - - $(lib)$(SOFILE) : proc/$(SONAME) -! $(install) --mode a=rx $< $@ - - ifneq ($(SOLINK),$(SOFILE)) - .PHONY: $(lib)$(SOLINK) ---- 96,102 ---- - #################### install rules ########################### - - $(lib)$(SOFILE) : proc/$(SONAME) -! $(install) -m 555 $< $@ - - ifneq ($(SOLINK),$(SOFILE)) - .PHONY: $(lib)$(SOLINK) -*************** -*** 115,121 **** - $(ldconfig) - - $(usr/lib)$(ANAME) : proc/$(ANAME) -! $(install) --mode a=r $< $@ - - # Junk anyway... supposed to go in /usr/include/$(NAME) - #INSTALL += $(addprefix $(include),$(HDRFILES)) ---- 115,121 ---- - $(ldconfig) - - $(usr/lib)$(ANAME) : proc/$(ANAME) -! $(install) -m 444 $< $@ - - # Junk anyway... supposed to go in /usr/include/$(NAME) - #INSTALL += $(addprefix $(include),$(HDRFILES)) diff --git a/recipes/procps/procps-3.2.7/procps.init b/recipes/procps/procps-3.2.7/procps.init deleted file mode 100644 index 739dcf4be7..0000000000 --- a/recipes/procps/procps-3.2.7/procps.init +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -SYSCTL_CONF="/etc/sysctl.conf" -if [ -f "${SYSCTL_CONF}" ]; then - /sbin/sysctl -q -p "${SYSCTL_CONF}" -fi diff --git a/recipes/procps/procps-3.2.7/psmodule.patch b/recipes/procps/procps-3.2.7/psmodule.patch deleted file mode 100644 index f298c1c1c4..0000000000 --- a/recipes/procps/procps-3.2.7/psmodule.patch +++ /dev/null @@ -1,21 +0,0 @@ -*** procps-3.2.5/ps/module.mk.orig Sun Jul 24 11:54:40 2005 ---- procps-3.2.5/ps/module.mk Sun Jul 24 11:55:02 2005 -*************** -*** 33,40 **** - - - $(bin)ps: ps/ps -! $(install) --mode a=rx $< $@ - - $(man1)ps.1 : ps/ps.1 -! $(install) --mode a=r $< $@ - -rm -f $(DESTDIR)/var/catman/cat1/ps.1.gz $(DESTDIR)/var/man/cat1/ps.1.gz ---- 33,40 ---- - - - $(bin)ps: ps/ps -! $(install) -m 555 $< $@ - - $(man1)ps.1 : ps/ps.1 -! $(install) -m 444 $< $@ - -rm -f $(DESTDIR)/var/catman/cat1/ps.1.gz $(DESTDIR)/var/man/cat1/ps.1.gz diff --git a/recipes/procps/procps-3.2.7/sysctl.conf b/recipes/procps/procps-3.2.7/sysctl.conf deleted file mode 100644 index 34e7488bf7..0000000000 --- a/recipes/procps/procps-3.2.7/sysctl.conf +++ /dev/null @@ -1,64 +0,0 @@ -# This configuration file is taken from Debian. -# -# /etc/sysctl.conf - Configuration file for setting system variables -# See sysctl.conf (5) for information. -# - -#kernel.domainname = example.com - -# Uncomment the following to stop low-level messages on console -#kernel.printk = 4 4 1 7 - -##############################################################3 -# Functions previously found in netbase -# - -# Uncomment the next two lines to enable Spoof protection (reverse-path filter) -# Turn on Source Address Verification in all interfaces to -# prevent some spoofing attacks -net.ipv4.conf.default.rp_filter=1 -net.ipv4.conf.all.rp_filter=1 - -# Uncomment the next line to enable TCP/IP SYN cookies -#net.ipv4.tcp_syncookies=1 - -# Uncomment the next line to enable packet forwarding for IPv4 -#net.ipv4.ip_forward=1 - -# Uncomment the next line to enable packet forwarding for IPv6 -#net.ipv6.conf.all.forwarding=1 - - -################################################################### -# Additional settings - these settings can improve the network -# security of the host and prevent against some network attacks -# including spoofing attacks and man in the middle attacks through -# redirection. Some network environments, however, require that these -# settings are disabled so review and enable them as needed. -# -# Ignore ICMP broadcasts -#net.ipv4.icmp_echo_ignore_broadcasts = 1 -# -# Ignore bogus ICMP errors -#net.ipv4.icmp_ignore_bogus_error_responses = 1 -# -# Do not accept ICMP redirects (prevent MITM attacks) -#net.ipv4.conf.all.accept_redirects = 0 -#net.ipv6.conf.all.accept_redirects = 0 -# _or_ -# Accept ICMP redirects only for gateways listed in our default -# gateway list (enabled by default) -# net.ipv4.conf.all.secure_redirects = 1 -# -# Do not send ICMP redirects (we are not a router) -#net.ipv4.conf.all.send_redirects = 0 -# -# Do not accept IP source route packets (we are not a router) -#net.ipv4.conf.all.accept_source_route = 0 -#net.ipv6.conf.all.accept_source_route = 0 -# -# Log Martian Packets -#net.ipv4.conf.all.log_martians = 1 -# - -#kernel.shmmax = 141762560 diff --git a/recipes/procps/procps-3.2.8/install.patch b/recipes/procps/procps-3.2.8/install.patch new file mode 100644 index 0000000000..9f1ef6915d --- /dev/null +++ b/recipes/procps/procps-3.2.8/install.patch @@ -0,0 +1,27 @@ +--- procps-3.2.5.virgin/Makefile 2005-01-26 05:55:26.000000000 +0100 ++++ procps-3.2.5/Makefile 2005-08-03 04:55:26.346984488 +0200 +@@ -30,7 +30,10 @@ + install := install -D --owner 0 --group 0 + + # Lame x86-64 /lib64 and /usr/lib64 abomination: +-lib64 := lib$(shell [ -d /lib64 ] && echo 64) ++# lib64 := lib$(shell [ -d /lib64 ] && echo 64) ++ ++# Equally lame hack to work around makefile lameness when the host arch is 64bit, but the target is not. ++lib64 := lib + + usr/bin := $(DESTDIR)/usr/bin/ + bin := $(DESTDIR)/bin/ +@@ -211,10 +214,10 @@ + ###### install + + $(BINFILES) : all +- $(install) --mode a=rx $(notdir $@) $@ ++ $(install) -m 555 $(notdir $@) $@ + + $(MANFILES) : all +- $(install) --mode a=r $(notdir $@) $@ ++ $(install) -m 444 $(notdir $@) $@ + + install: $(filter-out $(SKIP) $(addprefix $(DESTDIR),$(SKIP)),$(INSTALL)) + cd $(usr/bin) && $(ln_f) skill snice diff --git a/recipes/procps/procps-3.2.8/linux-limits.patch b/recipes/procps/procps-3.2.8/linux-limits.patch new file mode 100644 index 0000000000..dcd66163ad --- /dev/null +++ b/recipes/procps/procps-3.2.8/linux-limits.patch @@ -0,0 +1,13 @@ +diff --git a/pwdx.c b/pwdx.c +index cb96a52..29ebce2 100644 +--- a/pwdx.c ++++ b/pwdx.c +@@ -13,7 +13,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + diff --git a/recipes/procps/procps-3.2.8/pagesz-not-constant.patch b/recipes/procps/procps-3.2.8/pagesz-not-constant.patch new file mode 100644 index 0000000000..8e9e1ebfe1 --- /dev/null +++ b/recipes/procps/procps-3.2.8/pagesz-not-constant.patch @@ -0,0 +1,22 @@ +Index: procps-3.2.1/proc/devname.c +=================================================================== +--- procps-3.2.1.orig/proc/devname.c 2004-03-18 05:43:50.000000000 +1100 ++++ procps-3.2.1/proc/devname.c 2005-04-02 10:40:17.462138000 +1000 +@@ -227,7 +227,7 @@ + + /* number --> name */ + unsigned dev_to_tty(char *restrict ret, unsigned chop, dev_t dev_t_dev, int pid, unsigned int flags) { +- static char buf[PAGE_SIZE]; ++ static char buf[4096]; + char *restrict tmp = buf; + unsigned dev = dev_t_dev; + unsigned i = 0; +@@ -249,7 +249,7 @@ + if((flags&ABBREV_TTY) && !strncmp(tmp,"tty", 3) && tmp[3]) tmp += 3; + if((flags&ABBREV_PTS) && !strncmp(tmp,"pts/", 4) && tmp[4]) tmp += 4; + /* gotta check before we chop or we may chop someone else's memory */ +- if(chop + (unsigned long)(tmp-buf) <= sizeof buf) ++ if(chop + (unsigned long)(tmp-buf) < sizeof buf) + tmp[chop] = '\0'; + /* replace non-ASCII characters with '?' and return the number of chars */ + for(;;){ diff --git a/recipes/procps/procps-3.2.8/procmodule.patch b/recipes/procps/procps-3.2.8/procmodule.patch new file mode 100644 index 0000000000..fabfabaa59 --- /dev/null +++ b/recipes/procps/procps-3.2.8/procmodule.patch @@ -0,0 +1,36 @@ +*** procps-3.2.5/proc/module.mk.orig Sun Jul 24 11:53:49 2005 +--- procps-3.2.5/proc/module.mk Sun Jul 24 11:54:32 2005 +*************** +*** 96,102 **** + #################### install rules ########################### + + $(lib)$(SOFILE) : proc/$(SONAME) +! $(install) --mode a=rx $< $@ + + ifneq ($(SOLINK),$(SOFILE)) + .PHONY: $(lib)$(SOLINK) +--- 96,102 ---- + #################### install rules ########################### + + $(lib)$(SOFILE) : proc/$(SONAME) +! $(install) -m 555 $< $@ + + ifneq ($(SOLINK),$(SOFILE)) + .PHONY: $(lib)$(SOLINK) +*************** +*** 115,121 **** + $(ldconfig) + + $(usr/lib)$(ANAME) : proc/$(ANAME) +! $(install) --mode a=r $< $@ + + # Junk anyway... supposed to go in /usr/include/$(NAME) + #INSTALL += $(addprefix $(include),$(HDRFILES)) +--- 115,121 ---- + $(ldconfig) + + $(usr/lib)$(ANAME) : proc/$(ANAME) +! $(install) -m 444 $< $@ + + # Junk anyway... supposed to go in /usr/include/$(NAME) + #INSTALL += $(addprefix $(include),$(HDRFILES)) diff --git a/recipes/procps/procps-3.2.8/procps.init b/recipes/procps/procps-3.2.8/procps.init new file mode 100644 index 0000000000..739dcf4be7 --- /dev/null +++ b/recipes/procps/procps-3.2.8/procps.init @@ -0,0 +1,6 @@ +#!/bin/sh + +SYSCTL_CONF="/etc/sysctl.conf" +if [ -f "${SYSCTL_CONF}" ]; then + /sbin/sysctl -q -p "${SYSCTL_CONF}" +fi diff --git a/recipes/procps/procps-3.2.8/psmodule.patch b/recipes/procps/procps-3.2.8/psmodule.patch new file mode 100644 index 0000000000..f298c1c1c4 --- /dev/null +++ b/recipes/procps/procps-3.2.8/psmodule.patch @@ -0,0 +1,21 @@ +*** procps-3.2.5/ps/module.mk.orig Sun Jul 24 11:54:40 2005 +--- procps-3.2.5/ps/module.mk Sun Jul 24 11:55:02 2005 +*************** +*** 33,40 **** + + + $(bin)ps: ps/ps +! $(install) --mode a=rx $< $@ + + $(man1)ps.1 : ps/ps.1 +! $(install) --mode a=r $< $@ + -rm -f $(DESTDIR)/var/catman/cat1/ps.1.gz $(DESTDIR)/var/man/cat1/ps.1.gz +--- 33,40 ---- + + + $(bin)ps: ps/ps +! $(install) -m 555 $< $@ + + $(man1)ps.1 : ps/ps.1 +! $(install) -m 444 $< $@ + -rm -f $(DESTDIR)/var/catman/cat1/ps.1.gz $(DESTDIR)/var/man/cat1/ps.1.gz diff --git a/recipes/procps/procps-3.2.8/sysctl.conf b/recipes/procps/procps-3.2.8/sysctl.conf new file mode 100644 index 0000000000..34e7488bf7 --- /dev/null +++ b/recipes/procps/procps-3.2.8/sysctl.conf @@ -0,0 +1,64 @@ +# This configuration file is taken from Debian. +# +# /etc/sysctl.conf - Configuration file for setting system variables +# See sysctl.conf (5) for information. +# + +#kernel.domainname = example.com + +# Uncomment the following to stop low-level messages on console +#kernel.printk = 4 4 1 7 + +##############################################################3 +# Functions previously found in netbase +# + +# Uncomment the next two lines to enable Spoof protection (reverse-path filter) +# Turn on Source Address Verification in all interfaces to +# prevent some spoofing attacks +net.ipv4.conf.default.rp_filter=1 +net.ipv4.conf.all.rp_filter=1 + +# Uncomment the next line to enable TCP/IP SYN cookies +#net.ipv4.tcp_syncookies=1 + +# Uncomment the next line to enable packet forwarding for IPv4 +#net.ipv4.ip_forward=1 + +# Uncomment the next line to enable packet forwarding for IPv6 +#net.ipv6.conf.all.forwarding=1 + + +################################################################### +# Additional settings - these settings can improve the network +# security of the host and prevent against some network attacks +# including spoofing attacks and man in the middle attacks through +# redirection. Some network environments, however, require that these +# settings are disabled so review and enable them as needed. +# +# Ignore ICMP broadcasts +#net.ipv4.icmp_echo_ignore_broadcasts = 1 +# +# Ignore bogus ICMP errors +#net.ipv4.icmp_ignore_bogus_error_responses = 1 +# +# Do not accept ICMP redirects (prevent MITM attacks) +#net.ipv4.conf.all.accept_redirects = 0 +#net.ipv6.conf.all.accept_redirects = 0 +# _or_ +# Accept ICMP redirects only for gateways listed in our default +# gateway list (enabled by default) +# net.ipv4.conf.all.secure_redirects = 1 +# +# Do not send ICMP redirects (we are not a router) +#net.ipv4.conf.all.send_redirects = 0 +# +# Do not accept IP source route packets (we are not a router) +#net.ipv4.conf.all.accept_source_route = 0 +#net.ipv6.conf.all.accept_source_route = 0 +# +# Log Martian Packets +#net.ipv4.conf.all.log_martians = 1 +# + +#kernel.shmmax = 141762560 diff --git a/recipes/procps/procps.inc b/recipes/procps/procps.inc index 2de32d2c83..1db030d752 100644 --- a/recipes/procps/procps.inc +++ b/recipes/procps/procps.inc @@ -8,9 +8,64 @@ PRIORITY = "optional" LICENSE = "GPL" DEPENDS = "ncurses" -FILES_${PN} += "${base_libdir}/libproc-*.so" +INC_PR = "r9" -SRC_URI = "http://procps.sourceforge.net/procps-${PV}.tar.gz \ +SRC_URI = "http://procps.sourceforge.net/procps-${PV}.tar.gz;name=tarball \ + file://sysctl.conf \ + file://procps.init \ file://install.patch;patch=1" -inherit autotools +inherit autotools update-rc.d + +INITSCRIPT_NAME = "procps.sh" +INITSCRIPT_PARAMS = "start 30 S ." + +FILES_${PN} += "${base_libdir}/libproc-*.so" + +FILES = "${bindir}/top.${PN} ${base_bindir}/ps.${PN} ${bindir}/uptime.${PN} ${base_bindir}/kill.${PN} \ + ${bindir}/free.${PN} ${bindir}/w ${bindir}/watch ${bindir}/pgrep ${bindir}/pmap ${bindir}/pwdx \ + ${bindir}/snice ${bindir}/vmstat ${bindir}/slabtop ${bindir}/pkill ${bindir}/skill ${bindir}/tload \ + ${base_sbindir}/sysctl.${PN}" + +CONFFILES_${PN} = "${sysconfdir}/sysctl.conf" + +EXTRA_OEMAKE = "CFLAGS=-I${STAGING_INCDIR} \ + CPPFLAGS=-I${STAGING_INCDIR} \ + LDFLAGS="${LDFLAGS}" \ + CURSES=-lncurses \ + install='install -D' \ + ldconfig=echo" + +do_install_append () { + install -d ${D}${sysconfdir}/init.d + install -m 0644 ${WORKDIR}/sysctl.conf ${D}${sysconfdir}/sysctl.conf + install -m 0755 ${WORKDIR}/procps.init ${D}${sysconfdir}/init.d/procps.sh + + mv ${D}${bindir}/uptime ${D}${bindir}/uptime.${PN} + mv ${D}${bindir}/top ${D}${bindir}/top.${PN} + mv ${D}${base_bindir}/kill ${D}${base_bindir}/kill.${PN} + mv ${D}${base_bindir}/ps ${D}${base_bindir}/ps.${PN} + mv ${D}${bindir}/free ${D}${bindir}/free.${PN} + mv ${D}${base_sbindir}/sysctl ${D}${base_sbindir}/sysctl.${PN} + mv ${D}${bindir}/pkill ${D}${bindir}/pkill.${PN} +} + +pkg_postinst() { + update-alternatives --install ${bindir}/top top top.${PN} 90 + update-alternatives --install ${bindir}/uptime uptime uptime.${PN} 90 + update-alternatives --install ${base_bindir}/ps ps ps.${PN} 90 + update-alternatives --install ${base_bindir}/kill kill kill.${PN} 90 + update-alternatives --install ${bindir}/free free free.${PN} 90 + update-alternatives --install ${base_sbindir}/sysctl sysctl sysctl.${PN} 90 + update-alternatives --install ${bindir}/pkill pkill pkill.${PN} 90 +} + +pkg_postrm() { + update-alternatives --remove top top.${PN} + update-alternatives --remove ps ps.${PN} + update-alternatives --remove uptime uptime.${PN} + update-alternatives --remove kill kill.${PN} + update-alternatives --remove free free.${PN} + update-alternatives --remove sysctl sysctl.${PN} + update-alternatives --remove pkill pkill.${PN} +} diff --git a/recipes/procps/procps_3.1.15.bb b/recipes/procps/procps_3.1.15.bb deleted file mode 100644 index 01114e80dc..0000000000 --- a/recipes/procps/procps_3.1.15.bb +++ /dev/null @@ -1,9 +0,0 @@ -require procps.inc - -SRC_URI += "file://procps_${PV}-2.diff;patch=1" - -EXTRA_OEMAKE = "CFLAGS=-I${STAGING_INCDIR} \ - LDFLAGS=-L${STAGING_LIBDIR} -Wl,--rpath-link,${STAGING_LIBDIR} \ - CURSES=-lncurses \ - install='install -D' \ - ldconfig=echo" diff --git a/recipes/procps/procps_3.2.1.bb b/recipes/procps/procps_3.2.1.bb deleted file mode 100644 index 33df399c5f..0000000000 --- a/recipes/procps/procps_3.2.1.bb +++ /dev/null @@ -1,11 +0,0 @@ -require procps.inc - -PR = "r1" - -SRC_URI += "file://pagesz-not-constant.patch;patch=1" - -EXTRA_OEMAKE = "CFLAGS=-I${STAGING_INCDIR} \ - LDFLAGS=-L${STAGING_LIBDIR} -Wl,--rpath-link,${STAGING_LIBDIR} \ - CURSES=-lncurses \ - install='install -D' \ - ldconfig=echo" diff --git a/recipes/procps/procps_3.2.5.bb b/recipes/procps/procps_3.2.5.bb deleted file mode 100644 index de7524b2cb..0000000000 --- a/recipes/procps/procps_3.2.5.bb +++ /dev/null @@ -1,45 +0,0 @@ -require procps.inc - -PR = "r5" - -SRC_URI += "file://procmodule.patch;patch=1 \ - file://psmodule.patch;patch=1" - -FILES = "${bindir}/top.${PN} ${base_bindir}/ps.${PN} ${bindir}/uptime.${PN} ${base_bindir}/kill.${PN} \ - ${bindir}/free.${PN} ${bindir}/w ${bindir}/watch ${bindir}/pgrep ${bindir}/pmap ${bindir}/pwdx \ - ${bindir}/snice ${bindir}/vmstat ${bindir}/slabtop ${bindir}/pkill ${bindir}/skill ${bindir}/tload \ - ${base_sbindir}/sysctl.${PN}" - -EXTRA_OEMAKE = "CFLAGS=-I${STAGING_INCDIR} \ - CPPFLAGS=-I${STAGING_INCDIR} \ - LDFLAGS=-L${STAGING_LIBDIR} -Wl,--rpath-link,${STAGING_LIBDIR} \ - CURSES=-lncurses \ - install='install -D' \ - ldconfig=echo" - -do_install_append () { - mv ${D}${bindir}/uptime ${D}${bindir}/uptime.${PN} - mv ${D}${bindir}/top ${D}${bindir}/top.${PN} - mv ${D}${base_bindir}/kill ${D}${base_bindir}/kill.${PN} - mv ${D}${base_bindir}/ps ${D}${base_bindir}/ps.${PN} - mv ${D}${bindir}/free ${D}${bindir}/free.${PN} - mv ${D}${base_sbindir}/sysctl ${D}${base_sbindir}/sysctl.${PN} -} - -pkg_postinst() { - update-alternatives --install ${bindir}/top top top.${PN} 90 - update-alternatives --install ${bindir}/uptime uptime uptime.${PN} 90 - update-alternatives --install ${base_bindir}/ps ps ps.${PN} 90 - update-alternatives --install ${base_bindir}/kill kill kill.${PN} 90 - update-alternatives --install ${bindir}/free free free.${PN} 90 - update-alternatives --install ${base_sbindir}/sysctl sysctl sysctl.${PN} 90 -} - -pkg_postrm() { - update-alternatives --remove top top.${PN} - update-alternatives --remove ps ps.${PN} - update-alternatives --remove uptime uptime.${PN} - update-alternatives --remove kill kill.${PN} - update-alternatives --remove free free.${PN} - update-alternatives --remove sysctl sysctl.${PN} -} diff --git a/recipes/procps/procps_3.2.7.bb b/recipes/procps/procps_3.2.7.bb deleted file mode 100644 index b31b683708..0000000000 --- a/recipes/procps/procps_3.2.7.bb +++ /dev/null @@ -1,67 +0,0 @@ -require procps.inc - -PR = "r9" - -inherit update-rc.d - -INITSCRIPT_NAME = "procps.sh" -INITSCRIPT_PARAMS = "start 30 S ." - -SRC_URI += "file://procmodule.patch;patch=1 \ - file://psmodule.patch;patch=1 \ - file://linux-limits.patch;patch=1 \ - file://sysctl.conf \ - file://procps.init \ - " - -FILES = "${bindir}/top.${PN} ${base_bindir}/ps.${PN} ${bindir}/uptime.${PN} ${base_bindir}/kill.${PN} \ - ${bindir}/free.${PN} ${bindir}/w ${bindir}/watch ${bindir}/pgrep ${bindir}/pmap ${bindir}/pwdx \ - ${bindir}/snice ${bindir}/vmstat ${bindir}/slabtop ${bindir}/pkill ${bindir}/skill ${bindir}/tload \ - ${base_sbindir}/sysctl.${PN}" - -CONFFILES_${PN} = "${sysconfdir}/sysctl.conf" - -EXTRA_OEMAKE = "CFLAGS=-I${STAGING_INCDIR} \ - CPPFLAGS=-I${STAGING_INCDIR} \ - usr/bin=${D}${bindir}/ \ - bin=${D}${base_bindir}/ \ - usr/proc/bin=${D}${bindir}/ \ - LDFLAGS="${LDFLAGS}" \ - CURSES=-lncurses \ - install='install -D' \ - ldconfig=echo" - -do_install_append () { - install -d ${D}${sysconfdir} - install -m 0644 ${WORKDIR}/sysctl.conf ${D}${sysconfdir}/sysctl.conf - install -d ${D}${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/procps.init ${D}${sysconfdir}/init.d/procps.sh - - mv ${D}${bindir}/uptime ${D}${bindir}/uptime.${PN} - mv ${D}${bindir}/top ${D}${bindir}/top.${PN} - mv ${D}${base_bindir}/kill ${D}${base_bindir}/kill.${PN} - mv ${D}${base_bindir}/ps ${D}${base_bindir}/ps.${PN} - mv ${D}${bindir}/free ${D}${bindir}/free.${PN} - mv ${D}${base_sbindir}/sysctl ${D}${base_sbindir}/sysctl.${PN} - mv ${D}${bindir}/pkill ${D}${bindir}/pkill.${PN} -} - -pkg_postinst() { - update-alternatives --install ${bindir}/top top top.${PN} 90 - update-alternatives --install ${bindir}/uptime uptime uptime.${PN} 90 - update-alternatives --install ${base_bindir}/ps ps ps.${PN} 90 - update-alternatives --install ${base_bindir}/kill kill kill.${PN} 90 - update-alternatives --install ${bindir}/free free free.${PN} 90 - update-alternatives --install ${base_sbindir}/sysctl sysctl sysctl.${PN} 90 - update-alternatives --install ${bindir}/pkill pkill pkill.${PN} 90 -} - -pkg_postrm() { - update-alternatives --remove top top.${PN} - update-alternatives --remove ps ps.${PN} - update-alternatives --remove uptime uptime.${PN} - update-alternatives --remove kill kill.${PN} - update-alternatives --remove free free.${PN} - update-alternatives --remove sysctl sysctl.${PN} - update-alternatives --remove pkill pkill.${PN} -} diff --git a/recipes/procps/procps_3.2.8.bb b/recipes/procps/procps_3.2.8.bb new file mode 100644 index 0000000000..22f54c3692 --- /dev/null +++ b/recipes/procps/procps_3.2.8.bb @@ -0,0 +1,11 @@ +require procps.inc + +PR = "${INC_PR}.0" + +SRC_URI += "file://procmodule.patch;patch=1 \ + file://psmodule.patch;patch=1 \ + file://linux-limits.patch;patch=1 \ + " + +SRC_URI[tarball.md5sum] = "9532714b6846013ca9898984ba4cd7e0" +SRC_URI[tarball.sha256sum] = "11ed68d8a4433b91cd833deb714a3aa849c02aea738c42e6b4557982419c1535" -- cgit v1.2.3 From 9bcb1b1bb571de4fa3cdfcfa2e3ba667b1ddfd04 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 15 Mar 2010 16:24:33 +0100 Subject: sourcepkg: replace python with shell to avoid problems with packaged-staging --- classes/sourcepkg.bbclass | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/classes/sourcepkg.bbclass b/classes/sourcepkg.bbclass index 65b1de5659..7c202af4c9 100644 --- a/classes/sourcepkg.bbclass +++ b/classes/sourcepkg.bbclass @@ -36,7 +36,7 @@ sourcepkg_do_create_orig_tgz(){ echo $i >> temp/exclude-from-file done - src_tree=${@get_src_tree(d)} + src_tree=$(basename ${S}) echo $src_tree oenote "Creating .orig.tar.gz in ${DEPLOY_DIR_SRC}/${PN}/${P}.orig.tar.gz" @@ -46,7 +46,7 @@ sourcepkg_do_create_orig_tgz(){ sourcepkg_do_archive_bb() { - src_tree=${@get_src_tree(d)} + src_tree=$(basename ${S}) dest=${WORKDIR}/$src_tree/${DISTRO} mkdir -p $dest @@ -86,7 +86,7 @@ sourcepkg_do_create_diff_gz(){ done - src_tree=${@get_src_tree(d)} + src_tree=$(basename ${S}) for i in `find . -maxdepth 1 -type f`; do mkdir -p $src_tree/${DISTRO}/files -- cgit v1.2.3 From cf8dafa148a5a17005ef7291ffdb2cebff4b3aae Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Mon, 15 Mar 2010 16:32:46 +0100 Subject: netbase: add BUG 2.0 support Signed-off-by: Marcin Juszkiewicz --- recipes/netbase/netbase/bug20/hosts | 3 +++ recipes/netbase/netbase/bug20/interfaces | 29 +++++++++++++++++++++++++++++ recipes/netbase/netbase_4.21.bb | 2 +- 3 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 recipes/netbase/netbase/bug20/hosts create mode 100644 recipes/netbase/netbase/bug20/interfaces diff --git a/recipes/netbase/netbase/bug20/hosts b/recipes/netbase/netbase/bug20/hosts new file mode 100644 index 0000000000..789d660fa7 --- /dev/null +++ b/recipes/netbase/netbase/bug20/hosts @@ -0,0 +1,3 @@ +127.0.0.1 localhost.localdomain localhost bug +10.10.10.1 bughost + diff --git a/recipes/netbase/netbase/bug20/interfaces b/recipes/netbase/netbase/bug20/interfaces new file mode 100644 index 0000000000..6e5f74eb45 --- /dev/null +++ b/recipes/netbase/netbase/bug20/interfaces @@ -0,0 +1,29 @@ +# /etc/network/interfaces -- configuration file for ifup(8), ifdown(8) + +# The loopback interface +auto lo +iface lo inet loopback + +# Ethernet/RNDIS gadget (g_ether) +# usbnet and static hwaddr for mac users +auto usb0 +iface usb0 inet static + hwaddress ether A2:80:F4:8A:3C:91 + address 10.10.10.10 + netmask 255.255.255.0 + gateway 10.10.10.1 + +# Wired interface +# BUGbase Ethernet which is built into kernel +# It is on USB but we rename it by udev rule +auto eth0 +iface eth0 inet dhcp + +# +# wireless interface +auto eth1 +iface eth1 inet dhcp + wireless_mode managed + wireless_essid any + wpa-driver wext + wpa-conf /etc/wpa_supplicant.conf diff --git a/recipes/netbase/netbase_4.21.bb b/recipes/netbase/netbase_4.21.bb index c8b4d19869..04d9623a2b 100644 --- a/recipes/netbase/netbase_4.21.bb +++ b/recipes/netbase/netbase_4.21.bb @@ -2,7 +2,7 @@ DESCRIPTION = "This package provides the necessary \ infrastructure for basic TCP/IP based networking." SECTION = "base" LICENSE = "GPL" -PR = "r40" +PR = "r41" inherit update-rc.d -- cgit v1.2.3 From c8f6250eff102362e590f2fdf60d3366037e3ce0 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Mon, 15 Mar 2010 16:34:38 +0100 Subject: bug20: initial configuration for BUG 2.0 device Currently it is at prototype phase so company internal only. Kernel recipe will not be added into OE for now. Signed-off-by: Marcin Juszkiewicz --- conf/machine/bug20.conf | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 conf/machine/bug20.conf diff --git a/conf/machine/bug20.conf b/conf/machine/bug20.conf new file mode 100644 index 0000000000..dbc1faf6ea --- /dev/null +++ b/conf/machine/bug20.conf @@ -0,0 +1,47 @@ +#@TYPE: Machine +#@NAME: BUG 2.0 +#@DESCRIPTION: Machine configuration for the BUG 2.0 board (OMAP3530 based) +TARGET_ARCH = "arm" + +PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" +XSERVER = "xserver-xorg \ + xserver-xorg-extension-dri \ + xserver-xorg-extension-glx \ + xf86-input-evdev \ + xf86-input-mouse \ + xf86-video-omapfb \ + xf86-input-keyboard" + +# Only has DVI connector for external screen +GUI_MACHINE_CLASS = "bigscreen" + +require conf/machine/include/omap3.inc + +# this kernel is not provided in OE yet +PREFERRED_PROVIDER_virtual/kernel = "linux-omap-hah" + +IMAGE_FSTYPES += "tar.bz2" + +SERIAL_CONSOLE = "115200 ttyS2" + +UBOOT_MACHINE = "omap3_bug_config" + +# do ubiattach /dev/ubi_ctrl -m 4 +# From dmesg: +# UBI: smallest flash I/O unit: 2048 +# UBI: logical eraseblock size: 129024 bytes +# from ubiattach stdout: +# UBI device number 0, total 1996 LEBs +MKUBIFS_ARGS = "-m 2048 -e 129024 -c 1996" + +# do ubiattach /dev/ubi_ctrl -m 4 +# from dmesg: +# UBI: smallest flash I/O unit: 2048 +# UBI: physical eraseblock size: 131072 bytes (128 KiB) +# UBI: sub-page size: 512 +UBINIZE_ARGS = "-m 2048 -p 128KiB -s 512" + +PREFERRED_VERSION_u-boot = "git" + +# and sdio +MACHINE_FEATURES = "kernel26 screen apm usbgadget usbhost vfat alsa" -- cgit v1.2.3 From 88f377942a443be18f28bac91338d7117ad404ac Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Mon, 15 Mar 2010 16:36:19 +0100 Subject: xserver-xorg-conf: provide working setup for BUG 2.0 Copied from BeagleBoard one. Signed-off-by: Marcin Juszkiewicz --- recipes/xorg-xserver/xserver-xorg-conf_0.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/xorg-xserver/xserver-xorg-conf_0.1.bb b/recipes/xorg-xserver/xserver-xorg-conf_0.1.bb index 617eee66c9..1be87b16f4 100644 --- a/recipes/xorg-xserver/xserver-xorg-conf_0.1.bb +++ b/recipes/xorg-xserver/xserver-xorg-conf_0.1.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Machine specific xorg.conf files" -PR = "r20" +PR = "r21" SRC_URI = "file://xorg.conf" -- cgit v1.2.3 From e19f00968b9d865088ef3a45a85825c5fc17edc5 Mon Sep 17 00:00:00 2001 From: Thomas Zimmermann Date: Mon, 15 Mar 2010 16:42:14 +0100 Subject: qemu: fix build without zlib headers installed on buildhost *qemu-native fails to build without zlib-dev package installed on buildhost *configure script just adds -I. and -I${SRC_DIR} to QEMU_CFLAGS to build checks, so it fails to build without headers installed on host *change DEPENDS from zlib to zlib-native to install zlib headers in staging Signed-off-by: Thomas Zimmermann --- recipes/qemu/qemu_0.12.3.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/recipes/qemu/qemu_0.12.3.bb b/recipes/qemu/qemu_0.12.3.bb index 035b1a5b3a..bc5c251641 100644 --- a/recipes/qemu/qemu_0.12.3.bb +++ b/recipes/qemu/qemu_0.12.3.bb @@ -1,5 +1,5 @@ LICENSE = "GPL" -DEPENDS = "zlib" +DEPENDS = "zlib-native" PR = "r0" @@ -32,5 +32,6 @@ EXTRA_OECONF += "--disable-sdl --disable-strip" inherit autotools do_configure() { + export QEMU_CFLAGS="-I${STAGING_INCDIR_NATIVE} ${QEMU_CFLAGS}" ${S}/configure --prefix=${prefix} ${EXTRA_OECONF} } -- cgit v1.2.3 From 87b74b371b6c1d64c508c028d0633e9ad4ce1df3 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 15 Mar 2010 17:19:45 +0100 Subject: mplayer: bump PR for ffmpeg change --- recipes/mplayer/mplayer_svn.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/mplayer/mplayer_svn.bb b/recipes/mplayer/mplayer_svn.bb index 1d7f30d4f4..dd94767167 100644 --- a/recipes/mplayer/mplayer_svn.bb +++ b/recipes/mplayer/mplayer_svn.bb @@ -39,7 +39,7 @@ RCONFLICTS_${PN} = "mplayer-atty" RREPLACES_${PN} = "mplayer-atty" PV = "0.0+1.0rc3+svnr${SRCPV}" -PR = "r18" +PR = "r19" DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_angstrom = "1" DEFAULT_PREFERENCE_shr = "1" -- cgit v1.2.3 From ebac0f7b1b6287ca0d6315176a6070b013836032 Mon Sep 17 00:00:00 2001 From: Valentin Longchamp Date: Mon, 15 Mar 2010 07:04:04 +0000 Subject: Do not generate NEON code for qt-4.6.2 embedded on armv6 http://bugreports.qt.nokia.com/browse/QTBUG-8749 Neon code is generated for armv6 processor, where it should be armv7 only. This results in illegal instructions with some of the qt4 libraries. The current solution is not optimal, I just needed a quick fix for my arch and I don't have the needed knowledge in OE to fix it cleanly, but I wanted to point this issue out. But at least other arch (armv5 and armv4) should have the same problem and receive the same fix. Signed-off-by: Koen Kooi --- recipes/qt4/qt4-embedded_4.6.2.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/recipes/qt4/qt4-embedded_4.6.2.bb b/recipes/qt4/qt4-embedded_4.6.2.bb index 94ecd01bc6..8583752d6d 100644 --- a/recipes/qt4/qt4-embedded_4.6.2.bb +++ b/recipes/qt4/qt4-embedded_4.6.2.bb @@ -1,6 +1,8 @@ require qt4-embedded.inc -PR = "${INC_PR}.0" +PR = "${INC_PR}.1" + +QT_CONFIG_FLAGS_append_armv6 = " -no-neon " require qt-${PV}.inc -- cgit v1.2.3 From ed5210189a29729ee7fd31e7e522b9aeb6036bbb Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 15 Mar 2010 19:40:10 +0100 Subject: xf86-input-evtouch: perform sprint cleaning on the recipe to make it build again --- .../xf86-input-evtouch/02_calibration_1.6.patch | 41 + .../xf86-input-evtouch/03_server-1.6-ftbfs.diff | 61 + .../xf86-input-evtouch/04_server-1.7-ftbfs.diff | 516 +++ .../20_fix_calibrate_submission_directions.patch | 13 - .../21_more_calibration_fixups.patch | 33 - .../xf86-input-evtouch/fdi/50-elo-2700.fdi | 16 + .../xf86-input-evtouch/fdi/50-gunze.fdi | 16 + .../xf86-input-evtouch/fdi/50-ideaco-idc6681.fdi | 23 + .../xf86-input-evtouch/fdi/50-touchpack.fdi | 30 + .../xf86-input-evtouch_0.8.8-0ubuntu6.diff | 4210 -------------------- recipes/xorg-driver/xf86-input-evtouch_0.8.8.bb | 8 +- 11 files changed, 707 insertions(+), 4260 deletions(-) create mode 100644 recipes/xorg-driver/xf86-input-evtouch/02_calibration_1.6.patch create mode 100644 recipes/xorg-driver/xf86-input-evtouch/03_server-1.6-ftbfs.diff create mode 100644 recipes/xorg-driver/xf86-input-evtouch/04_server-1.7-ftbfs.diff delete mode 100644 recipes/xorg-driver/xf86-input-evtouch/20_fix_calibrate_submission_directions.patch delete mode 100644 recipes/xorg-driver/xf86-input-evtouch/21_more_calibration_fixups.patch create mode 100644 recipes/xorg-driver/xf86-input-evtouch/fdi/50-elo-2700.fdi create mode 100644 recipes/xorg-driver/xf86-input-evtouch/fdi/50-gunze.fdi create mode 100644 recipes/xorg-driver/xf86-input-evtouch/fdi/50-ideaco-idc6681.fdi create mode 100644 recipes/xorg-driver/xf86-input-evtouch/fdi/50-touchpack.fdi delete mode 100644 recipes/xorg-driver/xf86-input-evtouch/xf86-input-evtouch_0.8.8-0ubuntu6.diff diff --git a/recipes/xorg-driver/xf86-input-evtouch/02_calibration_1.6.patch b/recipes/xorg-driver/xf86-input-evtouch/02_calibration_1.6.patch new file mode 100644 index 0000000000..c461758115 --- /dev/null +++ b/recipes/xorg-driver/xf86-input-evtouch/02_calibration_1.6.patch @@ -0,0 +1,41 @@ +From: Thomas Jaeger +Date: Sun, 22 Mar 2009 20:58:58 -0400 +Subject: Make calibration work on xserver-1.6 + +Stolen from Ubuntu. + +Index: xserver-xorg-input-evtouch/ev_calibrate.c +=================================================================== +--- xserver-xorg-input-evtouch.orig/ev_calibrate.c ++++ xserver-xorg-input-evtouch/ev_calibrate.c +@@ -218,7 +218,7 @@ + int cap_style = CapButt; /* style of the line's edje and */ + int join_style = JoinBevel; /* joined lines. */ + +- int event_mask = ExposureMask | ButtonReleaseMask | PointerMotionMask | KeyPressMask; ++ int event_mask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PointerMotionMask | KeyPressMask; + + int depth; + int screen_num; +Index: xserver-xorg-input-evtouch/evtouch.c +=================================================================== +--- xserver-xorg-input-evtouch.orig/evtouch.c ++++ xserver-xorg-input-evtouch/evtouch.c +@@ -306,7 +306,7 @@ + } + + if (pos_changed == 1) { +-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 2 ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 2 + ConvertProc(priv->local, 0, 2, + priv->raw_x, priv->raw_y, + 0, 0, 0, 0, +@@ -369,7 +369,7 @@ + priv->raw_y = priv->min_y; + } + +-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 2 ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 2 + ConvertProc(priv->local, 0, 2, + priv->raw_x, priv->raw_y, + 0, 0, 0, 0, diff --git a/recipes/xorg-driver/xf86-input-evtouch/03_server-1.6-ftbfs.diff b/recipes/xorg-driver/xf86-input-evtouch/03_server-1.6-ftbfs.diff new file mode 100644 index 0000000000..79192cbad5 --- /dev/null +++ b/recipes/xorg-driver/xf86-input-evtouch/03_server-1.6-ftbfs.diff @@ -0,0 +1,61 @@ +From: Julien Cristau +Date: Sun, 17 May 2009 18:54:59 +0200 +Subject: Fix build with server 1.6 + +* uninclude xf86Version.h +* fix InitValuatorClassDeviceStruct usage +* fix input ABI check + +Index: xserver-xorg-input-evtouch/evtouch.c +=================================================================== +--- xserver-xorg-input-evtouch.orig/evtouch.c ++++ xserver-xorg-input-evtouch/evtouch.c +@@ -30,10 +30,8 @@ + + #define _evdev_touch_C_ + +-#include +-#if XF86_VERSION_CURRENT >= XF86_VERSION_NUMERIC(3,9,0,0,0) ++#include + #define XFREE86_V4 +-#endif + + /***************************************************************************** + * Standard Headers +@@ -74,7 +72,6 @@ + #include "xf86_OSproc.h" + #include "xf86Xinput.h" + #include "exevents.h" +-#include "xf86OSmouse.h" + #include "randrstr.h" + + #ifndef NEED_XF86_TYPES +@@ -139,7 +136,7 @@ + "Kenan Esau", + MODINFOSTRING1, + MODINFOSTRING2, +- XF86_VERSION_CURRENT, ++ XORG_VERSION_CURRENT, + 0, 8, 8, + ABI_CLASS_XINPUT, + ABI_XINPUT_VERSION, +@@ -652,14 +649,17 @@ + * Device reports motions on 2 axes in absolute coordinates. + * Axes min and max values are reported in raw coordinates. + */ +- if (InitValuatorClassDeviceStruct(dev, 2, xf86GetMotionEvents, ++ if (InitValuatorClassDeviceStruct(dev, 2, ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0 ++ xf86GetMotionEvents, ++#endif + local->history_size, Absolute) == FALSE) + { + ErrorF ("Unable to allocate EVTouch touchscreen ValuatorClassDeviceStruct\n"); + return !Success; + } + +-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 2 ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 2 + xf86InitValuatorAxisStruct(dev, 0, 0, priv->screen_width, + 1024, + EV_AXIS_MIN_RES /* min_res */ , diff --git a/recipes/xorg-driver/xf86-input-evtouch/04_server-1.7-ftbfs.diff b/recipes/xorg-driver/xf86-input-evtouch/04_server-1.7-ftbfs.diff new file mode 100644 index 0000000000..726297cff6 --- /dev/null +++ b/recipes/xorg-driver/xf86-input-evtouch/04_server-1.7-ftbfs.diff @@ -0,0 +1,516 @@ +commit f88ce643a4d343cc27ef6ef7e0bf148f885043ab +Author: Mattia Dongili +Date: Sun Jan 24 15:45:51 2010 +0900 + + 04 + + Build with 1.7. Also add some more probing taken from evdev. + + Signed-off-by: Mattia Dongili + +Index: xserver-xorg-input-evtouch/evtouch.c +=================================================================== +--- xserver-xorg-input-evtouch.orig/evtouch.c 2010-02-14 14:08:33.000000000 +0900 ++++ xserver-xorg-input-evtouch/evtouch.c 2010-02-14 14:13:51.000000000 +0900 +@@ -57,6 +57,7 @@ + #define NEED_EVENTS + #include + #include ++#include + + #include "xf86.h" + +@@ -129,7 +130,6 @@ + 0 + }; + +-#ifdef XFree86LOADER + static XF86ModuleVersionInfo VersionRec = + { + "evtouch", +@@ -164,9 +164,7 @@ + } + + +-XF86ModuleData evtouchModuleData = {&VersionRec, Plug, Unplug }; +- +-#endif /* XFree86LOADER */ ++_X_EXPORT XF86ModuleData evtouchModuleData = {&VersionRec, Plug, Unplug }; + + + static const char *default_options[] = +@@ -239,7 +237,7 @@ + + priv->emulate3_timer_expired = TRUE; + xf86UnblockSIGIO(sigstate); +- ++ + return 0; + } + +@@ -339,7 +337,7 @@ + priv->cur_x, + priv->cur_y); + } +- } ++ } + } + } + +@@ -372,7 +370,7 @@ + 0, 0, 0, 0, + &priv->cur_x, &priv->cur_y); + #endif +- ++ + libtouchSetPos(priv->libtouch, priv->cur_x, priv->cur_y); + } + +@@ -394,7 +392,7 @@ + priv->emulate3_timeout, + emulate3Timer, + local); +- ++ + if ( (ev->value == 1) && (ev->code == BTN_LEFT) ) { + priv->touch_flags |= LB_STAT; + } +@@ -419,7 +417,7 @@ + DBGOUT(2, "EVTouch: Right Release\n"); + priv->touch_flags &= ~RB_STAT; + SetBtnAction(priv, 3, BTN_RELEASE); +- } ++ } + } else { + if (ev->code == BTN_LEFT) { + SetBtnAction(priv, 1, ev->value); +@@ -478,26 +476,98 @@ + return; + } + +- +- ++#define TestBit(bit, array) ((array[(bit) / LONG_BITS]) & (1L << ((bit) % LONG_BITS))) ++#define ArrayLength(a) (sizeof(a) / (sizeof((a)[0]))) + + static Bool + QueryHardware (LocalDevicePtr local) + { +- DBGOUT(2, "EVTouch: %s\n", __FUNCTION__); +- +- return Success; ++ EVTouchPrivatePtr priv = (EVTouchPrivatePtr) (local->private); ++ size_t len; ++ int i, num_buttons; ++ ++ DBGOUT(2, "EVTouch: %s\n", __FUNCTION__); ++ ++ if (ioctl(local->fd, EVIOCGNAME(sizeof(priv->name) - 1), priv->name) < 0) { ++ xf86Msg(X_ERROR, "ioctl EVIOCGNAME failed: %s\n", strerror(errno)); ++ goto error; ++ } ++ ++ len = ioctl(local->fd, EVIOCGBIT(0, sizeof(priv->bitmask)), priv->bitmask); ++ if (len < 0) { ++ xf86Msg(X_ERROR, "%s: ioctl EVIOCGBIT failed: %s\n", ++ local->name, strerror(errno)); ++ goto error; ++ } ++ ++ len = ioctl(local->fd, EVIOCGBIT(EV_REL, sizeof(priv->rel_bitmask)), priv->rel_bitmask); ++ if (len < 0) { ++ xf86Msg(X_ERROR, "%s: ioctl EVIOCGBIT failed: %s\n", ++ local->name, strerror(errno)); ++ goto error; ++ } ++ ++ len = ioctl(local->fd, EVIOCGBIT(EV_ABS, sizeof(priv->abs_bitmask)), priv->abs_bitmask); ++ if (len < 0) { ++ xf86Msg(X_ERROR, "%s: ioctl EVIOCGBIT failed: %s\n", ++ local->name, strerror(errno)); ++ goto error; ++ } ++ ++ len = ioctl(local->fd, EVIOCGBIT(EV_KEY, sizeof(priv->key_bitmask)), priv->key_bitmask); ++ if (len < 0) { ++ xf86Msg(X_ERROR, "%s: ioctl EVIOCGBIT failed: %s\n", ++ local->name, strerror(errno)); ++ goto error; ++ } ++ ++ num_buttons = 0; ++ ++ /* count all buttons */ ++ for (i = BTN_MISC; i < BTN_JOYSTICK; i++) ++ { ++ if (TestBit(i, priv->key_bitmask)) ++ { ++ if (i > num_buttons) ++ num_buttons = i; ++ } ++ } ++ if (num_buttons) ++ { ++ priv->flags |= EVTOUCH_BUTTON_EVENTS; ++ priv->num_buttons = num_buttons; ++ xf86Msg(X_INFO, "%s: Found %d mouse buttons\n", local->name, ++ num_buttons); ++ } ++ ++ for (i = 0; i < REL_MAX; i++) { ++ if (TestBit(i, priv->rel_bitmask)) { ++ xf86Msg(X_INFO, "%s: Found relative axes\n", local->name); ++ priv->flags |= EVTOUCH_RELATIVE_EVENTS; ++ break; ++ } ++ } ++ ++ for (i = 0; i < ABS_MAX; i++) { ++ if (TestBit(i, priv->abs_bitmask)) { ++ xf86Msg(X_INFO, "%s: Found absolute axes\n", local->name); ++ priv->flags |= EVTOUCH_ABSOLUTE_EVENTS; ++ break; ++ } ++ } ++ ++ return Success; ++error: ++ return (!Success); + } + + +- +- + static Bool + DeviceOn (DeviceIntPtr dev) + { + LocalDevicePtr local = (LocalDevicePtr) dev->public.devicePrivate; + EVTouchPrivatePtr priv = (EVTouchPrivatePtr) (local->private); +- ++ + local->fd = xf86OpenSerial(local->options); + + DBGOUT(2, "EVTouch: %s\n", __FUNCTION__ ); +@@ -512,8 +582,7 @@ + + DBG (9, XisbTrace (priv->buffer, 1)); + +- +- if (!priv->buffer) ++ if (!priv->buffer) + { + xf86CloseSerial(local->fd); + local->fd = -1; +@@ -531,7 +600,6 @@ + if (ioctl(local->fd, EVIOCGRAB, (void *)1)) + xf86Msg(X_ERROR, "%s: Unable to grab device (%s).\n", local->name, strerror(errno)); + +- + #ifndef XFREE86_V4 + xf86AddEnabledDevice(local); + #else +@@ -544,8 +612,6 @@ + } + + +- +- + static Bool + DeviceOff (DeviceIntPtr dev) + { +@@ -555,7 +621,7 @@ + DBGOUT(2, "EVTouch: %s\n", __FUNCTION__ ); + + if (local->fd != -1) +- { ++ { + ioctl(local->fd, EVIOCGRAB, (void *)0); + xf86RemoveEnabledDevice (local); + if (priv->buffer) +@@ -577,6 +643,73 @@ + } + + ++static Atom *EvtouchInitButtonLabels(void) ++{ ++#ifdef HAVE_LABELS ++ Atom *labels = xalloc(EV_MAX_BUTTONS * sizeof(Atom)); ++ ++ /* initialize the 5 button labels used by this driver */ ++ labels[0] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_LEFT); ++ labels[1] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_MIDDLE); ++ labels[2] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_RIGHT); ++ labels[3] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_WHEEL_UP); ++ labels[4] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_WHEEL_DOWN); ++ ++ return labels; ++#endif ++} ++ ++static char* abs_labels[] = { ++ AXIS_LABEL_PROP_ABS_X, ++ AXIS_LABEL_PROP_ABS_Y, ++ AXIS_LABEL_PROP_ABS_Z, ++ AXIS_LABEL_PROP_ABS_WHEEL ++}; ++static char* rel_labels[] = { ++ AXIS_LABEL_PROP_REL_X, ++ AXIS_LABEL_PROP_REL_Y, ++ AXIS_LABEL_PROP_REL_Z, ++ AXIS_LABEL_PROP_REL_WHEEL ++}; ++ ++static void ++EvtouchInitAxesLabels(EVTouchPrivatePtr pEVTouch, int natoms, Atom *atoms) ++{ ++#ifdef HAVE_LABELS ++ Atom atom; ++ int axis; ++ char **labels; ++ int labels_len = 0; ++ char *misc_label; ++ ++ if (pEVTouch->flags & EVTOUCH_ABSOLUTE_EVENTS) ++ { ++ labels = abs_labels; ++ labels_len = ArrayLength(abs_labels); ++ misc_label = AXIS_LABEL_PROP_ABS_MISC; ++ } else if ((pEVTouch->flags & EVTOUCH_RELATIVE_EVENTS)) ++ { ++ labels = rel_labels; ++ labels_len = ArrayLength(rel_labels); ++ misc_label = AXIS_LABEL_PROP_REL_MISC; ++ } ++ ++ memset(atoms, 0, natoms * sizeof(Atom)); ++ ++ /* Now fill the ones we know */ ++ for (axis = 0; axis < labels_len; axis++) ++ { ++ if (pEVTouch->axis_map[axis] == -1) ++ continue; ++ ++ atom = XIGetKnownProperty(labels[axis]); ++ if (!atom) /* Should not happen */ ++ continue; ++ ++ atoms[pEVTouch->axis_map[axis]] = atom; ++ } ++#endif ++} + + + static Bool +@@ -585,6 +718,7 @@ + DBGOUT(2, "EVTouch: %s\n", __FUNCTION__); + LocalDevicePtr local = (LocalDevicePtr) dev->public.devicePrivate; + EVTouchPrivatePtr priv = (EVTouchPrivatePtr) (local->private); ++ Atom *labels, *atoms; + unsigned char map[EV_MAX_BUTTONS]; + int i; + +@@ -593,7 +727,7 @@ + + priv->btn_count = EV_MAX_BUTTONS; + +- /* ++ /* + * these have to be here instead of in the SetupProc, because when the + * SetupProc is run at server startup, screenInfo is not setup yet + */ +@@ -603,9 +737,9 @@ + priv->screen_height = pScrn->virtualY; + priv->pViewPort_X0 = &(pScrn->frameX0); /* initialize the pointers to the viewport coords */ + if ( (priv->screen_width != priv->phys_width) || +- (priv->screen_height != priv->phys_height) ) ++ (priv->screen_height != priv->phys_height) ) + priv->virtual = 1; +- else ++ else + priv->virtual = 0; + + priv->pViewPort_Y0 = &(pScrn->frameY0); +@@ -620,24 +754,29 @@ + DBGOUT(2, "EVTouch: MaxValue H,V: %d %d\n", pScrn->maxHValue, pScrn->maxVValue); + + priv->screen_width = screenInfo.screens[priv->screen_num]->width; +- priv->screen_height = screenInfo.screens[priv->screen_num]->height; ++ priv->screen_height = screenInfo.screens[priv->screen_num]->height; + +- /* ++ /* + * Device reports button press for 5 buttons. + */ +- if (InitButtonClassDeviceStruct (dev, EV_MAX_BUTTONS, map) == FALSE) ++ labels = EvtouchInitButtonLabels(); ++ if (InitButtonClassDeviceStruct (dev, EV_MAX_BUTTONS, ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 ++ labels, ++#endif ++ map) == FALSE) + { + ErrorF("Unable to allocate EVTouch touchscreen ButtonClassDeviceStruct\n"); + return BadAlloc; +- } ++ } + +- DBGOUT(2, "EVTouch: %s btn_count=%d\n", __FUNCTION__, ++ DBGOUT(2, "EVTouch: %s btn_count=%d\n", __FUNCTION__, + priv->btn_count); + priv->btn_actions = xcalloc(priv->btn_count, sizeof(BtnAction)); +- memset(priv->btn_actions, 0, ++ memset(priv->btn_actions, 0, + priv->btn_count * sizeof(BtnAction)); +- +- DBGOUT(2, "EVTouch: %s btn_count=%d\n", __FUNCTION__, ++ ++ DBGOUT(2, "EVTouch: %s btn_count=%d\n", __FUNCTION__, + priv->btn_count); + + if (InitFocusClassDeviceStruct(dev) == FALSE) { +@@ -645,13 +784,18 @@ + return !Success; + } + +- /* ++ /* + * Device reports motions on 2 axes in absolute coordinates. + * Axes min and max values are reported in raw coordinates. + */ ++ atoms = xalloc(2 * sizeof(Atom)); ++ EvtouchInitAxesLabels(priv, 2, atoms); ++ + if (InitValuatorClassDeviceStruct(dev, 2, + #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0 + xf86GetMotionEvents, ++#elif GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 ++ atoms, + #endif + local->history_size, Absolute) == FALSE) + { +@@ -660,12 +804,20 @@ + } + + #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 2 +- xf86InitValuatorAxisStruct(dev, 0, 0, priv->screen_width, ++ xf86InitValuatorAxisStruct(dev, 0, ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 ++ atoms[0], ++#endif ++ 0, priv->screen_width, + 1024, + EV_AXIS_MIN_RES /* min_res */ , + EV_AXIS_MAX_RES /* max_res */ ); + xf86InitValuatorDefaults(dev, 0); +- xf86InitValuatorAxisStruct(dev, 1, 0, priv->screen_height, ++ xf86InitValuatorAxisStruct(dev, 1, ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 ++ atoms[1], ++#endif ++ 0, priv->screen_height, + 1024, + EV_AXIS_MIN_RES /* min_res */ , + EV_AXIS_MAX_RES /* max_res */ ); +@@ -682,7 +834,6 @@ + priv->raw_y=priv->cur_y; + libtouchSetPos(priv->libtouch, priv->cur_x, priv->cur_y); + +- + if (InitProximityClassDeviceStruct (dev) == FALSE) + { + ErrorF ("Unable to allocate EVTouch touchscreen ProximityClassDeviceStruct\n"); +@@ -695,7 +846,7 @@ + return !Success; + } + +- /* ++ /* + * Allocate the motion events buffer. + */ + xf86MotionHistoryAllocate (local); +@@ -765,7 +916,7 @@ + if (sizeof(priv->ev) == count) { + count = 0; + EVTouchDumpPacketToLog(priv); +- ++ + return Success; + } + } +Index: xserver-xorg-input-evtouch/evtouch.h +=================================================================== +--- xserver-xorg-input-evtouch.orig/evtouch.h 2010-02-14 14:01:43.000000000 +0900 ++++ xserver-xorg-input-evtouch/evtouch.h 2010-02-14 14:08:34.000000000 +0900 +@@ -35,6 +35,22 @@ + #define DBGOUT(lvl, ...) + #endif + ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 3 ++#define HAVE_PROPERTIES 1 ++ ++/* 1.6 has properties, but no labels */ ++#ifdef AXIS_LABEL_PROP ++#define HAVE_LABELS ++#else ++#undef HAVE_LABELS ++#endif ++ ++#endif ++ ++#define LONG_BITS (sizeof(long) * 8) ++/* Number of longs needed to hold the given number of bits */ ++#define NLONGS(x) (((x) + LONG_BITS - 1) / LONG_BITS) ++ + /****************************************************************************** + * Definitions + * structs, typedefs, #defines, enums +@@ -52,6 +68,10 @@ + + #define EV_MAX_BUTTONS 5 + ++#define EVTOUCH_BUTTON_EVENTS 0x01 ++#define EVTOUCH_RELATIVE_EVENTS 0x02 ++#define EVTOUCH_ABSOLUTE_EVENTS 0x04 ++ + #define TOUCHED 0x01 + #define X_COORD 0x02 + #define Y_COORD 0x04 +@@ -80,6 +100,8 @@ + int min_rel_y; /* Minimum y reported by calibration */ + int max_rel_y; /* Maximum y */ + ++ int axis_map[max(ABS_CNT, REL_CNT)]; /* Map evtouch to index */ ++ + int drag_timer; + Bool emulate3; + int emulate3_timeout; +@@ -129,10 +151,10 @@ + int screen_num; /* Screen associated with the device */ + int screen_width; /* Width of the associated X screen */ + int screen_height; /* Height of the screen */ +- ++ + XISBuffer *buffer; + struct input_event ev; /* packet being/just read */ +- ++ + int packeti; /* index into packet */ + Bool cs7flag; + Bool binary_pkt; /* indicates packet was a binary touch */ +@@ -141,6 +163,16 @@ + + LibTouchRecPtr libtouch; + LocalDevicePtr local; ++ ++ /* Cached info from device. */ ++ int flags; ++ int num_buttons; ++ char name[1024]; ++ unsigned long bitmask[NLONGS(EV_CNT)]; ++ unsigned long key_bitmask[NLONGS(KEY_CNT)]; ++ unsigned long rel_bitmask[NLONGS(REL_CNT)]; ++ unsigned long abs_bitmask[NLONGS(ABS_CNT)]; ++ + } EVTouchPrivateRec, *EVTouchPrivatePtr; + + diff --git a/recipes/xorg-driver/xf86-input-evtouch/20_fix_calibrate_submission_directions.patch b/recipes/xorg-driver/xf86-input-evtouch/20_fix_calibrate_submission_directions.patch deleted file mode 100644 index 68950a4ca3..0000000000 --- a/recipes/xorg-driver/xf86-input-evtouch/20_fix_calibrate_submission_directions.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: xf86-input-evtouch-0.8.8/calibrate.sh -=================================================================== ---- xf86-input-evtouch-0.8.8.orig/calibrate.sh 2009-01-14 14:14:10.000000000 +0100 -+++ xf86-input-evtouch-0.8.8/calibrate.sh 2009-01-14 14:14:51.000000000 +0100 -@@ -25,7 +25,7 @@ - FAILINFO="No evtouch capable device found, if you are sure you have \n\ - an evtouch capable touchscreen, please mail the \ - resulting file of the command \"lshal > evtouch_hal.out\" to the\n\ --ubuntu-mobile@lists.ubuntu.com mailing list, so support for your \ -+bug url https://bugs.launchpad.net/bugs/317094, so support for your \ - device can be added." - - if [ -z "$UDI" ];then diff --git a/recipes/xorg-driver/xf86-input-evtouch/21_more_calibration_fixups.patch b/recipes/xorg-driver/xf86-input-evtouch/21_more_calibration_fixups.patch deleted file mode 100644 index abb9e51a49..0000000000 --- a/recipes/xorg-driver/xf86-input-evtouch/21_more_calibration_fixups.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -u xf86-input-evtouch-0.8.8/evtouch.c xf86-input-evtouch-0.8.8/evtouch.c ---- xf86-input-evtouch-0.8.8/evtouch.c -+++ xf86-input-evtouch-0.8.8/evtouch.c -@@ -305,7 +305,7 @@ - } - - if (pos_changed == 1) { --#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 2 -+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 2 - ConvertProc(priv->local, 0, 2, - priv->raw_x, priv->raw_y, - 0, 0, 0, 0, -@@ -369,7 +369,7 @@ - priv->raw_y = priv->min_y; - } - --#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 2 -+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 2 - ConvertProc(priv->local, 0, 2, - priv->raw_x, priv->raw_y, - 0, 0, 0, 0, -diff -u xf86-input-evtouch-0.8.8/debian/changelog xf86-input-evtouch-0.8.8/debian/changelog ---- xf86-input-evtouch-0.8.8.orig/ev_calibrate.c -+++ xf86-input-evtouch-0.8.8/ev_calibrate.c -@@ -218,7 +218,7 @@ - int cap_style = CapButt; /* style of the line's edje and */ - int join_style = JoinBevel; /* joined lines. */ - -- int event_mask = ExposureMask | ButtonReleaseMask | PointerMotionMask | KeyPressMask; -+ int event_mask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PointerMotionMask | KeyPressMask; - - int depth; - int screen_num; diff --git a/recipes/xorg-driver/xf86-input-evtouch/fdi/50-elo-2700.fdi b/recipes/xorg-driver/xf86-input-evtouch/fdi/50-elo-2700.fdi new file mode 100644 index 0000000000..d274a54f72 --- /dev/null +++ b/recipes/xorg-driver/xf86-input-evtouch/fdi/50-elo-2700.fdi @@ -0,0 +1,16 @@ + + + + + + evtouch + 130 + 197 + 3945 + 3894 + 1 + 1 + + + + diff --git a/recipes/xorg-driver/xf86-input-evtouch/fdi/50-gunze.fdi b/recipes/xorg-driver/xf86-input-evtouch/fdi/50-gunze.fdi new file mode 100644 index 0000000000..3a5f49cb03 --- /dev/null +++ b/recipes/xorg-driver/xf86-input-evtouch/fdi/50-gunze.fdi @@ -0,0 +1,16 @@ + + + + + + evtouch + Raw + false + 1 + 35 + 37 + 990 + 986 + + + \ No newline at end of file diff --git a/recipes/xorg-driver/xf86-input-evtouch/fdi/50-ideaco-idc6681.fdi b/recipes/xorg-driver/xf86-input-evtouch/fdi/50-ideaco-idc6681.fdi new file mode 100644 index 0000000000..390f3bc652 --- /dev/null +++ b/recipes/xorg-driver/xf86-input-evtouch/fdi/50-ideaco-idc6681.fdi @@ -0,0 +1,23 @@ + + + + + + + + evtouch + raw + 50 + 30 + 15 + true + 50 + 1100 + 1650 + 7220 + 6560 + + + + + diff --git a/recipes/xorg-driver/xf86-input-evtouch/fdi/50-touchpack.fdi b/recipes/xorg-driver/xf86-input-evtouch/fdi/50-touchpack.fdi new file mode 100644 index 0000000000..cb14eeba48 --- /dev/null +++ b/recipes/xorg-driver/xf86-input-evtouch/fdi/50-touchpack.fdi @@ -0,0 +1,30 @@ + + + + + + evtouch + raw + false + 50 + true + 4095 + 4095 + 21 + 0 + false + false + false + 30 + 750 + click + 3 + 2 + 10 + 1 + click + 1 + + + + diff --git a/recipes/xorg-driver/xf86-input-evtouch/xf86-input-evtouch_0.8.8-0ubuntu6.diff b/recipes/xorg-driver/xf86-input-evtouch/xf86-input-evtouch_0.8.8-0ubuntu6.diff deleted file mode 100644 index abe5b8f4ba..0000000000 --- a/recipes/xorg-driver/xf86-input-evtouch/xf86-input-evtouch_0.8.8-0ubuntu6.diff +++ /dev/null @@ -1,4210 +0,0 @@ ---- xf86-input-evtouch-0.8.8.orig/evtouch.c -+++ xf86-input-evtouch-0.8.8/evtouch.c -@@ -30,8 +30,8 @@ - - #define _evdev_touch_C_ - --#include --#if XF86_VERSION_CURRENT >= XF86_VERSION_NUMERIC(3,9,0,0,0) -+#include -+#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(3,9,0,0,0) - #define XFREE86_V4 - #endif - -@@ -74,7 +74,6 @@ - #include "xf86_OSproc.h" - #include "xf86Xinput.h" - #include "exevents.h" --#include "xf86OSmouse.h" - #include "randrstr.h" - - #ifndef NEED_XF86_TYPES -@@ -139,7 +138,7 @@ - "Kenan Esau", - MODINFOSTRING1, - MODINFOSTRING2, -- XF86_VERSION_CURRENT, -+ XORG_VERSION_CURRENT, - 0, 8, 8, - ABI_CLASS_XINPUT, - ABI_XINPUT_VERSION, -@@ -653,14 +652,13 @@ - * Device reports motions on 2 axes in absolute coordinates. - * Axes min and max values are reported in raw coordinates. - */ -- if (InitValuatorClassDeviceStruct(dev, 2, xf86GetMotionEvents, -+ if (InitValuatorClassDeviceStruct(dev, 2, - local->history_size, Absolute) == FALSE) - { - ErrorF ("Unable to allocate EVTouch touchscreen ValuatorClassDeviceStruct\n"); - return !Success; - } - --#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 2 - xf86InitValuatorAxisStruct(dev, 0, 0, priv->screen_width, - 1024, - EV_AXIS_MIN_RES /* min_res */ , -@@ -671,10 +669,6 @@ - EV_AXIS_MIN_RES /* min_res */ , - EV_AXIS_MAX_RES /* max_res */ ); - xf86InitValuatorDefaults(dev, 1); --#else -- xf86InitValuatorAxisStruct(dev, 0, priv->min_x, priv->max_x, -- xf86InitValuatorDefaults(dev, 1); --#endif - - /* Initial position of pointer on screen: Centered */ - priv->cur_x=(priv->max_x - priv->min_x)/2; ---- xf86-input-evtouch-0.8.8.orig/debian/changelog -+++ xf86-input-evtouch-0.8.8/debian/changelog -@@ -0,0 +1,259 @@ -+xf86-input-evtouch (0.8.8-0ubuntu6) karmic; urgency=low -+ -+ * Add debian/fdi/50-touchpack.fdi to support TouchPack touchscreen devices -+ (Clevo TN120 series, ASUS EeeTOP, Winux Tablet, ...) -+ (LP: #401039) -+ -+ -- Mirsal Ennaime Sat, 24 Oct 2009 18:10:18 +0200 -+ -+xf86-input-evtouch (0.8.8-0ubuntu5) karmic; urgency=low -+ -+ * control: Add dependencies for ttf-freefont and x-ttcidfont-conf. -+ These dependencies are required by one of the earlier patches. -+ (LP: #299178) -+ * Add debian/fdi/50-elo-2700.fdi to support EloTouch 2700 IntelliTouch -+ Touchmonitor Interface. -+ (LP: #362308) -+ * Add debian/fdi/50-gunze.fdi to support GUNZE USB Touch Panel -+ (LP: #368135) -+ -+ -- Bryce Harrington Wed, 14 Oct 2009 02:10:14 -0700 -+ -+xf86-input-evtouch (0.8.8-0ubuntu4) karmic; urgency=low -+ -+ * Add debian/fdi/50-ideaco-idc6681.fdi to support IDEACO IDC 6681 -+ touchscreen. -+ (LP: #378357) -+ -+ -- Bryce Harrington Wed, 14 Oct 2009 01:35:50 -0700 -+ -+xf86-input-evtouch (0.8.8-0ubuntu3) jaunty; urgency=low -+ -+ * 21_more_calibration_fixups.patch: Make calibration work on xserver-1.6 -+ -+ -- Thomas Jaeger Sun, 22 Mar 2009 20:58:58 -0400 -+ -+xf86-input-evtouch (0.8.8-0ubuntu2) jaunty; urgency=low -+ -+ * install fdi files to /usr/share/hal/fdi/policy/20thirdparty so we make -+ sure its not synaptics that gets used. -+ -+ -- Oliver Grawert Wed, 28 Jan 2009 16:17:39 +0100 -+ -+xf86-input-evtouch (0.8.8-0ubuntu1) jaunty; urgency=low -+ -+ * New upstream release, packaged by Thomas Jaeger (ThJaeger@gmail.com) -+ Thanks a lot for fixing the header issues !! (LP: #312098) -+ - fix rotation issues (LP: #222164) -+ * 20_fix_calibrate_submission_directions.patch, point lshal submission to a -+ LP bug instead of pointing people to a subscription only -+ mailing list (LP: #307503) -+ -+ -- Oliver Grawert Wed, 14 Jan 2009 14:04:58 -0500 -+ -+xf86-input-evtouch (0.8.7-4build2) jaunty; urgency=low -+ -+ * Rebuild against the new xserver. -+ -+ -- Timo Aaltonen Mon, 15 Dec 2008 11:49:43 +0200 -+ -+xf86-input-evtouch (0.8.7-4build1) intrepid; urgency=low -+ -+ * Rebuild due to x11proto-input fix in 283921 -+ -+ -- Bryce Harrington Sat, 18 Oct 2008 01:45:02 -0700 -+ -+xf86-input-evtouch (0.8.7-3ubuntu12) intrepid; urgency=low -+ -+ * add more touchscreen .fdi files -+ * install all touchscreen .fdi files to /usr/share/hal/fdi/policy/10osvendor -+ with sequence number 50 so they will override evdev and mouse settings -+ -+ -- Oliver Grawert Thu, 16 Oct 2008 01:50:09 +0200 -+ -+xf86-input-evtouch (0.8.7-3ubuntu11) intrepid; urgency=low -+ -+ * fix .fdi install location to make sure hal doesnt prefer mouse settings -+ for evtouch devices -+ -+ -- Oliver Grawert Mon, 29 Sep 2008 22:39:37 +0200 -+ -+xf86-input-evtouch (0.8.7-3ubuntu10) intrepid; urgency=low -+ -+ * update halification patch of calibration script to make sure it doesnt -+ fire if no evtouch capable device is in hal. -+ * add .fdi file for Fujitsu lifebook (and other Fujitsu driven touchscreen -+ devices with Fujitsu USB Touch Panel). -+ * add sane defaults to ideaco and eGalax fdi files. -+ * add selection of dialog frontends to show the info in X. -+ * move zenity to recommends, add xdialog and kdebase-bin (for kdialog) as -+ different dialog options. -+ -+ -- Oliver Grawert Thu, 25 Sep 2008 19:57:51 +0200 -+ -+xf86-input-evtouch (0.8.7-3ubuntu9) intrepid; urgency=low -+ -+ * quieten down initscript a bit (we dont want a newline for each applied -+ value on screen) -+ * call initscript at end of calibration, so new values are applied without -+ having to restart the system. -+ -+ -- Oliver Grawert Thu, 25 Sep 2008 13:27:41 +0200 -+ -+xf86-input-evtouch (0.8.7-3ubuntu8) intrepid; urgency=low -+ -+ * add 09_calibrate-script-halification.patch, adds hal functionallity to -+ calibration tool, makes the script work under X and gives useful output -+ through zenity dialogs -+ * add 10_ev_calibrate_fixups.patch, fix ev_calibrate.c to use a useful font -+ in calibration, make it write to /etc/evtouch/config in a format that can -+ be parsed by the evtouch hal-set-property initscript -+ * add calibrate.desktop and calibrate icon file (uuencoded), add sharutils -+ to build-deps -+ * make sure /etc/evtouch dir is created by the package so ev_calibrate can -+ write its config there. -+ * add hal to dependencies, zenity to suggests -+ * add xserver-xorg-input-evtouch initscript to apply calibration data on -+ system boot via hal-set-property -+ * include .fdi files for ideaco and eGalax touchscreens (hopefully there -+ will be more soon) -+ * closes (LP: #261873) -+ -+ -- Oliver Grawert Thu, 25 Sep 2008 00:54:44 +0200 -+ -+xf86-input-evtouch (0.8.7-3ubuntu7) intrepid; urgency=low -+ -+ * add CURSORDIR to debian/rules to make calibration tool work -+ * link calibration tools to /usr/bin so the low level calibration tools work -+ on a basic level -+ -+ -- Oliver Grawert Wed, 24 Sep 2008 13:27:49 +0200 -+ -+xf86-input-evtouch (0.8.7-3ubuntu6) intrepid; urgency=low -+ -+ * add libtouch.c to 08_fix_xf86memset.patch. (LP: #254848) -+ -+ -- Timo Aaltonen Thu, 07 Aug 2008 11:36:17 +0300 -+ -+xf86-input-evtouch (0.8.7-3ubuntu5) intrepid; urgency=low -+ -+ * add 08_fix_xf86memset.patch, fixes (LP: #254848) -+ -+ -- Oliver Grawert Tue, 05 Aug 2008 17:46:19 +0200 -+ -+xf86-input-evtouch (0.8.7-3ubuntu4) intrepid; urgency=low -+ -+ * Uh, ok. Don't apply 04_include_xf86_ansic_h.patch. (FTBFS) -+ -+ -- Timo Aaltonen Tue, 08 Jul 2008 14:22:13 +0300 -+ -+xf86-input-evtouch (0.8.7-3ubuntu3) intrepid; urgency=low -+ -+ * libtouch.c: don't #include . It is no more. (FTBFS) -+ -+ -- Timo Aaltonen Tue, 08 Jul 2008 14:13:32 +0300 -+ -+xf86-input-evtouch (0.8.7-3ubuntu2) intrepid; urgency=low -+ -+ * Rebuild against the new xserver-xorg-dev. -+ -+ -- Timo Aaltonen Mon, 07 Jul 2008 17:44:38 +0300 -+ -+xf86-input-evtouch (0.8.7-3ubuntu1) hardy; urgency=low -+ -+ * Merge from debian unstable, remaining changes: (LP: #190004) -+ - Change maintainer address. -+ - Change the default font from helvetica to fixed. -+ * Drop Pepper/Q1 patch, upstream has a slightly different fix -+ * Upstream includes fix for running on amd64 (LP: #155880) -+ -+ -- Steve Magoun Thu, 07 Feb 2008 14:09:00 -0500 -+ -+xf86-input-evtouch (0.8.7-3) unstable; urgency=low -+ -+ * work(!!!!) with xserver-xorg-core 1.4 -+ * added xf86-input-evtouch-0.8.7-misc.patch from -+ http://www.postnuklear.de/xorg-patches/ (Closes: #443726) -+ * bump Standards-Version to 3.7.3 -+ * use Vcs and Homepage headers in debian/control -+ -+ -- Mattia Dongili Sat, 02 Feb 2008 21:32:15 +0900 -+ -+xf86-input-evtouch (0.8.7-2ubuntu1) hardy; urgency=low -+ -+ * Merge from debian unstable, remaining changes: -+ - Change maintainer address. -+ - Add patch from Pepper to handle the touch screen on the Samsung Q1 -+ Ultra correctly. -+ - Change the default font from helvetica to fixed. -+ -+ -- Timo Aaltonen Tue, 13 Nov 2007 10:53:54 +0200 -+ -+xf86-input-evtouch (0.8.7-2) unstable; urgency=low -+ -+ * build with xserver-xorg-core 1.4 -+ -+ -- Mattia Dongili Mon, 17 Sep 2007 16:52:54 +0900 -+ -+xf86-input-evtouch (0.8.7-1) unstable; urgency=low -+ -+ * New upstream release: -+ - Added "fix" for AMD64-crashes on touch (Closes: #431925) -+ * updated xsfbs -+ * removed 03_fix_compile_warns.patch applied upstream -+ -+ -- Mattia Dongili Tue, 11 Sep 2007 22:42:32 +0900 -+ -+xf86-input-evtouch (0.8.6-1ubuntu1) gutsy; urgency=low -+ -+ * Add patch from Pepper to handle the touch screen on the Samsung Q1 -+ Ultra correctly. -+ * Change the default font from helvetica to fixed. -+ -+ -- Tollef Fog Heen Wed, 11 Jul 2007 18:52:09 +0200 -+ -+xf86-input-evtouch (0.8.6-1) unstable; urgency=low -+ -+ * New upstream release: -+ - Fixed classic rotation (Closes: #417546) -+ * removed 04_fix_segv_on_device_off.patch, applied upstream -+ * updated evtouch.html -+ -+ -- Mattia Dongili Sat, 16 Jun 2007 14:31:58 +0900 -+ -+xf86-input-evtouch (0.8.5-3) unstable; urgency=low -+ -+ * Use xsfbs to get xserver dependencies automatically. -+ -+ -- Mattia Dongili Sun, 10 Jun 2007 10:44:51 +0900 -+ -+xf86-input-evtouch (0.8.5-2) unstable; urgency=low -+ -+ * Fix SEGV on vt switch (DeviceClose actually). -+ -+ -- Mattia Dongili Wed, 30 May 2007 15:55:59 +0900 -+ -+xf86-input-evtouch (0.8.5-1) unstable; urgency=low -+ -+ * New upstream release. -+ -+ -- Mattia Dongili Fri, 11 May 2007 18:28:41 +0900 -+ -+xf86-input-evtouch (0.8.3-1) unstable; urgency=low -+ -+ * New upstream release. -+ -+ -- Mattia Dongili Mon, 19 Feb 2007 12:34:26 +0100 -+ -+xf86-input-evtouch (0.8.2-1) unstable; urgency=low -+ -+ * New upstream release. -+ -+ -- Mattia Dongili Sat, 03 Feb 2007 20:14:40 +0100 -+ -+xf86-input-evtouch (0.8.1-1) unstable; urgency=low -+ -+ * Initial release. (Closes: #404932) -+ -+ -- Mattia Dongili Fri, 29 Dec 2006 15:01:18 +0100 -+ ---- xf86-input-evtouch-0.8.8.orig/debian/xserver-xorg-input-evtouch.links -+++ xf86-input-evtouch-0.8.8/debian/xserver-xorg-input-evtouch.links -@@ -0,0 +1,2 @@ -+usr/lib/xf86-input-evtouch/ev_calibrate usr/bin/ev_calibrate -+/usr/lib/xf86-input-evtouch/calibrate.sh usr/bin/calibrate_touchscreen ---- xf86-input-evtouch-0.8.8.orig/debian/copyright -+++ xf86-input-evtouch-0.8.8/debian/copyright -@@ -0,0 +1,34 @@ -+This package was debianized Mattia Dongili based on the work -+by Rex Tsai on Sun, 03 Dec 2006 18:53:48 +0100. -+ -+It was downloaded from http://www.stz-softwaretechnik.com/~ke/touchscreen/evtouch.html -+ -+Upstream Author: Kenan Esau -+ -+Copyright: 2004-2006 Kenan Esau , Baltmannsweiler, Germany. -+ -+License: -+ -+ Permission to use, copy, modify, distribute, and sell this software and its -+ documentation for any purpose is hereby granted without fee, provided that -+ the above copyright notice appear in all copies and that both that -+ copyright notice and this permission notice appear in supporting -+ documentation, and that the names of copyright holders not be -+ used in advertising or publicity pertaining to distribution of the -+ software without specific, written prior permission. The copyright holders -+ make no representations about the suitability of this -+ software for any purpose. It is provided "as is" without express or -+ implied warranty. -+ -+ THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS -+ SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND -+ FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY -+ SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER -+ RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF -+ CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN -+ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -+ -+ -+The Debian packaging is (C) 2006, Mattia Dongili and -+is licensed under the GPL, see `/usr/share/common-licenses/GPL'. -+ ---- xf86-input-evtouch-0.8.8.orig/debian/calibrate.desktop -+++ xf86-input-evtouch-0.8.8/debian/calibrate.desktop -@@ -0,0 +1,12 @@ -+[Desktop Entry] -+Name=Calibrate Touchscreen -+Name[de]=Touchscreen Kalibrieren -+Comment=Run the touchscreen calibration tool -+Encoding=UTF-8 -+Exec=gksu /usr/bin/calibrate_touchscreen -+Terminal=false -+Type=Application -+Icon=calibrate.png -+StartupNotify=true -+Categories=GTK;System;Settings; -+X-Ubuntu-Gettext-Domain=evtouch ---- xf86-input-evtouch-0.8.8.orig/debian/calibrate.uuencode -+++ xf86-input-evtouch-0.8.8/debian/calibrate.uuencode -@@ -0,0 +1,50 @@ -+begin 644 calibrate.uunecode -+MB5!.1PT*&@H````-24A$4@```"0````D"`8```#A`)B8`````7-21T(`KLX< -+MZ0````9B2T=$`/\`_P#_H+VGDP````EP2%ES```-UP``#=`````=T -+M24U%!]@)&!(8$5T-YE8```>]241!5%C#[9AMC%Q5&<=_YYX[.UOF95^Z[Z7; -+M+K2496'9I=)`1&RD#29H\04,B5\$/_C!^(&HI89$HX&LA*CPP=<0$WQ!H@E& -+M_62,"9(B+QL+0FB`LD5IR]ANNVQG=F;NO>>>\_CASLS.6Y<:$S]YDY-S9^:< -+M\_S/\_R?Y_S/P/^?C1\%\.V''D@KS[NWKZ]OO_9T^G\)P#H7%(OGGW'.?>?0 -+MP?O+:N&A!U5O;^_//_ZQ`Y^]=,M6E/KO#(C(?SQ^966%W_W^MW\X?[YTNZ\4 -+M4]?.7GO7^-@8E+K$TSF'B`,4GN=U'7,A&OSQ\!N4*E'S(.UWVY-UR0Z>?^9/W'#S -+M_LX=-X$Y<^IM@FJ%@>$),MD\VO>[@NI*:)':FHUU50>@.+:4*P&GWCG.3Q]] -+M@,&1+6R=VMEUP=@8",\ST7\)KRT=8V+R,K*Y/KP+A;S#ENO@5L=,8QTGWODG -+M3S[V"-5*F2X1"H4`E,"VM7(U8JP3TYS+LVC'%/XZ]SKFSYU@K!QUC+]1, -+M[#KXZ".MH$SLR`R.U^[F[H,/`U`)30N/1(0X,N0&,UQ^V10KRP7> -+M6WV/=&Z0E)4+L5(H(Q -+M%G%"?W\_FICE,P7\=(;T)1E2J32>]O&TCU+)GBM!Q.I:0+$<4`X,[Q96VSF$ -+MWUY78NNH-GG#\Q1*>0T@":@Z>(=U#JTUD^-#[)Z;8F1D,X\_\6MT;S^YD6WX -+MV2%*DC-6,-81Q99J -+MI80)R@#TY;-\ZO;;.'#;K6P=SO&CA^_G^JD,B\\]S=+2,$F(KB5>:/6.%R$H-5#*F>.8$G[CU -+MPVBM$1%&1D8(PQ`1H:^O#VLM0T-#7#TSPS?O_PHCJ2)1Z2Q(G(#2&N5UEGZO -+M_1RRSC7"E8`23+TYP3@(8X<+2URY:[T^34]/8ZU%1.CM[<48@]::OKX^E%+L -+MVC9"M'8.92,\3Z.UQE->1['UVN-H71*BR"2>,34/&2?$%HQ-2D"V5Y//YS$F -+M(>;,S`SCX^.("/OW[R>52N'[/G-S`Z4!:4$4(AS#$NYD?[U+*VWT='1QM$R/S^/9D;;]C3XJ$Z=XPQ&&,(PY`P#'GSK>-4C$>J -+M%!)($92F6@D[-MT":.?D((_>^Y$-%:%(8K"\=AE_?^55;KQA3X/<(D(410T0 -+M01`011%!$'#JY`GNW'(#5T^2R^5J!ZYT"YF4PC"@ -+MM[<7:^T%O=(.,)U.,SL[R^'#A]F[=V\+D&9@QA@6%Q?9O'DSHZ-CY//];-K4 -+MVU*#/$_7^;CF@WKEQ<47GR@4"G=JK5,;Z>?VU(["B-=>.\K.E]Q>_"PH(&>''Q^0>G -+MIZ^ZK[^O/RG[GH>(4"P6V;9M.[.SLX@(U6JU`:P.:&%AH7#TZ-&#F4SF+WOV -+M[#F];]\^VW9YD$.'#CF`B[X6WO/YS_WJ0S?=?%?.G:-0*+"Z -+MNHKOITBGTPV2ETHECKQTY-5G#S][#_`&L+;11[YG?/3\P/#QT -+MQ_C8Q*=G9F9J@FV]%'B>PMK+,2:B7"Y3K08-+BH%J52*;=NW7CDW/_O!(T=> -+M/O7"BU^$A70.9^NI]7]ZW96+BA]EL;G!L;*QG^LKIFM3H?E.L -+M>Z0.QKEU76UMS.MOO,Z9,Z>K:^7RJ>-+2U_\P?=_O`@8(`+BI+BM>TC5WGN` -+M'J54S_C8V-=O/_#)L;H>WOC2)XWOM>[F]#37S>\&V.1$=CSUU&^^!=Q1`^/7 -+M>@,8O^T848":F!COR>5RVS.92][_FGQ1_P.T?L[G\SN'AX=ZEI?/QC6[#=M^ -+MT^JF;B6.8[V\O/SRSW[Q>%X$!:)$1+6^"P@UN=^P6#MSE:C$[Z)00DUE**5$ -+MH20R45$I%0!A6]BD6P#JB/TZGYK>=5/SVG;7[#K7U.H$CIMZ4^OC)G)SL6FO -+GFHRV@U`=>F4]<^K`V@'*1O'^-VN3A-O<,!`M`````$E%3D2N0F"" -+` -+end ---- xf86-input-evtouch-0.8.8.orig/debian/xserver-xorg-input-evtouch.dirs -+++ xf86-input-evtouch-0.8.8/debian/xserver-xorg-input-evtouch.dirs -@@ -0,0 +1 @@ -+etc/evtouch ---- xf86-input-evtouch-0.8.8.orig/debian/xserver-xorg-input-evtouch.init -+++ xf86-input-evtouch-0.8.8/debian/xserver-xorg-input-evtouch.init -@@ -0,0 +1,59 @@ -+#!/bin/sh -+ -+[ -x /usr/bin/hal-set-property ] || exit 0 -+[ -x /usr/bin/hal-find-by-property ] || exit 0 -+ -+. /etc/evtouch/config > /dev/null 2>&1 || exit 0 -+ -+do_start() { -+ UDI=$(/usr/bin/hal-find-by-property --key input.x11_driver --string evtouch) -+ -+ hal_set () { -+ if [ -n "$2" ]; then -+ /usr/bin/hal-set-property --udi "$UDI" --key input.x11_options.$1 --string "$2" >/dev/null 2>&1 -+ else -+ /usr/bin/hal-set-property --udi "$UDI" --key input.x11_options.$1 --remove >/dev/null 2>&1 -+ fi -+ } -+ -+ hal_set minx $MINX -+ hal_set miny $MINY -+ hal_set maxx $MAXX -+ hal_set maxy $MAXY -+ hal_set x0 $X0 -+ hal_set y0 $Y0 -+ hal_set x1 $X1 -+ hal_set y1 $Y1 -+ hal_set x2 $X2 -+ hal_set y2 $Y2 -+ hal_set x3 $X3 -+ hal_set y3 $Y3 -+ hal_set x4 $X4 -+ hal_set y4 $Y4 -+ hal_set x5 $X5 -+ hal_set y5 $Y5 -+ hal_set x6 $X6 -+ hal_set y6 $Y6 -+ hal_set x7 $X7 -+ hal_set y7 $Y7 -+ hal_set x8 $X8 -+ hal_set y8 $Y8 -+} -+ -+case "$1" in -+ start|"") -+ do_start -+ ;; -+ restart|reload|force-reload) -+ echo "Error: argument '$1' not supported" >&2 -+ exit 3 -+ ;; -+ stop) -+ # No-op -+ ;; -+ *) -+ echo "Usage: evtouch [start|stop]" >&2 -+ exit 3 -+ ;; -+esac -+ ---- xf86-input-evtouch-0.8.8.orig/debian/rules -+++ xf86-input-evtouch-0.8.8/debian/rules -@@ -0,0 +1,85 @@ -+#!/usr/bin/make -f -+# -*- makefile -*- -+ -+# Uncomment this to turn on verbose mode. -+#export DH_VERBOSE=1 -+include debian/xsfbs/xsfbs.mk -+ -+PACKAGE=xserver-xorg-input-evtouch -+ -+CFLAGS = -Wall -g -+ -+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) -+ CFLAGS += -O0 -+else -+ CFLAGS += -O2 -+endif -+ -+configure: configure-stamp -+configure-stamp: patch -+ dh_testdir -+ # Add here commands to configure the package. -+ -+ CURSORDIR=/usr/share/xf86-input-evtouch ./configure --prefix=/usr --enable-evcalibrate -+ touch configure-stamp -+ -+build: build-stamp -+ -+build-stamp: configure-stamp -+ dh_testdir -+ -+ # Add here commands to compile the package. -+ $(MAKE) CFLAGS="$(CFLAGS)" -+ #docbook-to-man debian/evtouch.sgml > evtouch.1 -+ -+ touch $@ -+ -+clean: xsfclean clean-patched unpatch -+clean-patched: -+ dh_testdir -+ dh_testroot -+ rm -f build-stamp configure-stamp -+ -+ # Add here commands to clean up after the build process. -+ [ ! -f Makefile ] || $(MAKE) distclean -+ -+ dh_clean -+ -+install: build -+ dh_testdir -+ dh_testroot -+ dh_clean -k -+ dh_installdirs -+ -+ # Add here commands to install the package into debian/tmp -+ $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp -+ -+ -+# Build architecture-independent files here. -+binary-indep: build install -+# We have nothing to do by default. -+ -+# Build architecture-dependent files here. -+binary-arch: build install serverabi -+ dh_testdir -+ dh_testroot -+ dh_install --sourcedir=debian/tmp --list-missing --exclude=.la --exclude=.a -+ dh_installchangelogs ChangeLog -+ dh_installdocs -+ dh_installexamples -+ dh_installman -+ mkdir -p debian/xserver-xorg-input-evtouch/usr/share/pixmaps -+ uudecode -o debian/xserver-xorg-input-evtouch/usr/share/pixmaps/calibrate.png debian/calibrate.uuencode -+ dh_installinit -a --no-start -u"start 25 2 3 4 5 ." -+ dh_link -+ dh_strip -+ dh_compress -+ dh_fixperms -+ dh_installdeb -+ dh_shlibdeps -+ dh_gencontrol -+ dh_md5sums -+ dh_builddeb -+ -+binary: binary-indep binary-arch -+.PHONY: build clean binary-indep binary-arch binary install configure ---- xf86-input-evtouch-0.8.8.orig/debian/control -+++ xf86-input-evtouch-0.8.8/debian/control -@@ -0,0 +1,23 @@ -+Source: xf86-input-evtouch -+Section: x11 -+Priority: optional -+Maintainer: Ubuntu Developers -+XSBC-Original-Maintainer: Debian X Strike Force -+Uploaders: Mattia Dongili -+Build-Depends: debhelper (>= 5), pkg-config, xserver-xorg-dev (>= 2:1.4), x11proto-randr-dev, libxrender-dev, libx11-dev, quilt, sharutils -+Standards-Version: 3.7.3 -+Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-input-evtouch -+Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-evtouch.git -+Homepage: http://stz-softwaretechnik.com/~ke/touchscreen/evtouch.html -+ -+Package: xserver-xorg-input-evtouch -+Architecture: any -+Depends: ${shlibs:Depends}, ${xserver:Depends}, hal, ttf-freefont, x-ttcidfont-conf -+Provides: ${xinpdriver:Provides} -+Recommends: zenity | kdebase-bin | xidalog -+Description: Touchscreen-Driver for X.Org/XFree86 server -+ This XFree/X.Org driver provides support for touchscreens input devices. -+ The driver is actually an evdev-driver which supports events for moving -+ in absolute coordinates, relative coordinates and mouse-buttons. -+ . -+ ---- xf86-input-evtouch-0.8.8.orig/debian/README.Debian -+++ xf86-input-evtouch-0.8.8/debian/README.Debian -@@ -0,0 +1,16 @@ -+xf86-input-evtouch for Debian -+----------------------------- -+ -+Evtouch is a Touchscreen-Driver for X. -+ -+Be sure to calibrate the device and set correct parameters in your -+xorg.conf, see README.calibrate and find the necessary helpers -+in /usr/lib/xf86-input-evtouch. -+ -+A complete reference can be found on-line at -+http://www.stz-softwaretechnik.com/~ke/touchscreen/evtouch.html -+or in /usr/share/doc/xserver-xorg-input-evtouch on your system. -+ -+Check /proc/bus/input/devices to find out your touchscreen device. -+ -+ -- Mattia Dongili , Sat, 09 Dec 2006 18:26:37 +0100 ---- xf86-input-evtouch-0.8.8.orig/debian/xserver-xorg-input-evtouch.install -+++ xf86-input-evtouch-0.8.8/debian/xserver-xorg-input-evtouch.install -@@ -0,0 +1,4 @@ -+usr/lib/* -+usr/share/* -+../fdi/* usr/share/hal/fdi/policy/20thirdparty -+../calibrate.desktop usr/share/applications/ ---- xf86-input-evtouch-0.8.8.orig/debian/docs -+++ xf86-input-evtouch-0.8.8/debian/docs -@@ -0,0 +1,4 @@ -+README -+README.calibration -+TODO -+debian/evtouch.html ---- xf86-input-evtouch-0.8.8.orig/debian/compat -+++ xf86-input-evtouch-0.8.8/debian/compat -@@ -0,0 +1 @@ -+5 ---- xf86-input-evtouch-0.8.8.orig/debian/evtouch.html -+++ xf86-input-evtouch-0.8.8/debian/evtouch.html -@@ -0,0 +1,248 @@ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+Xorg Touchscreen Driver -+ -+ -+
-+Last updated: 09.06.2007 -+
-+

Linux-Touchscreen Driver for X

-+
-+Evtouch is a Touchscreen-Driver for X. This site contains the configuration and installation description as well as the -+possibility to download the driver. -+
-+

Installation/Configuration

-+
  1. -+
    -+Download the tarball and extract it to some -+temporary directory. -+
    -+
    tar xzvf evtouch-xx.yy.tar.gz
    -+
    -+Copy the file "evtouch_drv.so" to the appropriate location -+(Some distributions use "/usr/X11R6/lib/modules/input" or -+"/usr/lib/xorg/modules/input/" (for Ubuntu)). -+
    -+
    -+Insert the lines below to the file "/etc/X11/XF86Config-4" or -+"/etc/X11/xorg.conf". -+
    -+
    -+ -+Section "InputDevice"
    -+    Identifier "touchscreen"
    -+    Driver "evtouch"
    -+    Option "Device" "/dev/input/event1"
    -+    Option "DeviceName" "touchscreen"
    -+    Option "MinX" "98"
    -+    Option "MinY" "43"
    -+    Option "MaxX" "940"
    -+    Option "MaxY" "925"
    -+    Option "ReportingMode" "Raw"
    -+    Option "Emulate3Buttons"
    -+    Option "Emulate3Timeout" "50"
    -+    Option "SendCoreEvents" "On"
    -+EndSection
    -+
    -+
  2. Beware that some distributions use other names for the device. Some use -+"/dev/input/evdevX" and others use "/dev/input/eventX".
    3. -+
  3. Add the line below to the file "/etc/X11/XF86Config-4" or -+"/etc/X11/xorg.conf" to the section "ServerLayout".
    -+
    InputDevice "touchscreen" "CorePointer"
    -+
    4. -+
  4. -+If your Y-axis is interchanged you might have used the wrong -+event-device. Maybe you should try the next few event-devices -+(/dev/event[1-9]). -+
    5. -+
-+ -+
Since Xorg 7.2 there is always a default-mouse-pointer which will run simultaneously with evtouch if you do not prevent it from loading. It is extremely important that you add the following to your configuration. Otherwise you will get double click events and all kind of strange things.
-+ -+
    -+
  1. -+
    Add the following new input-device to your xorg.conf:
    -+
    -+Section "InputDevice"
    -+    Identifier "dummy"
    -+    Driver "void"
    -+    Option "Device" "/dev/input/mice"
    -+EndSection
    -+
    -+
    2. -+
  2. -+
    Add the following line your your "ServerLayout"-section:
    -+
    InputDevice "dummy"
    -+
    3. -+
-+ -+
-+Calibration is also supported since V0.6.0. You can also reuse your -+settings from the old driver for the 2.6 driver. Actually you only -+have to exchange the driver name in the "Inputdevice"-section from -+"lbtouch" to "evtouch" and change the "Device". -+
-+ -+

Button-Events

-+ -+
-+With the state-machine based code you can have the three types of button actions (button up, down, click) which are issued in different states of the state-machine. So the complete behaviour is configurable. -+
-+ -+
-+Have a look at Libtouch to see which default-actions are hard-coded in the driver and what you have to do to change the default-behaviour. -+
-+
-+ -+

Advanced Configuration

-+ -+

Changing Timers

-+ -+
-+If you are not confident with the default behaviour of your touchpanel you -+can configure certain timers which change its behaviour. -+
-+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+
Option Description Default-Value -+
TapTimer This timer starts when the state MAYBETAPPED is -+entered. When this timer expires a tap-event is issued and the state -+changes to UNTOUCHED. 200 ms
LongTouchTimer This timer is always started when the state TOUCHED -+is entered. When the timer expires before you untouch the screen again the -+state moves to LONGTOUCHED and on entering that state a longtouch-event is -+issued. 400 ms
Emulate3Buttons Enable emulation of three button support true -- enabled
Emulate3Timeout If both buttons are pressed/released before this timer -+expires a -+"middle press/release"-event is generated. This timer starts to run as soon as -+a button is pressed. 50 ms
MoveLimit If the pen moves out of this radius a "mouse-press"-event -+becomes impossible. 30 Pixels
Rotate There are two valid values:
-+ CW -- Rotate the screen clockwise
-+ CCW -- Rotate the screen counter-clockwise
-+ Everything else will be treated as "no rotation". -+ 		no rotation
SwapX This option is in the driver since V0.61. When set to 1 -+the X-axis is -+ swapped. This option is applied BEFORE the rotation-option. -+ false -- no swapping
SwapY This option is in the driver since V0.61. When set to 1 -+the Y-axis is -+ swapped. This option is applied BEFORE the rotation-option. -+ false -- no swapping
-+ -+
-+If you find bugs or if you have comment/wishes please send mail to lifebook@conan.de
-+ -+

Download

-+

Touchscreen-Driver for X

-+This driver should work for XFree 4.x and Xorg 6.8.x.
-+Have a look at the CHANGELOG.
-+V0.8.2 was removed since it was broken -- sorry for the inconvenience.

-+V0.8.4 contains udev-rules for dynamically creating a softlink to the "correct" device. Please feel free to add your rules to this file and send the patches to me.
-+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+
Precompiled driver for X V0.8.6evtouch-0.8.6.tar.gz
Precompiled driver for X V0.8.5evtouch-0.8.5.tar.gz
Precompiled driver for X V0.8.4evtouch-0.8.4.tar.gz
Precompiled driver for X V0.8.3evtouch-0.8.3.tar.gz
Precompiled driver for X V0.8.1evtouch-0.8.1.tar.gz
Precompiled driver for X V0.8.0evtouch-0.8.0.tar.gz
X driver sources V0.8.6xf86-input-evtouch-0.8.6.tar.bz2
X driver sources V0.8.5xf86-input-evtouch-0.8.5.tar.bz2
X driver sources V0.8.4xf86-input-evtouch-0.8.4.tar.bz2
X driver sources V0.8.3xf86-input-evtouch-0.8.3.tar.bz2
X driver sources V0.8.1xf86-input-evtouch-0.8.1.tar.bz2
X driver sources V0.8.0evtouch-0.8.0-src.tar.gz
-+Older (obsolete) versions of the evtouch-driver -+can be downloaded here -+ -+ ---- xf86-input-evtouch-0.8.8.orig/debian/patches/02-buttonless-device.patch -+++ xf86-input-evtouch-0.8.8/debian/patches/02-buttonless-device.patch -@@ -0,0 +1,86 @@ -+Index: xf86-input-evtouch-0.8.3.dirty/evtouch.c -+=================================================================== -+--- xf86-input-evtouch-0.8.3.dirty.orig/evtouch.c 2007-02-19 18:28:41.749371445 +0100 -++++ xf86-input-evtouch-0.8.3.dirty/evtouch.c 2007-02-19 20:14:50.612312260 +0100 -+@@ -364,9 +364,15 @@ void EVTouchLBRBEvent(EVTouchPrivatePtr -+ void EVTouchProcessKey(EVTouchPrivatePtr priv) -+ { -+ struct input_event *ev; /* packet being/just read */ -++ ev = &priv->ev; -+ -+ DBGOUT(2, "EVTouch: %s\n", __FUNCTION__); -+- ev = &priv->ev; -++ -++ /* for buttonless devices no emulate3 is available, -++ only go through the SM */ -++ if (priv->buttonless) -++ return; -++ -+ if ( (ev->code == BTN_LEFT) || -+ (ev->code == BTN_RIGHT) || -+ (ev->code == BTN_MIDDLE) ) { -+@@ -688,6 +694,8 @@ static void ReadInput (LocalDevicePtr lo -+ while (EVTouchGetPacket (priv) == Success) -+ { -+ ev = &priv->ev; -++ DBGOUT(2, "EVTouch: %s type:%0.2x code: 0x%0.4x value:%d\n", -++ __FUNCTION__, ev->type, ev->code, ev->value); -+ -+ xf86XInputSetScreen(local, -+ priv->screen_num, -+@@ -708,7 +716,8 @@ static void ReadInput (LocalDevicePtr lo -+ EVTouchProcessRel(priv); -+ break; -+ case EV_KEY: -+- if (priv->ev.code == BTN_TOUCH) { -++ if (priv->ev.code == BTN_TOUCH -++ || priv->buttonless) { -+ if (priv->ev.value == 1) { -+ priv->touch_flags |= TOUCHED; -+ DBGOUT(2, "EVTouch: TOUCHED\n"); -+Index: xf86-input-evtouch-0.8.3.dirty/libtouch.c -+=================================================================== -+--- xf86-input-evtouch-0.8.3.dirty.orig/libtouch.c 2007-02-19 18:28:41.749371445 +0100 -++++ xf86-input-evtouch-0.8.3.dirty/libtouch.c 2007-02-19 20:02:36.070453105 +0100 -+@@ -320,6 +320,14 @@ static int handle_touched(LibTouchRecPtr -+ static void enter_moving(LibTouchRecPtr priv) -+ { -+ disable_timers(priv); -++ if (priv->pen == PEN_TOUCHED) { -++ DBG(4, ErrorF("LibTouch: Issuing Button-press 1\n")); -++ xf86PostButtonEvent(priv->local->dev, TRUE, -++ 1, 1, 0, 2, -++ priv->cur_x, -++ priv->cur_y); -++ priv->pressed_btn_stat |= 1 << 1; -++ } -+ } -+ -+ -+@@ -336,13 +344,13 @@ static void enter_longtouched(LibTouchRe -+ { -+ disable_timers(priv); -+ /* FIXME: Make Longtouch-Event configurable*/ -+- /* for now issue an LB down */ -+- DBG(4, ErrorF("LibTouch: Issuing Button-press 1\n")); -++ /* for now issue an RB down */ -++ DBG(4, ErrorF("LibTouch: Issuing Button-press 3\n")); -+ xf86PostButtonEvent(priv->local->dev, TRUE, -+- 1, 1, 0, 2, -++ 3, 1, 0, 2, -+ priv->cur_x, -+ priv->cur_y); -+- priv->pressed_btn_stat |= 1 << 1; -++ priv->pressed_btn_stat |= 1 << 3; -+ } -+ -+ -+@@ -515,7 +523,7 @@ static int handle_oneandahalftap(LibTouc -+ -+ /* FIXME: Make OneAndHalf-Event configurable */ -+ /* for now RB down */ -+- DBG(4, ErrorF("LibTouch: Issuing Button-press 1\n")); -++ DBG(4, ErrorF("LibTouch: Issuing Button-press 3\n")); -+ xf86PostButtonEvent (priv->local->dev, TRUE, -+ 3, 1, 0, 2, -+ priv->cur_x, ---- xf86-input-evtouch-0.8.8.orig/debian/patches/20_fix_calibrate_submission_directions.patch -+++ xf86-input-evtouch-0.8.8/debian/patches/20_fix_calibrate_submission_directions.patch -@@ -0,0 +1,13 @@ -+Index: xf86-input-evtouch-0.8.8/calibrate.sh -+=================================================================== -+--- xf86-input-evtouch-0.8.8.orig/calibrate.sh 2009-01-14 14:14:10.000000000 +0100 -++++ xf86-input-evtouch-0.8.8/calibrate.sh 2009-01-14 14:14:51.000000000 +0100 -+@@ -25,7 +25,7 @@ -+ FAILINFO="No evtouch capable device found, if you are sure you have \n\ -+ an evtouch capable touchscreen, please mail the \ -+ resulting file of the command \"lshal > evtouch_hal.out\" to the\n\ -+-ubuntu-mobile@lists.ubuntu.com mailing list, so support for your \ -++bug url https://bugs.launchpad.net/bugs/317094, so support for your \ -+ device can be added." -+ -+ if [ -z "$UDI" ];then ---- xf86-input-evtouch-0.8.8.orig/debian/patches/05_build_with_1_4.patch -+++ xf86-input-evtouch-0.8.8/debian/patches/05_build_with_1_4.patch -@@ -0,0 +1,22 @@ -+Index: xserver-xorg-input-evtouch/evtouch.c -+=================================================================== -+--- xserver-xorg-input-evtouch.orig/evtouch.c 2007-09-17 17:20:21.736761738 +0900 -++++ xserver-xorg-input-evtouch/evtouch.c 2007-09-17 17:31:22.274403633 +0900 -+@@ -492,9 +492,6 @@ DeviceOn (DeviceIntPtr dev) -+ -+ priv->buffer = XisbNew(local->fd, 64); -+ -+- DBG (9, XisbTrace (priv->buffer, 1)); -+- -+- -+ if (!priv->buffer) -+ { -+ xf86CloseSerial(local->fd); -+@@ -1207,7 +1204,6 @@ EVTouchPreInit(InputDriverPtr drv, IDevP -+ priv->diff[i][0], priv->diff[i][1]); -+ } -+ -+- xf86AlwaysCore(local, TRUE); -+ priv->touch_flags = 0; -+ -+ local->history_size = xf86SetIntOption( local->options, "HistorySize", 0 ); ---- xf86-input-evtouch-0.8.8.orig/debian/patches/10_ev_calibrate_fixups.patch -+++ xf86-input-evtouch-0.8.8/debian/patches/10_ev_calibrate_fixups.patch -@@ -0,0 +1,55 @@ -+Index: xf86-input-evtouch-0.8.7/ev_calibrate.c -+=================================================================== -+--- xf86-input-evtouch-0.8.7.orig/ev_calibrate.c 2008-09-25 01:13:32.000000000 +0200 -++++ xf86-input-evtouch-0.8.7/ev_calibrate.c 2008-09-25 01:13:43.000000000 +0200 -+@@ -198,7 +198,7 @@ -+ Pixmap cursor_pic; -+ XColor cursor_fg, cursor_bg; -+ XFontStruct* font_info; -+- char* font_name = "*fixed*"; -++ char* font_name = "*freemono*"; -+ char str[256]; -+ unsigned int cursor_width, cursor_height; -+ int hotspot_x, hotspot_y; -+@@ -234,7 +234,7 @@ -+ unsigned long black_pixel; -+ -+ -+- display = XOpenDisplay(":0"); -++ display = XOpenDisplay(getenv("DISPLAY")); -+ if (display == NULL) { -+ fprintf(stderr, "Cannot connect to X server %s\n", ":0"); -+ exit(-1); -+@@ -553,7 +553,7 @@ -+ /* -+ Put results to file and screen -+ */ -+- out_file = fopen("out.txt", "w"); -++ out_file = fopen("/etc/evtouch/config", "w"); -+ -+ -+ /* -+@@ -566,10 +566,10 @@ -+ min_max.max_x, -+ min_max.max_y); -+ -+- fprintf(out_file, " Option \"MinX\" \"%d\"\n", min_max.min_x); -+- fprintf(out_file, " Option \"MinY\" \"%d\"\n", min_max.min_y); -+- fprintf(out_file, " Option \"MaxX\" \"%d\"\n", min_max.max_x); -+- fprintf(out_file, " Option \"MaxY\" \"%d\"\n", min_max.max_y); -++ fprintf(out_file, "MINX=\"%d\"\n", min_max.min_x); -++ fprintf(out_file, "MINY=\"%d\"\n", min_max.min_y); -++ fprintf(out_file, "MAXX=\"%d\"\n", min_max.max_x); -++ fprintf(out_file, "MAXY=\"%d\"\n", min_max.max_y); -+ -+ -+ for (i=0; i<9; i++) { -+@@ -602,7 +602,7 @@ -+ i, marker_coordinates[i][1]-click_coordinates[i][1]); -+ -+ -+- fprintf(out_file, " Option \"x%d\" \"%d\"\n Option \"y%d\" \"%d\"\n", -++ fprintf(out_file, "X%d=\"%d\"\nY%d=\"%d\"\n", -+ i, marker_coordinates[i][0]-click_coordinates[i][0], -+ i, marker_coordinates[i][1]-click_coordinates[i][1]); -+ } ---- xf86-input-evtouch-0.8.8.orig/debian/patches/series -+++ xf86-input-evtouch-0.8.8/debian/patches/series -@@ -0,0 +1,11 @@ -+#02-buttonless-device.patch -+#03_fix_compile_warns.patch -+#04_include_xf86_ansic_h.patch -+#05_build_with_1_4.patch -+#06_xf86-input-evtouch-0.8.7-misc.patch -+#07_random_fixes_for_06.patch -+#08_fix_xf86memset.patch -+#09_calibrate-script-halification.patch -+#10_ev_calibrate_fixups.patch -+20_fix_calibrate_submission_directions.patch -+21_more_calibration_fixups.patch ---- xf86-input-evtouch-0.8.8.orig/debian/patches/06_xf86-input-evtouch-0.8.7-misc.patch -+++ xf86-input-evtouch-0.8.8/debian/patches/06_xf86-input-evtouch-0.8.7-misc.patch -@@ -0,0 +1,770 @@ -+# -+# This patch is from http://www.postnuklear.de/xorg-patches/ -+# -+# Description: This is a patch for the evtouch input driver ( -+# http://stz-softwaretechnik.com/~ke/touchscreen/evtouch.html). -+# Changes (for full description see ChangeLog file after patching (-: ): -+# o Changed code to compile a working driver for both XInput ABI 0.x and 2.0 (Xorg 1.4.0) -+# o changed rotation (due to segfault on xorg + fbdev) -+# o drag support -+# o tap "tolerance" -+# o added generic ts-adc touchscreen device to udev rules file -+# -+# Feel free to send comments, critics, suggestions to harryrat@postnuklear.de -+# To apply simply change into the toplevel directory of the source to be modified and enter: -+# patch -p1 < -+# -+# All patches are available under the GNU GPL, I hope they might be useful for you (-: -+# - Harald Radke -+# -+Index: xserver-xorg-input-evtouch/69-touchscreen.rules -+=================================================================== -+--- xserver-xorg-input-evtouch.orig/69-touchscreen.rules 2008-02-02 21:49:20.783972805 +0900 -++++ xserver-xorg-input-evtouch/69-touchscreen.rules 2008-02-02 21:49:39.730979724 +0900 -+@@ -7,8 +7,11 @@ -+ # Name can be found in /proc/bus/input/devices ('cat /proc/bus/input/devices') -+ # -+ -+-# These are the touchscreens supported by kernel's "usbtouchscreen" module -++# Generic ts-adc touchscreen modules -++KERNEL=="event*", SUBSYSTEM=="input", ATTRS{name}=="ts-adc", SYMLINK+="input/evtouch_event" -++ -+ -++# These are the touchscreens supported by kernel's "usbtouchscreen" module -+ # eGalax Inc. USB TouchController) -+ KERNEL=="event*", SUBSYSTEM=="input", ATTRS{idVendor}=="3823", ATTRS{idProduct}=="0001", SYMLINK+="input/evtouch_event" -+ # eGalax Inc. USB TouchController) -+Index: xserver-xorg-input-evtouch/ChangeLog -+=================================================================== -+--- xserver-xorg-input-evtouch.orig/ChangeLog 2008-02-02 21:49:20.795972782 +0900 -++++ xserver-xorg-input-evtouch/ChangeLog 2008-02-02 21:49:39.730979724 +0900 -+@@ -1,3 +1,61 @@ -++0.8.7-HR *** Note this is not an official release but an "unauthorized -++ *** fix version by me (Harald Radke - harryrat@postnuklear.de) -++ -> Changed code to compile a working driver for both -++ XInput ABI 0.x and 2.0 (Xorg 1.4.0) -++ (test compile for 0.x still needs to be done) -++ - evtouch.c: -++ * capsulated xf86Post*Events and xf86InputSetScreen -++ in functions where depending on the XINPUT ABI conversion -++ is done or xf86 functions are directly called -++ * xf86InitValuatorAxisStruct and xf86AlwaysCore() depending -++ on ABI done -++ - libtouch.h: passing xf86PostButtonEvent capsulation function -++ to init function (same as in evtouch.c) to do proper button -++ triggering -++ -> Rotation: -++ - added support for Option "Rotate" "UD" (upside down) -++ in evtouch input section of xorg.conf -++ - due to Segfault with (at least) fbdev video device, only -++ evtouch "Rotate" option is taken into calculations for coords, -++ meaning to get proper touchscreen behaviour on rotated X screens. -++ same Rotate option as in video device section of xorg.conf has -++ to be set in the evtouch section -++ -> Drag support: -++ Option "_drag" "" has been added. When set, -++ the handle_() function triggers BUTTON_DOWN for Button -++ before changing into S_MOVE state. Note that actually only -++ Option "touched_drag" "" is implemented, rest is dummy -++ (and doesn't make too much sense I guess) (-; -++ -> tap "tolerance": -++ introduce move_limit to evtouch.c as it is in libtouch.c, using it -++ to discard ABS_X/Y position changes if they are inside move_limit -++ around cur_x/y. this way pointer hopping can be avoided as well as -++ proper touched_drag established -++ - changes of cur_x/y are reported on EV_SYN in evtouch.c ReadInput() instead -++ on EV_ABS -++ -> added generic ts-adc touchscreen device to udev rules file -++ -++ => Example for a Loox720 PDA setup in input section of xorg.conf: -++ Section "InputDevice" -++ Identifier "touchscreen" -++ Driver "evtouch" -++ Option "Device" "/dev/input/evtouch_event" -++ Option "MinX" "434" -++ Option "MinY" "333" -++ Option "MaxX" "3643" -++ Option "MaxY" "3804" -++ Option "SwapX" "true" -++ Option "longtouched_action" "down" -++ Option "longtouched_button" "3" -++ Option "maybetapped_action" "click" -++ Option "maybetapped_button" "1" -++ Option "touched_drag" "1" -++ Option "oneandahalftap_button" "0" -++ Option "TapTimer" "30" -++ Option "LongtouchTimer" "500" -++ Option "MoveLimit" "18" -++ EndSection -++ -+ 0.8.7 -+ - Added Elo Touchscreen to udev-rules (Stephen Webb) -+ - Added "fix" for AMD64-crashes on touch (Martin Letenay) -+Index: xserver-xorg-input-evtouch/evtouch.c -+=================================================================== -+--- xserver-xorg-input-evtouch.orig/evtouch.c 2008-02-02 21:49:20.811973497 +0900 -++++ xserver-xorg-input-evtouch/evtouch.c 2008-02-02 21:49:39.734971242 +0900 -+@@ -182,6 +182,20 @@ static const char *default_options[] = -+ static int -+ ControlProc(LocalDevicePtr device, xDeviceCtl *ctrl); -+ -++static void -++PostMotionEvent(LocalDevicePtr local); -++ -++static void -++PostProximityEvent(LocalDevicePtr local,int is_in); -++ -++static void -++PostButtonEvent(LocalDevicePtr local, int button, -++ int is_down, int x,int y); -++ -++static void -++InputSetScreen(LocalDevicePtr local); -++ -++ -+ /***************************************************************************** -+ * Function Definitions -+ ****************************************************************************/ -+@@ -197,11 +211,10 @@ emulate3Timer(OsTimerPtr timer, CARD32 n -+ LocalDevicePtr local = (LocalDevicePtr)_local; -+ EVTouchPrivatePtr priv = (EVTouchPrivatePtr) local->private; -+ -++ -+ sigstate = xf86BlockSIGIO(); -+ -+- xf86PostMotionEvent(local->dev, TRUE, 0, 2, -+- priv->cur_x, -+- priv->cur_y); -++ PostMotionEvent(local); -+ -+ /* -+ * Emit a button press -- release is handled in EVTouchLBRBEvent -+@@ -209,31 +222,21 @@ emulate3Timer(OsTimerPtr timer, CARD32 n -+ if ( ( priv->touch_flags & LB_STAT ) && -+ !( priv->touch_flags & RB_STAT ) ) { -+ DBGOUT(2, "EVTouch: Left Press\n"); -+- xf86PostButtonEvent (local->dev, TRUE, -+- 1, 1, 0, 2, -+- priv->cur_x, -+- priv->cur_y); -++ PostButtonEvent (local, 1, 1,priv->cur_x,priv->cur_y); -+ } -+ -+ if ( ( priv->touch_flags & RB_STAT ) && -+ !( priv->touch_flags & LB_STAT ) ) { -+ DBGOUT(2, "EVTouch: Right Press\n"); -+- xf86PostButtonEvent (local->dev, TRUE, -+- 3, 1, 0, 2, -+- priv->cur_x, -+- priv->cur_y); -+- } -+- -++ PostButtonEvent (local, 3, 1,priv->cur_x,priv->cur_y); -++ } -+ /* -+ Handling "middle" button press -+ */ -+ if ( ( priv->touch_flags & RB_STAT ) && -+ ( priv->touch_flags & LB_STAT ) ) { -+ DBGOUT(2, "EVTouch: Middle Press\n"); -+- xf86PostButtonEvent (local->dev, TRUE, -+- 2, 1, 0, 2, -+- priv->cur_x, -+- priv->cur_y); -++ PostButtonEvent (local, 2, 1,priv->cur_x,priv->cur_y); -+ } -+ -+ priv->emulate3_timer_expired = TRUE; -+@@ -246,6 +249,7 @@ static void DoBtnAction(EVTouchPrivatePt -+ { -+ int btn = 0; -+ LocalDevicePtr local = priv->local; -++ -+ DBGOUT(2, "EVTouch: %s btn_count=%d\n", __FUNCTION__, priv->btn_count); -+ -+ for (btn = 0; btn < priv->btn_count; btn++) { -+@@ -262,12 +266,7 @@ static void DoBtnAction(EVTouchPrivatePt -+ DBGOUT(2, "EVTouch: %s btn = %d action = %d\n", -+ __FUNCTION__, btn, -+ priv->btn_actions[btn].action); -+- -+- xf86PostButtonEvent (local->dev, TRUE, btn, -+- priv->btn_actions[btn].action, -+- 0, 2, -+- priv->cur_x, -+- priv->cur_y); -++ PostButtonEvent (local, btn, priv->btn_actions[btn].action,priv->cur_x,priv->cur_y); -+ -+ priv->btn_actions[btn].do_it = 0; -+ priv->btn_actions[btn].action = 0; -+@@ -292,39 +291,32 @@ void EVTouchProcessAbs(EVTouchPrivatePtr -+ ev = &priv->ev; -+ -+ if ( (ev->code == ABS_X) || (ev->code == ABS_Z) ) { -++ if ((priv->cur_x - ev->value < priv->move_limit) -++ && (priv->cur_x - ev->value > -priv->move_limit)) -++ return; -+ priv->cur_x = ev->value; -+- libtouchSetXPos(priv->libtouch, priv->cur_x); -++// libtouchSetXPos(priv->libtouch, priv->cur_x); -+ } -+ -+ if ( (ev->code == ABS_Y) || (ev->code == ABS_RX) ) { -++ if ((priv->cur_y - ev->value < priv->move_limit) -++ && (priv->cur_y - ev->value > -priv->move_limit)) -++ return; -+ priv->cur_y = ev->value; -+- libtouchSetYPos(priv->libtouch, priv->cur_y); -++// libtouchSetYPos(priv->libtouch, priv->cur_y); -+ } -+ -+ if (ev->code == ABS_WHEEL) { -+ LocalDevicePtr local = priv->local; -+- -+ if (ev->value > 0) { -+ for (; ev->value > 0; ev->value--) { -+- xf86PostButtonEvent (local->dev, TRUE, -+- 4, 1, 0, 2, -+- priv->cur_x, -+- priv->cur_y); -+- xf86PostButtonEvent (local->dev, TRUE, -+- 4, 0, 0, 2, -+- priv->cur_x, -+- priv->cur_y); -++ PostButtonEvent (local, 4,1,priv->cur_x,priv->cur_y); -++ PostButtonEvent (local, 4,0,priv->cur_x,priv->cur_y); -+ } -+ } else if (ev->value < 0) { -+ for (ev->value = -ev->value; ev->value > 0; ev->value--) { -+- xf86PostButtonEvent (local->dev, TRUE, -+- 5, 1, 0, 2, -+- priv->cur_x, -+- priv->cur_y); -+- xf86PostButtonEvent (local->dev, TRUE, -+- 5, 0, 0, 2, -+- priv->cur_x, -+- priv->cur_y); -++ PostButtonEvent (local, 5,1,priv->cur_x,priv->cur_y); -++ PostButtonEvent (local, 5,0,priv->cur_x,priv->cur_y); -+ } -+ } -+ } -+@@ -451,10 +443,7 @@ void EVTouchProcessKey(EVTouchPrivatePtr -+ default: -+ return; -+ } -+- xf86PostButtonEvent(local->dev, TRUE, -+- btn, ev->value, 0, 2, -+- priv->cur_x, -+- priv->cur_y); -++ PostButtonEvent (local, btn, ev->value,priv->cur_x,priv->cur_y); -+ #endif -+ -+ return; -+@@ -492,8 +481,8 @@ DeviceOn (DeviceIntPtr dev) -+ -+ priv->buffer = XisbNew(local->fd, 64); -+ -+- DBG (9, XisbTrace (priv->buffer, 1)); -+- -++// breaks compilation -++// DBG (9, XisbTrace (priv->buffer, 1)); -+ -+ if (!priv->buffer) -+ { -+@@ -637,8 +626,19 @@ DeviceInit (DeviceIntPtr dev) -+ ErrorF ("Unable to allocate EVTouch touchscreen ValuatorClassDeviceStruct\n"); -+ return !Success; -+ } -+- -+- xf86InitValuatorAxisStruct(dev, 0, priv->min_x, priv->max_x, -++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 2 -++ xf86InitValuatorAxisStruct(dev, 0, 0, priv->screen_width, -++ 1024, -++ EV_AXIS_MIN_RES /* min_res */ , -++ EV_AXIS_MAX_RES /* max_res */ ); -++ xf86InitValuatorDefaults(dev, 0); -++ xf86InitValuatorAxisStruct(dev, 1, 0, priv->screen_height, -++ 1024, -++ EV_AXIS_MIN_RES /* min_res */ , -++ EV_AXIS_MAX_RES /* max_res */ ); -++ xf86InitValuatorDefaults(dev, 1); -++#else -++ xf86InitValuatorAxisStruct(dev, 0, priv->min_x, priv->max_x, -+ 1024, -+ EV_AXIS_MIN_RES /* min_res */ , -+ EV_AXIS_MAX_RES /* max_res */ ); -+@@ -648,7 +648,7 @@ DeviceInit (DeviceIntPtr dev) -+ EV_AXIS_MIN_RES /* min_res */ , -+ EV_AXIS_MAX_RES /* max_res */ ); -+ xf86InitValuatorDefaults(dev, 1); -+- -++#endif -+ /* Initial position of pointer on screen: Centered */ -+ priv->cur_x=(priv->max_x - priv->min_x)/2; -+ priv->cur_y=(priv->max_y - priv->min_y)/2; -+@@ -777,14 +777,8 @@ static void ReadInput (LocalDevicePtr lo -+ DBGOUT(2, "EVTouch: %s type:%0.2x code: 0x%0.4x value:%d\n", -+ __FUNCTION__, ev->type, ev->code, ev->value); -+ -+- xf86XInputSetScreen(local, -+- priv->screen_num, -+- priv->cur_x, -+- priv->cur_y); -+- -+- xf86PostProximityEvent(local->dev, 1, 0, 2, -+- priv->cur_x, -+- priv->cur_y); -++ InputSetScreen(local); -++ PostProximityEvent (local,1); -+ -+ switch (ev->type) { -+ case EV_ABS: -+@@ -794,9 +788,7 @@ static void ReadInput (LocalDevicePtr lo -+ EVTouchProcessRel(priv); -+ break; -+ case EV_KEY: -+- xf86PostMotionEvent (local->dev, TRUE, 0, 2, -+- priv->cur_x, -+- priv->cur_y); -++ PostMotionEvent (local); -+ -+ if (priv->ev.code == BTN_TOUCH) { -+ if (priv->ev.value == 1) { -+@@ -811,9 +803,8 @@ static void ReadInput (LocalDevicePtr lo -+ EVTouchProcessKey(priv); -+ break; -+ case EV_SYN: -+- xf86PostMotionEvent (local->dev, TRUE, 0, 2, -+- priv->cur_x, -+- priv->cur_y); -++ libtouchSetPos(priv->libtouch, priv->cur_x,priv->cur_y); -++ PostMotionEvent (local); -+ -+ if ( priv->touch_flags & TOUCHED ) -+ libtouchTriggerSM(priv->libtouch, PEN_TOUCHED); -+@@ -902,7 +893,9 @@ ConvertProc ( LocalDevicePtr local, -+ -+ EVTouchPrivatePtr priv = (EVTouchPrivatePtr) (local->private); -+ ScrnInfoPtr pScrn = xf86Screens[priv->screen_num]; -+- Rotation rotation = RRGetRotation(pScrn->pScreen); -++ -++// X Segfaults -++// Rotation rotation = RRGetRotation(pScrn->pScreen); -+ -+ DBGOUT(2, "EVTouch: FIRST: v0=%d v1=%d\n", v0, v1); -+ -+@@ -921,15 +914,17 @@ ConvertProc ( LocalDevicePtr local, -+ max_x = priv->max_x - priv->min_x; -+ max_y = priv->max_y - priv->min_y; -+ -+- if (priv->rotate == EV_ROTATE_NONE) { -++ -++// if (priv->rotate == EV_ROTATE_NONE) { -+ screen_width = pScrn->currentMode->HDisplay; -+ screen_height = pScrn->currentMode->VDisplay; -++/* Swapping is done below in Coords! Leave those to be able to calc correct mapping -+ } else { -+ screen_width = pScrn->currentMode->VDisplay; -+ screen_height = pScrn->currentMode->HDisplay; -+ } -+ -+- -++*/ -+ if (xc < (max_x / 2)) { -+ /* -+ left -+@@ -1042,45 +1037,57 @@ ConvertProc ( LocalDevicePtr local, -+ -+ int tmp = 0; -+ /* rotation mixes x and y up a bit */ -+- if (priv->rotate == EV_ROTATE_CW) { -++ switch(priv->rotate) { -++ case EV_ROTATE_CW: -+ tmp = xc; -+ xc = yc; -+ yc = screen_width - tmp; -+- } else if (priv->rotate == EV_ROTATE_CCW) { -++ break; -++ case EV_ROTATE_CCW: -+ tmp = xc; -+ xc = screen_height - yc; -+ yc = tmp; -++ break; -++ case EV_ROTATE_UD: -++ xc = screen_width - xc; -++ yc = screen_height - yc; -++ break; -++ default: -++ break; -+ } -+ -+- switch (rotation) { -+- case RR_Rotate_0: -++/* X Segfaults on rotation setting -++ switch (rotation) { -++ case RR_Rotate_0: -+ v0 = xc; -+ v1 = yc; -+- break; -+- case RR_Rotate_180: -+- v0 = screen_width - xc; -+- v1 = screen_height - yc; -+- break; -+- case RR_Rotate_90: -++ break; -++ case RR_Rotate_180: -++ v0 = screen_width - xc; -++ v1 = screen_height - yc; -++ break; -++ case RR_Rotate_90: -+ tmp = xc; -+- v0 = screen_height - yc; -++ v0 = screen_height - yc; -+ v1 = tmp; -+- break; -+- case RR_Rotate_270: -++ break; -++ case RR_Rotate_270: -+ tmp = xc; -+- v0 = yc; -+- v1 = screen_width - tmp; -+- break; -+- default: -+- break; -+- } -++ v0 = yc; -++ v1 = screen_width - tmp; -++ break; -++ default: -++ break; -++ } -++ -++ -++*/ -+ } -+ -+ DBGOUT(2, "EVTouch: FINAL: v0=%d v1=%d\n", v0, v1); -+ -+- *x = v0; -+- *y = v1; -+- -++ *x = xc; -++ *y = yc; -+ return (TRUE); -+ } -+ -+@@ -1133,8 +1140,9 @@ EVTouchPreInit(InputDriverPtr drv, IDevP -+ -+ xf86OptionListReport(local->options); -+ -++ -+ priv->libtouch = xcalloc(1, sizeof(LibTouchRec)); -+- libtouchInit(priv->libtouch, local); -++ libtouchInit(priv->libtouch, local,PostButtonEvent); -+ -+ priv->screen_num = xf86SetIntOption(local->options, "ScreenNumber", 0 ); -+ -+@@ -1164,9 +1172,9 @@ EVTouchPreInit(InputDriverPtr drv, IDevP -+ timeo = xf86SetIntOption(local->options, "LongtouchTimer", 160); -+ libtouchSetLongtouchTimeo(priv->libtouch, timeo); -+ -+- libtouchSetMoveLimit(priv->libtouch, -+- xf86SetIntOption( local->options, -+- "MoveLimit", 180 )); -++ priv->move_limit = xf86SetIntOption( local->options, -++ "MoveLimit", 180 ); -++ libtouchSetMoveLimit(priv->libtouch, priv->move_limit); -+ -+ priv->rotate = EV_ROTATE_NONE; -+ s = xf86FindOptionValue(local->options, "Rotate"); -+@@ -1175,7 +1183,11 @@ EVTouchPreInit(InputDriverPtr drv, IDevP -+ priv->rotate = EV_ROTATE_CW; -+ } else if (xf86NameCmp(s, "CCW") == 0 ) { -+ priv->rotate = EV_ROTATE_CCW; -+- } -++ } else if (xf86NameCmp(s, "UD") == 0 ) { -++ priv->rotate = EV_ROTATE_UD; -++ } -++ -++ -+ } -+ -+ if (priv->rotate == EV_ROTATE_NONE) { -+@@ -1207,9 +1219,10 @@ EVTouchPreInit(InputDriverPtr drv, IDevP -+ priv->diff[i][0], priv->diff[i][1]); -+ } -+ -++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0 -+ xf86AlwaysCore(local, TRUE); -++#endif -+ priv->touch_flags = 0; -+- -+ local->history_size = xf86SetIntOption( local->options, "HistorySize", 0 ); -+ -+ /* prepare to process touch packets */ -+@@ -1232,6 +1245,7 @@ EVTouchPreInit(InputDriverPtr drv, IDevP -+ -+ xf86CloseSerial(local->fd); -+ local->fd = -1; -++ -+ return (local); -+ } -+ -+@@ -1243,3 +1257,58 @@ EVTouchPtrCtrl(DeviceIntPtr device, PtrC -+ Ho Hum. -+ */ -+ } -++ -++ -++static void -++PostMotionEvent(LocalDevicePtr local) { -++int cur_x, cur_y; -++EVTouchPrivatePtr priv = (EVTouchPrivatePtr) (local->private); -++ -++ cur_x = priv->cur_x; -++ cur_y = priv->cur_y; -++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 2 -++ ConvertProc(local,0,2,priv->cur_x,priv->cur_y,0,0,0,0,&cur_x,&cur_y); -++#endif -++ -++xf86PostMotionEvent (local->dev, TRUE, 0, 2, cur_x, cur_y); -++} -++ -++static void -++PostProximityEvent(LocalDevicePtr local, int is_in) { -++int cur_x, cur_y; -++EVTouchPrivatePtr priv = (EVTouchPrivatePtr) (local->private); -++ -++ cur_x = priv->cur_x; -++ cur_y = priv->cur_y; -++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 2 -++ ConvertProc(local,0,2,priv->cur_x,priv->cur_y,0,0,0,0,&cur_x,&cur_y); -++#endif -++ -++xf86PostProximityEvent(local->dev, is_in, 0, 2, cur_x,cur_y); -++} -++ -++static void -++PostButtonEvent(LocalDevicePtr local, int button, int is_down,int x, int y) { -++EVTouchPrivatePtr priv = (EVTouchPrivatePtr) (local->private); -++ -++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 2 -++ ConvertProc(local,0,2,x,y,0,0,0,0,&x,&y); -++#endif -++ -++xf86PostButtonEvent (local->dev, TRUE, button, is_down, 0, 2, x, y); -++} -++ -++ -++static void InputSetScreen(LocalDevicePtr local) { -++int cur_x, cur_y; -++EVTouchPrivatePtr priv = (EVTouchPrivatePtr) (local->private); -++ -++ cur_x = priv->cur_x; -++ cur_y = priv->cur_y; -++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 2 -++ ConvertProc(local,0,2,priv->cur_x,priv->cur_y,0,0,0,0,&cur_x,&cur_y); -++#endif -++ -++xf86XInputSetScreen(local,priv->screen_num,cur_x,cur_y); -++} -++ -+Index: xserver-xorg-input-evtouch/evtouch.h -+=================================================================== -+--- xserver-xorg-input-evtouch.orig/evtouch.h 2008-02-02 21:49:20.823984091 +0900 -++++ xserver-xorg-input-evtouch/evtouch.h 2008-02-02 21:49:39.734971242 +0900 -+@@ -42,6 +42,7 @@ -+ #define EV_ROTATE_NONE 0 -+ #define EV_ROTATE_CW 1 -+ #define EV_ROTATE_CCW 2 -++#define EV_ROTATE_UD 3 -+ -+ #define EV_AXIS_MIN_RES 0 -+ #define EV_AXIS_MAX_RES 1024 -+@@ -80,6 +81,7 @@ typedef struct _EVTouchPrivateRec -+ int max_rel_y; /* Maximum y */ -+ -+ int drag_timer; -++ int move_limit; -+ Bool emulate3; -+ int emulate3_timeout; -+ OsTimerPtr emulate3_timer; -+@@ -138,6 +140,7 @@ typedef struct _EVTouchPrivateRec -+ -+ LibTouchRecPtr libtouch; -+ LocalDevicePtr local; -++ -+ } EVTouchPrivateRec, *EVTouchPrivatePtr; -+ -+ -+Index: xserver-xorg-input-evtouch/libtouch.c -+=================================================================== -+--- xserver-xorg-input-evtouch.orig/libtouch.c 2008-02-02 21:49:36.899983517 +0900 -++++ xserver-xorg-input-evtouch/libtouch.c 2008-02-02 21:49:39.734971242 +0900 -+@@ -52,6 +52,7 @@ typedef struct state { -+ int (*handle_state)(LibTouchRecPtr priv); -+ void (*action)(LibTouchRecPtr priv, int btn, int x, int y); -+ int btn; -++ int drag_btn; -+ } state_t; -+ -+ -+@@ -68,16 +69,14 @@ typedef enum states { -+ static void btn_down_action(LibTouchRecPtr priv, int btn, int x, int y) -+ { -+ DBG(4, ErrorF("LibTouch: Issuing Button %d down\n", btn)); -+- xf86PostButtonEvent(priv->local->dev, TRUE, -+- btn, 1, 0, 2, x, y); -++ priv->post_button_proc(priv->local,btn, 1,x,y); -+ priv->pressed_btn_stat |= 1 << btn; -+ } -+ -+ static void btn_up_action(LibTouchRecPtr priv, int btn, int x, int y) -+ { -+ DBG(4, ErrorF("LibTouch: Issuing Button %d up\n", btn)); -+- xf86PostButtonEvent(priv->local->dev, TRUE, -+- btn, 0, 0, 2, x, y); -++ priv->post_button_proc(priv->local,btn, 0,x,y); -+ priv->pressed_btn_stat &= ~(1 << btn); -+ } -+ -+@@ -103,13 +102,13 @@ static int handle_oneandahalftap(LibTouc -+ static void dump_configuration(); -+ -+ state_t state_ar[] = { -+- {enter_untouched, handle_untouched, NULL, 0}, -+- {enter_touched, handle_touched, NULL, 0}, -+- {enter_longtouched, handle_longtouched, btn_down_action, 1}, -+- {enter_moving, handle_moving, NULL, 0}, -+- {enter_maybetap, handle_maybetap, btn_click_action, 1}, -+- {enter_oneandahalftap, handle_oneandahalftap, btn_down_action, 3}, -+- {NULL, NULL, NULL, -1}, -++ {enter_untouched, handle_untouched, NULL, 0,-1}, -++ {enter_touched, handle_touched, NULL, 0,-1}, -++ {enter_longtouched, handle_longtouched, btn_down_action, 1,-1}, -++ {enter_moving, handle_moving, NULL, 0,-1}, -++ {enter_maybetap, handle_maybetap, btn_click_action, 1,-1}, -++ {enter_oneandahalftap, handle_oneandahalftap, btn_down_action, 3,-1}, -++ {NULL, NULL, NULL, -1,-1}, -+ }; -+ -+ char *state_str[] = { -+@@ -142,6 +141,16 @@ char *state_button_str[] = { -+ NULL, -+ }; -+ -++char *state_drag_str[] = { -++ "untouched_drag", -++ "touched_drag", -++ "longtouched_drag", -++ "moving_drag", -++ "maybetapped_drag", -++ "oneandahalftap_drag", -++ NULL, -++}; -++ -+ char *action_str[] = { -+ "down", -+ "up", -+@@ -177,13 +186,13 @@ void libtouchSetMoveLimit(LibTouchRecPtr -+ } -+ -+ -+-void libtouchInit(LibTouchRecPtr libtouch, LocalDevicePtr local) -++void libtouchInit(LibTouchRecPtr libtouch, LocalDevicePtr local,pointer post_button_proc) -+ { -+ int state_action_idx = 0; -+ int state_button_idx = 0; -++ int state_drag_idx = 0; -+ int action_idx = 0; -+ int btn; -+- -+ char *str; -+ -+ xf86memset(libtouch, 0, sizeof(LibTouchRec)); -+@@ -193,6 +202,7 @@ void libtouchInit(LibTouchRecPtr libtouc -+ libtouch->local = local; -+ libtouch->move_limit = 30; -+ -++ libtouch->post_button_proc = post_button_proc; -+ /* -+ Actions: up, down, click -+ -+@@ -228,6 +238,11 @@ void libtouchInit(LibTouchRecPtr libtouc -+ } -+ } -+ -++ /* parse dragging for the states, that is which button sent to be as down, when in state and about to change to MOVING state */ -++ for (state_drag_idx = 0; state_drag_str[state_drag_idx] != NULL; state_drag_idx++) { -++ btn = xf86SetIntOption(local->options, state_drag_str[state_drag_idx], -1); -++ if (btn != -1) state_ar[state_drag_idx].drag_btn = btn; -++ } -+ -+ dump_configuration(); -+ } -+@@ -359,10 +374,7 @@ static void enter_untouched(LibTouchRecP -+ for (i = 0; i < bit_size; i++) -+ if (priv->pressed_btn_stat & (1 << i)) { -+ DBG(4, ErrorF("LibTouch: Issuing Button-release %d\n", i)); -+- xf86PostButtonEvent(priv->local->dev, TRUE, -+- i, 0, 0, 2, -+- priv->cur_x, -+- priv->cur_y); -++ priv->post_button_proc(priv->local,i, 0,priv->cur_x,priv->cur_y); -+ } -+ -+ priv->pressed_btn_stat = 0; -+@@ -445,6 +457,10 @@ static int handle_touched(LibTouchRecPtr -+ if (priv->cur_x != priv->old_x) { -+ dx = delta(priv->touch_x, priv->cur_x); -+ if (dx > priv->move_limit) { -++ if((state_ar[S_TOUCHED].drag_btn != -1) && (priv->touch_time != priv->now)){ -++ libtouchSetTime(priv, GetTimeInMillis()); -++ btn_down_action(priv, state_ar[S_TOUCHED].drag_btn, priv->cur_x,priv->cur_y); -++ } -+ return S_MOVING; -+ } -+ } -+@@ -454,7 +470,10 @@ static int handle_touched(LibTouchRecPtr -+ if (priv->cur_y != priv->old_y) { -+ dy = delta(priv->touch_y, priv->cur_y); -+ if (dy > priv->move_limit) { -+- return S_MOVING; -++ if((state_ar[S_TOUCHED].drag_btn != -1) && (priv->touch_time != priv->now)){ -++ libtouchSetTime(priv, GetTimeInMillis()); -++ btn_down_action(priv, state_ar[S_TOUCHED].drag_btn, priv->cur_x,priv->cur_y); -++} return S_MOVING; -+ } -+ } -+ } -+@@ -500,7 +519,7 @@ static int handle_longtouched(LibTouchRe -+ } else { -+ if (priv->cur_x != priv->old_x) { -+ dx = delta(priv->touch_x, priv->cur_x); -+- if (dx > priv->move_limit) -++ if (dx > priv->move_limit) -+ rc = S_MOVING; -+ } -+ -+Index: xserver-xorg-input-evtouch/libtouch.h -+=================================================================== -+--- xserver-xorg-input-evtouch.orig/libtouch.h 2008-02-02 21:49:36.899983517 +0900 -++++ xserver-xorg-input-evtouch/libtouch.h 2008-02-02 21:49:39.734971242 +0900 -+@@ -50,6 +50,7 @@ typedef struct _libtouch { -+ CARD32 past; -+ CARD32 now; -+ LocalDevicePtr local; -++ void (*post_button_proc)(LocalDevicePtr local,int button, int is_down,int x,int y); -+ } LibTouchRec, *LibTouchRecPtr; -+ -+ void libtouchSetDebugLevel(int level); -+@@ -59,7 +60,7 @@ void libtouchSetOneandahalftapTimeo(LibT -+ void libtouchSetTime(LibTouchRecPtr libtouch, CARD32 now); -+ void libtouchSetMoveLimit(LibTouchRecPtr libtouch, int move_limit); -+ -+-void libtouchInit(LibTouchRecPtr libtouch, LocalDevicePtr local); -++void libtouchInit(LibTouchRecPtr libtouch, LocalDevicePtr local,pointer post_button_proc); -+ -+ void libtouchSetPos(LibTouchRecPtr libtouch, int x, int y); -+ void libtouchTriggerSM(LibTouchRecPtr libtouch, LibTouchState_t touch); ---- xf86-input-evtouch-0.8.8.orig/debian/patches/04_include_xf86_ansic_h.patch -+++ xf86-input-evtouch-0.8.8/debian/patches/04_include_xf86_ansic_h.patch -@@ -0,0 +1,23 @@ -+Index: xserver-xorg-input-evtouch/libtouch.c -+=================================================================== -+--- xserver-xorg-input-evtouch.orig/libtouch.c 2007-09-11 23:00:20.762131559 +0900 -++++ xserver-xorg-input-evtouch/libtouch.c 2007-09-11 23:00:43.263413833 +0900 -+@@ -34,7 +34,6 @@ -+ #ifndef NEED_XF86_TYPES -+ #define NEED_XF86_TYPES -+ #endif -+-#include -+ #include -+ #include -+ #include -+Index: xserver-xorg-input-evtouch/libtouch.h -+=================================================================== -+--- xserver-xorg-input-evtouch.orig/libtouch.h 2007-09-11 23:00:20.762131559 +0900 -++++ xserver-xorg-input-evtouch/libtouch.h 2007-09-11 23:00:51.263869754 +0900 -+@@ -1,5 +1,6 @@ -+ #ifndef _libtouch_H_ -+ #define _libtouch_H_ -++#include -+ #include -+ -+ #define TOUCHED 0x01 ---- xf86-input-evtouch-0.8.8.orig/debian/patches/07_random_fixes_for_06.patch -+++ xf86-input-evtouch-0.8.8/debian/patches/07_random_fixes_for_06.patch -@@ -0,0 +1,523 @@ -+# Description: -+# o Random whitespace fixes -+# o uninitialized variables warning fix -+# -+Index: xserver-xorg-input-evtouch/evtouch.c -+=================================================================== -+--- xserver-xorg-input-evtouch.orig/evtouch.c 2008-02-03 11:51:32.082972688 +0900 -++++ xserver-xorg-input-evtouch/evtouch.c 2008-02-03 11:51:32.106981862 +0900 -+@@ -1,6 +1,6 @@ -+ /* -+ * -+- * Copyright 2004 by Kenan Esau , Baltmannsweiler, -++ * Copyright 2004 by Kenan Esau , Baltmannsweiler, -+ * Germany. -+ * -+ * Permission to use, copy, modify, distribute, and sell this software and its -+@@ -182,17 +182,17 @@ static const char *default_options[] = -+ static int -+ ControlProc(LocalDevicePtr device, xDeviceCtl *ctrl); -+ -+-static void -++static void -+ PostMotionEvent(LocalDevicePtr local); -+ -+-static void -++static void -+ PostProximityEvent(LocalDevicePtr local,int is_in); -+ -+-static void -++static void -+ PostButtonEvent(LocalDevicePtr local, int button, -+ int is_down, int x,int y); -+ -+-static void -++static void -+ InputSetScreen(LocalDevicePtr local); -+ -+ -+@@ -216,7 +216,7 @@ emulate3Timer(OsTimerPtr timer, CARD32 n -+ -+ PostMotionEvent(local); -+ -+- /* -++ /* -+ * Emit a button press -- release is handled in EVTouchLBRBEvent -+ */ -+ if ( ( priv->touch_flags & LB_STAT ) && -+@@ -241,11 +241,11 @@ emulate3Timer(OsTimerPtr timer, CARD32 n -+ -+ priv->emulate3_timer_expired = TRUE; -+ xf86UnblockSIGIO(sigstate); -+- -++ -+ return 0; -+ } -+ -+-static void DoBtnAction(EVTouchPrivatePtr priv) -++static void DoBtnAction(EVTouchPrivatePtr priv) -+ { -+ int btn = 0; -+ LocalDevicePtr local = priv->local; -+@@ -253,7 +253,7 @@ static void DoBtnAction(EVTouchPrivatePt -+ DBGOUT(2, "EVTouch: %s btn_count=%d\n", __FUNCTION__, priv->btn_count); -+ -+ for (btn = 0; btn < priv->btn_count; btn++) { -+- DBGOUT(9, "EVTouch: %s do_it = %d \n", -++ DBGOUT(9, "EVTouch: %s do_it = %d \n", -+ __FUNCTION__, priv->btn_actions[btn].do_it); -+ if (priv->btn_actions[btn].do_it != 0) { -+ if (priv->emulate3_timer != NULL) -+@@ -263,10 +263,10 @@ static void DoBtnAction(EVTouchPrivatePt -+ priv->emulate3_timer_expired = FALSE; -+ } -+ -+- DBGOUT(2, "EVTouch: %s btn = %d action = %d\n", -+- __FUNCTION__, btn, -++ DBGOUT(2, "EVTouch: %s btn = %d action = %d\n", -++ __FUNCTION__, btn, -+ priv->btn_actions[btn].action); -+- PostButtonEvent (local, btn, priv->btn_actions[btn].action,priv->cur_x,priv->cur_y); -++ PostButtonEvent (local, btn, priv->btn_actions[btn].action,priv->cur_x,priv->cur_y); -+ -+ priv->btn_actions[btn].do_it = 0; -+ priv->btn_actions[btn].action = 0; -+@@ -318,7 +318,7 @@ void EVTouchProcessAbs(EVTouchPrivatePtr -+ PostButtonEvent (local, 5,1,priv->cur_x,priv->cur_y); -+ PostButtonEvent (local, 5,0,priv->cur_x,priv->cur_y); -+ } -+- } -++ } -+ } -+ } -+ -+@@ -337,7 +337,7 @@ void EVTouchProcessRel(EVTouchPrivatePtr -+ if (priv->cur_x < priv->min_x) -+ priv->cur_x = priv->min_x; -+ return; -+- } -++ } -+ if ( ev->code == REL_Y ) { -+ priv->cur_y += ev->value; -+ if (priv->cur_y > priv->max_y) -+@@ -346,7 +346,7 @@ void EVTouchProcessRel(EVTouchPrivatePtr -+ priv->cur_y = priv->min_y; -+ return; -+ } -+- -++ -+ libtouchSetPos(priv->libtouch, priv->cur_x, priv->cur_y); -+ } -+ -+@@ -363,12 +363,12 @@ void EVTouchLBRBEvent(EVTouchPrivatePtr -+ -+ if (priv->emulate3) { -+ if ( (ev->value==1) && (priv->emulate3_timer==NULL) ) -+- priv->emulate3_timer = TimerSet(priv->emulate3_timer, -++ priv->emulate3_timer = TimerSet(priv->emulate3_timer, -+ 0, -+ priv->emulate3_timeout, -+ emulate3Timer, -+ local); -+- -++ -+ if ( (ev->value == 1) && (ev->code == BTN_LEFT) ) { -+ priv->touch_flags |= LB_STAT; -+ } -+@@ -376,8 +376,8 @@ void EVTouchLBRBEvent(EVTouchPrivatePtr -+ priv->touch_flags |= RB_STAT; -+ } -+ -+- if ( (ev->value == 0) && -+- (priv->touch_flags & RB_STAT) && -++ if ( (ev->value == 0) && -++ (priv->touch_flags & RB_STAT) && -+ (priv->touch_flags & LB_STAT) ) { -+ DBGOUT(2, "EVTouch: Middle Release\n"); -+ priv->touch_flags &= ~LB_STAT; -+@@ -393,7 +393,7 @@ void EVTouchLBRBEvent(EVTouchPrivatePtr -+ DBGOUT(2, "EVTouch: Right Release\n"); -+ priv->touch_flags &= ~RB_STAT; -+ SetBtnAction(priv, 3, BTN_RELEASE); -+- } -++ } -+ } else { -+ if (ev->code == BTN_LEFT) { -+ SetBtnAction(priv, 1, ev->value); -+@@ -418,11 +418,11 @@ void EVTouchProcessKey(EVTouchPrivatePtr -+ -+ DBGOUT(2, "EVTouch: %s\n", __FUNCTION__); -+ ev = &priv->ev; -+- if ( (ev->code == BTN_LEFT) || -++ if ( (ev->code == BTN_LEFT) || -+ (ev->code == BTN_RIGHT) || -+ (ev->code == BTN_MIDDLE) ) { -+ -+- /* give lb and rb-events some special treatment -++ /* give lb and rb-events some special treatment -+ (emulate3 or not, ...) */ -+ EVTouchLBRBEvent(priv); -+ return; -+@@ -468,7 +468,7 @@ DeviceOn (DeviceIntPtr dev) -+ { -+ LocalDevicePtr local = (LocalDevicePtr) dev->public.devicePrivate; -+ EVTouchPrivatePtr priv = (EVTouchPrivatePtr) (local->private); -+- -++ -+ local->fd = xf86OpenSerial(local->options); -+ -+ DBGOUT(2, "EVTouch: %s\n", __FUNCTION__ ); -+@@ -484,7 +484,7 @@ DeviceOn (DeviceIntPtr dev) -+ // breaks compilation -+ // DBG (9, XisbTrace (priv->buffer, 1)); -+ -+- if (!priv->buffer) -++ if (!priv->buffer) -+ { -+ xf86CloseSerial(local->fd); -+ local->fd = -1; -+@@ -526,7 +526,7 @@ DeviceOff (DeviceIntPtr dev) -+ DBGOUT(2, "EVTouch: %s\n", __FUNCTION__ ); -+ -+ if (local->fd != -1) -+- { -++ { -+ ioctl(local->fd, EVIOCGRAB, (void *)0); -+ xf86RemoveEnabledDevice (local); -+ if (priv->buffer) -+@@ -564,7 +564,7 @@ DeviceInit (DeviceIntPtr dev) -+ -+ priv->btn_count = EV_MAX_BUTTONS; -+ -+- /* -++ /* -+ * these have to be here instead of in the SetupProc, because when the -+ * SetupProc is run at server startup, screenInfo is not setup yet -+ */ -+@@ -574,9 +574,9 @@ DeviceInit (DeviceIntPtr dev) -+ priv->screen_height = pScrn->virtualY; -+ priv->pViewPort_X0 = &(pScrn->frameX0); /* initialize the pointers to the viewport coords */ -+ if ( (priv->screen_width != priv->phys_width) || -+- (priv->screen_height != priv->phys_height) ) -++ (priv->screen_height != priv->phys_height) ) -+ priv->virtual = 1; -+- else -++ else -+ priv->virtual = 0; -+ -+ priv->pViewPort_Y0 = &(pScrn->frameY0); -+@@ -591,24 +591,24 @@ DeviceInit (DeviceIntPtr dev) -+ DBGOUT(2, "EVTouch: MaxValue H,V: %d %d\n", pScrn->maxHValue, pScrn->maxVValue); -+ -+ priv->screen_width = screenInfo.screens[priv->screen_num]->width; -+- priv->screen_height = screenInfo.screens[priv->screen_num]->height; -++ priv->screen_height = screenInfo.screens[priv->screen_num]->height; -+ -+- /* -++ /* -+ * Device reports button press for 5 buttons. -+ */ -+ if (InitButtonClassDeviceStruct (dev, EV_MAX_BUTTONS, map) == FALSE) -+ { -+ ErrorF("Unable to allocate EVTouch touchscreen ButtonClassDeviceStruct\n"); -+ return BadAlloc; -+- } -++ } -+ -+- DBGOUT(2, "EVTouch: %s btn_count=%d\n", __FUNCTION__, -++ DBGOUT(2, "EVTouch: %s btn_count=%d\n", __FUNCTION__, -+ priv->btn_count); -+ priv->btn_actions = xcalloc(priv->btn_count, sizeof(BtnAction)); -+- xf86memset(priv->btn_actions, 0, -++ xf86memset(priv->btn_actions, 0, -+ priv->btn_count * sizeof(BtnAction)); -+- -+- DBGOUT(2, "EVTouch: %s btn_count=%d\n", __FUNCTION__, -++ -++ DBGOUT(2, "EVTouch: %s btn_count=%d\n", __FUNCTION__, -+ priv->btn_count); -+ -+ if (InitFocusClassDeviceStruct(dev) == FALSE) { -+@@ -616,7 +616,7 @@ DeviceInit (DeviceIntPtr dev) -+ return !Success; -+ } -+ -+- /* -++ /* -+ * Device reports motions on 2 axes in absolute coordinates. -+ * Axes min and max values are reported in raw coordinates. -+ */ -+@@ -654,7 +654,7 @@ DeviceInit (DeviceIntPtr dev) -+ priv->cur_y=(priv->max_y - priv->min_y)/2; -+ libtouchSetPos(priv->libtouch, priv->cur_x, priv->cur_y); -+ -+- -++ -+ if (InitProximityClassDeviceStruct (dev) == FALSE) -+ { -+ ErrorF ("Unable to allocate EVTouch touchscreen ProximityClassDeviceStruct\n"); -+@@ -667,7 +667,7 @@ DeviceInit (DeviceIntPtr dev) -+ return !Success; -+ } -+ -+- /* -++ /* -+ * Allocate the motion events buffer. -+ */ -+ xf86MotionHistoryAllocate (local); -+@@ -748,7 +748,7 @@ EVTouchGetPacket (EVTouchPrivatePtr priv -+ if (sizeof(priv->ev) == count) { -+ count = 0; -+ EVTouchDumpPacketToLog(priv); -+- -++ -+ return Success; -+ } -+ } -+@@ -764,7 +764,7 @@ static void ReadInput (LocalDevicePtr lo -+ -+ EVTouchPrivatePtr priv = (EVTouchPrivatePtr) (local->private); -+ -+- /* -++ /* -+ * set blocking to -1 on the first call because we know there is data to -+ * read. Xisb automatically clears it after one successful read so that -+ * succeeding reads are preceeded buy a select with a 0 timeout to prevent -+@@ -815,7 +815,7 @@ static void ReadInput (LocalDevicePtr lo -+ break; -+ } -+ -+- DBGOUT( 2, "EVTouch: setting (x/y)=(%d/%d)\n", -++ DBGOUT( 2, "EVTouch: setting (x/y)=(%d/%d)\n", -+ priv->cur_x, priv->cur_y); -+ -+ } -+@@ -855,7 +855,7 @@ static int -+ SwitchMode (ClientPtr client, DeviceIntPtr dev, int mode) -+ { -+ DBGOUT(2, "EVTouch: %s\n", __FUNCTION__); -+- -++ -+ return (!Success); -+ } -+ -+@@ -884,19 +884,20 @@ ConvertProc ( LocalDevicePtr local, -+ float dx = 0, dy = 0; -+ -+ int max_x, max_y; -+- int xc, yc; -++ int xc = 0, yc = 0; -+ int screen_width = 0; -+ int screen_height = 0; -+ #ifdef EVDBG -+ int i = 0; -+ #endif -+ -+- EVTouchPrivatePtr priv = (EVTouchPrivatePtr) (local->private); -++ EVTouchPrivatePtr priv = (EVTouchPrivatePtr) (local->private); -+ ScrnInfoPtr pScrn = xf86Screens[priv->screen_num]; -+ -+ // X Segfaults -+-// Rotation rotation = RRGetRotation(pScrn->pScreen); -++ Rotation rotation = RRGetRotation(pScrn->pScreen); -+ -++ DBGOUT(2, "EVTouch: RRRotation=%d\n", rotation); -+ DBGOUT(2, "EVTouch: FIRST: v0=%d v1=%d\n", v0, v1); -+ -+ /*correction of raw coordinates*/ -+@@ -910,21 +911,20 @@ ConvertProc ( LocalDevicePtr local, -+ DBGOUT(2, "EVTouch: Scaling coordinates\n"); -+ xc = v0 - priv->min_x; -+ yc = v1 - priv->min_y; -+- -++ -+ max_x = priv->max_x - priv->min_x; -+ max_y = priv->max_y - priv->min_y; -+ -+ -+-// if (priv->rotate == EV_ROTATE_NONE) { -++ if (priv->rotate == EV_ROTATE_NONE) { -+ screen_width = pScrn->currentMode->HDisplay; -+ screen_height = pScrn->currentMode->VDisplay; -+-/* Swapping is done below in Coords! Leave those to be able to calc correct mapping -++/* Swapping is done below in Coords! Leave those to be able to calc correct mapping */ -+ } else { -+ screen_width = pScrn->currentMode->VDisplay; -+ screen_height = pScrn->currentMode->HDisplay; -+ } -+ -+-*/ -+ if (xc < (max_x / 2)) { -+ /* -+ left -+@@ -942,7 +942,7 @@ ConvertProc ( LocalDevicePtr local, -+ (float)(cx[0] * cy[0] * priv->diff[0][0]) + -+ (float)(cx[1] * cy[1] * priv->diff[4][0]) + -+ (float)(cx[0] * cy[1] * priv->diff[3][0])); -+- -++ -+ dy = ((float) (cx[1] * cy[0] * priv->diff[1][1]) + -+ (float)(cx[0] * cy[0] * priv->diff[0][1]) + -+ (float)(cx[1] * cy[1] * priv->diff[4][1]) + -+@@ -961,7 +961,7 @@ ConvertProc ( LocalDevicePtr local, -+ (float)(cx[0] * cy[0] * priv->diff[3][0]) + -+ (float)(cx[1] * cy[1] * priv->diff[7][0]) + -+ (float)(cx[0] * cy[1] * priv->diff[6][0])); -+- -++ -+ dy = ((float) (cx[1] * cy[0] * priv->diff[4][1]) + -+ (float)(cx[0] * cy[0] * priv->diff[3][1]) + -+ (float)(cx[1] * cy[1] * priv->diff[7][1]) + -+@@ -985,7 +985,7 @@ ConvertProc ( LocalDevicePtr local, -+ (float)(cx[0] * cy[0] * priv->diff[1][0]) + -+ (float)(cx[1] * cy[1] * priv->diff[5][0]) + -+ (float)(cx[0] * cy[1] * priv->diff[4][0])); -+- -++ -+ dy = ((float) (cx[1] * cy[0] * priv->diff[2][1]) + -+ (float)(cx[0] * cy[0] * priv->diff[1][1]) + -+ (float)(cx[1] * cy[1] * priv->diff[5][1]) + -+@@ -1004,7 +1004,7 @@ ConvertProc ( LocalDevicePtr local, -+ (float)(cx[0] * cy[0] * priv->diff[4][0]) + -+ (float)(cx[1] * cy[1] * priv->diff[8][0]) + -+ (float)(cx[0] * cy[1] * priv->diff[7][0])); -+- -++ -+ dy = ((float) (cx[1] * cy[0] * priv->diff[5][1]) + -+ (float)(cx[0] * cy[0] * priv->diff[4][1]) + -+ (float)(cx[1] * cy[1] * priv->diff[8][1]) + -+@@ -1014,12 +1014,12 @@ ConvertProc ( LocalDevicePtr local, -+ -+ -+ #ifdef EVDBG -+- for (i=0; i<3; i++) -++ for (i=0; i<3; i++) -+ xf86ErrorFVerb(2, "cx[%d]=%f cy[%d]=%f\n", i, cx[i] -+ ,i, cy[i]); -+- -+- DBGOUT(2, "EVTouch: ViewPort_X0=%d ViewPort_Y0=%d\n", -+- *(priv->pViewPort_X0), -++ -++ DBGOUT(2, "EVTouch: ViewPort_X0=%d ViewPort_Y0=%d\n", -++ *(priv->pViewPort_X0), -+ *(priv->pViewPort_Y0)); -+ DBGOUT(2, "EVTouch: dx=%f dy=%f\n", dx, dy); -+ #endif -+@@ -1030,7 +1030,7 @@ ConvertProc ( LocalDevicePtr local, -+ if (priv->swap_y == TRUE) -+ yc = screen_height - yc; -+ -+- /* ususally we DON'T swap x -- but if swap_x is 1 -++ /* ususally we DON'T swap x -- but if swap_x is 1 -+ => go on and swap */ -+ if (priv->swap_x == TRUE) -+ xc = screen_width - xc; -+@@ -1056,7 +1056,7 @@ ConvertProc ( LocalDevicePtr local, -+ break; -+ } -+ -+-/* X Segfaults on rotation setting -++/* X Segfaults on rotation setting */ -+ switch (rotation) { -+ case RR_Rotate_0: -+ v0 = xc; -+@@ -1080,14 +1080,12 @@ ConvertProc ( LocalDevicePtr local, -+ break; -+ } -+ -+- -+-*/ -+ } -+ -+ DBGOUT(2, "EVTouch: FINAL: v0=%d v1=%d\n", v0, v1); -+ -+- *x = xc; -+- *y = yc; -++ *x = v0; -++ *y = v1; -+ return (TRUE); -+ } -+ -+@@ -1160,7 +1158,7 @@ EVTouchPreInit(InputDriverPtr drv, IDevP -+ priv->button_number = xf86SetIntOption(local->options, "ButtonNumber", 2 ); -+ -+ priv->emulate3 = xf86SetBoolOption(local->options, "Emulate3Buttons", TRUE); -+- priv->emulate3_timeout = xf86SetIntOption(local->options, -++ priv->emulate3_timeout = xf86SetIntOption(local->options, -+ "Emulate3Timeout", 50); -+ -+ debug_level = xf86SetIntOption(local->options, "DebugLevel", 0); -+@@ -1180,33 +1178,33 @@ EVTouchPreInit(InputDriverPtr drv, IDevP -+ s = xf86FindOptionValue(local->options, "Rotate"); -+ if (s) { -+ if (xf86NameCmp(s, "CW") == 0) { -+- priv->rotate = EV_ROTATE_CW; -++ priv->rotate = EV_ROTATE_CW; -+ } else if (xf86NameCmp(s, "CCW") == 0 ) { -+ priv->rotate = EV_ROTATE_CCW; -+ } else if (xf86NameCmp(s, "UD") == 0 ) { -+ priv->rotate = EV_ROTATE_UD; -+ } -+ -+- -++ -+ } -+ -+ if (priv->rotate == EV_ROTATE_NONE) { -+ priv->max_rel_x = priv->max_x; -+ priv->max_rel_y = priv->max_y; -+ priv->min_rel_x = priv->min_x; -+- priv->min_rel_y = priv->min_y; -++ priv->min_rel_y = priv->min_y; -+ } else { -+ priv->max_rel_x = priv->max_y; -+ priv->max_rel_y = priv->max_x; -+ priv->min_rel_x = priv->min_y; -+- priv->min_rel_y = priv->min_x; -++ priv->min_rel_y = priv->min_x; -+ } -+ -+ priv->swap_y = xf86SetBoolOption(local->options, "SwapY", FALSE); -+ priv->swap_x = xf86SetBoolOption(local->options, "SwapX", FALSE); -+ -+- /* -+- get calibration parameters from XF86Config -++ /* -++ get calibration parameters from XF86Config -+ */ -+ for (i = 0; i < 9; i++){ -+ sprintf(tmp_str, "x%d", i); -+@@ -1215,10 +1213,10 @@ EVTouchPreInit(InputDriverPtr drv, IDevP -+ sprintf(tmp_str, "y%d", i); -+ priv->diff[i][1] = xf86SetIntOption( local->options, -+ tmp_str, 0 ); -+- DBGOUT(2, "(diff[%d][0]/diff[%d][1])=(%d/%d)\n", i, i, -++ DBGOUT(2, "(diff[%d][0]/diff[%d][1])=(%d/%d)\n", i, i, -+ priv->diff[i][0], priv->diff[i][1]); -+ } -+- -++ -+ #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0 -+ xf86AlwaysCore(local, TRUE); -+ #endif -+@@ -1228,9 +1226,9 @@ EVTouchPreInit(InputDriverPtr drv, IDevP -+ /* prepare to process touch packets */ -+ EVTouchNewPacket (priv); -+ -+- /* -++ /* -+ if started in calibration-mode: -+- - open named pipe -++ - open named pipe -+ */ -+ if (priv->calibrate) { -+ priv->fifo = open("/tmp/ev_calibrate", O_RDWR, 0); -+@@ -1252,7 +1250,7 @@ EVTouchPreInit(InputDriverPtr drv, IDevP -+ static void -+ EVTouchPtrCtrl(DeviceIntPtr device, PtrCtrl *ctrl) -+ { -+- /* I have no clue what this does, except that registering it stops the -++ /* I have no clue what this does, except that registering it stops the -+ X server segfaulting in ProcGetPointerMapping() -+ Ho Hum. -+ */ ---- xf86-input-evtouch-0.8.8.orig/debian/patches/21_more_calibration_fixups.patch -+++ xf86-input-evtouch-0.8.8/debian/patches/21_more_calibration_fixups.patch -@@ -0,0 +1,33 @@ -+diff -u xf86-input-evtouch-0.8.8/evtouch.c xf86-input-evtouch-0.8.8/evtouch.c -+--- xf86-input-evtouch-0.8.8/evtouch.c -++++ xf86-input-evtouch-0.8.8/evtouch.c -+@@ -305,7 +305,7 @@ -+ } -+ -+ if (pos_changed == 1) { -+-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 2 -++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 2 -+ ConvertProc(priv->local, 0, 2, -+ priv->raw_x, priv->raw_y, -+ 0, 0, 0, 0, -+@@ -369,7 +369,7 @@ -+ priv->raw_y = priv->min_y; -+ } -+ -+-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 2 -++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 2 -+ ConvertProc(priv->local, 0, 2, -+ priv->raw_x, priv->raw_y, -+ 0, 0, 0, 0, -+diff -u xf86-input-evtouch-0.8.8/debian/changelog xf86-input-evtouch-0.8.8/debian/changelog -+--- xf86-input-evtouch-0.8.8.orig/ev_calibrate.c -++++ xf86-input-evtouch-0.8.8/ev_calibrate.c -+@@ -218,7 +218,7 @@ -+ int cap_style = CapButt; /* style of the line's edje and */ -+ int join_style = JoinBevel; /* joined lines. */ -+ -+- int event_mask = ExposureMask | ButtonReleaseMask | PointerMotionMask | KeyPressMask; -++ int event_mask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PointerMotionMask | KeyPressMask; -+ -+ int depth; -+ int screen_num; ---- xf86-input-evtouch-0.8.8.orig/debian/patches/08_fix_xf86memset.patch -+++ xf86-input-evtouch-0.8.8/debian/patches/08_fix_xf86memset.patch -@@ -0,0 +1,35 @@ -+Index: xf86-input-evtouch-0.8.7/evtouch.c -+=================================================================== -+--- xf86-input-evtouch-0.8.7.orig/evtouch.c 2008-08-07 11:33:52.000000000 +0300 -++++ xf86-input-evtouch-0.8.7/evtouch.c 2008-08-07 11:33:52.000000000 +0300 -+@@ -605,7 +605,7 @@ -+ DBGOUT(2, "EVTouch: %s btn_count=%d\n", __FUNCTION__, -+ priv->btn_count); -+ priv->btn_actions = xcalloc(priv->btn_count, sizeof(BtnAction)); -+- xf86memset(priv->btn_actions, 0, -++ memset(priv->btn_actions, 0, -+ priv->btn_count * sizeof(BtnAction)); -+ -+ DBGOUT(2, "EVTouch: %s btn_count=%d\n", __FUNCTION__, -+@@ -708,7 +708,7 @@ -+ static void -+ EVTouchNewPacket (EVTouchPrivatePtr priv) -+ { -+- xf86memset(&priv->ev, 0, sizeof(struct input_event)); -++ memset(&priv->ev, 0, sizeof(struct input_event)); -+ priv->packeti = 0; -+ priv->binary_pkt = FALSE; -+ } -+Index: xf86-input-evtouch-0.8.7/libtouch.c -+=================================================================== -+--- xf86-input-evtouch-0.8.7.orig/libtouch.c 2008-08-07 11:34:37.000000000 +0300 -++++ xf86-input-evtouch-0.8.7/libtouch.c 2008-08-07 11:35:05.000000000 +0300 -+@@ -195,7 +195,7 @@ -+ int btn; -+ char *str; -+ -+- xf86memset(libtouch, 0, sizeof(LibTouchRec)); -++ memset(libtouch, 0, sizeof(LibTouchRec)); -+ -+ libtouch->now = GetTimeInMillis(); -+ libtouch->past = libtouch->now; ---- xf86-input-evtouch-0.8.8.orig/debian/patches/09_calibrate-script-halification.patch -+++ xf86-input-evtouch-0.8.8/debian/patches/09_calibrate-script-halification.patch -@@ -0,0 +1,87 @@ -+Index: xf86-input-evtouch-0.8.7/calibrate.sh -+=================================================================== -+--- xf86-input-evtouch-0.8.7.orig/calibrate.sh 2008-09-26 00:58:00.000000000 +0200 -++++ xf86-input-evtouch-0.8.7/calibrate.sh 2008-09-26 00:59:37.000000000 +0200 -+@@ -2,9 +2,58 @@ -+ XINIT=`which xinit` -+ XSERVER=`which X` -+ EVCALIBRATE=`which ev_calibrate || echo ./ev_calibrate` -++UDI=$(hal-find-by-property --key input.x11_driver --string evtouch) -++MYDPY=":1.0" -++ZENITY=`which zenity` -++KDIALOG=`which kdialog` -++XDIALOG=`which Xdialog` -++ -++INFO="You have selected to (re)calibrate your touchscreen.\n\n\ -++Move your pen around all edges on the following screen.\n\n\ -++If you are done and touched all edges, hit the enter key and wait until \ -++the top left crosshair turns red.\nOnce you tap the red crosshair, \ -++the next one will turn red going from the top left to the \ -++bottom right.\nIf you miss a tap, the right mouse button will \ -++take you back one step.\n\n\ -++If you tapped the last (bottom right) crosshair, the program will \ -++return to your session. Note that changes only take effect after \ -++restarting the session." -++ -++RESTARTINFO="Touchscreen calibration done\nPlease restart your \ -++session to \nmake the changes take effect" -++ -++FAILINFO="No evtouch capable device found, if you are sure you have \n\ -++an evtouch capable touchscreen, please mail the \ -++resulting file of the command \"lshal > evtouch_hal.out\" to the\n\ -++ubuntu-mobile@lists.ubuntu.com mailing list, so support for your \ -++device can be added." -++ -++if [ -z "$UDI" ];then -++ if [ -x "${ZENITY}" ]; then -++ $ZENITY --info --text="${FAILINFO}" -++ elif [ -x "${XDIALOG}" ]; then -++ $XDIALOG --fill --msgbox "${FAILINFO}" 20 40 -++ elif [ -x "${KDIALOG}" ]; then -++ $KDIALOG --msgbox "${FAILINFO}" -++ fi -++ exit 0 -++fi -++ -++if [ -x "${ZENITY}" ]; then -++ $ZENITY --info --text="${INFO}" -++elif [ -x "${XDIALOG}" ]; then -++ $XDIALOG --fill --msgbox "${INFO}" 30 40 -++elif [ -x "${KDIALOG}" ]; then -++ $KDIALOG --msgbox "${INFO}" -++fi -+ -+ echo $EVCALIBRATE -+ -++if [ -n "$DISPLAY" ]; then -++ DPY=$(echo $DISPLAY|sed -e 's/[a-z:]*//g'|cut -d'.' -f1) -++ MYDPY=":$(($DPY+1)).0" -++fi -++ -+ if ! [ -x "$EVCALIBRATE" ] ; then -+ echo "ev_calibrate not found exiting ..." -+ exit 1; -+@@ -32,6 +81,22 @@ -+ #xinit /usr/bin/ddd ev_calibrate -- /usr/X11R6/bin/X -+ echo "Starting calibration program..." -+ sleep 2 -++hal-set-property --udi $UDI --key input.x11_options.calibrate --string "1" -++ -++$XINIT $EVCALIBRATE -- $XSERVER $MYDPY -auth /dev/null -++ -++hal-set-property --remove --udi $UDI --key input.x11_options.calibrate -++ -++invoke-rc.d --quiet xserver-xorg-input-evtouch start -++ -++rm /tmp/ev_calibrate -++ -++if [ -x "${ZENITY}" ]; then -++ $ZENITY --info --text="${RESTARTINFO}" -++elif [ -x "${XDIALOG}" ]; then -++ $XDIALOG --fill --msgbox "${RESTARTINFO}" 10 40 -++elif [ -x "${KDIALOG}" ]; then -++ $KDIALOG --msgbox "${RESTARTINFO}" -++fi -+ -+-$XINIT $EVCALIBRATE -- $XSERVER -+ exit 0 ---- xf86-input-evtouch-0.8.8.orig/debian/fdi/50-eGalax.fdi -+++ xf86-input-evtouch-0.8.8/debian/fdi/50-eGalax.fdi -@@ -0,0 +1,23 @@ -+ -+ -+ -+ -+ -+ evtouch -+ 130 -+ 197 -+ 3945 -+ 3894 -+ 30 -+ 750 -+ click -+ 3 -+ 2 -+ 10 -+ 1 -+ click -+ 1 -+ -+ -+ -+ ---- xf86-input-evtouch-0.8.8.orig/debian/fdi/50-gunze.fdi -+++ xf86-input-evtouch-0.8.8/debian/fdi/50-gunze.fdi -@@ -0,0 +1,16 @@ -+ -+ -+ -+ -+ -+ evtouch -+ Raw -+ false -+ 1 -+ 35 -+ 37 -+ 990 -+ 986 -+ -+ -+ -\ No newline at end of file ---- xf86-input-evtouch-0.8.8.orig/debian/fdi/50-ideaco.fdi -+++ xf86-input-evtouch-0.8.8/debian/fdi/50-ideaco.fdi -@@ -0,0 +1,23 @@ -+ -+ -+ -+ -+ -+ -+ -+ evtouch -+ raw -+ 50 -+ 30 -+ 15 -+ true -+ 50 -+ 7948 -+ 7834 -+ 112 -+ 254 -+ -+ -+ -+ -+ ---- xf86-input-evtouch-0.8.8.orig/debian/fdi/50-elo-2700.fdi -+++ xf86-input-evtouch-0.8.8/debian/fdi/50-elo-2700.fdi -@@ -0,0 +1,18 @@ -+ -+ -+ -+ -+ -+ evtouch -+ 130 -+ 197 -+ 3945 -+ 3894 -+ 1 -+ 1 -+ -+ -+ -+ -+ -+ -\ No newline at end of file ---- xf86-input-evtouch-0.8.8.orig/debian/fdi/50-touchpack.fdi -+++ xf86-input-evtouch-0.8.8/debian/fdi/50-touchpack.fdi -@@ -0,0 +1,30 @@ -+ -+ -+ -+ -+ -+ evtouch -+ raw -+ false -+ 50 -+ true -+ 4095 -+ 4095 -+ 21 -+ 0 -+ false -+ false -+ false -+ 30 -+ 750 -+ click -+ 3 -+ 2 -+ 10 -+ 1 -+ click -+ 1 -+ -+ -+ -+ ---- xf86-input-evtouch-0.8.8.orig/debian/fdi/50-Fujitsu.fdi -+++ xf86-input-evtouch-0.8.8/debian/fdi/50-Fujitsu.fdi -@@ -0,0 +1,21 @@ -+ -+ -+ -+ -+ -+ -+ -+ evtouch -+ raw -+ true -+ 50 -+ on -+ 76 -+ 104 -+ 957 -+ 976 -+ -+ -+ -+ -+ ---- xf86-input-evtouch-0.8.8.orig/debian/fdi/50-Panasonic.fdi -+++ xf86-input-evtouch-0.8.8/debian/fdi/50-Panasonic.fdi -@@ -0,0 +1,21 @@ -+ -+ -+ -+ -+ -+ -+ -+ evtouch -+ raw -+ true -+ 50 -+ on -+ 76 -+ 104 -+ 957 -+ 976 -+ -+ -+ -+ -+ ---- xf86-input-evtouch-0.8.8.orig/debian/fdi/50-ideaco-idc6681.fdi -+++ xf86-input-evtouch-0.8.8/debian/fdi/50-ideaco-idc6681.fdi -@@ -0,0 +1,23 @@ -+ -+ -+ -+ -+ -+ -+ -+ evtouch -+ raw -+ 50 -+ 30 -+ 15 -+ true -+ 50 -+ 1100 -+ 1650 -+ 7220 -+ 6560 -+ -+ -+ -+ -+ ---- xf86-input-evtouch-0.8.8.orig/debian/fdi/50-touchkit.fdi -+++ xf86-input-evtouch-0.8.8/debian/fdi/50-touchkit.fdi -@@ -0,0 +1,23 @@ -+ -+ -+ -+ -+ -+ evtouch -+ 130 -+ 197 -+ 3945 -+ 3894 -+ 30 -+ 750 -+ click -+ 3 -+ 2 -+ 10 -+ 1 -+ click -+ 1 -+ -+ -+ -+ ---- xf86-input-evtouch-0.8.8.orig/debian/fdi/50-itm.fdi -+++ xf86-input-evtouch-0.8.8/debian/fdi/50-itm.fdi -@@ -0,0 +1,21 @@ -+ -+ -+ -+ -+ -+ -+ evtouch -+ raw -+ true -+ 50 -+ on -+ 3815 -+ 3948 -+ 295 -+ 200 -+ 1 -+ CW -+ -+ -+ -+ ---- xf86-input-evtouch-0.8.8.orig/debian/xsfbs/xsfbs-autoreconf.mk -+++ xf86-input-evtouch-0.8.8/debian/xsfbs/xsfbs-autoreconf.mk -@@ -0,0 +1,150 @@ -+#!/usr/bin/make -f -+# $Id$ -+ -+# Automagical conversion of autoreconf results into quilt patches. -+ -+# Copyright 2006 Eugene Konev -+# -+# Licensed under the GNU General Public License, version 2. See the file -+# /usr/share/common-licenses/GPL or . -+ -+# The idea behind this is storing changes produced by autoreconf as a -+# separate patch on quilt stack (on top of stack actually). -+# The only usable target here is 'autoreconf`. Other targets are not -+# supposed to be called directly. DO NOT invoke them, unless you know what -+# you are doing. -+# The autoreconf target will check if files with names in $(RECONF_CHECKFILES) -+# were changed during patching (from upstream version or from previously -+# autoreconfed version) and call actual autoreconfing if they were. -+# The actual autoreconfing target (doautoreconf) WILL FAIL after -+# calling autoreconf and pushing changes into quilt stack by design. It -+# should never be invoked by automatic build process. -+# The proposed use is adding autoreconf into clean's prerequisites before -+# xsfclean like: -+# - clean: xsfclean -+# + clean: autoreconf xsfclean -+# This will ensure it is called when you build package with dpkg-buildpackage. -+ -+# This dir will be used for producing diff of autoreconfed tree -+RECONF_DIR := xsfautoreconf -+ -+# This files will be checked for changes -+RECONF_CHECKFILES += configure.ac Makefile.am -+ -+# This files will not be hardlinked but copied -+RECONF_NOLINKFILES += aclocal.m4 -+ -+# This files/dirs will be pruned after autoreconf run -+RECONF_PRUNEFILES += autom4te.cache config.h.in~ aclocal.m4~ -+ -+# Internal target. Never invoke directly. -+stampdir_target+=check.md5sum -+$(STAMP_DIR)/check.md5sum: -+ dh_testdir -+ $(MAKE) -f debian/rules prepare -+ for F in $(RECONF_CHECKFILES); do \ -+ find . -wholename ./$(STAMP_DIR) -prune -o -name $$F -print | \ -+ LC_ALL=C sort | xargs --no-run-if-empty md5sum >>$@; \ -+ done -+ -+# Internal target. Never invoke directly. -+$(STAMP_DIR)/clean.md5sum: -+ dh_testdir -+ $(MAKE) -f debian/rules unpatch -+ rm -f $(STAMP_DIR)/check.md5sum -+ $(MAKE) -f debian/rules $(STAMP_DIR)/check.md5sum -+ mv $(STAMP_DIR)/check.md5sum $@ -+ -+# Internal target. Never invoke directly. -+debian/patches/patched.md5sum: -+ dh_testdir -+ [ -f $(STAMP_DIR)/clean.md5sum ] || \ -+ $(MAKE) -f debian/rules $(STAMP_DIR)/clean.md5sum -+ -+ $(MAKE) -f debian/rules patch -+ rm -f $(STAMP_DIR)/check.md5sum -+ $(MAKE) -f debian/rules $(STAMP_DIR)/check.md5sum -+ if ! diff $(STAMP_DIR)/clean.md5sum \ -+ $(STAMP_DIR)/check.md5sum > /dev/null; then \ -+ $(MAKE) -f debian/rules doautoreconf; \ -+ else \ -+ mv $(STAMP_DIR)/check.md5sum $@; \ -+ fi -+ -+# Internal target. Never invoke directly. -+,PHONY: doautoreconf -+doautoreconf: patch -+ quilt push -a >>$(STAMP_DIR)/log/autoreconf 2>&1 || true -+ if quilt applied | grep ^autoreconf.diff$$ > /dev/null; then \ -+ quilt pop -a >>$(STAMP_DIR)/log/autoreconf 2>&1; \ -+ quilt rename -p autoreconf.diff autoreconf-old.diff \ -+ >>$(STAMP_DIR)/log/autoreconf 2>&1; \ -+ quilt delete autoreconf-old.diff >>$(STAMP_DIR)/log/autoreconf 2>&1; \ -+ quilt push -a >>$(STAMP_DIR)/log/autoreconf 2>&1; \ -+ fi -+ -+ if [ -e $(RECONF_DIR) ]; then \ -+ echo "ERROR: $(RECONF_DIR) already exists. Cleanup by hand"; \ -+ exit 1; \ -+ fi -+ -+ mkdir -p $(RECONF_DIR)/before -+ find . -maxdepth 1 -mindepth 1 ! -wholename ./$(RECONF_DIR) \ -+ -a ! -wholename ./debian -a ! -wholename ./patches \ -+ -a ! -wholename ./.pc -a ! -wholename ./$(STAMP_DIR) | \ -+ xargs -i{} cp -al {} $(RECONF_DIR)/before/ -+ -+ for F in $(RECONF_PRUNEFILES); do \ -+ find $(RECONF_DIR)/before -name $$F -print | \ -+ xargs --no-run-if-empty rm -r; \ -+ done -+ -+ cp -al $(RECONF_DIR)/before $(RECONF_DIR)/after -+ -+ for F in $(RECONF_NOLINKFILES); do \ -+ find . -wholename ./$(RECONF_DIR) -prune -o -wholename ./debian \ -+ -prune -o -wholename ./$(STAMP_DIR) -prune -o -name $$F \ -+ -print | \ -+ xargs --no-run-if-empty -i{} cp --remove-destination {} \ -+ $(RECONF_DIR)/after/{}; \ -+ done -+ -+ cd $(RECONF_DIR)/after && autoreconf -v --install && \ -+ for F in $(RECONF_PRUNEFILES); do \ -+ find . -name $$F -print | \ -+ xargs --no-run-if-empty rm -r; \ -+ done -+ -+ cd $(RECONF_DIR) && diff -Nru before after > autoreconf.diff || true -+ -+ quilt import $(RECONF_DIR)/autoreconf.diff \ -+ >>$(STAMP_DIR)/log/autoreconf 2>&1 -+ -+ mv $(STAMP_DIR)/check.md5sum debian/patches/patched.md5sum -+ -+ rm -r $(RECONF_DIR) && rm -f patches/autoreconf-old.diff -+ -+ @echo -+ @echo "****************************************************************" -+ @echo " This target is made to fail INTENTIONALLY. It should NEVER " -+ @echo " be invoked during automatic builds. " -+ @echo -+ @echo " This target was invoked because you added/removed/changed " -+ @echo " patches which modify either configure.ac or Makefile.am and, " -+ @echo " thus, require autoreconf run. And all autoreconfing should " -+ @echo " happen before uploading. " -+ @echo -+ @echo " (See also debian/xsfbs/xsfbs-autoreconf.mk) " -+ @echo -+ @echo " If you see this message, autoreconfing actually SUCCEEDED, " -+ @echo " and your build should finish successfully, when rerun. " -+ @echo "****************************************************************" -+ @echo -+ exit 1; -+ -+.PHONY: autoreconf -+autoreconf: debian/patches/patched.md5sum patch $(STAMP_DIR)/check.md5sum -+ if ! diff $(STAMP_DIR)/check.md5sum \ -+ debian/patches/patched.md5sum > /dev/null; then \ -+ $(MAKE) -f debian/rules doautoreconf; \ -+ fi ---- xf86-input-evtouch-0.8.8.orig/debian/xsfbs/xsfbs.mk -+++ xf86-input-evtouch-0.8.8/debian/xsfbs/xsfbs.mk -@@ -0,0 +1,312 @@ -+#!/usr/bin/make -f -+ -+# Debian X Strike Force Build System (XSFBS): Make portion -+ -+# Copyright 1996 Stephen Early -+# Copyright 1997 Mark Eichin -+# Copyright 1998-2005, 2007 Branden Robinson -+# Copyright 2005 David Nusinow -+# -+# Licensed under the GNU General Public License, version 2. See the file -+# /usr/share/common-licenses/GPL or . -+ -+# Originally by Stephen Early -+# Modified by Mark W. Eichin -+# Modified by Adam Heath -+# Modified by Branden Robinson -+# Modified by Fabio Massimo Di Nitto -+# Modified by David Nusinow -+# Acknowledgements to Manoj Srivastava. -+ -+# Pass $(DH_OPTIONS) into the environment for debhelper's benefit. -+export DH_OPTIONS -+ -+# force quilt to not use ~/.quiltrc -+QUILT = quilt --quiltrc /dev/null -+# force QUILT_PATCHES to the default in case it is exported in the environment -+QUILT_PATCHES = patches/ -+ -+# Set up parameters for the upstream build environment. -+ -+# Determine (source) package name from Debian changelog. -+SOURCE_NAME:=$(shell dpkg-parsechangelog -ldebian/changelog \ -+ | grep '^Source:' | awk '{print $$2}') -+ -+# Determine package version from Debian changelog. -+SOURCE_VERSION:=$(shell dpkg-parsechangelog -ldebian/changelog \ -+ | grep '^Version:' | awk '{print $$2}') -+ -+# Determine upstream version number. -+UPSTREAM_VERSION:=$(shell echo $(SOURCE_VERSION) | sed 's/-.*//') -+ -+# Determine the source version without the epoch for make-orig-tar-gz -+NO_EPOCH_VER:=$(shell echo $(UPSTREAM_VERSION) | sed 's/^.://') -+ -+# Figure out who's building this package. -+BUILDER:=$(shell echo $${DEBEMAIL:-$${EMAIL:-$$(echo $$LOGNAME@$$(cat /etc/mailname 2>/dev/null))}}) -+ -+# Find out if this is an official build; an official build has nothing but -+# digits, dots, and/or the strings "woody" or "sarge" in the Debian part of the -+# version number. Anything else indicates an unofficial build. -+OFFICIAL_BUILD:=$(shell VERSION=$(SOURCE_VERSION); if ! expr "$$(echo $${VERSION\#\#*-} | sed 's/\(woody\|sarge\)//g')" : ".*[^0-9.].*" >/dev/null 2>&1; then echo yes; fi) -+ -+# Set up parameters for the Debian build environment. -+ -+# Determine our architecture. -+BUILD_ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH) -+# Work around some old-time dpkg braindamage. -+BUILD_ARCH:=$(subst i486,i386,$(BUILD_ARCH)) -+# The DEB_HOST_ARCH variable may be set per the Debian cross-compilation policy. -+ifdef DEB_HOST_ARCH -+ ARCH:=$(DEB_HOST_ARCH) -+else -+ # dpkg-cross sets the ARCH environment variable; if set, use it. -+ ifdef ARCH -+ ARCH:=$(ARCH) -+ else -+ ARCH:=$(BUILD_ARCH) -+ endif -+endif -+ -+# $(STAMP_DIR) houses stamp files for complex targets. -+STAMP_DIR:=stampdir -+ -+# $(SOURCE_DIR) houses one or more source trees. -+SOURCE_DIR:=build-tree -+ -+# $(SOURCE_TREE) is the location of the source tree to be compiled. If there -+# is more than one, others are found using this name plus a suffix to indicate -+# the purpose of the additional tree (e.g., $(SOURCE_TREE)-custom). The -+# "setup" target is responsible for creating such trees. -+#SOURCE_TREE:=$(SOURCE_DIR)/xc -+#FIXME We need to define this in our debian/rules file -+ -+# $(DEBTREEDIR) is where all install rules are told (via $(DESTDIR)) to place -+# their files. -+DEBTREEDIR:=$(CURDIR)/debian/tmp -+ -+# All "important" targets have four lines: -+# 1) A target name that is invoked by a package-building tool or the user. -+# This consists of a dependency on a "$(STAMP_DIR)/"-prefixed counterpart. -+# 2) A line delcaring 1) as a phony target (".PHONY:"). -+# 3) A "$(STAMP_DIR)/"-prefixed target which does the actual work, and may -+# depend on other targets. -+# 4) A line declaring 3) as a member of the $(stampdir_targets) variable; the -+# "$(STAMP_DIR)/" prefix is omitted. -+# -+# This indirection is needed so that the "stamp" files that signify when a rule -+# is done can be located in a separate "stampdir". Recall that make has no way -+# to know when a goal has been met for a phony target (like "build" or -+# "install"). -+# -+# At the end of each "$(STAMP_DIR)/" target, be sure to run the command ">$@" -+# so that the target will not be run again. Removing the file will make Make -+# run the target over. -+ -+# All phony targets should be declared as dependencies of .PHONY, even if they -+# do not have "($STAMP_DIR)/"-prefixed counterparts. -+ -+# Define a harmless default rule to keep things from going nuts by accident. -+.PHONY: default -+default: -+ -+# Set up the $(STAMP_DIR) directory. -+.PHONY: stampdir -+stampdir_targets+=stampdir -+stampdir: $(STAMP_DIR)/stampdir -+$(STAMP_DIR)/stampdir: -+ mkdir $(STAMP_DIR) -+ >$@ -+ -+# Set up the package build directory as quilt expects to find it. -+.PHONY: prepare -+stampdir_targets+=prepare -+prepare: $(STAMP_DIR)/genscripts $(STAMP_DIR)/prepare $(STAMP_DIR)/patches $(STAMP_DIR)/log -+$(STAMP_DIR)/prepare: $(STAMP_DIR)/stampdir -+ if [ ! -e $(STAMP_DIR)/patches ]; then \ -+ mkdir $(STAMP_DIR)/patches; \ -+ ln -s $(STAMP_DIR)/patches .pc; \ -+ echo 2 >$(STAMP_DIR)/patches/.version; \ -+ fi; \ -+ if [ ! -e $(STAMP_DIR)/log ]; then \ -+ mkdir $(STAMP_DIR)/log; \ -+ fi; \ -+ if [ -e debian/patches ] && [ ! -e patches ]; then \ -+ ln -s debian/patches patches; \ -+ fi; \ -+ >$@ -+ -+# Apply all patches to the upstream source. -+.PHONY: patch -+stampdir_targets+=patch -+patch: $(STAMP_DIR)/patch -+$(STAMP_DIR)/patch: $(STAMP_DIR)/prepare -+ if ! [ `which quilt` ]; then \ -+ echo "Couldn't find quilt. Please install it or add it to the build-depends for this package."; \ -+ exit 1; \ -+ fi; \ -+ if $(QUILT) next >/dev/null 2>&1; then \ -+ echo -n "Applying patches..."; \ -+ if $(QUILT) push -a -v >$(STAMP_DIR)/log/patch 2>&1; then \ -+ cat $(STAMP_DIR)/log/patch; \ -+ echo "successful."; \ -+ else \ -+ cat $(STAMP_DIR)/log/patch; \ -+ echo "failed! (check $(STAMP_DIR)/log/patch for details)"; \ -+ exit 1; \ -+ fi; \ -+ else \ -+ echo "No patches to apply"; \ -+ fi; \ -+ >$@ -+ -+# Revert all patches to the upstream source. -+.PHONY: unpatch -+unpatch: -+ rm -f $(STAMP_DIR)/patch -+ @echo -n "Unapplying patches..."; \ -+ if [ -e $(STAMP_DIR)/patches/applied-patches ]; then \ -+ if $(QUILT) pop -a -v >$(STAMP_DIR)/log/unpatch 2>&1; then \ -+ cat $(STAMP_DIR)/log/unpatch; \ -+ echo "successful."; \ -+ else \ -+ cat $(STAMP_DIR)/log/unpatch; \ -+ echo "failed! (check $(STAMP_DIR)/log/unpatch for details)"; \ -+ exit 1; \ -+ fi; \ -+ else \ -+ echo "nothing to do."; \ -+ fi -+ -+# Clean the generated maintainer scripts. -+.PHONY: cleanscripts -+cleanscripts: -+ rm -f $(STAMP_DIR)/genscripts -+ rm -f debian/*.config \ -+ debian/*.postinst \ -+ debian/*.postrm \ -+ debian/*.preinst \ -+ debian/*.prerm -+ -+# Clean the package build tree. -+.PHONY: xsfclean -+xsfclean: cleanscripts unpatch -+ dh_testdir -+ rm -f .pc patches -+ rm -rf $(STAMP_DIR) $(SOURCE_DIR) -+ rm -rf imports -+ dh_clean debian/shlibs.local \ -+ debian/po/pothead -+ -+# Generate the debconf templates POT file header. -+debian/po/pothead: debian/po/pothead.in -+ sed -e 's/SOURCE_VERSION/$(SOURCE_VERSION)/' \ -+ -e 's/DATE/$(shell date "+%F %X%z"/)' <$< >$@ -+ -+# Update POT and PO files. -+.PHONY: updatepo -+updatepo: debian/po/pothead -+ debian/scripts/debconf-updatepo --pot-header=pothead --verbose -+ -+# Remove files from the upstream source tree that we don't need, or which have -+# licensing problems. It must be run before creating the .orig.tar.gz. -+# -+# Note: This rule is for Debian package maintainers' convenience, and is not -+# needed for conventional build scenarios. -+.PHONY: prune-upstream-tree -+prune-upstream-tree: -+ # Ensure we're in the correct directory. -+ dh_testdir -+ grep -rvh '^#' debian/prune/ | xargs --no-run-if-empty rm -rf -+ -+# Verify that there are no offsets or fuzz in the patches we apply. -+# -+# Note: This rule is for Debian package maintainers' convenience, and is not -+# needed for conventional build scenarios. -+.PHONY: patch-audit -+patch-audit: prepare unpatch -+ @echo -n "Auditing patches..."; \ -+ >$(STAMP_DIR)/log/patch; \ -+ FUZZY=; \ -+ while [ -n "$$($(QUILT) next)" ]; do \ -+ RESULT=$$($(QUILT) push -v | tee -a $(STAMP_DIR)/log/patch | grep ^Hunk | sed 's/^Hunk.*\(succeeded\|FAILED\).*/\1/');\ -+ case "$$RESULT" in \ -+ succeeded) \ -+ echo "fuzzy patch: $$($(QUILT) top)" \ -+ | tee -a $(STAMP_DIR)/log/$$($(QUILT) top); \ -+ FUZZY=yes; \ -+ ;; \ -+ FAILED) \ -+ echo "broken patch: $$($(QUILT) next)" \ -+ | tee -a $(STAMP_DIR)/log/$$($(QUILT) next); \ -+ exit 1; \ -+ ;; \ -+ esac; \ -+ done; \ -+ if [ -n "$$FUZZY" ]; then \ -+ echo "there were fuzzy patches; please fix."; \ -+ exit 1; \ -+ else \ -+ echo "done."; \ -+ fi -+ -+# Generate the maintainer scripts. -+.PHONY: genscripts -+stampdir_targets+=genscripts -+genscripts: $(STAMP_DIR)/genscripts -+$(STAMP_DIR)/genscripts: $(STAMP_DIR)/stampdir -+ for FILE in debian/*.config.in \ -+ debian/*.postinst.in \ -+ debian/*.postrm.in \ -+ debian/*.preinst.in \ -+ debian/*.prerm.in; do \ -+ if [ -e "$$FILE" ]; then \ -+ MAINTSCRIPT=$$(echo $$FILE | sed 's/.in$$//'); \ -+ sed -n '1,/^#INCLUDE_SHELL_LIB#$$/p' <$$FILE \ -+ | sed -e '/^#INCLUDE_SHELL_LIB#$$/d' >$$MAINTSCRIPT.tmp; \ -+ cat debian/xsfbs/xsfbs.sh >>$$MAINTSCRIPT.tmp; \ -+ sed -n '/^#INCLUDE_SHELL_LIB#$$/,$$p' <$$FILE \ -+ | sed -e '/^#INCLUDE_SHELL_LIB#$$/d' >>$$MAINTSCRIPT.tmp; \ -+ sed -e 's/@SOURCE_VERSION@/$(SOURCE_VERSION)/' \ -+ -e 's/@OFFICIAL_BUILD@/$(OFFICIAL_BUILD)/' \ -+ -e 's/@DEFAULT_DCRESOLUTIONS@/$(DEFAULT_DCRESOLUTIONS)/' \ -+ <$$MAINTSCRIPT.tmp >$$MAINTSCRIPT; \ -+ rm $$MAINTSCRIPT.tmp; \ -+ fi; \ -+ done -+ # Validate syntax of generated shell scripts. -+ #sh debian/scripts/validate-posix-sh debian/*.config \ -+ # debian/*.postinst \ -+ # debian/*.postrm \ -+ # debian/*.preinst \ -+ # debian/*.prerm -+ >$@ -+ -+# Generate the shlibs.local file. -+debian/shlibs.local: -+ cat debian/*.shlibs >$@ -+ -+SERVERMINVERS = $(shell cat /usr/share/xserver-xorg/serverminver 2>/dev/null) -+VIDEOABI = $(shell cat /usr/share/xserver-xorg/videoabiver 2>/dev/null) -+INPUTABI = $(shell cat /usr/share/xserver-xorg/inputabiver 2>/dev/null) -+SERVER_DEPENDS = xserver-xorg-core (>= $(SERVERMINVERS)) -+VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI) -+INPDRIVER_PROVIDES = xserver-xorg-input-$(INPUTABI) -+ifeq ($(PACKAGE),) -+PACKAGE=$(shell awk '/^Package:/ { print $$2; exit }' < debian/control) -+endif -+ -+.PHONY: serverabi -+serverabi: -+ifeq ($(SERVERMINVERS),) -+ @echo error: xserver-xorg-dev needs to be installed -+ @exit 1 -+else -+ echo "xserver:Depends=$(SERVER_DEPENDS)" >> debian/$(PACKAGE).substvars -+ echo "xviddriver:Provides=$(VIDDRIVER_PROVIDES)" >> debian/$(PACKAGE).substvars -+ echo "xinpdriver:Provides=$(INPDRIVER_PROVIDES)" >> debian/$(PACKAGE).substvars -+endif -+ -+include debian/xsfbs/xsfbs-autoreconf.mk -+ -+# vim:set noet ai sts=8 sw=8 tw=0: ---- xf86-input-evtouch-0.8.8.orig/debian/xsfbs/xsfbs.sh -+++ xf86-input-evtouch-0.8.8/debian/xsfbs/xsfbs.sh -@@ -0,0 +1,900 @@ -+# $Id$ -+ -+# This is the X Strike Force shell library for X Window System package -+# maintainer scripts. It serves to define shell functions commonly used by -+# such packages, and performs some error checking necessary for proper operation -+# of those functions. By itself, it does not "do" much; the maintainer scripts -+# invoke the functions defined here to accomplish package installation and -+# removal tasks. -+ -+# If you are reading this within a Debian package maintainer script (e.g., -+# /var/lib/dpkg)info/PACKAGE.{config,preinst,postinst,prerm,postrm}), you can -+# skip past this library by scanning forward in this file to the string -+# "GOBSTOPPER". -+ -+SOURCE_VERSION=@SOURCE_VERSION@ -+OFFICIAL_BUILD=@OFFICIAL_BUILD@ -+ -+# Use special abnormal exit codes so that problems with this library are more -+# easily tracked down. -+SHELL_LIB_INTERNAL_ERROR=86 -+SHELL_LIB_THROWN_ERROR=74 -+SHELL_LIB_USAGE_ERROR=99 -+ -+# old -> new variable names -+if [ -z "$DEBUG_XORG_PACKAGE" ] && [ -n "$DEBUG_XFREE86_PACKAGE" ]; then -+ DEBUG_XORG_PACKAGE="$DEBUG_XFREE86_PACKAGE" -+fi -+if [ -z "$DEBUG_XORG_DEBCONF" ] && [ -n "$DEBUG_XFREE86_DEBCONF" ]; then -+ DEBUG_XORG_DEBCONF="$DEBUG_XFREE86_DEBCONF" -+fi -+ -+# initial sanity checks -+if [ -z "$THIS_PACKAGE" ]; then -+ cat >&2 < on the World Wide Web for -+instructions, read the file /usr/share/doc/debian/bug-reporting.txt from the -+"doc-debian" package, or install the "reportbug" package and use the command of -+the same name to file a report against version $SOURCE_VERSION of this package. -+EOF -+ exit $SHELL_LIB_USAGE_ERROR -+fi -+ -+if [ -z "$THIS_SCRIPT" ]; then -+ cat >&2 < on the World Wide Web for -+instructions, read the file /usr/share/doc/debian/bug-reporting.txt from the -+"doc-debian" package, or install the "reportbug" package and use the command of -+the same name to file a report against version $SOURCE_VERSION of the -+"$THIS_PACKAGE" package. -+EOF -+ exit $SHELL_LIB_USAGE_ERROR -+fi -+ -+ARCHITECTURE="$(dpkg --print-installation-architecture)" -+ -+if [ "$1" = "reconfigure" ] || [ -n "$DEBCONF_RECONFIGURE" ]; then -+ RECONFIGURE="true" -+else -+ RECONFIGURE= -+fi -+ -+if ([ "$1" = "install" ] || [ "$1" = "configure" ]) && [ -z "$2" ]; then -+ FIRSTINST="yes" -+fi -+ -+if [ -z "$RECONFIGURE" ] && [ -z "$FIRSTINST" ]; then -+ UPGRADE="yes" -+fi -+ -+trap "message;\ -+ message \"Received signal. Aborting $THIS_PACKAGE package $THIS_SCRIPT script.\";\ -+ message;\ -+ exit 1" HUP INT QUIT TERM -+ -+reject_nondigits () { -+ # syntax: reject_nondigits [ operand ... ] -+ # -+ # scan operands (typically shell variables whose values cannot be trusted) for -+ # characters other than decimal digits and barf if any are found -+ while [ -n "$1" ]; do -+ # does the operand contain anything but digits? -+ if ! expr "$1" : "[[:digit:]]\+$" > /dev/null 2>&1; then -+ # can't use die(), because it wraps message() which wraps this function -+ echo "$THIS_PACKAGE $THIS_SCRIPT error: reject_nondigits() encountered" \ -+ "possibly malicious garbage \"$1\"" >&2 -+ exit $SHELL_LIB_THROWN_ERROR -+ fi -+ shift -+ done -+} -+ -+reject_whitespace () { -+ # syntax: reject_whitespace [ operand ] -+ # -+ # scan operand (typically a shell variable whose value cannot be trusted) for -+ # whitespace characters and barf if any are found -+ if [ -n "$1" ]; then -+ # does the operand contain any whitespace? -+ if expr "$1" : "[[:space:]]" > /dev/null 2>&1; then -+ # can't use die(), because I want to avoid forward references -+ echo "$THIS_PACKAGE $THIS_SCRIPT error: reject_whitespace() encountered" \ -+ "possibly malicious garbage \"$1\"" >&2 -+ exit $SHELL_LIB_THROWN_ERROR -+ fi -+ fi -+} -+ -+reject_unlikely_path_chars () { -+ # syntax: reject_unlikely_path_chars [ operand ... ] -+ # -+ # scan operands (typically shell variables whose values cannot be trusted) for -+ # characters unlikely to be seen in a path and which the shell might -+ # interpret and barf if any are found -+ while [ -n "$1" ]; do -+ # does the operand contain any funny characters? -+ if expr "$1" : '.*[!$&()*;<>?|].*' > /dev/null 2>&1; then -+ # can't use die(), because I want to avoid forward references -+ echo "$THIS_PACKAGE $THIS_SCRIPT error: reject_unlikely_path_chars()" \ -+ "encountered possibly malicious garbage \"$1\"" >&2 -+ exit $SHELL_LIB_THROWN_ERROR -+ fi -+ shift -+ done -+} -+ -+# Query the terminal to establish a default number of columns to use for -+# displaying messages to the user. This is used only as a fallback in the -+# event the COLUMNS variable is not set. ($COLUMNS can react to SIGWINCH while -+# the script is running, and this cannot, only being calculated once.) -+DEFCOLUMNS=$(stty size 2> /dev/null | awk '{print $2}') || true -+if ! expr "$DEFCOLUMNS" : "[[:digit:]]\+$" > /dev/null 2>&1; then -+ DEFCOLUMNS=80 -+fi -+ -+message () { -+ # pretty-print messages of arbitrary length -+ reject_nondigits "$COLUMNS" -+ echo "$*" | fmt -t -w ${COLUMNS:-$DEFCOLUMNS} >&2 -+} -+ -+observe () { -+ # syntax: observe message ... -+ # -+ # issue observational message suitable for logging someday when support for -+ # it exists in dpkg -+ if [ -n "$DEBUG_XORG_PACKAGE" ]; then -+ message "$THIS_PACKAGE $THIS_SCRIPT note: $*" -+ fi -+} -+ -+warn () { -+ # syntax: warn message ... -+ # -+ # issue warning message suitable for logging someday when support for -+ # it exists in dpkg; also send to standard error -+ message "$THIS_PACKAGE $THIS_SCRIPT warning: $*" -+} -+ -+die () { -+ # syntax: die message ... -+ # -+ # exit script with error message -+ message "$THIS_PACKAGE $THIS_SCRIPT error: $*" -+ exit $SHELL_LIB_THROWN_ERROR -+} -+ -+internal_error () { -+ # exit script with error; essentially a "THIS SHOULD NEVER HAPPEN" message -+ message "internal error: $*" -+ if [ -n "$OFFICIAL_BUILD" ]; then -+ message "Please report a bug in the $THIS_SCRIPT script of the" \ -+ "$THIS_PACKAGE package, version $SOURCE_VERSION to the Debian Bug" \ -+ "Tracking System. Include all messages above that mention the" \ -+ "$THIS_PACKAGE package. Visit " \ -+ " on the World Wide Web for" \ -+ "instructions, read the file" \ -+ "/usr/share/doc/debian/bug-reporting.txt from the doc-debian" \ -+ "package, or install the reportbug package and use the command of" \ -+ "the same name to file a report." -+ fi -+ exit $SHELL_LIB_INTERNAL_ERROR -+} -+ -+usage_error () { -+ message "usage error: $*" -+ message "Please report a bug in the $THIS_SCRIPT script of the" \ -+ "$THIS_PACKAGE package, version $SOURCE_VERSION to the Debian Bug" \ -+ "Tracking System. Include all messages above that mention the" \ -+ "$THIS_PACKAGE package. Visit " \ -+ " on the World Wide Web for" \ -+ "instructions, read the file" \ -+ "/usr/share/doc/debian/bug-reporting.txt from the doc-debian" \ -+ "package, or install the reportbug package and use the command of" \ -+ "the same name to file a report." -+ exit $SHELL_LIB_USAGE_ERROR -+} -+ -+ -+maplink () { -+ # returns what symlink should point to; i.e., what the "sane" answer is -+ # Keep this in sync with the debian/*.links files. -+ # This is only needed for symlinks to directories. -+ # -+ # XXX: Most of these look wrong in the X11R7 world and need to be fixed. -+ # If we've stopped using this function, fixing it might enable us to re-enable -+ # it again and catch more errors. -+ case "$1" in -+ /etc/X11/xkb/compiled) echo /var/lib/xkb ;; -+ /etc/X11/xkb/xkbcomp) echo /usr/X11R6/bin/xkbcomp ;; -+ /usr/X11R6/lib/X11/app-defaults) echo /etc/X11/app-defaults ;; -+ /usr/X11R6/lib/X11/fs) echo /etc/X11/fs ;; -+ /usr/X11R6/lib/X11/lbxproxy) echo /etc/X11/lbxproxy ;; -+ /usr/X11R6/lib/X11/proxymngr) echo /etc/X11/proxymngr ;; -+ /usr/X11R6/lib/X11/rstart) echo /etc/X11/rstart ;; -+ /usr/X11R6/lib/X11/twm) echo /etc/X11/twm ;; -+ /usr/X11R6/lib/X11/xdm) echo /etc/X11/xdm ;; -+ /usr/X11R6/lib/X11/xinit) echo /etc/X11/xinit ;; -+ /usr/X11R6/lib/X11/xkb) echo /etc/X11/xkb ;; -+ /usr/X11R6/lib/X11/xserver) echo /etc/X11/xserver ;; -+ /usr/X11R6/lib/X11/xsm) echo /etc/X11/xsm ;; -+ /usr/bin/X11) echo ../X11R6/bin ;; -+ /usr/bin/rstartd) echo ../X11R6/bin/rstartd ;; -+ /usr/include/X11) echo ../X11R6/include/X11 ;; -+ /usr/lib/X11) echo ../X11R6/lib/X11 ;; -+ *) internal_error "maplink() called with unknown path \"$1\"" ;; -+ esac -+} -+ -+analyze_path () { -+ # given a supplied set of pathnames, break each one up by directory and do an -+ # ls -dl on each component, cumulatively; i.e. -+ # analyze_path /usr/X11R6/bin -> ls -dl /usr /usr/X11R6 /usr/X11R6/bin -+ # Thanks to Randolph Chung for this clever hack. -+ -+ #local f g -+ -+ while [ -n "$1" ]; do -+ reject_whitespace "$1" -+ _g= -+ message "Analyzing $1:" -+ for _f in $(echo "$1" | tr / \ ); do -+ if [ -e /$_g$_f ]; then -+ ls -dl /$_g$_f /$_g$_f.dpkg-* 2> /dev/null || true -+ _g=$_g$_f/ -+ else -+ message "/$_g$_f: nonexistent; directory contents of /$_g:" -+ ls -l /$_g -+ break -+ fi -+ done -+ shift -+ done -+} -+ -+find_culprits () { -+ #local f p dpkg_info_dir possible_culprits smoking_guns bad_packages package \ -+ # msg -+ -+ reject_whitespace "$1" -+ message "Searching for overlapping packages..." -+ _dpkg_info_dir=/var/lib/dpkg/info -+ if [ -d $_dpkg_info_dir ]; then -+ if [ "$(echo $_dpkg_info_dir/*.list)" != "$_dpkg_info_dir/*.list" ]; then -+ _possible_culprits=$(ls -1 $_dpkg_info_dir/*.list | egrep -v \ -+ "(xbase-clients|x11-common|xfs|xlibs)") -+ if [ -n "$_possible_culprits" ]; then -+ _smoking_guns=$(grep -l "$1" $_possible_culprits || true) -+ if [ -n "$_smoking_guns" ]; then -+ _bad_packages=$(printf "\\n") -+ for f in $_smoking_guns; do -+ # too bad you can't nest parameter expansion voodoo -+ p=${f%*.list} # strip off the trailing ".list" -+ _package=${p##*/} # strip off the directories -+ _bad_packages=$(printf "%s\n%s" "$_bad_packages" "$_package") -+ done -+ _msg=$(cat < /dev/null 2>&1; then -+ message "The readlink command was not found. Please install version" \ -+ "1.13.1 or later of the debianutils package." -+ readlink () { -+ # returns what symlink in $1 actually points to -+ perl -e '$l = shift; exit 1 unless -l $l; $r = readlink $l; exit 1 unless $r; print "$r\n"' "$1" -+ } -+fi -+ -+check_symlink () { -+ # syntax: check_symlink symlink -+ # -+ # See if specified symlink points where it is supposed to. Return 0 if it -+ # does, and 1 if it does not. -+ # -+ # Primarily used by check_symlinks_and_warn() and check_symlinks_and_bomb(). -+ -+ #local symlink -+ -+ # validate arguments -+ if [ $# -ne 1 ]; then -+ usage_error "check_symlink() called with wrong number of arguments;" \ -+ "expected 1, got $#" -+ exit $SHELL_LIB_USAGE_ERROR -+ fi -+ -+ _symlink="$1" -+ -+ if [ "$(maplink "$_symlink")" = "$(readlink "$_symlink")" ]; then -+ return 0 -+ else -+ return 1 -+ fi -+} -+ -+check_symlinks_and_warn () { -+ # syntax: check_symlinks_and_warn symlink ... -+ # -+ # For each argument, check for symlink sanity, and warn if it isn't sane. -+ # -+ # Call this function from a preinst script in the event $1 is "upgrade" or -+ # "install". -+ -+ #local errmsg symlink -+ -+ # validate arguments -+ if [ $# -lt 1 ]; then -+ usage_error "check_symlinks_and_warn() called with wrong number of" \ -+ "arguments; expected at least 1, got $#" -+ exit $SHELL_LIB_USAGE_ERROR -+ fi -+ -+ while [ -n "$1" ]; do -+ _symlink="$1" -+ if [ -L "$_symlink" ]; then -+ if ! check_symlink "$_symlink"; then -+ observe "$_symlink symbolic link points to wrong location" \ -+ "$(readlink "$_symlink"); removing" -+ rm "$_symlink" -+ fi -+ elif [ -e "$_symlink" ]; then -+ _errmsg="$_symlink exists and is not a symbolic link; this package cannot" -+ _errmsg="$_errmsg be installed until this" -+ if [ -f "$_symlink" ]; then -+ _errmsg="$_errmsg file" -+ elif [ -d "$_symlink" ]; then -+ _errmsg="$_errmsg directory" -+ else -+ _errmsg="$_errmsg thing" -+ fi -+ _errmsg="$_errmsg is removed" -+ die "$_errmsg" -+ fi -+ shift -+ done -+} -+ -+check_symlinks_and_bomb () { -+ # syntax: check_symlinks_and_bomb symlink ... -+ # -+ # For each argument, check for symlink sanity, and bomb if it isn't sane. -+ # -+ # Call this function from a postinst script. -+ -+ #local problem symlink -+ -+ # validate arguments -+ if [ $# -lt 1 ]; then -+ usage_error "check_symlinks_and_bomb() called with wrong number of" -+ "arguments; expected at least 1, got $#" -+ exit $SHELL_LIB_USAGE_ERROR -+ fi -+ -+ while [ -n "$1" ]; do -+ _problem= -+ _symlink="$1" -+ if [ -L "$_symlink" ]; then -+ if ! check_symlink "$_symlink"; then -+ _problem=yes -+ warn "$_symlink symbolic link points to wrong location" \ -+ "$(readlink "$_symlink")" -+ fi -+ elif [ -e "$_symlink" ]; then -+ _problem=yes -+ warn "$_symlink is not a symbolic link" -+ else -+ _problem=yes -+ warn "$_symlink symbolic link does not exist" -+ fi -+ if [ -n "$_problem" ]; then -+ analyze_path "$_symlink" "$(readlink "$_symlink")" -+ find_culprits "$_symlink" -+ die "bad symbolic links on system" -+ fi -+ shift -+ done -+} -+ -+font_update () { -+ # run $UPDATECMDS in $FONTDIRS -+ -+ #local dir cmd shortcmd x_font_dir_prefix -+ -+ _x_font_dir_prefix="/usr/share/fonts/X11" -+ -+ if [ -z "$UPDATECMDS" ]; then -+ usage_error "font_update() called but \$UPDATECMDS not set" -+ fi -+ if [ -z "$FONTDIRS" ]; then -+ usage_error "font_update() called but \$FONTDIRS not set" -+ fi -+ -+ reject_unlikely_path_chars "$UPDATECMDS" -+ reject_unlikely_path_chars "$FONTDIRS" -+ -+ for _dir in $FONTDIRS; do -+ if [ -d "$_x_font_dir_prefix/$_dir" ]; then -+ for _cmd in $UPDATECMDS; do -+ if which "$_cmd" > /dev/null 2>&1; then -+ _shortcmd=${_cmd##*/} -+ observe "running $_shortcmd in $_dir font directory" -+ _cmd_opts= -+ if [ "$_shortcmd" = "update-fonts-alias" ]; then -+ _cmd_opts=--x11r7-layout -+ fi -+ if [ "$_shortcmd" = "update-fonts-dir" ]; then -+ _cmd_opts=--x11r7-layout -+ fi -+ if [ "$_shortcmd" = "update-fonts-scale" ]; then -+ _cmd_opts=--x11r7-layout -+ fi -+ $_cmd $_cmd_opts $_dir || warn "$_cmd $_cmd_opts $_dir" \ -+ "failed; font directory data may not" \ -+ "be up to date" -+ else -+ warn "$_cmd not found; not updating corresponding $_dir font" \ -+ "directory data" -+ fi -+ done -+ else -+ warn "$_dir is not a directory; not updating font directory data" -+ fi -+ done -+} -+ -+remove_conffile_prepare () { -+ # syntax: remove_conffile_prepare filename official_md5sum ... -+ # -+ # Check a conffile "filename" against a list of canonical MD5 checksums. -+ # If the file's current MD5 checksum matches one of the "official_md5sum" -+ # operands provided, then prepare the conffile for removal from the system. -+ # We defer actual deletion until the package is configured so that we can -+ # roll this operation back if package installation fails. -+ # -+ # Call this function from a preinst script in the event $1 is "upgrade" or -+ # "install" and verify $2 to ensure the package is being upgraded from a -+ # version (or installed over a version removed-but-not-purged) prior to the -+ # one in which the conffile was obsoleted. -+ -+ #local conffile current_checksum -+ -+ # validate arguments -+ if [ $# -lt 2 ]; then -+ usage_error "remove_conffile_prepare() called with wrong number of" \ -+ "arguments; expected at least 2, got $#" -+ exit $SHELL_LIB_USAGE_ERROR -+ fi -+ -+ _conffile="$1" -+ shift -+ -+ # does the _conffile even exist? -+ if [ -e "$_conffile" ]; then -+ # calculate its checksum -+ _current_checksum=$(md5sum < "$_conffile" | sed 's/[[:space:]].*//') -+ # compare it to each supplied checksum -+ while [ -n "$1" ]; do -+ if [ "$_current_checksum" = "$1" ]; then -+ # we found a match; move the confffile and stop looking -+ observe "preparing obsolete conffile $_conffile for removal" -+ mv "$_conffile" "$_conffile.$THIS_PACKAGE-tmp" -+ break -+ fi -+ shift -+ done -+ fi -+} -+ -+remove_conffile_commit () { -+ # syntax: remove_conffile_commit filename -+ # -+ # Complete the removal of a conffile "filename" that has become obsolete. -+ # -+ # Call this function from a postinst script after having used -+ # remove_conffile_prepare() in the preinst. -+ -+ #local conffile -+ -+ # validate arguments -+ if [ $# -ne 1 ]; then -+ usage_error "remove_conffile_commit() called with wrong number of" \ -+ "arguments; expected 1, got $#" -+ exit $SHELL_LIB_USAGE_ERROR -+ fi -+ -+ _conffile="$1" -+ -+ # if the temporary file created by remove_conffile_prepare() exists, remove it -+ if [ -e "$_conffile.$THIS_PACKAGE-tmp" ]; then -+ observe "committing removal of obsolete conffile $_conffile" -+ rm "$_conffile.$THIS_PACKAGE-tmp" -+ fi -+} -+ -+remove_conffile_rollback () { -+ # syntax: remove_conffile_rollback filename -+ # -+ # Roll back the removal of a conffile "filename". -+ # -+ # Call this function from a postrm script in the event $1 is "abort-upgrade" -+ # or "abort-install" is after having used remove_conffile_prepare() in the -+ # preinst. -+ -+ #local conffile -+ -+ # validate arguments -+ if [ $# -ne 1 ]; then -+ usage_error "remove_conffile_rollback() called with wrong number of" \ -+ "arguments; expected 1, got $#" -+ exit $SHELL_LIB_USAGE_ERROR -+ fi -+ -+ _conffile="$1" -+ -+ # if the temporary file created by remove_conffile_prepare() exists, move it -+ # back -+ if [ -e "$_conffile.$THIS_PACKAGE-tmp" ]; then -+ observe "rolling back removal of obsolete conffile $_conffile" -+ mv "$_conffile.$THIS_PACKAGE-tmp" "$_conffile" -+ fi -+} -+ -+replace_conffile_with_symlink_prepare () { -+ # syntax: replace_conffile_with_symlink_prepare oldfilename newfilename \ -+ # official_md5sum ... -+ # -+ # Check a conffile "oldfilename" against a list of canonical MD5 checksums. -+ # If the file's current MD5 checksum matches one of the "official_md5sum" -+ # operands provided, then prepare the conffile for removal from the system. -+ # We defer actual deletion until the package is configured so that we can -+ # roll this operation back if package installation fails. Otherwise copy it -+ # to newfilename and let dpkg handle it through conffiles mechanism. -+ # -+ # Call this function from a preinst script in the event $1 is "upgrade" or -+ # "install" and verify $2 to ensure the package is being upgraded from a -+ # version (or installed over a version removed-but-not-purged) prior to the -+ # one in which the conffile was obsoleted. -+ -+ #local conffile current_checksum -+ -+ # validate arguments -+ if [ $# -lt 3 ]; then -+ usage_error "replace_conffile_with_symlink_prepare() called with wrong" \ -+ " number of arguments; expected at least 3, got $#" -+ exit $SHELL_LIB_USAGE_ERROR -+ fi -+ -+ _oldconffile="$1" -+ shift -+ _newconffile="$1" -+ shift -+ -+ remove_conffile_prepare "$_oldconffile" "$@" -+ # If $_oldconffile still exists, then md5sums didn't match. -+ # Copy it to new one. -+ if [ -f "$_oldconffile" ]; then -+ cp "$_oldconffile" "$_newconffile" -+ fi -+ -+} -+ -+replace_conffile_with_symlink_commit () { -+ # syntax: replace_conffile_with_symlink_commit oldfilename -+ # -+ # Complete the removal of a conffile "oldfilename" that has been -+ # replaced by a symlink. -+ # -+ # Call this function from a postinst script after having used -+ # replace_conffile_with_symlink_prepare() in the preinst. -+ -+ #local conffile -+ -+ # validate arguments -+ if [ $# -ne 1 ]; then -+ usage_error "replace_conffile_with_symlink_commit() called with wrong" \ -+ "number of arguments; expected 1, got $#" -+ exit $SHELL_LIB_USAGE_ERROR -+ fi -+ -+ _conffile="$1" -+ -+ remove_conffile_commit "$_conffile" -+} -+ -+replace_conffile_with_symlink_rollback () { -+ # syntax: replace_conffile_with_symlink_rollback oldfilename newfilename -+ # -+ # Roll back the replacing of a conffile "oldfilename" with symlink to -+ # "newfilename". -+ # -+ # Call this function from a postrm script in the event $1 is "abort-upgrade" -+ # or "abort-install" and verify $2 to ensure the package failed to upgrade -+ # from a version (or install over a version removed-but-not-purged) prior -+ # to the one in which the conffile was obsoleted. -+ # You should have used replace_conffile_with_symlink_prepare() in the -+ # preinst. -+ -+ #local conffile -+ -+ # validate arguments -+ if [ $# -ne 2 ]; then -+ usage_error "replace_conffile_with_symlink_rollback() called with wrong" \ -+ "number of arguments; expected 2, got $#" -+ exit $SHELL_LIB_USAGE_ERROR -+ fi -+ -+ _oldconffile="$1" -+ _newconffile="$2" -+ -+ remove_conffile_rollback "$_oldconffile" -+ if [ -f "$_newconffile" ]; then -+ rm "$_newconffile" -+ fi -+} -+ -+run () { -+ # syntax: run command [ argument ... ] -+ # -+ # Run specified command with optional arguments and report its exit status. -+ # Useful for commands whose exit status may be nonzero, but still acceptable, -+ # or commands whose failure is not fatal to us. -+ # -+ # NOTE: Do *not* use this function with db_get or db_metaget commands; in -+ # those cases the return value of the debconf command *must* be checked -+ # before the string returned by debconf is used for anything. -+ -+ #local retval -+ -+ # validate arguments -+ if [ $# -lt 1 ]; then -+ usage_error "run() called with wrong number of arguments; expected at" \ -+ "least 1, got $#" -+ exit $SHELL_LIB_USAGE_ERROR -+ fi -+ -+ "$@" || _retval=$? -+ -+ if [ ${_retval:-0} -ne 0 ]; then -+ observe "command \"$*\" exited with status $_retval" -+ fi -+} -+ -+register_x_lib_dir_with_ld_so () { -+ # syntax: register_x_lib_dir_with_ld_so -+ # -+ # Configure the dynamic loader ld.so to search /usr/X11R6/lib for shared -+ # libraries. -+ # -+ # Call this function from the postinst script of a package that places a -+ # shared library in /usr/X11R6/lib, before invoking ldconfig. -+ -+ #local dir ldsoconf -+ -+ _dir="/usr/X11R6/lib" -+ _ldsoconf="/etc/ld.so.conf" -+ -+ # is the line not already present? -+ if ! fgrep -qsx "$_dir" "$_ldsoconf"; then -+ observe "adding $_dir directory to $_ldsoconf" -+ echo "$_dir" >> "$_ldsoconf" -+ fi -+} -+ -+deregister_x_lib_dir_with_ld_so () { -+ # syntax: deregister_x_lib_dir_with_ld_so -+ # -+ # Configure dynamic loader ld.so to not search /usr/X11R6/lib for shared -+ # libraries, if and only if no shared libaries remain there. -+ # -+ # Call this function from the postrm script of a package that places a shared -+ # library in /usr/X11R6/lib, in the event "$1" is "remove", and before -+ # invoking ldconfig. -+ -+ #local dir ldsoconf fgrep_status cmp_status -+ -+ _dir="/usr/X11R6/lib" -+ _ldsoconf="/etc/ld.so.conf" -+ -+ # is the line present? -+ if fgrep -qsx "$_dir" "$_ldsoconf"; then -+ # are there any shared objects in the directory? -+ if [ "$(echo "$_dir"/lib*.so.*.*)" = "$_dir/lib*.so.*.*" ]; then -+ # glob expansion produced nothing, so no shared libraries are present -+ observe "removing $_dir directory from $_ldsoconf" -+ # rewrite the file (very carefully) -+ set +e -+ fgrep -svx "$_dir" "$_ldsoconf" > "$_ldsoconf.dpkg-tmp" -+ _fgrep_status=$? -+ set -e -+ case $_fgrep_status in -+ 0|1) ;; # we don't actually care if any lines matched or not -+ *) die "error reading \"$_ldsoconf\"; fgrep exited with status" \ -+ "$_fgrep_status" ;; -+ esac -+ set +e -+ cmp -s "$_ldsoconf.dpkg-tmp" "$_ldsoconf" -+ _cmp_status=$? -+ set -e -+ case $_cmp_status in -+ 0) rm "$_ldsoconf.dpkg-tmp" ;; # files are identical -+ 1) mv "$_ldsoconf.dpkg-tmp" "$_ldsoconf" ;; # files differ -+ *) die "error comparing \"$_ldsoconf.dpkg-tmp\" to \"$_ldsoconf\";" \ -+ "cmp exited with status $_cmp_status" ;; -+ esac -+ fi -+ fi -+} -+ -+make_symlink_sane () { -+ # syntax: make_symlink_sane symlink target -+ # -+ # Ensure that the symbolic link symlink exists, and points to target. -+ # -+ # If symlink does not exist, create it and point it at target. -+ # -+ # If symlink exists but is not a symbolic link, back it up. -+ # -+ # If symlink exists, is a symbolic link, but points to the wrong location, fix -+ # it. -+ # -+ # If symlink exists, is a symbolic link, and already points to target, do -+ # nothing. -+ # -+ # This function wouldn't be needed if ln had an -I, --idempotent option. -+ -+ # Validate arguments. -+ if [ $# -ne 2 ]; then -+ usage_error "make_symlink_sane() called with wrong number of arguments;" \ -+ "expected 2, got $#" -+ exit $SHELL_LIB_USAGE_ERROR -+ fi -+ -+ # We could just use the positional parameters as-is, but that makes things -+ # harder to follow. -+ #local symlink target -+ -+ _symlink="$1" -+ _target="$2" -+ -+ if [ -L "$_symlink" ] && [ "$(readlink "$_symlink")" = "$_target" ]; then -+ observe "link from $_symlink to $_target already exists" -+ else -+ observe "creating symbolic link from $_symlink to $_target" -+ mkdir -p "${_target%/*}" "${_symlink%/*}" -+ ln -s -b -S ".dpkg-old" "$_target" "$_symlink" -+ fi -+} -+ -+migrate_dir_to_symlink () { -+ # syntax: migrate_dir_to_symlink old_location new_location -+ # -+ # Per Debian Policy section 6.5.4, "A directory will never be replaced by a -+ # symbolic link to a directory or vice versa; instead, the existing state -+ # (symlink or not) will be left alone and dpkg will follow the symlink if -+ # there is one." -+ # -+ # We have to do it ourselves. -+ # -+ # This function moves the contents of old_location, a directory, into -+ # new_location, a directory, then makes old_location a symbolic link to -+ # new_location. -+ # -+ # old_location need not exist, but if it does, it must be a directory (or a -+ # symlink to a directory). If it is not, it is backed up. If new_location -+ # exists already and is not a directory, it is backed up. -+ # -+ # This function should be called from a package's preinst so that other -+ # packages unpacked after this one --- but before this package's postinst runs -+ # --- are unpacked into new_location even if their payloads contain -+ # old_location filespecs. -+ -+ # Validate arguments. -+ if [ $# -ne 2 ]; then -+ usage_error "migrate_dir_to_symlink() called with wrong number of" -+ "arguments; expected 2, got $#" -+ exit $SHELL_LIB_USAGE_ERROR -+ fi -+ -+ # We could just use the positional parameters as-is, but that makes things -+ # harder to follow. -+ local _new _old -+ -+ _old="$1" -+ _new="$2" -+ -+ # Is old location a symlink? -+ if [ -L "$_old" ]; then -+ # Does it already point to new location? -+ if [ "$(readlink "$_old")" = "$_new" ]; then -+ # Nothing to do; migration has already been done. -+ observe "migration of $_old to $_new already done" -+ return 0 -+ else -+ # Back it up. -+ warn "backing up symbolic link $_old as $_old.dpkg-old" -+ mv -b "$_old" "$_old.dpkg-old" -+ fi -+ fi -+ -+ # Does old location exist, but is not a directory? -+ if [ -e "$_old" ] && ! [ -d "$_old" ]; then -+ # Back it up. -+ warn "backing up non-directory $_old as $_old.dpkg-old" -+ mv -b "$_old" "$_old.dpkg-old" -+ fi -+ -+ observe "migrating $_old to $_new" -+ -+ # Is new location a symlink? -+ if [ -L "$_new" ]; then -+ # Does it point the wrong way, i.e., back to where we're migrating from? -+ if [ "$(readlink "$_new")" = "$_old" ]; then -+ # Get rid of it. -+ observe "removing symbolic link $_new which points to $_old" -+ rm "$_new" -+ else -+ # Back it up. -+ warn "backing up symbolic link $_new as $_new.dpkg-old" -+ mv -b "$_new" "$_new.dpkg-old" -+ fi -+ fi -+ -+ # Does new location exist, but is not a directory? -+ if [ -e "$_new" ] && ! [ -d "$_new" ]; then -+ warn "backing up non-directory $_new as $_new.dpkg-old" -+ mv -b "$_new" "$_new.dpkg-old" -+ fi -+ -+ # Create new directory if it does not yet exist. -+ if ! [ -e "$_new" ]; then -+ observe "creating $_new" -+ mkdir -p "$_new" -+ fi -+ -+ # Copy files in old location to new location. Back up any filenames that -+ # already exist in the new location with the extension ".dpkg-old". -+ observe "copying files from $_old to $_new" -+ if ! (cd "$_old" && cp -a -b -S ".dpkg-old" . "$_new"); then -+ die "error(s) encountered while copying files from $_old to $_new" -+ fi -+ -+ # Remove files at old location. -+ observe "removing $_old" -+ rm -r "$_old" -+ -+ # Create symlink from old location to new location. -+ make_symlink_sane "$_old" "$_new" -+} -+ -+# vim:set ai et sw=2 ts=2 tw=80: -+ -+# GOBSTOPPER: The X Strike Force shell library ends here. diff --git a/recipes/xorg-driver/xf86-input-evtouch_0.8.8.bb b/recipes/xorg-driver/xf86-input-evtouch_0.8.8.bb index 2b016e274d..4cb8e569b5 100644 --- a/recipes/xorg-driver/xf86-input-evtouch_0.8.8.bb +++ b/recipes/xorg-driver/xf86-input-evtouch_0.8.8.bb @@ -1,15 +1,15 @@ require xorg-driver-input.inc -PR = "r11" +PR = "r12" DESCRIPTION = "X.Org X server -- evtouch input driver" SRC_URI = "http://www.conan.de/touchscreen/xf86-input-evtouch-${PV}.tar.bz2 \ - file://xf86-input-evtouch_0.8.8-0ubuntu6.diff;patch=1 \ - file://20_fix_calibrate_submission_directions.patch;patch=1 \ - file://21_more_calibration_fixups.patch;patch=1 \ file://fdi/*.fdi \ file://udev-ett-tc5uh.patch;patch=1 \ + file://02_calibration_1.6.patch;patch=1 \ + file://03_server-1.6-ftbfs.diff;patch=1 \ + file://04_server-1.7-ftbfs.diff;patch=1 \ " EXTRA_OECONF = "--enable-evcalibrate \ -- cgit v1.2.3 From d3f24755aff91e79db65c182e49c3c7184c3cefa Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 15 Mar 2010 19:42:56 +0100 Subject: udev 151: provide compatibility symlink to /lib/udev where some recipes install their udev stuff into --- recipes/udev/udev_151.bb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/recipes/udev/udev_151.bb b/recipes/udev/udev_151.bb index 1aca146f87..123688cbf3 100644 --- a/recipes/udev/udev_151.bb +++ b/recipes/udev/udev_151.bb @@ -3,7 +3,7 @@ DESCRIPTION = "udev is a daemon which dynamically creates and removes device nod the hotplug package and requires a kernel not older than 2.6.12." LICENSE = "GPL" -PR = "r4" +PR = "r5" # Untested DEFAULT_PREFERENCE = "-1" @@ -69,7 +69,7 @@ FILES_${PN}-dbg += "${usrbindir}/.debug ${usrsbindir}/.debug" # udev installs binaries under $(udev_prefix)/lib/udev, even if ${libdir} # is ${prefix}/lib64 -FILES_${PN} += "/lib/udev/* ${libdir}/ConsoleKit" +FILES_${PN} += "/lib/udev* ${libdir}/ConsoleKit" FILES_${PN}-dbg += "/lib/udev/.debug" do_install () { @@ -104,6 +104,9 @@ do_install () { install -m 0755 ${WORKDIR}/mount.sh ${D}${sysconfdir}/udev/scripts/mount.sh install -m 0755 ${WORKDIR}/network.sh ${D}${sysconfdir}/udev/scripts + + mkdir -p ${D}${base_libdir} + ln -sf ${libdir}/udev ${D}${base_libdir}/ } do_install_append_h2200() { -- cgit v1.2.3 From 35a8b8a50d544d3abb00e87e61dc9f0b27412abe Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Mon, 15 Mar 2010 15:21:03 -0400 Subject: alsa-lib: update LICENSE to more specific LGPLv2.1 --- recipes/alsa/alsa-lib_1.0.11.bb | 2 +- recipes/alsa/alsa-lib_1.0.13.bb | 2 +- recipes/alsa/alsa-lib_1.0.14.bb | 2 +- recipes/alsa/alsa-lib_1.0.15.bb | 2 +- recipes/alsa/alsa-lib_1.0.17.bb | 2 +- recipes/alsa/alsa-lib_1.0.18.bb | 2 +- recipes/alsa/alsa-lib_1.0.19.bb | 2 +- recipes/alsa/alsa-lib_1.0.20.bb | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/recipes/alsa/alsa-lib_1.0.11.bb b/recipes/alsa/alsa-lib_1.0.11.bb index 4d7c2e8893..5bdee7eebb 100644 --- a/recipes/alsa/alsa-lib_1.0.11.bb +++ b/recipes/alsa/alsa-lib_1.0.11.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Alsa sound library" HOMEPAGE = "http://www.alsa-project.org" SECTION = "libs/multimedia" -LICENSE = "LGPL" +LICENSE = "LGPLv2.1" PR = "r4" # configure.in sets -D__arm__ on the command line for any arm system diff --git a/recipes/alsa/alsa-lib_1.0.13.bb b/recipes/alsa/alsa-lib_1.0.13.bb index 03ab74f664..1cfb52b7e0 100644 --- a/recipes/alsa/alsa-lib_1.0.13.bb +++ b/recipes/alsa/alsa-lib_1.0.13.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Alsa sound library" HOMEPAGE = "http://www.alsa-project.org" SECTION = "libs/multimedia" -LICENSE = "LGPL" +LICENSE = "LGPLv2.1" PR = "r4" # configure.in sets -D__arm__ on the command line for any arm system diff --git a/recipes/alsa/alsa-lib_1.0.14.bb b/recipes/alsa/alsa-lib_1.0.14.bb index 284ddd9bc6..520b3256d9 100644 --- a/recipes/alsa/alsa-lib_1.0.14.bb +++ b/recipes/alsa/alsa-lib_1.0.14.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Alsa sound library" HOMEPAGE = "http://www.alsa-project.org" SECTION = "libs/multimedia" -LICENSE = "LGPL" +LICENSE = "LGPLv2.1" PR = "r2" diff --git a/recipes/alsa/alsa-lib_1.0.15.bb b/recipes/alsa/alsa-lib_1.0.15.bb index b502adb3b5..6034aa7815 100644 --- a/recipes/alsa/alsa-lib_1.0.15.bb +++ b/recipes/alsa/alsa-lib_1.0.15.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Alsa sound library" HOMEPAGE = "http://www.alsa-project.org" SECTION = "libs/multimedia" -LICENSE = "LGPL" +LICENSE = "LGPLv2.1" PR = "r1" # configure.in sets -D__arm__ on the command line for any arm system diff --git a/recipes/alsa/alsa-lib_1.0.17.bb b/recipes/alsa/alsa-lib_1.0.17.bb index eff114de4b..c2401c6d0e 100644 --- a/recipes/alsa/alsa-lib_1.0.17.bb +++ b/recipes/alsa/alsa-lib_1.0.17.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Alsa sound library" HOMEPAGE = "http://www.alsa-project.org" SECTION = "libs/multimedia" -LICENSE = "LGPL" +LICENSE = "LGPLv2.1" # configure.in sets -D__arm__ on the command line for any arm system # (not just those with the ARM instruction set), this should be removed, diff --git a/recipes/alsa/alsa-lib_1.0.18.bb b/recipes/alsa/alsa-lib_1.0.18.bb index eff114de4b..c2401c6d0e 100644 --- a/recipes/alsa/alsa-lib_1.0.18.bb +++ b/recipes/alsa/alsa-lib_1.0.18.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Alsa sound library" HOMEPAGE = "http://www.alsa-project.org" SECTION = "libs/multimedia" -LICENSE = "LGPL" +LICENSE = "LGPLv2.1" # configure.in sets -D__arm__ on the command line for any arm system # (not just those with the ARM instruction set), this should be removed, diff --git a/recipes/alsa/alsa-lib_1.0.19.bb b/recipes/alsa/alsa-lib_1.0.19.bb index eff114de4b..c2401c6d0e 100644 --- a/recipes/alsa/alsa-lib_1.0.19.bb +++ b/recipes/alsa/alsa-lib_1.0.19.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Alsa sound library" HOMEPAGE = "http://www.alsa-project.org" SECTION = "libs/multimedia" -LICENSE = "LGPL" +LICENSE = "LGPLv2.1" # configure.in sets -D__arm__ on the command line for any arm system # (not just those with the ARM instruction set), this should be removed, diff --git a/recipes/alsa/alsa-lib_1.0.20.bb b/recipes/alsa/alsa-lib_1.0.20.bb index 6e61b4040b..55951be70b 100644 --- a/recipes/alsa/alsa-lib_1.0.20.bb +++ b/recipes/alsa/alsa-lib_1.0.20.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Alsa sound library" HOMEPAGE = "http://www.alsa-project.org" SECTION = "libs/multimedia" -LICENSE = "LGPL" +LICENSE = "LGPLv2.1" PR = "r3" # configure.in sets -D__arm__ on the command line for any arm system -- cgit v1.2.3 From 45d89c494c23884329e5233a610dadf87b7ddf60 Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Mon, 15 Mar 2010 15:23:15 -0400 Subject: alsa-utils: update LICENSE to more specific GPLv2 --- recipes/alsa/alsa-utils_1.0.11.bb | 2 +- recipes/alsa/alsa-utils_1.0.13.bb | 2 +- recipes/alsa/alsa-utils_1.0.14.bb | 2 +- recipes/alsa/alsa-utils_1.0.15.bb | 2 +- recipes/alsa/alsa-utils_1.0.17.bb | 2 +- recipes/alsa/alsa-utils_1.0.18.bb | 2 +- recipes/alsa/alsa-utils_1.0.19.bb | 2 +- recipes/alsa/alsa-utils_1.0.20.bb | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/recipes/alsa/alsa-utils_1.0.11.bb b/recipes/alsa/alsa-utils_1.0.11.bb index d2acfe1995..fbcf8d5c39 100644 --- a/recipes/alsa/alsa-utils_1.0.11.bb +++ b/recipes/alsa/alsa-utils_1.0.11.bb @@ -1,7 +1,7 @@ DESCRIPTION = "ALSA Utilities" HOMEPAGE = "http://www.alsa-project.org" SECTION = "console/utils" -LICENSE = "GPL" +LICENSE = "GPLv2" DEPENDS = "alsa-lib ncurses" PR = "r1" diff --git a/recipes/alsa/alsa-utils_1.0.13.bb b/recipes/alsa/alsa-utils_1.0.13.bb index e77c2d97f7..a0248735b2 100644 --- a/recipes/alsa/alsa-utils_1.0.13.bb +++ b/recipes/alsa/alsa-utils_1.0.13.bb @@ -1,7 +1,7 @@ DESCRIPTION = "ALSA Utilities" HOMEPAGE = "http://www.alsa-project.org" SECTION = "console/utils" -LICENSE = "GPL" +LICENSE = "GPLv2" DEPENDS = "alsa-lib ncurses" PR = "r1" diff --git a/recipes/alsa/alsa-utils_1.0.14.bb b/recipes/alsa/alsa-utils_1.0.14.bb index 25eeade7cd..e46f0e92be 100644 --- a/recipes/alsa/alsa-utils_1.0.14.bb +++ b/recipes/alsa/alsa-utils_1.0.14.bb @@ -1,7 +1,7 @@ DESCRIPTION = "ALSA Utilities" HOMEPAGE = "http://www.alsa-project.org" SECTION = "console/utils" -LICENSE = "GPL" +LICENSE = "GPLv2" DEPENDS = "alsa-lib ncurses" PR = "r1" diff --git a/recipes/alsa/alsa-utils_1.0.15.bb b/recipes/alsa/alsa-utils_1.0.15.bb index b271e75439..ae879f2d6c 100644 --- a/recipes/alsa/alsa-utils_1.0.15.bb +++ b/recipes/alsa/alsa-utils_1.0.15.bb @@ -1,7 +1,7 @@ DESCRIPTION = "ALSA Utilities" HOMEPAGE = "http://www.alsa-project.org" SECTION = "console/utils" -LICENSE = "GPL" +LICENSE = "GPLv2" DEPENDS = "alsa-lib ncurses" PR = "r1" diff --git a/recipes/alsa/alsa-utils_1.0.17.bb b/recipes/alsa/alsa-utils_1.0.17.bb index d5f116bafc..9d98601c08 100644 --- a/recipes/alsa/alsa-utils_1.0.17.bb +++ b/recipes/alsa/alsa-utils_1.0.17.bb @@ -1,7 +1,7 @@ DESCRIPTION = "ALSA Utilities" HOMEPAGE = "http://www.alsa-project.org" SECTION = "console/utils" -LICENSE = "GPL" +LICENSE = "GPLv2" DEPENDS = "alsa-lib ncurses" SRC_URI = "ftp://ftp.alsa-project.org/pub/utils/alsa-utils-${PV}.tar.bz2 \ diff --git a/recipes/alsa/alsa-utils_1.0.18.bb b/recipes/alsa/alsa-utils_1.0.18.bb index 40718b5500..68af8a548a 100644 --- a/recipes/alsa/alsa-utils_1.0.18.bb +++ b/recipes/alsa/alsa-utils_1.0.18.bb @@ -1,7 +1,7 @@ DESCRIPTION = "ALSA Utilities" HOMEPAGE = "http://www.alsa-project.org" SECTION = "console/utils" -LICENSE = "GPL" +LICENSE = "GPLv2" DEPENDS = "alsa-lib ncurses" PR = "r2" diff --git a/recipes/alsa/alsa-utils_1.0.19.bb b/recipes/alsa/alsa-utils_1.0.19.bb index 3e9bd86b7e..d218678dc8 100644 --- a/recipes/alsa/alsa-utils_1.0.19.bb +++ b/recipes/alsa/alsa-utils_1.0.19.bb @@ -1,7 +1,7 @@ DESCRIPTION = "ALSA Utilities" HOMEPAGE = "http://www.alsa-project.org" SECTION = "console/utils" -LICENSE = "GPL" +LICENSE = "GPLv2" DEPENDS = "alsa-lib ncurses" PR = "r1" diff --git a/recipes/alsa/alsa-utils_1.0.20.bb b/recipes/alsa/alsa-utils_1.0.20.bb index 7eeb46ca7d..be146f605a 100644 --- a/recipes/alsa/alsa-utils_1.0.20.bb +++ b/recipes/alsa/alsa-utils_1.0.20.bb @@ -1,7 +1,7 @@ DESCRIPTION = "ALSA Utilities" HOMEPAGE = "http://www.alsa-project.org" SECTION = "console/utils" -LICENSE = "GPL" +LICENSE = "GPLv2" DEPENDS = "alsa-lib ncurses" PR = "r0" -- cgit v1.2.3 From e07ee1348391fcbadabcc0ae610c7ef63009d00d Mon Sep 17 00:00:00 2001 From: Klaus Kurzmann Date: Mon, 15 Mar 2010 20:26:06 +0100 Subject: sane-srcrevs-fso.inc: bump rev of frameworkd needed to get the fix for contact default fields Signed-off-by: Klaus Kurzmann --- conf/distro/include/sane-srcrevs-fso.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/distro/include/sane-srcrevs-fso.inc b/conf/distro/include/sane-srcrevs-fso.inc index 200ef6aa6f..b018b99678 100644 --- a/conf/distro/include/sane-srcrevs-fso.inc +++ b/conf/distro/include/sane-srcrevs-fso.inc @@ -24,7 +24,7 @@ SRCREV_pn-mterm2 ?= "${FSO_CORNUCOPIA_SRCREV}" # FSO Projects -- Misc SRCREV_pn-dbus-hlid ?= "5df7f49fe8881804aaab544a569fd164c3e93afb" -SRCREV_pn-frameworkd ?= "aaca0006f07eb4b76f38e1cb8df1c968a32db989" +SRCREV_pn-frameworkd ?= "0039f8cd21ce007ac20de8f4525ad7c6e96804c0" SRCREV_pn-frameworkd-config-shr_FSO_REV ?= ${SRCREV_pn-frameworkd} SRCREV_pn-fso-gpsd ?= "39e810899110a9bb302cf2064e1c0f73541fb4e6" SRCREV_pn-fso-gsm0710muxd ?= "1d69fb5b666ac2a9e54e46978c7afa8fe5dfc3c9" -- cgit v1.2.3 From 6c60b59640f592bb3172fc55db85164b589668c3 Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Mon, 15 Mar 2010 15:39:31 -0400 Subject: busybox: update LICENSE to more specific GPLv2 --- recipes/busybox/busybox.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/busybox/busybox.inc b/recipes/busybox/busybox.inc index d1904a6dbc..1ee263ad90 100644 --- a/recipes/busybox/busybox.inc +++ b/recipes/busybox/busybox.inc @@ -7,7 +7,7 @@ functionality and behave very much like their GNU counterparts. BusyBox \ provides a fairly complete POSIX environment for any small or embedded \ system." HOMEPAGE = "http://www.busybox.net" -LICENSE = "GPL" +LICENSE = "GPLv2" SECTION = "base" PRIORITY = "required" -- cgit v1.2.3 From 48321673dbd1c2340d66008904e624ac44633b06 Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Mon, 15 Mar 2010 15:42:47 -0400 Subject: base-passwd: update LICENSE to more specific GPLv2 --- recipes/base-passwd/base-passwd_3.5.20.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/base-passwd/base-passwd_3.5.20.bb b/recipes/base-passwd/base-passwd_3.5.20.bb index 5305730a9f..2ae3651584 100644 --- a/recipes/base-passwd/base-passwd_3.5.20.bb +++ b/recipes/base-passwd/base-passwd_3.5.20.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Base system password/group files." SECTION = "base" -LICENSE = "GPL" +LICENSE = "GPLv2" PR = "r1" SRC_URI = "\ -- cgit v1.2.3 From c92d53f0856d586e901193a3d3817a7566a2cfe9 Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Mon, 15 Mar 2010 17:18:24 -0400 Subject: devmem2: update LICENSE to more specific GPLv2 --- recipes/devmem2/devmem2.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/devmem2/devmem2.bb b/recipes/devmem2/devmem2.bb index 4888d333b1..6a18173329 100644 --- a/recipes/devmem2/devmem2.bb +++ b/recipes/devmem2/devmem2.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Simple program to read/write from/to any location in memory." SRC_URI = "http://www.lartmaker.nl/lartware/port/devmem2.c" -LICENSE = "GPL" +LICENSE = "GPLv2" PR = "r3" S = "${WORKDIR}" -- cgit v1.2.3 From 2ec3bba04ca671f2f495f353bd62bbc4f92cefbb Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Mon, 15 Mar 2010 17:21:00 -0400 Subject: dosfstools: update LICENSE to more specific GPLv2 --- recipes/dosfstools/dosfstools_2.10.bb | 2 +- recipes/dosfstools/dosfstools_2.11.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/dosfstools/dosfstools_2.10.bb b/recipes/dosfstools/dosfstools_2.10.bb index 100044b75d..2b2dc016af 100644 --- a/recipes/dosfstools/dosfstools_2.10.bb +++ b/recipes/dosfstools/dosfstools_2.10.bb @@ -6,7 +6,7 @@ DESCRIPTION = "DOS FAT Filesystem Utilities" SECTION = "base" PRIORITY = "optional" -LICENSE = "GPL" +LICENSE = "GPLv2" PR = "r2" diff --git a/recipes/dosfstools/dosfstools_2.11.bb b/recipes/dosfstools/dosfstools_2.11.bb index a5f6e034dd..a8ae11cbc1 100644 --- a/recipes/dosfstools/dosfstools_2.11.bb +++ b/recipes/dosfstools/dosfstools_2.11.bb @@ -6,7 +6,7 @@ DESCRIPTION = "DOS FAT Filesystem Utilities" SECTION = "base" PRIORITY = "optional" -LICENSE = "GPL" +LICENSE = "GPLv2" PR = "r0" -- cgit v1.2.3 From 1e3bfb5e7ccc9121fcddc948cf2dca1b5c174668 Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Mon, 15 Mar 2010 17:25:04 -0400 Subject: i2c-tools: update LICENSE to more specific GPLv2 --- recipes/i2c-tools/i2c-tools_3.0.1.bb | 2 +- recipes/i2c-tools/i2c-tools_3.0.2.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/i2c-tools/i2c-tools_3.0.1.bb b/recipes/i2c-tools/i2c-tools_3.0.1.bb index c8ea32a5f1..7bbad35272 100644 --- a/recipes/i2c-tools/i2c-tools_3.0.1.bb +++ b/recipes/i2c-tools/i2c-tools_3.0.1.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Set of i2c tools for linux" SECTION = "base" -LICENSE = "GPL" +LICENSE = "GPLv2" SRC_URI = "http://dl.lm-sensors.org/i2c-tools/releases/i2c-tools-${PV}.tar.bz2" diff --git a/recipes/i2c-tools/i2c-tools_3.0.2.bb b/recipes/i2c-tools/i2c-tools_3.0.2.bb index c44af1e3ba..e86763d857 100644 --- a/recipes/i2c-tools/i2c-tools_3.0.2.bb +++ b/recipes/i2c-tools/i2c-tools_3.0.2.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Set of i2c tools for linux" SECTION = "base" -LICENSE = "GPL" +LICENSE = "GPLv2" PR = "r1" -- cgit v1.2.3 From d9bc52274d3c9f0a7bfd9ae735f96de0b8cc3d9f Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Mon, 15 Mar 2010 17:27:51 -0400 Subject: iproute2: update LICENSE to more specific GPLv2 --- recipes/iproute2/iproute2.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/iproute2/iproute2.inc b/recipes/iproute2/iproute2.inc index 3b3d5b9b92..e755ce5abc 100644 --- a/recipes/iproute2/iproute2.inc +++ b/recipes/iproute2/iproute2.inc @@ -1,7 +1,7 @@ DESCRIPTION = "kernel routing and traffic control utilities" HOMEPAGE = "http://linux-net.osdl.org/index.php/Iproute2" SECTION = "base" -LICENSE = "GPL" +LICENSE = "GPLv2" DEPENDS = "flex-native bison-native" INC_PR = "r3" -- cgit v1.2.3 From 10ef228567ab4846af74cf3e93cd180dee0ed56c Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Mon, 15 Mar 2010 17:31:43 -0400 Subject: libusb: update LICENSE to more specific LGPLv2.1 --- recipes/libusb/libusb-compat_0.1.2.bb | 2 +- recipes/libusb/libusb-compat_0.1.3.bb | 2 +- recipes/libusb/libusb1_1.0.2.bb | 2 +- recipes/libusb/libusb1_1.0.4.bb | 2 +- recipes/libusb/libusb_0.1.12.bb | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/recipes/libusb/libusb-compat_0.1.2.bb b/recipes/libusb/libusb-compat_0.1.2.bb index 8ce111f2d8..6de1d482ff 100644 --- a/recipes/libusb/libusb-compat_0.1.2.bb +++ b/recipes/libusb/libusb-compat_0.1.2.bb @@ -1,7 +1,7 @@ DESCRIPTION = "libusb-0 compatibility library using libusb-1" HOMEPAGE = "http://libusb.sf.net" SECTION = "libs" -LICENSE = "LGPL" +LICENSE = "LGPLv2.1" PROVIDES = "virtual/libusb0" PE = "1" PR = "r0" diff --git a/recipes/libusb/libusb-compat_0.1.3.bb b/recipes/libusb/libusb-compat_0.1.3.bb index 25aaa0597e..85a5561685 100644 --- a/recipes/libusb/libusb-compat_0.1.3.bb +++ b/recipes/libusb/libusb-compat_0.1.3.bb @@ -1,7 +1,7 @@ DESCRIPTION = "libusb-0 compatibility library using libusb-1" HOMEPAGE = "http://libusb.sf.net" SECTION = "libs" -LICENSE = "LGPL" +LICENSE = "LGPLv2.1" PROVIDES = "virtual/libusb0" PE = "1" PR = "r0" diff --git a/recipes/libusb/libusb1_1.0.2.bb b/recipes/libusb/libusb1_1.0.2.bb index 145e4cbe97..2b1360192c 100644 --- a/recipes/libusb/libusb1_1.0.2.bb +++ b/recipes/libusb/libusb1_1.0.2.bb @@ -1,7 +1,7 @@ DESCRIPTION = "library to provide userspace access to USB devices" HOMEPAGE = "http://libusb.sf.net" SECTION = "libs" -LICENSE = "LGPL" +LICENSE = "LGPLv2.1" SRC_URI = "${SOURCEFORGE_MIRROR}/libusb/libusb-${PV}.tar.bz2" S = "${WORKDIR}/libusb-${PV}" diff --git a/recipes/libusb/libusb1_1.0.4.bb b/recipes/libusb/libusb1_1.0.4.bb index 1e56006ef1..5221f6e7f1 100644 --- a/recipes/libusb/libusb1_1.0.4.bb +++ b/recipes/libusb/libusb1_1.0.4.bb @@ -1,7 +1,7 @@ DESCRIPTION = "library to provide userspace access to USB devices" HOMEPAGE = "http://libusb.sf.net" SECTION = "libs" -LICENSE = "LGPL" +LICENSE = "LGPLv2.1" PR = "r1" diff --git a/recipes/libusb/libusb_0.1.12.bb b/recipes/libusb/libusb_0.1.12.bb index ae62cc2b02..3b5ac65a55 100644 --- a/recipes/libusb/libusb_0.1.12.bb +++ b/recipes/libusb/libusb_0.1.12.bb @@ -1,7 +1,7 @@ DESCRIPTION = "libusb is a library to provide userspace access to USB devices." HOMEPAGE = "http://libusb.sf.net" SECTION = "libs" -LICENSE = "LGPL" +LICENSE = "LGPLv2.1" PROVIDES = "virtual/libusb0" PR = "r4" -- cgit v1.2.3 From 3017a22545c1cc0558b84cfc69fef3f9cadf6fd9 Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Mon, 15 Mar 2010 17:33:19 -0400 Subject: module-init-tools: update LICENSE to more specific GPLv2 --- recipes/module-init-tools/module-init-tools.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/module-init-tools/module-init-tools.inc b/recipes/module-init-tools/module-init-tools.inc index 59e93d4533..9ad925f82b 100644 --- a/recipes/module-init-tools/module-init-tools.inc +++ b/recipes/module-init-tools/module-init-tools.inc @@ -1,7 +1,7 @@ DESCRIPTION = "This package contains a set of programs for loading, inserting, and \ removing kernel modules for Linux (versions 2.5.48 and above). It serves \ the same function that the modutils package serves for Linux 2.4." -LICENSE = "GPL" +LICENSE = "GPLv2" SECTION = "base" PR = "r5" -- cgit v1.2.3 From 588268fcc052c909151ae1003db4c1f532ae2898 Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Mon, 15 Mar 2010 17:35:11 -0400 Subject: opkg: update LICENSE to more specific GPLv2 --- recipes/opkg/opkg.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/opkg/opkg.inc b/recipes/opkg/opkg.inc index b317de4cc3..4442102b51 100644 --- a/recipes/opkg/opkg.inc +++ b/recipes/opkg/opkg.inc @@ -1,7 +1,7 @@ DESCRIPTION = "Opkg Package Manager" DESCRIPTION_libopkg = "Opkg Package Manager Library" SECTION = "base" -LICENSE = "GPL" +LICENSE = "GPLv2" DEPENDS = "curl gpgme" PV = "0.1.6+svnr${SRCPV}" INC_PR = "r20" -- cgit v1.2.3 From 8932bf6b359b93e17e22b91be7052efabee0f307 Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Mon, 15 Mar 2010 17:40:53 -0400 Subject: tslib: update LICENSE to more specific LGPLv2 --- recipes/tslib/tslib.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/tslib/tslib.inc b/recipes/tslib/tslib.inc index 81f2a4eaa6..4d75c5a45f 100644 --- a/recipes/tslib/tslib.inc +++ b/recipes/tslib/tslib.inc @@ -2,7 +2,7 @@ DESCRIPTION = "tslib is a plugin-based flexible touchscreen access library." HOMEPAGE = "http://tslib.berlios.de/" AUTHOR = "Russell King w/ plugins by Chris Larson et. al." SECTION = "base" -LICENSE = "LGPL" +LICENSE = "LGPLv2" INC_PR = "r23" SRC_URI += "\ -- cgit v1.2.3 From df63fa123c0da7cdfa35c4c935667bf767e8b892 Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Mon, 15 Mar 2010 17:44:04 -0400 Subject: usbutils: update LICENSE to more specific GPLv2 --- recipes/usbutils/usbutils_0.70.bb | 2 +- recipes/usbutils/usbutils_0.73.bb | 2 +- recipes/usbutils/usbutils_0.82.bb | 2 +- recipes/usbutils/usbutils_0.86.bb | 2 +- recipes/usbutils/usbutils_cvs.bb | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/recipes/usbutils/usbutils_0.70.bb b/recipes/usbutils/usbutils_0.70.bb index 7ec23278fa..4dfad5602e 100644 --- a/recipes/usbutils/usbutils_0.70.bb +++ b/recipes/usbutils/usbutils_0.70.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Host side USB console utilities." SECTION = "base" DEPENDS += "virtual/libusb0" -LICENSE = "GPL" +LICENSE = "GPLv2" PRIORITY = "optional" DEFAULT_PREFERENCE = "1" diff --git a/recipes/usbutils/usbutils_0.73.bb b/recipes/usbutils/usbutils_0.73.bb index ebbc306007..e10f1eb2f3 100644 --- a/recipes/usbutils/usbutils_0.73.bb +++ b/recipes/usbutils/usbutils_0.73.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Host side USB console utilities." SECTION = "base" DEPENDS += "virtual/libusb0" -LICENSE = "GPL" +LICENSE = "GPLv2" PRIORITY = "optional" DEFAULT_PREFERENCE = "1" diff --git a/recipes/usbutils/usbutils_0.82.bb b/recipes/usbutils/usbutils_0.82.bb index 436331dd5a..bcbb2671bf 100644 --- a/recipes/usbutils/usbutils_0.82.bb +++ b/recipes/usbutils/usbutils_0.82.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Host side USB console utilities." SECTION = "base" DEPENDS += "virtual/libusb0" -LICENSE = "GPL" +LICENSE = "GPLv2" PRIORITY = "optional" SRC_URI = "${SOURCEFORGE_MIRROR}/linux-usb/usbutils-${PV}.tar.gz \ diff --git a/recipes/usbutils/usbutils_0.86.bb b/recipes/usbutils/usbutils_0.86.bb index 436331dd5a..bcbb2671bf 100644 --- a/recipes/usbutils/usbutils_0.86.bb +++ b/recipes/usbutils/usbutils_0.86.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Host side USB console utilities." SECTION = "base" DEPENDS += "virtual/libusb0" -LICENSE = "GPL" +LICENSE = "GPLv2" PRIORITY = "optional" SRC_URI = "${SOURCEFORGE_MIRROR}/linux-usb/usbutils-${PV}.tar.gz \ diff --git a/recipes/usbutils/usbutils_cvs.bb b/recipes/usbutils/usbutils_cvs.bb index 9ef25c4984..e53d3db57d 100644 --- a/recipes/usbutils/usbutils_cvs.bb +++ b/recipes/usbutils/usbutils_cvs.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Host side USB console utilities." SECTION = "base" DEPENDS += "virtual/libusb0" -LICENSE = "GPL" +LICENSE = "GPLv2" PRIORITY = "optional" PV = "0.71+cvs${SRCDATE}" PR = "r4" -- cgit v1.2.3 From f92b2201ab4974bc1e2fed1b6ee9906774baf928 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 15 Mar 2010 04:55:56 +0000 Subject: liba52: Disable `-prefer-non-pic` to enable `-fPIC`. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Using GCC 4.4.2 and Binutils 2.20 gives the following error. …/bin/ld: .libs/imdct.o: relocation R_ARM_MOVW_ABS_NC against `a local symbol' can not be used when making a shared object; recompile with -fPIC Therefore enable `-fPIC` with this patch taken from Debian [1]. [1] http://patch-tracker.debian.org/patch/series/view/a52dec/0.7.4-13/01-enable-pic.diff Signed-off-by: Paul Menzel Signed-off-by: Philip Balister --- recipes/liba52/files/01-enable-pic.diff | 23 +++++++++++++++++++++++ recipes/liba52/liba52_0.7.4.bb | 5 +++-- 2 files changed, 26 insertions(+), 2 deletions(-) create mode 100644 recipes/liba52/files/01-enable-pic.diff diff --git a/recipes/liba52/files/01-enable-pic.diff b/recipes/liba52/files/01-enable-pic.diff new file mode 100644 index 0000000000..ed1accd37a --- /dev/null +++ b/recipes/liba52/files/01-enable-pic.diff @@ -0,0 +1,23 @@ +Description: Disabling -prefer-non-pic which enables -fPIC +Bug-Debian: http://bugs.debian.org/401590 +Author: Daniel Baumann , Dmitrijs Ledkovs + + +--- + liba52/configure.incl | 3 --- + 1 files changed, 0 insertions(+), 3 deletions(-) + +Index: a52dec-deb/liba52/configure.incl +=================================================================== +--- a52dec-deb.orig/liba52/configure.incl 2009-12-05 02:52:12.000000000 +0000 ++++ a52dec-deb/liba52/configure.incl 2009-12-05 03:23:45.000000000 +0000 +@@ -1,9 +1,6 @@ + AC_SUBST([LIBA52_CFLAGS]) + AC_SUBST([LIBA52_LIBS]) + +-dnl avoid -fPIC when possible +-LIBA52_CFLAGS="$LIBA52_CFLAGS -prefer-non-pic" +- + AC_ARG_ENABLE([double], + [ --enable-double use double-precision samples]) + if test x"$enable_double" = x"yes"; then diff --git a/recipes/liba52/liba52_0.7.4.bb b/recipes/liba52/liba52_0.7.4.bb index 743fa30f83..ea87cbef4f 100644 --- a/recipes/liba52/liba52_0.7.4.bb +++ b/recipes/liba52/liba52_0.7.4.bb @@ -2,11 +2,12 @@ DESCRIPTION = "Library for reading some sort of media format." LICENSE = "GPL" SECTION = "libs" PRIORITY = "optional" -PR = "r1" +PR = "r2" inherit autotools -SRC_URI = "http://liba52.sourceforge.net/files/a52dec-${PV}.tar.gz" +SRC_URI = "http://liba52.sourceforge.net/files/a52dec-${PV}.tar.gz \ + file://01-enable-pic.diff;patch=1" S = "${WORKDIR}/a52dec-${PV}" EXTRA_OECONF = " --enable-shared " -- cgit v1.2.3 From 8d27fe0364ef3a11b5370383039b72c8a6893caf Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Mon, 15 Mar 2010 18:26:32 -0400 Subject: gdb: update LICENSE to specific GPLv2/GPLv3 depending on version --- recipes/gdb/gdb-cross-sdk_6.6.bb | 1 + recipes/gdb/gdb-cross_6.3.bb | 1 + recipes/gdb/gdb-cross_6.4.bb | 1 + recipes/gdb/gdb-cross_6.6.bb | 2 ++ recipes/gdb/gdb-cross_6.7.1.bb | 2 ++ recipes/gdb/gdb_6.3.bb | 1 + recipes/gdb/gdb_6.4.bb | 1 + recipes/gdb/gdb_6.6.bb | 1 + recipes/gdb/gdb_6.7.1.bb | 1 + 9 files changed, 11 insertions(+) diff --git a/recipes/gdb/gdb-cross-sdk_6.6.bb b/recipes/gdb/gdb-cross-sdk_6.6.bb index bf0f2ebbab..aa6e7563cf 100644 --- a/recipes/gdb/gdb-cross-sdk_6.6.bb +++ b/recipes/gdb/gdb-cross-sdk_6.6.bb @@ -1,4 +1,5 @@ require gdb-cross.inc +LICENSE = "GPLv2" inherit sdk diff --git a/recipes/gdb/gdb-cross_6.3.bb b/recipes/gdb/gdb-cross_6.3.bb index 5b27e09959..fd2f97245c 100644 --- a/recipes/gdb/gdb-cross_6.3.bb +++ b/recipes/gdb/gdb-cross_6.3.bb @@ -1,4 +1,5 @@ require gdb-cross.inc +LICENSE = "GPLv2" inherit cross diff --git a/recipes/gdb/gdb-cross_6.4.bb b/recipes/gdb/gdb-cross_6.4.bb index e4946b0fe1..2e6de0895e 100644 --- a/recipes/gdb/gdb-cross_6.4.bb +++ b/recipes/gdb/gdb-cross_6.4.bb @@ -1,4 +1,5 @@ require gdb-cross.inc +LICENSE = "GPLv2" inherit cross diff --git a/recipes/gdb/gdb-cross_6.6.bb b/recipes/gdb/gdb-cross_6.6.bb index 570dd52859..a1851f7777 100644 --- a/recipes/gdb/gdb-cross_6.6.bb +++ b/recipes/gdb/gdb-cross_6.6.bb @@ -1,4 +1,6 @@ require gdb-cross.inc +LICENSE = "GPLv2" + inherit cross PR = "r3" diff --git a/recipes/gdb/gdb-cross_6.7.1.bb b/recipes/gdb/gdb-cross_6.7.1.bb index adccebe115..0681029694 100644 --- a/recipes/gdb/gdb-cross_6.7.1.bb +++ b/recipes/gdb/gdb-cross_6.7.1.bb @@ -1,4 +1,6 @@ require gdb-cross.inc +LICENSE = "GPLv3" + inherit cross DEFAULT_PREFERENCE_avr32 = "99" diff --git a/recipes/gdb/gdb_6.3.bb b/recipes/gdb/gdb_6.3.bb index 988cfb4c44..69d9e7117d 100644 --- a/recipes/gdb/gdb_6.3.bb +++ b/recipes/gdb/gdb_6.3.bb @@ -1,3 +1,4 @@ require gdb.inc +LICENSE = "GPLv2" PR = "r4" diff --git a/recipes/gdb/gdb_6.4.bb b/recipes/gdb/gdb_6.4.bb index be40f3f12b..b3c53a27ae 100644 --- a/recipes/gdb/gdb_6.4.bb +++ b/recipes/gdb/gdb_6.4.bb @@ -1,3 +1,4 @@ require gdb.inc +LICENSE = "GPLv2" PR = "r2" diff --git a/recipes/gdb/gdb_6.6.bb b/recipes/gdb/gdb_6.6.bb index e4502a648e..501e1164ff 100644 --- a/recipes/gdb/gdb_6.6.bb +++ b/recipes/gdb/gdb_6.6.bb @@ -1,4 +1,5 @@ require gdb.inc +LICENSE = "GPLv2" PR = "r5" diff --git a/recipes/gdb/gdb_6.7.1.bb b/recipes/gdb/gdb_6.7.1.bb index fedf2bf1f1..fb9ed3f1bf 100644 --- a/recipes/gdb/gdb_6.7.1.bb +++ b/recipes/gdb/gdb_6.7.1.bb @@ -1,4 +1,5 @@ require gdb.inc +LICENSE = "GPLv3" PR = "r1" -- cgit v1.2.3 From da90b492ec8dc12fce8f4b7d07a43d23649d3948 Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Mon, 15 Mar 2010 19:14:48 -0400 Subject: fbset: update LICENSE to more specific GPLv2 --- recipes/fbset/fbset_2.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/fbset/fbset_2.1.bb b/recipes/fbset/fbset_2.1.bb index 9037350bad..6299148579 100644 --- a/recipes/fbset/fbset_2.1.bb +++ b/recipes/fbset/fbset_2.1.bb @@ -6,7 +6,7 @@ # Date: 28-May-06 DESCRIPTION = "The fbset console tool" -LICENSE = "GPL" +LICENSE = "GPLv2" RRECOMMENDS = "fbset-modes" PR = "r2" -- cgit v1.2.3 From acf4d8c07c5c877533807125e07ad01751b40c19 Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Mon, 15 Mar 2010 17:13:53 -0700 Subject: collections.inc: define COLLECTIONS with ?= so it can be pulled in by a distro and overridden by local.conf Signed-off-by: Chris Larson --- conf/collections.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/collections.inc b/conf/collections.inc index 6a0f41fd78..0572568f06 100644 --- a/conf/collections.inc +++ b/conf/collections.inc @@ -10,7 +10,7 @@ # supported format will be unpacked into COLLECTIONS_UNPACKDIR and used from # there. -COLLECTIONS = "${@' '.join(d.getVar('BBPATH', 1).split(':'))}" +COLLECTIONS ?= "${@' '.join(d.getVar('BBPATH', 1).split(':'))}" COLLECTIONS_UNPACKDIR = "${TMPDIR}/collections" COLLECTIONINFO = "${@get_collection(d.getVar('FILE', 1), d)}" -- cgit v1.2.3 From 8434abe285a204578c9da00ef644387bc2b0af46 Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Mon, 15 Mar 2010 22:05:59 -0400 Subject: netbase: update LICENSE to more specific GPLv2 --- recipes/netbase/netbase_4.21.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/netbase/netbase_4.21.bb b/recipes/netbase/netbase_4.21.bb index 04d9623a2b..bb94399e86 100644 --- a/recipes/netbase/netbase_4.21.bb +++ b/recipes/netbase/netbase_4.21.bb @@ -1,7 +1,7 @@ DESCRIPTION = "This package provides the necessary \ infrastructure for basic TCP/IP based networking." SECTION = "base" -LICENSE = "GPL" +LICENSE = "GPLv2" PR = "r41" inherit update-rc.d -- cgit v1.2.3 From cac361afe35a8d426eb8dbe3386991add1e97e8e Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Mon, 15 Mar 2010 22:07:02 -0400 Subject: sysvinit: update LICENSE to more specific GPLv2+ (v2 or later) --- recipes/sysvinit/sysvinit_2.86.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/sysvinit/sysvinit_2.86.bb b/recipes/sysvinit/sysvinit_2.86.bb index e546726ab9..df75fe72af 100644 --- a/recipes/sysvinit/sysvinit_2.86.bb +++ b/recipes/sysvinit/sysvinit_2.86.bb @@ -1,6 +1,6 @@ DESCRIPTION = "System-V like init." SECTION = "base" -LICENSE = "GPL" +LICENSE = "GPLv2+" HOMEPAGE = "http://freshmeat.net/projects/sysvinit/" PR = "r57" -- cgit v1.2.3 From 6d7a0618df5085e5c80f22d4f1f3d879ee8ce1ab Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Mon, 15 Mar 2010 22:08:19 -0400 Subject: udev: update LICENSE to more specific GPLv2+ (v2 or later) --- recipes/udev/udev.inc | 2 +- recipes/udev/udev_141.bb | 2 +- recipes/udev/udev_151.bb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/recipes/udev/udev.inc b/recipes/udev/udev.inc index 86f851db05..14d10b45cc 100644 --- a/recipes/udev/udev.inc +++ b/recipes/udev/udev.inc @@ -1,6 +1,6 @@ DESCRIPTION ?= "udev is a program which dynamically creates and removes device nodes from \ /dev/. It responds to /sbin/hotplug device events and requires a 2.6 kernel." -LICENSE = "GPL" +LICENSE = "GPLv2+" SRC_URI += " \ file://udev.rules \ diff --git a/recipes/udev/udev_141.bb b/recipes/udev/udev_141.bb index e2b71d10f1..55ccb23f85 100644 --- a/recipes/udev/udev_141.bb +++ b/recipes/udev/udev_141.bb @@ -1,7 +1,7 @@ DESCRIPTION = "udev is a daemon which dynamically creates and removes device nodes from \ /dev/, handles hotplug events and loads drivers at boot time. It replaces \ the hotplug package and requires a kernel not older than 2.6.12." -LICENSE = "GPL" +LICENSE = "GPLv2+" # Untested DEFAULT_PREFERENCE = "-1" diff --git a/recipes/udev/udev_151.bb b/recipes/udev/udev_151.bb index 123688cbf3..884ba8f256 100644 --- a/recipes/udev/udev_151.bb +++ b/recipes/udev/udev_151.bb @@ -1,7 +1,7 @@ DESCRIPTION = "udev is a daemon which dynamically creates and removes device nodes from \ /dev/, handles hotplug events and loads drivers at boot time. It replaces \ the hotplug package and requires a kernel not older than 2.6.12." -LICENSE = "GPL" +LICENSE = "GPLv2+" PR = "r5" -- cgit v1.2.3 From a354bababcb3df9935ebe652a2df353b7205ad9f Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Mon, 15 Mar 2010 17:10:26 +0000 Subject: opkg: fix global depends on openssl, even in -nogpg/-nocurl Fixes the problem, introduced by 8c1731d818c89a291f80940c1912587ff9ce46b7, where openssl is added with DEPENDS_append override, preventing -nogpg and -nocurl variants from clearing the DEPENDS, when they include opkg_svn.bb file, thus forcing them to depend on openssl too. Signed-off-by: Denys Dmytriyenko Acked-by: Chris Larson --- recipes/opkg/opkg.inc | 4 ++-- recipes/opkg/opkg_svn.bb | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/recipes/opkg/opkg.inc b/recipes/opkg/opkg.inc index 4442102b51..9a3d3dc71b 100644 --- a/recipes/opkg/opkg.inc +++ b/recipes/opkg/opkg.inc @@ -2,9 +2,9 @@ DESCRIPTION = "Opkg Package Manager" DESCRIPTION_libopkg = "Opkg Package Manager Library" SECTION = "base" LICENSE = "GPLv2" -DEPENDS = "curl gpgme" +DEPENDS = "curl gpgme openssl" PV = "0.1.6+svnr${SRCPV}" -INC_PR = "r20" +INC_PR = "r21" FILESPATHPKG =. "opkg:" diff --git a/recipes/opkg/opkg_svn.bb b/recipes/opkg/opkg_svn.bb index 4945260065..5138458498 100644 --- a/recipes/opkg/opkg_svn.bb +++ b/recipes/opkg/opkg_svn.bb @@ -1,7 +1,5 @@ require opkg.inc -DEPENDS_append = " openssl" - PR = "${INC_PR}" PROVIDES =+ "virtual/update-alternatives" -- cgit v1.2.3 From 1eb9bb6dc735dc71d8dee16868ee7f9f121db525 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Tue, 16 Mar 2010 10:18:17 +0800 Subject: streamripper: Upgrade to 1.64.6 to address multiple buffer overflows Address CVE-2008-4829 which was fixed in 1.64.0 --- conf/checksums.ini | 8 -------- recipes/streamripper/streamripper_1.61.10.bb | 15 --------------- recipes/streamripper/streamripper_1.64.6.bb | 17 +++++++++++++++++ 3 files changed, 17 insertions(+), 23 deletions(-) delete mode 100644 recipes/streamripper/streamripper_1.61.10.bb create mode 100644 recipes/streamripper/streamripper_1.64.6.bb diff --git a/conf/checksums.ini b/conf/checksums.ini index 63cf4156f0..0a63d0c752 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -25610,14 +25610,6 @@ sha256=ba8c492c1b2033d4e2131f05df9e3780d4bc35bea87aa32a6052dd53a814e288 md5=e9449fcee97e6a8ed73934c883c870e0 sha256=95e7b7470e04f22c3ec8dc6d0b1fdd8944306cb5313c84c4545cd83abada26d0 -[http://downloads.sourceforge.net/streamripper/streamripper-1.61.10.tar.gz] -md5=2d62a4546521980e1ed705a5094a6ec3 -sha256=08ca63620c1c071f4b2d42c5f63f38cee920aa57cde151ac3cfcf344437e3f11 - -[http://heanet.dl.sourceforge.net/streamripper/streamripper-1.61.10.tar.gz] -md5=2d62a4546521980e1ed705a5094a6ec3 -sha256=08ca63620c1c071f4b2d42c5f63f38cee920aa57cde151ac3cfcf344437e3f11 - [http://downloads.sourceforge.net/streamripper/streamripper-1.61.3.tar.gz] md5=57cd09098917bda29f841d366649681c sha256=1747aee9fa4cc09b49e0fb14baace3293f8f870c0de27fd3550cde21d99e9cd7 diff --git a/recipes/streamripper/streamripper_1.61.10.bb b/recipes/streamripper/streamripper_1.61.10.bb deleted file mode 100644 index fe691400ac..0000000000 --- a/recipes/streamripper/streamripper_1.61.10.bb +++ /dev/null @@ -1,15 +0,0 @@ -DESCRIPTION = "StreamRipper lets you record streaming mp3 to your hard drive." -SECTION = "console/multimedia" -LICENSE = "GPL" -DEPENDS= "libogg libvorbis" -RDEPENDS= "libogg libvorbis" - -SRC_URI = "${SOURCEFORGE_MIRROR}/streamripper/streamripper-${PV}.tar.gz" - -EXTRA_OECONF="--disable-oggtest \ - --disable-vorbistest \ - --with-ogg=${STAGING_LIBDIR} \ - --with-vorbis=${STAGING_LIBDIR}" - -inherit autotools - diff --git a/recipes/streamripper/streamripper_1.64.6.bb b/recipes/streamripper/streamripper_1.64.6.bb new file mode 100644 index 0000000000..f8141cf06c --- /dev/null +++ b/recipes/streamripper/streamripper_1.64.6.bb @@ -0,0 +1,17 @@ +DESCRIPTION = "StreamRipper lets you record streaming mp3 to your hard drive." +SECTION = "console/multimedia" +LICENSE = "GPL" +DEPENDS= "libogg libvorbis" +RDEPENDS= "libogg libvorbis" + +SRC_URI = "${SOURCEFORGE_MIRROR}/streamripper/streamripper-${PV}.tar.gz;name=src" +SRC_URI[src.md5sum] = "a37a1a8b8f9228522196a122a1c2dd32" +SRC_URI[src.sha256sum] = "c1d75f2e9c7b38fd4695be66eff4533395248132f3cc61f375196403c4d8de42" + +EXTRA_OECONF="--disable-oggtest \ + --disable-vorbistest \ + --with-ogg=${STAGING_LIBDIR} \ + --with-vorbis=${STAGING_LIBDIR}" + +inherit autotools + -- cgit v1.2.3 From dbe7a1085f23c0737bc7d690e929e9ed63d3a4fa Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Tue, 16 Mar 2010 13:48:44 +0800 Subject: gftp: Address multiple flaws by taking the gentoo patch Addresses CVE-2007-3961, CVE-2007-3962 --- recipes/gftp/gftp/gftp-2.0.18-188252.patch | 77 ++++++++++++++++++++++++++++++ recipes/gftp/gftp_2.0.18.bb | 5 +- 2 files changed, 80 insertions(+), 2 deletions(-) create mode 100644 recipes/gftp/gftp/gftp-2.0.18-188252.patch diff --git a/recipes/gftp/gftp/gftp-2.0.18-188252.patch b/recipes/gftp/gftp/gftp-2.0.18-188252.patch new file mode 100644 index 0000000000..27b3d48ac8 --- /dev/null +++ b/recipes/gftp/gftp/gftp-2.0.18-188252.patch @@ -0,0 +1,77 @@ +Gentoo patch from http://sources.gentoo.org/viewcvs.py/*checkout*/gentoo-x86/net-ftp/gftp/files/gftp-2.0.18-188252.patch?rev=1.1 + +addresses: CVE-2007-3961, CVE-2007-3962 + +diff --exclude-from=/home/dang/.scripts/diffrc -up -bruN gftp-2.0.18.orig/lib/fsplib/fsplib.c gftp-2.0.18/lib/fsplib/fsplib.c +--- gftp-2.0.18.orig/lib/fsplib/fsplib.c 2005-01-18 21:03:45.000000000 -0500 ++++ gftp-2.0.18/lib/fsplib/fsplib.c 2007-09-21 16:03:01.000000000 -0400 +@@ -612,7 +612,7 @@ int fsp_readdir_r(FSP_DIR *dir,struct di + entry->d_reclen = fentry.reclen; + strncpy(entry->d_name,fentry.name,MAXNAMLEN); + +- if (fentry.namlen > MAXNAMLEN) ++ if (fentry.namlen >= MAXNAMLEN) + { + entry->d_name[MAXNAMLEN + 1 ] = '\0'; + #ifdef HAVE_NAMLEN +@@ -680,9 +680,19 @@ int fsp_readdir_native(FSP_DIR *dir,FSP_ + /* skip file date and file size */ + dir->dirpos += 9; + /* read file name */ +- entry->name[255 + 1] = '\0'; ++ entry->name[255] = '\0'; + strncpy(entry->name,(char *)( dir->data + dir->dirpos ),MAXNAMLEN); ++ /* check for ASCIIZ encoded filename */ ++ if (memchr(dir->data + dir->dirpos,0,dir->datasize - dir->dirpos) != NULL) ++ { + namelen = strlen( (char *) dir->data+dir->dirpos); ++ } ++ else ++ { ++ /* \0 terminator not found at end of filename */ ++ *result = NULL; ++ return 0; ++ } + /* skip over file name */ + dir->dirpos += namelen +1; + +@@ -709,12 +719,12 @@ int fsp_readdir_native(FSP_DIR *dir,FSP_ + + struct dirent * fsp_readdir(FSP_DIR *dirp) + { +- static struct dirent entry; ++ static dirent_workaround entry; + struct dirent *result; + + + if (dirp == NULL) return NULL; +- if ( fsp_readdir_r(dirp,&entry,&result) ) ++ if ( fsp_readdir_r(dirp,&entry.dirent,&result) ) + return NULL; + else + return result; +diff --exclude-from=/home/dang/.scripts/diffrc -up -bruN gftp-2.0.18.orig/lib/fsplib/fsplib.h gftp-2.0.18/lib/fsplib/fsplib.h +--- gftp-2.0.18.orig/lib/fsplib/fsplib.h 2005-01-18 21:04:02.000000000 -0500 ++++ gftp-2.0.18/lib/fsplib/fsplib.h 2007-09-21 15:56:37.000000000 -0400 +@@ -1,6 +1,8 @@ + #ifndef _FSPLIB_H + #define _FSPLIB_H 1 + #include ++#include ++ + /* The FSP v2 protocol support library - public interface */ + + /* +@@ -138,6 +140,12 @@ typedef struct FSP_FILE { + unsigned int pos; /* position of next packet */ + } FSP_FILE; + ++ ++typedef union dirent_workaround { ++ struct dirent dirent; ++ char fill[offsetof (struct dirent, d_name) + MAXNAMLEN + 1]; ++} dirent_workaround; ++ + /* function prototypes */ + + /* session management */ diff --git a/recipes/gftp/gftp_2.0.18.bb b/recipes/gftp/gftp_2.0.18.bb index f5705b1357..f5a5047e77 100644 --- a/recipes/gftp/gftp_2.0.18.bb +++ b/recipes/gftp/gftp_2.0.18.bb @@ -6,10 +6,11 @@ DESCRIPTION = "Free multithreaded file transfer client (FTP/HTTP/SSH)." HOMEPAGE="http://www.gftp.org/" SECTION = "x11/network" LICENSE="GPL" -PR = "r1" +PR = "r2" SRC_URI="http://www.gftp.org/gftp-${PV}.tar.bz2 \ - file://configure.patch;patch=1" + file://configure.patch;patch=1 \ + file://gftp-2.0.18-188252.patch;patch=1 " DEPENDS="gtk+ openssl" -- cgit v1.2.3 From ccdf5120a8f52685be43b0931196f83a263012bd Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Tue, 16 Mar 2010 14:05:30 +0800 Subject: gftp: Add more gentoo patches for gftp 2.0.18 --- recipes/gftp/gftp/gftp-2.0.18-ipv6.patch | 33 ++++++++++++++++++++++ recipes/gftp/gftp/gftp-2.0.18-ssh2-read.patch | 13 +++++++++ .../gftp/gftp/gftp-2.0.18-ssl-wildcardcert.patch | 22 +++++++++++++++ recipes/gftp/gftp_2.0.18.bb | 7 +++-- 4 files changed, 73 insertions(+), 2 deletions(-) create mode 100644 recipes/gftp/gftp/gftp-2.0.18-ipv6.patch create mode 100644 recipes/gftp/gftp/gftp-2.0.18-ssh2-read.patch create mode 100644 recipes/gftp/gftp/gftp-2.0.18-ssl-wildcardcert.patch diff --git a/recipes/gftp/gftp/gftp-2.0.18-ipv6.patch b/recipes/gftp/gftp/gftp-2.0.18-ipv6.patch new file mode 100644 index 0000000000..05454211b8 --- /dev/null +++ b/recipes/gftp/gftp/gftp-2.0.18-ipv6.patch @@ -0,0 +1,33 @@ +2006-7-19 Brian Masney + * lib/misc.c (gftp_copy_request) - fixes when doing an IPv6 transfer or + using ignore PASV address (from (from Aurelien Jarno) (closes GNOME bugzilla #169671) + +--- a/trunk/lib/misc.c 2006/07/20 02:32:58 784 ++++ b/trunk/lib/misc.c 2006/07/20 02:37:45 785 +@@ -568,8 +568,24 @@ + newreq->use_proxy = req->use_proxy; + newreq->logging_function = req->logging_function; + newreq->ai_family = req->ai_family; +- newreq->free_hostp = 0; +- newreq->hostp = NULL; ++ ++ if (req->hostp) ++ { ++#if defined (HAVE_GETADDRINFO) && defined (HAVE_GAI_STRERROR) ++ newreq->hostp = g_malloc (sizeof(struct addrinfo)); ++ memcpy(newreq->hostp, req->hostp, sizeof(struct addrinfo)); ++ if (req->current_hostp) ++ newreq->current_hostp = newreq->hostp + (req->current_hostp - req->hostp); ++#else ++ newreq->hostp = g_malloc (sizeof(struct hostent)); ++ memcpy(newreq->hostp, req->hostp, sizeof(struct hostent)); ++ newreq->host = req->host; ++ newreq->curhost = req->curhost; ++#endif ++ } ++ else ++ newreq->hostp = NULL; ++ newreq->free_hostp = 1; + + gftp_copy_local_options (&newreq->local_options_vars, + &newreq->local_options_hash, diff --git a/recipes/gftp/gftp/gftp-2.0.18-ssh2-read.patch b/recipes/gftp/gftp/gftp-2.0.18-ssh2-read.patch new file mode 100644 index 0000000000..765741be7b --- /dev/null +++ b/recipes/gftp/gftp/gftp-2.0.18-ssh2-read.patch @@ -0,0 +1,13 @@ +--- gftp-2.0.18.orig/lib/sshv2.c ++++ gftp-2.0.18/lib/sshv2.c +@@ -1841,7 +1841,7 @@ + { + int ret; + +- if ((ret = sshv2_open_file (request, file, startsize, SSH_FXP_OPEN)) < 0) ++ if ((ret = sshv2_open_file (request, file, startsize, SSH_FXF_READ)) < 0) + return (ret); + + return (sshv2_get_file_size (request, file)); + + diff --git a/recipes/gftp/gftp/gftp-2.0.18-ssl-wildcardcert.patch b/recipes/gftp/gftp/gftp-2.0.18-ssl-wildcardcert.patch new file mode 100644 index 0000000000..202b2931c9 --- /dev/null +++ b/recipes/gftp/gftp/gftp-2.0.18-ssl-wildcardcert.patch @@ -0,0 +1,22 @@ +--- lib/sslcommon.c 2005-01-04 14:32:11.000000000 +0100 ++++ lib/sslcommon.c 2006-06-19 15:23:13.000000000 +0200 +@@ -182,7 +182,18 @@ + X509_NAME_get_text_by_NID (subj, NID_commonName, data, 256) > 0) + { + data[sizeof (data) - 1] = '\0'; +- if (strcasecmp (data, request->hostname) != 0) ++ /* Check for wildcard CN (must begin with *.) */ ++ if (strncmp(data, "*.", 2) == 0) ++ { ++ int hostname_len = strlen(data) - 1; ++ if (strlen(request->hostname) > hostname_len && ++ strcasecmp (&(data[1]), &(request->hostname[strlen(request->hostname) - hostname_len])) == 0) ++ ok = 1; ++ } ++ else if (strcasecmp (data, request->hostname) == 0) ++ ok = 1; ++ ++ if (!ok) + { + request->logging_function (gftp_logging_error, request, + _("ERROR: The host in the SSL certificate (%s) does not match the host that we connected to (%s). Aborting connection.\n"), diff --git a/recipes/gftp/gftp_2.0.18.bb b/recipes/gftp/gftp_2.0.18.bb index f5a5047e77..104e7bf953 100644 --- a/recipes/gftp/gftp_2.0.18.bb +++ b/recipes/gftp/gftp_2.0.18.bb @@ -6,11 +6,14 @@ DESCRIPTION = "Free multithreaded file transfer client (FTP/HTTP/SSH)." HOMEPAGE="http://www.gftp.org/" SECTION = "x11/network" LICENSE="GPL" -PR = "r2" +PR = "r3" SRC_URI="http://www.gftp.org/gftp-${PV}.tar.bz2 \ file://configure.patch;patch=1 \ - file://gftp-2.0.18-188252.patch;patch=1 " + file://gftp-2.0.18-188252.patch;patch=1 \ + file://gftp-2.0.18-ipv6.patch;patch=1;pnum=2 \ + file://gftp-2.0.18-ssh2-read.patch;patch=1 \ + file://gftp-2.0.18-ssl-wildcardcert.patch;patch=1;pnum=0 " DEPENDS="gtk+ openssl" -- cgit v1.2.3 From 02c54584c5b28c3a356ede18df032642d719c376 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Tue, 16 Mar 2010 14:09:32 +0800 Subject: gftp: Add a mkinstalldir patch as seen in findutils and such --- recipes/gftp/gftp/gftp-2.0.18-mkinstalldir.patch | 14 ++++++++++++++ recipes/gftp/gftp_2.0.18.bb | 5 +++-- 2 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 recipes/gftp/gftp/gftp-2.0.18-mkinstalldir.patch diff --git a/recipes/gftp/gftp/gftp-2.0.18-mkinstalldir.patch b/recipes/gftp/gftp/gftp-2.0.18-mkinstalldir.patch new file mode 100644 index 0000000000..e2781bd928 --- /dev/null +++ b/recipes/gftp/gftp/gftp-2.0.18-mkinstalldir.patch @@ -0,0 +1,14 @@ +Index: gftp-2.0.18/po/Makefile.in.in +=================================================================== +--- gftp-2.0.18.orig/po/Makefile.in.in 2010-03-16 14:07:50.311553658 +0800 ++++ gftp-2.0.18/po/Makefile.in.in 2010-03-16 14:08:08.977119831 +0800 +@@ -28,8 +28,7 @@ + + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ +-MKINSTALLDIRS = @MKINSTALLDIRS@ +-mkinstalldirs = $(SHELL) $(MKINSTALLDIRS) ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + + GMSGFMT = @GMSGFMT@ + MSGFMT = @MSGFMT@ diff --git a/recipes/gftp/gftp_2.0.18.bb b/recipes/gftp/gftp_2.0.18.bb index 104e7bf953..fa73486d4a 100644 --- a/recipes/gftp/gftp_2.0.18.bb +++ b/recipes/gftp/gftp_2.0.18.bb @@ -6,14 +6,15 @@ DESCRIPTION = "Free multithreaded file transfer client (FTP/HTTP/SSH)." HOMEPAGE="http://www.gftp.org/" SECTION = "x11/network" LICENSE="GPL" -PR = "r3" +PR = "r4" SRC_URI="http://www.gftp.org/gftp-${PV}.tar.bz2 \ file://configure.patch;patch=1 \ file://gftp-2.0.18-188252.patch;patch=1 \ file://gftp-2.0.18-ipv6.patch;patch=1;pnum=2 \ file://gftp-2.0.18-ssh2-read.patch;patch=1 \ - file://gftp-2.0.18-ssl-wildcardcert.patch;patch=1;pnum=0 " + file://gftp-2.0.18-ssl-wildcardcert.patch;patch=1;pnum=0 \ + file://gftp-2.0.18-mkinstalldir.patch;patch=1 " DEPENDS="gtk+ openssl" -- cgit v1.2.3 From ccc8a55321a9795e67a34b205eb499c5f3a71fc0 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Tue, 16 Mar 2010 07:52:47 +0100 Subject: contrib/qa/oe_audit.py: Add audit script Add my script to compare a FreeBSD auditfile with a list of package names as output by bitbake -s. --- contrib/qa/oe_audit.py | 184 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 184 insertions(+) create mode 100755 contrib/qa/oe_audit.py diff --git a/contrib/qa/oe_audit.py b/contrib/qa/oe_audit.py new file mode 100755 index 0000000000..c0ac9c0aa0 --- /dev/null +++ b/contrib/qa/oe_audit.py @@ -0,0 +1,184 @@ +#!/usr/bin/env python + +def read_available(filename): + """ + Parses the output of bitbake -s + minus the first few lines + """ + f = open(filename) + packages = {} + + for line in f: + # str.split can not be used as we have multiple whitespace + first_space = line.find(" ") + package = line[0:first_space] + rest = line[first_space+1:] + pv = rest.strip().split(" ")[0] + + packages[package] = pv + return packages + + +def map_names(str): + """Map a FreeBSD name to OE""" + maps = { + "libpurple" : "pidgin", + "php4" : "php", + "php5" : "php", + "expat2" : "expat", + "freeciv-gtk" : "freeciv", + "pcre" : "libpcre", + "vim-gnome" : "vim", + "python23" : "python", + "python24" : "python", + "python25" : "python", + "python+ipv6" : "python", + "wget-devel" : "wget", + "xchat2" : "xchat", + "freetype" : "freetype", + "qemu-devel" : "qemu", + "krb5-beta" : "krb5", + "freeciv-gtk2": "freeciv", + } + + try: + return maps[str] + except: + return str + +def is_not_in_oe(name): + """Method to reject packages not in OE""" + not_in = [ + "openoffice.org-2-devel", + "linux-firefox", "fr-linux-netscape", "linux-netscape-{communicator,navigator}", + "linux_base", "ja-netscape7", "{ja,ko}-netscape-{communicator,navigator}-linux", + ] + + return name in not_in + +class freebsd_info: + """ + Handles an entry like the one below: + vulnerability-test-port>=2000<2010.02.26|http://cvsweb.freebsd.org/ports/security/vulnerability-test-port/|Not vulnerable, just a test port (database: 2010-02-26) + """ + def __init__(self, line): + split = line.split("|") + for i in range(0, len(split[0])): + c = split[0][i] + if c != '<' and c != '=' and c != '>': + continue + self.name = map_names(split[0][0:i]) + self.versions = self.split_versions(split[0][i:]) + break + + self.link = split[1] + self.kind = split[2] + + @classmethod + def split_versions(self, input): + """ + Split versions by <, >, >=, >= + """ + versions = [] + last_pos = 0 + + # Try to determine <, >, >=, <= + # we will have to carry stuff on to find the + # version.. + i = 0 + while i < len(input) - 1: + c1 = input[i] + c2 = input[i+1] + if c1 != '<' and c1 != '>' and c1 != '=': + i = i + 1 + continue + + # is a '=' coming behind it? + next = i + 1 + if c2 == '=': + next = next + 1 + + # submit + if last_pos != 0: + versions.append((next_type, input[last_pos:i])) + + # remember stuff + next_type = input[i:next] + last_pos = next + i = next + + assert last_pos != 0 + versions.append((next_type, input[last_pos:len(input)])) + return versions + + def __repr__(self): + return "%s: %s" % (self.name, self.versions) + +def read_auditfile(filename): + """ + Read an uncompressed audit file from freebsd + """ + f = open(filename) + packages = {} + for line in f: + if line.startswith("#"): + continue + + info = freebsd_info(line) + try: + packages[info.name].append(info) + except: + packages[info.name] = [] + packages[info.name].append(info) + return packages + + +def strip_oe_version(oe_version): + """ + We need to strip the package epoch... and the PR to compare + it to the FreeBSD versions. Also FreeBSD seems to use _N as + PR so we might need to do more.. + """ + split = oe_version.split(':', 1) + ver = split[1] + + split = ver.rsplit('-r', 1) + ver = split[0] + return ver + +def strip_bsd_version(bsd_version): + """ + FreeBSD is adding ,1 for revisions.. remove that + """ + split = bsd_version.rsplit(',', 1) + return split[0] + +def compare_versions(oe, freebsd, not_known): + def handle_package(oe_name, bsd_name): + if not oe_name in oe: + if oe_name == bsd_name: + print >> not_known, "%s is not in OE" % oe_name + return + + oe_version = strip_oe_version(oe[oe_name]) + for ver in freebsd[bsd_name]: + str = [] + for (cmp, vers) in ver.versions: + bsd_ver = strip_bsd_version(vers) + str.append("%s %s %s %s" % (oe_name, oe_version, cmp, bsd_ver)) + print " && ".join(str), ver.link + + for package in freebsd.keys(): + # handle the various versions of OE packages + handle_package(package, package) + handle_package("%s-native" % package, package) + handle_package("%s-full-native" % package, package) + handle_package("%s-sdk" % package, package) + + +# read the input data +oe_packages = read_available("available") +freebsd_vuln = read_auditfile("auditfile") +buggy = open("not_in_oe.bugs", "w+") + +compare_versions(oe=oe_packages, freebsd=freebsd_vuln, not_known=buggy) -- cgit v1.2.3 From 5051155fd112ebce51ce262444400a666966c3f8 Mon Sep 17 00:00:00 2001 From: Ulf Samuelsson Date: Tue, 16 Mar 2010 07:51:08 +0100 Subject: at91bootstrap-2.13: Build ${AT91BOOTSTRAP_BOARD} Previous version of at91bootstrap recipes provided a defconfig file. The new version assumes you have defined a variable * AT91BOOTSTRAP_BOARD This can be a list of boards allowing multiple configurations to be built. Example of use (in MACHINE configuration file): AT91BOOTSTRAP_BOARD = "at91sam9g20df at91sam9g20ek" Signed-off-by: Ulf Samuelsson --- .../at91bootstrap-2.13/at91cap9adk/defconfig | 110 -------------------- .../at91bootstrap-2.13/at91sam9260ek/defconfig | 110 -------------------- .../at91bootstrap-2.13/at91sam9261ek/defconfig | 110 -------------------- .../at91bootstrap-2.13/at91sam9263ek/defconfig | 113 --------------------- .../at91bootstrap-2.13/at91sam9g20ek/defconfig | 110 -------------------- .../at91bootstrap-2.13/at91sam9g45ek/defconfig | 110 -------------------- .../at91bootstrap-2.13/at91sam9rlek/defconfig | 110 -------------------- .../at91bootstrap-2.13/at91sam9xeek/defconfig | 110 -------------------- recipes/at91bootstrap/at91bootstrap_2.0.inc | 33 ++++++ recipes/at91bootstrap/at91bootstrap_2.13.bb | 4 +- 10 files changed, 35 insertions(+), 885 deletions(-) delete mode 100644 recipes/at91bootstrap/at91bootstrap-2.13/at91cap9adk/defconfig delete mode 100644 recipes/at91bootstrap/at91bootstrap-2.13/at91sam9260ek/defconfig delete mode 100644 recipes/at91bootstrap/at91bootstrap-2.13/at91sam9261ek/defconfig delete mode 100644 recipes/at91bootstrap/at91bootstrap-2.13/at91sam9263ek/defconfig delete mode 100644 recipes/at91bootstrap/at91bootstrap-2.13/at91sam9g20ek/defconfig delete mode 100644 recipes/at91bootstrap/at91bootstrap-2.13/at91sam9g45ek/defconfig delete mode 100644 recipes/at91bootstrap/at91bootstrap-2.13/at91sam9rlek/defconfig delete mode 100644 recipes/at91bootstrap/at91bootstrap-2.13/at91sam9xeek/defconfig create mode 100644 recipes/at91bootstrap/at91bootstrap_2.0.inc diff --git a/recipes/at91bootstrap/at91bootstrap-2.13/at91cap9adk/defconfig b/recipes/at91bootstrap/at91bootstrap-2.13/at91cap9adk/defconfig deleted file mode 100644 index 8ccd36dbc8..0000000000 --- a/recipes/at91bootstrap/at91bootstrap-2.13/at91cap9adk/defconfig +++ /dev/null @@ -1,110 +0,0 @@ -# -# Automatically generated make config: don't edit -# Tue Jan 12 22:00:30 2010 -# -HAVE_DOT_CONFIG=y -CONFIG_BOARDNAME="at91cap9df" -# CONFIG_AT91SAM9260EK is not set -# CONFIG_AT91SAM9261EK is not set -# CONFIG_AT91SAM9263EK is not set -# CONFIG_AT91SAM9RLEK is not set -# CONFIG_AT91SAM9XEEK is not set -# CONFIG_AT91SAM9G10EK is not set -# CONFIG_AT91SAM9G20EK is not set -# CONFIG_AT91SAM9G45EK is not set -# CONFIG_AT91SAM9G45EKES is not set -# CONFIG_AT91SAM9M10EK is not set -CONFIG_AT91CAP9ADK=y -# CONFIG_AT91CAP9STK is not set -# CONFIG_AFEB9260 is not set -CONFIG_CHIP="AT91CAP9" -CONFIG_BOARD="at91cap9adk" -CONFIG_MACH_TYPE="0x61E" -CONFIG_LINK_ADDR="0x000000" -CONFIG_TOP_OF_MEMORY="0x108000" -CONFIG_BOOTSTRAP_MAXSIZE="13000" -CONFIG_CRYSTAL_12_000MHZ=y -# CONFIG_CRYSTAL_16_000MHZ is not set -# CONFIG_CRYSTAL_16_36766MHZ is not set -# CONFIG_CRYSTAL_18_432MHZ is not set -ALLOW_CRYSTAL_12_000MHZ=y -CONFIG_CRYSTAL="CRYSTAL_18_432MHZ" -# CONFIG_CPU_CLK_166MHZ is not set -# CONFIG_CPU_CLK_180MHZ is not set -CONFIG_CPU_CLK_200MHZ=y -# CONFIG_CPU_CLK_240MHZ is not set -# CONFIG_CPU_CLK_266MHZ is not set -# CONFIG_CPU_CLK_400MHZ is not set -ALLOW_CPU_CLK_200MHZ=y -ALLOW_CPU_CLK_240MHZ=y -# DISABLE_CPU_CLK_240MHZ is not set -# CONFIG_BUS_SPEED_83MHZ is not set -# CONFIG_BUS_SPEED_90MHZ is not set -CONFIG_BUS_SPEED_100MHZ=y -# CONFIG_BUS_SPEED_133MHZ is not set - -# -# Memory selection -# -# CONFIG_SDRAM is not set -CONFIG_SDDRC=y -# CONFIG_DDR2 is not set -ALLOW_DATAFLASH=y -ALLOW_FLASH=y -# ALLOW_NANDFLASH is not set -# ALLOW_SDCARD is not set -# ALLOW_PSRAM is not set -# ALLOW_SDRAM_16BIT is not set -# CONFIG_RAM_32MB is not set -CONFIG_RAM_64MB=y -# CONFIG_RAM_128MB is not set -# CONFIG_RAM_256MB is not set -CONFIG_DATAFLASH=y -# CONFIG_FLASH is not set -# CONFIG_NANDFLASH is not set -# CONFIG_SDCARD is not set -CONFIG_MEMORY="dataflash" - -# -# SPI configuration -# -CONFIG_SPI_CLK=33000000 -CONFIG_SMALL_DATAFLASH=y -# ALLOW_DATAFLASH_RECOVERY is not set -CONFIG_SPI_BOOT_CS0=y -# CONFIG_SPI_BOOT_CS1 is not set -# CONFIG_SPI_BOOT_CS2 is not set -# CONFIG_SPI_BOOT_CS3 is not set -ALLOW_BOOT_FROM_DATAFLASH_CS0=y -# ALLOW_BOOT_FROM_DATAFLASH_CS1 is not set -# ALLOW_BOOT_FROM_DATAFLASH_CS2 is not set -# ALLOW_BOOT_FROM_DATAFLASH_CS3 is not set -DATAFLASHCARD_ON_CS0=y -# DATAFLASHCARD_ON_CS1 is not set -# DATAFLASHCARD_ON_CS2 is not set -# DATAFLASHCARD_ON_CS3 is not set -CONFIG_DATAFLASHCARD=y -CONFIG_CARD_SUFFIX="card" -CONFIG_SPI_BOOT="AT91C_SPI_PCS0_DATAFLASH" -CONFIG_SPI_MODE_0=y -# CONFIG_SPI_MODE_1 is not set -# CONFIG_SPI_MODE_2 is not set -# CONFIG_SPI_MODE_3 is not set -CONFIG_SPI_MODE=0 -CONFIG_PROJECT="dataflash" -CONFIG_LOAD_UBOOT=y -# CONFIG_LOAD_64KB is not set -# CONFIG_LOAD_1MB is not set -# CONFIG_LOAD_4MB is not set -CONFIG_IMG_ADDRESS="0x00008400" -CONFIG_IMG_SIZE="0x00040000" -CONFIG_JUMP_ADDR="0x73F00000" -CONFIG_APP_CHECK=y -# CONFIG_LONG_TEST is not set -CONFIG_DEBUG=y -CONFIG_VERBOSE=y -CONFIG_HW_INIT=y -# CONFIG_USER_HW_INIT is not set -# CONFIG_THUMB is not set -CONFIG_SX_AT91=y -CONFIG_RAW_AT91=y diff --git a/recipes/at91bootstrap/at91bootstrap-2.13/at91sam9260ek/defconfig b/recipes/at91bootstrap/at91bootstrap-2.13/at91sam9260ek/defconfig deleted file mode 100644 index 5e744ad829..0000000000 --- a/recipes/at91bootstrap/at91bootstrap-2.13/at91sam9260ek/defconfig +++ /dev/null @@ -1,110 +0,0 @@ -# -# Automatically generated make config: don't edit -# Tue Jan 12 22:00:52 2010 -# -HAVE_DOT_CONFIG=y -CONFIG_BOARDNAME="at91sam9260dfc" -CONFIG_AT91SAM9260EK=y -# CONFIG_AT91SAM9261EK is not set -# CONFIG_AT91SAM9263EK is not set -# CONFIG_AT91SAM9RLEK is not set -# CONFIG_AT91SAM9XEEK is not set -# CONFIG_AT91SAM9G10EK is not set -# CONFIG_AT91SAM9G20EK is not set -# CONFIG_AT91SAM9G45EK is not set -# CONFIG_AT91SAM9G45EKES is not set -# CONFIG_AT91SAM9M10EK is not set -# CONFIG_AT91CAP9ADK is not set -# CONFIG_AT91CAP9STK is not set -# CONFIG_AFEB9260 is not set -CONFIG_CHIP="AT91SAM9260" -CONFIG_BOARD="at91sam9260ek" -CONFIG_MACH_TYPE="0x44B" -CONFIG_LINK_ADDR="0x000000" -CONFIG_TOP_OF_MEMORY="0x301000" -CONFIG_BOOTSTRAP_MAXSIZE="4096" -# CONFIG_CRYSTAL_12_000MHZ is not set -# CONFIG_CRYSTAL_16_000MHZ is not set -# CONFIG_CRYSTAL_16_36766MHZ is not set -CONFIG_CRYSTAL_18_432MHZ=y -ALLOW_CRYSTAL_18_432MHZ=y -CONFIG_CRYSTAL="CRYSTAL_18_432MHZ" -# CONFIG_CPU_CLK_166MHZ is not set -# CONFIG_CPU_CLK_180MHZ is not set -CONFIG_CPU_CLK_200MHZ=y -# CONFIG_CPU_CLK_240MHZ is not set -# CONFIG_CPU_CLK_266MHZ is not set -# CONFIG_CPU_CLK_400MHZ is not set -ALLOW_CPU_CLK_200MHZ=y -# DISABLE_CPU_CLK_240MHZ is not set -# CONFIG_BUS_SPEED_83MHZ is not set -# CONFIG_BUS_SPEED_90MHZ is not set -CONFIG_BUS_SPEED_100MHZ=y -# CONFIG_BUS_SPEED_133MHZ is not set - -# -# Memory selection -# -CONFIG_SDRAM=y -# CONFIG_SDDRC is not set -# CONFIG_DDR2 is not set -ALLOW_DATAFLASH=y -# ALLOW_FLASH is not set -ALLOW_NANDFLASH=y -# ALLOW_SDCARD is not set -# ALLOW_PSRAM is not set -# ALLOW_SDRAM_16BIT is not set -# CONFIG_RAM_32MB is not set -CONFIG_RAM_64MB=y -# CONFIG_RAM_128MB is not set -# CONFIG_RAM_256MB is not set -CONFIG_DATAFLASH=y -# CONFIG_FLASH is not set -# CONFIG_NANDFLASH is not set -# CONFIG_SDCARD is not set -CONFIG_MEMORY="dataflash" - -# -# SPI configuration -# -CONFIG_SPI_CLK=33000000 -# CONFIG_SMALL_DATAFLASH is not set -CONFIG_DATAFLASH_RECOVERY=y -ALLOW_DATAFLASH_RECOVERY=y -CONFIG_SPI_BOOT_CS0=y -# CONFIG_SPI_BOOT_CS1 is not set -# CONFIG_SPI_BOOT_CS2 is not set -# CONFIG_SPI_BOOT_CS3 is not set -ALLOW_BOOT_FROM_DATAFLASH_CS0=y -ALLOW_BOOT_FROM_DATAFLASH_CS1=y -# ALLOW_BOOT_FROM_DATAFLASH_CS2 is not set -# ALLOW_BOOT_FROM_DATAFLASH_CS3 is not set -DATAFLASHCARD_ON_CS0=y -# DATAFLASHCARD_ON_CS1 is not set -# DATAFLASHCARD_ON_CS2 is not set -# DATAFLASHCARD_ON_CS3 is not set -CONFIG_DATAFLASHCARD=y -CONFIG_CARD_SUFFIX="card" -CONFIG_SPI_BOOT="AT91C_SPI_PCS0_DATAFLASH" -CONFIG_SPI_MODE_0=y -# CONFIG_SPI_MODE_1 is not set -# CONFIG_SPI_MODE_2 is not set -# CONFIG_SPI_MODE_3 is not set -CONFIG_SPI_MODE=0 -CONFIG_PROJECT="dataflash" -CONFIG_LOAD_UBOOT=y -# CONFIG_LOAD_64KB is not set -# CONFIG_LOAD_1MB is not set -# CONFIG_LOAD_4MB is not set -CONFIG_IMG_ADDRESS="0x00008400" -CONFIG_IMG_SIZE="0x00040000" -CONFIG_JUMP_ADDR="0x23F00000" -CONFIG_APP_CHECK=y -# CONFIG_LONG_TEST is not set -# CONFIG_DEBUG is not set -# CONFIG_VERBOSE is not set -CONFIG_HW_INIT=y -# CONFIG_USER_HW_INIT is not set -# CONFIG_THUMB is not set -CONFIG_SX_AT91=y -CONFIG_RAW_AT91=y diff --git a/recipes/at91bootstrap/at91bootstrap-2.13/at91sam9261ek/defconfig b/recipes/at91bootstrap/at91bootstrap-2.13/at91sam9261ek/defconfig deleted file mode 100644 index 05058be3d3..0000000000 --- a/recipes/at91bootstrap/at91bootstrap-2.13/at91sam9261ek/defconfig +++ /dev/null @@ -1,110 +0,0 @@ -# -# Automatically generated make config: don't edit -# Tue Jan 12 22:00:56 2010 -# -HAVE_DOT_CONFIG=y -CONFIG_BOARDNAME="at91sam9261df" -# CONFIG_AT91SAM9260EK is not set -CONFIG_AT91SAM9261EK=y -# CONFIG_AT91SAM9263EK is not set -# CONFIG_AT91SAM9RLEK is not set -# CONFIG_AT91SAM9XEEK is not set -# CONFIG_AT91SAM9G10EK is not set -# CONFIG_AT91SAM9G20EK is not set -# CONFIG_AT91SAM9G45EK is not set -# CONFIG_AT91SAM9G45EKES is not set -# CONFIG_AT91SAM9M10EK is not set -# CONFIG_AT91CAP9ADK is not set -# CONFIG_AT91CAP9STK is not set -# CONFIG_AFEB9260 is not set -CONFIG_CHIP="AT91SAM9261" -CONFIG_BOARD="at91sam9261ek" -CONFIG_MACH_TYPE="0x350" -CONFIG_LINK_ADDR="0x000000" -CONFIG_TOP_OF_MEMORY="0x328000" -CONFIG_BOOTSTRAP_MAXSIZE="13000" -# CONFIG_CRYSTAL_12_000MHZ is not set -# CONFIG_CRYSTAL_16_000MHZ is not set -# CONFIG_CRYSTAL_16_36766MHZ is not set -CONFIG_CRYSTAL_18_432MHZ=y -ALLOW_CRYSTAL_18_432MHZ=y -CONFIG_CRYSTAL="CRYSTAL_18_432MHZ" -# CONFIG_CPU_CLK_166MHZ is not set -# CONFIG_CPU_CLK_180MHZ is not set -CONFIG_CPU_CLK_200MHZ=y -# CONFIG_CPU_CLK_240MHZ is not set -# CONFIG_CPU_CLK_266MHZ is not set -# CONFIG_CPU_CLK_400MHZ is not set -ALLOW_CPU_CLK_200MHZ=y -ALLOW_CPU_CLK_266MHZ=y -# DISABLE_CPU_CLK_240MHZ is not set -# CONFIG_BUS_SPEED_83MHZ is not set -# CONFIG_BUS_SPEED_90MHZ is not set -CONFIG_BUS_SPEED_100MHZ=y -# CONFIG_BUS_SPEED_133MHZ is not set - -# -# Memory selection -# -CONFIG_SDRAM=y -# CONFIG_SDDRC is not set -# CONFIG_DDR2 is not set -ALLOW_DATAFLASH=y -# ALLOW_FLASH is not set -ALLOW_NANDFLASH=y -# ALLOW_SDCARD is not set -# ALLOW_PSRAM is not set -# ALLOW_SDRAM_16BIT is not set -# CONFIG_RAM_32MB is not set -CONFIG_RAM_64MB=y -# CONFIG_RAM_128MB is not set -# CONFIG_RAM_256MB is not set -CONFIG_DATAFLASH=y -# CONFIG_FLASH is not set -# CONFIG_NANDFLASH is not set -# CONFIG_SDCARD is not set -CONFIG_MEMORY="dataflash" - -# -# SPI configuration -# -CONFIG_SPI_CLK=33000000 -CONFIG_SMALL_DATAFLASH=y -# ALLOW_DATAFLASH_RECOVERY is not set -CONFIG_SPI_BOOT_CS0=y -# CONFIG_SPI_BOOT_CS1 is not set -# CONFIG_SPI_BOOT_CS2 is not set -# CONFIG_SPI_BOOT_CS3 is not set -ALLOW_BOOT_FROM_DATAFLASH_CS0=y -# ALLOW_BOOT_FROM_DATAFLASH_CS1 is not set -# ALLOW_BOOT_FROM_DATAFLASH_CS2 is not set -ALLOW_BOOT_FROM_DATAFLASH_CS3=y -# DATAFLASHCARD_ON_CS0 is not set -# DATAFLASHCARD_ON_CS1 is not set -# DATAFLASHCARD_ON_CS2 is not set -# DATAFLASHCARD_ON_CS3 is not set -# CONFIG_DATAFLASHCARD is not set -CONFIG_CARD_SUFFIX="" -CONFIG_SPI_BOOT="AT91C_SPI_PCS0_DATAFLASH" -CONFIG_SPI_MODE_0=y -# CONFIG_SPI_MODE_1 is not set -# CONFIG_SPI_MODE_2 is not set -# CONFIG_SPI_MODE_3 is not set -CONFIG_SPI_MODE=0 -CONFIG_PROJECT="dataflash" -CONFIG_LOAD_UBOOT=y -# CONFIG_LOAD_64KB is not set -# CONFIG_LOAD_1MB is not set -# CONFIG_LOAD_4MB is not set -CONFIG_IMG_ADDRESS="0x00008400" -CONFIG_IMG_SIZE="0x00040000" -CONFIG_JUMP_ADDR="0x23F00000" -CONFIG_APP_CHECK=y -# CONFIG_LONG_TEST is not set -CONFIG_DEBUG=y -CONFIG_VERBOSE=y -CONFIG_HW_INIT=y -# CONFIG_USER_HW_INIT is not set -# CONFIG_THUMB is not set -CONFIG_SX_AT91=y -CONFIG_RAW_AT91=y diff --git a/recipes/at91bootstrap/at91bootstrap-2.13/at91sam9263ek/defconfig b/recipes/at91bootstrap/at91bootstrap-2.13/at91sam9263ek/defconfig deleted file mode 100644 index 70f6e3228e..0000000000 --- a/recipes/at91bootstrap/at91bootstrap-2.13/at91sam9263ek/defconfig +++ /dev/null @@ -1,113 +0,0 @@ -# -# Automatically generated make config: don't edit -# Tue Jan 12 22:00:59 2010 -# -HAVE_DOT_CONFIG=y -CONFIG_BOARDNAME="at91sam9263dfc" -# CONFIG_AT91SAM9260EK is not set -# CONFIG_AT91SAM9261EK is not set -CONFIG_AT91SAM9263EK=y -# CONFIG_AT91SAM9RLEK is not set -# CONFIG_AT91SAM9XEEK is not set -# CONFIG_AT91SAM9G10EK is not set -# CONFIG_AT91SAM9G20EK is not set -# CONFIG_AT91SAM9G45EK is not set -# CONFIG_AT91SAM9G45EKES is not set -# CONFIG_AT91SAM9M10EK is not set -# CONFIG_AT91CAP9ADK is not set -# CONFIG_AT91CAP9STK is not set -# CONFIG_AFEB9260 is not set -CONFIG_CHIP="AT91SAM9263" -CONFIG_BOARD="at91sam9263ek" -CONFIG_MACH_TYPE="0x4B2" -CONFIG_LINK_ADDR="0x000000" -CONFIG_TOP_OF_MEMORY="0x314000" -CONFIG_BOOTSTRAP_MAXSIZE="13000" -# CONFIG_CRYSTAL_12_000MHZ is not set -# CONFIG_CRYSTAL_16_000MHZ is not set -CONFIG_CRYSTAL_16_36766MHZ=y -# CONFIG_CRYSTAL_18_432MHZ is not set -ALLOW_CRYSTAL_16_36766MHZ=y -ALLOW_CRYSTAL_18_432MHZ=y -CONFIG_CRYSTAL="CRYSTAL_16_36766MHZ" -# CONFIG_CPU_CLK_166MHZ is not set -# CONFIG_CPU_CLK_180MHZ is not set -CONFIG_CPU_CLK_200MHZ=y -# CONFIG_CPU_CLK_240MHZ is not set -# CONFIG_CPU_CLK_266MHZ is not set -# CONFIG_CPU_CLK_400MHZ is not set -ALLOW_CPU_CLK_200MHZ=y -ALLOW_CPU_CLK_240MHZ=y -DISABLE_CPU_CLK_240MHZ=y -# CONFIG_BUS_SPEED_83MHZ is not set -# CONFIG_BUS_SPEED_90MHZ is not set -CONFIG_BUS_SPEED_100MHZ=y -# CONFIG_BUS_SPEED_133MHZ is not set - -# -# Memory selection -# -CONFIG_SDRAM=y -# CONFIG_SDDRC is not set -# CONFIG_DDR2 is not set -ALLOW_DATAFLASH=y -# ALLOW_FLASH is not set -ALLOW_NANDFLASH=y -# ALLOW_SDCARD is not set -ALLOW_PSRAM=y -ALLOW_SDRAM_16BIT=y -# CONFIG_RAM_32MB is not set -CONFIG_RAM_64MB=y -# CONFIG_RAM_128MB is not set -# CONFIG_RAM_256MB is not set -# CONFIG_SDRAM_16BIT is not set -# CONFIG_PSRAM is not set -CONFIG_DATAFLASH=y -# CONFIG_FLASH is not set -# CONFIG_NANDFLASH is not set -# CONFIG_SDCARD is not set -CONFIG_MEMORY="dataflash" - -# -# SPI configuration -# -CONFIG_SPI_CLK=33000000 -CONFIG_SMALL_DATAFLASH=y -# ALLOW_DATAFLASH_RECOVERY is not set -CONFIG_SPI_BOOT_CS0=y -# CONFIG_SPI_BOOT_CS1 is not set -# CONFIG_SPI_BOOT_CS2 is not set -# CONFIG_SPI_BOOT_CS3 is not set -ALLOW_BOOT_FROM_DATAFLASH_CS0=y -# ALLOW_BOOT_FROM_DATAFLASH_CS1 is not set -# ALLOW_BOOT_FROM_DATAFLASH_CS2 is not set -# ALLOW_BOOT_FROM_DATAFLASH_CS3 is not set -DATAFLASHCARD_ON_CS0=y -# DATAFLASHCARD_ON_CS1 is not set -# DATAFLASHCARD_ON_CS2 is not set -# DATAFLASHCARD_ON_CS3 is not set -CONFIG_DATAFLASHCARD=y -CONFIG_CARD_SUFFIX="card" -CONFIG_SPI_BOOT="AT91C_SPI_PCS0_DATAFLASH" -CONFIG_SPI_MODE_0=y -# CONFIG_SPI_MODE_1 is not set -# CONFIG_SPI_MODE_2 is not set -# CONFIG_SPI_MODE_3 is not set -CONFIG_SPI_MODE=0 -CONFIG_PROJECT="dataflash" -CONFIG_LOAD_UBOOT=y -# CONFIG_LOAD_64KB is not set -# CONFIG_LOAD_1MB is not set -# CONFIG_LOAD_4MB is not set -CONFIG_IMG_ADDRESS="0x00008400" -CONFIG_IMG_SIZE="0x00040000" -CONFIG_JUMP_ADDR="0x23F00000" -CONFIG_APP_CHECK=y -# CONFIG_LONG_TEST is not set -# CONFIG_DEBUG is not set -CONFIG_VERBOSE=y -CONFIG_HW_INIT=y -# CONFIG_USER_HW_INIT is not set -# CONFIG_THUMB is not set -CONFIG_SX_AT91=y -CONFIG_RAW_AT91=y diff --git a/recipes/at91bootstrap/at91bootstrap-2.13/at91sam9g20ek/defconfig b/recipes/at91bootstrap/at91bootstrap-2.13/at91sam9g20ek/defconfig deleted file mode 100644 index 8520a79658..0000000000 --- a/recipes/at91bootstrap/at91bootstrap-2.13/at91sam9g20ek/defconfig +++ /dev/null @@ -1,110 +0,0 @@ -# -# Automatically generated make config: don't edit -# Tue Jan 12 22:00:34 2010 -# -HAVE_DOT_CONFIG=y -CONFIG_BOARDNAME="at91sam9g20dfc" -# CONFIG_AT91SAM9260EK is not set -# CONFIG_AT91SAM9261EK is not set -# CONFIG_AT91SAM9263EK is not set -# CONFIG_AT91SAM9RLEK is not set -# CONFIG_AT91SAM9XEEK is not set -# CONFIG_AT91SAM9G10EK is not set -CONFIG_AT91SAM9G20EK=y -# CONFIG_AT91SAM9G45EK is not set -# CONFIG_AT91SAM9G45EKES is not set -# CONFIG_AT91SAM9M10EK is not set -# CONFIG_AT91CAP9ADK is not set -# CONFIG_AT91CAP9STK is not set -# CONFIG_AFEB9260 is not set -CONFIG_CHIP="AT91SAM9G20" -CONFIG_BOARD="at91sam9g20ek" -CONFIG_MACH_TYPE="0x658" -CONFIG_LINK_ADDR="0x000000" -CONFIG_TOP_OF_MEMORY="0x301000" -CONFIG_BOOTSTRAP_MAXSIZE="13000" -# CONFIG_CRYSTAL_12_000MHZ is not set -# CONFIG_CRYSTAL_16_000MHZ is not set -# CONFIG_CRYSTAL_16_36766MHZ is not set -CONFIG_CRYSTAL_18_432MHZ=y -ALLOW_CRYSTAL_18_432MHZ=y -CONFIG_CRYSTAL="CRYSTAL_18_432MHZ" -# CONFIG_CPU_CLK_166MHZ is not set -# CONFIG_CPU_CLK_180MHZ is not set -# CONFIG_CPU_CLK_200MHZ is not set -# CONFIG_CPU_CLK_240MHZ is not set -# CONFIG_CPU_CLK_266MHZ is not set -CONFIG_CPU_CLK_400MHZ=y -ALLOW_CPU_CLK_400MHZ=y -# DISABLE_CPU_CLK_240MHZ is not set -# CONFIG_BUS_SPEED_83MHZ is not set -# CONFIG_BUS_SPEED_90MHZ is not set -# CONFIG_BUS_SPEED_100MHZ is not set -CONFIG_BUS_SPEED_133MHZ=y - -# -# Memory selection -# -CONFIG_SDRAM=y -# CONFIG_SDDRC is not set -# CONFIG_DDR2 is not set -ALLOW_DATAFLASH=y -# ALLOW_FLASH is not set -ALLOW_NANDFLASH=y -# ALLOW_SDCARD is not set -# ALLOW_PSRAM is not set -# ALLOW_SDRAM_16BIT is not set -# CONFIG_RAM_32MB is not set -CONFIG_RAM_64MB=y -# CONFIG_RAM_128MB is not set -# CONFIG_RAM_256MB is not set -CONFIG_DATAFLASH=y -# CONFIG_FLASH is not set -# CONFIG_NANDFLASH is not set -# CONFIG_SDCARD is not set -CONFIG_MEMORY="dataflash" - -# -# SPI configuration -# -CONFIG_SPI_CLK=33000000 -CONFIG_SMALL_DATAFLASH=y -CONFIG_DATAFLASH_RECOVERY=y -ALLOW_DATAFLASH_RECOVERY=y -CONFIG_SPI_BOOT_CS0=y -# CONFIG_SPI_BOOT_CS1 is not set -# CONFIG_SPI_BOOT_CS2 is not set -# CONFIG_SPI_BOOT_CS3 is not set -ALLOW_BOOT_FROM_DATAFLASH_CS0=y -ALLOW_BOOT_FROM_DATAFLASH_CS1=y -# ALLOW_BOOT_FROM_DATAFLASH_CS2 is not set -# ALLOW_BOOT_FROM_DATAFLASH_CS3 is not set -DATAFLASHCARD_ON_CS0=y -# DATAFLASHCARD_ON_CS1 is not set -# DATAFLASHCARD_ON_CS2 is not set -# DATAFLASHCARD_ON_CS3 is not set -CONFIG_DATAFLASHCARD=y -CONFIG_CARD_SUFFIX="card" -CONFIG_SPI_BOOT="AT91C_SPI_PCS0_DATAFLASH" -CONFIG_SPI_MODE_0=y -# CONFIG_SPI_MODE_1 is not set -# CONFIG_SPI_MODE_2 is not set -# CONFIG_SPI_MODE_3 is not set -CONFIG_SPI_MODE=0 -CONFIG_PROJECT="dataflash" -CONFIG_LOAD_UBOOT=y -# CONFIG_LOAD_64KB is not set -# CONFIG_LOAD_1MB is not set -# CONFIG_LOAD_4MB is not set -CONFIG_IMG_ADDRESS="0x00008400" -CONFIG_IMG_SIZE="0x00040000" -CONFIG_JUMP_ADDR="0x23F00000" -CONFIG_APP_CHECK=y -# CONFIG_LONG_TEST is not set -CONFIG_DEBUG=y -CONFIG_VERBOSE=y -CONFIG_HW_INIT=y -# CONFIG_USER_HW_INIT is not set -# CONFIG_THUMB is not set -CONFIG_SX_AT91=y -CONFIG_RAW_AT91=y diff --git a/recipes/at91bootstrap/at91bootstrap-2.13/at91sam9g45ek/defconfig b/recipes/at91bootstrap/at91bootstrap-2.13/at91sam9g45ek/defconfig deleted file mode 100644 index 6259b01f13..0000000000 --- a/recipes/at91bootstrap/at91bootstrap-2.13/at91sam9g45ek/defconfig +++ /dev/null @@ -1,110 +0,0 @@ -# -# Automatically generated make config: don't edit -# Tue Jan 12 22:00:42 2010 -# -HAVE_DOT_CONFIG=y -CONFIG_BOARDNAME="at91sam9g45df" -# CONFIG_AT91SAM9260EK is not set -# CONFIG_AT91SAM9261EK is not set -# CONFIG_AT91SAM9263EK is not set -# CONFIG_AT91SAM9RLEK is not set -# CONFIG_AT91SAM9XEEK is not set -# CONFIG_AT91SAM9G10EK is not set -# CONFIG_AT91SAM9G20EK is not set -CONFIG_AT91SAM9G45EK=y -# CONFIG_AT91SAM9G45EKES is not set -# CONFIG_AT91SAM9M10EK is not set -# CONFIG_AT91CAP9ADK is not set -# CONFIG_AT91CAP9STK is not set -# CONFIG_AFEB9260 is not set -CONFIG_CHIP="AT91SAM9G45" -CONFIG_BOARD="at91sam9g45ek" -CONFIG_MACH_TYPE="1830" -CONFIG_LINK_ADDR="0x000000" -CONFIG_TOP_OF_MEMORY="0x304000" -CONFIG_BOOTSTRAP_MAXSIZE="13000" -# CONFIG_CRYSTAL_12_000MHZ is not set -# CONFIG_CRYSTAL_16_000MHZ is not set -# CONFIG_CRYSTAL_16_36766MHZ is not set -CONFIG_CRYSTAL_18_432MHZ=y -ALLOW_CRYSTAL_18_432MHZ=y -CONFIG_CRYSTAL="CRYSTAL_18_432MHZ" -# CONFIG_CPU_CLK_166MHZ is not set -# CONFIG_CPU_CLK_180MHZ is not set -# CONFIG_CPU_CLK_200MHZ is not set -# CONFIG_CPU_CLK_240MHZ is not set -# CONFIG_CPU_CLK_266MHZ is not set -CONFIG_CPU_CLK_400MHZ=y -ALLOW_CPU_CLK_400MHZ=y -# DISABLE_CPU_CLK_240MHZ is not set -# CONFIG_BUS_SPEED_83MHZ is not set -# CONFIG_BUS_SPEED_90MHZ is not set -# CONFIG_BUS_SPEED_100MHZ is not set -CONFIG_BUS_SPEED_133MHZ=y - -# -# Memory selection -# -# CONFIG_SDRAM is not set -# CONFIG_SDDRC is not set -CONFIG_DDR2=y -ALLOW_DATAFLASH=y -# ALLOW_FLASH is not set -ALLOW_NANDFLASH=y -# ALLOW_SDCARD is not set -# ALLOW_PSRAM is not set -# ALLOW_SDRAM_16BIT is not set -# CONFIG_RAM_32MB is not set -# CONFIG_RAM_64MB is not set -CONFIG_RAM_128MB=y -# CONFIG_RAM_256MB is not set -CONFIG_DATAFLASH=y -# CONFIG_FLASH is not set -# CONFIG_NANDFLASH is not set -# CONFIG_SDCARD is not set -CONFIG_MEMORY="dataflash" - -# -# SPI configuration -# -CONFIG_SPI_CLK=33000000 -CONFIG_SMALL_DATAFLASH=y -CONFIG_DATAFLASH_RECOVERY=y -ALLOW_DATAFLASH_RECOVERY=y -CONFIG_SPI_BOOT_CS0=y -# CONFIG_SPI_BOOT_CS1 is not set -# CONFIG_SPI_BOOT_CS2 is not set -# CONFIG_SPI_BOOT_CS3 is not set -ALLOW_BOOT_FROM_DATAFLASH_CS0=y -# ALLOW_BOOT_FROM_DATAFLASH_CS1 is not set -# ALLOW_BOOT_FROM_DATAFLASH_CS2 is not set -# ALLOW_BOOT_FROM_DATAFLASH_CS3 is not set -DATAFLASHCARD_ON_CS0=y -# DATAFLASHCARD_ON_CS1 is not set -# DATAFLASHCARD_ON_CS2 is not set -# DATAFLASHCARD_ON_CS3 is not set -CONFIG_DATAFLASHCARD=y -CONFIG_CARD_SUFFIX="card" -CONFIG_SPI_BOOT="AT91C_SPI_PCS0_DATAFLASH" -CONFIG_SPI_MODE_0=y -# CONFIG_SPI_MODE_1 is not set -# CONFIG_SPI_MODE_2 is not set -# CONFIG_SPI_MODE_3 is not set -CONFIG_SPI_MODE=0 -CONFIG_PROJECT="dataflash" -CONFIG_LOAD_UBOOT=y -# CONFIG_LOAD_64KB is not set -# CONFIG_LOAD_1MB is not set -# CONFIG_LOAD_4MB is not set -CONFIG_IMG_ADDRESS="0x00008400" -CONFIG_IMG_SIZE="0x00040000" -CONFIG_JUMP_ADDR="0x73F00000" -CONFIG_APP_CHECK=y -# CONFIG_LONG_TEST is not set -CONFIG_DEBUG=y -CONFIG_VERBOSE=y -CONFIG_HW_INIT=y -# CONFIG_USER_HW_INIT is not set -# CONFIG_THUMB is not set -CONFIG_SX_AT91=y -CONFIG_RAW_AT91=y diff --git a/recipes/at91bootstrap/at91bootstrap-2.13/at91sam9rlek/defconfig b/recipes/at91bootstrap/at91bootstrap-2.13/at91sam9rlek/defconfig deleted file mode 100644 index af7ce6adfb..0000000000 --- a/recipes/at91bootstrap/at91bootstrap-2.13/at91sam9rlek/defconfig +++ /dev/null @@ -1,110 +0,0 @@ -# -# Automatically generated make config: don't edit -# Tue Jan 12 22:00:47 2010 -# -HAVE_DOT_CONFIG=y -CONFIG_BOARDNAME="at91sam9rldf" -# CONFIG_AT91SAM9260EK is not set -# CONFIG_AT91SAM9261EK is not set -# CONFIG_AT91SAM9263EK is not set -CONFIG_AT91SAM9RLEK=y -# CONFIG_AT91SAM9XEEK is not set -# CONFIG_AT91SAM9G10EK is not set -# CONFIG_AT91SAM9G20EK is not set -# CONFIG_AT91SAM9G45EK is not set -# CONFIG_AT91SAM9G45EKES is not set -# CONFIG_AT91SAM9M10EK is not set -# CONFIG_AT91CAP9ADK is not set -# CONFIG_AT91CAP9STK is not set -# CONFIG_AFEB9260 is not set -CONFIG_CHIP="AT91SAM9RL" -CONFIG_BOARD="at91sam9rlek" -CONFIG_MACH_TYPE="1326" -CONFIG_LINK_ADDR="0x000000" -CONFIG_TOP_OF_MEMORY="0x310000" -CONFIG_BOOTSTRAP_MAXSIZE="13000" -# CONFIG_CRYSTAL_12_000MHZ is not set -# CONFIG_CRYSTAL_16_000MHZ is not set -# CONFIG_CRYSTAL_16_36766MHZ is not set -CONFIG_CRYSTAL_18_432MHZ=y -ALLOW_CRYSTAL_18_432MHZ=y -CONFIG_CRYSTAL="CRYSTAL_18_432MHZ" -# CONFIG_CPU_CLK_166MHZ is not set -# CONFIG_CPU_CLK_180MHZ is not set -CONFIG_CPU_CLK_200MHZ=y -# CONFIG_CPU_CLK_240MHZ is not set -# CONFIG_CPU_CLK_266MHZ is not set -# CONFIG_CPU_CLK_400MHZ is not set -ALLOW_CPU_CLK_200MHZ=y -ALLOW_CPU_CLK_266MHZ=y -# DISABLE_CPU_CLK_240MHZ is not set -# CONFIG_BUS_SPEED_83MHZ is not set -# CONFIG_BUS_SPEED_90MHZ is not set -CONFIG_BUS_SPEED_100MHZ=y -# CONFIG_BUS_SPEED_133MHZ is not set - -# -# Memory selection -# -CONFIG_SDRAM=y -# CONFIG_SDDRC is not set -# CONFIG_DDR2 is not set -ALLOW_DATAFLASH=y -# ALLOW_FLASH is not set -ALLOW_NANDFLASH=y -# ALLOW_SDCARD is not set -# ALLOW_PSRAM is not set -# ALLOW_SDRAM_16BIT is not set -# CONFIG_RAM_32MB is not set -CONFIG_RAM_64MB=y -# CONFIG_RAM_128MB is not set -# CONFIG_RAM_256MB is not set -CONFIG_DATAFLASH=y -# CONFIG_FLASH is not set -# CONFIG_NANDFLASH is not set -# CONFIG_SDCARD is not set -CONFIG_MEMORY="dataflash" - -# -# SPI configuration -# -CONFIG_SPI_CLK=33000000 -CONFIG_SMALL_DATAFLASH=y -# ALLOW_DATAFLASH_RECOVERY is not set -CONFIG_SPI_BOOT_CS0=y -# CONFIG_SPI_BOOT_CS1 is not set -# CONFIG_SPI_BOOT_CS2 is not set -# CONFIG_SPI_BOOT_CS3 is not set -ALLOW_BOOT_FROM_DATAFLASH_CS0=y -# ALLOW_BOOT_FROM_DATAFLASH_CS1 is not set -# ALLOW_BOOT_FROM_DATAFLASH_CS2 is not set -# ALLOW_BOOT_FROM_DATAFLASH_CS3 is not set -# DATAFLASHCARD_ON_CS0 is not set -# DATAFLASHCARD_ON_CS1 is not set -# DATAFLASHCARD_ON_CS2 is not set -# DATAFLASHCARD_ON_CS3 is not set -# CONFIG_DATAFLASHCARD is not set -CONFIG_CARD_SUFFIX="" -CONFIG_SPI_BOOT="AT91C_SPI_PCS0_DATAFLASH" -CONFIG_SPI_MODE_0=y -# CONFIG_SPI_MODE_1 is not set -# CONFIG_SPI_MODE_2 is not set -# CONFIG_SPI_MODE_3 is not set -CONFIG_SPI_MODE=0 -CONFIG_PROJECT="dataflash" -CONFIG_LOAD_UBOOT=y -# CONFIG_LOAD_64KB is not set -# CONFIG_LOAD_1MB is not set -# CONFIG_LOAD_4MB is not set -CONFIG_IMG_ADDRESS="0x00008400" -CONFIG_IMG_SIZE="0x00040000" -CONFIG_JUMP_ADDR="0x23F00000" -CONFIG_APP_CHECK=y -# CONFIG_LONG_TEST is not set -CONFIG_DEBUG=y -CONFIG_VERBOSE=y -CONFIG_HW_INIT=y -# CONFIG_USER_HW_INIT is not set -# CONFIG_THUMB is not set -CONFIG_SX_AT91=y -CONFIG_RAW_AT91=y diff --git a/recipes/at91bootstrap/at91bootstrap-2.13/at91sam9xeek/defconfig b/recipes/at91bootstrap/at91bootstrap-2.13/at91sam9xeek/defconfig deleted file mode 100644 index fc83730b6f..0000000000 --- a/recipes/at91bootstrap/at91bootstrap-2.13/at91sam9xeek/defconfig +++ /dev/null @@ -1,110 +0,0 @@ -# -# Automatically generated make config: don't edit -# Tue Jan 12 22:00:49 2010 -# -HAVE_DOT_CONFIG=y -CONFIG_BOARDNAME="at91sam9xedfc" -# CONFIG_AT91SAM9260EK is not set -# CONFIG_AT91SAM9261EK is not set -# CONFIG_AT91SAM9263EK is not set -# CONFIG_AT91SAM9RLEK is not set -CONFIG_AT91SAM9XEEK=y -# CONFIG_AT91SAM9G10EK is not set -# CONFIG_AT91SAM9G20EK is not set -# CONFIG_AT91SAM9G45EK is not set -# CONFIG_AT91SAM9G45EKES is not set -# CONFIG_AT91SAM9M10EK is not set -# CONFIG_AT91CAP9ADK is not set -# CONFIG_AT91CAP9STK is not set -# CONFIG_AFEB9260 is not set -CONFIG_CHIP="AT91SAM9XE" -CONFIG_BOARD="at91sam9xeek" -CONFIG_MACH_TYPE="0x44B" -CONFIG_LINK_ADDR="0x000000" -CONFIG_TOP_OF_MEMORY="0x301000" -CONFIG_BOOTSTRAP_MAXSIZE="13000" -# CONFIG_CRYSTAL_12_000MHZ is not set -# CONFIG_CRYSTAL_16_000MHZ is not set -# CONFIG_CRYSTAL_16_36766MHZ is not set -CONFIG_CRYSTAL_18_432MHZ=y -ALLOW_CRYSTAL_18_432MHZ=y -CONFIG_CRYSTAL="CRYSTAL_18_432MHZ" -# CONFIG_CPU_CLK_166MHZ is not set -# CONFIG_CPU_CLK_180MHZ is not set -CONFIG_CPU_CLK_200MHZ=y -# CONFIG_CPU_CLK_240MHZ is not set -# CONFIG_CPU_CLK_266MHZ is not set -# CONFIG_CPU_CLK_400MHZ is not set -ALLOW_CPU_CLK_200MHZ=y -# DISABLE_CPU_CLK_240MHZ is not set -# CONFIG_BUS_SPEED_83MHZ is not set -# CONFIG_BUS_SPEED_90MHZ is not set -CONFIG_BUS_SPEED_100MHZ=y -# CONFIG_BUS_SPEED_133MHZ is not set - -# -# Memory selection -# -CONFIG_SDRAM=y -# CONFIG_SDDRC is not set -# CONFIG_DDR2 is not set -ALLOW_DATAFLASH=y -# ALLOW_FLASH is not set -ALLOW_NANDFLASH=y -# ALLOW_SDCARD is not set -# ALLOW_PSRAM is not set -# ALLOW_SDRAM_16BIT is not set -# CONFIG_RAM_32MB is not set -CONFIG_RAM_64MB=y -# CONFIG_RAM_128MB is not set -# CONFIG_RAM_256MB is not set -CONFIG_DATAFLASH=y -# CONFIG_FLASH is not set -# CONFIG_NANDFLASH is not set -# CONFIG_SDCARD is not set -CONFIG_MEMORY="dataflash" - -# -# SPI configuration -# -CONFIG_SPI_CLK=33000000 -CONFIG_SMALL_DATAFLASH=y -CONFIG_DATAFLASH_RECOVERY=y -ALLOW_DATAFLASH_RECOVERY=y -CONFIG_SPI_BOOT_CS0=y -# CONFIG_SPI_BOOT_CS1 is not set -# CONFIG_SPI_BOOT_CS2 is not set -# CONFIG_SPI_BOOT_CS3 is not set -ALLOW_BOOT_FROM_DATAFLASH_CS0=y -ALLOW_BOOT_FROM_DATAFLASH_CS1=y -# ALLOW_BOOT_FROM_DATAFLASH_CS2 is not set -# ALLOW_BOOT_FROM_DATAFLASH_CS3 is not set -DATAFLASHCARD_ON_CS0=y -# DATAFLASHCARD_ON_CS1 is not set -# DATAFLASHCARD_ON_CS2 is not set -# DATAFLASHCARD_ON_CS3 is not set -CONFIG_DATAFLASHCARD=y -CONFIG_CARD_SUFFIX="card" -CONFIG_SPI_BOOT="AT91C_SPI_PCS0_DATAFLASH" -CONFIG_SPI_MODE_0=y -# CONFIG_SPI_MODE_1 is not set -# CONFIG_SPI_MODE_2 is not set -# CONFIG_SPI_MODE_3 is not set -CONFIG_SPI_MODE=0 -CONFIG_PROJECT="dataflash" -CONFIG_LOAD_UBOOT=y -# CONFIG_LOAD_64KB is not set -# CONFIG_LOAD_1MB is not set -# CONFIG_LOAD_4MB is not set -CONFIG_IMG_ADDRESS="0x00008400" -CONFIG_IMG_SIZE="0x00040000" -CONFIG_JUMP_ADDR="0x23F00000" -CONFIG_APP_CHECK=y -# CONFIG_LONG_TEST is not set -CONFIG_DEBUG=y -CONFIG_VERBOSE=y -CONFIG_HW_INIT=y -# CONFIG_USER_HW_INIT is not set -# CONFIG_THUMB is not set -CONFIG_SX_AT91=y -CONFIG_RAW_AT91=y diff --git a/recipes/at91bootstrap/at91bootstrap_2.0.inc b/recipes/at91bootstrap/at91bootstrap_2.0.inc new file mode 100644 index 0000000000..67e7893c3e --- /dev/null +++ b/recipes/at91bootstrap/at91bootstrap_2.0.inc @@ -0,0 +1,33 @@ +DESCRIPTION = "at91bootstrap: loaded into internal SRAM by AT91 BootROM" +SECTION = "bootloaders" + +PARALLEL_MAKE = "" + +SRC_URI = "ftp://www.at91.com/pub/buildroot/${PN}-${PV}.tar.bz2 \ + " + +S = "${WORKDIR}/${PN}-${PV}" +PACKAGE_ARCH = "${MACHINE_ARCH}" +EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX} DESTDIR=${DEPLOY_DIR_IMAGE} REVISION=${PR}" + +do_compile () { + unset LDFLAGS + unset CFLAGS + unset CPPFLAGS + + rm -Rf ${S}/binaries + if ! [ "x${AT91BOOTSTRAP_BOARD}" == "x" ] ; then + for board in ${AT91BOOTSTRAP_BOARD} ; do + cp `find ./board/ -name ${board}_defconfig` .config + oe_runmake AT91_CUSTOM_FLAGS="${AT91BOOTSTRAP_FLAGS}" + oe_runmake AT91_CUSTOM_FLAGS="${AT91BOOTSTRAP_FLAGS}" boot + oe_runmake AT91_CUSTOM_FLAGS="${AT91BOOTSTRAP_FLAGS}" install + done + else + cp ${S}/../defconfig ${S}/.config + oe_runmake AT91_CUSTOM_FLAGS="${AT91BOOTSTRAP_FLAGS}" + oe_runmake AT91_CUSTOM_FLAGS="${AT91BOOTSTRAP_FLAGS}" boot + oe_runmake AT91_CUSTOM_FLAGS="${AT91BOOTSTRAP_FLAGS}" install + fi + +} diff --git a/recipes/at91bootstrap/at91bootstrap_2.13.bb b/recipes/at91bootstrap/at91bootstrap_2.13.bb index 6f544fba54..147bb61cf1 100644 --- a/recipes/at91bootstrap/at91bootstrap_2.13.bb +++ b/recipes/at91bootstrap/at91bootstrap_2.13.bb @@ -1,5 +1,5 @@ -require at91bootstrap.inc -PR = "r0" +require at91bootstrap_2.0.inc +PR = "r1" DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_at91sam9g45ek = "1" DEFAULT_PREFERENCE_at91sam9g45ekes = "1" -- cgit v1.2.3 From 52198f7ac730e8c46fa5d464dc80ccf636e20507 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Tue, 16 Mar 2010 14:35:54 +0800 Subject: grip: Apply FreeBSD patch to fix a flaw with handling CDDB responses Addresses CVE-2005-0706. --- recipes/grip/grip-3.2.0/patch-src::discdb | 20 ++++++++++++++++++++ recipes/grip/grip_3.2.0.bb | 5 ++++- 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 recipes/grip/grip-3.2.0/patch-src::discdb diff --git a/recipes/grip/grip-3.2.0/patch-src::discdb b/recipes/grip/grip-3.2.0/patch-src::discdb new file mode 100644 index 0000000000..1d300b270f --- /dev/null +++ b/recipes/grip/grip-3.2.0/patch-src::discdb @@ -0,0 +1,20 @@ +--- src/discdb.c.orig Thu Apr 15 21:23:37 2004 ++++ src/discdb.c Wed Mar 16 19:02:09 2005 +@@ -311,7 +311,7 @@ + query->query_match=MATCH_EXACT; + query->query_matches=0; + +- while((inbuffer=DiscDBReadLine(&dataptr))) { ++ while(query->query_matches < MAX_INEXACT_MATCHES && (inbuffer=DiscDBReadLine(&dataptr))) { + query->query_list[query->query_matches].list_genre= + DiscDBGenreValue(g_strstrip(strtok(inbuffer," "))); + +@@ -331,7 +331,7 @@ + query->query_match=MATCH_INEXACT; + query->query_matches=0; + +- while((inbuffer=DiscDBReadLine(&dataptr))) { ++ while(query->query_matches < MAX_INEXACT_MATCHES && (inbuffer=DiscDBReadLine(&dataptr))) { + query->query_list[query->query_matches].list_genre= + DiscDBGenreValue(g_strstrip(strtok(inbuffer," "))); + diff --git a/recipes/grip/grip_3.2.0.bb b/recipes/grip/grip_3.2.0.bb index 063803138d..b4473860e0 100644 --- a/recipes/grip/grip_3.2.0.bb +++ b/recipes/grip/grip_3.2.0.bb @@ -5,7 +5,10 @@ HOMEPAGE="http://www.nostatic.org/grip/" LICENSE="GPL" -SRC_URI="${SOURCEFORGE_MIRROR}/grip/grip-${PV}.tar.gz" +SRC_URI="${SOURCEFORGE_MIRROR}/grip/grip-${PV}.tar.gz \ + file://patch-src::discdb;patch=1;pnum=0 " DEPENDS="libgnomeui vte curl cdparanoia id3lib" +PR = "r1" + inherit autotools -- cgit v1.2.3 From cd0801739557ad8536a2d7331ffe90de58b811f1 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Tue, 16 Mar 2010 14:37:52 +0800 Subject: grip-3.2.0: Add another FreeBSD patch for getting the locale right. --- recipes/grip/grip-3.2.0/patch-src::main.c | 208 ++++++++++++++++++++++++++++++ recipes/grip/grip_3.2.0.bb | 5 +- 2 files changed, 211 insertions(+), 2 deletions(-) create mode 100644 recipes/grip/grip-3.2.0/patch-src::main.c diff --git a/recipes/grip/grip-3.2.0/patch-src::main.c b/recipes/grip/grip-3.2.0/patch-src::main.c new file mode 100644 index 0000000000..ce3bd1ca08 --- /dev/null +++ b/recipes/grip/grip-3.2.0/patch-src::main.c @@ -0,0 +1,208 @@ + + + + + +view + + + + + + + + + + + + + + +
+
+ Skip site + navigation (1)Skip section navigation (2) + +
+ + +

Site Navigation

+ + +
+ +
+ +

view

+ + + + + + +
[BACK]Return to patch-src::main.c CVS log [TXT] [DIR] Up to [FreeBSD] / ports / audio / grip / files
+
+
+File:  + [FreeBSD] / ports / audio / grip / files / patch-src::main.c
+ + Revision 1.1: download - view: text, annotated - select for diffs
+Sun Nov 15 12:26:31 2009 UTC (3 months, 4 weeks ago) by naddy
+Branches: MAIN
+CVS tags: RELEASE_7_3_0, +HEAD
+
+Fix the actual bug that caused translated message catalogs to be
+displayed incorrectly, and remove the workaround.
+
+
+
+--- src/main.c.orig
++++ src/main.c
+@@ -163,7 +163,7 @@
+ 		     GNOME_PARAM_POPT_TABLE,options,
+ 		     GNOME_PROGRAM_STANDARD_PROPERTIES,NULL);
+ 
+-  bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF8");
++  bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8");
+ 
+   /* Session Management */
+   
+
+ +
+ +
+
+ + diff --git a/recipes/grip/grip_3.2.0.bb b/recipes/grip/grip_3.2.0.bb index b4473860e0..bda6044014 100644 --- a/recipes/grip/grip_3.2.0.bb +++ b/recipes/grip/grip_3.2.0.bb @@ -6,9 +6,10 @@ HOMEPAGE="http://www.nostatic.org/grip/" LICENSE="GPL" SRC_URI="${SOURCEFORGE_MIRROR}/grip/grip-${PV}.tar.gz \ - file://patch-src::discdb;patch=1;pnum=0 " + file://patch-src::discdb;patch=1;pnum=0 \ + file://patch-src::main.c;patch=1;pnum=0 " DEPENDS="libgnomeui vte curl cdparanoia id3lib" -PR = "r1" +PR = "r2" inherit autotools -- cgit v1.2.3 From 5a90ecfa84b4f10a8fa5aba512c54b639291676e Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Tue, 16 Mar 2010 14:44:58 +0800 Subject: grip-3.2.0: Add patch from FreeBSD to fix the locale. --- recipes/grip/grip-3.2.0/patch-src::main.c | 201 +----------------------------- 1 file changed, 2 insertions(+), 199 deletions(-) diff --git a/recipes/grip/grip-3.2.0/patch-src::main.c b/recipes/grip/grip-3.2.0/patch-src::main.c index ce3bd1ca08..40f1bc169b 100644 --- a/recipes/grip/grip-3.2.0/patch-src::main.c +++ b/recipes/grip/grip-3.2.0/patch-src::main.c @@ -1,208 +1,11 @@ - - - - - -view - - - - - - - - - - - - - - -
-
- Skip site - navigation (1)Skip section navigation (2) - -
- - -

Site Navigation

- - -
- -
- -

view

- - - - - - -
[BACK]Return to patch-src::main.c CVS log [TXT] [DIR] Up to [FreeBSD] / ports / audio / grip / files
-
-
-File:  - [FreeBSD] / ports / audio / grip / files / patch-src::main.c
- - Revision 1.1: download - view: text, annotated - select for diffs
-Sun Nov 15 12:26:31 2009 UTC (3 months, 4 weeks ago) by naddy
-Branches: MAIN
-CVS tags: RELEASE_7_3_0, -HEAD
-
-Fix the actual bug that caused translated message catalogs to be
-displayed incorrectly, and remove the workaround.
-
-
-
 --- src/main.c.orig
 +++ src/main.c
 @@ -163,7 +163,7 @@
  		     GNOME_PARAM_POPT_TABLE,options,
  		     GNOME_PROGRAM_STANDARD_PROPERTIES,NULL);
  
--  bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF8");
-+  bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8");
+-  bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF8");
++  bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8");
  
    /* Session Management */
    
-
- -
- -
-
- - -- cgit v1.2.3 From ede720badf45fe73a900013967dd622e1add201a Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Tue, 16 Mar 2010 14:48:33 +0800 Subject: grip-3.2.0: Remove host includes from the Makefile.am and make it compile again --- recipes/grip/grip-3.2.0/no-host-includes.patch | 10 ++++++++++ recipes/grip/grip_3.2.0.bb | 5 +++-- 2 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 recipes/grip/grip-3.2.0/no-host-includes.patch diff --git a/recipes/grip/grip-3.2.0/no-host-includes.patch b/recipes/grip/grip-3.2.0/no-host-includes.patch new file mode 100644 index 0000000000..66fca367ee --- /dev/null +++ b/recipes/grip/grip-3.2.0/no-host-includes.patch @@ -0,0 +1,10 @@ +Index: grip-3.2.0/src/Makefile.am +=================================================================== +--- grip-3.2.0.orig/src/Makefile.am 2010-03-16 14:46:01.651553829 +0800 ++++ grip-3.2.0/src/Makefile.am 2010-03-16 14:46:05.240303128 +0800 +@@ -1,4 +1,4 @@ +-INCLUDES = -I$(top_srcdir) -I$(includedir) \ ++INCLUDES = -I$(top_srcdir) \ + -DGNOME_ICONDIR=\""$(datadir)/pixmaps"\" \ + -DG_LOG_DOMAIN=\"grip\" -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ + -I../intl -I$(top_srcdir)/intl \ diff --git a/recipes/grip/grip_3.2.0.bb b/recipes/grip/grip_3.2.0.bb index bda6044014..81c36709f6 100644 --- a/recipes/grip/grip_3.2.0.bb +++ b/recipes/grip/grip_3.2.0.bb @@ -7,9 +7,10 @@ LICENSE="GPL" SRC_URI="${SOURCEFORGE_MIRROR}/grip/grip-${PV}.tar.gz \ file://patch-src::discdb;patch=1;pnum=0 \ - file://patch-src::main.c;patch=1;pnum=0 " + file://patch-src::main.c;patch=1;pnum=0 \ + file://no-host-includes.patch;patch=1 " DEPENDS="libgnomeui vte curl cdparanoia id3lib" -PR = "r2" +PR = "r3" inherit autotools -- cgit v1.2.3 From 9f06d76aaebf119e56973a0a2eecfa17689e3b0c Mon Sep 17 00:00:00 2001 From: Ulf Samuelsson Date: Tue, 16 Mar 2010 08:10:31 +0100 Subject: osb-jscore_svn.bb: Templates cannot be static "static inline" templates in "JavaScriptCore/kjs/protected_values.cpp" causes compile errors This patch removes the static keywords allowing the build to complete successfully. Signed-off-by: Ulf Samuelsson --- recipes/gtk-webcore/files/no-static-templates.patch | 21 +++++++++++++++++++++ recipes/gtk-webcore/osb-jscore_svn.bb | 6 ++++-- 2 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 recipes/gtk-webcore/files/no-static-templates.patch diff --git a/recipes/gtk-webcore/files/no-static-templates.patch b/recipes/gtk-webcore/files/no-static-templates.patch new file mode 100644 index 0000000000..2cfb41f655 --- /dev/null +++ b/recipes/gtk-webcore/files/no-static-templates.patch @@ -0,0 +1,21 @@ +diff -urN JavaScriptCore-0rig/kjs/protected_values.cpp JavaScriptCore/kjs/protected_values.cpp +--- JavaScriptCore-0rig/kjs/protected_values.cpp 2010-02-26 12:57:50.000000000 +0100 ++++ JavaScriptCore/kjs/protected_values.cpp 2010-02-26 12:59:13.000000000 +0100 +@@ -195,7 +195,7 @@ + + template static unsigned hash(ValueImp *pointer); + +-template <> static inline unsigned hash<4>(ValueImp *pointer) ++template <> inline unsigned hash<4>(ValueImp *pointer) + { + int a = (int)(intptr_t)PHI; + int b = (int)(intptr_t)pointer; +@@ -214,7 +214,7 @@ + return (unsigned)c; + } + +-template <> static inline unsigned hash<8>(ValueImp *pointer) ++template <> inline unsigned hash<8>(ValueImp *pointer) + { + int a = (int)PHI; + int b = (int)(intptr_t)pointer; diff --git a/recipes/gtk-webcore/osb-jscore_svn.bb b/recipes/gtk-webcore/osb-jscore_svn.bb index 52c56f98b5..af85764842 100644 --- a/recipes/gtk-webcore/osb-jscore_svn.bb +++ b/recipes/gtk-webcore/osb-jscore_svn.bb @@ -4,10 +4,12 @@ LICENSE = "GPL" PRIORITY = "optional" PV = "0.5.2+svnr${SRCPV}" -PR = "r1" +PR = "r2" SRC_URI = "svn://gtk-webcore.svn.sourceforge.net/svnroot/gtk-webcore/trunk;module=JavaScriptCore;proto=https \ - file://gcc4-fno-threadsafe-statics-JavaScriptCore.patch;patch=1" + file://gcc4-fno-threadsafe-statics-JavaScriptCore.patch;patch=1 \ + file://no-static-templates.patch;patch=1 \ + " S = "${WORKDIR}/JavaScriptCore" -- cgit v1.2.3 From 778845163c7978a4b912ca8f8be647f12f7a451e Mon Sep 17 00:00:00 2001 From: Ulf Samuelsson Date: Tue, 16 Mar 2010 08:16:31 +0100 Subject: fbv-1.0: Build fbv with support for jpeg and bmp fbv today only supports png files. This patch will enable jpeg and bmp support in fbv Signed-off-by: Ulf Samuelsson --- recipes/fbv/fbv-1.0b/fbv-1.0b.patch | 12 ++++++++++++ recipes/fbv/fbv_1.0b.bb | 25 ++++++++++++++----------- 2 files changed, 26 insertions(+), 11 deletions(-) create mode 100644 recipes/fbv/fbv-1.0b/fbv-1.0b.patch diff --git a/recipes/fbv/fbv-1.0b/fbv-1.0b.patch b/recipes/fbv/fbv-1.0b/fbv-1.0b.patch new file mode 100644 index 0000000000..2ca9d522b9 --- /dev/null +++ b/recipes/fbv/fbv-1.0b/fbv-1.0b.patch @@ -0,0 +1,12 @@ +diff -urN fbv-1.0b-0rig/Makefile fbv-1.0b/Makefile +--- fbv-1.0b-0rig/Makefile 2009-08-20 00:33:58.000000000 +0200 ++++ fbv-1.0b/Makefile 2009-08-20 00:34:16.000000000 +0200 +@@ -12,7 +12,7 @@ + OBJECTS = ${SOURCES:.c=.o} + + OUT = fbv +-#LIBS = -lungif -L/usr/X11R6/lib -ljpeg -lpng ++LIBS = -L/usr/lib -ljpeg -lpng #-lungif + + all: $(OUT) + @echo Build DONE. diff --git a/recipes/fbv/fbv_1.0b.bb b/recipes/fbv/fbv_1.0b.bb index 04c70661d6..6016e0a709 100644 --- a/recipes/fbv/fbv_1.0b.bb +++ b/recipes/fbv/fbv_1.0b.bb @@ -1,25 +1,28 @@ DESCRIPTION = "Frame Buffer Viewer" LICENSE = "GPL" -DEPENDS = "libpng" -PR = "r1" +DEPENDS = "libpng jpeg" +PR = "r2" SRC_URI = "http://s-tech.elsat.net.pl/fbv/fbv-1.0b.tar.gz \ - file://cross_compile.patch;patch=1" + file://cross_compile.patch;patch=1 \ + file://fbv-1.0b.patch;patch=1 \ + " do_configure() { - CC="${CC}" ./configure --without-libungif --without-bmp \ - --without-libjpeg + CC="${CC}" ./configure --without-libungif } do_compile() { - oe_runmake CFLAGS="-O2 -Wall -D_GNU_SOURCE -D__KERNEL_STRICT_NAMES" \ - CC="${CC}" + oe_runmake CC="${CC}" \ + CFLAGS="-O2 -Wall -D_GNU_SOURCE -D__KERNEL_STRICT_NAMES" } + do_install() { install -d ${D}${bindir} - install -m 0755 fbv ${D}${bindir} + install -m 0755 fbv ${D}${bindir} - # man - install -d ${D}${mandir}/man1/ - install -m 0644 fbv.1 ${D}${mandir}/man1/fbv.1 +# man + install -d ${D}${mandir}/man1/ + install -m 0644 fbv.1 ${D}${mandir}/man1/fbv.1 } + -- cgit v1.2.3 From 9d5cc61a1f2ed61433541abfcbbbe5e4cb3bf0d6 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Tue, 16 Mar 2010 15:45:17 +0800 Subject: libvorbis-1.2.3: Address CVE-2009-3379 Fix handling of malformed Vorbis streams that would crash libvorbis. CVE-2008-1420 (improved), CVE-2009-3379. Patches are coming from FreeBSD. --- .../libvorbis/libvorbis-1.2.3/patch-lib_backends.h | 11 ++++++ .../libvorbis/libvorbis-1.2.3/patch-lib_codebook.c | 11 ++++++ .../libvorbis-1.2.3/patch-lib_modes_residue_44.h | 30 ++++++++++++++++ .../libvorbis-1.2.3/patch-lib_modes_residue_44u.h | 30 ++++++++++++++++ recipes/libvorbis/libvorbis-1.2.3/patch-lib_res0.c | 40 ++++++++++++++++++++++ recipes/libvorbis/libvorbis_1.2.3.bb | 7 +++- 6 files changed, 128 insertions(+), 1 deletion(-) create mode 100644 recipes/libvorbis/libvorbis-1.2.3/patch-lib_backends.h create mode 100644 recipes/libvorbis/libvorbis-1.2.3/patch-lib_codebook.c create mode 100644 recipes/libvorbis/libvorbis-1.2.3/patch-lib_modes_residue_44.h create mode 100644 recipes/libvorbis/libvorbis-1.2.3/patch-lib_modes_residue_44u.h create mode 100644 recipes/libvorbis/libvorbis-1.2.3/patch-lib_res0.c diff --git a/recipes/libvorbis/libvorbis-1.2.3/patch-lib_backends.h b/recipes/libvorbis/libvorbis-1.2.3/patch-lib_backends.h new file mode 100644 index 0000000000..44da9d3107 --- /dev/null +++ b/recipes/libvorbis/libvorbis-1.2.3/patch-lib_backends.h @@ -0,0 +1,11 @@ +$FreeBSD: ports/audio/libvorbis/files/patch-lib_backends.h,v 1.1 2009/11/24 21:32:39 naddy Exp $ +--- lib/backends.h.orig 2009-11-24 21:46:47.000000000 +0100 ++++ lib/backends.h 2009-11-24 21:46:47.000000000 +0100 +@@ -109,6 +109,7 @@ typedef struct vorbis_info_residue0{ + /* first stage (lossless partitioning) */ + int grouping; /* group n vectors per partition */ + int partitions; /* possible codebooks for a partition */ ++ int partvals; /* partitions ^ groupbook dim */ + int groupbook; /* huffbook for partitioning */ + int secondstages[64]; /* expanded out to pointers in lookup */ + int booklist[512]; /* list of second stage books */ diff --git a/recipes/libvorbis/libvorbis-1.2.3/patch-lib_codebook.c b/recipes/libvorbis/libvorbis-1.2.3/patch-lib_codebook.c new file mode 100644 index 0000000000..ed76a9edea --- /dev/null +++ b/recipes/libvorbis/libvorbis-1.2.3/patch-lib_codebook.c @@ -0,0 +1,11 @@ +$FreeBSD: ports/audio/libvorbis/files/patch-lib_codebook.c,v 1.3 2009/11/24 21:32:39 naddy Exp $ +--- lib/codebook.c.orig 2009-07-09 11:12:08.000000000 +0200 ++++ lib/codebook.c 2009-11-24 21:46:47.000000000 +0100 +@@ -198,6 +198,7 @@ int vorbis_staticbook_unpack(oggpack_buf + for(i=0;ientries;){ + long num=oggpack_read(opb,_ilog(s->entries-i)); + if(num==-1)goto _eofout; ++ if(length>32)goto _errout; + for(j=0;jentries;j++,i++) + s->lengthlist[i]=length; + length++; diff --git a/recipes/libvorbis/libvorbis-1.2.3/patch-lib_modes_residue_44.h b/recipes/libvorbis/libvorbis-1.2.3/patch-lib_modes_residue_44.h new file mode 100644 index 0000000000..13bc016feb --- /dev/null +++ b/recipes/libvorbis/libvorbis-1.2.3/patch-lib_modes_residue_44.h @@ -0,0 +1,30 @@ +$FreeBSD: ports/audio/libvorbis/files/patch-lib_modes_residue_44.h,v 1.1 2009/11/24 21:32:39 naddy Exp $ +--- lib/modes/residue_44.h.orig 2009-07-09 11:12:08.000000000 +0200 ++++ lib/modes/residue_44.h 2009-11-24 21:46:47.000000000 +0100 +@@ -22,7 +22,7 @@ + /***** residue backends *********************************************/ + + static const vorbis_info_residue0 _residue_44_low={ +- 0,-1, -1, 9,-1, ++ 0,-1, -1, 9,-1,-1, + /* 0 1 2 3 4 5 6 7 */ + {0}, + {-1}, +@@ -31,7 +31,7 @@ static const vorbis_info_residue0 _resid + }; + + static const vorbis_info_residue0 _residue_44_mid={ +- 0,-1, -1, 10,-1, ++ 0,-1, -1, 10,-1,-1, + /* 0 1 2 3 4 5 6 7 8 */ + {0}, + {-1}, +@@ -40,7 +40,7 @@ static const vorbis_info_residue0 _resid + }; + + static const vorbis_info_residue0 _residue_44_high={ +- 0,-1, -1, 10,-1, ++ 0,-1, -1, 10,-1,-1, + /* 0 1 2 3 4 5 6 7 8 */ + {0}, + {-1}, diff --git a/recipes/libvorbis/libvorbis-1.2.3/patch-lib_modes_residue_44u.h b/recipes/libvorbis/libvorbis-1.2.3/patch-lib_modes_residue_44u.h new file mode 100644 index 0000000000..4c0cb74ae1 --- /dev/null +++ b/recipes/libvorbis/libvorbis-1.2.3/patch-lib_modes_residue_44u.h @@ -0,0 +1,30 @@ +$FreeBSD: ports/audio/libvorbis/files/patch-lib_modes_residue_44u.h,v 1.1 2009/11/24 21:32:39 naddy Exp $ +--- lib/modes/residue_44u.h.orig 2009-07-08 07:40:12.000000000 +0200 ++++ lib/modes/residue_44u.h 2009-11-24 21:46:47.000000000 +0100 +@@ -23,7 +23,7 @@ + + + static const vorbis_info_residue0 _residue_44_low_un={ +- 0,-1, -1, 8,-1, ++ 0,-1, -1, 8,-1,-1, + {0}, + {-1}, + { .5, 1.5, 1.5, 2.5, 2.5, 4.5, 28.5}, +@@ -31,7 +31,7 @@ static const vorbis_info_residue0 _resid + }; + + static const vorbis_info_residue0 _residue_44_mid_un={ +- 0,-1, -1, 10,-1, ++ 0,-1, -1, 10,-1,-1, + /* 0 1 2 3 4 5 6 7 8 9 */ + {0}, + {-1}, +@@ -40,7 +40,7 @@ static const vorbis_info_residue0 _resid + }; + + static const vorbis_info_residue0 _residue_44_hi_un={ +- 0,-1, -1, 10,-1, ++ 0,-1, -1, 10,-1,-1, + /* 0 1 2 3 4 5 6 7 8 9 */ + {0}, + {-1}, diff --git a/recipes/libvorbis/libvorbis-1.2.3/patch-lib_res0.c b/recipes/libvorbis/libvorbis-1.2.3/patch-lib_res0.c new file mode 100644 index 0000000000..910311b271 --- /dev/null +++ b/recipes/libvorbis/libvorbis-1.2.3/patch-lib_res0.c @@ -0,0 +1,40 @@ +$FreeBSD: ports/audio/libvorbis/files/patch-lib_res0.c,v 1.3 2009/11/24 21:32:39 naddy Exp $ +--- lib/res0.c.orig 2009-11-24 21:51:43.000000000 +0100 ++++ lib/res0.c 2009-11-24 21:52:01.000000000 +0100 +@@ -238,6 +238,10 @@ vorbis_info_residue *res0_unpack(vorbis_ + + /* verify the phrasebook is not specifying an impossible or + inconsistent partitioning scheme. */ ++ /* modify the phrasebook ranging check from r16327; an early beta ++ encoder had a bug where it used an oversized phrasebook by ++ accident. These files should continue to be playable, but don't ++ allow an exploit */ + { + int entries = ci->book_param[info->groupbook]->entries; + int dim = ci->book_param[info->groupbook]->dim; +@@ -247,6 +251,7 @@ vorbis_info_residue *res0_unpack(vorbis_ + if(partvals > entries) goto errout; + dim--; + } ++ info->partvals = partvals; + } + + return(info); +@@ -667,7 +672,7 @@ static int _01inverse(vorbis_block *vb,v + for(j=0;jphrasebook,&vb->opb); + +- if(temp==-1)goto eopbreak; ++ if(temp==-1 || temp>=info->partvals)goto eopbreak; + partword[j][l]=look->decodemap[temp]; + if(partword[j][l]==NULL)goto errout; + } +@@ -883,7 +888,7 @@ int res2_inverse(vorbis_block *vb,vorbis + if(s==0){ + /* fetch the partition word */ + int temp=vorbis_book_decode(look->phrasebook,&vb->opb); +- if(temp==-1)goto eopbreak; ++ if(temp==-1 || temp>info->partvals)goto eopbreak; + partword[l]=look->decodemap[temp]; + if(partword[l]==NULL)goto errout; + } diff --git a/recipes/libvorbis/libvorbis_1.2.3.bb b/recipes/libvorbis/libvorbis_1.2.3.bb index 1173809d48..87d4d3cab3 100644 --- a/recipes/libvorbis/libvorbis_1.2.3.bb +++ b/recipes/libvorbis/libvorbis_1.2.3.bb @@ -1,10 +1,15 @@ require libvorbis.inc -PR = "${INC_PR}.0" +PR = "${INC_PR}.1" SRC_URI = "http://downloads.xiph.org/releases/vorbis/libvorbis-${PV}.tar.gz \ file://configure_powerpc-no-fixed-cpu.patch;patch=1 \ + file://patch-lib_backends.h;patch=1;pnum=0 \ + file://patch-lib_codebook.c;patch=1;pnum=0 \ + file://patch-lib_modes_residue_44.h;patch=1;pnum=0 \ + file://patch-lib_modes_residue_44u.h;patch=1;pnum=0 \ + file://patch-lib_res0.c;patch=1;pnum=0 \ " # override should be handeld by pkgconfig now -- cgit v1.2.3 From 0f2f85bac90c4aa498ab77d5cfef19aaa581afce Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Tue, 16 Mar 2010 16:26:28 +0800 Subject: ctorrent-3.3.1: Apply patch from the bugtracker... Apparently this should fix CVE-2009-1759. --- recipes/ctorrent/ctorrent_3.3.1.bb | 4 +- recipes/ctorrent/files/CVE-2009-1759.patch | 88 ++++++++++++++++++++++++++++++ 2 files changed, 91 insertions(+), 1 deletion(-) create mode 100644 recipes/ctorrent/files/CVE-2009-1759.patch diff --git a/recipes/ctorrent/ctorrent_3.3.1.bb b/recipes/ctorrent/ctorrent_3.3.1.bb index 91a1fac181..ae189af36f 100644 --- a/recipes/ctorrent/ctorrent_3.3.1.bb +++ b/recipes/ctorrent/ctorrent_3.3.1.bb @@ -2,6 +2,8 @@ require ctorrent.inc DESCRIPTION += "This is the Enhanced version from the dtorrent project" -SRC_URI = "${SOURCEFORGE_MIRROR}/dtorrent/ctorrent-dnh${PV}.tar.gz" +SRC_URI = "${SOURCEFORGE_MIRROR}/dtorrent/ctorrent-dnh${PV}.tar.gz \ + file://CVE-2009-1759.patch;patch=1;pnum=0 " S = "${WORKDIR}/${PN}-dnh${PV}" +PR="r1" diff --git a/recipes/ctorrent/files/CVE-2009-1759.patch b/recipes/ctorrent/files/CVE-2009-1759.patch new file mode 100644 index 0000000000..2f61c92852 --- /dev/null +++ b/recipes/ctorrent/files/CVE-2009-1759.patch @@ -0,0 +1,88 @@ +CVE-2009-1759 + +http://sourceforge.net/tracker/?func=detail&aid=2782875&group_id=202532&atid=981959 + +Index: bencode.h +=================================================================== +--- bencode.h (revision 301) ++++ bencode.h (revision 302) +@@ -25,7 +25,7 @@ + size_t decode_list(const char *b,size_t len,const char *keylist); + size_t decode_rev(const char *b,size_t len,const char *keylist); + size_t decode_query(const char *b,size_t len,const char *keylist,const char **ps,size_t *pi,int64_t *pl,int method); +-size_t decode_list2path(const char *b, size_t n, char *pathname); ++size_t decode_list2path(const char *b, size_t n, char *pathname, size_t maxlen); + size_t bencode_buf(const char *str,size_t len,FILE *fp); + size_t bencode_str(const char *str, FILE *fp); + size_t bencode_int(const uint64_t integer, FILE *fp); +Index: bencode.cpp +=================================================================== +--- bencode.cpp (revision 301) ++++ bencode.cpp (revision 302) +@@ -233,22 +233,28 @@ + return bencode_end_dict_list(fp); + } + +-size_t decode_list2path(const char *b, size_t n, char *pathname) ++size_t decode_list2path(const char *b, size_t n, char *pathname, size_t maxlen) + { + const char *pb = b; + const char *s = (char *) 0; ++ const char *endmax = pathname + maxlen - 1; + size_t r,q; + + if( 'l' != *pb ) return 0; + pb++; + n--; + if( !n ) return 0; +- for(; n;){ ++ while( n && pathname < endmax ){ + if(!(r = buf_str(pb, n, &s, &q)) ) return 0; ++ if( q >= maxlen ) return 0; + memcpy(pathname, s, q); + pathname += q; +- pb += r; n -= r; +- if( 'e' != *pb ){*pathname = PATH_SP, pathname++;} else break; ++ maxlen -= q; ++ pb += r; ++ n -= r; ++ if( 'e' == *pb ) break; ++ if( pathname >= endmax ) return 0; ++ *pathname++ = PATH_SP; + } + *pathname = '\0'; + return (pb - b + 1); +Index: btfiles.cpp +=================================================================== +--- btfiles.cpp (revision 301) ++++ btfiles.cpp (revision 302) +@@ -471,6 +471,8 @@ + BTFILE *pbf_last = (BTFILE*) 0; + BTFILE *pbf = (BTFILE*) 0; + size_t dl; ++ unsigned long nfiles = 0; ++ + if( decode_query(metabuf,metabuf_len,"info|length", + (const char**) 0,(size_t*) 0,(int64_t*) 0,QUERY_LONG) ) + return -1; +@@ -524,12 +526,18 @@ + #ifndef WINDOWS + if( !pbf ) return -1; + #endif ++ nfiles++; + pbf->bf_length = t; + m_total_files_length += t; + r = decode_query(p, dl, "path", (const char **)0, &n, (int64_t*)0, + QUERY_POS); +- if( !r ) return -1; +- if(!decode_list2path(p + r, n, path)) return -1; ++ if( !r || !decode_list2path(p + r, n, path, sizeof(path)) ){ ++ CONSOLE.Warning(1, ++ "error, invalid path in torrent data for file %lu at offset %llu", ++ nfiles, m_total_files_length - t); ++ delete pbf; ++ return -1; ++ } + + int f_conv; + char *tmpfn = new char[strlen(path)*2+5]; -- cgit v1.2.3 From 2ed217468dba20e9bdc290afe6d7f36e2c164108 Mon Sep 17 00:00:00 2001 From: Thomas Zimmermann Date: Tue, 16 Mar 2010 09:53:29 +0100 Subject: attr: fix MSGFMT and MSGMERGE paths * do_configure fails if gettext isn't installed on buildhost * set ac_cv_path_MSGFMT and ac_cv_path_MSGMERGE like it's already done for ac_cv_path_XGETTEXT Signed-off-by: Thomas Zimmermann --- recipes/udev/attr_2.4.44.bb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/recipes/udev/attr_2.4.44.bb b/recipes/udev/attr_2.4.44.bb index a20568d5c1..2c750428c4 100644 --- a/recipes/udev/attr_2.4.44.bb +++ b/recipes/udev/attr_2.4.44.bb @@ -7,7 +7,10 @@ SRC_URI = "http://mirror.its.uidaho.edu/pub/savannah/attr/attr-${PV}.src.tar.gz" inherit gettext autotools lib_package -EXTRA_OECONF = " --enable-gettext=yes ac_cv_path_XGETTEXT=${STAGING_BINDIR_NATIVE}/xgettext" +EXTRA_OECONF = " --enable-gettext=yes \ + ac_cv_path_XGETTEXT=${STAGING_BINDIR_NATIVE}/xgettext \ + ac_cv_path_MSGFMT=${STAGING_BINDIR_NATIVE}/msgfmt \ + ac_cv_path_MSGMERGE=${STAGING_BINDIR_NATIVE}/msgmerge " LDFLAGS_append_libc-uclibc += " -lintl" -- cgit v1.2.3 From da767162b80a9853f9dee6060258e64bf54c38e7 Mon Sep 17 00:00:00 2001 From: Thomas Zimmermann Date: Tue, 16 Mar 2010 09:56:53 +0100 Subject: Revert "qemu: fix build without zlib headers installed on buildhost" This reverts commit e19f00968b9d865088ef3a45a85825c5fc17edc5. --- recipes/qemu/qemu_0.12.3.bb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/recipes/qemu/qemu_0.12.3.bb b/recipes/qemu/qemu_0.12.3.bb index bc5c251641..035b1a5b3a 100644 --- a/recipes/qemu/qemu_0.12.3.bb +++ b/recipes/qemu/qemu_0.12.3.bb @@ -1,5 +1,5 @@ LICENSE = "GPL" -DEPENDS = "zlib-native" +DEPENDS = "zlib" PR = "r0" @@ -32,6 +32,5 @@ EXTRA_OECONF += "--disable-sdl --disable-strip" inherit autotools do_configure() { - export QEMU_CFLAGS="-I${STAGING_INCDIR_NATIVE} ${QEMU_CFLAGS}" ${S}/configure --prefix=${prefix} ${EXTRA_OECONF} } -- cgit v1.2.3 From 5ee2b6e865852d37c14707c424027834b9701d81 Mon Sep 17 00:00:00 2001 From: Thomas Zimmermann Date: Tue, 16 Mar 2010 10:07:58 +0100 Subject: acl: fix msgfmt and msgmerge paths like already done for xgettext Signed-off-by: Thomas Zimmermann --- recipes/udev/acl_2.2.49.bb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/recipes/udev/acl_2.2.49.bb b/recipes/udev/acl_2.2.49.bb index b2b1272530..30875b7a47 100644 --- a/recipes/udev/acl_2.2.49.bb +++ b/recipes/udev/acl_2.2.49.bb @@ -9,7 +9,10 @@ SRC_URI = "http://mirror.its.uidaho.edu/pub/savannah/acl/acl-${PV}.src.tar.gz" inherit autotools lib_package -EXTRA_OECONF = " --enable-gettext=yes ac_cv_path_XGETTEXT=${STAGING_BINDIR_NATIVE}/xgettext" +EXTRA_OECONF = " --enable-gettext=yes \ + ac_cv_path_XGETTEXT=${STAGING_BINDIR_NATIVE}/xgettext \ + ac_cv_path_MSGFMT=${STAGING_BINDIR_NATIVE}/msgfmt \ + ac_cv_path_MSGMERGE=${STAGING_BINDIR_NATIVE}/msgmerge " do_configure_append() { # gettext hack -- cgit v1.2.3 From 356d0ec42b023761e1e9e1a6bd5f3ab83b87033f Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 15 Mar 2010 12:34:27 +0000 Subject: ffmpeg: Convert recipe to use INC_PR. Signed-off-by: Paul Menzel Acked-by: Martin Jansa --- recipes/ffmpeg/ffmpeg.inc | 2 ++ recipes/ffmpeg/ffmpeg_0.4.9-pre1.bb | 2 +- recipes/ffmpeg/ffmpeg_0.5.bb | 2 +- recipes/ffmpeg/ffmpeg_git.bb | 2 +- recipes/ffmpeg/ffmpeg_svn.bb | 2 +- 5 files changed, 6 insertions(+), 4 deletions(-) diff --git a/recipes/ffmpeg/ffmpeg.inc b/recipes/ffmpeg/ffmpeg.inc index cdb3f7ee16..3ec06bc792 100644 --- a/recipes/ffmpeg/ffmpeg.inc +++ b/recipes/ffmpeg/ffmpeg.inc @@ -10,6 +10,8 @@ ARM_INSTRUCTION_SET = "arm" DEPENDS = "zlib libogg libvorbis libtheora faac faad2 ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'lame liba52', d)}" RSUGGESTS = "mplayer" +INC_PR = "r9" + inherit autotools pkgconfig LEAD_SONAME = "libavcodec.so" diff --git a/recipes/ffmpeg/ffmpeg_0.4.9-pre1.bb b/recipes/ffmpeg/ffmpeg_0.4.9-pre1.bb index 6e347b16f1..54991f5c0f 100644 --- a/recipes/ffmpeg/ffmpeg_0.4.9-pre1.bb +++ b/recipes/ffmpeg/ffmpeg_0.4.9-pre1.bb @@ -1,6 +1,6 @@ require ffmpeg.inc -PR = "r9" +PR = "${INC_PR}.0" SRC_URI = "${SOURCEFORGE_MIRROR}/ffmpeg/ffmpeg-${PV}.tar.gz \ file://configure.patch;patch=0 \ diff --git a/recipes/ffmpeg/ffmpeg_0.5.bb b/recipes/ffmpeg/ffmpeg_0.5.bb index b80fa8893b..e39e41e160 100644 --- a/recipes/ffmpeg/ffmpeg_0.5.bb +++ b/recipes/ffmpeg/ffmpeg_0.5.bb @@ -3,7 +3,7 @@ require ffmpeg.inc DEPENDS += "schroedinger libgsm" PE = "1" -PR = "r5" +PR = "${INC_PR}.0" DEFAULT_PREFERENCE = "1" diff --git a/recipes/ffmpeg/ffmpeg_git.bb b/recipes/ffmpeg/ffmpeg_git.bb index 1cfc3e2f89..fc9bdf2dee 100644 --- a/recipes/ffmpeg/ffmpeg_git.bb +++ b/recipes/ffmpeg/ffmpeg_git.bb @@ -4,7 +4,7 @@ DEPENDS += "schroedinger libgsm" PE = "1" PV = "0.5.0+${PR}+gitr${SRCREV}" -PR = "r0" +PR = "${INC_PR}.0" DEFAULT_PREFERENCE = "-1" diff --git a/recipes/ffmpeg/ffmpeg_svn.bb b/recipes/ffmpeg/ffmpeg_svn.bb index ec3082179a..620783c07d 100644 --- a/recipes/ffmpeg/ffmpeg_svn.bb +++ b/recipes/ffmpeg/ffmpeg_svn.bb @@ -6,7 +6,7 @@ SRCREV = "22521" PE = "1" PV = "0.5.0+${PR}+svnr${SRCPV}" -PR = "r0" +PR = "${INC_PR}.0" DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_angstrom = "1" -- cgit v1.2.3 From 0315e512f4b5d71dc0dbeb6fee9ada5b7b7b2bea Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 15 Mar 2010 12:35:00 +0000 Subject: ffmpeg: Stage `attributes.h`. Signed-off-by: Paul Menzel Acked-by: Martin Jansa --- recipes/ffmpeg/ffmpeg.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipes/ffmpeg/ffmpeg.inc b/recipes/ffmpeg/ffmpeg.inc index 3ec06bc792..cd330f81f1 100644 --- a/recipes/ffmpeg/ffmpeg.inc +++ b/recipes/ffmpeg/ffmpeg.inc @@ -10,7 +10,7 @@ ARM_INSTRUCTION_SET = "arm" DEPENDS = "zlib libogg libvorbis libtheora faac faad2 ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'lame liba52', d)}" RSUGGESTS = "mplayer" -INC_PR = "r9" +INC_PR = "r10" inherit autotools pkgconfig @@ -53,8 +53,8 @@ do_stage() { install -m 0644 ${S}/libavformat/$h ${STAGING_INCDIR}/libavformat/$h done - for h in adler32.h avstring.h avutil.h base64.h bswap.h \ - common.h crc.h fifo.h integer.h intfloat_readwrite.h \ + for h in adler32.h attributes.h avstring.h avutil.h base64.h \ + bswap.h common.h crc.h fifo.h integer.h intfloat_readwrite.h \ log.h lzo.h mathematics.h md5.h mem.h pixfmt.h random*.h \ rational.h sha1.h do -- cgit v1.2.3 From 9d39425ecaa8911345fca461294b62f09a911547 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Mon, 15 Mar 2010 10:48:56 +0100 Subject: navit: bump SRCREV Signed-off-by: Martin Jansa --- conf/distro/include/sane-srcrevs.inc | 2 -- recipes/navit/navit-icons/configure.in | 1 + recipes/navit/navit-icons_svn.bb | 4 +++- recipes/navit/navit_svn.bb | 3 ++- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 31d6c30a07..5ebcab3a01 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -156,8 +156,6 @@ SRCREV_pn-mplayer-maemo ?= "342" SRCREV_pn-msn-pecan ?= "e795b33b29d792f19fcf699275eb966dc68be257" SRCREV_pn-multitap-pad ?= "373" SRCREV_pn-mux ?= "72460e890dbb15edbf7dc193116be0dcf9794a8b" -SRCREV_pn-navit ?= "2934" -SRCREV_pn-navit-icons ?= "2927" SRCREV_pn-neod ?= "4617" SRCREV_pn-neomis ?= "6" SRCREV_pn-net-snmp ?= "17367" diff --git a/recipes/navit/navit-icons/configure.in b/recipes/navit/navit-icons/configure.in index 25259007e8..4ffc7b0a21 100644 --- a/recipes/navit/navit-icons/configure.in +++ b/recipes/navit/navit-icons/configure.in @@ -60,6 +60,7 @@ AM_CONDITIONAL(USE_SVG2PNG_SCALES_FLAG, test "x${SVG2PNG_SCALES_FLAG}" != "xyes" AM_CONDITIONAL(USE_SVG2PNG_SCALES_NAV, test "x${SVG2PNG_SCALES_NAV}" != "xyes" -a "x${SVG2PNG_SCALES_NAV}" != "x") AM_CONDITIONAL(USE_SVG2PNG, test "x${enable_svg2png}" = "xyes") AM_CONDITIONAL(USE_SVG, test "x${enable_svg}" = "xyes") +AM_CONDITIONAL(SUPPORT_WIN32, [test "x$win32" = "xyes"]) AC_CONFIG_FILES([ Makefile diff --git a/recipes/navit/navit-icons_svn.bb b/recipes/navit/navit-icons_svn.bb index f171e4d030..ad36b0ead5 100644 --- a/recipes/navit/navit-icons_svn.bb +++ b/recipes/navit/navit-icons_svn.bb @@ -18,7 +18,9 @@ inherit autotools FILES_${PN} = " /usr/share/navit/xpm/" -#use different URL than navit_svn doest, to prevent upgrade/downgrade cycle in downloads dir +SRCREV = "2948" + +#use different URL than navit_svn does, to prevent upgrade/downgrade cycle in downloads dir SRC_URI = "svn://anonymous@navit.svn.sourceforge.net/svnroot/navit/trunk/navit/navit;module=xpm;proto=https \ file://configure.in" diff --git a/recipes/navit/navit_svn.bb b/recipes/navit/navit_svn.bb index a8ff27b25b..a6e3fa3f68 100644 --- a/recipes/navit/navit_svn.bb +++ b/recipes/navit/navit_svn.bb @@ -13,6 +13,7 @@ DEPENDS_shr += " librsvg-native" RDEPENDS = " navit-icons" EXTRA_OECONF += " --enable-svg2png-scaling-flag=32 --disable-speech-speech-dispatcher --enable-cache-size=20971520" +SRCREV = "3012" SRC_URI = "svn://anonymous@navit.svn.sourceforge.net/svnroot/navit/trunk;module=navit;proto=https" EXTRA_AUTORECONF = " -I m4" @@ -32,7 +33,7 @@ SRC_URI += "file://navit.xml \ file://osd.xml \ file://speech.xml \ file://plugins.xml \ - " + " #Second launcher for shr SRC_URI_append_shr = "file://navitD.desktop \ -- cgit v1.2.3 From d492d3c95a63c2074e8309839c9b6bedc2287750 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 16 Mar 2010 09:23:32 +0100 Subject: elementary: add .debug from tests to -dbg package before including it in -tests Signed-off-by: Martin Jansa --- recipes/efl1/elementary_svn.bb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/recipes/efl1/elementary_svn.bb b/recipes/efl1/elementary_svn.bb index e3a1e91ee5..fc4b451466 100644 --- a/recipes/efl1/elementary_svn.bb +++ b/recipes/efl1/elementary_svn.bb @@ -2,7 +2,7 @@ DESCRIPTION = "EFL based widget set for mobile devices" LICENSE = "LGPL" DEPENDS = "eet-native efreet evas ecore edje eet edbus" PV = "0.0.0+svnr${SRCPV}" -PR = "r7" +PR = "r8" inherit efl @@ -36,6 +36,10 @@ FILES_${PN}-configs = "\ ${datadir}/elementary/config \ " +FILES_${PN}-dbg += "\ + ${libdir}/elementary/modules/test_entry/*/.debug \ +" + FILES_${PN}-tests = "\ ${bindir}/elementary* \ ${datadir}/elementary/images \ -- cgit v1.2.3 From 9656d6728d6e316f22be06f42019891e28353305 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Tue, 16 Mar 2010 17:28:58 +0800 Subject: gnupg-1.4.10: Upgrade to the latest gnupg release * Drop all prior patches... debian has none applied so it should work on mips and such as well. --- conf/checksums.ini | 4 - recipes/gnupg/gnupg-1.4.2.2/15_free_caps.patch | 93 ---------------------- .../gnupg/gnupg-1.4.2.2/16_min_privileges.patch | 68 ---------------- .../gnupg-1.4.2.2/22_zero_length_mpi_fix.patch | 37 --------- .../gnupg/gnupg-1.4.2.2/30_nm_always_check.patch | 21 ----- .../gnupg-1.4.2.2/dont_use_mips_h_constraint.patch | 48 ----------- recipes/gnupg/gnupg-1.4.2.2/long-long-thumb.patch | 11 --- recipes/gnupg/gnupg.inc | 2 +- recipes/gnupg/gnupg_1.4.10.bb | 12 +++ recipes/gnupg/gnupg_1.4.2.2.bb | 17 ---- 10 files changed, 13 insertions(+), 300 deletions(-) delete mode 100644 recipes/gnupg/gnupg-1.4.2.2/15_free_caps.patch delete mode 100644 recipes/gnupg/gnupg-1.4.2.2/16_min_privileges.patch delete mode 100644 recipes/gnupg/gnupg-1.4.2.2/22_zero_length_mpi_fix.patch delete mode 100644 recipes/gnupg/gnupg-1.4.2.2/30_nm_always_check.patch delete mode 100644 recipes/gnupg/gnupg-1.4.2.2/dont_use_mips_h_constraint.patch delete mode 100644 recipes/gnupg/gnupg-1.4.2.2/long-long-thumb.patch create mode 100644 recipes/gnupg/gnupg_1.4.10.bb delete mode 100644 recipes/gnupg/gnupg_1.4.2.2.bb diff --git a/conf/checksums.ini b/conf/checksums.ini index 0a63d0c752..d3dc6cd56a 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -9946,10 +9946,6 @@ sha256=a3c7fdbbafa6c9cfee7f16c067b043c3041cd0240292aa92b653a2221ae04503 md5=6781d0df02e603c556758d90e96e37f6 sha256=0f934eddd2204f938f0359d8c39ef590ab4fec60d6922853e6c8c23e3069d7f4 -[ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-1.4.2.2.tar.bz2] -md5=c34736eb7cb687f9e5b6d4df48aaf7c8 -sha256=174e7f78c670d76984c4c4bd6077a0b9fec7b4be700b9f3e40c6889b78110c57 - [ftp://ftp.gnuplot.info/pub/gnuplot/gnuplot-4.0.0.tar.gz] md5=66258443d9f93cc4f46b147dac33e63a sha256=a77ad7cb08b2551dacbaa0bb02e561fddb6b9f4a0f3d45eb1c38be219955ea48 diff --git a/recipes/gnupg/gnupg-1.4.2.2/15_free_caps.patch b/recipes/gnupg/gnupg-1.4.2.2/15_free_caps.patch deleted file mode 100644 index 20949a7d49..0000000000 --- a/recipes/gnupg/gnupg-1.4.2.2/15_free_caps.patch +++ /dev/null @@ -1,93 +0,0 @@ ---- /home/weasel/tmp/debian-gpg/gnupg-1.2.5/g10/status.c 2004-07-21 09:59:45.000000000 +0200 -+++ gnupg-1.2.5/g10/status.c 2004-08-01 20:07:42.071690680 +0200 -@@ -346,6 +346,9 @@ - { - char buf[100]; - struct shmid_ds shmds; -+#ifdef USE_CAPABILITIES -+ cap_t caps; -+#endif - - #ifndef IPC_RMID_DEFERRED_RELEASE - atexit( remove_shmid ); -@@ -371,7 +374,9 @@ - (unsigned)shm_size/1024, shm_area, shm_id ); - if( lock_mem ) { - #ifdef USE_CAPABILITIES -- cap_set_proc( cap_from_text("cap_ipc_lock+ep") ); -+ caps = cap_from_text("cap_ipc_lock=ep"); -+ cap_set_proc( caps ); -+ cap_free( caps ); - #endif - /* (need the cast for Solaris with Sun's workshop compilers) */ - if ( mlock ( (char*)shm_area, shm_size) ) -@@ -380,7 +385,9 @@ - else - shm_is_locked = 1; - #ifdef USE_CAPABILITIES -- cap_set_proc( cap_from_text("cap_ipc_lock+p") ); -+ caps = cap_from_text("cap_ipc_lock=p"); -+ cap_set_proc( caps ); -+ cap_free( caps ); - #endif - } - -@@ -407,7 +414,9 @@ - - if( lock_mem ) { - #ifdef USE_CAPABILITIES -- cap_set_proc( cap_from_text("cap_ipc_lock+ep") ); -+ caps = cap_from_text("cap_ipc_lock=ep"); -+ cap_set_proc( caps ); -+ cap_free( caps ); - #endif - #ifdef IPC_HAVE_SHM_LOCK - if ( shmctl (shm_id, SHM_LOCK, 0) ) -@@ -419,7 +428,9 @@ - log_info("Locking shared memory %d failed: No way to do it\n", shm_id ); - #endif - #ifdef USE_CAPABILITIES -- cap_set_proc( cap_from_text("cap_ipc_lock+p") ); -+ caps = cap_from_text("cap_ipc_lock=p"); -+ cap_set_proc( caps ); -+ cap_free( caps ); - #endif - } - ---- /home/weasel/tmp/debian-gpg/gnupg-1.2.5/util/secmem.c 2004-02-24 17:06:58.000000000 +0100 -+++ gnupg-1.2.5/util/secmem.c 2004-08-01 20:08:10.873412378 +0200 -@@ -97,12 +97,18 @@ - { - #if defined(USE_CAPABILITIES) && defined(HAVE_MLOCK) - int err; -+ cap_t caps; -+ -+ caps = cap_from_text("cap_ipc_lock=ep"); -+ cap_set_proc( caps ); -+ cap_free( caps ); - -- cap_set_proc( cap_from_text("cap_ipc_lock+ep") ); - err = mlock( p, n ); - if( err && errno ) - err = errno; -- cap_set_proc( cap_from_text("cap_ipc_lock+p") ); -+ caps = cap_from_text("cap_ipc_lock=p"); -+ cap_set_proc( caps ); -+ cap_free( caps ); - - if( err ) { - if( errno != EPERM -@@ -301,8 +307,12 @@ - if( !n ) { - #ifndef __riscos__ - #ifdef USE_CAPABILITIES -+ cap_t caps; -+ - /* drop all capabilities */ -- cap_set_proc( cap_from_text("all-eip") ); -+ caps = cap_from_text("all-eip"); -+ cap_set_proc( caps ); -+ cap_free( caps ); - - #elif !defined(HAVE_DOSISH_SYSTEM) - uid_t uid; diff --git a/recipes/gnupg/gnupg-1.4.2.2/16_min_privileges.patch b/recipes/gnupg/gnupg-1.4.2.2/16_min_privileges.patch deleted file mode 100644 index b29233b33b..0000000000 --- a/recipes/gnupg/gnupg-1.4.2.2/16_min_privileges.patch +++ /dev/null @@ -1,68 +0,0 @@ ---- gnupg-1.4.0/g10/g10.c 2004-12-16 09:47:36.000000000 +0000 -+++ /tmp/dpep.O5S02c/gnupg-1.4.0/g10/g10.c 2005-02-03 23:31:40.645873299 +0000 -@@ -69,6 +69,11 @@ - #endif - - -+#ifdef USE_CAPABILITIES -+#include -+#include -+#endif -+ - enum cmd_and_opt_values - { - aNull = 0, -@@ -1618,6 +1623,10 @@ - #ifdef USE_SHM_COPROCESSING - ulong requested_shm_size=0; - #endif -+#ifdef USE_CAPABILITIES -+ uid_t curr_uid; -+ cap_t caps; -+#endif - - #ifdef __riscos__ - opt.lock_once = 1; -@@ -1629,6 +1638,33 @@ - * when adding any stuff between here and the call to - * secmem_init() somewhere after the option parsing - */ -+ -+ /* if we use capabilities and run as root, we can immediately setuid back -+ * to the normal user and only keep CAP_IPC_LOCK until the shared memory is -+ * set up. -+ */ -+#ifdef USE_CAPABILITIES -+ curr_uid = getuid(); -+ if( curr_uid && !geteuid() ) { /* we are setuid root */ -+ if( prctl( PR_SET_KEEPCAPS, 1, 0, 0, 0 ) ) { -+ perror( "main(): could not keep capabilities" ); -+ return -100; -+ } -+ -+ if( setuid( curr_uid ) ) { -+ perror( "main(): could not set user id" ); -+ return -100; -+ } -+ -+ caps = cap_from_text( "cap_ipc_lock=p" ); -+ if( cap_set_proc( caps ) ) { -+ perror( "main(): could not install capabilities" ); -+ return -100; -+ } -+ cap_free( caps ); -+ } -+#endif -+ - log_set_name("gpg"); - secure_random_alloc(); /* put random number into secure memory */ - may_coredump = disable_core_dumps(); -@@ -1747,7 +1783,7 @@ - } - #endif - /* initialize the secure memory. */ -- got_secmem=secmem_init( 32768 ); -+ got_secmem=secmem_init( 32768 ); /* this will drop all remaining privileges */ - maybe_setuid = 0; - /* Okay, we are now working under our real uid */ - diff --git a/recipes/gnupg/gnupg-1.4.2.2/22_zero_length_mpi_fix.patch b/recipes/gnupg/gnupg-1.4.2.2/22_zero_length_mpi_fix.patch deleted file mode 100644 index 8f13db4d23..0000000000 --- a/recipes/gnupg/gnupg-1.4.2.2/22_zero_length_mpi_fix.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff -urNad gnupg-1.4.2~/mpi/mpicoder.c gnupg-1.4.2/mpi/mpicoder.c ---- gnupg-1.4.2~/mpi/mpicoder.c 2005-05-31 06:30:05.000000000 +0000 -+++ gnupg-1.4.2/mpi/mpicoder.c 2005-09-29 00:52:19.000000000 +0000 -@@ -80,16 +80,20 @@ - mpi_limb_t a; - MPI val = MPI_NULL; - -+ if (nread == nmax) -+ goto overflow; - if( (c = iobuf_get(inp)) == -1 ) - goto leave; -- if (++nread >= nmax) -- goto overflow; -+ nread++; - nbits = c << 8; -+ -+ if (nread == nmax) -+ goto overflow; - if( (c = iobuf_get(inp)) == -1 ) - goto leave; -- if (++nread >= nmax) -- goto overflow; -+ nread++; - nbits |= c; -+ - if( nbits > MAX_EXTERN_MPI_BITS ) { - log_error("mpi too large for this implementation (%u bits)\n", nbits); - goto leave; -@@ -112,7 +116,7 @@ - for( ; j > 0; j-- ) { - a = 0; - for(; i < BYTES_PER_MPI_LIMB; i++ ) { -- if (nread >= nmax) { -+ if (nread == nmax) { - #ifdef M_DEBUG - mpi_debug_free (val); - #else diff --git a/recipes/gnupg/gnupg-1.4.2.2/30_nm_always_check.patch b/recipes/gnupg/gnupg-1.4.2.2/30_nm_always_check.patch deleted file mode 100644 index 914f1475b7..0000000000 --- a/recipes/gnupg/gnupg-1.4.2.2/30_nm_always_check.patch +++ /dev/null @@ -1,21 +0,0 @@ -Originally the test for _'s on symbols was not done when cross-compiling and -it was assumed that the _'s were appended. The test does in fact work since -it simply compiles a file and then run's nm on it. So patch this to enable. -Without this x86 targets fail during linking since the assembler code has -the _'s appended when it shouldn't. - ---- gnupg-1.4.2.2/acinclude.m4 2006/09/11 22:11:23 1.1 -+++ gnupg-1.4.2.2/acinclude.m4 2006/09/11 22:17:25 -@@ -673,11 +673,7 @@ - ac_cv_sys_symbol_underscore=yes - ;; - *) -- if test "$cross_compiling" = yes; then -- ac_cv_sys_symbol_underscore=yes -- else -- tmp_do_check="yes" -- fi -+ tmp_do_check="yes" - ;; - esac - diff --git a/recipes/gnupg/gnupg-1.4.2.2/dont_use_mips_h_constraint.patch b/recipes/gnupg/gnupg-1.4.2.2/dont_use_mips_h_constraint.patch deleted file mode 100644 index e0212b8e4b..0000000000 --- a/recipes/gnupg/gnupg-1.4.2.2/dont_use_mips_h_constraint.patch +++ /dev/null @@ -1,48 +0,0 @@ -Avoid using h contraint on mips for gcc >= 4.4 as it has been removed -on gcc 4.4 onwards - -see - -http://gcc.gnu.org/gcc-4.4/changes.html - --Khem - -Index: gnupg-1.4.2.2/mpi/longlong.h -=================================================================== ---- gnupg-1.4.2.2.orig/mpi/longlong.h 2009-12-18 16:44:21.334633084 -0800 -+++ gnupg-1.4.2.2/mpi/longlong.h 2009-12-18 16:48:29.202212344 -0800 -@@ -711,7 +711,15 @@ extern USItype __udiv_qrnnd (); - ************** MIPS ***************** - ***************************************/ - #if defined (__mips__) && W_TYPE_SIZE == 32 --#if __GNUC__ > 2 || __GNUC_MINOR__ >= 7 -+#if (__GNUC__ >= 5) || (__GNUC__ >= 4 && __GNUC_MINOR__ >= 4) -+#define umul_ppmm(w1, w0, u, v) \ -+ do { \ -+ UDItype _r; \ -+ _r = (UDItype) u * v; \ -+ (w1) = _r >> 32; \ -+ (w0) = (USItype) _r; \ -+ } while (0) -+#elif __GNUC__ > 2 || __GNUC_MINOR__ >= 7 - #define umul_ppmm(w1, w0, u, v) \ - __asm__ ("multu %2,%3" \ - : "=l" ((USItype)(w0)), \ -@@ -736,7 +744,16 @@ extern USItype __udiv_qrnnd (); - ************** MIPS/64 ************** - ***************************************/ - #if (defined (__mips) && __mips >= 3) && W_TYPE_SIZE == 64 --#if __GNUC__ > 2 || __GNUC_MINOR__ >= 7 -+#if (__GNUC__ >= 5) || (__GNUC__ >= 4 && __GNUC_MINOR__ >= 4) -+typedef unsigned int UTItype __attribute__ ((mode (TI))); -+#define umul_ppmm(w1, w0, u, v) \ -+ do { \ -+ UTItype _r; \ -+ _r = (UTItype) u * v; \ -+ (w1) = _r >> 64; \ -+ (w0) = (UDItype) _r; \ -+ } while (0) -+#elif __GNUC__ > 2 || __GNUC_MINOR__ >= 7 - #define umul_ppmm(w1, w0, u, v) \ - __asm__ ("dmultu %2,%3" \ - : "=l" ((UDItype)(w0)), \ diff --git a/recipes/gnupg/gnupg-1.4.2.2/long-long-thumb.patch b/recipes/gnupg/gnupg-1.4.2.2/long-long-thumb.patch deleted file mode 100644 index 36e9992772..0000000000 --- a/recipes/gnupg/gnupg-1.4.2.2/long-long-thumb.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- gnupg/mpi/longlong.h~ 2006-02-14 10:09:55.000000000 +0000 -+++ gnupg/mpi/longlong.h 2008-10-27 13:11:09.000000000 +0000 -@@ -181,7 +181,7 @@ - /*************************************** - ************** ARM ****************** - ***************************************/ --#if defined (__arm__) && W_TYPE_SIZE == 32 -+#if defined (__arm__) && W_TYPE_SIZE == 32 && !defined(__thumb__) - #define add_ssaaaa(sh, sl, ah, al, bh, bl) \ - __asm__ ("adds %1, %4, %5\n" \ - "adc %0, %2, %3" \ diff --git a/recipes/gnupg/gnupg.inc b/recipes/gnupg/gnupg.inc index f41dbdc73c..7115d46614 100644 --- a/recipes/gnupg/gnupg.inc +++ b/recipes/gnupg/gnupg.inc @@ -9,7 +9,7 @@ inherit autotools gettext MIRRORS_prepend () { ftp://ftp.gnupg.org/gcrypt http://mirrors.rootmode.com/ftp.gnupg.org } -SRC_URI = "ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-${PV}.tar.bz2" +SRC_URI = "ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-${PV}.tar.bz2;name=src" S = "${WORKDIR}/gnupg-${PV}" # --with-egd-socket=NAME use NAME for the EGD socket diff --git a/recipes/gnupg/gnupg_1.4.10.bb b/recipes/gnupg/gnupg_1.4.10.bb new file mode 100644 index 0000000000..a5fae96342 --- /dev/null +++ b/recipes/gnupg/gnupg_1.4.10.bb @@ -0,0 +1,12 @@ +require gnupg.inc + +DEPENDS += "readline" +EXTRA_OECONF += "--with-readline=${STAGING_LIBDIR}/.. ac_cv_sys_symbol_underscore=yes" +# --without-readline do not support fancy command line editing + +SRC_URI[src.md5sum] = "dcf7ed712997888d616e029637bfc303" +SRC_URI[src.sha256sum] = "a2907f4432d67894e425e48ae85785dd60ecb01658c9682bcd96f5e91043bb38" + +S = "${WORKDIR}/gnupg-${PV}" + +PR = "r1" diff --git a/recipes/gnupg/gnupg_1.4.2.2.bb b/recipes/gnupg/gnupg_1.4.2.2.bb deleted file mode 100644 index 7f21a312ae..0000000000 --- a/recipes/gnupg/gnupg_1.4.2.2.bb +++ /dev/null @@ -1,17 +0,0 @@ -require gnupg.inc - -DEPENDS += "readline" -EXTRA_OECONF += "--with-readline=${STAGING_LIBDIR}/.." -# --without-readline do not support fancy command line editing - -SRC_URI += "file://15_free_caps.patch;patch=1 \ - file://16_min_privileges.patch;patch=1 \ - file://22_zero_length_mpi_fix.patch;patch=1 \ - file://30_nm_always_check.patch;patch=1 \ - file://long-long-thumb.patch;patch=1 \ - file://dont_use_mips_h_constraint.patch;patch=1 \ - " - -S = "${WORKDIR}/gnupg-${PV}" - -PR = "r4" -- cgit v1.2.3 From 83394d70df1fdadddb7aeebcc9b225bfbd2a462f Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Tue, 16 Mar 2010 17:34:48 +0800 Subject: gnupg-1.4.10: Readd the ARM Thumb patch as debian has no thumb support --- recipes/gnupg/gnupg-1.4.10/long-long-thumb.patch | 12 ++++++++++++ recipes/gnupg/gnupg_1.4.10.bb | 3 ++- 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 recipes/gnupg/gnupg-1.4.10/long-long-thumb.patch diff --git a/recipes/gnupg/gnupg-1.4.10/long-long-thumb.patch b/recipes/gnupg/gnupg-1.4.10/long-long-thumb.patch new file mode 100644 index 0000000000..dd4ec73eca --- /dev/null +++ b/recipes/gnupg/gnupg-1.4.10/long-long-thumb.patch @@ -0,0 +1,12 @@ +--- gnupg/mpi/longlong.h~ 2006-02-14 10:09:55.000000000 +0000 ++++ gnupg/mpi/longlong.h 2008-10-27 13:11:09.000000000 +0000 +@@ -181,7 +181,7 @@ + /*************************************** + ************** ARM ****************** + ***************************************/ +-#if defined (__arm__) && W_TYPE_SIZE == 32 ++#if defined (__arm__) && W_TYPE_SIZE == 32 && !defined(__thumb__) + #define add_ssaaaa(sh, sl, ah, al, bh, bl) \ + __asm__ ("adds %1, %4, %5\n" \ + "adc %0, %2, %3" \ + diff --git a/recipes/gnupg/gnupg_1.4.10.bb b/recipes/gnupg/gnupg_1.4.10.bb index a5fae96342..38af0873fa 100644 --- a/recipes/gnupg/gnupg_1.4.10.bb +++ b/recipes/gnupg/gnupg_1.4.10.bb @@ -4,9 +4,10 @@ DEPENDS += "readline" EXTRA_OECONF += "--with-readline=${STAGING_LIBDIR}/.. ac_cv_sys_symbol_underscore=yes" # --without-readline do not support fancy command line editing +SRC_URI += "file://long-long-thumb.patch;patch=1" SRC_URI[src.md5sum] = "dcf7ed712997888d616e029637bfc303" SRC_URI[src.sha256sum] = "a2907f4432d67894e425e48ae85785dd60ecb01658c9682bcd96f5e91043bb38" S = "${WORKDIR}/gnupg-${PV}" -PR = "r1" +PR = "r2" -- cgit v1.2.3 From c574f947e3b88e412b77f45a3b969c6251f5dd56 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Tue, 16 Mar 2010 10:37:24 +0100 Subject: check-kernel-updates.sh: really fetch list Signed-off-by: Marcin Juszkiewicz --- contrib/hrw/check-kernel-updates.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/hrw/check-kernel-updates.sh b/contrib/hrw/check-kernel-updates.sh index 389265a057..7758baf69d 100644 --- a/contrib/hrw/check-kernel-updates.sh +++ b/contrib/hrw/check-kernel-updates.sh @@ -1,6 +1,6 @@ echo "fetching list of changelogs" -#echo "ls ChangeLog-*" |lftp ftp://www.kernel.org/pub/linux/kernel/v2.6/> changes.txt +echo "ls ChangeLog-*" |lftp ftp://www.kernel.org/pub/linux/kernel/v2.6/> changes.txt for release in `seq 16 32`; do -- cgit v1.2.3 From c6d4c85a36f6ef139a2ed2d2e2af721c8e010638 Mon Sep 17 00:00:00 2001 From: Nicolas Ferre Date: Mon, 15 Mar 2010 21:38:18 +0000 Subject: alsa-state: add alsa-state for at91 processors + at91sam9260ek + at91sam9261ek + at91sam9263ek (updated) + at91sam9g10ek + at91sam9g20ek + at91sam9g20ek_2mmc + at91sam9g45ek (updated) + at91sam9g45ekes + at91sam9m10ekes + at91sam9m10g45ek + at91sam9rlek Signed-off-by: Ulf Samuelsson Signed-off-by: Marcin Juszkiewicz --- recipes/alsa/alsa-state.bb | 2 +- recipes/alsa/alsa-state/at91sam9260ek/asound.conf | 2 + recipes/alsa/alsa-state/at91sam9260ek/asound.state | 108 ++++ recipes/alsa/alsa-state/at91sam9261ek/asound.conf | 2 + recipes/alsa/alsa-state/at91sam9261ek/asound.state | 108 ++++ recipes/alsa/alsa-state/at91sam9263ek/asound.state | 283 +++++++++++ recipes/alsa/alsa-state/at91sam9g10ek/asound.conf | 2 + recipes/alsa/alsa-state/at91sam9g10ek/asound.state | 108 ++++ recipes/alsa/alsa-state/at91sam9g20ek/asound.conf | 2 + recipes/alsa/alsa-state/at91sam9g20ek/asound.state | 133 +++++ .../alsa/alsa-state/at91sam9g20ek_2mmc/asound.conf | 2 + .../alsa-state/at91sam9g20ek_2mmc/asound.state | 133 +++++ recipes/alsa/alsa-state/at91sam9g45ek/asound.conf | 2 +- recipes/alsa/alsa-state/at91sam9g45ek/asound.state | 283 +++++++++++ .../alsa/alsa-state/at91sam9g45ekes/asound.conf | 2 + .../alsa/alsa-state/at91sam9g45ekes/asound.state | 566 +++++++++++++++++++++ .../alsa/alsa-state/at91sam9m10ekes/asound.conf | 2 + .../alsa/alsa-state/at91sam9m10ekes/asound.state | 566 +++++++++++++++++++++ .../alsa/alsa-state/at91sam9m10g45ek/asound.conf | 2 + .../alsa/alsa-state/at91sam9m10g45ek/asound.state | 566 +++++++++++++++++++++ recipes/alsa/alsa-state/at91sam9rlek/asound.conf | 2 + recipes/alsa/alsa-state/at91sam9rlek/asound.state | 566 +++++++++++++++++++++ 22 files changed, 3440 insertions(+), 2 deletions(-) create mode 100644 recipes/alsa/alsa-state/at91sam9260ek/asound.conf create mode 100644 recipes/alsa/alsa-state/at91sam9260ek/asound.state create mode 100644 recipes/alsa/alsa-state/at91sam9261ek/asound.conf create mode 100644 recipes/alsa/alsa-state/at91sam9261ek/asound.state create mode 100644 recipes/alsa/alsa-state/at91sam9g10ek/asound.conf create mode 100644 recipes/alsa/alsa-state/at91sam9g10ek/asound.state create mode 100644 recipes/alsa/alsa-state/at91sam9g20ek/asound.conf create mode 100644 recipes/alsa/alsa-state/at91sam9g20ek/asound.state create mode 100644 recipes/alsa/alsa-state/at91sam9g20ek_2mmc/asound.conf create mode 100644 recipes/alsa/alsa-state/at91sam9g20ek_2mmc/asound.state create mode 100644 recipes/alsa/alsa-state/at91sam9g45ekes/asound.conf create mode 100644 recipes/alsa/alsa-state/at91sam9g45ekes/asound.state create mode 100644 recipes/alsa/alsa-state/at91sam9m10ekes/asound.conf create mode 100644 recipes/alsa/alsa-state/at91sam9m10ekes/asound.state create mode 100644 recipes/alsa/alsa-state/at91sam9m10g45ek/asound.conf create mode 100644 recipes/alsa/alsa-state/at91sam9m10g45ek/asound.state create mode 100644 recipes/alsa/alsa-state/at91sam9rlek/asound.conf create mode 100644 recipes/alsa/alsa-state/at91sam9rlek/asound.state diff --git a/recipes/alsa/alsa-state.bb b/recipes/alsa/alsa-state.bb index d77db707df..b6b494e353 100644 --- a/recipes/alsa/alsa-state.bb +++ b/recipes/alsa/alsa-state.bb @@ -7,7 +7,7 @@ DESCRIPTION = "Alsa Scenario Files" LICENSE = "MIT" PV = "0.2.0" -PR = "r11" +PR = "r12" SRC_URI = "\ file://asound.conf \ diff --git a/recipes/alsa/alsa-state/at91sam9260ek/asound.conf b/recipes/alsa/alsa-state/at91sam9260ek/asound.conf new file mode 100644 index 0000000000..87bb5ec050 --- /dev/null +++ b/recipes/alsa/alsa-state/at91sam9260ek/asound.conf @@ -0,0 +1,2 @@ +pcm.!default { type hw card 0 } +ctl.!default { type hw card 0 } diff --git a/recipes/alsa/alsa-state/at91sam9260ek/asound.state b/recipes/alsa/alsa-state/at91sam9260ek/asound.state new file mode 100644 index 0000000000..3d86e4cd5a --- /dev/null +++ b/recipes/alsa/alsa-state/at91sam9260ek/asound.state @@ -0,0 +1,108 @@ +state.at73c213_0 { + control.1 { + comment.access 'read write' + comment.type INTEGER + comment.count 2 + comment.range '0 - 31' + iface MIXER + name 'Master Playback Volume' + value.0 22 + value.1 22 + } + control.2 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 2 + iface MIXER + name 'Master Playback Switch' + value.0 true + value.1 true + } + control.3 { + comment.access 'read write' + comment.type INTEGER + comment.count 2 + comment.range '0 - 31' + iface MIXER + name 'PCM Playback Volume' + value.0 20 + value.1 20 + } + control.4 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 2 + iface MIXER + name 'PCM Playback Switch' + value.0 true + value.1 true + } + control.5 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Mono PA Playback Switch' + value false + } + control.6 { + comment.access 'read write' + comment.type INTEGER + comment.count 1 + comment.range '0 - 14' + iface MIXER + name 'PA Playback Volume' + value 0 + } + control.7 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'PA High Gain Playback Switch' + value false + } + control.8 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'PA Playback Switch' + value false + } + control.9 { + comment.access 'read write' + comment.type INTEGER + comment.count 1 + comment.range '14 - 31' + iface MIXER + name 'Aux Capture Volume' + value 14 + } + control.10 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Aux Capture Switch' + value false + } + control.11 { + comment.access 'read write' + comment.type INTEGER + comment.count 2 + comment.range '14 - 31' + iface MIXER + name 'Line Capture Volume' + value.0 14 + value.1 14 + } + control.12 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Line Capture Switch' + value false + } +} diff --git a/recipes/alsa/alsa-state/at91sam9261ek/asound.conf b/recipes/alsa/alsa-state/at91sam9261ek/asound.conf new file mode 100644 index 0000000000..87bb5ec050 --- /dev/null +++ b/recipes/alsa/alsa-state/at91sam9261ek/asound.conf @@ -0,0 +1,2 @@ +pcm.!default { type hw card 0 } +ctl.!default { type hw card 0 } diff --git a/recipes/alsa/alsa-state/at91sam9261ek/asound.state b/recipes/alsa/alsa-state/at91sam9261ek/asound.state new file mode 100644 index 0000000000..40a6457c63 --- /dev/null +++ b/recipes/alsa/alsa-state/at91sam9261ek/asound.state @@ -0,0 +1,108 @@ +state.at73c213_1 { + control.1 { + comment.access 'read write' + comment.type INTEGER + comment.count 2 + comment.range '0 - 31' + iface MIXER + name 'Master Playback Volume' + value.0 23 + value.1 23 + } + control.2 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 2 + iface MIXER + name 'Master Playback Switch' + value.0 true + value.1 true + } + control.3 { + comment.access 'read write' + comment.type INTEGER + comment.count 2 + comment.range '0 - 31' + iface MIXER + name 'PCM Playback Volume' + value.0 16 + value.1 16 + } + control.4 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 2 + iface MIXER + name 'PCM Playback Switch' + value.0 true + value.1 true + } + control.5 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Mono PA Playback Switch' + value false + } + control.6 { + comment.access 'read write' + comment.type INTEGER + comment.count 1 + comment.range '0 - 14' + iface MIXER + name 'PA Playback Volume' + value 0 + } + control.7 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'PA High Gain Playback Switch' + value false + } + control.8 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'PA Playback Switch' + value false + } + control.9 { + comment.access 'read write' + comment.type INTEGER + comment.count 1 + comment.range '14 - 31' + iface MIXER + name 'Aux Capture Volume' + value 14 + } + control.10 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Aux Capture Switch' + value false + } + control.11 { + comment.access 'read write' + comment.type INTEGER + comment.count 2 + comment.range '14 - 31' + iface MIXER + name 'Line Capture Volume' + value.0 14 + value.1 14 + } + control.12 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Line Capture Switch' + value false + } +} diff --git a/recipes/alsa/alsa-state/at91sam9263ek/asound.state b/recipes/alsa/alsa-state/at91sam9263ek/asound.state index ee646a1341..e8d3218b4f 100644 --- a/recipes/alsa/alsa-state/at91sam9263ek/asound.state +++ b/recipes/alsa/alsa-state/at91sam9263ek/asound.state @@ -281,3 +281,286 @@ state.AC97 { value true } } +state.AC97C { + control.1 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 2 + iface MIXER + name 'Master Playback Switch' + value.0 true + value.1 true + } + control.2 { + comment.access 'read write' + comment.type INTEGER + comment.count 2 + comment.range '0 - 31' + comment.dbmin -4650 + comment.dbmax 0 + iface MIXER + name 'Master Playback Volume' + value.0 22 + value.1 22 + } + control.3 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 2 + iface MIXER + name 'Headphone Playback Switch' + value.0 true + value.1 true + } + control.4 { + comment.access 'read write' + comment.type INTEGER + comment.count 2 + comment.range '0 - 31' + comment.dbmin -4650 + comment.dbmax 0 + iface MIXER + name 'Headphone Playback Volume' + value.0 22 + value.1 22 + } + control.5 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Master Mono Playback Switch' + value false + } + control.6 { + comment.access 'read write' + comment.type INTEGER + comment.count 1 + comment.range '0 - 31' + comment.dbmin -4650 + comment.dbmax 0 + iface MIXER + name 'Master Mono Playback Volume' + value 0 + } + control.7 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Phone Playback Switch' + value false + } + control.8 { + comment.access 'read write' + comment.type INTEGER + comment.count 1 + comment.range '0 - 31' + comment.dbmin -3450 + comment.dbmax 1200 + iface MIXER + name 'Phone Playback Volume' + value 0 + } + control.9 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Mic Playback Switch' + value false + } + control.10 { + comment.access 'read write' + comment.type INTEGER + comment.count 1 + comment.range '0 - 31' + comment.dbmin -3450 + comment.dbmax 1200 + iface MIXER + name 'Mic Playback Volume' + value 0 + } + control.11 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Mic Boost (+20dB)' + value false + } + control.12 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 2 + iface MIXER + name 'Line Playback Switch' + value.0 false + value.1 false + } + control.13 { + comment.access 'read write' + comment.type INTEGER + comment.count 2 + comment.range '0 - 31' + comment.dbmin -3450 + comment.dbmax 1200 + iface MIXER + name 'Line Playback Volume' + value.0 0 + value.1 0 + } + control.14 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 2 + iface MIXER + name 'CD Playback Switch' + value.0 false + value.1 false + } + control.15 { + comment.access 'read write' + comment.type INTEGER + comment.count 2 + comment.range '0 - 31' + comment.dbmin -3450 + comment.dbmax 1200 + iface MIXER + name 'CD Playback Volume' + value.0 0 + value.1 0 + } + control.16 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 2 + iface MIXER + name 'Aux Playback Switch' + value.0 false + value.1 false + } + control.17 { + comment.access 'read write' + comment.type INTEGER + comment.count 2 + comment.range '0 - 31' + comment.dbmin -3450 + comment.dbmax 1200 + iface MIXER + name 'Aux Playback Volume' + value.0 0 + value.1 0 + } + control.18 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 2 + iface MIXER + name 'PCM Playback Switch' + value.0 true + value.1 true + } + control.19 { + comment.access 'read write' + comment.type INTEGER + comment.count 2 + comment.range '0 - 31' + comment.dbmin -3450 + comment.dbmax 1200 + iface MIXER + name 'PCM Playback Volume' + value.0 22 + value.1 22 + } + control.20 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 2 + comment.item.0 Mic + comment.item.1 CD + comment.item.2 Video + comment.item.3 Aux + comment.item.4 Line + comment.item.5 Mix + comment.item.6 'Mix Mono' + comment.item.7 Phone + iface MIXER + name 'Capture Source' + value.0 Mic + value.1 Mic + } + control.21 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 2 + iface MIXER + name 'Capture Switch' + value.0 true + value.1 true + } + control.22 { + comment.access 'read write' + comment.type INTEGER + comment.count 2 + comment.range '0 - 15' + comment.dbmin 0 + comment.dbmax 2250 + iface MIXER + name 'Capture Volume' + value.0 11 + value.1 11 + } + control.23 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 1 + comment.item.0 Mix + comment.item.1 Mic + iface MIXER + name 'Mono Output Select' + value Mix + } + control.24 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 1 + comment.item.0 Mic1 + comment.item.1 Mic2 + iface MIXER + name 'Mic Select' + value Mic1 + } + control.25 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Stereo Mic' + value false + } + control.26 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Headphone Jack Sense' + value false + } + control.27 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Line Jack Sense' + value false + } + control.28 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'External Amplifier' + value true + } +} diff --git a/recipes/alsa/alsa-state/at91sam9g10ek/asound.conf b/recipes/alsa/alsa-state/at91sam9g10ek/asound.conf new file mode 100644 index 0000000000..87bb5ec050 --- /dev/null +++ b/recipes/alsa/alsa-state/at91sam9g10ek/asound.conf @@ -0,0 +1,2 @@ +pcm.!default { type hw card 0 } +ctl.!default { type hw card 0 } diff --git a/recipes/alsa/alsa-state/at91sam9g10ek/asound.state b/recipes/alsa/alsa-state/at91sam9g10ek/asound.state new file mode 100644 index 0000000000..40a6457c63 --- /dev/null +++ b/recipes/alsa/alsa-state/at91sam9g10ek/asound.state @@ -0,0 +1,108 @@ +state.at73c213_1 { + control.1 { + comment.access 'read write' + comment.type INTEGER + comment.count 2 + comment.range '0 - 31' + iface MIXER + name 'Master Playback Volume' + value.0 23 + value.1 23 + } + control.2 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 2 + iface MIXER + name 'Master Playback Switch' + value.0 true + value.1 true + } + control.3 { + comment.access 'read write' + comment.type INTEGER + comment.count 2 + comment.range '0 - 31' + iface MIXER + name 'PCM Playback Volume' + value.0 16 + value.1 16 + } + control.4 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 2 + iface MIXER + name 'PCM Playback Switch' + value.0 true + value.1 true + } + control.5 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Mono PA Playback Switch' + value false + } + control.6 { + comment.access 'read write' + comment.type INTEGER + comment.count 1 + comment.range '0 - 14' + iface MIXER + name 'PA Playback Volume' + value 0 + } + control.7 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'PA High Gain Playback Switch' + value false + } + control.8 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'PA Playback Switch' + value false + } + control.9 { + comment.access 'read write' + comment.type INTEGER + comment.count 1 + comment.range '14 - 31' + iface MIXER + name 'Aux Capture Volume' + value 14 + } + control.10 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Aux Capture Switch' + value false + } + control.11 { + comment.access 'read write' + comment.type INTEGER + comment.count 2 + comment.range '14 - 31' + iface MIXER + name 'Line Capture Volume' + value.0 14 + value.1 14 + } + control.12 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Line Capture Switch' + value false + } +} diff --git a/recipes/alsa/alsa-state/at91sam9g20ek/asound.conf b/recipes/alsa/alsa-state/at91sam9g20ek/asound.conf new file mode 100644 index 0000000000..87bb5ec050 --- /dev/null +++ b/recipes/alsa/alsa-state/at91sam9g20ek/asound.conf @@ -0,0 +1,2 @@ +pcm.!default { type hw card 0 } +ctl.!default { type hw card 0 } diff --git a/recipes/alsa/alsa-state/at91sam9g20ek/asound.state b/recipes/alsa/alsa-state/at91sam9g20ek/asound.state new file mode 100644 index 0000000000..da98b4eb40 --- /dev/null +++ b/recipes/alsa/alsa-state/at91sam9g20ek/asound.state @@ -0,0 +1,133 @@ +state.AT91SAMG20EK { + control.1 { + comment.access 'read write' + comment.type INTEGER + comment.count 2 + comment.range '0 - 127' + comment.dbmin -12100 + comment.dbmax 600 + iface MIXER + name 'Master Playback Volume' + value.0 115 + value.1 115 + } + control.2 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 2 + iface MIXER + name 'Master Playback ZC Switch' + value.0 false + value.1 false + } + control.3 { + comment.access 'read write' + comment.type INTEGER + comment.count 2 + comment.range '0 - 31' + comment.dbmin -3450 + comment.dbmax 1200 + iface MIXER + name 'Capture Volume' + value.0 23 + value.1 23 + } + control.4 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 2 + iface MIXER + name 'Line Capture Switch' + value.0 false + value.1 false + } + control.5 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Mic Boost (+20dB)' + value false + } + control.6 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Mic Capture Switch' + value false + } + control.7 { + comment.access 'read write' + comment.type INTEGER + comment.count 1 + comment.range '0 - 3' + comment.dbmin -1500 + comment.dbmax -600 + iface MIXER + name 'Sidetone Playback Volume' + value 0 + } + control.8 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'ADC High Pass Filter Switch' + value true + } + control.9 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Store DC Offset Switch' + value false + } + control.10 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 1 + comment.item.0 None + comment.item.1 '32Khz' + comment.item.2 '44.1Khz' + comment.item.3 '48Khz' + iface MIXER + name 'Playback De-emphasis' + value None + } + control.11 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 1 + comment.item.0 'Line In' + comment.item.1 Mic + iface MIXER + name 'Input Mux' + value 'Line In' + } + control.12 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Output Mixer Line Bypass Switch' + value false + } + control.13 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Output Mixer Mic Sidetone Switch' + value false + } + control.14 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Output Mixer HiFi Playback Switch' + value true + } +} diff --git a/recipes/alsa/alsa-state/at91sam9g20ek_2mmc/asound.conf b/recipes/alsa/alsa-state/at91sam9g20ek_2mmc/asound.conf new file mode 100644 index 0000000000..87bb5ec050 --- /dev/null +++ b/recipes/alsa/alsa-state/at91sam9g20ek_2mmc/asound.conf @@ -0,0 +1,2 @@ +pcm.!default { type hw card 0 } +ctl.!default { type hw card 0 } diff --git a/recipes/alsa/alsa-state/at91sam9g20ek_2mmc/asound.state b/recipes/alsa/alsa-state/at91sam9g20ek_2mmc/asound.state new file mode 100644 index 0000000000..da98b4eb40 --- /dev/null +++ b/recipes/alsa/alsa-state/at91sam9g20ek_2mmc/asound.state @@ -0,0 +1,133 @@ +state.AT91SAMG20EK { + control.1 { + comment.access 'read write' + comment.type INTEGER + comment.count 2 + comment.range '0 - 127' + comment.dbmin -12100 + comment.dbmax 600 + iface MIXER + name 'Master Playback Volume' + value.0 115 + value.1 115 + } + control.2 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 2 + iface MIXER + name 'Master Playback ZC Switch' + value.0 false + value.1 false + } + control.3 { + comment.access 'read write' + comment.type INTEGER + comment.count 2 + comment.range '0 - 31' + comment.dbmin -3450 + comment.dbmax 1200 + iface MIXER + name 'Capture Volume' + value.0 23 + value.1 23 + } + control.4 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 2 + iface MIXER + name 'Line Capture Switch' + value.0 false + value.1 false + } + control.5 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Mic Boost (+20dB)' + value false + } + control.6 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Mic Capture Switch' + value false + } + control.7 { + comment.access 'read write' + comment.type INTEGER + comment.count 1 + comment.range '0 - 3' + comment.dbmin -1500 + comment.dbmax -600 + iface MIXER + name 'Sidetone Playback Volume' + value 0 + } + control.8 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'ADC High Pass Filter Switch' + value true + } + control.9 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Store DC Offset Switch' + value false + } + control.10 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 1 + comment.item.0 None + comment.item.1 '32Khz' + comment.item.2 '44.1Khz' + comment.item.3 '48Khz' + iface MIXER + name 'Playback De-emphasis' + value None + } + control.11 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 1 + comment.item.0 'Line In' + comment.item.1 Mic + iface MIXER + name 'Input Mux' + value 'Line In' + } + control.12 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Output Mixer Line Bypass Switch' + value false + } + control.13 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Output Mixer Mic Sidetone Switch' + value false + } + control.14 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Output Mixer HiFi Playback Switch' + value true + } +} diff --git a/recipes/alsa/alsa-state/at91sam9g45ek/asound.conf b/recipes/alsa/alsa-state/at91sam9g45ek/asound.conf index fa98593515..87bb5ec050 100644 --- a/recipes/alsa/alsa-state/at91sam9g45ek/asound.conf +++ b/recipes/alsa/alsa-state/at91sam9g45ek/asound.conf @@ -1,2 +1,2 @@ -pcm.!default { type hw card 0 } +pcm.!default { type hw card 0 } ctl.!default { type hw card 0 } diff --git a/recipes/alsa/alsa-state/at91sam9g45ek/asound.state b/recipes/alsa/alsa-state/at91sam9g45ek/asound.state index ee646a1341..e8d3218b4f 100644 --- a/recipes/alsa/alsa-state/at91sam9g45ek/asound.state +++ b/recipes/alsa/alsa-state/at91sam9g45ek/asound.state @@ -281,3 +281,286 @@ state.AC97 { value true } } +state.AC97C { + control.1 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 2 + iface MIXER + name 'Master Playback Switch' + value.0 true + value.1 true + } + control.2 { + comment.access 'read write' + comment.type INTEGER + comment.count 2 + comment.range '0 - 31' + comment.dbmin -4650 + comment.dbmax 0 + iface MIXER + name 'Master Playback Volume' + value.0 22 + value.1 22 + } + control.3 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 2 + iface MIXER + name 'Headphone Playback Switch' + value.0 true + value.1 true + } + control.4 { + comment.access 'read write' + comment.type INTEGER + comment.count 2 + comment.range '0 - 31' + comment.dbmin -4650 + comment.dbmax 0 + iface MIXER + name 'Headphone Playback Volume' + value.0 22 + value.1 22 + } + control.5 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Master Mono Playback Switch' + value false + } + control.6 { + comment.access 'read write' + comment.type INTEGER + comment.count 1 + comment.range '0 - 31' + comment.dbmin -4650 + comment.dbmax 0 + iface MIXER + name 'Master Mono Playback Volume' + value 0 + } + control.7 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Phone Playback Switch' + value false + } + control.8 { + comment.access 'read write' + comment.type INTEGER + comment.count 1 + comment.range '0 - 31' + comment.dbmin -3450 + comment.dbmax 1200 + iface MIXER + name 'Phone Playback Volume' + value 0 + } + control.9 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Mic Playback Switch' + value false + } + control.10 { + comment.access 'read write' + comment.type INTEGER + comment.count 1 + comment.range '0 - 31' + comment.dbmin -3450 + comment.dbmax 1200 + iface MIXER + name 'Mic Playback Volume' + value 0 + } + control.11 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Mic Boost (+20dB)' + value false + } + control.12 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 2 + iface MIXER + name 'Line Playback Switch' + value.0 false + value.1 false + } + control.13 { + comment.access 'read write' + comment.type INTEGER + comment.count 2 + comment.range '0 - 31' + comment.dbmin -3450 + comment.dbmax 1200 + iface MIXER + name 'Line Playback Volume' + value.0 0 + value.1 0 + } + control.14 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 2 + iface MIXER + name 'CD Playback Switch' + value.0 false + value.1 false + } + control.15 { + comment.access 'read write' + comment.type INTEGER + comment.count 2 + comment.range '0 - 31' + comment.dbmin -3450 + comment.dbmax 1200 + iface MIXER + name 'CD Playback Volume' + value.0 0 + value.1 0 + } + control.16 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 2 + iface MIXER + name 'Aux Playback Switch' + value.0 false + value.1 false + } + control.17 { + comment.access 'read write' + comment.type INTEGER + comment.count 2 + comment.range '0 - 31' + comment.dbmin -3450 + comment.dbmax 1200 + iface MIXER + name 'Aux Playback Volume' + value.0 0 + value.1 0 + } + control.18 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 2 + iface MIXER + name 'PCM Playback Switch' + value.0 true + value.1 true + } + control.19 { + comment.access 'read write' + comment.type INTEGER + comment.count 2 + comment.range '0 - 31' + comment.dbmin -3450 + comment.dbmax 1200 + iface MIXER + name 'PCM Playback Volume' + value.0 22 + value.1 22 + } + control.20 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 2 + comment.item.0 Mic + comment.item.1 CD + comment.item.2 Video + comment.item.3 Aux + comment.item.4 Line + comment.item.5 Mix + comment.item.6 'Mix Mono' + comment.item.7 Phone + iface MIXER + name 'Capture Source' + value.0 Mic + value.1 Mic + } + control.21 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 2 + iface MIXER + name 'Capture Switch' + value.0 true + value.1 true + } + control.22 { + comment.access 'read write' + comment.type INTEGER + comment.count 2 + comment.range '0 - 15' + comment.dbmin 0 + comment.dbmax 2250 + iface MIXER + name 'Capture Volume' + value.0 11 + value.1 11 + } + control.23 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 1 + comment.item.0 Mix + comment.item.1 Mic + iface MIXER + name 'Mono Output Select' + value Mix + } + control.24 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 1 + comment.item.0 Mic1 + comment.item.1 Mic2 + iface MIXER + name 'Mic Select' + value Mic1 + } + control.25 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Stereo Mic' + value false + } + control.26 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Headphone Jack Sense' + value false + } + control.27 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Line Jack Sense' + value false + } + control.28 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'External Amplifier' + value true + } +} diff --git a/recipes/alsa/alsa-state/at91sam9g45ekes/asound.conf b/recipes/alsa/alsa-state/at91sam9g45ekes/asound.conf new file mode 100644 index 0000000000..87bb5ec050 --- /dev/null +++ b/recipes/alsa/alsa-state/at91sam9g45ekes/asound.conf @@ -0,0 +1,2 @@ +pcm.!default { type hw card 0 } +ctl.!default { type hw card 0 } diff --git a/recipes/alsa/alsa-state/at91sam9g45ekes/asound.state b/recipes/alsa/alsa-state/at91sam9g45ekes/asound.state new file mode 100644 index 0000000000..e8d3218b4f --- /dev/null +++ b/recipes/alsa/alsa-state/at91sam9g45ekes/asound.state @@ -0,0 +1,566 @@ +state.AC97 { + control.1 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 2 + iface MIXER + name 'Master Playback Switch' + value.0 true + value.1 true + } + control.2 { + comment.access 'read write' + comment.type INTEGER + comment.count 2 + comment.range '0 - 31' + comment.dbmin -4650 + comment.dbmax 0 + iface MIXER + name 'Master Playback Volume' + value.0 22 + value.1 22 + } + control.3 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 2 + iface MIXER + name 'Headphone Playback Switch' + value.0 true + value.1 true + } + control.4 { + comment.access 'read write' + comment.type INTEGER + comment.count 2 + comment.range '0 - 31' + comment.dbmin -4650 + comment.dbmax 0 + iface MIXER + name 'Headphone Playback Volume' + value.0 22 + value.1 22 + } + control.5 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Master Mono Playback Switch' + value false + } + control.6 { + comment.access 'read write' + comment.type INTEGER + comment.count 1 + comment.range '0 - 31' + comment.dbmin -4650 + comment.dbmax 0 + iface MIXER + name 'Master Mono Playback Volume' + value 0 + } + control.7 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Phone Playback Switch' + value false + } + control.8 { + comment.access 'read write' + comment.type INTEGER + comment.count 1 + comment.range '0 - 31' + comment.dbmin -3450 + comment.dbmax 1200 + iface MIXER + name 'Phone Playback Volume' + value 0 + } + control.9 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Mic Playback Switch' + value false + } + control.10 { + comment.access 'read write' + comment.type INTEGER + comment.count 1 + comment.range '0 - 31' + comment.dbmin -3450 + comment.dbmax 1200 + iface MIXER + name 'Mic Playback Volume' + value 0 + } + control.11 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Mic Boost (+20dB)' + value false + } + control.12 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 2 + iface MIXER + name 'Line Playback Switch' + value.0 false + value.1 false + } + control.13 { + comment.access 'read write' + comment.type INTEGER + comment.count 2 + comment.range '0 - 31' + comment.dbmin -3450 + comment.dbmax 1200 + iface MIXER + name 'Line Playback Volume' + value.0 0 + value.1 0 + } + control.14 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 2 + iface MIXER + name 'CD Playback Switch' + value.0 false + value.1 false + } + control.15 { + comment.access 'read write' + comment.type INTEGER + comment.count 2 + comment.range '0 - 31' + comment.dbmin -3450 + comment.dbmax 1200 + iface MIXER + name 'CD Playback Volume' + value.0 0 + value.1 0 + } + control.16 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 2 + iface MIXER + name 'Aux Playback Switch' + value.0 false + value.1 false + } + control.17 { + comment.access 'read write' + comment.type INTEGER + comment.count 2 + comment.range '0 - 31' + comment.dbmin -3450 + comment.dbmax 1200 + iface MIXER + name 'Aux Playback Volume' + value.0 0 + value.1 0 + } + control.18 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 2 + iface MIXER + name 'PCM Playback Switch' + value.0 true + value.1 true + } + control.19 { + comment.access 'read write' + comment.type INTEGER + comment.count 2 + comment.range '0 - 31' + comment.dbmin -3450 + comment.dbmax 1200 + iface MIXER + name 'PCM Playback Volume' + value.0 22 + value.1 22 + } + control.20 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 2 + comment.item.0 Mic + comment.item.1 CD + comment.item.2 Video + comment.item.3 Aux + comment.item.4 Line + comment.item.5 Mix + comment.item.6 'Mix Mono' + comment.item.7 Phone + iface MIXER + name 'Capture Source' + value.0 Mic + value.1 Mic + } + control.21 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 2 + iface MIXER + name 'Capture Switch' + value.0 true + value.1 true + } + control.22 { + comment.access 'read write' + comment.type INTEGER + comment.count 2 + comment.range '0 - 15' + comment.dbmin 0 + comment.dbmax 2250 + iface MIXER + name 'Capture Volume' + value.0 11 + value.1 11 + } + control.23 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 1 + comment.item.0 Mix + comment.item.1 Mic + iface MIXER + name 'Mono Output Select' + value Mix + } + control.24 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 1 + comment.item.0 Mic1 + comment.item.1 Mic2 + iface MIXER + name 'Mic Select' + value Mic1 + } + control.25 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Stereo Mic' + value false + } + control.26 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Headphone Jack Sense' + value false + } + control.27 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Line Jack Sense' + value false + } + control.28 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'External Amplifier' + value true + } +} +state.AC97C { + control.1 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 2 + iface MIXER + name 'Master Playback Switch' + value.0 true + value.1 true + } + control.2 { + comment.access 'read write' + comment.type INTEGER + comment.count 2 + comment.range '0 - 31' + comment.dbmin -4650 + comment.dbmax 0 + iface MIXER + name 'Master Playback Volume' + value.0 22 + value.1 22 + } + control.3 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 2 + iface MIXER + name 'Headphone Playback Switch' + value.0 true + value.1 true + } + control.4 { + comment.access 'read write' + comment.type INTEGER + comment.count 2 + comment.range '0 - 31' + comment.dbmin -4650 + comment.dbmax 0 + iface MIXER + name 'Headphone Playback Volume' + value.0 22 + value.1 22 + } + control.5 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Master Mono Playback Switch' + value false + } + control.6 { + comment.access 'read write' + comment.type INTEGER + comment.count 1 + comment.range '0 - 31' + comment.dbmin -4650 + comment.dbmax 0 + iface MIXER + name 'Master Mono Playback Volume' + value 0 + } + control.7 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Phone Playback Switch' + value false + } + control.8 { + comment.access 'read write' + comment.type INTEGER + comment.count 1 + comment.range '0 - 31' + comment.dbmin -3450 + comment.dbmax 1200 + iface MIXER + name 'Phone Playback Volume' + value 0 + } + control.9 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Mic Playback Switch' + value false + } + control.10 { + comment.access 'read write' + comment.type INTEGER + comment.count 1 + comment.range '0 - 31' + comment.dbmin -3450 + comment.dbmax 1200 + iface MIXER + name 'Mic Playback Volume' + value 0 + } + control.11 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Mic Boost (+20dB)' + value false + } + control.12 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 2 + iface MIXER + name 'Line Playback Switch' + value.0 false + value.1 false + } + control.13 { + comment.access 'read write' + comment.type INTEGER + comment.count 2 + comment.range '0 - 31' + comment.dbmin -3450 + comment.dbmax 1200 + iface MIXER + name 'Line Playback Volume' + value.0 0 + value.1 0 + } + control.14 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 2 + iface MIXER + name 'CD Playback Switch' + value.0 false + value.1 false + } + control.15 { + comment.access 'read write' + comment.type INTEGER + comment.count 2 + comment.range '0 - 31' + comment.dbmin -3450 + comment.dbmax 1200 + iface MIXER + name 'CD Playback Volume' + value.0 0 + value.1 0 + } + control.16 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 2 + iface MIXER + name 'Aux Playback Switch' + value.0 false + value.1 false + } + control.17 { + comment.access 'read write' + comment.type INTEGER + comment.count 2 + comment.range '0 - 31' + comment.dbmin -3450 + comment.dbmax 1200 + iface MIXER + name 'Aux Playback Volume' + value.0 0 + value.1 0 + } + control.18 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 2 + iface MIXER + name 'PCM Playback Switch' + value.0 true + value.1 true + } + control.19 { + comment.access 'read write' + comment.type INTEGER + comment.count 2 + comment.range '0 - 31' + comment.dbmin -3450 + comment.dbmax 1200 + iface MIXER + name 'PCM Playback Volume' + value.0 22 + value.1 22 + } + control.20 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 2 + comment.item.0 Mic + comment.item.1 CD + comment.item.2 Video + comment.item.3 Aux + comment.item.4 Line + comment.item.5 Mix + comment.item.6 'Mix Mono' + comment.item.7 Phone + iface MIXER + name 'Capture Source' + value.0 Mic + value.1 Mic + } + control.21 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 2 + iface MIXER + name 'Capture Switch' + value.0 true + value.1 true + } + control.22 { + comment.access 'read write' + comment.type INTEGER + comment.count 2 + comment.range '0 - 15' + comment.dbmin 0 + comment.dbmax 2250 + iface MIXER + name 'Capture Volume' + value.0 11 + value.1 11 + } + control.23 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 1 + comment.item.0 Mix + comment.item.1 Mic + iface MIXER + name 'Mono Output Select' + value Mix + } + control.24 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 1 + comment.item.0 Mic1 + comment.item.1 Mic2 + iface MIXER + name 'Mic Select' + value Mic1 + } + control.25 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Stereo Mic' + value false + } + control.26 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Headphone Jack Sense' + value false + } + control.27 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Line Jack Sense' + value false + } + control.28 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'External Amplifier' + value true + } +} diff --git a/recipes/alsa/alsa-state/at91sam9m10ekes/asound.conf b/recipes/alsa/alsa-state/at91sam9m10ekes/asound.conf new file mode 100644 index 0000000000..87bb5ec050 --- /dev/null +++ b/recipes/alsa/alsa-state/at91sam9m10ekes/asound.conf @@ -0,0 +1,2 @@ +pcm.!default { type hw card 0 } +ctl.!default { type hw card 0 } diff --git a/recipes/alsa/alsa-state/at91sam9m10ekes/asound.state b/recipes/alsa/alsa-state/at91sam9m10ekes/asound.state new file mode 100644 index 0000000000..e8d3218b4f --- /dev/null +++ b/recipes/alsa/alsa-state/at91sam9m10ekes/asound.state @@ -0,0 +1,566 @@ +state.AC97 { + control.1 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 2 + iface MIXER + name 'Master Playback Switch' + value.0 true + value.1 true + } + control.2 { + comment.access 'read write' + comment.type INTEGER + comment.count 2 + comment.range '0 - 31' + comment.dbmin -4650 + comment.dbmax 0 + iface MIXER + name 'Master Playback Volume' + value.0 22 + value.1 22 + } + control.3 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 2 + iface MIXER + name 'Headphone Playback Switch' + value.0 true + value.1 true + } + control.4 { + comment.access 'read write' + comment.type INTEGER + comment.count 2 + comment.range '0 - 31' + comment.dbmin -4650 + comment.dbmax 0 + iface MIXER + name 'Headphone Playback Volume' + value.0 22 + value.1 22 + } + control.5 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Master Mono Playback Switch' + value false + } + control.6 { + comment.access 'read write' + comment.type INTEGER + comment.count 1 + comment.range '0 - 31' + comment.dbmin -4650 + comment.dbmax 0 + iface MIXER + name 'Master Mono Playback Volume' + value 0 + } + control.7 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Phone Playback Switch' + value false + } + control.8 { + comment.access 'read write' + comment.type INTEGER + comment.count 1 + comment.range '0 - 31' + comment.dbmin -3450 + comment.dbmax 1200 + iface MIXER + name 'Phone Playback Volume' + value 0 + } + control.9 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Mic Playback Switch' + value false + } + control.10 { + comment.access 'read write' + comment.type INTEGER + comment.count 1 + comment.range '0 - 31' + comment.dbmin -3450 + comment.dbmax 1200 + iface MIXER + name 'Mic Playback Volume' + value 0 + } + control.11 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Mic Boost (+20dB)' + value false + } + control.12 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 2 + iface MIXER + name 'Line Playback Switch' + value.0 false + value.1 false + } + control.13 { + comment.access 'read write' + comment.type INTEGER + comment.count 2 + comment.range '0 - 31' + comment.dbmin -3450 + comment.dbmax 1200 + iface MIXER + name 'Line Playback Volume' + value.0 0 + value.1 0 + } + control.14 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 2 + iface MIXER + name 'CD Playback Switch' + value.0 false + value.1 false + } + control.15 { + comment.access 'read write' + comment.type INTEGER + comment.count 2 + comment.range '0 - 31' + comment.dbmin -3450 + comment.dbmax 1200 + iface MIXER + name 'CD Playback Volume' + value.0 0 + value.1 0 + } + control.16 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 2 + iface MIXER + name 'Aux Playback Switch' + value.0 false + value.1 false + } + control.17 { + comment.access 'read write' + comment.type INTEGER + comment.count 2 + comment.range '0 - 31' + comment.dbmin -3450 + comment.dbmax 1200 + iface MIXER + name 'Aux Playback Volume' + value.0 0 + value.1 0 + } + control.18 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 2 + iface MIXER + name 'PCM Playback Switch' + value.0 true + value.1 true + } + control.19 { + comment.access 'read write' + comment.type INTEGER + comment.count 2 + comment.range '0 - 31' + comment.dbmin -3450 + comment.dbmax 1200 + iface MIXER + name 'PCM Playback Volume' + value.0 22 + value.1 22 + } + control.20 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 2 + comment.item.0 Mic + comment.item.1 CD + comment.item.2 Video + comment.item.3 Aux + comment.item.4 Line + comment.item.5 Mix + comment.item.6 'Mix Mono' + comment.item.7 Phone + iface MIXER + name 'Capture Source' + value.0 Mic + value.1 Mic + } + control.21 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 2 + iface MIXER + name 'Capture Switch' + value.0 true + value.1 true + } + control.22 { + comment.access 'read write' + comment.type INTEGER + comment.count 2 + comment.range '0 - 15' + comment.dbmin 0 + comment.dbmax 2250 + iface MIXER + name 'Capture Volume' + value.0 11 + value.1 11 + } + control.23 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 1 + comment.item.0 Mix + comment.item.1 Mic + iface MIXER + name 'Mono Output Select' + value Mix + } + control.24 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 1 + comment.item.0 Mic1 + comment.item.1 Mic2 + iface MIXER + name 'Mic Select' + value Mic1 + } + control.25 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Stereo Mic' + value false + } + control.26 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Headphone Jack Sense' + value false + } + control.27 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Line Jack Sense' + value false + } + control.28 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'External Amplifier' + value true + } +} +state.AC97C { + control.1 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 2 + iface MIXER + name 'Master Playback Switch' + value.0 true + value.1 true + } + control.2 { + comment.access 'read write' + comment.type INTEGER + comment.count 2 + comment.range '0 - 31' + comment.dbmin -4650 + comment.dbmax 0 + iface MIXER + name 'Master Playback Volume' + value.0 22 + value.1 22 + } + control.3 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 2 + iface MIXER + name 'Headphone Playback Switch' + value.0 true + value.1 true + } + control.4 { + comment.access 'read write' + comment.type INTEGER + comment.count 2 + comment.range '0 - 31' + comment.dbmin -4650 + comment.dbmax 0 + iface MIXER + name 'Headphone Playback Volume' + value.0 22 + value.1 22 + } + control.5 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Master Mono Playback Switch' + value false + } + control.6 { + comment.access 'read write' + comment.type INTEGER + comment.count 1 + comment.range '0 - 31' + comment.dbmin -4650 + comment.dbmax 0 + iface MIXER + name 'Master Mono Playback Volume' + value 0 + } + control.7 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Phone Playback Switch' + value false + } + control.8 { + comment.access 'read write' + comment.type INTEGER + comment.count 1 + comment.range '0 - 31' + comment.dbmin -3450 + comment.dbmax 1200 + iface MIXER + name 'Phone Playback Volume' + value 0 + } + control.9 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Mic Playback Switch' + value false + } + control.10 { + comment.access 'read write' + comment.type INTEGER + comment.count 1 + comment.range '0 - 31' + comment.dbmin -3450 + comment.dbmax 1200 + iface MIXER + name 'Mic Playback Volume' + value 0 + } + control.11 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Mic Boost (+20dB)' + value false + } + control.12 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 2 + iface MIXER + name 'Line Playback Switch' + value.0 false + value.1 false + } + control.13 { + comment.access 'read write' + comment.type INTEGER + comment.count 2 + comment.range '0 - 31' + comment.dbmin -3450 + comment.dbmax 1200 + iface MIXER + name 'Line Playback Volume' + value.0 0 + value.1 0 + } + control.14 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 2 + iface MIXER + name 'CD Playback Switch' + value.0 false + value.1 false + } + control.15 { + comment.access 'read write' + comment.type INTEGER + comment.count 2 + comment.range '0 - 31' + comment.dbmin -3450 + comment.dbmax 1200 + iface MIXER + name 'CD Playback Volume' + value.0 0 + value.1 0 + } + control.16 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 2 + iface MIXER + name 'Aux Playback Switch' + value.0 false + value.1 false + } + control.17 { + comment.access 'read write' + comment.type INTEGER + comment.count 2 + comment.range '0 - 31' + comment.dbmin -3450 + comment.dbmax 1200 + iface MIXER + name 'Aux Playback Volume' + value.0 0 + value.1 0 + } + control.18 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 2 + iface MIXER + name 'PCM Playback Switch' + value.0 true + value.1 true + } + control.19 { + comment.access 'read write' + comment.type INTEGER + comment.count 2 + comment.range '0 - 31' + comment.dbmin -3450 + comment.dbmax 1200 + iface MIXER + name 'PCM Playback Volume' + value.0 22 + value.1 22 + } + control.20 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 2 + comment.item.0 Mic + comment.item.1 CD + comment.item.2 Video + comment.item.3 Aux + comment.item.4 Line + comment.item.5 Mix + comment.item.6 'Mix Mono' + comment.item.7 Phone + iface MIXER + name 'Capture Source' + value.0 Mic + value.1 Mic + } + control.21 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 2 + iface MIXER + name 'Capture Switch' + value.0 true + value.1 true + } + control.22 { + comment.access 'read write' + comment.type INTEGER + comment.count 2 + comment.range '0 - 15' + comment.dbmin 0 + comment.dbmax 2250 + iface MIXER + name 'Capture Volume' + value.0 11 + value.1 11 + } + control.23 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 1 + comment.item.0 Mix + comment.item.1 Mic + iface MIXER + name 'Mono Output Select' + value Mix + } + control.24 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 1 + comment.item.0 Mic1 + comment.item.1 Mic2 + iface MIXER + name 'Mic Select' + value Mic1 + } + control.25 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Stereo Mic' + value false + } + control.26 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Headphone Jack Sense' + value false + } + control.27 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Line Jack Sense' + value false + } + control.28 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'External Amplifier' + value true + } +} diff --git a/recipes/alsa/alsa-state/at91sam9m10g45ek/asound.conf b/recipes/alsa/alsa-state/at91sam9m10g45ek/asound.conf new file mode 100644 index 0000000000..87bb5ec050 --- /dev/null +++ b/recipes/alsa/alsa-state/at91sam9m10g45ek/asound.conf @@ -0,0 +1,2 @@ +pcm.!default { type hw card 0 } +ctl.!default { type hw card 0 } diff --git a/recipes/alsa/alsa-state/at91sam9m10g45ek/asound.state b/recipes/alsa/alsa-state/at91sam9m10g45ek/asound.state new file mode 100644 index 0000000000..e8d3218b4f --- /dev/null +++ b/recipes/alsa/alsa-state/at91sam9m10g45ek/asound.state @@ -0,0 +1,566 @@ +state.AC97 { + control.1 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 2 + iface MIXER + name 'Master Playback Switch' + value.0 true + value.1 true + } + control.2 { + comment.access 'read write' + comment.type INTEGER + comment.count 2 + comment.range '0 - 31' + comment.dbmin -4650 + comment.dbmax 0 + iface MIXER + name 'Master Playback Volume' + value.0 22 + value.1 22 + } + control.3 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 2 + iface MIXER + name 'Headphone Playback Switch' + value.0 true + value.1 true + } + control.4 { + comment.access 'read write' + comment.type INTEGER + comment.count 2 + comment.range '0 - 31' + comment.dbmin -4650 + comment.dbmax 0 + iface MIXER + name 'Headphone Playback Volume' + value.0 22 + value.1 22 + } + control.5 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Master Mono Playback Switch' + value false + } + control.6 { + comment.access 'read write' + comment.type INTEGER + comment.count 1 + comment.range '0 - 31' + comment.dbmin -4650 + comment.dbmax 0 + iface MIXER + name 'Master Mono Playback Volume' + value 0 + } + control.7 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Phone Playback Switch' + value false + } + control.8 { + comment.access 'read write' + comment.type INTEGER + comment.count 1 + comment.range '0 - 31' + comment.dbmin -3450 + comment.dbmax 1200 + iface MIXER + name 'Phone Playback Volume' + value 0 + } + control.9 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Mic Playback Switch' + value false + } + control.10 { + comment.access 'read write' + comment.type INTEGER + comment.count 1 + comment.range '0 - 31' + comment.dbmin -3450 + comment.dbmax 1200 + iface MIXER + name 'Mic Playback Volume' + value 0 + } + control.11 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Mic Boost (+20dB)' + value false + } + control.12 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 2 + iface MIXER + name 'Line Playback Switch' + value.0 false + value.1 false + } + control.13 { + comment.access 'read write' + comment.type INTEGER + comment.count 2 + comment.range '0 - 31' + comment.dbmin -3450 + comment.dbmax 1200 + iface MIXER + name 'Line Playback Volume' + value.0 0 + value.1 0 + } + control.14 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 2 + iface MIXER + name 'CD Playback Switch' + value.0 false + value.1 false + } + control.15 { + comment.access 'read write' + comment.type INTEGER + comment.count 2 + comment.range '0 - 31' + comment.dbmin -3450 + comment.dbmax 1200 + iface MIXER + name 'CD Playback Volume' + value.0 0 + value.1 0 + } + control.16 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 2 + iface MIXER + name 'Aux Playback Switch' + value.0 false + value.1 false + } + control.17 { + comment.access 'read write' + comment.type INTEGER + comment.count 2 + comment.range '0 - 31' + comment.dbmin -3450 + comment.dbmax 1200 + iface MIXER + name 'Aux Playback Volume' + value.0 0 + value.1 0 + } + control.18 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 2 + iface MIXER + name 'PCM Playback Switch' + value.0 true + value.1 true + } + control.19 { + comment.access 'read write' + comment.type INTEGER + comment.count 2 + comment.range '0 - 31' + comment.dbmin -3450 + comment.dbmax 1200 + iface MIXER + name 'PCM Playback Volume' + value.0 22 + value.1 22 + } + control.20 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 2 + comment.item.0 Mic + comment.item.1 CD + comment.item.2 Video + comment.item.3 Aux + comment.item.4 Line + comment.item.5 Mix + comment.item.6 'Mix Mono' + comment.item.7 Phone + iface MIXER + name 'Capture Source' + value.0 Mic + value.1 Mic + } + control.21 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 2 + iface MIXER + name 'Capture Switch' + value.0 true + value.1 true + } + control.22 { + comment.access 'read write' + comment.type INTEGER + comment.count 2 + comment.range '0 - 15' + comment.dbmin 0 + comment.dbmax 2250 + iface MIXER + name 'Capture Volume' + value.0 11 + value.1 11 + } + control.23 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 1 + comment.item.0 Mix + comment.item.1 Mic + iface MIXER + name 'Mono Output Select' + value Mix + } + control.24 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 1 + comment.item.0 Mic1 + comment.item.1 Mic2 + iface MIXER + name 'Mic Select' + value Mic1 + } + control.25 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Stereo Mic' + value false + } + control.26 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Headphone Jack Sense' + value false + } + control.27 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Line Jack Sense' + value false + } + control.28 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'External Amplifier' + value true + } +} +state.AC97C { + control.1 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 2 + iface MIXER + name 'Master Playback Switch' + value.0 true + value.1 true + } + control.2 { + comment.access 'read write' + comment.type INTEGER + comment.count 2 + comment.range '0 - 31' + comment.dbmin -4650 + comment.dbmax 0 + iface MIXER + name 'Master Playback Volume' + value.0 22 + value.1 22 + } + control.3 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 2 + iface MIXER + name 'Headphone Playback Switch' + value.0 true + value.1 true + } + control.4 { + comment.access 'read write' + comment.type INTEGER + comment.count 2 + comment.range '0 - 31' + comment.dbmin -4650 + comment.dbmax 0 + iface MIXER + name 'Headphone Playback Volume' + value.0 22 + value.1 22 + } + control.5 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Master Mono Playback Switch' + value false + } + control.6 { + comment.access 'read write' + comment.type INTEGER + comment.count 1 + comment.range '0 - 31' + comment.dbmin -4650 + comment.dbmax 0 + iface MIXER + name 'Master Mono Playback Volume' + value 0 + } + control.7 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Phone Playback Switch' + value false + } + control.8 { + comment.access 'read write' + comment.type INTEGER + comment.count 1 + comment.range '0 - 31' + comment.dbmin -3450 + comment.dbmax 1200 + iface MIXER + name 'Phone Playback Volume' + value 0 + } + control.9 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Mic Playback Switch' + value false + } + control.10 { + comment.access 'read write' + comment.type INTEGER + comment.count 1 + comment.range '0 - 31' + comment.dbmin -3450 + comment.dbmax 1200 + iface MIXER + name 'Mic Playback Volume' + value 0 + } + control.11 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Mic Boost (+20dB)' + value false + } + control.12 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 2 + iface MIXER + name 'Line Playback Switch' + value.0 false + value.1 false + } + control.13 { + comment.access 'read write' + comment.type INTEGER + comment.count 2 + comment.range '0 - 31' + comment.dbmin -3450 + comment.dbmax 1200 + iface MIXER + name 'Line Playback Volume' + value.0 0 + value.1 0 + } + control.14 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 2 + iface MIXER + name 'CD Playback Switch' + value.0 false + value.1 false + } + control.15 { + comment.access 'read write' + comment.type INTEGER + comment.count 2 + comment.range '0 - 31' + comment.dbmin -3450 + comment.dbmax 1200 + iface MIXER + name 'CD Playback Volume' + value.0 0 + value.1 0 + } + control.16 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 2 + iface MIXER + name 'Aux Playback Switch' + value.0 false + value.1 false + } + control.17 { + comment.access 'read write' + comment.type INTEGER + comment.count 2 + comment.range '0 - 31' + comment.dbmin -3450 + comment.dbmax 1200 + iface MIXER + name 'Aux Playback Volume' + value.0 0 + value.1 0 + } + control.18 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 2 + iface MIXER + name 'PCM Playback Switch' + value.0 true + value.1 true + } + control.19 { + comment.access 'read write' + comment.type INTEGER + comment.count 2 + comment.range '0 - 31' + comment.dbmin -3450 + comment.dbmax 1200 + iface MIXER + name 'PCM Playback Volume' + value.0 22 + value.1 22 + } + control.20 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 2 + comment.item.0 Mic + comment.item.1 CD + comment.item.2 Video + comment.item.3 Aux + comment.item.4 Line + comment.item.5 Mix + comment.item.6 'Mix Mono' + comment.item.7 Phone + iface MIXER + name 'Capture Source' + value.0 Mic + value.1 Mic + } + control.21 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 2 + iface MIXER + name 'Capture Switch' + value.0 true + value.1 true + } + control.22 { + comment.access 'read write' + comment.type INTEGER + comment.count 2 + comment.range '0 - 15' + comment.dbmin 0 + comment.dbmax 2250 + iface MIXER + name 'Capture Volume' + value.0 11 + value.1 11 + } + control.23 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 1 + comment.item.0 Mix + comment.item.1 Mic + iface MIXER + name 'Mono Output Select' + value Mix + } + control.24 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 1 + comment.item.0 Mic1 + comment.item.1 Mic2 + iface MIXER + name 'Mic Select' + value Mic1 + } + control.25 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Stereo Mic' + value false + } + control.26 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Headphone Jack Sense' + value false + } + control.27 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Line Jack Sense' + value false + } + control.28 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'External Amplifier' + value true + } +} diff --git a/recipes/alsa/alsa-state/at91sam9rlek/asound.conf b/recipes/alsa/alsa-state/at91sam9rlek/asound.conf new file mode 100644 index 0000000000..87bb5ec050 --- /dev/null +++ b/recipes/alsa/alsa-state/at91sam9rlek/asound.conf @@ -0,0 +1,2 @@ +pcm.!default { type hw card 0 } +ctl.!default { type hw card 0 } diff --git a/recipes/alsa/alsa-state/at91sam9rlek/asound.state b/recipes/alsa/alsa-state/at91sam9rlek/asound.state new file mode 100644 index 0000000000..e8d3218b4f --- /dev/null +++ b/recipes/alsa/alsa-state/at91sam9rlek/asound.state @@ -0,0 +1,566 @@ +state.AC97 { + control.1 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 2 + iface MIXER + name 'Master Playback Switch' + value.0 true + value.1 true + } + control.2 { + comment.access 'read write' + comment.type INTEGER + comment.count 2 + comment.range '0 - 31' + comment.dbmin -4650 + comment.dbmax 0 + iface MIXER + name 'Master Playback Volume' + value.0 22 + value.1 22 + } + control.3 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 2 + iface MIXER + name 'Headphone Playback Switch' + value.0 true + value.1 true + } + control.4 { + comment.access 'read write' + comment.type INTEGER + comment.count 2 + comment.range '0 - 31' + comment.dbmin -4650 + comment.dbmax 0 + iface MIXER + name 'Headphone Playback Volume' + value.0 22 + value.1 22 + } + control.5 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Master Mono Playback Switch' + value false + } + control.6 { + comment.access 'read write' + comment.type INTEGER + comment.count 1 + comment.range '0 - 31' + comment.dbmin -4650 + comment.dbmax 0 + iface MIXER + name 'Master Mono Playback Volume' + value 0 + } + control.7 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Phone Playback Switch' + value false + } + control.8 { + comment.access 'read write' + comment.type INTEGER + comment.count 1 + comment.range '0 - 31' + comment.dbmin -3450 + comment.dbmax 1200 + iface MIXER + name 'Phone Playback Volume' + value 0 + } + control.9 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Mic Playback Switch' + value false + } + control.10 { + comment.access 'read write' + comment.type INTEGER + comment.count 1 + comment.range '0 - 31' + comment.dbmin -3450 + comment.dbmax 1200 + iface MIXER + name 'Mic Playback Volume' + value 0 + } + control.11 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Mic Boost (+20dB)' + value false + } + control.12 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 2 + iface MIXER + name 'Line Playback Switch' + value.0 false + value.1 false + } + control.13 { + comment.access 'read write' + comment.type INTEGER + comment.count 2 + comment.range '0 - 31' + comment.dbmin -3450 + comment.dbmax 1200 + iface MIXER + name 'Line Playback Volume' + value.0 0 + value.1 0 + } + control.14 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 2 + iface MIXER + name 'CD Playback Switch' + value.0 false + value.1 false + } + control.15 { + comment.access 'read write' + comment.type INTEGER + comment.count 2 + comment.range '0 - 31' + comment.dbmin -3450 + comment.dbmax 1200 + iface MIXER + name 'CD Playback Volume' + value.0 0 + value.1 0 + } + control.16 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 2 + iface MIXER + name 'Aux Playback Switch' + value.0 false + value.1 false + } + control.17 { + comment.access 'read write' + comment.type INTEGER + comment.count 2 + comment.range '0 - 31' + comment.dbmin -3450 + comment.dbmax 1200 + iface MIXER + name 'Aux Playback Volume' + value.0 0 + value.1 0 + } + control.18 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 2 + iface MIXER + name 'PCM Playback Switch' + value.0 true + value.1 true + } + control.19 { + comment.access 'read write' + comment.type INTEGER + comment.count 2 + comment.range '0 - 31' + comment.dbmin -3450 + comment.dbmax 1200 + iface MIXER + name 'PCM Playback Volume' + value.0 22 + value.1 22 + } + control.20 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 2 + comment.item.0 Mic + comment.item.1 CD + comment.item.2 Video + comment.item.3 Aux + comment.item.4 Line + comment.item.5 Mix + comment.item.6 'Mix Mono' + comment.item.7 Phone + iface MIXER + name 'Capture Source' + value.0 Mic + value.1 Mic + } + control.21 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 2 + iface MIXER + name 'Capture Switch' + value.0 true + value.1 true + } + control.22 { + comment.access 'read write' + comment.type INTEGER + comment.count 2 + comment.range '0 - 15' + comment.dbmin 0 + comment.dbmax 2250 + iface MIXER + name 'Capture Volume' + value.0 11 + value.1 11 + } + control.23 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 1 + comment.item.0 Mix + comment.item.1 Mic + iface MIXER + name 'Mono Output Select' + value Mix + } + control.24 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 1 + comment.item.0 Mic1 + comment.item.1 Mic2 + iface MIXER + name 'Mic Select' + value Mic1 + } + control.25 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Stereo Mic' + value false + } + control.26 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Headphone Jack Sense' + value false + } + control.27 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Line Jack Sense' + value false + } + control.28 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'External Amplifier' + value true + } +} +state.AC97C { + control.1 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 2 + iface MIXER + name 'Master Playback Switch' + value.0 true + value.1 true + } + control.2 { + comment.access 'read write' + comment.type INTEGER + comment.count 2 + comment.range '0 - 31' + comment.dbmin -4650 + comment.dbmax 0 + iface MIXER + name 'Master Playback Volume' + value.0 22 + value.1 22 + } + control.3 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 2 + iface MIXER + name 'Headphone Playback Switch' + value.0 true + value.1 true + } + control.4 { + comment.access 'read write' + comment.type INTEGER + comment.count 2 + comment.range '0 - 31' + comment.dbmin -4650 + comment.dbmax 0 + iface MIXER + name 'Headphone Playback Volume' + value.0 22 + value.1 22 + } + control.5 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Master Mono Playback Switch' + value false + } + control.6 { + comment.access 'read write' + comment.type INTEGER + comment.count 1 + comment.range '0 - 31' + comment.dbmin -4650 + comment.dbmax 0 + iface MIXER + name 'Master Mono Playback Volume' + value 0 + } + control.7 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Phone Playback Switch' + value false + } + control.8 { + comment.access 'read write' + comment.type INTEGER + comment.count 1 + comment.range '0 - 31' + comment.dbmin -3450 + comment.dbmax 1200 + iface MIXER + name 'Phone Playback Volume' + value 0 + } + control.9 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Mic Playback Switch' + value false + } + control.10 { + comment.access 'read write' + comment.type INTEGER + comment.count 1 + comment.range '0 - 31' + comment.dbmin -3450 + comment.dbmax 1200 + iface MIXER + name 'Mic Playback Volume' + value 0 + } + control.11 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Mic Boost (+20dB)' + value false + } + control.12 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 2 + iface MIXER + name 'Line Playback Switch' + value.0 false + value.1 false + } + control.13 { + comment.access 'read write' + comment.type INTEGER + comment.count 2 + comment.range '0 - 31' + comment.dbmin -3450 + comment.dbmax 1200 + iface MIXER + name 'Line Playback Volume' + value.0 0 + value.1 0 + } + control.14 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 2 + iface MIXER + name 'CD Playback Switch' + value.0 false + value.1 false + } + control.15 { + comment.access 'read write' + comment.type INTEGER + comment.count 2 + comment.range '0 - 31' + comment.dbmin -3450 + comment.dbmax 1200 + iface MIXER + name 'CD Playback Volume' + value.0 0 + value.1 0 + } + control.16 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 2 + iface MIXER + name 'Aux Playback Switch' + value.0 false + value.1 false + } + control.17 { + comment.access 'read write' + comment.type INTEGER + comment.count 2 + comment.range '0 - 31' + comment.dbmin -3450 + comment.dbmax 1200 + iface MIXER + name 'Aux Playback Volume' + value.0 0 + value.1 0 + } + control.18 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 2 + iface MIXER + name 'PCM Playback Switch' + value.0 true + value.1 true + } + control.19 { + comment.access 'read write' + comment.type INTEGER + comment.count 2 + comment.range '0 - 31' + comment.dbmin -3450 + comment.dbmax 1200 + iface MIXER + name 'PCM Playback Volume' + value.0 22 + value.1 22 + } + control.20 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 2 + comment.item.0 Mic + comment.item.1 CD + comment.item.2 Video + comment.item.3 Aux + comment.item.4 Line + comment.item.5 Mix + comment.item.6 'Mix Mono' + comment.item.7 Phone + iface MIXER + name 'Capture Source' + value.0 Mic + value.1 Mic + } + control.21 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 2 + iface MIXER + name 'Capture Switch' + value.0 true + value.1 true + } + control.22 { + comment.access 'read write' + comment.type INTEGER + comment.count 2 + comment.range '0 - 15' + comment.dbmin 0 + comment.dbmax 2250 + iface MIXER + name 'Capture Volume' + value.0 11 + value.1 11 + } + control.23 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 1 + comment.item.0 Mix + comment.item.1 Mic + iface MIXER + name 'Mono Output Select' + value Mix + } + control.24 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 1 + comment.item.0 Mic1 + comment.item.1 Mic2 + iface MIXER + name 'Mic Select' + value Mic1 + } + control.25 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Stereo Mic' + value false + } + control.26 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Headphone Jack Sense' + value false + } + control.27 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Line Jack Sense' + value false + } + control.28 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'External Amplifier' + value true + } +} -- cgit v1.2.3 From 697ec7d0cf012f5dcef3dbcac19ead12011a166b Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 16 Mar 2010 10:48:31 +0100 Subject: qt4-x11 4.6.2: apply neon fix from qt/e to here as well --- recipes/qt4/qt4-x11-free_4.6.2.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/recipes/qt4/qt4-x11-free_4.6.2.bb b/recipes/qt4/qt4-x11-free_4.6.2.bb index a8d5c3f141..fe03daa971 100644 --- a/recipes/qt4/qt4-x11-free_4.6.2.bb +++ b/recipes/qt4/qt4-x11-free_4.6.2.bb @@ -1,5 +1,7 @@ require qt4-x11-free.inc -PR = "${INC_PR}.1" +PR = "${INC_PR}.2" + +QT_CONFIG_FLAGS_append_armv6 = " -no-neon " require qt-${PV}.inc -- cgit v1.2.3 From 5de0ca84e6d5dc1b4b1e2bf4bcdc63a8b66bac58 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Tue, 16 Mar 2010 18:05:51 +0800 Subject: expat-native: Upgrade to match latest of expat. --- recipes/expat/expat-native_1.95.7.bb | 4 ---- recipes/expat/expat-native_2.0.1.bb | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-) delete mode 100644 recipes/expat/expat-native_1.95.7.bb create mode 100644 recipes/expat/expat-native_2.0.1.bb diff --git a/recipes/expat/expat-native_1.95.7.bb b/recipes/expat/expat-native_1.95.7.bb deleted file mode 100644 index edfa53ae48..0000000000 --- a/recipes/expat/expat-native_1.95.7.bb +++ /dev/null @@ -1,4 +0,0 @@ -SECTION = "libs" -require expat_${PV}.bb -inherit native -FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/expat-${PV}" diff --git a/recipes/expat/expat-native_2.0.1.bb b/recipes/expat/expat-native_2.0.1.bb new file mode 100644 index 0000000000..edfa53ae48 --- /dev/null +++ b/recipes/expat/expat-native_2.0.1.bb @@ -0,0 +1,4 @@ +SECTION = "libs" +require expat_${PV}.bb +inherit native +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/expat-${PV}" -- cgit v1.2.3 From 980269b4e3b93236ddf64da3814c357bdf7d1305 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Tue, 16 Mar 2010 18:09:04 +0800 Subject: proftpd: Upgrade to the latest version. --- conf/checksums.ini | 8 -------- recipes/proftpd/proftpd_1.3.2b.bb | 36 ------------------------------------ recipes/proftpd/proftpd_1.3.2e.bb | 39 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 39 insertions(+), 44 deletions(-) delete mode 100644 recipes/proftpd/proftpd_1.3.2b.bb create mode 100644 recipes/proftpd/proftpd_1.3.2e.bb diff --git a/conf/checksums.ini b/conf/checksums.ini index d3dc6cd56a..3fe8493e13 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -22554,14 +22554,6 @@ sha256=6d52c706401af197bd9d7e0187c35b4a3463ea720392ffa0c020d94899b361e5 md5=f490bca772b16472962c7b9f23b1e97d sha256=b439e04adab9b1e66e11f59c4331680da48f1722f2123123f7c16dfbed2c38dc -[ftp://ftp.nl.uu.net/pub/unix/ftp/proftpd/ftp/distrib/source/proftpd-1.3.2.tar.gz] -md5=756f762883cc8eed03d99dc3b1c56a8e -sha256=5e00c20d74bbf98fb8bcc63bd4aecfd08480a87ec731dae8955bd9fca6a01bb3 - -[ftp://ftp.nl.uu.net/pub/unix/ftp/proftpd/ftp/distrib/source/proftpd-1.3.2b.tar.gz] -md5=4918908fcae9e591ba84c66edff73410 -sha256=fffee421390fe2647eeb0515a8c20759fda75e3df2014fc0a47e8a314e5ea88b - [http://downloads.sourceforge.net/progear/progear-ac-0.1.tar.gz] md5=60a89c2c907fb5ff2293ce3dfbcdace6 sha256=4124e24726369b42ed0a7aff33e5c572de5e4a0f46edd4e1e81125412c4bdf24 diff --git a/recipes/proftpd/proftpd_1.3.2b.bb b/recipes/proftpd/proftpd_1.3.2b.bb deleted file mode 100644 index a50cc08b08..0000000000 --- a/recipes/proftpd/proftpd_1.3.2b.bb +++ /dev/null @@ -1,36 +0,0 @@ -DESCRIPTION = "Secure ftp daemon" -SECTION = "console/network" -LICENSE = "GPL" -PR = "r0" - -SRC_URI = "ftp://ftp.nl.uu.net/pub/unix/ftp/proftpd/ftp/distrib/source/${PN}-${PV}.tar.gz \ - file://make.patch;patch=1 \ - " - - -EXTRA_OECONF = "ac_cv_func_setpgrp_void=yes ac_cv_func_setgrent_void=yes" -LDFLAGS += "-Llib" -PARALLEL_MAKE = "" - -do_configure () { - ./configure \ - --disable-auth-pam \ - --build=${BUILD_SYS} \ - --host=${HOST_SYS} \ - --target=${TARGET_SYS} \ - --prefix=/usr \ - --sysconfdir=/etc \ - --sharedstatedir=/com \ - --localstatedir=/var \ - ${EXTRA_OECONF} \ - $@; -} - -do_install () { - oe_runmake DESTDIR=${D} install -} - -pkg_postinst () { - # more chown's might be needed - chown root:root /usr/sbin/proftpd -} diff --git a/recipes/proftpd/proftpd_1.3.2e.bb b/recipes/proftpd/proftpd_1.3.2e.bb new file mode 100644 index 0000000000..b6cec1b707 --- /dev/null +++ b/recipes/proftpd/proftpd_1.3.2e.bb @@ -0,0 +1,39 @@ +DESCRIPTION = "Secure ftp daemon" +SECTION = "console/network" +LICENSE = "GPL" +PR = "r0" + +SRC_URI = "ftp://ftp.nl.uu.net/pub/unix/ftp/proftpd/ftp/distrib/source/${PN}-${PV}.tar.gz;name=src \ + file://make.patch;patch=1 \ + " +SRC_URI[src.md5sum] = "4ecb82cb1050c0e897d5343f6d2cc1ed" +SRC_URI[src.sha256sum] = "7c7f295944e8e7c85060829deeaed74f3f0b36c8f1d3936277d59bbea5d60093" + + + +EXTRA_OECONF = "ac_cv_func_setpgrp_void=yes ac_cv_func_setgrent_void=yes" +LDFLAGS += "-Llib" +PARALLEL_MAKE = "" + +do_configure () { + ./configure \ + --disable-auth-pam \ + --build=${BUILD_SYS} \ + --host=${HOST_SYS} \ + --target=${TARGET_SYS} \ + --prefix=/usr \ + --sysconfdir=/etc \ + --sharedstatedir=/com \ + --localstatedir=/var \ + ${EXTRA_OECONF} \ + $@; +} + +do_install () { + oe_runmake DESTDIR=${D} install +} + +pkg_postinst () { + # more chown's might be needed + chown root:root /usr/sbin/proftpd +} -- cgit v1.2.3 From 9e8743297d49e37e9be3e217a5cf735cc694bc57 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Tue, 16 Mar 2010 08:23:53 +0100 Subject: oe_audit.py: Ignore packets that are not in OE Split the list in two parts with packets that will be never in OE and thet ones that are not in OE right now. --- contrib/qa/oe_audit.py | 70 +++++++++++++++++++++++++++++++++++--------------- 1 file changed, 50 insertions(+), 20 deletions(-) diff --git a/contrib/qa/oe_audit.py b/contrib/qa/oe_audit.py index c0ac9c0aa0..132adca143 100755 --- a/contrib/qa/oe_audit.py +++ b/contrib/qa/oe_audit.py @@ -39,6 +39,14 @@ def map_names(str): "qemu-devel" : "qemu", "krb5-beta" : "krb5", "freeciv-gtk2": "freeciv", + "gtk" : "gtk+", + "wget+ipv6" : "wget", + "ja-gd" : "gd", + "openvpn-devel" : "openvpn", + "mpeg123-esound" : "mpeg123", + "mpeg123-nas" : "mpeg123", + "cdrtools-cjk" : "cdrtools", + "apache+mod_ssl+mod_deflate" : "apache2", } try: @@ -49,9 +57,20 @@ def map_names(str): def is_not_in_oe(name): """Method to reject packages not in OE""" not_in = [ - "openoffice.org-2-devel", + # packages that we will never have... "linux-firefox", "fr-linux-netscape", "linux-netscape-{communicator,navigator}", - "linux_base", "ja-netscape7", "{ja,ko}-netscape-{communicator,navigator}-linux", + "linux_base", "ja-netscape7", "{ja,ko}-netscape-{communicator,navigator}-linux", "zhTW-linux-mozillafirebird", "ja-linux-mozillafirebird-gtk1", "el-linux-mozillafirebird", + "acroread4", "acroread7", + "linux-openmotif", "linux-flock", "linux-jdk", "linux-curl", + + # packages that we don't have now but maybe will have in + # the future and blacklisting them here might be a problem + "openoffice.org-2-devel", "openoffice.org-2", "it-openoffice", "ca-openoffice","sl-openoffice-SI" + "drupal4", "drupal5", "drupal6", + "gpdf", + "nagios", + "kdenetwork", "ja-kdelibs", + "xemacs-devel", "xemacs-devel-21.5", "xemacs-mule", "zh-xemacs", ] return name in not_in @@ -61,18 +80,10 @@ class freebsd_info: Handles an entry like the one below: vulnerability-test-port>=2000<2010.02.26|http://cvsweb.freebsd.org/ports/security/vulnerability-test-port/|Not vulnerable, just a test port (database: 2010-02-26) """ - def __init__(self, line): - split = line.split("|") - for i in range(0, len(split[0])): - c = split[0][i] - if c != '<' and c != '=' and c != '>': - continue - self.name = map_names(split[0][0:i]) - self.versions = self.split_versions(split[0][i:]) - break - - self.link = split[1] - self.kind = split[2] + def __init__(self, name, versions, link, kind): + self.name = name + self.versions = versions + self.link = link @classmethod def split_versions(self, input): @@ -114,6 +125,24 @@ class freebsd_info: def __repr__(self): return "%s: %s" % (self.name, self.versions) +def create_infos(line): + split = line.split("|") + for i in range(0, len(split[0])): + c = split[0][i] + if c != '<' and c != '=' and c != '>': + continue + name = map_names(split[0][0:i]) + versions = freebsd_info.split_versions(split[0][i:]) + break + + if is_not_in_oe(name): + print "Not in oe %s" % name + return [] + + link = split[1] + kind = split[2] + return [freebsd_info(name, versions, link, kind)] + def read_auditfile(filename): """ Read an uncompressed audit file from freebsd @@ -124,12 +153,13 @@ def read_auditfile(filename): if line.startswith("#"): continue - info = freebsd_info(line) - try: - packages[info.name].append(info) - except: - packages[info.name] = [] - packages[info.name].append(info) + infos = create_infos(line) + for info in infos: + try: + packages[info.name].append(info) + except: + packages[info.name] = [] + packages[info.name].append(info) return packages -- cgit v1.2.3 From 87c53fe1e5dc6f011f6b2397e95ce1d0dd093dea Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Tue, 16 Mar 2010 11:07:06 +0100 Subject: oe_audit.py: Upgrade list of packet match --- contrib/qa/oe_audit.py | 45 ++++++++++++++++++++++++++++++++++++++------- 1 file changed, 38 insertions(+), 7 deletions(-) diff --git a/contrib/qa/oe_audit.py b/contrib/qa/oe_audit.py index 132adca143..71658029da 100755 --- a/contrib/qa/oe_audit.py +++ b/contrib/qa/oe_audit.py @@ -47,6 +47,35 @@ def map_names(str): "mpeg123-nas" : "mpeg123", "cdrtools-cjk" : "cdrtools", "apache+mod_ssl+mod_deflate" : "apache2", + "apache+mod_ssl*" : "apache2", + "vim-gtk2" : "vim", + "zh-emacs" : "emacs", + "{ja-,}bugzilla" : "bugzilla", + "zh-tin" : "tin", + "mozilla+ipv6": "mozilla", + "mozilla-embeddded" : "mozilla", + "rar" : "unrar", + "libsndfile" : "libsndfile1", + "sylpheed-gtk2": "sylpheed", + "cdrtools-devel": "cdrtools", + "pine4-ssl": "pine", + "apache" : "apache2", + "ghostscript-gpl" : "gs", + "ghostscript-gnu-nox11" : "gs", + "ghostscript8" : "gs", + "ghostscript-afpl-nox11" : "gs", + "ghostscript-afpl" : "gs", + "isc-dhcp" : "dhcp", + "mplayer-gtk" : "mplayer", + "xerces-c2" : "xerces-c", + "libxml" : "libxml2", + "vim+ruby" : "vim", + "mplayer{,-gtk}{,-esound}" : "mplayer", + "proftpd-devel": "proftpd", + "neon28" : "neon", + "php4-dba" : "php", + "php5-{cgi,cli}" : "php", + } try: @@ -59,18 +88,20 @@ def is_not_in_oe(name): not_in = [ # packages that we will never have... "linux-firefox", "fr-linux-netscape", "linux-netscape-{communicator,navigator}", - "linux_base", "ja-netscape7", "{ja,ko}-netscape-{communicator,navigator}-linux", "zhTW-linux-mozillafirebird", "ja-linux-mozillafirebird-gtk1", "el-linux-mozillafirebird", - "acroread4", "acroread7", - "linux-openmotif", "linux-flock", "linux-jdk", "linux-curl", + "linux_base", "ja-netscape7", "{ja,ko}-netscape-{communicator,navigator}-linux", "zhTW-linux-mozillafirebird", "ja-linux-mozillafirebird-gtk1", "el-linux-mozillafirebird", "mozilla-firebird", "netscape7", + "acroread4", "acroread7", "acroread5", + "linux-openmotif", "linux-flock", "linux-jdk", "linux-curl", "linux-png", "linux-firefox-devel", # packages that we don't have now but maybe will have in # the future and blacklisting them here might be a problem - "openoffice.org-2-devel", "openoffice.org-2", "it-openoffice", "ca-openoffice","sl-openoffice-SI" - "drupal4", "drupal5", "drupal6", + "openoffice.org-2-devel", "openoffice.org-2", "it-openoffice", "ca-openoffice","sl-openoffice-SI", "ja-openoffice", + "drupal4", "drupal5", "drupal6", "drupal-pubcookie", "gpdf", "nagios", - "kdenetwork", "ja-kdelibs", - "xemacs-devel", "xemacs-devel-21.5", "xemacs-mule", "zh-xemacs", + "kdenetwork", "ja-kdelibs", "kdegraphics", "kdepim", "kdebase4-runtime", + "xemacs-devel", "xemacs-devel-21.5", "xemacs-mule", "zh-xemacs", "zh-xemacs-mule", + "geeklog", "apach13-ssl", "nvidia-driver", "eGroupWare", "varnish", "heimdal", + "bugzilla", "agenda-snow-libs", "mozilla", ] return name in not_in -- cgit v1.2.3 From 690e114ba85eec8693957d204079d9b770ffec5c Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Tue, 16 Mar 2010 11:07:41 +0100 Subject: oe_audit.py: Print only vulnerabe software --- contrib/qa/oe_audit.py | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/contrib/qa/oe_audit.py b/contrib/qa/oe_audit.py index 71658029da..6a820cd618 100755 --- a/contrib/qa/oe_audit.py +++ b/contrib/qa/oe_audit.py @@ -1,5 +1,7 @@ #!/usr/bin/env python +import bb + def read_available(filename): """ Parses the output of bitbake -s @@ -212,6 +214,8 @@ def strip_bsd_version(bsd_version): FreeBSD is adding ,1 for revisions.. remove that """ split = bsd_version.rsplit(',', 1) + split = split[0] + split = split.rsplit('_', 1) return split[0] def compare_versions(oe, freebsd, not_known): @@ -223,11 +227,37 @@ def compare_versions(oe, freebsd, not_known): oe_version = strip_oe_version(oe[oe_name]) for ver in freebsd[bsd_name]: + affected = True str = [] for (cmp, vers) in ver.versions: bsd_ver = strip_bsd_version(vers) + cmp_res = bb.utils.vercmp(('0', oe_version, 'r0'), ('0', bsd_ver, 'r0')) + if cmp == '<': + if cmp_res >= 0: + affected = False + pass + elif cmp == '<=': + if cmp_res > 0: + affected = False + pass + elif cmp == '>': + if cmp_res <= 0: + affected = False + pass + elif cmp == '>=': + if cmp_res < 0: + affected = False + pass + elif cmp == '=': + if cmp_res > 0: + affected = False + else: + print cmp + assert True + str.append("%s %s %s %s" % (oe_name, oe_version, cmp, bsd_ver)) - print " && ".join(str), ver.link + if affected: + print " && ".join(str), ver.link for package in freebsd.keys(): # handle the various versions of OE packages -- cgit v1.2.3 From 3da62b39e48f7c18516215b85ba59fdb05f571b0 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Tue, 16 Mar 2010 18:30:07 +0800 Subject: cscope: Upgrade to 15.7a to address multiple flaws --- conf/checksums.ini | 8 -------- recipes/cscope/cscope_15.5.bb | 12 ------------ recipes/cscope/cscope_15.7a.bb | 14 ++++++++++++++ 3 files changed, 14 insertions(+), 20 deletions(-) delete mode 100644 recipes/cscope/cscope_15.5.bb create mode 100644 recipes/cscope/cscope_15.7a.bb diff --git a/conf/checksums.ini b/conf/checksums.ini index 3fe8493e13..8dd9d6cae1 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -4786,14 +4786,6 @@ sha256=fc7ac2829df8d394635aa1cc704b78e93ca287111df1001e5738ae2282691219 md5=779415872c771b580e4c6d10346b3a79 sha256=0903c37aaa9ced2c12a9e7d4a418b7d57d5a92a0f1451afd29f70bd0da240bc8 -[http://downloads.sourceforge.net/cscope/cscope-15.5.tar.gz] -md5=beb6032a301bb11524aec74bfb5e4840 -sha256=be49cda0a9d33add89cabe0dfcef436a2863a7b0b833767875e0b7a6e8b4c4d1 - -[http://heanet.dl.sourceforge.net/cscope/cscope-15.5.tar.gz] -md5=beb6032a301bb11524aec74bfb5e4840 -sha256=be49cda0a9d33add89cabe0dfcef436a2863a7b0b833767875e0b7a6e8b4c4d1 - [http://svn.o-hand.com/repos/web/trunk/patches/css-media.patch] md5=d3fe4cda3545f3e4718f1acc186608ab sha256=3aefaa17ffa38143bf5df1161c51ab402d35bfbee41ab4643c313edf569165d5 diff --git a/recipes/cscope/cscope_15.5.bb b/recipes/cscope/cscope_15.5.bb deleted file mode 100644 index 9d41997a60..0000000000 --- a/recipes/cscope/cscope_15.5.bb +++ /dev/null @@ -1,12 +0,0 @@ -DEPENDS = "ncurses" -DESCRIPTION = "A text screen-based source browser." -SECTION = "console/utils" -LICENSE = "BSD" - -SRC_URI = "${SOURCEFORGE_MIRROR}/cscope/cscope-${PV}.tar.gz" - -inherit autotools - -do_compile () { - oe_runmake 'LDFLAGS=${LDFLAGS}' -} diff --git a/recipes/cscope/cscope_15.7a.bb b/recipes/cscope/cscope_15.7a.bb new file mode 100644 index 0000000000..851855b8db --- /dev/null +++ b/recipes/cscope/cscope_15.7a.bb @@ -0,0 +1,14 @@ +DEPENDS = "ncurses" +DESCRIPTION = "A text screen-based source browser." +SECTION = "console/utils" +LICENSE = "BSD" + +SRC_URI = "${SOURCEFORGE_MIRROR}/cscope/cscope-${PV}.tar.bz2;name=src" +SRC_URI[src.md5sum] = "da43987622ace8c36bbf14c15a350ec1" +SRC_URI[src.sha256sum] = "02638bcba790bc8b0562f28dbe789e61794415079d94a676efc287d18dc96037" + +inherit autotools + +do_compile () { + oe_runmake 'LDFLAGS=${LDFLAGS}' +} -- cgit v1.2.3 From c1965f2fe85ea931f937ca773bb16082d61e0e7c Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 16 Mar 2010 13:31:17 +0100 Subject: sourcepkg: split per package arch to catch arch overrides as well --- classes/sourcepkg.bbclass | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/classes/sourcepkg.bbclass b/classes/sourcepkg.bbclass index 7c202af4c9..7e73680f33 100644 --- a/classes/sourcepkg.bbclass +++ b/classes/sourcepkg.bbclass @@ -30,7 +30,7 @@ def get_src_tree(d): sourcepkg_do_create_orig_tgz(){ - mkdir -p ${DEPLOY_DIR_SRC}/${PN} + mkdir -p ${DEPLOY_DIR_SRC}/${PN}/${PACKAGE_ARCH} cd ${WORKDIR} for i in ${EXCLUDE_FROM}; do echo $i >> temp/exclude-from-file @@ -39,8 +39,8 @@ sourcepkg_do_create_orig_tgz(){ src_tree=$(basename ${S}) echo $src_tree - oenote "Creating .orig.tar.gz in ${DEPLOY_DIR_SRC}/${PN}/${P}.orig.tar.gz" - tar cvzf ${DEPLOY_DIR_SRC}/${PN}/${P}.orig.tar.gz --exclude-from temp/exclude-from-file $src_tree + oenote "Creating .orig.tar.gz in ${DEPLOY_DIR_SRC}/${PN}/${PACKAGE_ARCH}/${P}.orig.tar.gz" + tar cvzf ${DEPLOY_DIR_SRC}/${PN}/${PACKAGE_ARCH}/${P}.orig.tar.gz --exclude-from temp/exclude-from-file $src_tree cp -pPR $src_tree $src_tree.orig } @@ -93,8 +93,8 @@ sourcepkg_do_create_diff_gz(){ cp $i $src_tree/${DISTRO}/files done - oenote "Creating .diff.gz in ${DEPLOY_DIR_SRC}/${PN}/${P}-${PR}.diff.gz" - LC_ALL=C TZ=UTC0 diff --exclude-from=temp/exclude-from-file -Naur $src_tree.orig $src_tree | gzip -c > ${DEPLOY_DIR_SRC}/${PN}/${P}-${PR}.diff.gz + oenote "Creating .diff.gz in ${DEPLOY_DIR_SRC}/${PN}/${PACKAGE_ARCH}/${P}-${PR}.diff.gz" + LC_ALL=C TZ=UTC0 diff --exclude-from=temp/exclude-from-file -Naur $src_tree.orig $src_tree | gzip -c > ${DEPLOY_DIR_SRC}/${PN}/${PACKAGE_ARCH}/${P}-${PR}.diff.gz rm -rf $src_tree.orig } -- cgit v1.2.3 From 69c1b8c1862b63220fb31c5152086a03064d6932 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 15 Mar 2010 23:49:57 +0000 Subject: ffmpeg: Stage `avconfig.h` which is built at compile time. This header is needed for `libvalhalla`. Signed-off-by: Paul Menzel Acked-by: Martin Jansa --- recipes/ffmpeg/ffmpeg.inc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/recipes/ffmpeg/ffmpeg.inc b/recipes/ffmpeg/ffmpeg.inc index cd330f81f1..6b1bca6a00 100644 --- a/recipes/ffmpeg/ffmpeg.inc +++ b/recipes/ffmpeg/ffmpeg.inc @@ -10,7 +10,7 @@ ARM_INSTRUCTION_SET = "arm" DEPENDS = "zlib libogg libvorbis libtheora faac faad2 ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'lame liba52', d)}" RSUGGESTS = "mplayer" -INC_PR = "r10" +INC_PR = "r11" inherit autotools pkgconfig @@ -61,6 +61,8 @@ do_stage() { install -m 0644 ${S}/libavutil/$h ${STAGING_INCDIR}/ffmpeg/$h install -m 0644 ${S}/libavutil/$h ${STAGING_INCDIR}/libavutil/$h done + install -m 0644 ${B}/libavutil/avconfig.h ${STAGING_INCDIR}/ffmpeg/ + install -m 0644 ${B}/libavutil/avconfig.h ${STAGING_INCDIR}/libavutil/ install -d ${STAGING_INCDIR}/libswscale/ install -m 0644 ${S}/libswscale/*.h ${STAGING_INCDIR}/ffmpeg/ -- cgit v1.2.3 From 20b1ca2cc5ce58a80ea94acae571467af145eb31 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 11 Mar 2010 10:25:12 +0100 Subject: mplayer_git: bump SRCREV and remove unsupported option Signed-off-by: Martin Jansa --- recipes/mplayer/mplayer_git.bb | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/recipes/mplayer/mplayer_git.bb b/recipes/mplayer/mplayer_git.bb index 4f56241598..8e206dc573 100644 --- a/recipes/mplayer/mplayer_git.bb +++ b/recipes/mplayer/mplayer_git.bb @@ -13,7 +13,6 @@ SRC_URI_om-gta02 = "git://repo.or.cz/mplayer/glamo.git;protocol=git;branch=maste " SRC_URI_append = " \ - file://pld-onlyarm5-svn.patch;patch=1 \ file://makefile-nostrip-svn.patch;patch=1 \ " @@ -29,8 +28,8 @@ SRC_URI_append_armv7a = " \ # ie. for all armv4 machines. SRC_URI_append_collie = "file://disable-executable-stack-test.patch;patch=1" -SRCREV_om-gta02 = "71807fcbb1eb35c337ef03f4f62d181963173550" -SRCREV = "e5bcd70bc5b0557635ae51c7093f0e887493d4ba" +SRCREV_om-gta02 = "5b7a3c944e39b8dad17eeae2c3bdc038662f9352" +SRCREV = "f4a1d6e36eb2e9a92894ea42276f9e1087c4bd57" PACKAGE_ARCH_collie = "collie" PACKAGE_ARCH_c7x0 = "c7x0" @@ -41,7 +40,7 @@ ARM_INSTRUCTION_SET = "ARM" RCONFLICTS_${PN} = "mplayer-atty" RREPLACES_${PN} = "mplayer-atty" -PV = "0.0+1.0rc3+gitr${SRCREV}" +PV = "0.0+1.0rc4+gitr${SRCREV}" PR = "r0" DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_om-gta02 = "2" @@ -137,7 +136,6 @@ EXTRA_OECONF = " \ --disable-dxr2 \ --disable-dxr3 \ --disable-dvb \ - --disable-dvbhead \ --disable-mga \ --disable-xmga \ --enable-xv \ -- cgit v1.2.3 From acaa4a2e7ecce698494106dd116f138fd211ca47 Mon Sep 17 00:00:00 2001 From: Frans Meulenbroeks Date: Tue, 16 Mar 2010 13:49:49 +0100 Subject: xfsprogs: added 3.1.1 Signed-off-by: Frans Meulenbroeks --- recipes/xfsprogs/xfsprogs_3.1.1.bb | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 recipes/xfsprogs/xfsprogs_3.1.1.bb diff --git a/recipes/xfsprogs/xfsprogs_3.1.1.bb b/recipes/xfsprogs/xfsprogs_3.1.1.bb new file mode 100644 index 0000000000..6caf8dc18c --- /dev/null +++ b/recipes/xfsprogs/xfsprogs_3.1.1.bb @@ -0,0 +1,28 @@ +DESCRIPTION = "XFS Filesystem Utilities" +HOMEPAGE = "http://oss.sgi.com/projects/xfs" +LICENSE = "GPL" +SECTION = "base" +PR = "r0" +DEPENDS = "e2fsprogs-libs" + +SRC_URI = "ftp://oss.sgi.com/projects/xfs/cmd_tars/xfsprogs-3.1.1.tar.gz;name=xfsprogstargz" +SRC_URI[xfsprogstargz.md5sum] = "c2308b46ee707597ac50aae418d321b8" +SRC_URI[xfsprogstargz.sha256sum] = "bc189022f720019d9e4aa9856772a4f89afa1cc4022f872b759fe001a8dd1e36" + +PARALLEL_MAKE = "" +inherit autotools +EXTRA_OECONF = "--enable-gettext=no" +TARGET_CC_ARCH += "${LDFLAGS}" + + +do_configure () { + export LIBTOOL="${STAGING_BINDIR_NATIVE}/${HOST_SYS}-libtool" + export DEBUG="-DNDEBUG" + oe_runconf +} + +do_install () { + export DIST_ROOT=${D} + oe_runmake install +} + -- cgit v1.2.3 From 969424adc3187312fa92456733edd861d1dc61d3 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 16 Mar 2010 15:37:32 +0100 Subject: desktop-file-utils: add 0.16 --- recipes/desktop-file-utils/desktop-file-utils_0.16.bb | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 recipes/desktop-file-utils/desktop-file-utils_0.16.bb diff --git a/recipes/desktop-file-utils/desktop-file-utils_0.16.bb b/recipes/desktop-file-utils/desktop-file-utils_0.16.bb new file mode 100644 index 0000000000..9492205896 --- /dev/null +++ b/recipes/desktop-file-utils/desktop-file-utils_0.16.bb @@ -0,0 +1,15 @@ +SECTION = "console/utils" +HOMEPAGE = "http://www.freedesktop.org/wiki/Software/desktop-file-utils" +DESCRIPTION = "command line utilities to work with *.desktop files" +LICENSE = "GPL" + +DEPENDS = "glib-2.0" + +SRC_URI = "http://www.freedesktop.org/software/desktop-file-utils/releases/desktop-file-utils-${PV}.tar.bz2;name=archive" +SRC_URI[archive.md5sum] = "6811712bced796d025d1a8a0f728d941" +SRC_URI[archive.sha256sum] = "7960be4bf7aa4b4698e8ea333cfa0bbfa7a169029e85d6a8b5390f625155c9a3" + +inherit autotools + +BBCLASSEXTEND = "native" +NATIVE_INSTALL_WORKS = "1" -- cgit v1.2.3 From 157b38c38c5ab0bb44d31e8478fc8241d99020d5 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 16 Mar 2010 15:46:15 +0100 Subject: udev 151: libdir symlinking logic was reversed, fix that --- recipes/udev/udev_151.bb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/recipes/udev/udev_151.bb b/recipes/udev/udev_151.bb index 884ba8f256..fab8bc254d 100644 --- a/recipes/udev/udev_151.bb +++ b/recipes/udev/udev_151.bb @@ -3,7 +3,7 @@ DESCRIPTION = "udev is a daemon which dynamically creates and removes device nod the hotplug package and requires a kernel not older than 2.6.12." LICENSE = "GPLv2+" -PR = "r5" +PR = "r6" # Untested DEFAULT_PREFERENCE = "-1" @@ -105,8 +105,9 @@ do_install () { install -m 0755 ${WORKDIR}/mount.sh ${D}${sysconfdir}/udev/scripts/mount.sh install -m 0755 ${WORKDIR}/network.sh ${D}${sysconfdir}/udev/scripts - mkdir -p ${D}${base_libdir} - ln -sf ${libdir}/udev ${D}${base_libdir}/ + mkdir -p ${base_libdir}/udev + mkdir -p ${D}${libdir} + ln -sf ${base_libdir}/udev ${D}${libdir}/ } do_install_append_h2200() { -- cgit v1.2.3 From ce2d4f482a41ee2b8884095174ce278d8fc277de Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Tue, 16 Mar 2010 15:46:53 +0100 Subject: procps: apply patch from Ubuntu to finally get rid of 'Unknown Hz value' Signed-off-by: Marcin Juszkiewicz --- .../procps-3.2.8/60_linux_version_init.dpatch | 61 ++++++++++++++++++++++ recipes/procps/procps_3.2.8.bb | 3 +- 2 files changed, 63 insertions(+), 1 deletion(-) create mode 100644 recipes/procps/procps-3.2.8/60_linux_version_init.dpatch diff --git a/recipes/procps/procps-3.2.8/60_linux_version_init.dpatch b/recipes/procps/procps-3.2.8/60_linux_version_init.dpatch new file mode 100644 index 0000000000..d99456a6e8 --- /dev/null +++ b/recipes/procps/procps-3.2.8/60_linux_version_init.dpatch @@ -0,0 +1,61 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 60_linux_init.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Fix Linux version detection which relied on elf loader side-effect. +## DP: This patch also depends on 40_gnu-kbsd-version, which modified +## DP: init_Linux_version(). + +@DPATCH@ +--- + proc/sysinfo.c | 1 + + proc/version.c | 5 +++-- + proc/version.h | 1 + + 3 files changed, 5 insertions(+), 2 deletions(-) + +--- procps-3.2.8.orig/proc/sysinfo.c ++++ procps-3.2.8/proc/sysinfo.c +@@ -210,10 +210,11 @@ static int check_for_privs(void){ + } + + static void init_libproc(void) __attribute__((constructor)); + static void init_libproc(void){ + have_privs = check_for_privs(); ++ init_Linux_version(); // make sure we have version before continuing... + // ought to count CPUs in /proc/stat instead of relying + // on glibc, which foolishly tries to parse /proc/cpuinfo + // + // SourceForge has an old Alpha running Linux 2.2.20 that + // appears to have a non-SMP kernel on a 2-way SMP box. +--- procps-3.2.8.orig/proc/version.c ++++ procps-3.2.8/proc/version.c +@@ -31,12 +31,13 @@ void display_version(void) { + + #define LINUX_VERSION(x,y,z) (0x10000*(x) + 0x100*(y) + z) + + int linux_version_code; + +-static void init_Linux_version(void) __attribute__((constructor)); +-static void init_Linux_version(void) { ++// cannot depend on this auto-running before libproc init... ++//static void init_Linux_version(void) __attribute__((constructor)); ++void init_Linux_version(void) { + static struct utsname uts; + int x = 0, y = 0, z = 0; /* cleared in case sscanf() < 3 */ + + if (uname(&uts) == -1) /* failure implies impending death */ + exit(1); +--- procps-3.2.8.orig/proc/version.h ++++ procps-3.2.8/proc/version.h +@@ -12,10 +12,11 @@ + * Copyright 2002 Albert Cahalan + */ + + EXTERN_C_BEGIN + ++extern void init_Linux_version(void); /* initialize linux version */ + extern void display_version(void); /* display suite version */ + extern const char procps_version[]; /* global buf for suite version */ + + extern int linux_version_code; /* runtime version of LINUX_VERSION_CODE + in /usr/include/linux/version.h */ diff --git a/recipes/procps/procps_3.2.8.bb b/recipes/procps/procps_3.2.8.bb index 22f54c3692..f98b8493ca 100644 --- a/recipes/procps/procps_3.2.8.bb +++ b/recipes/procps/procps_3.2.8.bb @@ -1,10 +1,11 @@ require procps.inc -PR = "${INC_PR}.0" +PR = "${INC_PR}.1" SRC_URI += "file://procmodule.patch;patch=1 \ file://psmodule.patch;patch=1 \ file://linux-limits.patch;patch=1 \ + file://60_linux_version_init.dpatch;patch=1 \ " SRC_URI[tarball.md5sum] = "9532714b6846013ca9898984ba4cd7e0" -- cgit v1.2.3 From 437dc4079052d6f02b295db6f9540f1c0259dc36 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 16 Mar 2010 15:59:52 +0100 Subject: udev 151: remove symlinking logic completely: * it breaks upgrade paths * broken apps will still be broken --- recipes/udev/udev_151.bb | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/recipes/udev/udev_151.bb b/recipes/udev/udev_151.bb index fab8bc254d..169d3c5035 100644 --- a/recipes/udev/udev_151.bb +++ b/recipes/udev/udev_151.bb @@ -3,7 +3,7 @@ DESCRIPTION = "udev is a daemon which dynamically creates and removes device nod the hotplug package and requires a kernel not older than 2.6.12." LICENSE = "GPLv2+" -PR = "r6" +PR = "r7" # Untested DEFAULT_PREFERENCE = "-1" @@ -104,10 +104,6 @@ do_install () { install -m 0755 ${WORKDIR}/mount.sh ${D}${sysconfdir}/udev/scripts/mount.sh install -m 0755 ${WORKDIR}/network.sh ${D}${sysconfdir}/udev/scripts - - mkdir -p ${base_libdir}/udev - mkdir -p ${D}${libdir} - ln -sf ${base_libdir}/udev ${D}${libdir}/ } do_install_append_h2200() { -- cgit v1.2.3 From 5183adab7131c9f5bede3f7b2b14c91c9ed81628 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 16 Mar 2010 17:12:38 +0100 Subject: pixman git: update to 0.17.10 + ~alexl/alex-scaler2 + overlapped blt --- .../0001-Add-CONVERT_0565_TO_8888-macro.patch | 27 ++ ..._8888_TO_8888-and-CONVERT_0565_TO_0565-ma.patch | 28 ++ .../0003-Add-FAST_PATH_NO_NONE_REPEAT-flag.patch | 53 ++++ ...TH_SAMPLES_COVER_CLIP-and-FAST_PATH_16BIT.patch | 167 ++++++++++++ ...0005-Add-specialized-fast-nearest-scalers.patch | 284 +++++++++++++++++++++ ...mplementation-of-pixman_blt-with-overlapp.patch | 114 +++++++++ ...of-overlapping-src-dst-for-pixman_blt_mmx.patch | 91 +++++++ ...f-overlapping-src-dst-for-pixman_blt_sse2.patch | 91 +++++++ ...f-overlapping-src-dst-for-pixman_blt_neon.patch | 94 +++++++ recipes/xorg-lib/pixman_git.bb | 24 +- 10 files changed, 962 insertions(+), 11 deletions(-) create mode 100644 recipes/xorg-lib/pixman/0001-Add-CONVERT_0565_TO_8888-macro.patch create mode 100644 recipes/xorg-lib/pixman/0002-Add-CONVERT_8888_TO_8888-and-CONVERT_0565_TO_0565-ma.patch create mode 100644 recipes/xorg-lib/pixman/0003-Add-FAST_PATH_NO_NONE_REPEAT-flag.patch create mode 100644 recipes/xorg-lib/pixman/0004-Add-FAST_PATH_SAMPLES_COVER_CLIP-and-FAST_PATH_16BIT.patch create mode 100644 recipes/xorg-lib/pixman/0005-Add-specialized-fast-nearest-scalers.patch create mode 100644 recipes/xorg-lib/pixman/0006-Generic-C-implementation-of-pixman_blt-with-overlapp.patch create mode 100644 recipes/xorg-lib/pixman/0007-Support-of-overlapping-src-dst-for-pixman_blt_mmx.patch create mode 100644 recipes/xorg-lib/pixman/0008-Support-of-overlapping-src-dst-for-pixman_blt_sse2.patch create mode 100644 recipes/xorg-lib/pixman/0009-Support-of-overlapping-src-dst-for-pixman_blt_neon.patch diff --git a/recipes/xorg-lib/pixman/0001-Add-CONVERT_0565_TO_8888-macro.patch b/recipes/xorg-lib/pixman/0001-Add-CONVERT_0565_TO_8888-macro.patch new file mode 100644 index 0000000000..4caf6393fc --- /dev/null +++ b/recipes/xorg-lib/pixman/0001-Add-CONVERT_0565_TO_8888-macro.patch @@ -0,0 +1,27 @@ +From deb3b0ab6a97f4584fe37b3ef708dcad59ceddde Mon Sep 17 00:00:00 2001 +From: Alexander Larsson +Date: Fri, 12 Mar 2010 16:23:42 +0100 +Subject: [PATCH 1/9] Add CONVERT_0565_TO_8888 macro + +This lets us simplify some fast paths since we get a consistent +naming that always has 8888 and gets some value for alpha. +--- + pixman/pixman-private.h | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) + +diff --git a/pixman/pixman-private.h b/pixman/pixman-private.h +index 9dcdca7..d0bec39 100644 +--- a/pixman/pixman-private.h ++++ b/pixman/pixman-private.h +@@ -704,6 +704,8 @@ pixman_region16_copy_from_region32 (pixman_region16_t *dst, + ((((s) << 5) & 0xfc00) | (((s) >> 1) & 0x300)) | \ + ((((s) << 8) & 0xf80000) | (((s) << 3) & 0x70000))) + ++#define CONVERT_0565_TO_8888(s) (CONVERT_0565_TO_0888(s) | 0xff000000) ++ + #define PIXMAN_FORMAT_IS_WIDE(f) \ + (PIXMAN_FORMAT_A (f) > 8 || \ + PIXMAN_FORMAT_R (f) > 8 || \ +-- +1.6.6.1 + diff --git a/recipes/xorg-lib/pixman/0002-Add-CONVERT_8888_TO_8888-and-CONVERT_0565_TO_0565-ma.patch b/recipes/xorg-lib/pixman/0002-Add-CONVERT_8888_TO_8888-and-CONVERT_0565_TO_0565-ma.patch new file mode 100644 index 0000000000..871ce75078 --- /dev/null +++ b/recipes/xorg-lib/pixman/0002-Add-CONVERT_8888_TO_8888-and-CONVERT_0565_TO_0565-ma.patch @@ -0,0 +1,28 @@ +From 7c2da7f27c2dd04d9ed3db5fd13f1da26cebfa3a Mon Sep 17 00:00:00 2001 +From: Alexander Larsson +Date: Tue, 16 Mar 2010 14:18:29 +0100 +Subject: [PATCH 2/9] Add CONVERT_8888_TO_8888 and CONVERT_0565_TO_0565 macros + +These are useful for macroization +--- + pixman/pixman-private.h | 4 ++++ + 1 files changed, 4 insertions(+), 0 deletions(-) + +diff --git a/pixman/pixman-private.h b/pixman/pixman-private.h +index d0bec39..bc41249 100644 +--- a/pixman/pixman-private.h ++++ b/pixman/pixman-private.h +@@ -706,6 +706,10 @@ pixman_region16_copy_from_region32 (pixman_region16_t *dst, + + #define CONVERT_0565_TO_8888(s) (CONVERT_0565_TO_0888(s) | 0xff000000) + ++/* Trivial versions that are useful in macros */ ++#define CONVERT_8888_TO_8888(s) (s) ++#define CONVERT_0565_TO_0565(s) (s) ++ + #define PIXMAN_FORMAT_IS_WIDE(f) \ + (PIXMAN_FORMAT_A (f) > 8 || \ + PIXMAN_FORMAT_R (f) > 8 || \ +-- +1.6.6.1 + diff --git a/recipes/xorg-lib/pixman/0003-Add-FAST_PATH_NO_NONE_REPEAT-flag.patch b/recipes/xorg-lib/pixman/0003-Add-FAST_PATH_NO_NONE_REPEAT-flag.patch new file mode 100644 index 0000000000..d9a79985a8 --- /dev/null +++ b/recipes/xorg-lib/pixman/0003-Add-FAST_PATH_NO_NONE_REPEAT-flag.patch @@ -0,0 +1,53 @@ +From 6e80b9148a7f43b7b40235a57c1066fe64e371e5 Mon Sep 17 00:00:00 2001 +From: Alexander Larsson +Date: Fri, 12 Mar 2010 15:40:07 +0100 +Subject: [PATCH 3/9] Add FAST_PATH_NO_NONE_REPEAT flag + +--- + pixman/pixman-image.c | 10 +++++++--- + pixman/pixman-private.h | 1 + + 2 files changed, 8 insertions(+), 3 deletions(-) + +diff --git a/pixman/pixman-image.c b/pixman/pixman-image.c +index d09d193..df5b457 100644 +--- a/pixman/pixman-image.c ++++ b/pixman/pixman-image.c +@@ -335,16 +335,20 @@ compute_image_info (pixman_image_t *image) + /* Repeat mode */ + switch (image->common.repeat) + { ++ case PIXMAN_REPEAT_NONE: ++ flags |= FAST_PATH_NO_REFLECT_REPEAT | FAST_PATH_NO_PAD_REPEAT; ++ break; ++ + case PIXMAN_REPEAT_REFLECT: +- flags |= FAST_PATH_NO_PAD_REPEAT; ++ flags |= FAST_PATH_NO_PAD_REPEAT | FAST_PATH_NO_NONE_REPEAT; + break; + + case PIXMAN_REPEAT_PAD: +- flags |= FAST_PATH_NO_REFLECT_REPEAT; ++ flags |= FAST_PATH_NO_REFLECT_REPEAT | FAST_PATH_NO_NONE_REPEAT; + break; + + default: +- flags |= (FAST_PATH_NO_REFLECT_REPEAT | FAST_PATH_NO_PAD_REPEAT); ++ flags |= FAST_PATH_NO_REFLECT_REPEAT | FAST_PATH_NO_PAD_REPEAT | FAST_PATH_NO_NONE_REPEAT; + break; + } + +diff --git a/pixman/pixman-private.h b/pixman/pixman-private.h +index bc41249..65314b9 100644 +--- a/pixman/pixman-private.h ++++ b/pixman/pixman-private.h +@@ -579,6 +579,7 @@ _pixman_choose_implementation (void); + #define FAST_PATH_SIMPLE_REPEAT (1 << 12) + #define FAST_PATH_IS_OPAQUE (1 << 13) + #define FAST_PATH_NEEDS_WORKAROUND (1 << 14) ++#define FAST_PATH_NO_NONE_REPEAT (1 << 15) + + #define _FAST_PATH_STANDARD_FLAGS \ + (FAST_PATH_ID_TRANSFORM | \ +-- +1.6.6.1 + diff --git a/recipes/xorg-lib/pixman/0004-Add-FAST_PATH_SAMPLES_COVER_CLIP-and-FAST_PATH_16BIT.patch b/recipes/xorg-lib/pixman/0004-Add-FAST_PATH_SAMPLES_COVER_CLIP-and-FAST_PATH_16BIT.patch new file mode 100644 index 0000000000..eb388475d9 --- /dev/null +++ b/recipes/xorg-lib/pixman/0004-Add-FAST_PATH_SAMPLES_COVER_CLIP-and-FAST_PATH_16BIT.patch @@ -0,0 +1,167 @@ +From 8e7e8e3f96b094616f37fdf8a35043d7c5f64417 Mon Sep 17 00:00:00 2001 +From: Alexander Larsson +Date: Fri, 12 Mar 2010 15:41:01 +0100 +Subject: [PATCH 4/9] Add FAST_PATH_SAMPLES_COVER_CLIP and FAST_PATH_16BIT_SAFE + +FAST_PATH_SAMPLES_COVER_CLIP: + +This is set of the source sample grid, unrepeated but transformed +completely completely covers the clip destination. If this is set +you can use a simple scaled that doesn't have to care about the repeat +mode. + +FAST_PATH_16BIT_SAFE: + +This signifies two things: +1) The size of the src/mask fits in a 16.16 fixed point, so something like: + + max_vx = src_image->bits.width << 16; + + Is allowed and is guaranteed to not overflow max_vx + +2) When stepping the source space we're guaranteed to never overflow + a 16.16 bit fix point variable, even if we step one extra step + in the destination space. This means that a loop doing: + + x = vx >> 16; + vx += unit_x; d = src_row[x]; + + will never overflow vx causing x to be negative. + + And additionally, if you track vx like above and apply NORMAL repeat + after the vx addition with something like: + + while (vx >= max_vx) vx -= max_vx; + + This will never overflow the vx even on the final increment that + takes vx one past the end of where we will read, which makes the + repeat loop safe. +--- + pixman/pixman-private.h | 2 + + pixman/pixman.c | 84 +++++++++++++++++++++++++++++++++++++--------- + 2 files changed, 69 insertions(+), 17 deletions(-) + +diff --git a/pixman/pixman-private.h b/pixman/pixman-private.h +index 65314b9..0cf9113 100644 +--- a/pixman/pixman-private.h ++++ b/pixman/pixman-private.h +@@ -580,6 +580,8 @@ _pixman_choose_implementation (void); + #define FAST_PATH_IS_OPAQUE (1 << 13) + #define FAST_PATH_NEEDS_WORKAROUND (1 << 14) + #define FAST_PATH_NO_NONE_REPEAT (1 << 15) ++#define FAST_PATH_SAMPLES_COVER_CLIP (1 << 16) ++#define FAST_PATH_16BIT_SAFE (1 << 17) + + #define _FAST_PATH_STANDARD_FLAGS \ + (FAST_PATH_ID_TRANSFORM | \ +diff --git a/pixman/pixman.c b/pixman/pixman.c +index c71617e..e967e34 100644 +--- a/pixman/pixman.c ++++ b/pixman/pixman.c +@@ -479,24 +479,75 @@ walk_region_internal (pixman_implementation_t *imp, + } + } + +-static force_inline pixman_bool_t +-image_covers (pixman_image_t *image, +- pixman_box32_t *extents, +- int x, +- int y) ++#define IS_16BIT(x) (((x) >= INT16_MIN) && ((x) <= INT16_MAX)) ++ ++static force_inline uint32_t ++compute_src_extents_flags (pixman_image_t *image, ++ pixman_box32_t *extents, ++ int x, ++ int y) + { +- if (image->common.type == BITS && +- image->common.repeat == PIXMAN_REPEAT_NONE) ++ pixman_box16_t extents16; ++ uint32_t flags; ++ ++ flags = FAST_PATH_COVERS_CLIP; ++ ++ if (image->common.type != BITS) ++ return flags; ++ ++ if (image->common.repeat == PIXMAN_REPEAT_NONE && ++ (x > extents->x1 || y > extents->y1 || ++ x + image->bits.width < extents->x2 || ++ y + image->bits.height < extents->y2)) ++ { ++ flags &= ~FAST_PATH_COVERS_CLIP; ++ } ++ ++ if (IS_16BIT (extents->x1 - x) && ++ IS_16BIT (extents->y1 - y) && ++ IS_16BIT (extents->x2 - x) && ++ IS_16BIT (extents->y2 - y)) + { +- if (x > extents->x1 || y > extents->y1 || +- x + image->bits.width < extents->x2 || +- y + image->bits.height < extents->y2) ++ extents16.x1 = extents->x1 - x; ++ extents16.y1 = extents->y1 - y; ++ extents16.x2 = extents->x2 - x; ++ extents16.y2 = extents->y2 - y; ++ ++ if (!image->common.transform || ++ pixman_transform_bounds (image->common.transform, &extents16)) + { +- return FALSE; ++ if (extents16.x1 >= 0 && extents16.y1 >= 0 && ++ extents16.x2 <= image->bits.width && ++ extents16.y2 <= image->bits.height) ++ { ++ flags |= FAST_PATH_SAMPLES_COVER_CLIP; ++ } + } + } + +- return TRUE; ++ if (IS_16BIT (extents->x1 - x - 1) && ++ IS_16BIT (extents->y1 - y - 1) && ++ IS_16BIT (extents->x2 - x + 1) && ++ IS_16BIT (extents->y2 - y + 1)) ++ { ++ extents16.x1 = extents->x1 - x - 1; ++ extents16.y1 = extents->y1 - y - 1; ++ extents16.x2 = extents->x2 - x + 1; ++ extents16.y2 = extents->y2 - y + 1; ++ ++ if (/* src space expanded by one in dest space fits in 16 bit */ ++ (!image->common.transform || ++ pixman_transform_bounds (image->common.transform, &extents16)) && ++ /* And src image size can be used as 16.16 fixed point */ ++ image->bits.width < 0x7fff && ++ image->bits.height < 0x7fff) ++ { ++ /* Then we're "16bit safe" */ ++ flags |= FAST_PATH_16BIT_SAFE; ++ } ++ } ++ ++ return flags; + } + + static void +@@ -581,11 +632,10 @@ do_composite (pixman_implementation_t *imp, + + extents = pixman_region32_extents (®ion); + +- if (image_covers (src, extents, dest_x - src_x, dest_y - src_y)) +- src_flags |= FAST_PATH_COVERS_CLIP; +- +- if (mask && image_covers (mask, extents, dest_x - mask_x, dest_y - mask_y)) +- mask_flags |= FAST_PATH_COVERS_CLIP; ++ src_flags |= compute_src_extents_flags (src, extents, dest_x - src_x, dest_y - src_y); ++ ++ if (mask) ++ mask_flags |= compute_src_extents_flags (mask, extents, dest_x - mask_x, dest_y - mask_y); + + /* + * Check if we can replace our operator by a simpler one +-- +1.6.6.1 + diff --git a/recipes/xorg-lib/pixman/0005-Add-specialized-fast-nearest-scalers.patch b/recipes/xorg-lib/pixman/0005-Add-specialized-fast-nearest-scalers.patch new file mode 100644 index 0000000000..6be7b9312c --- /dev/null +++ b/recipes/xorg-lib/pixman/0005-Add-specialized-fast-nearest-scalers.patch @@ -0,0 +1,284 @@ +From def20085302693c032e81456d975454acd356acd Mon Sep 17 00:00:00 2001 +From: Alexander Larsson +Date: Fri, 12 Mar 2010 15:45:04 +0100 +Subject: [PATCH 5/9] Add specialized fast nearest scalers + +This is a macroized version of SRC/OVER repeat normal/unneeded nearest +neighbour scaling instantiated for some common 8888 and 565 formats. + +Based on work by Siarhei Siamashka +--- + pixman/pixman-fast-path.c | 243 +++++++++++++++++++++++++++++++++++++++++++++ + 1 files changed, 243 insertions(+), 0 deletions(-) + +diff --git a/pixman/pixman-fast-path.c b/pixman/pixman-fast-path.c +index 4d26b0f..6607a47 100644 +--- a/pixman/pixman-fast-path.c ++++ b/pixman/pixman-fast-path.c +@@ -27,6 +27,7 @@ + #include + #endif + #include ++#include + #include "pixman-private.h" + #include "pixman-combine32.h" + +@@ -1373,6 +1374,208 @@ repeat (pixman_repeat_t repeat, int *c, int size) + return TRUE; + } + ++/* A macroified version of specialized nearest scalers for some ++ * common 8888 and 565 formats. It supports SRC and OVER ops. ++ * ++ * There are two repeat versions, one that handles repeat normal, ++ * and one without repeat handling that only works if the src region ++ * used is completely covered by the pre-repeated source samples. ++ * ++ * The loops are unrolled to process two pixels per iteration for better ++ * performance on most CPU architectures (superscalar processors ++ * can issue several operations simultaneously, other processors can hide ++ * instructions latencies by pipelining operations). Unrolling more ++ * does not make much sense because the compiler will start running out ++ * of spare registers soon. ++ */ ++ ++#define GET_8888_ALPHA(s) ((s) >> 24) ++ /* This is not actually used since we don't have an OVER with ++ 565 source, but it is needed to build. */ ++#define GET_0565_ALPHA(s) 0xff ++ ++#define FAST_NEAREST(scale_func_name, SRC_FORMAT, DST_FORMAT, \ ++ src_type_t, dst_type_t, OP, do_repeat) \ ++static void \ ++fast_composite_scaled_nearest_ ## scale_func_name ## _ ## OP (pixman_implementation_t *imp, \ ++ pixman_op_t op, \ ++ pixman_image_t * src_image, \ ++ pixman_image_t * mask_image, \ ++ pixman_image_t * dst_image, \ ++ int32_t src_x, \ ++ int32_t src_y, \ ++ int32_t mask_x, \ ++ int32_t mask_y, \ ++ int32_t dst_x, \ ++ int32_t dst_y, \ ++ int32_t width, \ ++ int32_t height) \ ++{ \ ++ dst_type_t *dst_line; \ ++ src_type_t *src_first_line; \ ++ uint32_t d; \ ++ src_type_t s1, s2; \ ++ uint8_t a1, a2; \ ++ int w; \ ++ int x1, x2, y; \ ++ pixman_fixed_t orig_vx; \ ++ pixman_fixed_t max_vx, max_vy; \ ++ pixman_vector_t v; \ ++ pixman_fixed_t vx, vy; \ ++ pixman_fixed_t unit_x, unit_y; \ ++ \ ++ src_type_t *src; \ ++ dst_type_t *dst; \ ++ int src_stride, dst_stride; \ ++ \ ++ if (PIXMAN_OP_ ## OP != PIXMAN_OP_SRC && PIXMAN_OP_ ## OP != PIXMAN_OP_OVER) \ ++ abort(); \ ++ \ ++ PIXMAN_IMAGE_GET_LINE (dst_image, dst_x, dst_y, dst_type_t, dst_stride, dst_line, 1); \ ++ /* pass in 0 instead of src_x and src_y because src_x and src_y need to be \ ++ * transformed from destination space to source space */ \ ++ PIXMAN_IMAGE_GET_LINE (src_image, 0, 0, src_type_t, src_stride, src_first_line, 1); \ ++ \ ++ /* reference point is the center of the pixel */ \ ++ v.vector[0] = pixman_int_to_fixed (src_x) + pixman_fixed_1 / 2; \ ++ v.vector[1] = pixman_int_to_fixed (src_y) + pixman_fixed_1 / 2; \ ++ v.vector[2] = pixman_fixed_1; \ ++ \ ++ if (!pixman_transform_point_3d (src_image->common.transform, &v)) \ ++ return; \ ++ \ ++ unit_x = src_image->common.transform->matrix[0][0]; \ ++ unit_y = src_image->common.transform->matrix[1][1]; \ ++ \ ++ /* Round down to closest integer, ensuring that 0.5 rounds to 0, not 1 */ \ ++ v.vector[0] -= pixman_fixed_e; \ ++ v.vector[1] -= pixman_fixed_e; \ ++ \ ++ vx = v.vector[0]; \ ++ vy = v.vector[1]; \ ++ \ ++ if (do_repeat) \ ++ { \ ++ /* Clamp repeating positions inside the actual samples */ \ ++ max_vx = src_image->bits.width << 16; \ ++ max_vy = src_image->bits.height << 16; \ ++ \ ++ repeat (PIXMAN_REPEAT_NORMAL, &vx, max_vx); \ ++ repeat (PIXMAN_REPEAT_NORMAL, &vy, max_vy); \ ++ } \ ++ \ ++ orig_vx = vx; \ ++ \ ++ while (--height >= 0) \ ++ { \ ++ dst = dst_line; \ ++ dst_line += dst_stride; \ ++ \ ++ y = vy >> 16; \ ++ vy += unit_y; \ ++ if (do_repeat) \ ++ repeat (PIXMAN_REPEAT_NORMAL, &vy, max_vy); \ ++ \ ++ src = src_first_line + src_stride * y; \ ++ \ ++ w = width; \ ++ vx = orig_vx; \ ++ while ((w -= 2) >= 0) \ ++ { \ ++ x1 = vx >> 16; \ ++ vx += unit_x; \ ++ if (do_repeat) \ ++ repeat (PIXMAN_REPEAT_NORMAL, &vx, max_vx); \ ++ s1 = src[x1]; \ ++ \ ++ x2 = vx >> 16; \ ++ vx += unit_x; \ ++ if (do_repeat) \ ++ repeat (PIXMAN_REPEAT_NORMAL, &vx, max_vx); \ ++ s2 = src[x2]; \ ++ \ ++ if (PIXMAN_OP_ ## OP == PIXMAN_OP_OVER) \ ++ { \ ++ a1 = GET_ ## SRC_FORMAT ## _ALPHA(s1); \ ++ a2 = GET_ ## SRC_FORMAT ## _ALPHA(s2); \ ++ \ ++ if (a1 == 0xff) \ ++ { \ ++ *dst = CONVERT_ ## SRC_FORMAT ## _TO_ ## DST_FORMAT (s1); \ ++ } \ ++ else if (s1) \ ++ { \ ++ d = CONVERT_## DST_FORMAT ## _TO_8888 (*dst); \ ++ a1 ^= 0xff; \ ++ UN8x4_MUL_UN8_ADD_UN8x4 (d, a1, s1); \ ++ *dst = CONVERT_8888_TO_ ## DST_FORMAT (d); \ ++ } \ ++ dst++; \ ++ \ ++ if (a2 == 0xff) \ ++ { \ ++ *dst = CONVERT_ ## SRC_FORMAT ## _TO_ ## DST_FORMAT (s2); \ ++ } \ ++ else if (s2) \ ++ { \ ++ d = CONVERT_## DST_FORMAT ## _TO_8888 (*dst); \ ++ a2 ^= 0xff; \ ++ UN8x4_MUL_UN8_ADD_UN8x4 (d, a2, s2); \ ++ *dst = CONVERT_8888_TO_ ## DST_FORMAT (d); \ ++ } \ ++ dst++; \ ++ } \ ++ else /* PIXMAN_OP_SRC */ \ ++ { \ ++ *dst++ = CONVERT_ ## SRC_FORMAT ## _TO_ ## DST_FORMAT (s1); \ ++ *dst++ = CONVERT_ ## SRC_FORMAT ## _TO_ ## DST_FORMAT (s2); \ ++ } \ ++ } \ ++ \ ++ if (w & 1) \ ++ { \ ++ x1 = vx >> 16; \ ++ vx += unit_x; \ ++ if (do_repeat) \ ++ repeat (PIXMAN_REPEAT_NORMAL, &vx, max_vx); \ ++ s1 = src[x1]; \ ++ \ ++ if (PIXMAN_OP_ ## OP == PIXMAN_OP_OVER) \ ++ { \ ++ a1 = GET_ ## SRC_FORMAT ## _ALPHA(s1); \ ++ \ ++ if (a1 == 0xff) \ ++ { \ ++ *dst = CONVERT_ ## SRC_FORMAT ## _TO_ ## DST_FORMAT (s1); \ ++ } \ ++ else if (s1) \ ++ { \ ++ d = CONVERT_## DST_FORMAT ## _TO_8888 (*dst); \ ++ a1 ^= 0xff; \ ++ UN8x4_MUL_UN8_ADD_UN8x4 (d, a1, s1); \ ++ *dst = CONVERT_8888_TO_ ## DST_FORMAT (d); \ ++ } \ ++ dst++; \ ++ } \ ++ else /* PIXMAN_OP_SRC */ \ ++ { \ ++ *dst++ = CONVERT_ ## SRC_FORMAT ## _TO_ ## DST_FORMAT (s1); \ ++ } \ ++ } \ ++ } \ ++} ++ ++FAST_NEAREST(x888_x888_none, 8888, 8888, uint32_t, uint32_t, SRC, /*repeat: */ 0); ++FAST_NEAREST(x888_x888_normal, 8888, 8888, uint32_t, uint32_t, SRC, /*repeat: */ 1); ++FAST_NEAREST(x888_x888_none, 8888, 8888, uint32_t, uint32_t, OVER, /*repeat: */ 0); ++FAST_NEAREST(x888_x888_normal, 8888, 8888, uint32_t, uint32_t, OVER, /*repeat: */ 1); ++FAST_NEAREST(x888_565_none, 8888, 0565, uint32_t, uint16_t, SRC, /*repeat: */ 0); ++FAST_NEAREST(x888_565_normal, 8888, 0565, uint32_t, uint16_t, SRC, /*repeat: */ 1); ++FAST_NEAREST(565_565_none, 0565, 0565, uint16_t, uint16_t, SRC, /*repeat: */ 0); ++FAST_NEAREST(565_565_normal, 0565, 0565, uint16_t, uint16_t, SRC, /*repeat: */ 1); ++FAST_NEAREST(8888_565_none, 8888, 0565, uint32_t, uint16_t, OVER, /*repeat: */ 0); ++FAST_NEAREST(8888_565_normal, 8888, 0565, uint32_t, uint16_t, OVER, /*repeat: */ 1); ++ + static force_inline uint32_t + fetch_nearest (pixman_repeat_t src_repeat, + pixman_format_code_t format, +@@ -1595,6 +1798,46 @@ static const pixman_fast_path_t c_fast_paths[] = + FAST_PATH_NO_ACCESSORS | \ + FAST_PATH_NO_WIDE_FORMAT) + ++#define HAS_NORMAL_REPEAT_FLAGS \ ++ (FAST_PATH_NO_REFLECT_REPEAT | \ ++ FAST_PATH_NO_PAD_REPEAT | \ ++ FAST_PATH_NO_NONE_REPEAT) ++ ++#define SIMPLE_NEAREST_FAST_PATH(op,s,d,func) \ ++ { PIXMAN_OP_ ## op, \ ++ PIXMAN_ ## s, \ ++ SCALED_NEAREST_FLAGS | HAS_NORMAL_REPEAT_FLAGS | FAST_PATH_16BIT_SAFE, \ ++ PIXMAN_null, 0, \ ++ PIXMAN_ ## d, FAST_PATH_STD_DEST_FLAGS, \ ++ fast_composite_scaled_nearest_ ## func ## _normal ## _ ## op, \ ++ }, \ ++ { PIXMAN_OP_ ## op, \ ++ PIXMAN_ ## s, \ ++ SCALED_NEAREST_FLAGS | FAST_PATH_SAMPLES_COVER_CLIP, \ ++ PIXMAN_null, 0, \ ++ PIXMAN_ ## d, FAST_PATH_STD_DEST_FLAGS, \ ++ fast_composite_scaled_nearest_ ## func ## _none ## _ ## op, \ ++ } ++ SIMPLE_NEAREST_FAST_PATH (SRC, x8r8g8b8, x8r8g8b8, x888_x888), ++ SIMPLE_NEAREST_FAST_PATH (SRC, a8r8g8b8, x8r8g8b8, x888_x888), ++ SIMPLE_NEAREST_FAST_PATH (SRC, x8b8g8r8, x8b8g8r8, x888_x888), ++ SIMPLE_NEAREST_FAST_PATH (SRC, a8b8g8r8, x8b8g8r8, x888_x888), ++ ++ SIMPLE_NEAREST_FAST_PATH (SRC, a8r8g8b8, a8r8g8b8, x888_x888), ++ SIMPLE_NEAREST_FAST_PATH (SRC, a8b8g8r8, a8b8g8r8, x888_x888), ++ ++ SIMPLE_NEAREST_FAST_PATH (SRC, x8r8g8b8, r5g6b5, x888_565), ++ SIMPLE_NEAREST_FAST_PATH (SRC, a8r8g8b8, r5g6b5, x888_565), ++ ++ SIMPLE_NEAREST_FAST_PATH (SRC, r5g6b5, r5g6b5, 565_565), ++ ++ SIMPLE_NEAREST_FAST_PATH (OVER, a8r8g8b8, x8r8g8b8, x888_x888), ++ SIMPLE_NEAREST_FAST_PATH (OVER, a8b8g8r8, x8b8g8r8, x888_x888), ++ SIMPLE_NEAREST_FAST_PATH (OVER, a8r8g8b8, a8r8g8b8, x888_x888), ++ SIMPLE_NEAREST_FAST_PATH (OVER, a8b8g8r8, a8b8g8r8, x888_x888), ++ ++ SIMPLE_NEAREST_FAST_PATH (OVER, a8b8g8r8, r5g6b5, 8888_565), ++ + #define NEAREST_FAST_PATH(op,s,d) \ + { PIXMAN_OP_ ## op, \ + PIXMAN_ ## s, SCALED_NEAREST_FLAGS, \ +-- +1.6.6.1 + diff --git a/recipes/xorg-lib/pixman/0006-Generic-C-implementation-of-pixman_blt-with-overlapp.patch b/recipes/xorg-lib/pixman/0006-Generic-C-implementation-of-pixman_blt-with-overlapp.patch new file mode 100644 index 0000000000..8b265c0d74 --- /dev/null +++ b/recipes/xorg-lib/pixman/0006-Generic-C-implementation-of-pixman_blt-with-overlapp.patch @@ -0,0 +1,114 @@ +From 8d1125fd6a25a0d1d758fd93384bf1baf07bcdf0 Mon Sep 17 00:00:00 2001 +From: Siarhei Siamashka +Date: Tue, 16 Mar 2010 16:55:28 +0100 +Subject: [PATCH 6/9] Generic C implementation of pixman_blt with overlapping support + +Uses memcpy/memmove functions to copy pixels, can handle the +case when both source and destination areas are in the same +image (this is useful for scrolling). + +It is assumed that copying direction is only important when +using the same image for both source and destination (and +src_stride == dst_stride). Copying direction is undefined +for the images with different source and destination stride +which happen to be in the overlapped areas (but this is an +unrealistic case anyway). +--- + pixman/pixman-general.c | 21 ++++++++++++++++++--- + pixman/pixman-private.h | 43 +++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 61 insertions(+), 3 deletions(-) + +diff --git a/pixman/pixman-general.c b/pixman/pixman-general.c +index bddf79a..f525744 100644 +--- a/pixman/pixman-general.c ++++ b/pixman/pixman-general.c +@@ -285,9 +285,24 @@ general_blt (pixman_implementation_t *imp, + int width, + int height) + { +- /* We can't blit unless we have sse2 or mmx */ +- +- return FALSE; ++ uint8_t *dst_bytes = (uint8_t *)dst_bits; ++ uint8_t *src_bytes = (uint8_t *)src_bits; ++ int bpp; ++ ++ if (src_bpp != dst_bpp || src_bpp & 7) ++ return FALSE; ++ ++ bpp = src_bpp >> 3; ++ width *= bpp; ++ src_stride *= 4; ++ dst_stride *= 4; ++ pixman_blt_helper (src_bytes + src_y * src_stride + src_x * bpp, ++ dst_bytes + dst_y * dst_stride + dst_x * bpp, ++ src_stride, ++ dst_stride, ++ width, ++ height); ++ return TRUE; + } + + static pixman_bool_t +diff --git a/pixman/pixman-private.h b/pixman/pixman-private.h +index 0cf9113..3478e1b 100644 +--- a/pixman/pixman-private.h ++++ b/pixman/pixman-private.h +@@ -10,6 +10,7 @@ + + #include "pixman.h" + #include ++#include + #include + #include + #include +@@ -866,4 +867,46 @@ void pixman_timer_register (pixman_timer_t *timer); + + #endif /* PIXMAN_TIMERS */ + ++/* a helper function, can blit 8-bit images with src/dst overlapping support */ ++static inline void ++pixman_blt_helper (uint8_t *src_bytes, ++ uint8_t *dst_bytes, ++ int src_stride, ++ int dst_stride, ++ int width, ++ int height) ++{ ++ /* ++ * The second part of this check is not strictly needed, but it prevents ++ * unnecessary upside-down processing of areas which belong to different ++ * images. Upside-down processing can be slower with fixed-distance-ahead ++ * prefetch and perceived as having more tearing. ++ */ ++ if (src_bytes < dst_bytes + width && ++ src_bytes + src_stride * height > dst_bytes) ++ { ++ src_bytes += src_stride * height - src_stride; ++ dst_bytes += dst_stride * height - dst_stride; ++ dst_stride = -dst_stride; ++ src_stride = -src_stride; ++ /* Horizontal scrolling to the left needs memmove */ ++ if (src_bytes + width > dst_bytes) ++ { ++ while (--height >= 0) ++ { ++ memmove (dst_bytes, src_bytes, width); ++ dst_bytes += dst_stride; ++ src_bytes += src_stride; ++ } ++ return; ++ } ++ } ++ while (--height >= 0) ++ { ++ memcpy (dst_bytes, src_bytes, width); ++ dst_bytes += dst_stride; ++ src_bytes += src_stride; ++ } ++} ++ + #endif /* PIXMAN_PRIVATE_H */ +-- +1.6.6.1 + diff --git a/recipes/xorg-lib/pixman/0007-Support-of-overlapping-src-dst-for-pixman_blt_mmx.patch b/recipes/xorg-lib/pixman/0007-Support-of-overlapping-src-dst-for-pixman_blt_mmx.patch new file mode 100644 index 0000000000..f9a812e376 --- /dev/null +++ b/recipes/xorg-lib/pixman/0007-Support-of-overlapping-src-dst-for-pixman_blt_mmx.patch @@ -0,0 +1,91 @@ +From ac9b18e8aefad1992c3057dc3cf7c309f14544d2 Mon Sep 17 00:00:00 2001 +From: Siarhei Siamashka +Date: Thu, 22 Oct 2009 05:45:47 +0300 +Subject: [PATCH 7/9] Support of overlapping src/dst for pixman_blt_mmx + +--- + pixman/pixman-mmx.c | 55 +++++++++++++++++++++++++++++--------------------- + 1 files changed, 32 insertions(+), 23 deletions(-) + +diff --git a/pixman/pixman-mmx.c b/pixman/pixman-mmx.c +index e084e7f..6212b31 100644 +--- a/pixman/pixman-mmx.c ++++ b/pixman/pixman-mmx.c +@@ -2994,34 +2994,43 @@ pixman_blt_mmx (uint32_t *src_bits, + { + uint8_t * src_bytes; + uint8_t * dst_bytes; +- int byte_width; ++ int bpp; + +- if (src_bpp != dst_bpp) ++ if (src_bpp != dst_bpp || src_bpp & 7) + return FALSE; + +- if (src_bpp == 16) +- { +- src_stride = src_stride * (int) sizeof (uint32_t) / 2; +- dst_stride = dst_stride * (int) sizeof (uint32_t) / 2; +- src_bytes = (uint8_t *)(((uint16_t *)src_bits) + src_stride * (src_y) + (src_x)); +- dst_bytes = (uint8_t *)(((uint16_t *)dst_bits) + dst_stride * (dst_y) + (dst_x)); +- byte_width = 2 * width; +- src_stride *= 2; +- dst_stride *= 2; +- } +- else if (src_bpp == 32) ++ bpp = src_bpp >> 3; ++ width *= bpp; ++ src_stride *= 4; ++ dst_stride *= 4; ++ src_bytes = (uint8_t *)src_bits + src_y * src_stride + src_x * bpp; ++ dst_bytes = (uint8_t *)dst_bits + dst_y * dst_stride + dst_x * bpp; ++ ++ if (src_bpp != 16 && src_bpp != 32) + { +- src_stride = src_stride * (int) sizeof (uint32_t) / 4; +- dst_stride = dst_stride * (int) sizeof (uint32_t) / 4; +- src_bytes = (uint8_t *)(((uint32_t *)src_bits) + src_stride * (src_y) + (src_x)); +- dst_bytes = (uint8_t *)(((uint32_t *)dst_bits) + dst_stride * (dst_y) + (dst_x)); +- byte_width = 4 * width; +- src_stride *= 4; +- dst_stride *= 4; ++ pixman_blt_helper (src_bytes, dst_bytes, src_stride, dst_stride, ++ width, height); ++ return TRUE; + } +- else ++ ++ if (src_bytes < dst_bytes && src_bytes + src_stride * height > dst_bytes) + { +- return FALSE; ++ src_bytes += src_stride * height - src_stride; ++ dst_bytes += dst_stride * height - dst_stride; ++ dst_stride = -dst_stride; ++ src_stride = -src_stride; ++ ++ if (src_bytes + width > dst_bytes) ++ { ++ /* TODO: reverse scanline copy using MMX */ ++ while (--height >= 0) ++ { ++ memmove (dst_bytes, src_bytes, width); ++ dst_bytes += dst_stride; ++ src_bytes += src_stride; ++ } ++ return TRUE; ++ } + } + + while (height--) +@@ -3031,7 +3040,7 @@ pixman_blt_mmx (uint32_t *src_bits, + uint8_t *d = dst_bytes; + src_bytes += src_stride; + dst_bytes += dst_stride; +- w = byte_width; ++ w = width; + + while (w >= 2 && ((unsigned long)d & 3)) + { +-- +1.6.6.1 + diff --git a/recipes/xorg-lib/pixman/0008-Support-of-overlapping-src-dst-for-pixman_blt_sse2.patch b/recipes/xorg-lib/pixman/0008-Support-of-overlapping-src-dst-for-pixman_blt_sse2.patch new file mode 100644 index 0000000000..5b311fe81f --- /dev/null +++ b/recipes/xorg-lib/pixman/0008-Support-of-overlapping-src-dst-for-pixman_blt_sse2.patch @@ -0,0 +1,91 @@ +From f6d6ad1063e29a95bad4c4a2e43f3ecf90344ef7 Mon Sep 17 00:00:00 2001 +From: Siarhei Siamashka +Date: Thu, 22 Oct 2009 05:45:54 +0300 +Subject: [PATCH 8/9] Support of overlapping src/dst for pixman_blt_sse2 + +--- + pixman/pixman-sse2.c | 55 +++++++++++++++++++++++++++++-------------------- + 1 files changed, 32 insertions(+), 23 deletions(-) + +diff --git a/pixman/pixman-sse2.c b/pixman/pixman-sse2.c +index 946e7ba..66053ae 100644 +--- a/pixman/pixman-sse2.c ++++ b/pixman/pixman-sse2.c +@@ -5299,34 +5299,43 @@ pixman_blt_sse2 (uint32_t *src_bits, + { + uint8_t * src_bytes; + uint8_t * dst_bytes; +- int byte_width; ++ int bpp; + +- if (src_bpp != dst_bpp) ++ if (src_bpp != dst_bpp || src_bpp & 7) + return FALSE; + +- if (src_bpp == 16) +- { +- src_stride = src_stride * (int) sizeof (uint32_t) / 2; +- dst_stride = dst_stride * (int) sizeof (uint32_t) / 2; +- src_bytes =(uint8_t *)(((uint16_t *)src_bits) + src_stride * (src_y) + (src_x)); +- dst_bytes = (uint8_t *)(((uint16_t *)dst_bits) + dst_stride * (dst_y) + (dst_x)); +- byte_width = 2 * width; +- src_stride *= 2; +- dst_stride *= 2; +- } +- else if (src_bpp == 32) ++ bpp = src_bpp >> 3; ++ width *= bpp; ++ src_stride *= 4; ++ dst_stride *= 4; ++ src_bytes = (uint8_t *)src_bits + src_y * src_stride + src_x * bpp; ++ dst_bytes = (uint8_t *)dst_bits + dst_y * dst_stride + dst_x * bpp; ++ ++ if (src_bpp != 16 && src_bpp != 32) + { +- src_stride = src_stride * (int) sizeof (uint32_t) / 4; +- dst_stride = dst_stride * (int) sizeof (uint32_t) / 4; +- src_bytes = (uint8_t *)(((uint32_t *)src_bits) + src_stride * (src_y) + (src_x)); +- dst_bytes = (uint8_t *)(((uint32_t *)dst_bits) + dst_stride * (dst_y) + (dst_x)); +- byte_width = 4 * width; +- src_stride *= 4; +- dst_stride *= 4; ++ pixman_blt_helper (src_bytes, dst_bytes, src_stride, dst_stride, ++ width, height); ++ return TRUE; + } +- else ++ ++ if (src_bytes < dst_bytes && src_bytes + src_stride * height > dst_bytes) + { +- return FALSE; ++ src_bytes += src_stride * height - src_stride; ++ dst_bytes += dst_stride * height - dst_stride; ++ dst_stride = -dst_stride; ++ src_stride = -src_stride; ++ ++ if (src_bytes + width > dst_bytes) ++ { ++ /* TODO: reverse scanline copy using SSE2 */ ++ while (--height >= 0) ++ { ++ memmove (dst_bytes, src_bytes, width); ++ dst_bytes += dst_stride; ++ src_bytes += src_stride; ++ } ++ return TRUE; ++ } + } + + cache_prefetch ((__m128i*)src_bytes); +@@ -5339,7 +5348,7 @@ pixman_blt_sse2 (uint32_t *src_bits, + uint8_t *d = dst_bytes; + src_bytes += src_stride; + dst_bytes += dst_stride; +- w = byte_width; ++ w = width; + + cache_prefetch_next ((__m128i*)s); + cache_prefetch_next ((__m128i*)d); +-- +1.6.6.1 + diff --git a/recipes/xorg-lib/pixman/0009-Support-of-overlapping-src-dst-for-pixman_blt_neon.patch b/recipes/xorg-lib/pixman/0009-Support-of-overlapping-src-dst-for-pixman_blt_neon.patch new file mode 100644 index 0000000000..ae7b043194 --- /dev/null +++ b/recipes/xorg-lib/pixman/0009-Support-of-overlapping-src-dst-for-pixman_blt_neon.patch @@ -0,0 +1,94 @@ +From 41572ca5aa9e50e4d1000b3da1e6ee43c6f4088a Mon Sep 17 00:00:00 2001 +From: Siarhei Siamashka +Date: Wed, 18 Nov 2009 06:08:48 +0200 +Subject: [PATCH 9/9] Support of overlapping src/dst for pixman_blt_neon + +--- + pixman/pixman-arm-neon.c | 62 +++++++++++++++++++++++++++++++++++++-------- + 1 files changed, 51 insertions(+), 11 deletions(-) + +diff --git a/pixman/pixman-arm-neon.c b/pixman/pixman-arm-neon.c +index 24ceeeb..134493d 100644 +--- a/pixman/pixman-arm-neon.c ++++ b/pixman/pixman-arm-neon.c +@@ -360,26 +360,66 @@ pixman_blt_neon (uint32_t *src_bits, + int width, + int height) + { +- if (src_bpp != dst_bpp) ++ uint8_t * src_bytes; ++ uint8_t * dst_bytes; ++ int bpp; ++ ++ if (src_bpp != dst_bpp || src_bpp & 7) + return FALSE; + ++ bpp = src_bpp >> 3; ++ width *= bpp; ++ src_stride *= 4; ++ dst_stride *= 4; ++ src_bytes = (uint8_t *)src_bits + src_y * src_stride + src_x * bpp; ++ dst_bytes = (uint8_t *)dst_bits + dst_y * dst_stride + dst_x * bpp; ++ ++ if (src_bpp != 16 && src_bpp != 32) ++ { ++ pixman_blt_helper (src_bytes, dst_bytes, src_stride, dst_stride, ++ width, height); ++ return TRUE; ++ } ++ ++ if (src_bytes < dst_bytes && src_bytes + src_stride * height > dst_bytes) ++ { ++ src_bytes += src_stride * height - src_stride; ++ dst_bytes += dst_stride * height - dst_stride; ++ dst_stride = -dst_stride; ++ src_stride = -src_stride; ++ ++ if (src_bytes + width > dst_bytes) ++ { ++ /* TODO: reverse scanline copy using NEON */ ++ while (--height >= 0) ++ { ++ memmove (dst_bytes, src_bytes, width); ++ dst_bytes += dst_stride; ++ src_bytes += src_stride; ++ } ++ return TRUE; ++ } ++ } ++ + switch (src_bpp) + { + case 16: + pixman_composite_src_0565_0565_asm_neon ( +- width, height, +- (uint16_t *)(((char *) dst_bits) + +- dst_y * dst_stride * 4 + dst_x * 2), dst_stride * 2, +- (uint16_t *)(((char *) src_bits) + +- src_y * src_stride * 4 + src_x * 2), src_stride * 2); ++ width >> 1, ++ height, ++ (uint16_t *) dst_bytes, ++ dst_stride >> 1, ++ (uint16_t *) src_bytes, ++ src_stride >> 1); + return TRUE; + case 32: + pixman_composite_src_8888_8888_asm_neon ( +- width, height, +- (uint32_t *)(((char *) dst_bits) + +- dst_y * dst_stride * 4 + dst_x * 4), dst_stride, +- (uint32_t *)(((char *) src_bits) + +- src_y * src_stride * 4 + src_x * 4), src_stride); ++ width >> 2, ++ height, ++ (uint32_t *) dst_bytes, ++ dst_stride >> 2, ++ (uint32_t *) src_bytes, ++ src_stride >> 2); + return TRUE; + default: + return FALSE; +-- +1.6.6.1 + diff --git a/recipes/xorg-lib/pixman_git.bb b/recipes/xorg-lib/pixman_git.bb index b15fc355f7..5080438cbc 100644 --- a/recipes/xorg-lib/pixman_git.bb +++ b/recipes/xorg-lib/pixman_git.bb @@ -3,24 +3,26 @@ PRIORITY = "optional" DESCRIPTION = "Low-level pixel manipulation library." LICENSE = "X11" -PV = "0.17.8" -PR = "r8" +PV = "0.17.10" +PR = "r0" PR_append = "+gitr${SRCREV}" BBCLASSEXTEND="native" -SRCREV = "7a15fa25ddb88ebb4ac00772854271f102f06e81" +SRCREV = "313353f1fb9d40d0c3aaf7cfb99ca978b29003a4" DEFAULT_PREFERENCE = "-1" -SRC_URI = "git://anongit.freedesktop.org/~sandmann/pixman;protocol=git;branch=flags \ - file://0003-Generic-C-implementation-of-pixman_blt-with-overlapp.patch;patch=1 \ - file://0004-Support-of-overlapping-src-dst-for-pixman_blt_mmx.patch;patch=1 \ - file://0005-Support-of-overlapping-src-dst-for-pixman_blt_sse2.patch;patch=1 \ - file://0006-Support-of-overlapping-src-dst-for-pixman_blt_neon.patch;patch=1 \ - file://1-composite.patch;patch=1 \ - file://2-composite.patch;patch=1 \ - file://3-composite.patch;patch=1 \ +SRC_URI = "git://anongit.freedesktop.org/pixman;protocol=git;branch=master \ + file://0001-Add-CONVERT_0565_TO_8888-macro.patch;patch=1 \ + file://0002-Add-CONVERT_8888_TO_8888-and-CONVERT_0565_TO_0565-ma.patch;patch=1 \ + file://0003-Add-FAST_PATH_NO_NONE_REPEAT-flag.patch;patch=1 \ + file://0004-Add-FAST_PATH_SAMPLES_COVER_CLIP-and-FAST_PATH_16BIT.patch;patch=1 \ + file://0005-Add-specialized-fast-nearest-scalers.patch;patch=1 \ + file://0006-Generic-C-implementation-of-pixman_blt-with-overlapp.patch;patch=1 \ + file://0007-Support-of-overlapping-src-dst-for-pixman_blt_mmx.patch;patch=1 \ + file://0008-Support-of-overlapping-src-dst-for-pixman_blt_sse2.patch;patch=1 \ + file://0009-Support-of-overlapping-src-dst-for-pixman_blt_neon.patch;patch=1 \ file://over-n-8-0565.patch;patch=1 \ file://src-8888-0565.patch;patch=1 \ " -- cgit v1.2.3 From ddda7726d2645f0f4b7f23187f3dc7a47ffdd5bc Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 16 Mar 2010 14:41:04 +0100 Subject: phoneui-shr-theme-neo: SRCREV bump Signed-off-by: Martin Jansa --- recipes/shr/phoneui-shr-theme-neo_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/shr/phoneui-shr-theme-neo_git.bb b/recipes/shr/phoneui-shr-theme-neo_git.bb index b13bb51e69..0bf26487af 100644 --- a/recipes/shr/phoneui-shr-theme-neo_git.bb +++ b/recipes/shr/phoneui-shr-theme-neo_git.bb @@ -6,7 +6,7 @@ LICENSE = "unknown" DEPENDS = "edje-native" RDEPENDS = "libphone-ui-shr" RSUGGESTS = "e-wm-theme-illume-neo gtk-theme-neo icon-theme-neo elementary-theme-neo" -SRCREV = "27e2247d7dce9496ee0ea9438b2a4fe8c16819ab" +SRCREV = "8e89c8dbae569a08cac246a3805fca20988c0ad1" PV = "0.1+gitr${SRCREV}" PR = "r0" -- cgit v1.2.3 From a4ed65667262535000c82fc60a5bf0b6d0017e51 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 16 Mar 2010 15:12:33 +0100 Subject: libxml-parser-perl: PR bump after libexpat soname change Signed-off-by: Martin Jansa --- recipes/perl/libxml-parser-perl_2.34.bb | 2 +- recipes/perl/libxml-parser-perl_2.36.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/perl/libxml-parser-perl_2.34.bb b/recipes/perl/libxml-parser-perl_2.34.bb index a7ee4f3a4b..0b423ab2c6 100644 --- a/recipes/perl/libxml-parser-perl_2.34.bb +++ b/recipes/perl/libxml-parser-perl_2.34.bb @@ -2,7 +2,7 @@ DESCRIPTION = "XML::Parser - A perl module for parsing XML documents" SECTION = "libs" LICENSE = "Artistic" DEPENDS += "expat expat-native" -PR = "r12" +PR = "r13" SRC_URI = "http://www.cpan.org/modules/by-module/XML/XML-Parser-${PV}.tar.gz" diff --git a/recipes/perl/libxml-parser-perl_2.36.bb b/recipes/perl/libxml-parser-perl_2.36.bb index 7431ef7a7c..63938992ff 100644 --- a/recipes/perl/libxml-parser-perl_2.36.bb +++ b/recipes/perl/libxml-parser-perl_2.36.bb @@ -2,7 +2,7 @@ DESCRIPTION = "XML::Parser - A perl module for parsing XML documents" SECTION = "libs" LICENSE = "Artistic" DEPENDS += "expat expat-native" -PR= "r1" +PR= "r2" SRC_URI = "http://www.cpan.org/modules/by-module/XML/XML-Parser-${PV}.tar.gz" -- cgit v1.2.3 From 408183fe885af8004336276607e54dee87f156e2 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 16 Mar 2010 15:12:53 +0100 Subject: vala-dbus-binding-tool: PR bump after libexpat soname change Signed-off-by: Martin Jansa --- recipes/vala-dbus-binding-tool/vala-dbus-binding-tool.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/vala-dbus-binding-tool/vala-dbus-binding-tool.inc b/recipes/vala-dbus-binding-tool/vala-dbus-binding-tool.inc index 770ef008bf..96c2836b25 100644 --- a/recipes/vala-dbus-binding-tool/vala-dbus-binding-tool.inc +++ b/recipes/vala-dbus-binding-tool/vala-dbus-binding-tool.inc @@ -3,7 +3,7 @@ SECTION = "devel" DEPENDS = "vala libgee libxml2 intltool-native" HOMEPAGE = "http://www.freesmartphone.org/index.php/Implementations/vala-dbus-binding-tool" LICENSE = "GPLv2" -INC_PR = "r1" +INC_PR = "r2" SRC_URI = "http://www.freesmartphone.org/sources/vala-dbus-binding-tool-${PV}.tar.bz2;name=archive" -- cgit v1.2.3 From 950f0a1a5c1db70279b36bc137619f71e8cc5a9c Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 16 Mar 2010 17:23:23 +0100 Subject: evas: PR bump after libexpat soname change Signed-off-by: Martin Jansa --- recipes/efl1/evas-native_svn.bb | 2 +- recipes/efl1/evas_svn.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/efl1/evas-native_svn.bb b/recipes/efl1/evas-native_svn.bb index 5c46a01234..a76997626c 100644 --- a/recipes/efl1/evas-native_svn.bb +++ b/recipes/efl1/evas-native_svn.bb @@ -1,7 +1,7 @@ require evas.inc inherit native DEPENDS = "freetype-native libxext-native libpng-native jpeg-native eet-native eina-native libfribidi-native" -PR = "r2" +PR = "r3" EXTRA_OECONF = "\ --x-includes=${STAGING_INCDIR}/X11 \ diff --git a/recipes/efl1/evas_svn.bb b/recipes/efl1/evas_svn.bb index d74433e7c6..bdcffa13ca 100644 --- a/recipes/efl1/evas_svn.bb +++ b/recipes/efl1/evas_svn.bb @@ -1,5 +1,5 @@ require evas.inc -PR = "r5" +PR = "r6" EVAS_CPU_TWEAKS = "" EVAS_CPU_TWEAKS_armv7a = "--enable-cpu-neon" -- cgit v1.2.3 From fbe36876df725a259ef983d9b52daf3254b7b8a5 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 16 Mar 2010 17:23:10 +0100 Subject: ecore: PR bump after libexpat soname change Signed-off-by: Martin Jansa --- recipes/efl1/ecore-native_svn.bb | 2 +- recipes/efl1/ecore_svn.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/efl1/ecore-native_svn.bb b/recipes/efl1/ecore-native_svn.bb index 22208b926e..7963574c7b 100644 --- a/recipes/efl1/ecore-native_svn.bb +++ b/recipes/efl1/ecore-native_svn.bb @@ -1,7 +1,7 @@ require ecore.inc inherit native DEPENDS = "eet-native evas-native" -PR = "r3" +PR = "r4" EXTRA_OECONF = "\ --enable-ecore-txt \ diff --git a/recipes/efl1/ecore_svn.bb b/recipes/efl1/ecore_svn.bb index 6fc4676214..e3fdf588bc 100644 --- a/recipes/efl1/ecore_svn.bb +++ b/recipes/efl1/ecore_svn.bb @@ -1,5 +1,5 @@ require ecore.inc -PR = "r8" +PR = "r9" SRC_URI += "\ file://iconv.patch;patch=1;maxrev=43996 \ -- cgit v1.2.3 From e5cb27071a47a6c49cd141d2a5549afabf74c45a Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 16 Mar 2010 17:23:41 +0100 Subject: edje: PR bump after libexpat soname change Signed-off-by: Martin Jansa --- recipes/efl1/edje-native_svn.bb | 2 +- recipes/efl1/edje-sdk_svn.bb | 2 +- recipes/efl1/edje_svn.bb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/recipes/efl1/edje-native_svn.bb b/recipes/efl1/edje-native_svn.bb index 7b4b79a300..33fe06f41c 100644 --- a/recipes/efl1/edje-native_svn.bb +++ b/recipes/efl1/edje-native_svn.bb @@ -1,6 +1,6 @@ require edje_${PV}.bb inherit native -PR = "r3" +PR = "r4" DEPENDS = "lua5.1-native evas-native ecore-native eet-native embryo-native" diff --git a/recipes/efl1/edje-sdk_svn.bb b/recipes/efl1/edje-sdk_svn.bb index 1733380c0b..e91652e16d 100644 --- a/recipes/efl1/edje-sdk_svn.bb +++ b/recipes/efl1/edje-sdk_svn.bb @@ -1,7 +1,7 @@ require edje_svn.bb inherit sdk -PR = "r3" +PR = "r4" SRCNAME = "${@bb.data.getVar('PN', d, 1).replace('-sdk', '')}" DEPENDS = "evas-native ecore-native eet-native embryo-native" diff --git a/recipes/efl1/edje_svn.bb b/recipes/efl1/edje_svn.bb index 433ded5764..e438e1b30b 100644 --- a/recipes/efl1/edje_svn.bb +++ b/recipes/efl1/edje_svn.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Edje is the Enlightenment graphical design & layout library" DEPENDS = "lua5.1 eet evas ecore embryo edje-native" LICENSE = "MIT BSD" PV = "0.9.92.060+svnr${SRCPV}" -PR = "r5" +PR = "r6" inherit efl -- cgit v1.2.3 From 4d84f2baca1badb915715701f990e0e2d3a6736a Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 16 Mar 2010 17:23:59 +0100 Subject: fontconfig: PR bump after libexpat soname change Signed-off-by: Martin Jansa --- recipes/fontconfig/fontconfig_2.2.95.bb | 2 +- recipes/fontconfig/fontconfig_2.3.91.bb | 2 +- recipes/fontconfig/fontconfig_2.3.95.bb | 2 +- recipes/fontconfig/fontconfig_2.4.1.bb | 2 +- recipes/fontconfig/fontconfig_2.6.0.bb | 2 +- recipes/fontconfig/fontconfig_2.6.99.bb | 1 + 6 files changed, 6 insertions(+), 5 deletions(-) diff --git a/recipes/fontconfig/fontconfig_2.2.95.bb b/recipes/fontconfig/fontconfig_2.2.95.bb index d1aab24951..7f143d1edd 100644 --- a/recipes/fontconfig/fontconfig_2.2.95.bb +++ b/recipes/fontconfig/fontconfig_2.2.95.bb @@ -5,7 +5,7 @@ DEPENDS += "fontconfig-native" SRC_URI += "file://fc-glyphname.patch;patch=1 \ file://fc-lang.patch;patch=1 \ file://local.conf" -PR = "r8" +PR = "r9" do_stage () { oe_libinstall -so -a -C src libfontconfig ${STAGING_LIBDIR} diff --git a/recipes/fontconfig/fontconfig_2.3.91.bb b/recipes/fontconfig/fontconfig_2.3.91.bb index ec6ef8e037..5b8425f189 100644 --- a/recipes/fontconfig/fontconfig_2.3.91.bb +++ b/recipes/fontconfig/fontconfig_2.3.91.bb @@ -7,7 +7,7 @@ SRC_URI += "file://fc-glyphname.patch;patch=1 \ file://one-j-too-many.patch;patch=1 \ file://local.conf" -PR = "r3" +PR = "r4" do_stage () { oe_libinstall -so -a -C src libfontconfig ${STAGING_LIBDIR} diff --git a/recipes/fontconfig/fontconfig_2.3.95.bb b/recipes/fontconfig/fontconfig_2.3.95.bb index 035f8467ed..25b4fb731f 100644 --- a/recipes/fontconfig/fontconfig_2.3.95.bb +++ b/recipes/fontconfig/fontconfig_2.3.95.bb @@ -2,7 +2,7 @@ require fontconfig.inc SRC_URI += "file://one-j-too-many.patch;patch=1" -PR = "r2" +PR = "r3" do_stage () { oe_libinstall -so -a -C src libfontconfig ${STAGING_LIBDIR} diff --git a/recipes/fontconfig/fontconfig_2.4.1.bb b/recipes/fontconfig/fontconfig_2.4.1.bb index c1d861cfb9..5b3c5b36d1 100644 --- a/recipes/fontconfig/fontconfig_2.4.1.bb +++ b/recipes/fontconfig/fontconfig_2.4.1.bb @@ -1,6 +1,6 @@ require fontconfig.inc -PR = "r3" +PR = "r4" SRC_URI += "https://stage.maemo.org/svn/maemo/projects/haf/trunk/fontconfig/device_symbols.h \ file://configure_fix.patch;patch=1 " diff --git a/recipes/fontconfig/fontconfig_2.6.0.bb b/recipes/fontconfig/fontconfig_2.6.0.bb index 5a056b7885..10c934918e 100644 --- a/recipes/fontconfig/fontconfig_2.6.0.bb +++ b/recipes/fontconfig/fontconfig_2.6.0.bb @@ -3,7 +3,7 @@ LICENSE = "BSD" DESCRIPTION = "A library for configuring and customizing font access." DEPENDS = "expat freetype zlib" -PR = "r1" +PR = "r2" SRC_URI = "http://fontconfig.org/release/fontconfig-${PV}.tar.gz \ file://fix-pkgconfig.patch;patch=1" diff --git a/recipes/fontconfig/fontconfig_2.6.99.bb b/recipes/fontconfig/fontconfig_2.6.99.bb index c812350b41..13502309f2 100644 --- a/recipes/fontconfig/fontconfig_2.6.99.bb +++ b/recipes/fontconfig/fontconfig_2.6.99.bb @@ -10,6 +10,7 @@ SRCREV = "96194cc3fa484837bf41598ff3f3d09b97c8dba4" SRC_URI = "git://anongit.freedesktop.org/~behdad/fontconfig;protocol=git \ " +PR = "r1" S = "${WORKDIR}/git" PACKAGES =+ "fontconfig-utils-dbg fontconfig-utils " -- cgit v1.2.3 From a62cb41071da352093e2a15e65d5eb11bd2cb483 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 16 Mar 2010 18:01:33 +0100 Subject: dbus-glib: PR bump after libexpat soname change Signed-off-by: Martin Jansa --- recipes/dbus/dbus-glib-native_0.74.bb | 2 +- recipes/dbus/dbus-glib-native_0.76.bb | 2 +- recipes/dbus/dbus-glib_0.74.bb | 2 +- recipes/dbus/dbus-glib_0.76.bb | 2 +- recipes/dbus/dbus-glib_0.78.bb | 1 + recipes/dbus/dbus-glib_0.82.bb | 2 +- 6 files changed, 6 insertions(+), 5 deletions(-) diff --git a/recipes/dbus/dbus-glib-native_0.74.bb b/recipes/dbus/dbus-glib-native_0.74.bb index e37a64cfea..1a1463411d 100644 --- a/recipes/dbus/dbus-glib-native_0.74.bb +++ b/recipes/dbus/dbus-glib-native_0.74.bb @@ -1,5 +1,5 @@ SECTION = "base" -PR = "r0" +PR = "r1" HOMEPAGE = "http://www.freedesktop.org/Software/dbus" DESCRIPTION = "Message bus system for applications to talk to one another" LICENSE = "GPL" diff --git a/recipes/dbus/dbus-glib-native_0.76.bb b/recipes/dbus/dbus-glib-native_0.76.bb index d76cc043d4..b50d18ef04 100644 --- a/recipes/dbus/dbus-glib-native_0.76.bb +++ b/recipes/dbus/dbus-glib-native_0.76.bb @@ -1,5 +1,5 @@ SECTION = "base" -PR = "r0" +PR = "r1" HOMEPAGE = "http://www.freedesktop.org/Software/dbus" DESCRIPTION = "message bus system for applications to talk to one another" LICENSE = "GPL" diff --git a/recipes/dbus/dbus-glib_0.74.bb b/recipes/dbus/dbus-glib_0.74.bb index 3c5512feb6..7b9a8289ad 100644 --- a/recipes/dbus/dbus-glib_0.74.bb +++ b/recipes/dbus/dbus-glib_0.74.bb @@ -1,5 +1,5 @@ SECTION = "base" -PR = "r0" +PR = "r1" HOMEPAGE = "http://www.freedesktop.org/Software/dbus" DESCRIPTION = "Message bus system for applications to talk to one another" LICENSE = "GPL" diff --git a/recipes/dbus/dbus-glib_0.76.bb b/recipes/dbus/dbus-glib_0.76.bb index 0a34c738c3..8dd5b836fd 100644 --- a/recipes/dbus/dbus-glib_0.76.bb +++ b/recipes/dbus/dbus-glib_0.76.bb @@ -1,5 +1,5 @@ SECTION = "base" -PR = "r0" +PR = "r1" HOMEPAGE = "http://www.freedesktop.org/Software/dbus" DESCRIPTION = "message bus system for applications to talk to one another" LICENSE = "GPL" diff --git a/recipes/dbus/dbus-glib_0.78.bb b/recipes/dbus/dbus-glib_0.78.bb index 398314bdff..20a27860b9 100644 --- a/recipes/dbus/dbus-glib_0.78.bb +++ b/recipes/dbus/dbus-glib_0.78.bb @@ -1,4 +1,5 @@ SECTION = "base" +PR = "r1" HOMEPAGE = "http://www.freedesktop.org/Software/dbus" DESCRIPTION = "message bus system for applications to talk to one another" LICENSE = "GPL" diff --git a/recipes/dbus/dbus-glib_0.82.bb b/recipes/dbus/dbus-glib_0.82.bb index f5790dcd0e..461df61c9e 100644 --- a/recipes/dbus/dbus-glib_0.82.bb +++ b/recipes/dbus/dbus-glib_0.82.bb @@ -1,2 +1,2 @@ require dbus-glib.inc -PR = "${INC_PR}.0" +PR = "${INC_PR}.1" -- cgit v1.2.3 From dd812f9f378b3474585789c59dd3005a35a979ff Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 16 Mar 2010 18:02:53 +0100 Subject: dbus: PR bump after libexpat soname change Signed-off-by: Martin Jansa --- recipes/dbus/dbus.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/dbus/dbus.inc b/recipes/dbus/dbus.inc index 08940a670c..2c41eb12c9 100644 --- a/recipes/dbus/dbus.inc +++ b/recipes/dbus/dbus.inc @@ -4,7 +4,7 @@ SECTION = "base" LICENSE = "GPL" DEPENDS = "expat glib-2.0 virtual/libintl libsm libice virtual/libx11" -INC_PR = "r17" +INC_PR = "r18" SRC_URI = "\ http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz;name=dbus \ -- cgit v1.2.3 From e52ae858a634df0361d0f0a2696e05682f7dbd9d Mon Sep 17 00:00:00 2001 From: Adrian Alonso Date: Fri, 5 Mar 2010 13:15:17 +0000 Subject: linux.inc: add device tree for xilinx ml507 Signed-off-by: Adrian Alonso Signed-off-by: Stefan Schmidt --- recipes/linux/linux.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes/linux/linux.inc b/recipes/linux/linux.inc index 8f9b323902..b0f78de668 100644 --- a/recipes/linux/linux.inc +++ b/recipes/linux/linux.inc @@ -39,6 +39,7 @@ KERNEL_DEVICETREE_mpc8315e-rdb = "arch/${ARCH}/boot/dts/mpc8315erdb.dts" KERNEL_DEVICETREE_mpc8323e-rdb = "arch/${ARCH}/boot/dts/mpc832x_rdb.dts" KERNEL_DEVICETREE_sequoia = "arch/${ARCH}/boot/dts/sequoia.dts" KERNEL_DEVICETREE_p2020ds = "arch/${ARCH}/boot/dts/p2020ds.dts" +KERNEL_DEVICETREE_xilinx-ml507 = "arch/${ARCH}/boot/dts/virtex440-ml507.dts" KERNEL_DEVICETREE_FLAGS = "-R 8 -S 0x3000" -- cgit v1.2.3 From 7a6addf03f29380b3771132849c896487f7bb73b Mon Sep 17 00:00:00 2001 From: Adrian Alonso Date: Fri, 5 Mar 2010 13:15:19 +0000 Subject: xilinx-ml507.conf: new config file for ml507 devboard Signed-off-by: Adrian Alonso Signed-off-by: Stefan Schmidt --- conf/machine/xilinx-ml507.conf | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 conf/machine/xilinx-ml507.conf diff --git a/conf/machine/xilinx-ml507.conf b/conf/machine/xilinx-ml507.conf new file mode 100644 index 0000000000..693f904012 --- /dev/null +++ b/conf/machine/xilinx-ml507.conf @@ -0,0 +1,38 @@ +# Copyright (C) 2010, Adrian Alonso +# Released under the MIT license (see packages/COPYING) +#@TYPE: Machine +#@Name: Xilinx ML507 FPGA Development Platform +#@DESCRIPTION: Machine configuration for Xilinx ML507 + +TARGET_ARCH = "powerpc" +TARGET_CPU = "440" +TARGET_FPU = "soft" +#tune for the 440 cpu +require conf/machine/include/tune-ppc440.inc + +#ASSUME_PROVIDED += "virtual/kernel" +PREFERRED_PROVIDER_virtual/kernel = "linux-xilinx-ml507" + +KERNEL_IMAGETYPE = "uImage" + +MACHINE_FEATURES = "kernel26 apm ext2 vfat ethernet" +MACHINE_EXTRA_RECOMMENDS = "kernel-modules" + +UBOOT_ARCH = "ppc" +UBOOT_MACHINE = "ml507_config" +UBOOT_ENTRYPOINT ?= "0x00000000" +UBOOT_LOADADDRESS ?= "0x00000000" +PREFERRED_VERSION_u-boot_xilinx-ml507 = "git" + +# Xilinx EDK override hardware definitions for xilinx-bsp +# Include in your local.conf +# XILINX_BSP_PATH = "complete path for Xilinx XPS project" +# XILINX_BOARD = "ml507" + +# Don't use tty1 +USE_VT = "0" +SERIAL_CONSOLE = "9600 ttyS0" + +# Device nodes add xsa for (system ace) +IMAGE_DEVICE_TABLES = "files/device_table-minimal.txt \ + files/device_table_add-xsa.txt" -- cgit v1.2.3 From f66859bd44bfbe638b9b0a98bb9d27cdace17d7e Mon Sep 17 00:00:00 2001 From: Adrian Alonso Date: Fri, 5 Mar 2010 13:15:13 +0000 Subject: device_table_add-xsa: add dev nodes for system ace Signed-off-by: Adrian Alonso Signed-off-by: Stefan Schmidt --- files/device_table_add-xsa.txt | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 files/device_table_add-xsa.txt diff --git a/files/device_table_add-xsa.txt b/files/device_table_add-xsa.txt new file mode 100644 index 0000000000..a0bc48efa1 --- /dev/null +++ b/files/device_table_add-xsa.txt @@ -0,0 +1,5 @@ +# Add nodes for xilinx system ace +/dev/xsa b 640 0 0 125 0 0 0 - +/dev/xsa1 b 640 0 1 125 0 0 0 - +/dev/xsa2 b 640 0 2 125 0 0 0 - +/dev/xsa3 b 640 0 3 125 0 0 0 - -- cgit v1.2.3 From 9315ae1513d03c229a6c44727054ecce36600c2e Mon Sep 17 00:00:00 2001 From: Adrian Alonso Date: Fri, 5 Mar 2010 13:15:15 +0000 Subject: linux-xilinx-ml507_git: new kernel recipe for xilinx ml507 * Based on the oficial xilinx repo since not all drivers are in the * mainline kernel tree * Make use off the xilinx-bsp bbclass to override device tree descriptor Signed-off-by: Adrian Alonso Signed-off-by: Stefan Schmidt --- recipes/linux/linux-xilinx-ml507_git.bb | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 recipes/linux/linux-xilinx-ml507_git.bb diff --git a/recipes/linux/linux-xilinx-ml507_git.bb b/recipes/linux/linux-xilinx-ml507_git.bb new file mode 100644 index 0000000000..ec9de1cd49 --- /dev/null +++ b/recipes/linux/linux-xilinx-ml507_git.bb @@ -0,0 +1,23 @@ +require linux.inc + +DESCRIPTION = "Linux kernel for Xilinx ml507 platform" +KERNEL_RELEASE = "2.6.32+git" + +COMPATIBLE_MACHINE = "xilinx-ml507" +DEFAULT_PREFERENCE = "-1" +DEFAULT_PREFERENCE_xilinx-ml507 = "1" + +PV = "${KERNEL_RELEASE}" +PR = "r0" + +SRCREV = "dc53725d22405e384b984d222542f526eaa9b829" +SRC_URI = "git://git.xilinx.com/linux-2.6-xlnx.git;protocol=git \ + file://defconfig" + +inherit kernel xilinx-bsp + +S = "${WORKDIR}/git" + +do_configure_prepend() { + install -m 0644 ${WORKDIR}/defconfig ${S}/.config +} -- cgit v1.2.3 From 45bfbb12df75c6fd73e38018b7fd0d46aae2feef Mon Sep 17 00:00:00 2001 From: Adrian Alonso Date: Fri, 5 Mar 2010 13:15:14 +0000 Subject: defconfig: xilinx ml507 kernel config Signed-off-by: Adrian Alonso Signed-off-by: Stefan Schmidt --- recipes/linux/linux-xilinx-ml507/defconfig | 1415 ++++++++++++++++++++++++++++ 1 file changed, 1415 insertions(+) create mode 100644 recipes/linux/linux-xilinx-ml507/defconfig diff --git a/recipes/linux/linux-xilinx-ml507/defconfig b/recipes/linux/linux-xilinx-ml507/defconfig new file mode 100644 index 0000000000..693e14168b --- /dev/null +++ b/recipes/linux/linux-xilinx-ml507/defconfig @@ -0,0 +1,1415 @@ +# +# Automatically generated make config: don't edit +# Linux kernel version: 2.6.32 +# Fri Feb 26 23:31:02 2010 +# +# CONFIG_PPC64 is not set + +# +# Processor support +# +# CONFIG_PPC_BOOK3S_32 is not set +# CONFIG_PPC_85xx is not set +# CONFIG_PPC_8xx is not set +# CONFIG_40x is not set +CONFIG_44x=y +# CONFIG_E200 is not set +# CONFIG_PPC_FPU is not set +CONFIG_4xx=y +CONFIG_BOOKE=y +CONFIG_PTE_64BIT=y +CONFIG_PHYS_64BIT=y +CONFIG_PPC_MMU_NOHASH=y +CONFIG_PPC_MMU_NOHASH_32=y +# CONFIG_PPC_MM_SLICES is not set +CONFIG_NOT_COHERENT_CACHE=y +CONFIG_PPC32=y +CONFIG_WORD_SIZE=32 +CONFIG_ARCH_PHYS_ADDR_T_64BIT=y +CONFIG_MMU=y +CONFIG_GENERIC_CMOS_UPDATE=y +CONFIG_GENERIC_TIME=y +CONFIG_GENERIC_TIME_VSYSCALL=y +CONFIG_GENERIC_CLOCKEVENTS=y +CONFIG_GENERIC_HARDIRQS=y +CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y +# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set +# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set +CONFIG_IRQ_PER_CPU=y +CONFIG_STACKTRACE_SUPPORT=y +CONFIG_HAVE_LATENCYTOP_SUPPORT=y +CONFIG_TRACE_IRQFLAGS_SUPPORT=y +CONFIG_LOCKDEP_SUPPORT=y +CONFIG_RWSEM_XCHGADD_ALGORITHM=y +CONFIG_ARCH_HAS_ILOG2_U32=y +CONFIG_GENERIC_HWEIGHT=y +CONFIG_GENERIC_FIND_NEXT_BIT=y +CONFIG_GENERIC_GPIO=y +# CONFIG_ARCH_NO_VIRT_TO_BUS is not set +CONFIG_PPC=y +CONFIG_EARLY_PRINTK=y +CONFIG_GENERIC_NVRAM=y +CONFIG_SCHED_OMIT_FRAME_POINTER=y +CONFIG_ARCH_MAY_HAVE_PC_FDC=y +CONFIG_PPC_OF=y +CONFIG_OF=y +CONFIG_PPC_UDBG_16550=y +# CONFIG_GENERIC_TBSYNC is not set +CONFIG_AUDIT_ARCH=y +CONFIG_GENERIC_BUG=y +CONFIG_DTC=y +CONFIG_DEFAULT_UIMAGE=y +CONFIG_PPC_DCR_NATIVE=y +CONFIG_PPC_DCR_MMIO=y +CONFIG_PPC_DCR=y +CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y +CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" +CONFIG_CONSTRUCTORS=y + +# +# General setup +# +CONFIG_EXPERIMENTAL=y +CONFIG_BROKEN_ON_SMP=y +CONFIG_LOCK_KERNEL=y +CONFIG_INIT_ENV_ARG_LIMIT=32 +CONFIG_LOCALVERSION="" +# CONFIG_LOCALVERSION_AUTO is not set +CONFIG_SWAP=y +CONFIG_SYSVIPC=y +CONFIG_SYSVIPC_SYSCTL=y +CONFIG_POSIX_MQUEUE=y +CONFIG_POSIX_MQUEUE_SYSCTL=y +# CONFIG_BSD_PROCESS_ACCT is not set +# CONFIG_TASKSTATS is not set +# CONFIG_AUDIT is not set + +# +# RCU Subsystem +# +CONFIG_TREE_RCU=y +# CONFIG_TREE_PREEMPT_RCU is not set +# CONFIG_RCU_TRACE is not set +CONFIG_RCU_FANOUT=32 +# CONFIG_RCU_FANOUT_EXACT is not set +# CONFIG_TREE_RCU_TRACE is not set +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_LOG_BUF_SHIFT=14 +# CONFIG_GROUP_SCHED is not set +# CONFIG_CGROUPS is not set +CONFIG_SYSFS_DEPRECATED=y +CONFIG_SYSFS_DEPRECATED_V2=y +# CONFIG_RELAY is not set +CONFIG_NAMESPACES=y +# CONFIG_UTS_NS is not set +# CONFIG_IPC_NS is not set +# CONFIG_USER_NS is not set +# CONFIG_PID_NS is not set +# CONFIG_NET_NS is not set +CONFIG_BLK_DEV_INITRD=y +CONFIG_INITRAMFS_SOURCE="" +CONFIG_RD_GZIP=y +CONFIG_RD_BZIP2=y +CONFIG_RD_LZMA=y +# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set +CONFIG_SYSCTL=y +CONFIG_ANON_INODES=y +# CONFIG_EMBEDDED is not set +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_SIGNALFD=y +CONFIG_TIMERFD=y +CONFIG_EVENTFD=y +CONFIG_SHMEM=y +CONFIG_AIO=y +CONFIG_HAVE_PERF_EVENTS=y + +# +# Kernel Performance Events And Counters +# +# CONFIG_PERF_EVENTS is not set +# CONFIG_PERF_COUNTERS is not set +CONFIG_VM_EVENT_COUNTERS=y +CONFIG_PCI_QUIRKS=y +CONFIG_COMPAT_BRK=y +CONFIG_SLAB=y +# CONFIG_SLUB is not set +# CONFIG_SLOB is not set +# CONFIG_PROFILING is not set +CONFIG_HAVE_OPROFILE=y +# CONFIG_KPROBES is not set +CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y +CONFIG_HAVE_IOREMAP_PROT=y +CONFIG_HAVE_KPROBES=y +CONFIG_HAVE_KRETPROBES=y +CONFIG_HAVE_ARCH_TRACEHOOK=y +CONFIG_HAVE_DMA_ATTRS=y +CONFIG_HAVE_DMA_API_DEBUG=y + +# +# GCOV-based kernel profiling +# +# CONFIG_SLOW_WORK is not set +# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set +CONFIG_SLABINFO=y +CONFIG_RT_MUTEXES=y +CONFIG_BASE_SMALL=0 +CONFIG_MODULES=y +# CONFIG_MODULE_FORCE_LOAD is not set +CONFIG_MODULE_UNLOAD=y +CONFIG_MODULE_FORCE_UNLOAD=y +CONFIG_MODVERSIONS=y +# CONFIG_MODULE_SRCVERSION_ALL is not set +CONFIG_BLOCK=y +CONFIG_LBDAF=y +# CONFIG_BLK_DEV_BSG is not set +# CONFIG_BLK_DEV_INTEGRITY 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" +# CONFIG_FREEZER is not set +# CONFIG_PPC4xx_PCI_EXPRESS is not set + +# +# Platform support +# +# CONFIG_PPC_CELL is not set +# CONFIG_PPC_CELL_NATIVE is not set +# CONFIG_PQ2ADS is not set +# CONFIG_BAMBOO is not set +# CONFIG_EBONY is not set +# CONFIG_SAM440EP is not set +# CONFIG_SEQUOIA is not set +# CONFIG_TAISHAN is not set +# CONFIG_KATMAI is not set +# CONFIG_RAINIER is not set +# CONFIG_WARP is not set +# CONFIG_ARCHES is not set +# CONFIG_CANYONLANDS is not set +# CONFIG_GLACIER is not set +# CONFIG_REDWOOD is not set +# CONFIG_EIGER is not set +# CONFIG_YOSEMITE is not set +CONFIG_XILINX_VIRTEX440_GENERIC_BOARD=y +# CONFIG_XILINX_ML510 is not set +# CONFIG_PPC44x_SIMPLE is not set +# CONFIG_PPC4xx_GPIO is not set +CONFIG_XILINX_VIRTEX=y +CONFIG_XILINX_VIRTEX_5_FXT=y +# CONFIG_IPIC is not set +# CONFIG_MPIC is not set +# CONFIG_MPIC_WEIRD is not set +# CONFIG_PPC_I8259 is not set +# CONFIG_PPC_RTAS is not set +# CONFIG_MMIO_NVRAM is not set +# CONFIG_PPC_MPC106 is not set +# CONFIG_PPC_970_NAP is not set +# CONFIG_PPC_INDIRECT_IO is not set +# CONFIG_GENERIC_IOMAP is not set +# CONFIG_CPU_FREQ is not set +# CONFIG_FSL_ULI1575 is not set +# CONFIG_SIMPLE_GPIO is not set +# CONFIG_XILINX_PCI is not set + +# +# Kernel options +# +# CONFIG_HIGHMEM is not set +# CONFIG_NO_HZ is not set +# CONFIG_HIGH_RES_TIMERS is not set +CONFIG_GENERIC_CLOCKEVENTS_BUILD=y +# CONFIG_HZ_100 is not set +CONFIG_HZ_250=y +# CONFIG_HZ_300 is not set +# CONFIG_HZ_1000 is not set +CONFIG_HZ=250 +# CONFIG_SCHED_HRTICK is not set +# CONFIG_PREEMPT_NONE is not set +# CONFIG_PREEMPT_VOLUNTARY is not set +CONFIG_PREEMPT=y +CONFIG_BINFMT_ELF=y +# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set +# CONFIG_HAVE_AOUT is not set +# CONFIG_BINFMT_MISC is not set +CONFIG_MATH_EMULATION=y +# CONFIG_IOMMU_HELPER is not set +# CONFIG_SWIOTLB is not set +CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y +CONFIG_ARCH_HAS_WALK_MEMORY=y +CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y +CONFIG_MAX_ACTIVE_REGIONS=32 +CONFIG_ARCH_FLATMEM_ENABLE=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_PAGEFLAGS_EXTENDED=y +CONFIG_SPLIT_PTLOCK_CPUS=4 +CONFIG_MIGRATION=y +CONFIG_PHYS_ADDR_T_64BIT=y +CONFIG_ZONE_DMA_FLAG=1 +CONFIG_BOUNCE=y +CONFIG_VIRT_TO_BUS=y +CONFIG_HAVE_MLOCK=y +CONFIG_HAVE_MLOCKED_PAGE_BIT=y +# CONFIG_KSM is not set +CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 +CONFIG_STDBINUTILS=y +CONFIG_PPC_4K_PAGES=y +# CONFIG_PPC_16K_PAGES is not set +# CONFIG_PPC_64K_PAGES is not set +# CONFIG_PPC_256K_PAGES is not set +CONFIG_FORCE_MAX_ZONEORDER=11 +CONFIG_PROC_DEVICETREE=y +CONFIG_CMDLINE_BOOL=y +CONFIG_CMDLINE="" +CONFIG_EXTRA_TARGETS="simpleImage.virtex440-ml507 simpleImage.initrd.virtex440-ml507" +CONFIG_SECCOMP=y +# CONFIG_COMPRESSED_DEVICE_TREE is not set +CONFIG_ISA_DMA_API=y + +# +# Bus options +# +CONFIG_ZONE_DMA=y +CONFIG_PPC_INDIRECT_PCI=y +CONFIG_4xx_SOC=y +CONFIG_PPC_PCI_CHOICE=y +CONFIG_PCI=y +CONFIG_PCI_DOMAINS=y +CONFIG_PCI_SYSCALL=y +# CONFIG_PCIEPORTBUS is not set +CONFIG_ARCH_SUPPORTS_MSI=y +# CONFIG_PCI_MSI is not set +# CONFIG_PCI_LEGACY is not set +# CONFIG_PCI_DEBUG is not set +# CONFIG_PCI_STUB is not set +# CONFIG_PCI_IOV is not set +# CONFIG_PCCARD is not set +# CONFIG_HOTPLUG_PCI is not set +# CONFIG_HAS_RAPIDIO is not set + +# +# Advanced setup +# +# CONFIG_ADVANCED_OPTIONS is not set + +# +# Default settings for advanced configuration options are used +# +CONFIG_LOWMEM_SIZE=0x30000000 +CONFIG_PAGE_OFFSET=0xc0000000 +CONFIG_KERNEL_START=0xc0000000 +CONFIG_PHYSICAL_START=0x00000000 +CONFIG_TASK_SIZE=0xc0000000 +CONFIG_CONSISTENT_SIZE=0x00200000 +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_XFRM_STATISTICS is not set +# CONFIG_NET_KEY is not set +CONFIG_INET=y +CONFIG_IP_MULTICAST=y +# CONFIG_IP_ADVANCED_ROUTER is not set +CONFIG_IP_FIB_HASH=y +CONFIG_IP_PNP=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_IP_MROUTE is not set +# CONFIG_ARPD is not set +# CONFIG_SYN_COOKIES is not set +# CONFIG_INET_AH is not set +# CONFIG_INET_ESP is not set +# CONFIG_INET_IPCOMP is not set +# CONFIG_INET_XFRM_TUNNEL is not set +CONFIG_INET_TUNNEL=m +CONFIG_INET_XFRM_MODE_TRANSPORT=y +CONFIG_INET_XFRM_MODE_TUNNEL=y +CONFIG_INET_XFRM_MODE_BEET=y +# CONFIG_INET_LRO is not set +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=m +# CONFIG_IPV6_PRIVACY is not set +# CONFIG_IPV6_ROUTER_PREF is not set +# CONFIG_IPV6_OPTIMISTIC_DAD is not set +# CONFIG_INET6_AH is not set +# CONFIG_INET6_ESP is not set +# CONFIG_INET6_IPCOMP is not set +# CONFIG_IPV6_MIP6 is not set +# CONFIG_INET6_XFRM_TUNNEL is not set +# CONFIG_INET6_TUNNEL is not set +CONFIG_INET6_XFRM_MODE_TRANSPORT=m +CONFIG_INET6_XFRM_MODE_TUNNEL=m +CONFIG_INET6_XFRM_MODE_BEET=m +# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set +CONFIG_IPV6_SIT=m +CONFIG_IPV6_NDISC_NODETYPE=y +# CONFIG_IPV6_TUNNEL is not set +# CONFIG_IPV6_MULTIPLE_TABLES is not set +# CONFIG_IPV6_MROUTE is not set +# CONFIG_NETWORK_SECMARK is not set +CONFIG_NETFILTER=y +# CONFIG_NETFILTER_DEBUG is not set +CONFIG_NETFILTER_ADVANCED=y + +# +# Core Netfilter Configuration +# +# CONFIG_NETFILTER_NETLINK_QUEUE is not set +# CONFIG_NETFILTER_NETLINK_LOG is not set +# CONFIG_NF_CONNTRACK is not set +# CONFIG_NETFILTER_TPROXY is not set +CONFIG_NETFILTER_XTABLES=m +# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set +# CONFIG_NETFILTER_XT_TARGET_DSCP is not set +# CONFIG_NETFILTER_XT_TARGET_HL is not set +# CONFIG_NETFILTER_XT_TARGET_MARK is not set +# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set +# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set +# CONFIG_NETFILTER_XT_TARGET_RATEEST is not set +# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set +# CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP is not set +# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set +# CONFIG_NETFILTER_XT_MATCH_DCCP is not set +# CONFIG_NETFILTER_XT_MATCH_DSCP is not set +# CONFIG_NETFILTER_XT_MATCH_ESP is not set +# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set +# CONFIG_NETFILTER_XT_MATCH_HL is not set +# CONFIG_NETFILTER_XT_MATCH_IPRANGE is not set +# CONFIG_NETFILTER_XT_MATCH_LENGTH is not set +# CONFIG_NETFILTER_XT_MATCH_LIMIT is not set +# CONFIG_NETFILTER_XT_MATCH_MAC is not set +# CONFIG_NETFILTER_XT_MATCH_MARK is not set +# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set +# CONFIG_NETFILTER_XT_MATCH_OWNER is not set +# CONFIG_NETFILTER_XT_MATCH_POLICY is not set +# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set +# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set +# CONFIG_NETFILTER_XT_MATCH_RATEEST is not set +# CONFIG_NETFILTER_XT_MATCH_REALM is not set +# CONFIG_NETFILTER_XT_MATCH_RECENT is not set +# CONFIG_NETFILTER_XT_MATCH_SCTP is not set +# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set +# CONFIG_NETFILTER_XT_MATCH_STRING is not set +# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set +# CONFIG_NETFILTER_XT_MATCH_TIME is not set +# CONFIG_NETFILTER_XT_MATCH_U32 is not set +# CONFIG_IP_VS is not set + +# +# IP: Netfilter Configuration +# +# CONFIG_NF_DEFRAG_IPV4 is not set +# CONFIG_IP_NF_QUEUE is not set +CONFIG_IP_NF_IPTABLES=m +# CONFIG_IP_NF_MATCH_ADDRTYPE is not set +# CONFIG_IP_NF_MATCH_AH is not set +# CONFIG_IP_NF_MATCH_ECN is not set +# CONFIG_IP_NF_MATCH_TTL is not set +CONFIG_IP_NF_FILTER=m +# CONFIG_IP_NF_TARGET_REJECT is not set +# CONFIG_IP_NF_TARGET_LOG is not set +# CONFIG_IP_NF_TARGET_ULOG is not set +CONFIG_IP_NF_MANGLE=m +# CONFIG_IP_NF_TARGET_ECN is not set +# CONFIG_IP_NF_TARGET_TTL is not set +# CONFIG_IP_NF_RAW is not set +# CONFIG_IP_NF_ARPTABLES is not set + +# +# IPv6: Netfilter Configuration +# +# CONFIG_IP6_NF_QUEUE is not set +# CONFIG_IP6_NF_IPTABLES is not set +# CONFIG_IP_DCCP is not set +# CONFIG_IP_SCTP is not set +# CONFIG_RDS is not set +# CONFIG_TIPC is not set +# CONFIG_ATM is not set +# CONFIG_BRIDGE is not set +# CONFIG_NET_DSA 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 +# CONFIG_PHONET is not set +# CONFIG_IEEE802154 is not set +# CONFIG_NET_SCHED is not set +# CONFIG_DCB is not set + +# +# Network testing +# +# CONFIG_NET_PKTGEN is not set +# CONFIG_HAMRADIO is not set +# CONFIG_CAN is not set +# CONFIG_IRDA is not set +# CONFIG_BT is not set +# CONFIG_AF_RXRPC is not set +CONFIG_WIRELESS=y +# CONFIG_CFG80211 is not set +CONFIG_CFG80211_DEFAULT_PS_VALUE=0 +CONFIG_WIRELESS_OLD_REGULATORY=y +# CONFIG_WIRELESS_EXT is not set +# CONFIG_LIB80211 is not set + +# +# CFG80211 needs to be enabled for MAC80211 +# +# CONFIG_WIMAX is not set +# CONFIG_RFKILL is not set +# CONFIG_NET_9P is not set + +# +# Device Drivers +# + +# +# Generic Driver Options +# +CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" +# CONFIG_DEVTMPFS is not set +CONFIG_STANDALONE=y +CONFIG_PREVENT_FIRMWARE_BUILD=y +CONFIG_FW_LOADER=y +CONFIG_FIRMWARE_IN_KERNEL=y +CONFIG_EXTRA_FIRMWARE="" +# CONFIG_DEBUG_DRIVER is not set +# CONFIG_DEBUG_DEVRES is not set +# CONFIG_SYS_HYPERVISOR is not set +# CONFIG_CONNECTOR is not set +CONFIG_MTD=y +# CONFIG_MTD_DEBUG is not set +# CONFIG_MTD_TESTS 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_OF_PARTS is not set +# CONFIG_MTD_AR7_PARTS is not set + +# +# User Modules And Translation Layers +# +CONFIG_MTD_CHAR=y +CONFIG_MTD_BLKDEVS=y +CONFIG_MTD_BLOCK=y +# CONFIG_FTL is not set +# CONFIG_NFTL is not set +# CONFIG_INFTL is not set +# CONFIG_RFD_FTL is not set +# CONFIG_SSFDC is not set +# CONFIG_MTD_OOPS is not set + +# +# RAM/ROM/Flash chip drivers +# +CONFIG_MTD_CFI=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=y +# CONFIG_MTD_CFI_AMDSTD is not set +# 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 + +# +# Mapping drivers for chip access +# +# CONFIG_MTD_COMPLEX_MAPPINGS is not set +# CONFIG_MTD_PHYSMAP is not set +CONFIG_MTD_PHYSMAP_OF=y +# CONFIG_MTD_INTEL_VR_NOR 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 +# CONFIG_MTD_NAND is not set +# CONFIG_MTD_ONENAND is not set + +# +# LPDDR flash memory drivers +# +# CONFIG_MTD_LPDDR is not set + +# +# UBI - Unsorted block images +# +# CONFIG_MTD_UBI is not set +CONFIG_OF_DEVICE=y +CONFIG_OF_GPIO=y +# CONFIG_PARPORT is not set +CONFIG_BLK_DEV=y +# CONFIG_BLK_DEV_FD 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=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_RAM=y +CONFIG_BLK_DEV_RAM_COUNT=16 +CONFIG_BLK_DEV_RAM_SIZE=8192 +# CONFIG_BLK_DEV_XIP is not set +# CONFIG_CDROM_PKTCDVD is not set +# CONFIG_ATA_OVER_ETH is not set +CONFIG_XILINX_SYSACE=y +# CONFIG_BLK_DEV_HD is not set +CONFIG_MISC_DEVICES=y +# CONFIG_PHANTOM is not set +# CONFIG_SGI_IOC4 is not set +# CONFIG_TIFM_CORE is not set +# CONFIG_ENCLOSURE_SERVICES is not set +# CONFIG_HP_ILO is not set +# CONFIG_C2PORT is not set + +# +# EEPROM support +# +# CONFIG_EEPROM_93CX6 is not set +# CONFIG_CB710_CORE is not set +CONFIG_XILINX_DRIVERS=y +CONFIG_NEED_XILINX_LLDMA=y +CONFIG_HAVE_IDE=y +# CONFIG_IDE is not set + +# +# SCSI device support +# +# CONFIG_RAID_ATTRS is not set +# CONFIG_SCSI is not set +# CONFIG_SCSI_DMA is not set +# CONFIG_SCSI_NETLINK is not set +# CONFIG_ATA is not set +# CONFIG_MD is not set +# CONFIG_FUSION is not set + +# +# IEEE 1394 (FireWire) support +# + +# +# You can enable one or both FireWire driver stacks. +# + +# +# See the help texts for more information. +# +# CONFIG_FIREWIRE is not set +# CONFIG_IEEE1394 is not set +# CONFIG_I2O is not set +# CONFIG_MACINTOSH_DRIVERS is not set +CONFIG_NETDEVICES=y +# CONFIG_DUMMY is not set +# CONFIG_BONDING is not set +# CONFIG_MACVLAN is not set +# CONFIG_EQUALIZER is not set +# CONFIG_TUN is not set +# CONFIG_VETH is not set +# CONFIG_ARCNET is not set +# CONFIG_PHYLIB is not set +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_ETHOC is not set +# CONFIG_DNET is not set +# CONFIG_NET_TULIP is not set +# CONFIG_HP100 is not set +# CONFIG_IBM_NEW_EMAC is not set +# CONFIG_IBM_NEW_EMAC_ZMII is not set +# CONFIG_IBM_NEW_EMAC_RGMII is not set +# CONFIG_IBM_NEW_EMAC_TAH is not set +# CONFIG_IBM_NEW_EMAC_EMAC4 is not set +# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set +# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set +# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set +# CONFIG_NET_PCI is not set +# CONFIG_B44 is not set +# CONFIG_KS8842 is not set +# CONFIG_KS8851_MLL is not set +# CONFIG_XILINX_EMAC is not set +# CONFIG_ATL2 is not set +# CONFIG_XILINX_EMACLITE is not set +CONFIG_NETDEV_1000=y +# CONFIG_ACENIC is not set +# CONFIG_DL2K is not set +# CONFIG_E1000 is not set +# CONFIG_E1000E is not set +# CONFIG_IP1000 is not set +# CONFIG_IGB is not set +# CONFIG_IGBVF 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_VIA_VELOCITY is not set +# CONFIG_TIGON3 is not set +# CONFIG_BNX2 is not set +# CONFIG_CNIC is not set +# CONFIG_MV643XX_ETH is not set +# CONFIG_XILINX_LL_TEMAC is not set +# CONFIG_QLA3XXX is not set +# CONFIG_ATL1 is not set +# CONFIG_XILINX_TEMAC is not set +# CONFIG_ATL1E is not set +CONFIG_XILINX_LLTEMAC=y +# CONFIG_XILINX_LLTEMAC_MARVELL_88E1111_RGMII is not set +CONFIG_XILINX_LLTEMAC_MARVELL_88E1111_GMII=y +# CONFIG_XILINX_LLTEMAC_MARVELL_88E1111_MII is not set +# CONFIG_XILINX_LLTEMAC_NATIONAL_DP83865_GMII is not set +# CONFIG_ATL1C is not set +# CONFIG_JME is not set +# CONFIG_NETDEV_10000 is not set +# CONFIG_TR is not set +CONFIG_WLAN=y +# CONFIG_WLAN_PRE80211 is not set +# CONFIG_WLAN_80211 is not set + +# +# Enable WiMAX (Networking options) to see the WiMAX drivers +# +# 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_NETCONSOLE is not set +# CONFIG_NETPOLL is not set +# CONFIG_NET_POLL_CONTROLLER is not set +# CONFIG_ISDN is not set +# 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=y +CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 +CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 +# CONFIG_INPUT_JOYDEV is not set +# CONFIG_INPUT_EVDEV is not set +# CONFIG_INPUT_EVBUG is not set + +# +# Input Device Drivers +# +CONFIG_INPUT_KEYBOARD=y +CONFIG_KEYBOARD_ATKBD=y +# CONFIG_KEYBOARD_LKKBD is not set +# CONFIG_KEYBOARD_GPIO is not set +# CONFIG_KEYBOARD_MATRIX is not set +# CONFIG_KEYBOARD_NEWTON is not set +# CONFIG_KEYBOARD_OPENCORES is not set +# CONFIG_KEYBOARD_STOWAWAY is not set +# CONFIG_KEYBOARD_SUNKBD is not set +# CONFIG_KEYBOARD_XTKBD is not set +CONFIG_INPUT_MOUSE=y +CONFIG_MOUSE_PS2=y +CONFIG_MOUSE_PS2_ALPS=y +CONFIG_MOUSE_PS2_LOGIPS2PP=y +CONFIG_MOUSE_PS2_SYNAPTICS=y +CONFIG_MOUSE_PS2_TRACKPOINT=y +# CONFIG_MOUSE_PS2_ELANTECH is not set +# CONFIG_MOUSE_PS2_SENTELIC is not set +# CONFIG_MOUSE_PS2_TOUCHKIT is not set +# CONFIG_MOUSE_SERIAL is not set +# CONFIG_MOUSE_VSXXXAA is not set +# CONFIG_MOUSE_GPIO is not set +# CONFIG_INPUT_JOYSTICK is not set +# CONFIG_INPUT_TABLET is not set +# CONFIG_INPUT_TOUCHSCREEN is not set +# CONFIG_INPUT_MISC is not set + +# +# Hardware I/O ports +# +CONFIG_SERIO=y +# CONFIG_SERIO_I8042 is not set +# CONFIG_SERIO_SERPORT is not set +# CONFIG_SERIO_PCIPS2 is not set +CONFIG_SERIO_LIBPS2=y +# CONFIG_SERIO_XILINXPS2 is not set +CONFIG_SERIO_XILINX_XPS_PS2=y +# CONFIG_SERIO_RAW is not set +# CONFIG_GAMEPORT is not set + +# +# Character devices +# +CONFIG_VT=y +CONFIG_CONSOLE_TRANSLATIONS=y +CONFIG_VT_CONSOLE=y +CONFIG_HW_CONSOLE=y +# CONFIG_VT_HW_CONSOLE_BINDING is not set +CONFIG_DEVKMEM=y +# CONFIG_SERIAL_NONSTANDARD is not set +# CONFIG_NOZOMI is not set + +# +# Serial drivers +# +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_SERIAL_8250_PCI=y +CONFIG_SERIAL_8250_NR_UARTS=4 +CONFIG_SERIAL_8250_RUNTIME_UARTS=4 +# CONFIG_SERIAL_8250_EXTENDED is not set + +# +# Non-8250 serial port support +# +CONFIG_SERIAL_UARTLITE=y +CONFIG_SERIAL_UARTLITE_CONSOLE=y +CONFIG_SERIAL_CORE=y +CONFIG_SERIAL_CORE_CONSOLE=y +# CONFIG_SERIAL_JSM is not set +CONFIG_SERIAL_OF_PLATFORM=y +# CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL is not set +CONFIG_UNIX98_PTYS=y +# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set +CONFIG_LEGACY_PTYS=y +CONFIG_LEGACY_PTY_COUNT=256 +# CONFIG_HVC_UDBG is not set +# CONFIG_IPMI_HANDLER is not set +CONFIG_HW_RANDOM=m +# CONFIG_HW_RANDOM_TIMERIOMEM is not set +# CONFIG_NVRAM is not set +# CONFIG_GEN_RTC is not set +CONFIG_XILINX_HWICAP=y +# CONFIG_R3964 is not set +# CONFIG_APPLICOM is not set +# CONFIG_RAW_DRIVER is not set +# CONFIG_TCG_TPM is not set +CONFIG_DEVPORT=y +# CONFIG_I2C is not set +# CONFIG_SPI is not set + +# +# PPS support +# +# CONFIG_PPS is not set +CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y +CONFIG_GPIOLIB=y +# CONFIG_DEBUG_GPIO is not set +CONFIG_GPIO_SYSFS=y + +# +# Memory mapped GPIO expanders: +# +CONFIG_GPIO_XILINX=y + +# +# I2C GPIO expanders: +# + +# +# PCI GPIO expanders: +# +# CONFIG_GPIO_BT8XX is not set +# CONFIG_GPIO_LANGWELL is not set + +# +# SPI GPIO expanders: +# + +# +# AC97 GPIO expanders: +# +# CONFIG_W1 is not set +# CONFIG_POWER_SUPPLY is not set +# CONFIG_HWMON is not set +# CONFIG_THERMAL is not set +# CONFIG_WATCHDOG is not set +CONFIG_SSB_POSSIBLE=y + +# +# Sonics Silicon Backplane +# +# CONFIG_SSB is not set + +# +# Multifunction device drivers +# +# CONFIG_MFD_CORE is not set +# CONFIG_MFD_SM501 is not set +# CONFIG_HTC_PASIC3 is not set +# CONFIG_MFD_TMIO is not set +# CONFIG_REGULATOR is not set +# CONFIG_MEDIA_SUPPORT is not set + +# +# Graphics support +# +# CONFIG_AGP is not set +CONFIG_VGA_ARB=y +# CONFIG_DRM is not set +# CONFIG_VGASTATE is not set +# CONFIG_VIDEO_OUTPUT_CONTROL is not set +CONFIG_FB=y +# CONFIG_FIRMWARE_EDID is not set +# CONFIG_FB_DDC is not set +# CONFIG_FB_BOOT_VESA_SUPPORT is not set +CONFIG_FB_CFB_FILLRECT=y +CONFIG_FB_CFB_COPYAREA=y +CONFIG_FB_CFB_IMAGEBLIT=y +# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set +# CONFIG_FB_SYS_FILLRECT is not set +# CONFIG_FB_SYS_COPYAREA is not set +# CONFIG_FB_SYS_IMAGEBLIT is not set +# CONFIG_FB_FOREIGN_ENDIAN is not set +# CONFIG_FB_SYS_FOPS is not set +# CONFIG_FB_SVGALIB is not set +# CONFIG_FB_MACMODES is not set +# CONFIG_FB_BACKLIGHT is not set +# CONFIG_FB_MODE_HELPERS is not set +# CONFIG_FB_TILEBLITTING is not set + +# +# Frame buffer hardware drivers +# +# CONFIG_FB_CIRRUS is not set +# CONFIG_FB_PM2 is not set +# CONFIG_FB_CYBER2000 is not set +# CONFIG_FB_OF is not set +# CONFIG_FB_CT65550 is not set +# CONFIG_FB_ASILIANT is not set +# CONFIG_FB_IMSTT is not set +# CONFIG_FB_VGA16 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_VIA 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_TRIDENT is not set +# CONFIG_FB_ARK is not set +# CONFIG_FB_PM3 is not set +# CONFIG_FB_CARMINE is not set +# CONFIG_FB_IBM_GXT4500 is not set +CONFIG_FB_XILINX=y +# CONFIG_FB_VIRTUAL is not set +# CONFIG_FB_METRONOME is not set +# CONFIG_FB_MB862XX is not set +# CONFIG_FB_BROADSHEET is not set +# CONFIG_BACKLIGHT_LCD_SUPPORT is not set + +# +# Display device support +# +# CONFIG_DISPLAY_SUPPORT is not set + +# +# Console display driver support +# +CONFIG_DUMMY_CONSOLE=y +CONFIG_FRAMEBUFFER_CONSOLE=y +# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set +# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set +CONFIG_FONTS=y +CONFIG_FONT_8x8=y +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=y +CONFIG_LOGO_LINUX_MONO=y +CONFIG_LOGO_LINUX_VGA16=y +CONFIG_LOGO_LINUX_CLUT224=y +# CONFIG_SOUND is not set +# CONFIG_HID_SUPPORT is not set +# CONFIG_USB_SUPPORT is not set +# CONFIG_UWB is not set +# CONFIG_MMC is not set +# CONFIG_MEMSTICK is not set +# CONFIG_NEW_LEDS is not set +# CONFIG_ACCESSIBILITY is not set +# CONFIG_INFINIBAND is not set +# CONFIG_EDAC is not set +# CONFIG_RTC_CLASS is not set +# CONFIG_DMADEVICES is not set +# CONFIG_AUXDISPLAY is not set +CONFIG_XILINX_EDK=y +CONFIG_XILINX_LLDMA_USE_DCR=y +# CONFIG_UIO is not set + +# +# TI VLYNQ +# +# CONFIG_STAGING is not set + +# +# File systems +# +CONFIG_EXT2_FS=y +CONFIG_EXT2_FS_XATTR=y +CONFIG_EXT2_FS_POSIX_ACL=y +CONFIG_EXT2_FS_SECURITY=y +CONFIG_EXT2_FS_XIP=y +CONFIG_EXT3_FS=y +# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set +CONFIG_EXT3_FS_XATTR=y +# CONFIG_EXT3_FS_POSIX_ACL is not set +# CONFIG_EXT3_FS_SECURITY is not set +# CONFIG_EXT4_FS is not set +CONFIG_FS_XIP=y +CONFIG_JBD=y +CONFIG_FS_MBCACHE=y +# CONFIG_REISERFS_FS is not set +CONFIG_JFS_FS=y +# CONFIG_JFS_POSIX_ACL is not set +# CONFIG_JFS_SECURITY is not set +# CONFIG_JFS_DEBUG is not set +# CONFIG_JFS_STATISTICS 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_BTRFS_FS is not set +# CONFIG_NILFS2_FS is not set +CONFIG_FILE_LOCKING=y +CONFIG_FSNOTIFY=y +CONFIG_DNOTIFY=y +CONFIG_INOTIFY=y +CONFIG_INOTIFY_USER=y +# CONFIG_QUOTA is not set +CONFIG_AUTOFS_FS=y +CONFIG_AUTOFS4_FS=y +# CONFIG_FUSE_FS is not set + +# +# Caches +# +# CONFIG_FSCACHE 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_KCORE is not set +CONFIG_PROC_SYSCTL=y +CONFIG_PROC_PAGE_MONITOR=y +CONFIG_SYSFS=y +CONFIG_TMPFS=y +# CONFIG_TMPFS_POSIX_ACL is not set +# CONFIG_HUGETLB_PAGE is not set +# CONFIG_CONFIGFS_FS is not set +CONFIG_MISC_FILESYSTEMS=y +# 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=y +# CONFIG_SQUASHFS is not set +# CONFIG_VXFS_FS is not set +# CONFIG_MINIX_FS is not set +# CONFIG_OMFS_FS is not set +# CONFIG_HPFS_FS is not set +# CONFIG_QNX4FS_FS is not set +CONFIG_ROMFS_FS=y +CONFIG_ROMFS_BACKED_BY_BLOCK=y +# CONFIG_ROMFS_BACKED_BY_MTD is not set +# CONFIG_ROMFS_BACKED_BY_BOTH is not set +CONFIG_ROMFS_ON_BLOCK=y +# CONFIG_SYSV_FS is not set +# CONFIG_UFS_FS is not set +CONFIG_NETWORK_FILESYSTEMS=y +CONFIG_NFS_FS=y +CONFIG_NFS_V3=y +# CONFIG_NFS_V3_ACL is not set +# CONFIG_NFS_V4 is not set +CONFIG_ROOT_NFS=y +# CONFIG_NFSD is not set +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 is not set +# CONFIG_CIFS is not set +# CONFIG_NCP_FS is not set +# CONFIG_CODA_FS is not set +# CONFIG_AFS_FS is not set + +# +# Partition Types +# +# CONFIG_PARTITION_ADVANCED is not set +CONFIG_MSDOS_PARTITION=y +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=m +CONFIG_NLS_ISO8859_1=m +# 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=m +# CONFIG_DLM is not set +# CONFIG_BINARY_PRINTF is not set + +# +# Library routines +# +CONFIG_BITREVERSE=y +CONFIG_GENERIC_FIND_LAST_BIT=y +CONFIG_CRC_CCITT=y +# CONFIG_CRC16 is not set +# CONFIG_CRC_T10DIF is not set +# CONFIG_CRC_ITU_T is not set +CONFIG_CRC32=y +# CONFIG_CRC7 is not set +# CONFIG_LIBCRC32C is not set +CONFIG_ZLIB_INFLATE=y +CONFIG_DECOMPRESS_GZIP=y +CONFIG_DECOMPRESS_BZIP2=y +CONFIG_DECOMPRESS_LZMA=y +CONFIG_HAS_IOMEM=y +CONFIG_HAS_IOPORT=y +CONFIG_HAS_DMA=y +CONFIG_HAVE_LMB=y +CONFIG_NLATTR=y +CONFIG_GENERIC_ATOMIC64=y + +# +# Kernel hacking +# +# CONFIG_PRINTK_TIME is not set +CONFIG_ENABLE_WARN_DEPRECATED=y +CONFIG_ENABLE_MUST_CHECK=y +CONFIG_FRAME_WARN=1024 +# CONFIG_MAGIC_SYSRQ is not set +# CONFIG_STRIP_ASM_SYMS is not set +# 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_DETECT_SOFTLOCKUP=y +# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set +CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 +CONFIG_DETECT_HUNG_TASK=y +# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set +CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0 +CONFIG_SCHED_DEBUG=y +# CONFIG_SCHEDSTATS is not set +# CONFIG_TIMER_STATS is not set +# CONFIG_DEBUG_OBJECTS is not set +# CONFIG_DEBUG_SLAB is not set +# CONFIG_DEBUG_KMEMLEAK is not set +CONFIG_DEBUG_PREEMPT=y +# 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_LOCK_ALLOC is not set +# CONFIG_PROVE_LOCKING is not set +# CONFIG_LOCK_STAT is not set +# CONFIG_DEBUG_SPINLOCK_SLEEP is not set +# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set +# CONFIG_DEBUG_KOBJECT is not set +CONFIG_DEBUG_BUGVERBOSE=y +CONFIG_DEBUG_INFO=y +# CONFIG_DEBUG_VM is not set +# CONFIG_DEBUG_WRITECOUNT is not set +CONFIG_DEBUG_MEMORY_INIT=y +# CONFIG_DEBUG_LIST is not set +# CONFIG_DEBUG_SG is not set +# CONFIG_DEBUG_NOTIFIERS is not set +# CONFIG_DEBUG_CREDENTIALS is not set +# CONFIG_RCU_TORTURE_TEST is not set +# CONFIG_RCU_CPU_STALL_DETECTOR is not set +# CONFIG_BACKTRACE_SELF_TEST is not set +# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set +# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set +# CONFIG_FAULT_INJECTION is not set +# CONFIG_LATENCYTOP is not set +CONFIG_SYSCTL_SYSCALL_CHECK=y +# CONFIG_DEBUG_PAGEALLOC is not set +CONFIG_HAVE_FUNCTION_TRACER=y +CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y +CONFIG_HAVE_DYNAMIC_FTRACE=y +CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y +CONFIG_TRACING_SUPPORT=y +CONFIG_FTRACE=y +# CONFIG_FUNCTION_TRACER is not set +# CONFIG_IRQSOFF_TRACER is not set +# CONFIG_PREEMPT_TRACER is not set +# CONFIG_SCHED_TRACER is not set +# CONFIG_ENABLE_DEFAULT_TRACERS is not set +# CONFIG_BOOT_TRACER is not set +CONFIG_BRANCH_PROFILE_NONE=y +# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set +# CONFIG_PROFILE_ALL_BRANCHES is not set +# CONFIG_STACK_TRACER is not set +# CONFIG_KMEMTRACE is not set +# CONFIG_WORKQUEUE_TRACER is not set +# CONFIG_BLK_DEV_IO_TRACE is not set +# CONFIG_DMA_API_DEBUG is not set +# CONFIG_SAMPLES is not set +CONFIG_HAVE_ARCH_KGDB=y +# CONFIG_KGDB is not set +# CONFIG_PPC_DISABLE_WERROR is not set +CONFIG_PPC_WERROR=y +CONFIG_PRINT_STACK_DEPTH=64 +# CONFIG_DEBUG_STACKOVERFLOW is not set +# CONFIG_DEBUG_STACK_USAGE is not set +# CONFIG_CODE_PATCHING_SELFTEST is not set +# CONFIG_FTR_FIXUP_SELFTEST is not set +# CONFIG_MSI_BITMAP_SELFTEST is not set +# CONFIG_XMON is not set +# CONFIG_IRQSTACKS is not set +# CONFIG_BDI_SWITCH is not set +# CONFIG_PPC_EARLY_DEBUG is not set + +# +# Security options +# +# CONFIG_KEYS is not set +# CONFIG_SECURITY is not set +# CONFIG_SECURITYFS is not set +# CONFIG_SECURITY_FILE_CAPABILITIES is not set +CONFIG_CRYPTO=y + +# +# Crypto core or helper +# +# CONFIG_CRYPTO_MANAGER is not set +# CONFIG_CRYPTO_MANAGER2 is not set +# CONFIG_CRYPTO_GF128MUL is not set +# CONFIG_CRYPTO_NULL is not set +# CONFIG_CRYPTO_CRYPTD is not set +# CONFIG_CRYPTO_AUTHENC is not set +# CONFIG_CRYPTO_TEST is not set + +# +# Authenticated Encryption with Associated Data +# +# CONFIG_CRYPTO_CCM is not set +# CONFIG_CRYPTO_GCM is not set +# CONFIG_CRYPTO_SEQIV is not set + +# +# Block modes +# +# CONFIG_CRYPTO_CBC is not set +# CONFIG_CRYPTO_CTR is not set +# CONFIG_CRYPTO_CTS is not set +# CONFIG_CRYPTO_ECB is not set +# CONFIG_CRYPTO_LRW is not set +# CONFIG_CRYPTO_PCBC is not set +# CONFIG_CRYPTO_XTS is not set + +# +# Hash modes +# +# CONFIG_CRYPTO_HMAC is not set +# CONFIG_CRYPTO_XCBC is not set +# CONFIG_CRYPTO_VMAC is not set + +# +# Digest +# +# CONFIG_CRYPTO_CRC32C is not set +# CONFIG_CRYPTO_GHASH is not set +# CONFIG_CRYPTO_MD4 is not set +# CONFIG_CRYPTO_MD5 is not set +# CONFIG_CRYPTO_MICHAEL_MIC is not set +# CONFIG_CRYPTO_RMD128 is not set +# CONFIG_CRYPTO_RMD160 is not set +# CONFIG_CRYPTO_RMD256 is not set +# CONFIG_CRYPTO_RMD320 is not set +# CONFIG_CRYPTO_SHA1 is not set +# CONFIG_CRYPTO_SHA256 is not set +# CONFIG_CRYPTO_SHA512 is not set +# CONFIG_CRYPTO_TGR192 is not set +# CONFIG_CRYPTO_WP512 is not set + +# +# Ciphers +# +# CONFIG_CRYPTO_AES is not set +# CONFIG_CRYPTO_ANUBIS is not set +# CONFIG_CRYPTO_ARC4 is not set +# CONFIG_CRYPTO_BLOWFISH is not set +# CONFIG_CRYPTO_CAMELLIA is not set +# CONFIG_CRYPTO_CAST5 is not set +# CONFIG_CRYPTO_CAST6 is not set +# CONFIG_CRYPTO_DES is not set +# CONFIG_CRYPTO_FCRYPT is not set +# CONFIG_CRYPTO_KHAZAD is not set +# CONFIG_CRYPTO_SALSA20 is not set +# CONFIG_CRYPTO_SEED is not set +# CONFIG_CRYPTO_SERPENT is not set +# CONFIG_CRYPTO_TEA is not set +# CONFIG_CRYPTO_TWOFISH is not set + +# +# Compression +# +# CONFIG_CRYPTO_DEFLATE is not set +# CONFIG_CRYPTO_ZLIB is not set +# CONFIG_CRYPTO_LZO is not set + +# +# Random Number Generation +# +# CONFIG_CRYPTO_ANSI_CPRNG is not set +CONFIG_CRYPTO_HW=y +# CONFIG_CRYPTO_DEV_HIFN_795X is not set +# CONFIG_CRYPTO_DEV_PPC4XX is not set +# CONFIG_PPC_CLOCK is not set +# CONFIG_VIRTUALIZATION is not set -- cgit v1.2.3 From c3289a93bb0bcf6d44118bc0c10054b2cb88dd6e Mon Sep 17 00:00:00 2001 From: Adrian Alonso Date: Fri, 5 Mar 2010 13:15:16 +0000 Subject: xilinx-bsp.bbclass: add support for xilinx ml507 Signed-off-by: Adrian Alonso Signed-off-by: Stefan Schmidt --- classes/xilinx-bsp.bbclass | 52 ++++++++++++++++++++++++---------------------- 1 file changed, 27 insertions(+), 25 deletions(-) diff --git a/classes/xilinx-bsp.bbclass b/classes/xilinx-bsp.bbclass index f657e5be94..d32c60ec73 100644 --- a/classes/xilinx-bsp.bbclass +++ b/classes/xilinx-bsp.bbclass @@ -3,7 +3,7 @@ # #This class handles all the intricasies of getting the required files from the #ISE/EDK/project to the kernel and prepare the kernel for compilation. -#The Xilinx EDK supports 2 different architectures : PowerPC (ppc 405) and Microblaze +#The Xilinx EDK supports 2 different architectures : PowerPC (ppc 405,440) and Microblaze #Only the PowerPC BSP has been tested so far #For this to work correctly you need to add XILINX_BSP_PATH and XILINX_BOARD to your #local.conf @@ -12,38 +12,40 @@ # #Currently supported boards #Xilinx ML403 +#Xilinx ML507 #More to come soon ;) do_configure_prepend() { - #first check that the XILINX_BSP_PATH and XILINX_BOARD have been defined in local.conf -if [ -z "${XILINX_BSP_PATH}" ]; then - oefatal "XILINX_BSP_PATH not defined ! Exiting..." - exit 1 - -else - if [ -z "${XILINX_BOARD}" ]; then - oefatal "XILINX_BOARD not defined ! Exiting" - exit 1 - fi - -fi #now depending on the board type and arch do what is nessesary -case "${XILINX_BOARD}" in - ML403) - oenote "ML403 board setup" - cp -pPR ${XILINX_BSP_PATH}/ppc405_0/libsrc/linux_2_6_v1_00_a/linux/arch/ppc/platforms/4xx/xparameters/xparameters_ml40x.h \ +if [ -n "${XILINX_BSP_PATH}" ]; then + case "${XILINX_BOARD}" in + ml403 | ML403) + oenote "ML403 board setup" + cp -pPR ${XILINX_BSP_PATH}/ppc405_0/libsrc/linux_2_6_v1_00_a/linux/arch/ppc/platforms/4xx/xparameters/xparameters_ml40x.h \ ${S}/arch/ppc/platforms/4xx/xparameters/xparameters_ml403.h - ;; - - * ) - oefatal "! Unknow Xilinx board ! Exiting..." - exit 1 - ;; -esac - + ;; + ml507 | ML507) + oenote "Xilinx ML507 board setup" + dts=`find "${XILINX_BSP_PATH}" -name *.dts -print` + if [ -n "$dts" ]; then + oenote "Replacing device tree with ${dts}" + cp -pP ${dts} ${S}/arch/powerpc/boot/dts/virtex440-ml507.dts + else + oenote "Device tree not found in project dir" + fi + ;; + *) + oefatal "! Unknow Xilinx board ! Exit ..." + exit 1 + ;; + esac +else + oefatal "XILINX_BSP_PATH not defined ! Exit" + exit 1 +fi } -- cgit v1.2.3 From ba37428a7e91205ad205bcf4d19268b6fe73844e Mon Sep 17 00:00:00 2001 From: Adrian Alonso Date: Fri, 5 Mar 2010 13:15:18 +0000 Subject: tune-ppc440.inc: add base to extra archs Signed-off-by: Adrian Alonso Signed-off-by: Stefan Schmidt --- conf/machine/include/tune-ppc440.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/machine/include/tune-ppc440.inc b/conf/machine/include/tune-ppc440.inc index feca186315..1c94a34e9e 100644 --- a/conf/machine/include/tune-ppc440.inc +++ b/conf/machine/include/tune-ppc440.inc @@ -1,4 +1,4 @@ TARGET_CC_ARCH = "-mcpu=440" BASE_PACKAGE_ARCH = "ppc440" FEED_ARCH = "ppc440" -PACKAGE_EXTRA_ARCHS += "ppc440e" +PACKAGE_EXTRA_ARCHS += "${BASE_PACKAGE_ARCH} ppc440e" -- cgit v1.2.3 From 2465c93bcb894b109badf81fdde2445c8d6ff363 Mon Sep 17 00:00:00 2001 From: Roman I Khimov Date: Mon, 15 Mar 2010 23:55:00 +0300 Subject: qemu: fix build with zlib-dev missing on host OE provides its own zlib-native and qemu-native should use that. Thanks to Thomas Zimmermann for spotting it. Signed-off-by: Roman I Khimov --- recipes/qemu/qemu_0.12.3.bb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/recipes/qemu/qemu_0.12.3.bb b/recipes/qemu/qemu_0.12.3.bb index 035b1a5b3a..d1971e96f8 100644 --- a/recipes/qemu/qemu_0.12.3.bb +++ b/recipes/qemu/qemu_0.12.3.bb @@ -1,7 +1,7 @@ LICENSE = "GPL" DEPENDS = "zlib" -PR = "r0" +PR = "r1" SRC_URI = "\ http://download.savannah.gnu.org/releases/qemu/qemu-${PV}.tar.gz;name=qemu-${PV} \ @@ -31,6 +31,10 @@ EXTRA_OECONF += "--disable-sdl --disable-strip" inherit autotools +do_configure_prepend_virtclass-native() { + export QEMU_CFLAGS="-I${STAGING_INCDIR_NATIVE} ${QEMU_CFLAGS}" +} + do_configure() { ${S}/configure --prefix=${prefix} ${EXTRA_OECONF} } -- cgit v1.2.3 From 394d321684eec271bc55438e3c01f74825d80988 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Tue, 16 Mar 2010 18:43:14 -0700 Subject: packaged-staging: Grab the staging lock before we copy and test the stamps so that we don't have other threads try and validate or install based on them being valid. This is a potential issue for certain BB_STAMP_POLICY (such as the default) values and enough concurrent threads. Signed-off-by: Tom Rini --- classes/packaged-staging.bbclass | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/classes/packaged-staging.bbclass b/classes/packaged-staging.bbclass index 1ede25cef0..da9d0f34c6 100644 --- a/classes/packaged-staging.bbclass +++ b/classes/packaged-staging.bbclass @@ -188,12 +188,21 @@ python packagestage_scenefunc () { if ret != 0: bb.fatal("Couldn't install the staging package to a temp directory") + # + # Grab the staging lock now so that we don't have other threads try and + # validate or install based on these stamps being valid. This is a + # potential issue for certain BB_STAMP_POLICY values and enough + # concurrent threads. + # + lf = bb.utils.lockfile(bb.data.expand("${SYSROOT_LOCK}", d)) + # # Copy the stamp files into the main stamps directoy # cmd = bb.data.expand("cp -dpR ${WORKDIR}/tstage/stamps/* ${TMPDIR}/stamps/", d) ret = os.system(cmd) if ret != 0: + bb.utils.unlockfile(lf) bb.fatal("Couldn't copy the staging package stamp files") # @@ -213,6 +222,7 @@ python packagestage_scenefunc () { stageok = bb.runqueue.check_stamp_fn(file, task, d) bb.debug(1, "Result %s" % (stageok)) if not stageok: + bb.utils.unlockfile(lf) break # Remove the stamps and files we added above @@ -223,7 +233,6 @@ python packagestage_scenefunc () { if stageok: bb.note("Staging package found, using it for %s." % file) installcmd = bb.data.getVar("PSTAGE_INSTALL_CMD", d, 1) - lf = bb.utils.lockfile(bb.data.expand("${SYSROOT_LOCK}", d)) ret = os.system("PATH=\"%s\" %s %s" % (path, installcmd, stagepkg)) bb.utils.unlockfile(lf) if ret != 0: -- cgit v1.2.3 From 9912eb3d0b73418219c963ca865faeee111f304d Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Wed, 17 Mar 2010 11:40:53 +0800 Subject: socat: Upgrade to version 1.7.1.2 Upgrade socat to the latest available version --- conf/checksums.ini | 8 - recipes/socat/files/compile.patch | 939 ++++++++++++++++++++++++++++++++ recipes/socat/files/ldflags.patch | 32 -- recipes/socat/files/xioinitialize.patch | 52 -- recipes/socat/files/xioopen.patch | 11 - recipes/socat/socat_1.3.2.1.bb | 19 - recipes/socat/socat_1.7.1.2.bb | 19 + 7 files changed, 958 insertions(+), 122 deletions(-) create mode 100644 recipes/socat/files/compile.patch delete mode 100644 recipes/socat/files/ldflags.patch delete mode 100644 recipes/socat/files/xioinitialize.patch delete mode 100644 recipes/socat/files/xioopen.patch delete mode 100644 recipes/socat/socat_1.3.2.1.bb create mode 100644 recipes/socat/socat_1.7.1.2.bb diff --git a/conf/checksums.ini b/conf/checksums.ini index 8dd9d6cae1..29e0f6ff0a 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -25166,14 +25166,6 @@ sha256=489bb2f9fb69922e9befc27ae1b8d19d31c83c586f55b7ecc503cb4f5e767da4 md5=6df271fd6a92d7641d7b060dedf7fec6 sha256=7eedc4ece1c82668c06222ef85457206139253e24a50e5b5d2401a41baee28c1 -[http://www.dest-unreach.org/socat/download/Archive/socat-1.3.2.1.tar.bz2] -md5=860fe417ea5e9ca2d2b2225192b85b87 -sha256=ecfbca297c26eff6cb04c2c45af1ee5c21d4a123a05f8b056a1c81ffcdfa1e3a - -[http://www.dest-unreach.org/socat/download/socat-1.3.2.1.tar.bz2] -md5=860fe417ea5e9ca2d2b2225192b85b87 -sha256=ecfbca297c26eff6cb04c2c45af1ee5c21d4a123a05f8b056a1c81ffcdfa1e3a - [http://download.ronetix.info/sk-eb926x/linux/kernel/2.6.25.4/socketcan-driver-at91.patch] md5=fe6945121eaea5e9c570e3dad54d7569 sha256=578db455270592833156358f79205b21701aa12b64142da16df08fb36fca3322 diff --git a/recipes/socat/files/compile.patch b/recipes/socat/files/compile.patch new file mode 100644 index 0000000000..35a1e3188f --- /dev/null +++ b/recipes/socat/files/compile.patch @@ -0,0 +1,939 @@ +Index: socat-1.7.1.2/configure.in +=================================================================== +--- socat-1.7.1.2.orig/configure.in 2010-03-17 10:10:07.431327912 +0800 ++++ socat-1.7.1.2/configure.in 2010-03-17 11:30:56.010077501 +0800 +@@ -86,7 +86,7 @@ + + + dnl Check for extra socket library (for Solaris) +-AC_CHECK_FUNC(hstrerror, , AC_CHECK_LIB(resolv, hstrerror, [LIBS="$LIBS -lresolv"; AC_DEFINE(HAVE_HSTRERROR)])) ++AC_CHECK_FUNC(hstrerror, , AC_CHECK_LIB(resolv, hstrerror, [LIBS="$LIBS -lresolv"; AC_DEFINE(HAVE_HSTRERROR, [1], [STRERROR])])) + AC_CHECK_FUNC(gethostent, , AC_CHECK_LIB(nsl, gethostent)) + AC_CHECK_FUNC(setsockopt, , AC_CHECK_LIB(socket, setsockopt)) + +@@ -100,7 +100,7 @@ + [sc_cv_have_prototype_hstrerror=yes]); + CFLAGS="$CFLAGS1"]) + if test $sc_cv_have_prototype_hstrerror = yes; then +- AC_DEFINE(HAVE_PROTOTYPE_HSTRERROR) ++ AC_DEFINE(HAVE_PROTOTYPE_HSTRERROR, [1], [Has Strerror]) + fi + AC_MSG_RESULT($sc_cv_have_prototype_hstrerror) + +@@ -109,83 +109,83 @@ + AC_ARG_ENABLE(help, [ --disable-help disable help], + [case "$enableval" in + no) AC_MSG_RESULT(no);; +- *) AC_DEFINE(WITH_HELP) AC_MSG_RESULT(yes);; ++ *) AC_DEFINE(WITH_HELP, [1], [With help]) AC_MSG_RESULT(yes);; + esac], +- [AC_DEFINE(WITH_HELP) AC_MSG_RESULT(yes)]) ++ [AC_DEFINE(WITH_HELP, [1], [With help]) AC_MSG_RESULT(yes)]) + + AC_MSG_CHECKING(whether to include STDIO support) + AC_ARG_ENABLE(stdio, [ --disable-stdio disable STDIO support], + [case "$enableval" in + no) AC_MSG_RESULT(no);; +- *) AC_DEFINE(WITH_STDIO) AC_MSG_RESULT(yes);; ++ *) AC_DEFINE(WITH_STDIO, [1], [With stdio]) AC_MSG_RESULT(yes);; + esac], +- [AC_DEFINE(WITH_STDIO) AC_MSG_RESULT(yes)]) ++ [AC_DEFINE(WITH_STDIO, [1], [With stdio]) AC_MSG_RESULT(yes)]) + + AC_MSG_CHECKING(whether to include FD-number support) + AC_ARG_ENABLE(fdnum, [ --disable-fdnum disable FD-number support], + [case "$enableval" in + no) AC_MSG_RESULT(no);; +- *) AC_DEFINE(WITH_FDNUM) AC_MSG_RESULT(yes);; ++ *) AC_DEFINE(WITH_FDNUM, [1], [With fdnum]) AC_MSG_RESULT(yes);; + esac], +- [AC_DEFINE(WITH_FDNUM) AC_MSG_RESULT(yes)]) ++ [AC_DEFINE(WITH_FDNUM, [1], [With fdnum]) AC_MSG_RESULT(yes)]) + + AC_MSG_CHECKING(whether to include direct file support) + AC_ARG_ENABLE(file, [ --disable-file disable direct file support], + [case "$enableval" in + no) AC_MSG_RESULT(no);; +- *) AC_DEFINE(WITH_FILE) AC_MSG_RESULT(yes);; ++ *) AC_DEFINE(WITH_FILE, [1], [With file]) AC_MSG_RESULT(yes);; + esac], +- [AC_DEFINE(WITH_FILE) AC_MSG_RESULT(yes)]) ++ [AC_DEFINE(WITH_FILE, [1], [With file]) AC_MSG_RESULT(yes)]) + + AC_MSG_CHECKING(whether to include direct create support) + AC_ARG_ENABLE(creat, [ --disable-creat disable direct create support], + [case "$enableval" in + no) AC_MSG_RESULT(no);; +- *) AC_DEFINE(WITH_CREAT) AC_MSG_RESULT(yes);; ++ *) AC_DEFINE(WITH_CREAT, [1], [With creat]) AC_MSG_RESULT(yes);; + esac], +- [AC_DEFINE(WITH_CREAT) AC_MSG_RESULT(yes)]) ++ [AC_DEFINE(WITH_CREAT, [1], [With creat]) AC_MSG_RESULT(yes)]) + + AC_MSG_CHECKING(whether to include gopen support) + AC_ARG_ENABLE(gopen, [ --disable-gopen disable open for UNIX socket support], + [case "$enableval" in + no) AC_MSG_RESULT(no);; +- *) AC_DEFINE(WITH_GOPEN) AC_MSG_RESULT(yes);; ++ *) AC_DEFINE(WITH_GOPEN, [1], [With gopen]) AC_MSG_RESULT(yes);; + esac], +- [AC_DEFINE(WITH_GOPEN) AC_MSG_RESULT(yes)]) ++ [AC_DEFINE(WITH_GOPEN, [1], [With gopen]) AC_MSG_RESULT(yes)]) + + AC_MSG_CHECKING(whether to include explicit pipe support) + AC_ARG_ENABLE(pipe, [ --disable-pipe disable pipe support], + [case "$enableval" in + no) AC_MSG_RESULT(no);; +- *) AC_DEFINE(WITH_PIPE) AC_MSG_RESULT(yes);; ++ *) AC_DEFINE(WITH_PIPE, [1], [With pipe]) AC_MSG_RESULT(yes);; + esac], +- [AC_DEFINE(WITH_PIPE) AC_MSG_RESULT(yes)]) ++ [AC_DEFINE(WITH_PIPE, [1], [With pipe]) AC_MSG_RESULT(yes)]) + + AC_MSG_CHECKING(whether to include explicit termios support) + AC_ARG_ENABLE(termios, [ --disable-termios disable termios support], + [case "$enableval" in + no) AC_MSG_RESULT(no);; +- *) AC_DEFINE(WITH_TERMIOS) AC_MSG_RESULT(yes);; ++ *) AC_DEFINE(WITH_TERMIOS, [1], [With termios]) AC_MSG_RESULT(yes);; + esac], +- [AC_DEFINE(WITH_TERMIOS) AC_MSG_RESULT(yes)]) ++ [AC_DEFINE(WITH_TERMIOS, [1], [With termios]) AC_MSG_RESULT(yes)]) + + AC_MSG_CHECKING(whether to include UNIX socket support) + AC_ARG_ENABLE(unix, [ --disable-unix disable UNIX domain socket support], + [case "$enableval" in + no) AC_MSG_RESULT(no);; +- *) AC_DEFINE(WITH_UNIX) AC_MSG_RESULT(yes);; ++ *) AC_DEFINE(WITH_UNIX, [1], [With unix]) AC_MSG_RESULT(yes);; + esac], +- [AC_DEFINE(WITH_UNIX) AC_MSG_RESULT(yes)]) ++ [AC_DEFINE(WITH_UNIX, [1], [With unix]) AC_MSG_RESULT(yes)]) + + AC_MSG_CHECKING(whether to include abstract UNIX socket support) + AC_ARG_ENABLE(abstract_unixsocket, [ --disable-abstract-unixsocket disable abstract UNIX domain socket support], + [case "$enableval" in + no) AC_MSG_RESULT(no);; +- *) AC_DEFINE(WITH_ABSTRACT_UNIXSOCKET) AC_MSG_RESULT(yes);; ++ *) AC_DEFINE(WITH_ABSTRACT_UNIXSOCKET, [1], [With abstract unix socket]) AC_MSG_RESULT(yes);; + esac], + [ case "`uname`" in + Linux) +- AC_DEFINE(WITH_ABSTRACT_UNIXSOCKET) AC_MSG_RESULT(yes);; ++ AC_DEFINE(WITH_ABSTRACT_UNIXSOCKET, [1], [With abstract unix socket]) AC_MSG_RESULT(yes);; + *) + AC_MSG_RESULT(no);; + esac]) +@@ -194,9 +194,9 @@ + AC_ARG_ENABLE(ip4, [ --disable-ip4 disable IPv4 support], + [case "$enableval" in + no) AC_MSG_RESULT(no);; +- *) AC_DEFINE(WITH_IP4) AC_MSG_RESULT(yes);; ++ *) AC_DEFINE(WITH_IP4, [1], [with ipv4]) AC_MSG_RESULT(yes);; + esac], +- [AC_DEFINE(WITH_IP4) AC_MSG_RESULT(yes)]) ++ [AC_DEFINE(WITH_IP4, [1], [with ipv4]) AC_MSG_RESULT(yes)]) + + AC_MSG_CHECKING(whether to include IPv6 support) + AC_ARG_ENABLE(ip6, [ --disable-ip6 disable IPv6 support], +@@ -207,7 +207,7 @@ + [ AC_MSG_RESULT(yes); WITH_IP6=1 ]) + if test "$WITH_IP6"; then + AC_CHECK_HEADERS([netinet/ip6.h], +- [AC_DEFINE(HAVE_NETINET_IP6_H) AC_DEFINE(WITH_IP6)], ++ [AC_DEFINE(HAVE_NETINET_IP6_H) AC_DEFINE(WITH_IP6, [1], [with ipv6])], + [AC_MSG_WARN([include file netinet/ip6.h not found, disabling IP6])], + [AC_INCLUDES_DEFAULT + #ifdef HAVE_NETINET_IN_H +@@ -219,17 +219,17 @@ + AC_ARG_ENABLE(rawip, [ --disable-rawip disable raw IP support], + [case "$enableval" in + no) AC_MSG_RESULT(no);; +- *) AC_DEFINE(WITH_RAWIP) AC_MSG_RESULT(yes);; ++ *) AC_DEFINE(WITH_RAWIP, [1], [With reawip]) AC_MSG_RESULT(yes);; + esac], +- [AC_DEFINE(WITH_RAWIP) AC_MSG_RESULT(yes)]) ++ [AC_DEFINE(WITH_RAWIP, [1], [With rawip]) AC_MSG_RESULT(yes)]) + + AC_MSG_CHECKING(whether to include generic socket support) + AC_ARG_ENABLE(rawsocket, [ --disable-genericsocket disable generic socket support], + [case "$enableval" in + no) AC_MSG_RESULT(no);; +- *) AC_DEFINE(WITH_GENERICSOCKET) AC_MSG_RESULT(yes);; ++ *) AC_DEFINE(WITH_GENERICSOCKET, [1], [With genericsocket]) AC_MSG_RESULT(yes);; + esac], +- [AC_DEFINE(WITH_GENERICSOCKET) AC_MSG_RESULT(yes)]) ++ [AC_DEFINE(WITH_GENERICSOCKET, [1], [With genericsocket]) AC_MSG_RESULT(yes)]) + AC_MSG_CHECKING(whether to include raw network interface support) + AC_ARG_ENABLE(interface, [ --disable-interface disable network interface support], + [case "$enableval" in +@@ -239,35 +239,35 @@ + [AC_MSG_RESULT(yes); WITH_INTERFACE=1 ]) + if test "$WITH_INTERFACE"; then + AC_CHECK_HEADER(netpacket/packet.h, +- AC_DEFINE(HAVE_NETPACKET_PACKET_H), ++ AC_DEFINE(HAVE_NETPACKET_PACKET_H, [1], [Has packet.h]), + [WITH_INTERFACE=; + AC_MSG_WARN([include file netpacket/packet.h not found, disabling interface])]) + fi + if test "$WITH_INTERFACE"; then + AC_CHECK_HEADER(netinet/if_ether.h, +- AC_DEFINE(HAVE_NETINET_IF_ETHER_H), ++ AC_DEFINE(HAVE_NETINET_IF_ETHER_H, [1], [Has if_ether.h]), + [WITH_INTERFACE=; + AC_MSG_WARN([include file netinet/if_ether.h not found, disabling interface])]) + fi + if test "$WITH_INTERFACE"; then +- AC_DEFINE(WITH_INTERFACE) ++ AC_DEFINE(WITH_INTERFACE, [1], [Wither interface]) + fi + + AC_MSG_CHECKING(whether to include TCP support) + AC_ARG_ENABLE(tcp, [ --disable-tcp disable TCP support], + [case "$enableval" in + no) AC_MSG_RESULT(no);; +- *) AC_DEFINE(WITH_TCP) AC_MSG_RESULT(yes);; ++ *) AC_DEFINE(WITH_TCP, [1], [With TCP]) AC_MSG_RESULT(yes);; + esac], +- [AC_DEFINE(WITH_TCP) AC_MSG_RESULT(yes)]) ++ [AC_DEFINE(WITH_TCP, [1], [With TCP]) AC_MSG_RESULT(yes)]) + + AC_MSG_CHECKING(whether to include UDP support) + AC_ARG_ENABLE(udp, [ --disable-udp disable UDP support], + [case "$enableval" in + no) AC_MSG_RESULT(no);; +- *) AC_DEFINE(WITH_UDP) AC_MSG_RESULT(yes);; ++ *) AC_DEFINE(WITH_UDP, [1], [With UDP]) AC_MSG_RESULT(yes);; + esac], +- [AC_DEFINE(WITH_UDP) AC_MSG_RESULT(yes)]) ++ [AC_DEFINE(WITH_UDP, [1], [With UDP]) AC_MSG_RESULT(yes)]) + + AC_MSG_CHECKING(whether to include SCTP support) + AC_ARG_ENABLE(sctp, [ --disable-sctp disable SCTP support], +@@ -287,7 +287,7 @@ + [sc_cv_define_ipproto_sctp=no])]) + AC_MSG_RESULT($sc_cv_define_ipproto_sctp) + if test $sc_cv_define_ipproto_sctp = yes; then +- AC_DEFINE(WITH_SCTP) ++ AC_DEFINE(WITH_SCTP, [1], [With SCTP]) + else + AC_MSG_WARN([IPPROTO_SCTP undefined, disabling SCTP support]) + fi +@@ -297,65 +297,65 @@ + AC_ARG_ENABLE(listen, [ --disable-listen disable listen support], + [case "$enableval" in + no) AC_MSG_RESULT(no);; +- *) AC_DEFINE(WITH_LISTEN) AC_MSG_RESULT(yes);; ++ *) AC_DEFINE(WITH_LISTEN, [1], [With listen]) AC_MSG_RESULT(yes);; + esac], +- [AC_DEFINE(WITH_LISTEN) AC_MSG_RESULT(yes)]) ++ [AC_DEFINE(WITH_LISTEN, [1], [With listen]) AC_MSG_RESULT(yes)]) + + AC_MSG_CHECKING(whether to include socks4 support) + AC_ARG_ENABLE(socks4, [ --disable-socks4 disable socks4 support], + [case "$enableval" in + no) AC_MSG_RESULT(no);; +- *) AC_DEFINE(WITH_SOCKS4) AC_MSG_RESULT(yes);; ++ *) AC_DEFINE(WITH_SOCKS4, [1], [With socks]) AC_MSG_RESULT(yes);; + esac], +- [AC_DEFINE(WITH_SOCKS4) AC_MSG_RESULT(yes)]) ++ [AC_DEFINE(WITH_SOCKS4, [1], [With socks]) AC_MSG_RESULT(yes)]) + + AC_MSG_CHECKING(whether to include socks4a support) + AC_ARG_ENABLE(socks4a, [ --disable-socks4a disable socks4a support], + [case "$enableval" in + no) AC_MSG_RESULT(no);; +- *) AC_DEFINE(WITH_SOCKS4A) AC_MSG_RESULT(yes);; ++ *) AC_DEFINE(WITH_SOCKS4A, [1], [With socks4a]) AC_MSG_RESULT(yes);; + esac], +- [AC_DEFINE(WITH_SOCKS4A) AC_MSG_RESULT(yes)]) ++ [AC_DEFINE(WITH_SOCKS4A, [1], [With socks4a]) AC_MSG_RESULT(yes)]) + + AC_MSG_CHECKING(whether to include proxy connect support) + AC_ARG_ENABLE(proxy, [ --disable-proxy disable proxy connect support], + [case "$enableval" in + no) AC_MSG_RESULT(no);; +- *) AC_DEFINE(WITH_PROXY) AC_MSG_RESULT(yes);; ++ *) AC_DEFINE(WITH_PROXY, [1], [With proxy]) AC_MSG_RESULT(yes);; + esac], +- [AC_DEFINE(WITH_PROXY) AC_MSG_RESULT(yes)]) ++ [AC_DEFINE(WITH_PROXY, [1], [With proxy]) AC_MSG_RESULT(yes)]) + + AC_MSG_CHECKING(whether to include exec support) + AC_ARG_ENABLE(exec, [ --disable-exec disable exec support], + [case "$enableval" in + no) AC_MSG_RESULT(no);; +- *) AC_DEFINE(WITH_EXEC) AC_MSG_RESULT(yes);; ++ *) AC_DEFINE(WITH_EXEC, [1], [With exec]) AC_MSG_RESULT(yes);; + esac], +- [AC_DEFINE(WITH_EXEC) AC_MSG_RESULT(yes)]) ++ [AC_DEFINE(WITH_EXEC, [1], [With exec]) AC_MSG_RESULT(yes)]) + + AC_MSG_CHECKING([whether to include system (shell) support]) + AC_ARG_ENABLE(system, [ --disable-system disable system (shell) support], + [case "$enableval" in + no) AC_MSG_RESULT(no);; +- *) AC_DEFINE(WITH_SYSTEM) AC_MSG_RESULT(yes);; ++ *) AC_DEFINE(WITH_SYSTEM, [1], [With system]) AC_MSG_RESULT(yes);; + esac], +- [AC_DEFINE(WITH_SYSTEM) AC_MSG_RESULT(yes)]) ++ [AC_DEFINE(WITH_SYSTEM, [1], [With system]) AC_MSG_RESULT(yes)]) + + AC_MSG_CHECKING(whether to include pty address support) + AC_ARG_ENABLE(pty, [ --disable-pty disable pty support], + [case "$enableval" in + no) AC_MSG_RESULT(no);; +- *) AC_DEFINE(WITH_PTY) AC_MSG_RESULT(yes);; ++ *) AC_DEFINE(WITH_PTY, [1], [With pty]) AC_MSG_RESULT(yes);; + esac], +- [AC_DEFINE(WITH_PTY) AC_MSG_RESULT(yes)]) ++ [AC_DEFINE(WITH_PTY, [1], [With pty]) AC_MSG_RESULT(yes)]) + + AC_MSG_CHECKING(whether to include ext2 fs attributes support) + AC_ARG_ENABLE(ext2, [ --disable-ext2 disable ext2 fs attributes support], + [case "$enableval" in + no) AC_MSG_RESULT(no);; +- *) AC_DEFINE(WITH_EXT2) AC_MSG_RESULT(yes);; ++ *) AC_DEFINE(WITH_EXT2, [1], [With ext2]) AC_MSG_RESULT(yes);; + esac], +- [AC_DEFINE(WITH_EXT2) AC_MSG_RESULT(yes)]) ++ [AC_DEFINE(WITH_EXT2, [1], [With ext2]) AC_MSG_RESULT(yes)]) + + AC_MSG_CHECKING(whether to include readline support) + AC_ARG_ENABLE(readline, [ --disable-readline disable readline support], +@@ -400,10 +400,10 @@ + + if test -n "$sc_usable_readline_found"; then + AC_MSG_RESULT(yes) +- AC_DEFINE(HAVE_READLINE_READLINE_H,1) +- AC_DEFINE(HAVE_READLINE_HISTORY_H,1) +- AC_DEFINE(HAVE_LIBREADLINE,1) +- AC_DEFINE(WITH_READLINE,1) ++ AC_DEFINE(HAVE_READLINE_READLINE_H,1, [have readline]) ++ AC_DEFINE(HAVE_READLINE_HISTORY_H,1, [have history]) ++ AC_DEFINE(HAVE_LIBREADLINE,1, [have readline]) ++ AC_DEFINE(WITH_READLINE,1, [with readline]) + break + else + AC_MSG_RESULT(no) +@@ -446,7 +446,7 @@ + done]) + ]) + if test "$sc_cv_have_openssl_ssl_h" = "yes"; then +- AC_DEFINE(HAVE_OPENSSL_SSL_H) ++ AC_DEFINE(HAVE_OPENSSL_SSL_H, [1], [have openssl.h]) + fi + AC_MSG_NOTICE(checked for openssl/ssl.h... $sc_cv_have_openssl_ssl_h) + fi # end checking for openssl/ssl.h +@@ -478,7 +478,7 @@ + ] + ) + if test "$sc_cv_have_libssl" = 'yes'; then +- AC_DEFINE(HAVE_LIBSSL) ++ AC_DEFINE(HAVE_LIBSSL, [1], [libssl]) + fi + AC_MSG_RESULT($sc_cv_have_libssl) + fi +@@ -506,7 +506,7 @@ + #fi + if test -n "$WITH_OPENSSL"; then + if test "$sc_cv_have_openssl_ssl_h" = "yes" -a "$sc_cv_have_libssl" = "yes"; then +- AC_DEFINE(WITH_OPENSSL) ++ AC_DEFINE(WITH_OPENSSL, [1], [With openssl]) + else + AC_MSG_WARN([not all components of OpenSSL found, disabling it]); + fi +@@ -552,7 +552,7 @@ + )] + ) + if test "$sv_cv_have_openssl_fips_h" = "yes"; then +- AC_DEFINE(HAVE_OPENSSL_FIPS_H) ++ AC_DEFINE(HAVE_OPENSSL_FIPS_H, [1], [OpenSSL fips.h]) + fi + AC_MSG_NOTICE(checked for openssl/fips.h... $sc_cv_have_openssl_ssl_h) + fi +@@ -583,15 +583,15 @@ + ] + ) + if test "$sc_cv_have_libcrypto" = 'yes'; then +- AC_DEFINE(HAVE_LIBCRYPTO) ++ AC_DEFINE(HAVE_LIBCRYPTO, [1], [libcrypto]) + fi + AC_MSG_RESULT($sc_cv_have_libcrypto) + fi + + if test -n "$WITH_FIPS"; then + if test "$sc_cv_have_openssl_fips_h" = 'yes' -a "$sc_cv_have_libcrypto" = 'yes'; then +- AC_DEFINE(WITH_FIPS) +- AC_DEFINE(OPENSSL_FIPS) ++ AC_DEFINE(WITH_FIPS, [1], [With fips]) ++ AC_DEFINE(OPENSSL_FIPS, [1], [openssl fips]) + else + AC_MSG_WARN([not all components of OpenSSL FIPS found, disabling it]); + fi +@@ -612,17 +612,17 @@ + fi + # + if test -n "$WITH_TUN"; then +- AC_DEFINE(WITH_TUN) ++ AC_DEFINE(WITH_TUN, [1], [with tun]) + fi + + AC_MSG_CHECKING(whether to include system call tracing) + AC_ARG_ENABLE(sycls, [ --disable-sycls disable system call tracing], + [case "$enableval" in + no) SYCLS=""; SSLCLS=""; AC_MSG_RESULT(no);; +- *) AC_DEFINE(WITH_SYCLS) ++ *) AC_DEFINE(WITH_SYCLS, [1], [syscls]) + SYCLS="sycls.c"; SSLCLS="sslcls.c"; AC_MSG_RESULT(yes);; + esac], +- [AC_DEFINE(WITH_SYCLS) ++ [AC_DEFINE(WITH_SYCLS, [1], [syscls]) + SYCLS="sycls.c"; SSLCLS="sslcls.c"; AC_MSG_RESULT(yes)]) + AC_SUBST(SYCLS) + AC_SUBST(SSLCLS) +@@ -631,31 +631,31 @@ + AC_ARG_ENABLE(filan, [ --disable-filan disable file descriptor analyzer], + [case "$enableval" in + no) FILAN=""; AC_MSG_RESULT(no);; +- *) AC_DEFINE(WITH_FILAN) FILAN="filan.c"; AC_MSG_RESULT(yes);; ++ *) AC_DEFINE(WITH_FILAN, [1], [filan]) FILAN="filan.c"; AC_MSG_RESULT(yes);; + esac], +- [AC_DEFINE(WITH_FILAN) FILAN="filan.c"; AC_MSG_RESULT(yes)]) ++ [AC_DEFINE(WITH_FILAN, [1], [filan]) FILAN="filan.c"; AC_MSG_RESULT(yes)]) + AC_SUBST(FILAN) + + AC_MSG_CHECKING(whether to include retry support) + AC_ARG_ENABLE(retry, [ --disable-retry disable retry support], + [case "$enableval" in + no) AC_MSG_RESULT(no);; +- *) AC_DEFINE(WITH_RETRY) AC_MSG_RESULT(yes);; ++ *) AC_DEFINE(WITH_RETRY, [1], [retry]) AC_MSG_RESULT(yes);; + esac], +- [AC_DEFINE(WITH_RETRY) AC_MSG_RESULT(yes)]) ++ [AC_DEFINE(WITH_RETRY, [1], [retry]) AC_MSG_RESULT(yes)]) + + AC_MSG_CHECKING(included message level) + AC_ARG_ENABLE(msglevel, [ --enable-msglevel=N set max verbosity to debug,info,notice,warn,error,fatal], + [case "$enableval" in +- debug) AC_DEFINE(WITH_MSGLEVEL,0) AC_MSG_RESULT(debug);; +- info) AC_DEFINE(WITH_MSGLEVEL,1) AC_MSG_RESULT(info);; +- notice) AC_DEFINE(WITH_MSGLEVEL,2) AC_MSG_RESULT(notice);; +- warn) AC_DEFINE(WITH_MSGLEVEL,3) AC_MSG_RESULT(warn);; +- error) AC_DEFINE(WITH_MSGLEVEL,4) AC_MSG_RESULT(error);; +- fatal) AC_DEFINE(WITH_MSGLEVEL,5) AC_MSG_RESULT(fatal);; +- *) AC_DEFINE(WITH_MSGLEVEL,0) AC_MSG_RESULT(debug);; ++ debug) AC_DEFINE(WITH_MSGLEVEL,0, [msglevel]) AC_MSG_RESULT(debug);; ++ info) AC_DEFINE(WITH_MSGLEVEL,1, [msglevel]) AC_MSG_RESULT(info);; ++ notice) AC_DEFINE(WITH_MSGLEVEL,2, [msglevel]) AC_MSG_RESULT(notice);; ++ warn) AC_DEFINE(WITH_MSGLEVEL,3, [msglevel]) AC_MSG_RESULT(warn);; ++ error) AC_DEFINE(WITH_MSGLEVEL,4, [msglevel]) AC_MSG_RESULT(error);; ++ fatal) AC_DEFINE(WITH_MSGLEVEL,5, [msglevel]) AC_MSG_RESULT(fatal);; ++ *) AC_DEFINE(WITH_MSGLEVEL,0, [msglevel]) AC_MSG_RESULT(debug);; + esac], +- [AC_DEFINE(WITH_MSGLEVEL,0) AC_MSG_RESULT(debug)]) ++ [AC_DEFINE(WITH_MSGLEVEL,0, [msglevel]) AC_MSG_RESULT(debug)]) + + #AC_SUBST(V_INCL) + +@@ -672,7 +672,7 @@ + AC_HEADER_TIME + + dnl Check for extra realtime library (for Solaris) +-AC_CHECK_FUNC(nanosleep, AC_DEFINE(HAVE_NANOSLEEP), AC_CHECK_LIB(rt, nanosleep, [LIBS="-lrt $LIBS"; AC_DEFINE(HAVE_NANOSLEEP)])) ++AC_CHECK_FUNC(nanosleep, AC_DEFINE(HAVE_NANOSLEEP, [1], [have nanosleep]), AC_CHECK_LIB(rt, nanosleep, [LIBS="-lrt $LIBS"; AC_DEFINE(HAVE_NANOSLEEP, [1], [have nanosleep])])) + #AC_CHECK_FUNC(nanosleep, , AC_CHECK_LIB(rt, nanosleep)) + + dnl Checks for library functions. +@@ -694,7 +694,7 @@ + [sc_cv_type_longlong=yes], + [sc_cv_type_longlong=no])]) + if test $sc_cv_type_longlong = yes; then +- AC_DEFINE(HAVE_TYPE_LONGLONG) ++ AC_DEFINE(HAVE_TYPE_LONGLONG, [1], [have type long long]) + fi + AC_MSG_RESULT($sc_cv_type_longlong) + +@@ -710,7 +710,7 @@ + [sc_cv_type_socklen=yes], + [sc_cv_type_socklen=no])]) + if test $sc_cv_type_socklen = yes; then +- AC_DEFINE(HAVE_TYPE_SOCKLEN) ++ AC_DEFINE(HAVE_TYPE_SOCKLEN, [1], [Has Socklen]) + fi + AC_MSG_RESULT($sc_cv_type_socklen) + +@@ -720,7 +720,7 @@ + [sc_cv_type_stat64=yes], + [sc_cv_type_stat64=no])]) + if test $sc_cv_type_stat64 = yes; then +- AC_DEFINE(HAVE_TYPE_STAT64) ++ AC_DEFINE(HAVE_TYPE_STAT64, [1], [Has stat64]) + fi + AC_MSG_RESULT($sc_cv_type_stat64) + +@@ -730,7 +730,7 @@ + [sc_cv_type_off64=yes], + [sc_cv_type_off64=no])]) + if test $sc_cv_type_off64 = yes; then +- AC_DEFINE(HAVE_TYPE_OFF64) ++ AC_DEFINE(HAVE_TYPE_OFF64, [1], [have off64]) + fi + AC_MSG_RESULT($sc_cv_type_off64) + +@@ -740,7 +740,7 @@ + [sc_cv_type_sighandler=yes], + [sc_cv_type_sighandler=no])]) + if test $sc_cv_type_sighandler = yes; then +- AC_DEFINE(HAVE_TYPE_SIGHANDLER) ++ AC_DEFINE(HAVE_TYPE_SIGHANDLER, [1], [have type sighandler]) + fi + AC_MSG_RESULT($sc_cv_type_socklen) + +@@ -758,7 +758,7 @@ + [sc_cv_type_uint8=yes], + [sc_cv_type_uint8=no])]) + if test $sc_cv_type_uint8 = yes; then +- AC_DEFINE(HAVE_TYPE_UINT8) ++ AC_DEFINE(HAVE_TYPE_UINT8, [1], [have uint8]) + fi + AC_MSG_RESULT($sc_cv_type_uint8) + +@@ -776,7 +776,7 @@ + [sc_cv_type_uint16=yes], + [sc_cv_type_uint16=no])]) + if test $sc_cv_type_uint16 = yes; then +- AC_DEFINE(HAVE_TYPE_UINT16) ++ AC_DEFINE(HAVE_TYPE_UINT16, [1], [have uint16t]) + fi + AC_MSG_RESULT($sc_cv_type_uint16) + +@@ -794,7 +794,7 @@ + [sc_cv_type_uint32=yes], + [sc_cv_type_uint32=no])]) + if test $sc_cv_type_uint32 = yes; then +- AC_DEFINE(HAVE_TYPE_UINT32) ++ AC_DEFINE(HAVE_TYPE_UINT32, [1], [have uint32]) + fi + AC_MSG_RESULT($sc_cv_type_uint32) + +@@ -812,7 +812,7 @@ + [sc_cv_type_uint64=yes], + [sc_cv_type_uint64=no])]) + if test $sc_cv_type_uint64 = yes; then +- AC_DEFINE(HAVE_TYPE_UINT64) ++ AC_DEFINE(HAVE_TYPE_UINT64, [1], [have uint64] ) + fi + AC_MSG_RESULT($sc_cv_type_uint64) + +@@ -834,7 +834,7 @@ + #include + #endif], + [fd_set s; s.fds_bits[0]=0;], +-[AC_MSG_RESULT(yes); AC_DEFINE(HAVE_FDS_BITS)], ++[AC_MSG_RESULT(yes); AC_DEFINE(HAVE_FDS_BITS, [1], [have fds bits])], + [AC_MSG_RESULT(no);]) + + AC_MSG_CHECKING(for sa_family_t) +@@ -844,7 +844,7 @@ + [sc_cv_type_sa_family_t=yes], + [sc_cv_type_sa_family_t=no])]) + if test $sc_cv_type_sa_family_t = yes; then +- AC_DEFINE(HAVE_TYPE_SA_FAMILY_T) ++ AC_DEFINE(HAVE_TYPE_SA_FAMILY_T, [1], [have sa family_t type]) + fi + AC_MSG_RESULT($sc_cv_type_sa_family_t) + +@@ -854,7 +854,7 @@ + [sc_cv_struct_sigaction_sa_sigaction=yes], + [sc_cv_struct_sigaction_sa_sigaction=no])]) + if test $sc_cv_struct_sigaction_sa_sigaction = yes; then +- AC_DEFINE(HAVE_STRUCT_SIGACTION_SA_SIGACTION) ++ AC_DEFINE(HAVE_STRUCT_SIGACTION_SA_SIGACTION, [1], [sigaction]) + fi + AC_MSG_RESULT($sc_cv_struct_sigaction_sa_sigaction) + +@@ -862,11 +862,11 @@ + AC_MSG_CHECKING(for termios.c_ispeed) + AC_CACHE_VAL(sc_cv_termios_ispeed, + [AC_TRY_COMPILE([#include ], +-[struct termios t; t.c_ispeed=0;], ++[struct termios t; t.c_ispeed=ISPEED_OFFSET; t.c_ospeed=OSPEED_OFFSET;], + [sc_cv_termios_ispeed=yes], + [sc_cv_termios_ispeed=no])]) + if test $sc_cv_termios_ispeed = yes; then +- AC_DEFINE(HAVE_TERMIOS_ISPEED) ++ AC_DEFINE(HAVE_TERMIOS_ISPEED, [1], [have ispeed]) + fi + AC_MSG_RESULT($sc_cv_termios_ispeed) + +@@ -897,7 +897,7 @@ + LIBS="$LIBS1" + AC_MSG_RESULT($ac_cv_ispeed_offset) + if test $ac_cv_ispeed_offset -ge 0; then +- AC_DEFINE_UNQUOTED(ISPEED_OFFSET, $ac_cv_ispeed_offset) ++ AC_DEFINE_UNQUOTED(ISPEED_OFFSET, $ac_cv_ispeed_offset, [have ispeed]) + fi + fi + +@@ -916,7 +916,7 @@ + )] + )]) + if test $ac_cv_svid3 = yes; then +- AC_DEFINE(_SVID3) ++ AC_DEFINE(_SVID3, [1], [svid3]) + fi + AC_MSG_RESULT($ac_cv_svid3) + +@@ -931,7 +931,7 @@ + [sc_cv_struct_timespec=yes], + [sc_cv_struct_timespec=no])]) + if test $sc_cv_struct_timespec = yes; then +- AC_DEFINE(HAVE_STRUCT_TIMESPEC) ++ AC_DEFINE(HAVE_STRUCT_TIMESPEC, [1], [struct timespec]) + fi + AC_MSG_RESULT($sc_cv_struct_timespec) + +@@ -944,7 +944,7 @@ + [sc_cv_struct_linger=yes], + [sc_cv_struct_linger=no])]) + if test $sc_cv_struct_linger = yes; then +- AC_DEFINE(HAVE_STRUCT_LINGER) ++ AC_DEFINE(HAVE_STRUCT_LINGER, [1], [struct linger]) + fi + AC_MSG_RESULT($sc_cv_struct_linger) + +@@ -958,7 +958,7 @@ + [sc_cv_struct_ip_mreq=yes], + [sc_cv_struct_ip_mreq=no])]) + if test $sc_cv_struct_ip_mreq = yes; then +- AC_DEFINE(HAVE_STRUCT_IP_MREQ) ++ AC_DEFINE(HAVE_STRUCT_IP_MREQ, [1], [have struct ip mreq]) + fi + AC_MSG_RESULT($sc_cv_struct_ip_mreq) + +@@ -971,7 +971,7 @@ + [sc_cv_struct_ip_mreqn=yes], + [sc_cv_struct_ip_mreqn=no])]) + if test $sc_cv_struct_ip_mreqn = yes; then +- AC_DEFINE(HAVE_STRUCT_IP_MREQN) ++ AC_DEFINE(HAVE_STRUCT_IP_MREQN, [1], [have struct ip mreqn]) + fi + AC_MSG_RESULT($sc_cv_struct_ip_mreqn) + +@@ -984,7 +984,7 @@ + [sc_cv_struct_ipv6_mreq=yes], + [sc_cv_struct_ipv6_mreq=no])]) + if test $sc_cv_struct_ipv6_mreq = yes; then +- AC_DEFINE(HAVE_STRUCT_IPV6_MREQ) ++ AC_DEFINE(HAVE_STRUCT_IPV6_MREQ, [1], [have struct ipv5 mreq]) + fi + AC_MSG_RESULT($sc_cv_struct_ipv6_mreq) + +@@ -998,7 +998,7 @@ + [sc_cv_struct_ifreq=yes], + [sc_cv_struct_ifreq=no])]) + if test $sc_cv_struct_ifreq = yes; then +- AC_DEFINE(HAVE_STRUCT_IFREQ) ++ AC_DEFINE(HAVE_STRUCT_IFREQ, [1], [have struct ifreq]) + fi + AC_MSG_RESULT($sc_cv_struct_ifreq) + +@@ -1013,7 +1013,7 @@ + [sc_cv_struct_ifreq_ifr_index=yes], + [sc_cv_struct_ifreq_ifr_index=no])]) + if test $sc_cv_struct_ifreq_ifr_index = yes; then +- AC_DEFINE(HAVE_STRUCT_IFREQ_IFR_INDEX) ++ AC_DEFINE(HAVE_STRUCT_IFREQ_IFR_INDEX, [1], [have struct ifreq ifr]) + fi + AC_MSG_RESULT($sc_cv_struct_ifreq_ifr_index) + +@@ -1028,7 +1028,7 @@ + [sc_cv_struct_ifreq_ifr_ifindex=yes], + [sc_cv_struct_ifreq_ifr_ifindex=no])]) + if test $sc_cv_struct_ifreq_ifr_ifindex = yes; then +- AC_DEFINE(HAVE_STRUCT_IFREQ_IFR_IFINDEX) ++ AC_DEFINE(HAVE_STRUCT_IFREQ_IFR_IFINDEX, [1], [have struct ifreq ifindex]) + fi + AC_MSG_RESULT($sc_cv_struct_ifreq_ifr_ifindex) + +@@ -1043,7 +1043,7 @@ + [sc_cv_struct_sockaddr_salen=yes], + [sc_cv_struct_sockaddr_salen=no])]) + if test $sc_cv_struct_sockaddr_salen = yes; then +- AC_DEFINE(HAVE_STRUCT_SOCKADDR_SALEN) ++ AC_DEFINE(HAVE_STRUCT_SOCKADDR_SALEN, [1], [sockaddr salen]) + fi + AC_MSG_RESULT($sc_cv_struct_sockaddr_salen) + +@@ -1054,31 +1054,31 @@ + #include ], + [struct sockaddr_in6 sa6;sa6.sin6_addr.s6_addr[0]=0;], + [AC_MSG_RESULT(s6_addr); +- AC_DEFINE(HAVE_IP6_SOCKADDR, 0)], ++ AC_DEFINE(HAVE_IP6_SOCKADDR, 0, [ip6 sockaddr])], + [AC_TRY_COMPILE([#include + #include ], + [struct sockaddr_in6 sa6;sa6.sin6_addr.u6_addr.u6_addr16[0]=0;], + [AC_MSG_RESULT(u6_addr.u6_addr16); +- AC_DEFINE(HAVE_IP6_SOCKADDR, 1)], ++ AC_DEFINE(HAVE_IP6_SOCKADDR, 1, [ip6 sockaddr])], + [AC_TRY_COMPILE([#include + #include ], + [struct sockaddr_in6 sa6;sa6.sin6_addr.u6_addr16[0]=0;], +- [AC_MSG_RESULT(u6_addr16); AC_DEFINE(HAVE_IP6_SOCKADDR, 2)], ++ [AC_MSG_RESULT(u6_addr16); AC_DEFINE(HAVE_IP6_SOCKADDR, 2, [ip6 sockaddr])], + [AC_TRY_COMPILE([#include + #include ], + [struct sockaddr_in6 sa6;sa6.sin6_addr.in6_u.u6_addr16[0]=0;], + [AC_MSG_RESULT(in6_u.u6_addr16); +- AC_DEFINE(HAVE_IP6_SOCKADDR, 3)], ++ AC_DEFINE(HAVE_IP6_SOCKADDR, 3, [ip6 sockaddr])], + [AC_TRY_COMPILE([#include + #include ], + [struct sockaddr_in6 sa6;sa6.sin6_addr._S6_un._S6_u32[0]=0;], + [AC_MSG_RESULT(_S6_un._S6_u32); +- AC_DEFINE(HAVE_IP6_SOCKADDR, 4)], ++ AC_DEFINE(HAVE_IP6_SOCKADDR, 4, [ip6 sockaddr])], + [AC_TRY_COMPILE([#include + #include ], + [struct sockaddr_in6 sa6;sa6.sin6_addr.__u6_addr.__u6_addr32[0]=0;], + [AC_MSG_RESULT(__u6_addr.__u6_addr32); +- AC_DEFINE(HAVE_IP6_SOCKADDR, 5)], ++ AC_DEFINE(HAVE_IP6_SOCKADDR, 5, [ip6 sockaddr])], + + [AC_MSG_RESULT([none or unknown])] + )])])])])]) +@@ -1090,7 +1090,7 @@ + [sc_cv_struct_iovec=yes], + [sc_cv_struct_iovec=no])]) + if test $sc_cv_struct_iovec = yes; then +- AC_DEFINE(HAVE_STRUCT_IOVEC) ++ AC_DEFINE(HAVE_STRUCT_IOVEC, [1], [have struct iovec]) + fi + AC_MSG_RESULT($sc_cv_struct_iovec) + +@@ -1103,7 +1103,7 @@ + [sc_cv_struct_msghdr_msgcontrol=yes], + [sc_cv_struct_msghdr_msgcontrol=no])]) + if test $sc_cv_struct_msghdr_msgcontrol = yes; then +- AC_DEFINE(HAVE_STRUCT_MSGHDR_MSGCONTROL) ++ AC_DEFINE(HAVE_STRUCT_MSGHDR_MSGCONTROL, [1], [have struct msgcontrol]) + fi + AC_MSG_RESULT($sc_cv_struct_msghdr_msgcontrol) + +@@ -1116,7 +1116,7 @@ + [sc_cv_struct_msghdr_msgcontrollen=yes], + [sc_cv_struct_msghdr_msgcontrollen=no])]) + if test $sc_cv_struct_msghdr_msgcontrollen = yes; then +- AC_DEFINE(HAVE_STRUCT_MSGHDR_MSGCONTROLLEN) ++ AC_DEFINE(HAVE_STRUCT_MSGHDR_MSGCONTROLLEN, [1], [have struct msghdr msgcontrollen]) + fi + AC_MSG_RESULT($sc_cv_struct_msghdr_msgcontrollen) + +@@ -1129,7 +1129,7 @@ + [sc_cv_struct_msghdr_msgflags=yes], + [sc_cv_struct_msghdr_msgflags=no])]) + if test $sc_cv_struct_msghdr_msgflags = yes; then +- AC_DEFINE(HAVE_STRUCT_MSGHDR_MSGFLAGS) ++ AC_DEFINE(HAVE_STRUCT_MSGHDR_MSGFLAGS, [1], [msgflags]) + fi + AC_MSG_RESULT($sc_cv_struct_msghdr_msgflags) + +@@ -1142,7 +1142,7 @@ + [sc_cv_struct_cmsghdr=yes], + [sc_cv_struct_cmsghdr=no])]) + if test $sc_cv_struct_cmsghdr = yes; then +- AC_DEFINE(HAVE_STRUCT_CMSGHDR) ++ AC_DEFINE(HAVE_STRUCT_CMSGHDR, [1], [have cmshdr]) + fi + AC_MSG_RESULT($sc_cv_struct_cmsghdr) + +@@ -1155,7 +1155,7 @@ + [sc_cv_struct_in_pktinfo=yes], + [sc_cv_struct_in_pktinfo=no])]) + if test $sc_cv_struct_in_pktinfo = yes; then +- AC_DEFINE(HAVE_STRUCT_IN_PKTINFO) ++ AC_DEFINE(HAVE_STRUCT_IN_PKTINFO, [1], [pktinfo]) + fi + AC_MSG_RESULT($sc_cv_struct_in_pktinfo) + +@@ -1170,7 +1170,7 @@ + [sc_cv_struct_ip_ip_hl=yes], + [sc_cv_struct_ip_ip_hl=no])]) + if test $sc_cv_struct_ip_ip_hl = yes; then +- AC_DEFINE(HAVE_STRUCT_IP_IP_HL) ++ AC_DEFINE(HAVE_STRUCT_IP_IP_HL, [1], [foo]) + fi + AC_MSG_RESULT($sc_cv_struct_ip_ip_hl) + +@@ -1178,19 +1178,19 @@ + dnl Library function checks + + dnl Check sigaction() +-AC_CHECK_FUNC(sigaction, AC_DEFINE(HAVE_SIGACTION)) ++AC_CHECK_FUNC(sigaction, AC_DEFINE(HAVE_SIGACTION, [1], [foo])) + + dnl Check for 64bit versions of system calls +-AC_CHECK_FUNC(stat64, AC_DEFINE(HAVE_STAT64)) +-AC_CHECK_FUNC(fstat64, AC_DEFINE(HAVE_FSTAT64)) +-AC_CHECK_FUNC(lstat64, AC_DEFINE(HAVE_LSTAT64)) +-AC_CHECK_FUNC(lseek64, AC_DEFINE(HAVE_LSEEK64)) +-AC_CHECK_FUNC(truncate64, AC_DEFINE(HAVE_TRUNCATE64)) +-AC_CHECK_FUNC(ftruncate64, AC_DEFINE(HAVE_FTRUNCATE64)) +- +-AC_CHECK_FUNC(strtoll, AC_DEFINE(HAVE_STRTOLL)) +-AC_CHECK_FUNC(hstrerror, AC_DEFINE(HAVE_HSTRERROR)) +-AC_CHECK_FUNC(inet_ntop, AC_DEFINE(HAVE_INET_NTOP)) ++AC_CHECK_FUNC(stat64, AC_DEFINE(HAVE_STAT64, [1], [foo])) ++AC_CHECK_FUNC(fstat64, AC_DEFINE(HAVE_FSTAT64, [1], [foo])) ++AC_CHECK_FUNC(lstat64, AC_DEFINE(HAVE_LSTAT64, [1], [foo])) ++AC_CHECK_FUNC(lseek64, AC_DEFINE(HAVE_LSEEK64, [1], [foo])) ++AC_CHECK_FUNC(truncate64, AC_DEFINE(HAVE_TRUNCATE64, [1], [foo])) ++AC_CHECK_FUNC(ftruncate64, AC_DEFINE(HAVE_FTRUNCATE64, [1], [foo])) ++ ++AC_CHECK_FUNC(strtoll, AC_DEFINE(HAVE_STRTOLL, [1], [foo])) ++AC_CHECK_FUNC(hstrerror, AC_DEFINE(HAVE_HSTRERROR, [1], [foo])) ++AC_CHECK_FUNC(inet_ntop, AC_DEFINE(HAVE_INET_NTOP, [1], [foo])) + + #if test "$ac_cv_func_hstrerror" = "yes"; then + # AC_MSG_CHECKING(if _XOPEN_SOURCE_EXTENDED is helpful) +@@ -1213,25 +1213,26 @@ + + dnl Search for openpty() + # MacOS +-AC_CHECK_FUNC(openpty, AC_DEFINE(HAVE_OPENPTY)) ++AC_CHECK_FUNC(openpty, AC_DEFINE(HAVE_OPENPTY, [1], [foo])) + # AIX + AC_CHECK_LIB(bsd, openpty, +- [LIBS="-lbsd $LIBS"; AC_DEFINE(HAVE_OPENPTY)]) ++ [LIBS="-lbsd $LIBS"; AC_DEFINE(HAVE_OPENPTY, [1], [foo])]) + # Linux 2.4 + AC_CHECK_LIB(util, openpty, +- [LIBS="-lutil $LIBS"; AC_DEFINE(HAVE_OPENPTY)]) ++ [LIBS="-lutil $LIBS"; AC_DEFINE(HAVE_OPENPTY, [1], [foo])]) ++ + + dnl Search for flock() + # with Linux it's in libc, with AIX in libbsd +-AC_CHECK_FUNC(flock, AC_DEFINE(HAVE_FLOCK), ++AC_CHECK_FUNC(flock, AC_DEFINE(HAVE_FLOCK, [1], [have flock]), + AC_CHECK_LIB(bsd, flock, [LIBS="-lbsd $LIBS"])) + + dnl Search for setenv() +-AC_CHECK_FUNC(setenv, AC_DEFINE(HAVE_SETENV), ++AC_CHECK_FUNC(setenv, AC_DEFINE(HAVE_SETENV, [1], [have setenv]), + AC_CHECK_LIB(isode, setenv, [LIBS="-lisode $LIBS"])) + + dnl Search for unsetenv() +-AC_CHECK_FUNC(unsetenv, AC_DEFINE(HAVE_UNSETENV)) ++AC_CHECK_FUNC(unsetenv, AC_DEFINE(HAVE_UNSETENV, [1], [have unsetenv])) + + + dnl Run time checks +@@ -1250,7 +1251,7 @@ + [ac_cv_have_z_modifier=no], + [ac_cv_have_z_modifier=no])]) + if test $ac_cv_have_z_modifier = yes; then +- AC_DEFINE(HAVE_FORMAT_Z) ++ AC_DEFINE(HAVE_FORMAT_Z, [1], [have format z]) + fi + AC_MSG_RESULT($ac_cv_have_z_modifier) + +@@ -1289,7 +1290,8 @@ + [AC_MSG_RESULT(please determine $1_SHIFT manually)] + ) + LIBS="$LIBS1"]) +-AC_DEFINE_UNQUOTED($1_SHIFT, ${$2}) ++SHIFT_NAME="$1"_SHIFT ++AC_DEFINE_UNQUOTED($SHIFT_NAME, ${$2}, [foo]) + ]) + + AC_SHIFT_OFFSET(CRDLY, sc_cv_sys_crdly_shift) +@@ -1326,7 +1328,7 @@ + [$4="0 /* unknown, taking default */" + ]) ]) ]) ]) ]) ]) ]) ]) + CFLAGS="$CFLAGS1" ]) +-AC_DEFINE_UNQUOTED($3, ${$4}) ++AC_DEFINE_UNQUOTED($3, ${$4}, [foo]) + ]) + + dnl find what physical type (basic C type) describes the given struct or union +@@ -1358,7 +1360,7 @@ + [$5="0 /* unknown, taking default */" + ]) ]) ]) ]) ]) ]) ]) ]) + CFLAGS="$CFLAGS1" ]) +-AC_DEFINE_UNQUOTED($4, ${$5}) ++AC_DEFINE_UNQUOTED($4, ${$5}, [foo]) + ]) + + AC_BASIC_TYPE([#include ], size_t, HAVE_BASIC_SIZE_T, sc_cv_type_sizet_basic) +@@ -1416,13 +1418,13 @@ + + AC_MSG_CHECKING(for /dev/ptmx) + if test -c /dev/ptmx; then +- AC_DEFINE(HAVE_DEV_PTMX, 1) ++ AC_DEFINE(HAVE_DEV_PTMX, 1, [ptmx]) + AC_MSG_RESULT(yes) + else + AC_MSG_RESULT(no) + AC_MSG_CHECKING(for /dev/ptc) + if test -c /dev/ptc; then +- AC_DEFINE(HAVE_DEV_PTC) ++ AC_DEFINE(HAVE_DEV_PTC, 1, [ptc]) + AC_MSG_RESULT(yes) + else + AC_MSG_RESULT(no) +@@ -1431,7 +1433,7 @@ + + AC_MSG_CHECKING(for /proc) + if test -d /proc; then +- AC_DEFINE(HAVE_PROC_DIR, 1) ++ AC_DEFINE(HAVE_PROC_DIR, 1, [procdir]) + AC_MSG_RESULT(yes) + else + AC_MSG_RESULT(no) +@@ -1439,7 +1441,7 @@ + + AC_MSG_CHECKING(for /proc/*/fd) + if test -d /proc/$$/fd; then +- AC_DEFINE(HAVE_PROC_DIR_FD, 1) ++ AC_DEFINE(HAVE_PROC_DIR_FD, 1, [procdir fd]) + AC_MSG_RESULT(yes) + else + AC_MSG_RESULT(no) +@@ -1479,7 +1481,7 @@ + done]) + ]) + if test "$sc_cv_have_tcpd_h" = "yes"; then +- AC_DEFINE(HAVE_TCPD_H) ++ AC_DEFINE(HAVE_TCPD_H, [1], [have tcpd]) + fi + AC_MSG_NOTICE(checked for tcpd.h... $sc_cv_have_tcpd_h) + fi # end checking for tcpd.h +@@ -1512,14 +1514,14 @@ + ] + ) + if test "$sc_cv_have_libwrap" = 'yes'; then +- AC_DEFINE(HAVE_LIBWRAP) ++ AC_DEFINE(HAVE_LIBWRAP, [1], [libwrap]) + fi + AC_MSG_RESULT($sc_cv_have_libwrap) + fi + # + if test -n "$WITH_LIBWRAP"; then + if test "$sc_cv_have_tcpd_h" = "yes" -a "$sc_cv_have_libwrap" = "yes"; then +- AC_DEFINE(WITH_LIBWRAP) ++ AC_DEFINE(WITH_LIBWRAP, [1], [libwrap]) + else + AC_MSG_WARN([not all components of tcp wrappers found, disabling it]); + fi +@@ -1534,7 +1536,7 @@ + [sc_cv_have_hosts_allow_table=yes], + [sc_cv_have_hosts_allow_table=no])]) + if test $sc_cv_have_hosts_allow_table = yes; then +- AC_DEFINE(HAVE_HOSTS_ALLOW_TABLE) ++ AC_DEFINE(HAVE_HOSTS_ALLOW_TABLE, [1], [hosts allow table]) + fi + AC_MSG_RESULT($sc_cv_have_hosts_allow_table) + fi # test -n "$WITH_LIBWRAP" diff --git a/recipes/socat/files/ldflags.patch b/recipes/socat/files/ldflags.patch deleted file mode 100644 index 6ab4681383..0000000000 --- a/recipes/socat/files/ldflags.patch +++ /dev/null @@ -1,32 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- socat-1.3/Makefile.in~ldflags -+++ socat-1.3/Makefile.in -@@ -33,6 +33,7 @@ - - - CFLAGS = @CFLAGS@ $(CCOPTS) $(DEFS) $(INCLS) -+LDFLAGS = @LDFLAGS@ - CLIBS = $(LIBS) - #CLIBS = $(LIBS) -lm -lefence - XIOSRCS = xioinitialize.c xiohelp.c xioparam.c xiodiag.c xioopen.c xioopts.c xiosigchld.c xioread.c xiowrite.c \ -@@ -78,13 +79,13 @@ - makedepend @SYSDEFS@ $(CFILES) - - socat: socat.o libxio.a -- $(CC) $(CFLAGS) -o $@ socat.o libxio.a $(CLIBS) -+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ socat.o libxio.a $(CLIBS) - - procan: procan_main.o procan.o error.o sycls.o sysutils.o utils.o -- $(CC) $(CFLAGS) -o $@ procan_main.o procan.o error.o sycls.o sysutils.o utils.o $(CLIBS) -+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ procan_main.o procan.o error.o sycls.o sysutils.o utils.o $(CLIBS) - - filan: filan_main.o filan.o fdname.o error.o sycls.o sysutils.o utils.o -- $(CC) $(CFLAGS) -o $@ filan_main.o filan.o fdname.o error.o sycls.o sysutils.o utils.o $(CLIBS) -+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ filan_main.o filan.o fdname.o error.o sycls.o sysutils.o utils.o $(CLIBS) - - libxio.a: $(XIOOBJS) $(UTLOBJS) - $(AR) r $@ $(XIOOBJS) $(UTLOBJS) diff --git a/recipes/socat/files/xioinitialize.patch b/recipes/socat/files/xioinitialize.patch deleted file mode 100644 index 24e816cfd7..0000000000 --- a/recipes/socat/files/xioinitialize.patch +++ /dev/null @@ -1,52 +0,0 @@ -diff -Naur socat-1.3/xioinitialize.c socat-1.3_patched/xioinitialize.c ---- socat-1.3/xioinitialize.c 2003-05-23 08:24:53.000000000 +0200 -+++ socat-1.3_patched/xioinitialize.c 2006-09-09 18:18:19.000000000 +0200 -@@ -19,48 +19,10 @@ - assert(O_WRONLY==1); - assert(O_RDWR==2); - -- /* some assertions about termios */ --#if WITH_TERMIOS --#ifdef CRDLY -- assert(3 << opt_crdly.arg3 == CRDLY); --#endif --#ifdef TABDLY -- assert(3 << opt_tabdly.arg3 == TABDLY); --#endif -- assert(3 << opt_csize.arg3 == CSIZE); -- { -- union { -- struct termios termarg; -- tcflag_t flags[4]; --#if HAVE_TERMIOS_ISPEED -- speed_t speeds[sizeof(struct termios)/sizeof(speed_t)]; --#endif -- } tdata; -- tdata.termarg.c_iflag = 0x12345678; -- tdata.termarg.c_oflag = 0x23456789; -- tdata.termarg.c_cflag = 0x3456789a; -- tdata.termarg.c_lflag = 0x456789ab; -- assert(tdata.termarg.c_iflag == tdata.flags[0]); -- assert(tdata.termarg.c_oflag == tdata.flags[1]); -- assert(tdata.termarg.c_cflag == tdata.flags[2]); -- assert(tdata.termarg.c_lflag == tdata.flags[3]); --#if HAVE_TERMIOS_ISPEED -- tdata.termarg.c_ispeed = 0x56789abc; -- tdata.termarg.c_ospeed = 0x6789abcd; -- assert(tdata.termarg.c_ispeed == tdata.speeds[ISPEED_OFFSET]); -- assert(tdata.termarg.c_ospeed == tdata.speeds[OSPEED_OFFSET]); --#endif -- } --#endif -- - /* these dependencies required in applyopts() for OFUNC_FCNTL */ - assert(F_GETFD == F_SETFD-1); - assert(F_GETFL == F_SETFL-1); - -- if (Atexit(xioexit) < 0) { -- Error("atexit(xioexit) failed"); -- return -1; -- } - xioinitialized = 1; - return 0; - } diff --git a/recipes/socat/files/xioopen.patch b/recipes/socat/files/xioopen.patch deleted file mode 100644 index 456862653a..0000000000 --- a/recipes/socat/files/xioopen.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Naur socat-1.3/xioopen.h socat-1.3_patched/xioopen.h ---- socat-1.3/xioopen.h 2003-02-15 15:26:22.000000000 +0100 -+++ socat-1.3_patched/xioopen.h 2006-09-05 10:49:15.000000000 +0200 -@@ -42,7 +42,6 @@ - extern const char *ddirection[]; - extern const char *filetypenames[]; - extern const struct addrname addressnames[]; --extern const char *addressgroupnames[]; - extern const struct optname optionnames[]; - - extern int xioopen_makedual(xiofile_t *file); diff --git a/recipes/socat/socat_1.3.2.1.bb b/recipes/socat/socat_1.3.2.1.bb deleted file mode 100644 index c30fb7a0ec..0000000000 --- a/recipes/socat/socat_1.3.2.1.bb +++ /dev/null @@ -1,19 +0,0 @@ -SECTION = "console/network" -DEPENDS = "openssl" -DESCRIPTION = "Socat is a relay for bidirectional data \ -transfer between two independent data channels." -LICENSE = "GPL" -PR = "r1" - -SRC_URI = "http://www.dest-unreach.org/socat/download/Archive/socat-${PV}.tar.bz2 \ - file://xioopen.patch;patch=1 \ - file://ldflags.patch;patch=1 \ - file://xioinitialize.patch;patch=1" -S = "${WORKDIR}/socat-1.3" - -inherit autotools - -do_install_prepend () { - mkdir -p ${D}${bindir} - install -d ${D}${bindir} ${D}${mandir}/man1 -} diff --git a/recipes/socat/socat_1.7.1.2.bb b/recipes/socat/socat_1.7.1.2.bb new file mode 100644 index 0000000000..769d3a73d6 --- /dev/null +++ b/recipes/socat/socat_1.7.1.2.bb @@ -0,0 +1,19 @@ +SECTION = "console/network" +DEPENDS = "openssl" +DESCRIPTION = "Socat is a relay for bidirectional data \ +transfer between two independent data channels." +LICENSE = "GPL" +PR = "r0" + +SRC_URI = "http://www.dest-unreach.org/socat/download/Archive/socat-${PV}.tar.bz2;name=src \ + file://compile.patch;patch=1" +SRC_URI[src.md5sum] = "9c0c5e83ce665f38d4d3aababad275eb" +SRC_URI[src.sha256sum] = "f7395b154914bdaa49805603aac2a90fb3d60255f95691d7779ab4680615e167" +EXTRA_OECONF = " --disable-termios " + +inherit autotools + +do_install_prepend () { + mkdir -p ${D}${bindir} + install -d ${D}${bindir} ${D}${mandir}/man1 +} -- cgit v1.2.3 From daba9a8ffb3abfed3e488bfd729f4af84d893bdb Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Wed, 17 Mar 2010 11:59:35 +0800 Subject: cdrtools-native: Upgrade to the latest version --- .../cdrtools/cdrtools-native_2.01.01_alpha77.bb | 26 ++++++++++++++++++++++ recipes/cdrtools/cdrtools-native_2.01.bb | 24 -------------------- 2 files changed, 26 insertions(+), 24 deletions(-) create mode 100644 recipes/cdrtools/cdrtools-native_2.01.01_alpha77.bb delete mode 100644 recipes/cdrtools/cdrtools-native_2.01.bb diff --git a/recipes/cdrtools/cdrtools-native_2.01.01_alpha77.bb b/recipes/cdrtools/cdrtools-native_2.01.01_alpha77.bb new file mode 100644 index 0000000000..9e89874c85 --- /dev/null +++ b/recipes/cdrtools/cdrtools-native_2.01.01_alpha77.bb @@ -0,0 +1,26 @@ +# cdrtools-native OE build file +# Copyright (C) 2004-2006, Advanced Micro Devices, Inc. All Rights Reserved +# Released under the MIT license (see packages/COPYING) + +LICENSE="OSS" +DESCRIPTION="A set of tools for CD recording, including cdrecord" +HOMEPAGE="http://cdrecord.berlios.de/private/cdrecord.html" + +SRC_URI="http://ftp.berlios.de/pub/cdrecord/alpha/cdrtools-2.01.01a77.tar.bz2;name=src" +SRC_URI[src.md5sum] = "0564e79a18d9a6768dbbb02a7717c5ab" +SRC_URI[src.sha256sum] = "c007e72ec113503a30f26f7b344d95f804a72ff4981141e2a55fc2b32db324cc" + +S="${WORKDIR}/cdrtools-${PV}" +PR = "r2" + +inherit native + +STAGE_TEMP="${WORKDIR}/stage_temp" + +do_stage() { + install -d ${STAGE_TEMP} + make install INS_BASE=${STAGE_TEMP} + + install -d ${STAGING_BINDIR} + install ${STAGE_TEMP}/bin/* ${STAGING_BINDIR} +} diff --git a/recipes/cdrtools/cdrtools-native_2.01.bb b/recipes/cdrtools/cdrtools-native_2.01.bb deleted file mode 100644 index 35404c9c04..0000000000 --- a/recipes/cdrtools/cdrtools-native_2.01.bb +++ /dev/null @@ -1,24 +0,0 @@ -# cdrtools-native OE build file -# Copyright (C) 2004-2006, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see packages/COPYING) - -LICENSE="OSS" -DESCRIPTION="A set of tools for CD recording, including cdrecord" -HOMEPAGE="http://cdrecord.berlios.de/private/cdrecord.html" - -SRC_URI="http://ftp.berlios.de/pub/cdrecord/cdrtools-${PV}.tar.bz2" - -S="${WORKDIR}/cdrtools-${PV}" -PR = "r2" - -inherit native - -STAGE_TEMP="${WORKDIR}/stage_temp" - -do_stage() { - install -d ${STAGE_TEMP} - make install INS_BASE=${STAGE_TEMP} - - install -d ${STAGING_BINDIR} - install ${STAGE_TEMP}/bin/* ${STAGING_BINDIR} -} -- cgit v1.2.3 From b6faa2ebb00fa219beee042aeb41321b0d4fbc18 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Wed, 17 Mar 2010 12:23:47 +0800 Subject: nsd: Bump to 3.2.4 This addresses CVE-2009-1755 which is in any nsd below 3.2.2. --- conf/checksums.ini | 4 ---- recipes/nsd/nsd_2.0.0.bb | 22 ---------------------- recipes/nsd/nsd_3.2.4.bb | 14 ++++++++++++++ 3 files changed, 14 insertions(+), 26 deletions(-) delete mode 100644 recipes/nsd/nsd_2.0.0.bb create mode 100644 recipes/nsd/nsd_3.2.4.bb diff --git a/conf/checksums.ini b/conf/checksums.ini index 29e0f6ff0a..8abd64e2c0 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -20146,10 +20146,6 @@ sha256=4310a3a526ae5461e17f57353fc29f71d13820a215eaa62c629190cc2a026173 md5=46291de38362acdcd335bcf259055046 sha256=0e6b18e3bf77dd20395881535e3e7043bcd5171c220728310215d708f44f3b1c -[http://www.nlnetlabs.nl/downloads/nsd/nsd-2.0.0.tar.gz] -md5=a09542645b91ff60564b0f4db436af01 -sha256=8f486c4ef4d3f60fba4e0f855399184ca557f03a747cae6adde4cc2dffc53ff2 - [http://nslu.sf.net/downloads/nslu2-linksys-firmware-2.3r63.tar.bz2] md5=d4daf9d424a182e7ca2747d9db004581 sha256=703c9083f2f114588eb54442f7e621cbf3e0f1398c3381b5ad8d1fc56f6468a5 diff --git a/recipes/nsd/nsd_2.0.0.bb b/recipes/nsd/nsd_2.0.0.bb deleted file mode 100644 index 0614337d5b..0000000000 --- a/recipes/nsd/nsd_2.0.0.bb +++ /dev/null @@ -1,22 +0,0 @@ -DESCRIPTION = "NSD is an authoritative only, high performance, simple and opensource name server" -SECTION = "console/network" -PRIORITY = "optional" - -SRC_URI = "http://www.nlnetlabs.nl/downloads/nsd/nsd-${PV}.tar.gz" -LICENSE = "nsd" -inherit autotools - -do_install() { - oe_runmake configdir=${D}${sysconfdir}/nsd \ - pidfile=${D}${localstatedir}/run/nsd.pid \ - zonesfile=${D}${sysconfdir}/nsd/nsd.zones \ - dbfile=${D}${sysconfdir}/nsd/nsd.db \ - configfile=${D}${sysconfdir}/nsd/nsdc.conf \ - zonesdir=${D}${sysconfdir}/nsd \ - prefix=${D}${prefix} \ - exec_prefix=${D}${exec_prefix} \ - sbindir=${D}${sbindir} \ - mandir=${D}${mandir} \ - install -} - diff --git a/recipes/nsd/nsd_3.2.4.bb b/recipes/nsd/nsd_3.2.4.bb new file mode 100644 index 0000000000..148ce0dffe --- /dev/null +++ b/recipes/nsd/nsd_3.2.4.bb @@ -0,0 +1,14 @@ +DESCRIPTION = "NSD is an authoritative only, high performance, simple and opensource name server" +SECTION = "console/network" +PRIORITY = "optional" + +DEPENDS = "openssl" + +SRC_URI = "http://www.nlnetlabs.nl/downloads/nsd/nsd-${PV}.tar.gz;name=src" +SRC_URI[src.md5sum] = "0c394fd713d194bde24a1035e56d5a79" +SRC_URI[src.sha256sum] = "41ed4a3e21d7381379c85d46ee7131937195aa780f120b03e5d4d878d397c769" +LICENSE = "nsd" +inherit autotools + +EXTRA_OECONF = " --with-ssl=${STAGING_DIR_HOST}${exec_prefix} " + -- cgit v1.2.3 From d4574145085218e93f55724924e3e99c39ea3afd Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Wed, 17 Mar 2010 13:37:41 +0800 Subject: maradns: Upgrade to version 1.4.03 * Patch the Makefiles so LDFLAGS is passed to the linker --- conf/checksums.ini | 4 -- recipes/maradns/files/compile-1.4.0.3.patch | 61 +++++++++++++++++++++++++++++ recipes/maradns/maradns_1.0.41.bb | 43 -------------------- recipes/maradns/maradns_1.4.03.bb | 46 ++++++++++++++++++++++ 4 files changed, 107 insertions(+), 47 deletions(-) create mode 100644 recipes/maradns/files/compile-1.4.0.3.patch delete mode 100644 recipes/maradns/maradns_1.0.41.bb create mode 100644 recipes/maradns/maradns_1.4.03.bb diff --git a/conf/checksums.ini b/conf/checksums.ini index 8abd64e2c0..df4eda7dc1 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -18574,10 +18574,6 @@ sha256=59b1c19817ed65ba8f0d3a2ac8f06ecf5c12f452d10170fa04f6824ea257437f md5=5ac39978f55ecaf6e887cd5be027b1c3 sha256=4ac5940d25a9b5a52d0ff1f8223bb85462f9cfcceb4ac547e3ca9b6690aad394 -[http://www.maradns.org/download/1.0/maradns-1.0.41.tar.bz2] -md5=9abc13da25c1103d788ee9def1c8e764 -sha256=42930f57e2fb965360a31de35d8eb8c2b0cdd06172e413e8cfec5745b6a236b8 - [ftp://ftp.debian.org/debian/pool/main/m/masqmail/masqmail_0.2.21.orig.tar.gz] md5=7e989a8b0562054aea22c654507f2cb5 sha256=2257099c760c12daf094744c6b2269d476e3bc6b523366168ad81bdd2ebd2445 diff --git a/recipes/maradns/files/compile-1.4.0.3.patch b/recipes/maradns/files/compile-1.4.0.3.patch new file mode 100644 index 0000000000..ad7d1f8617 --- /dev/null +++ b/recipes/maradns/files/compile-1.4.0.3.patch @@ -0,0 +1,61 @@ +Index: maradns-1.4.03/server/Makefile.recursive +=================================================================== +--- maradns-1.4.03.orig/server/Makefile.recursive 2010-03-17 13:04:16.831313185 +0800 ++++ maradns-1.4.03/server/Makefile.recursive 2010-03-17 13:04:31.304869993 +0800 +@@ -52,8 +52,8 @@ + $(CC) -c $(FLAGS) -o udpsuccess.o udpsuccess.c + + maradns: MaraDNS.c $(OBJECTS) MaraDNS_locale.h +- $(CC) $(FLAGS) -DVERSION=\"$(VERSION)\" -DCOMPILED=\"$(COMPILED)\" -o maradns MaraDNS.c $(OBJECTS) -lpthread ++ $(CC) $(FLAGS) -DVERSION=\"$(VERSION)\" -DCOMPILED=\"$(COMPILED)\" -o maradns MaraDNS.c $(OBJECTS) -lpthread $(LDFLAGS) + + simple: simple.c $(XOBJECTS) MaraDNS_locale.h +- $(CC) $(FLAGS) -DVERSION=\"$(VERSION)\" -DCOMPILED=\"$(COMPILED)\" -o simple $(OBJECTS) simple.c ++ $(CC) $(FLAGS) -DVERSION=\"$(VERSION)\" -DCOMPILED=\"$(COMPILED)\" -o simple $(OBJECTS) simple.c $(LDFLAGS) + +Index: maradns-1.4.03/tcp/Makefile.recursive +=================================================================== +--- maradns-1.4.03.orig/tcp/Makefile.recursive 2010-03-17 13:20:21.270078031 +0800 ++++ maradns-1.4.03/tcp/Makefile.recursive 2010-03-17 13:20:37.020069979 +0800 +@@ -26,11 +26,11 @@ + rm -f core $(EXECS) $(TCPOBJS) *.exe + + getzone: getzone.c $(OBJECTS) +- $(CC) $(FLAGS) -o getzone getzone.c $(OBJECTS) ++ $(CC) $(FLAGS) -o getzone getzone.c $(OBJECTS) $(LDFLAGS) + + fetchzone: fetchzone.c $(OBJECTS) +- $(CC) $(FLAGS) -o fetchzone fetchzone.c $(OBJECTS) ++ $(CC) $(FLAGS) -o fetchzone fetchzone.c $(OBJECTS) $(LDFLAGS) + + zoneserver: zoneserver.c zoneserver_en.h $(OBJECTS) +- $(CC) $(FLAGS) -DVERSION=\"$(VERSION)\" -o zoneserver zoneserver.c $(OBJECTS) $(RNGOBJS) ++ $(CC) $(FLAGS) -DVERSION=\"$(VERSION)\" -o zoneserver zoneserver.c $(OBJECTS) $(RNGOBJS) $(LDFLAGS) + +Index: maradns-1.4.03/tools/Makefile.recursive +=================================================================== +--- maradns-1.4.03.orig/tools/Makefile.recursive 2010-03-17 13:05:46.600079208 +0800 ++++ maradns-1.4.03/tools/Makefile.recursive 2010-03-17 13:10:39.090763025 +0800 +@@ -18,17 +18,17 @@ + rm -f core $(EXECS) *.exe + + askmara: askmara.c askmara_labels_en.h $(OBJECTS) $(Q) $(OUTOBJ) +- $(CC) $(FLAGS) -o askmara askmara.c $(OBJECTS) $(Q) $(OUTOBJ) ++ $(CC) $(FLAGS) -o askmara askmara.c $(OBJECTS) $(Q) $(OUTOBJ) $(LDFLAGS) + + askmara-tcp: askmara-tcp.c askmara_labels_en.h $(OBJECTS) $(ROBJECTS) $(POBJECTS) +- $(CC) $(FLAGS) -o askmara-tcp askmara-tcp.c $(OBJECTS) $(ROBJECTS) $(POBJECTS) ++ $(CC) $(FLAGS) -o askmara-tcp askmara-tcp.c $(OBJECTS) $(ROBJECTS) $(POBJECTS) $(LDFLAGS) + + benchmark: benchmark.c askmara_labels_en.h $(OBJECTS) $(POBJECTS) +- $(CC) $(FLAGS) -o benchmark benchmark.c $(OBJECTS) $(POBJECTS) ++ $(CC) $(FLAGS) -o benchmark benchmark.c $(OBJECTS) $(POBJECTS) $(LDFLAGS) + + duende: duende.c +- $(CC) $(FLAGS) -o duende duende.c ++ $(CC) $(FLAGS) -o duende duende.c $(LDFLAGS) + + strip.control: strip.control.c +- $(CC) $(FLAGS) -o strip.control strip.control.c ++ $(CC) $(FLAGS) -o strip.control strip.control.c $(LDFLAGS) + diff --git a/recipes/maradns/maradns_1.0.41.bb b/recipes/maradns/maradns_1.0.41.bb deleted file mode 100644 index a8bed6f05e..0000000000 --- a/recipes/maradns/maradns_1.0.41.bb +++ /dev/null @@ -1,43 +0,0 @@ -DESCRIPTION = "A security-aware DNS server" -SECTION = "console/network" -HOMEPAGE = "http://www.maradns.org" -LICENSE = "PD" - -SRC_URI = "http://www.maradns.org/download/1.0/maradns-${PV}.tar.bz2 \ - file://init \ - file://rng-makefile-build-cc.patch;patch=1;pnum=0" - -do_install() { - install -d ${D}${bindir} - install -d ${D}${sbindir} - install -d ${D}${sysconfdir} - install -d ${D}${sysconfdir}/mararc - install -d ${D}${sysconfdir}/init.d - install -d ${D}${mandir}/man1 - install -d ${D}${mandir}/man5 - install -d ${D}${mandir}/man8 - - sed -i -e "s:PREFIX/man:PREFIX/share/man:" \ - -e "s:PREFIX/doc/maradns-\$VERSION:PREFIX/share/doc/${PF}:" \ - build/install.locations - - oe_runmake \ - TOPLEVEL=${S} \ - BUILDDIR=${S}/build \ - RPM_BUILD_ROOT=${D} \ - PREFIX=${D}/usr \ - MAN1=${D}${mandir}/man1 \ - MAN5=${D}${mandir}/man5 \ - MAN8=${D}${mandir}/man8 \ - install - - mv ${D}${sysconfdir}/mararc/example_mararc ${D}${sysconfdir}/maradns/mararc - rm -r ${D}${sysconfdir}/mararc/ - install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/maradns -} - -PACKAGES =+ "maradns-zone maradns-ask" -FILES_maradns-zone = "${sbindir}/zoneserver ${bindir}/getzone" -FILES_maradns-ask = "${bindir}/askmara" - -CONFFILES_${PN}_nylon = "/etc/maradns/mararc" diff --git a/recipes/maradns/maradns_1.4.03.bb b/recipes/maradns/maradns_1.4.03.bb new file mode 100644 index 0000000000..4d547a2788 --- /dev/null +++ b/recipes/maradns/maradns_1.4.03.bb @@ -0,0 +1,46 @@ +DESCRIPTION = "A security-aware DNS server" +SECTION = "console/network" +HOMEPAGE = "http://www.maradns.org" +LICENSE = "PD" + +SRC_URI = "http://www.maradns.org/download/1.4/${PV}/maradns-${PV}.tar.bz2;name=src \ + file://init \ + file://rng-makefile-build-cc.patch;patch=1;pnum=0 \ + file://compile-1.4.0.3.patch;patch=1 " +SRC_URI[src.md5sum] = "071b3a3df07e18855a7edf9a6281641a" +SRC_URI[src.sha256sum] = "a611b6ac0f3abee62c227b128c1773be4a2a41de75a37ca123d684db33793b23" + +do_install() { + install -d ${D}${bindir} + install -d ${D}${sbindir} + install -d ${D}${sysconfdir} + install -d ${D}${sysconfdir}/mararc + install -d ${D}${sysconfdir}/init.d + install -d ${D}${mandir}/man1 + install -d ${D}${mandir}/man5 + install -d ${D}${mandir}/man8 + + sed -i -e "s:PREFIX/man:PREFIX/share/man:" \ + -e "s:PREFIX/doc/maradns-\$VERSION:PREFIX/share/doc/${PF}:" \ + build/install.locations + + oe_runmake \ + TOPLEVEL=${S} \ + BUILDDIR=${S}/build \ + RPM_BUILD_ROOT=${D} \ + PREFIX=${D}/usr \ + MAN1=${D}${mandir}/man1 \ + MAN5=${D}${mandir}/man5 \ + MAN8=${D}${mandir}/man8 \ + install + + mv ${D}${sysconfdir}/mararc/example_mararc ${D}${sysconfdir}/maradns/mararc + rm -r ${D}${sysconfdir}/mararc/ + install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/maradns +} + +PACKAGES =+ "maradns-zone maradns-ask" +FILES_maradns-zone = "${sbindir}/zoneserver ${bindir}/getzone" +FILES_maradns-ask = "${bindir}/askmara" + +CONFFILES_${PN}_nylon = "/etc/maradns/mararc" -- cgit v1.2.3 From 8d574e65a90bae4393ba20aee8f8a3a3f886d9c8 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Wed, 17 Mar 2010 13:50:46 +0800 Subject: lighttpd: Upgrade to 1.4.26 This should address CVE-2010-0295. --- conf/checksums.ini | 12 ------------ recipes/lighttpd/lighttpd.inc | 2 +- recipes/lighttpd/lighttpd_1.4.25.bb | 6 ------ recipes/lighttpd/lighttpd_1.4.26.bb | 8 ++++++++ 4 files changed, 9 insertions(+), 19 deletions(-) delete mode 100644 recipes/lighttpd/lighttpd_1.4.25.bb create mode 100644 recipes/lighttpd/lighttpd_1.4.26.bb diff --git a/conf/checksums.ini b/conf/checksums.ini index df4eda7dc1..c54ea74ab5 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -17346,18 +17346,6 @@ sha256=97d0ac5957745eeaf311ec38ebbbf3b30a5316b01c320a759af47129c994c20c md5=5db3204d57436a032f899ff9dbce793f sha256=97d0ac5957745eeaf311ec38ebbbf3b30a5316b01c320a759af47129c994c20c -[http://www.lighttpd.net/download/lighttpd-1.4.22.tar.gz] -md5=949c33a81e83f7718a47280bef21b90c -sha256=197bd2b57c5e2b9bfc30bb565a4c44fbea82daa20a31fa8ba490dd61dad69f2a - -[http://www.lighttpd.net/download/lighttpd-1.4.23.tar.gz] -md5=41dfad5c366d34d83c3d2b46d4c08f5c -sha256=8555db22ed7d429160701555611d8cd5eff42fc7e6e3ad3b050279c9b2145469 - -[http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.25.tar.gz] -md5=87e936ec272ddaba8a2fdfecd8c6b704 -sha256=0e71cd677a2282fff0ee0248a0e70a593a75e06f8a26411ca5314d0c01debbc3 - [http://twibble.org/dist/sh4/src/lilosh/lilo-21.tar.gz] md5=1e975d827ad96e1942df73f63512178e sha256=da2340aca2eaf451243d2e4c2bf66aa4b80cc0abaef96860da8daf5db1cae12f diff --git a/recipes/lighttpd/lighttpd.inc b/recipes/lighttpd/lighttpd.inc index dd35db1f75..20e85a8dad 100644 --- a/recipes/lighttpd/lighttpd.inc +++ b/recipes/lighttpd/lighttpd.inc @@ -12,7 +12,7 @@ RDEPENDS_${PN} += " \ INC_PR = "r7" -SRC_URI = "http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${PV}.tar.gz \ +SRC_URI = "http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${PV}.tar.gz;name=src \ file://index.html \ file://lighttpd.conf \ file://lighttpd \ diff --git a/recipes/lighttpd/lighttpd_1.4.25.bb b/recipes/lighttpd/lighttpd_1.4.25.bb deleted file mode 100644 index 04442ced17..0000000000 --- a/recipes/lighttpd/lighttpd_1.4.25.bb +++ /dev/null @@ -1,6 +0,0 @@ -require lighttpd.inc - -PR = "${INC_PR}.0" - -DEFAULT_PREFERENCE = "-1" - diff --git a/recipes/lighttpd/lighttpd_1.4.26.bb b/recipes/lighttpd/lighttpd_1.4.26.bb new file mode 100644 index 0000000000..071efc3a32 --- /dev/null +++ b/recipes/lighttpd/lighttpd_1.4.26.bb @@ -0,0 +1,8 @@ +require lighttpd.inc + +PR = "${INC_PR}.0" + +DEFAULT_PREFERENCE = "-1" + +SRC_URI[src.md5sum] = "3ce5be17a4dac3c384a8a452c664b840" +SRC_URI[src.sha256sum] = "08fc11864a0ad6d2871f32e6d0b0eaeb070f78698a72959f812526173145986e" -- cgit v1.2.3 From 3391bc4c4d7ebc2de9e10c289e674fb616fe1541 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Wed, 17 Mar 2010 14:13:17 +0800 Subject: bogofilter: Upgrade to 0.96.6 * 0.96.6 is the latest release of the ancient 0.96 release * It is addressing CVE-2005-4592 --- conf/checksums.ini | 4 --- .../bogofilter-0.96.0/configure.ac.patch | 34 ------------------ .../bogofilter-0.96.6/configure.ac.patch | 34 ++++++++++++++++++ recipes/bogofilter/bogofilter_0.96.0.bb | 38 -------------------- recipes/bogofilter/bogofilter_0.96.6.bb | 40 ++++++++++++++++++++++ 5 files changed, 74 insertions(+), 76 deletions(-) delete mode 100644 recipes/bogofilter/bogofilter-0.96.0/configure.ac.patch create mode 100644 recipes/bogofilter/bogofilter-0.96.6/configure.ac.patch delete mode 100644 recipes/bogofilter/bogofilter_0.96.0.bb create mode 100644 recipes/bogofilter/bogofilter_0.96.6.bb diff --git a/conf/checksums.ini b/conf/checksums.ini index c54ea74ab5..668a236db1 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -3510,10 +3510,6 @@ sha256=90ec337d482a0e766e1f24679324445057abfc2e01d9d2c1f561b40ac7f1915b md5=30bdb17e11fb416f9d3c6243e02f6e73 sha256=90ec337d482a0e766e1f24679324445057abfc2e01d9d2c1f561b40ac7f1915b -[http://download.sourceforge.net/bogofilter/bogofilter-0.96.0.tar.bz2] -md5=ca946b43212d8a2909e86f7140e535db -sha256=7aeb2c4eb6ad6636631f85816b4f4d21ce811f763412530b70b2c85602e795d3 - [http://downloads.sourceforge.net/bonnie/bonnie++-1.03a.tgz] md5=00b1eee7f98b68fa762c4efb3b34caa1 sha256=2d1c6b2cfdc17d6348f25f0830e1fa5c1c1dd3f014caff74005294c9ed6a0cbf diff --git a/recipes/bogofilter/bogofilter-0.96.0/configure.ac.patch b/recipes/bogofilter/bogofilter-0.96.0/configure.ac.patch deleted file mode 100644 index 310eaaa16d..0000000000 --- a/recipes/bogofilter/bogofilter-0.96.0/configure.ac.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- bogofilter-0.96.0/configure.ac.orig 2005-09-04 20:42:35.000000000 +0200 -+++ bogofilter-0.96.0/configure.ac 2005-09-04 20:45:12.000000000 +0200 -@@ -460,6 +460,7 @@ - dnl check if run-time link works - saveLIBS="$LIBS" - LIBS="$LIBS $LIBDB" -+ if test x$cross_compiling = xNO ; then - AC_MSG_CHECKING(if a program can be linked against Berkeley DB and run) - AC_RUN_IFELSE( - AC_LANG_PROGRAM([[ -@@ -500,6 +501,7 @@ - [AC_MSG_RESULT(no) - AC_MSG_ERROR(db.h header file and db library version do not match.)],) - AC_MSG_RESULT(yes) -+ fi - AC_CHECK_DECLS(db_create,, - AC_MSG_ERROR([[Can not locate a suitable Berkeley DB db.h header file. - Use --with-libdb-prefix=PATH to specify the path to a v3+ install directory. -@@ -509,6 +511,7 @@ - #endif - #include ]] - ) -+ if test x$cross_compiling = xNO ; then - AC_MSG_CHECKING(if Berkeley DB supports shared environments) - if test "x$enable_dbshared_test" != xno && test "x$USE_TRANSACTIONS" != xNO ; then - AC_RUN_IFELSE( -@@ -548,6 +551,7 @@ - else - AC_MSG_RESULT(skipped) - fi -+ fi - - AC_DEFINE(ENABLE_DB_DATASTORE,1, [Enable Berkeley DB datastore]) - LIBS="$saveLIBS" diff --git a/recipes/bogofilter/bogofilter-0.96.6/configure.ac.patch b/recipes/bogofilter/bogofilter-0.96.6/configure.ac.patch new file mode 100644 index 0000000000..310eaaa16d --- /dev/null +++ b/recipes/bogofilter/bogofilter-0.96.6/configure.ac.patch @@ -0,0 +1,34 @@ +--- bogofilter-0.96.0/configure.ac.orig 2005-09-04 20:42:35.000000000 +0200 ++++ bogofilter-0.96.0/configure.ac 2005-09-04 20:45:12.000000000 +0200 +@@ -460,6 +460,7 @@ + dnl check if run-time link works + saveLIBS="$LIBS" + LIBS="$LIBS $LIBDB" ++ if test x$cross_compiling = xNO ; then + AC_MSG_CHECKING(if a program can be linked against Berkeley DB and run) + AC_RUN_IFELSE( + AC_LANG_PROGRAM([[ +@@ -500,6 +501,7 @@ + [AC_MSG_RESULT(no) + AC_MSG_ERROR(db.h header file and db library version do not match.)],) + AC_MSG_RESULT(yes) ++ fi + AC_CHECK_DECLS(db_create,, + AC_MSG_ERROR([[Can not locate a suitable Berkeley DB db.h header file. + Use --with-libdb-prefix=PATH to specify the path to a v3+ install directory. +@@ -509,6 +511,7 @@ + #endif + #include ]] + ) ++ if test x$cross_compiling = xNO ; then + AC_MSG_CHECKING(if Berkeley DB supports shared environments) + if test "x$enable_dbshared_test" != xno && test "x$USE_TRANSACTIONS" != xNO ; then + AC_RUN_IFELSE( +@@ -548,6 +551,7 @@ + else + AC_MSG_RESULT(skipped) + fi ++ fi + + AC_DEFINE(ENABLE_DB_DATASTORE,1, [Enable Berkeley DB datastore]) + LIBS="$saveLIBS" diff --git a/recipes/bogofilter/bogofilter_0.96.0.bb b/recipes/bogofilter/bogofilter_0.96.0.bb deleted file mode 100644 index 48caf83af5..0000000000 --- a/recipes/bogofilter/bogofilter_0.96.0.bb +++ /dev/null @@ -1,38 +0,0 @@ -SECTION = "console/network" -DEPENDS = "virtual/db" -RDEPENDS = "glibc-gconv glibc-gconv-iso8859-1" -DESCRIPTION = "Bogofilter is a mail filter that classifies mail as spam or ham (non-spam) \ -by a statistical analysis of the message's header and content (body). \ -The program is able to learn from the user's classifications and corrections." -LICENSE = "GPL" -PR = "r8" -PRIORITY = "optional" - -SRC_URI = "http://download.sourceforge.net/bogofilter/bogofilter-${PV}.tar.bz2 \ - file://configure.ac.patch;patch=1 \ - file://volatiles \ - file://postfix-filter.sh \ - file://bogohelper.sh \ - " - -inherit autotools - -EXTRA_OECONF = "--with-libdb-prefix=${libdir}" - -do_install_append () { - mkdir -p ${D}${sysconfdir}/default/volatiles - install -m 644 ${WORKDIR}/volatiles ${D}${sysconfdir}/default/volatiles/01_bogofilter - install -m 755 ${WORKDIR}/postfix-filter.sh ${D}${bindir}/postfix-filter.sh - install -m 755 ${WORKDIR}/bogohelper.sh ${D}${bindir}/bogohelper.sh -} - -pkg_postinst () { - grep filter /etc/group || addgroup filter - grep spam /etc/passwd || adduser --disabled-password --home=/var/spool/filter --ingroup filter -g "Bogofilter" spam - grep bogo /etc/passwd || adduser --disabled-password --home=/home/bogo --ingroup filter -g "Bogofilter" bogo - [ -f "/etc/postfix/master.cf" ] && grep "/usr/bin/postfix-filter.sh" /etc/postfix/master.cf || { - echo "bogofilter unix - n n - - pipe" >> /etc/postfix/master.cf - echo " flags=R user=bogo argv=/usr/bin/postfix-filter.sh -f ${sender} -- ${recipient}" >> /etc/postfix/master.cf - } - /etc/init.d/populate-volatile.sh update -} diff --git a/recipes/bogofilter/bogofilter_0.96.6.bb b/recipes/bogofilter/bogofilter_0.96.6.bb new file mode 100644 index 0000000000..35bb1112b5 --- /dev/null +++ b/recipes/bogofilter/bogofilter_0.96.6.bb @@ -0,0 +1,40 @@ +SECTION = "console/network" +DEPENDS = "virtual/db" +RDEPENDS = "glibc-gconv glibc-gconv-iso8859-1" +DESCRIPTION = "Bogofilter is a mail filter that classifies mail as spam or ham (non-spam) \ +by a statistical analysis of the message's header and content (body). \ +The program is able to learn from the user's classifications and corrections." +LICENSE = "GPL" +PR = "r8" +PRIORITY = "optional" + +SRC_URI = "http://launchpad.net/bogofilter/main/0.96.6/+download/bogofilter-0.96.6.tar.gz;name=src \ + file://configure.ac.patch;patch=1 \ + file://volatiles \ + file://postfix-filter.sh \ + file://bogohelper.sh " +SRC_URI[src.md5sum] = "7e8e9593662f6394a56f99f12f525d6e" +SRC_URI[src.sha256sum] = "0b12fdd5b0bc50b582327764ee5cd415809db6d7adc233f1801bc0d0bf435a6d" + + +inherit autotools + +EXTRA_OECONF = "--with-libdb-prefix=${libdir}" + +do_install_append () { + mkdir -p ${D}${sysconfdir}/default/volatiles + install -m 644 ${WORKDIR}/volatiles ${D}${sysconfdir}/default/volatiles/01_bogofilter + install -m 755 ${WORKDIR}/postfix-filter.sh ${D}${bindir}/postfix-filter.sh + install -m 755 ${WORKDIR}/bogohelper.sh ${D}${bindir}/bogohelper.sh +} + +pkg_postinst () { + grep filter /etc/group || addgroup filter + grep spam /etc/passwd || adduser --disabled-password --home=/var/spool/filter --ingroup filter -g "Bogofilter" spam + grep bogo /etc/passwd || adduser --disabled-password --home=/home/bogo --ingroup filter -g "Bogofilter" bogo + [ -f "/etc/postfix/master.cf" ] && grep "/usr/bin/postfix-filter.sh" /etc/postfix/master.cf || { + echo "bogofilter unix - n n - - pipe" >> /etc/postfix/master.cf + echo " flags=R user=bogo argv=/usr/bin/postfix-filter.sh -f ${sender} -- ${recipient}" >> /etc/postfix/master.cf + } + /etc/init.d/populate-volatile.sh update +} -- cgit v1.2.3 From e54dcda0f3850194a820cfeb994832fa9b73f7de Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Wed, 17 Mar 2010 14:20:04 +0800 Subject: wv: Upgrade to 1.2.4 to address multiple flaws Addressed CVE-2006-4513. --- conf/checksums.ini | 12 ------------ recipes/wv/wv-1.2.0/pkgconfig.patch | 13 ------------- recipes/wv/wv-1.2.4/pkgconfig.patch | 13 +++++++++++++ recipes/wv/wv_1.2.0.bb | 22 ---------------------- recipes/wv/wv_1.2.4.bb | 25 +++++++++++++++++++++++++ 5 files changed, 38 insertions(+), 47 deletions(-) delete mode 100644 recipes/wv/wv-1.2.0/pkgconfig.patch create mode 100644 recipes/wv/wv-1.2.4/pkgconfig.patch delete mode 100644 recipes/wv/wv_1.2.0.bb create mode 100644 recipes/wv/wv_1.2.4.bb diff --git a/conf/checksums.ini b/conf/checksums.ini index 668a236db1..e8ee8c2dab 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -28138,18 +28138,6 @@ sha256=c6f692956d93765f12402a0b22617566decc52a9bb1a707b4e8d12affd1528d3 md5=3d35c181dfab7dfd3fe898738dffb421 sha256=64e6bd25d18e838e1c60693eccbd11926c65b228d6ac69c4dafc7ebe7341dbbf -[http://downloads.sourceforge.net/wvware/wv-1.2.0.tar.gz] -md5=b6319d5e75611fe2210453b5feb82c0c -sha256=a76f44468e78591e6d510d326702e7c3999d2b9dd3ab8ab8c1c9811fd5b111e4 - -[http://heanet.dl.sourceforge.net/wvware/wv-1.2.0.tar.gz] -md5=b6319d5e75611fe2210453b5feb82c0c -sha256=a76f44468e78591e6d510d326702e7c3999d2b9dd3ab8ab8c1c9811fd5b111e4 - -[http://switch.dl.sourceforge.net/sourceforge/wvware/wv-1.2.0.tar.gz] -md5=b6319d5e75611fe2210453b5feb82c0c -sha256=a76f44468e78591e6d510d326702e7c3999d2b9dd3ab8ab8c1c9811fd5b111e4 - [http://www.alumnit.ca/download/wvdial-1.56.tar.gz] md5=45097f269c7847266e121e4a0f362be9 sha256=e4d35719c10c372bfca8247d127c941958557aabca61c25a04f213e22cc40728 diff --git a/recipes/wv/wv-1.2.0/pkgconfig.patch b/recipes/wv/wv-1.2.0/pkgconfig.patch deleted file mode 100644 index 136d89341f..0000000000 --- a/recipes/wv/wv-1.2.0/pkgconfig.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: wv-1.2.0/wv-1.0.pc.in -=================================================================== ---- wv-1.2.0.orig/wv-1.0.pc.in 2008-03-19 22:25:18.000000000 +0000 -+++ wv-1.2.0/wv-1.0.pc.in 2008-03-19 22:26:32.000000000 +0000 -@@ -6,5 +6,6 @@ - Name: wvWare - Description: Word Document Filter library and utilities - Version: @VERSION@ --Libs: -L${libdir} -lwv @WMF_LIBS@ @XML_LIBS@ @GLIB_LIBS@ @GSF_LIBS@ @PNG_LIBS@ @ZLIB_LIBS@ @LIBS@ -lm --Cflags: -I${includedir}/wv @GSF_CFLAGS@ -+Requires: libgsf-1 -+Libs: -L${libdir} -lwv @WMF_LIBS@ @XML_LIBS@ @PNG_LIBS@ @ZLIB_LIBS@ @LIBS@ -lm -+Cflags: -I${includedir}/wv diff --git a/recipes/wv/wv-1.2.4/pkgconfig.patch b/recipes/wv/wv-1.2.4/pkgconfig.patch new file mode 100644 index 0000000000..136d89341f --- /dev/null +++ b/recipes/wv/wv-1.2.4/pkgconfig.patch @@ -0,0 +1,13 @@ +Index: wv-1.2.0/wv-1.0.pc.in +=================================================================== +--- wv-1.2.0.orig/wv-1.0.pc.in 2008-03-19 22:25:18.000000000 +0000 ++++ wv-1.2.0/wv-1.0.pc.in 2008-03-19 22:26:32.000000000 +0000 +@@ -6,5 +6,6 @@ + Name: wvWare + Description: Word Document Filter library and utilities + Version: @VERSION@ +-Libs: -L${libdir} -lwv @WMF_LIBS@ @XML_LIBS@ @GLIB_LIBS@ @GSF_LIBS@ @PNG_LIBS@ @ZLIB_LIBS@ @LIBS@ -lm +-Cflags: -I${includedir}/wv @GSF_CFLAGS@ ++Requires: libgsf-1 ++Libs: -L${libdir} -lwv @WMF_LIBS@ @XML_LIBS@ @PNG_LIBS@ @ZLIB_LIBS@ @LIBS@ -lm ++Cflags: -I${includedir}/wv diff --git a/recipes/wv/wv_1.2.0.bb b/recipes/wv/wv_1.2.0.bb deleted file mode 100644 index b3114a5325..0000000000 --- a/recipes/wv/wv_1.2.0.bb +++ /dev/null @@ -1,22 +0,0 @@ -DESCRIPTION = "Programs for accessing Microsoft Word documents" -HOMEPAGE = "http://wvware.sourceforge.net/" -LICENSE = "GPLv2" -DEPENDS = "libgsf glib-2.0" -PR = "r4" - -SRC_URI = "${SOURCEFORGE_MIRROR}/wvware/wv-${PV}.tar.gz \ - file://pkgconfig.patch;patch=1" - -inherit autotools pkgconfig - -S = "${WORKDIR}/${PN}-${PV}" - -EXTRA_OECONF = "" - -do_stage () { - autotools_stage_all -} - -do_compile () { - oe_runmake -f GNUmakefile -} diff --git a/recipes/wv/wv_1.2.4.bb b/recipes/wv/wv_1.2.4.bb new file mode 100644 index 0000000000..8b773270c5 --- /dev/null +++ b/recipes/wv/wv_1.2.4.bb @@ -0,0 +1,25 @@ +DESCRIPTION = "Programs for accessing Microsoft Word documents" +HOMEPAGE = "http://wvware.sourceforge.net/" +LICENSE = "GPLv2" +DEPENDS = "libgsf glib-2.0" +PR = "r4" + +SRC_URI = "${SOURCEFORGE_MIRROR}/wvware/wv-${PV}.tar.gz;name=src \ + file://pkgconfig.patch;patch=1" +SRC_URI[src.md5sum] = "c1861c560491f121e12917fa76970ac5" +SRC_URI[src.sha256sum] = "673109910e22d4cf94cc8be4dcb9a0c41b5fbdb1736d4b7bdc7778894d57c2d6" + + +inherit autotools pkgconfig + +S = "${WORKDIR}/${PN}-${PV}" + +EXTRA_OECONF = "" + +do_stage () { + autotools_stage_all +} + +do_compile () { + oe_runmake -f GNUmakefile +} -- cgit v1.2.3 From d3a29410109b3d8c7e7884d459334a744fbf97bf Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Wed, 17 Mar 2010 15:01:42 +0800 Subject: pulseaudio-0.9.15: Fix a flaw in the tmp directory handling * Address CVE-2009-1299, compare with http://www.debian.org/security/2010/dsa-2017 --- recipes/pulseaudio/files/CVE-2009-1299.patch | 86 ++++++++++++++++++++++++++++ recipes/pulseaudio/pulseaudio_0.9.15.bb | 3 +- 2 files changed, 88 insertions(+), 1 deletion(-) create mode 100644 recipes/pulseaudio/files/CVE-2009-1299.patch diff --git a/recipes/pulseaudio/files/CVE-2009-1299.patch b/recipes/pulseaudio/files/CVE-2009-1299.patch new file mode 100644 index 0000000000..63314b8280 --- /dev/null +++ b/recipes/pulseaudio/files/CVE-2009-1299.patch @@ -0,0 +1,86 @@ +From d3efa43d85ac132c6a5a416a2b6f2115f5d577ee Mon Sep 17 00:00:00 2001 +From: Kees Cook +Date: Tue, 2 Mar 2010 21:33:34 -0800 +Subject: [PATCH] core-util: ensure that we chmod only the dir we ourselves created + +--- + configure.ac | 2 +- + src/pulsecore/core-util.c | 39 ++++++++++++++++++++++++++++++++++----- + 2 files changed, 35 insertions(+), 6 deletions(-) + +Index: pulseaudio-0.9.15/configure.ac +=================================================================== +--- pulseaudio-0.9.15.orig/configure.ac 2010-03-17 14:50:02.000000000 +0800 ++++ pulseaudio-0.9.15/configure.ac 2010-03-17 14:52:27.250075828 +0800 +@@ -403,7 +403,7 @@ + AC_FUNC_FORK + AC_FUNC_GETGROUPS + AC_FUNC_SELECT_ARGTYPES +-AC_CHECK_FUNCS([chmod chown clock_gettime getaddrinfo getgrgid_r getgrnam_r \ ++AC_CHECK_FUNCS([chmod chown fstat fchown fchmod clock_gettime getaddrinfo getgrgid_r getgrnam_r \ + getpwnam_r getpwuid_r gettimeofday getuid inet_ntop inet_pton mlock nanosleep \ + pipe posix_fadvise posix_madvise posix_memalign setpgid setsid shm_open \ + sigaction sleep sysconf pthread_setaffinity_np]) +Index: pulseaudio-0.9.15/src/pulsecore/core-util.c +=================================================================== +--- pulseaudio-0.9.15.orig/src/pulsecore/core-util.c 2010-03-17 14:49:59.000000000 +0800 ++++ pulseaudio-0.9.15/src/pulsecore/core-util.c 2010-03-17 14:51:37.680079062 +0800 +@@ -178,7 +178,7 @@ + /** Creates a directory securely */ + int pa_make_secure_dir(const char* dir, mode_t m, uid_t uid, gid_t gid) { + struct stat st; +- int r, saved_errno; ++ int r, saved_errno, fd; + + pa_assert(dir); + +@@ -196,16 +196,45 @@ + if (r < 0 && errno != EEXIST) + return -1; + +-#ifdef HAVE_CHOWN ++#ifdef HAVE_FSTAT ++ if ((fd = open(dir, ++#ifdef O_CLOEXEC ++ O_CLOEXEC| ++#endif ++#ifdef O_NOCTTY ++ O_NOCTTY| ++#endif ++#ifdef O_NOFOLLOW ++ O_NOFOLLOW| ++#endif ++ O_RDONLY)) < 0) ++ goto fail; ++ ++ if (fstat(fd, &st) < 0) { ++ pa_assert_se(pa_close(fd) >= 0); ++ goto fail; ++ } ++ ++ if (!S_ISDIR(st.st_mode)) { ++ pa_assert_se(pa_close(fd) >= 0); ++ errno = EEXIST; ++ goto fail; ++ } ++ ++#ifdef HAVE_FCHOWN + if (uid == (uid_t)-1) + uid = getuid(); + if (gid == (gid_t)-1) + gid = getgid(); +- (void) chown(dir, uid, gid); ++ (void) fchown(fd, uid, gid); ++#endif ++ ++#ifdef HAVE_FCHMOD ++ (void) fchmod(fd, m); + #endif + +-#ifdef HAVE_CHMOD +- chmod(dir, m); ++ pa_assert_se(pa_close(fd) >= 0); ++ + #endif + + #ifdef HAVE_LSTAT diff --git a/recipes/pulseaudio/pulseaudio_0.9.15.bb b/recipes/pulseaudio/pulseaudio_0.9.15.bb index 64ca916659..760e408333 100644 --- a/recipes/pulseaudio/pulseaudio_0.9.15.bb +++ b/recipes/pulseaudio/pulseaudio_0.9.15.bb @@ -1,7 +1,7 @@ require pulseaudio.inc DEPENDS += "gdbm speex" -PR = "${INC_PR}.4" +PR = "${INC_PR}.5" inherit gettext @@ -15,6 +15,7 @@ SRC_URI += "\ file://fixbluezbuild.patch;patch=1 \ file://tls_m4.patch;patch=1 \ file://sbc-thumb.patch;patch=1 \ + file://CVE-2009-1299.patch;patch=1 \ " do_compile_prepend() { -- cgit v1.2.3 From 01c5424aa65a52b774c71a80ba1cbc1caa41b8ab Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 16 Mar 2010 19:25:03 +0100 Subject: pixman git: fix typo in patch --- recipes/xorg-lib/pixman/0005-Add-specialized-fast-nearest-scalers.patch | 2 +- recipes/xorg-lib/pixman_git.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/xorg-lib/pixman/0005-Add-specialized-fast-nearest-scalers.patch b/recipes/xorg-lib/pixman/0005-Add-specialized-fast-nearest-scalers.patch index 6be7b9312c..962b4e03e2 100644 --- a/recipes/xorg-lib/pixman/0005-Add-specialized-fast-nearest-scalers.patch +++ b/recipes/xorg-lib/pixman/0005-Add-specialized-fast-nearest-scalers.patch @@ -274,7 +274,7 @@ index 4d26b0f..6607a47 100644 + SIMPLE_NEAREST_FAST_PATH (OVER, a8r8g8b8, a8r8g8b8, x888_x888), + SIMPLE_NEAREST_FAST_PATH (OVER, a8b8g8r8, a8b8g8r8, x888_x888), + -+ SIMPLE_NEAREST_FAST_PATH (OVER, a8b8g8r8, r5g6b5, 8888_565), ++ SIMPLE_NEAREST_FAST_PATH (OVER, a8r8g8b8, r5g6b5, 8888_565), + #define NEAREST_FAST_PATH(op,s,d) \ { PIXMAN_OP_ ## op, \ diff --git a/recipes/xorg-lib/pixman_git.bb b/recipes/xorg-lib/pixman_git.bb index 5080438cbc..aae86e92fe 100644 --- a/recipes/xorg-lib/pixman_git.bb +++ b/recipes/xorg-lib/pixman_git.bb @@ -4,7 +4,7 @@ DESCRIPTION = "Low-level pixel manipulation library." LICENSE = "X11" PV = "0.17.10" -PR = "r0" +PR = "r1" PR_append = "+gitr${SRCREV}" BBCLASSEXTEND="native" -- cgit v1.2.3 From 0785f3f8ca3d3373c481d44cf4f367120fb1d185 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 17 Mar 2010 09:19:15 +0100 Subject: angstrom feed sorter: add smdk6410 --- contrib/angstrom/sort.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/angstrom/sort.sh b/contrib/angstrom/sort.sh index 2e2cefaac6..f18a1e5651 100755 --- a/contrib/angstrom/sort.sh +++ b/contrib/angstrom/sort.sh @@ -54,7 +54,7 @@ case "$arch" in "armv6-novfp") machines="htcdiamond htckaiser htcpolaris htcraphael htcvogue" ;; "armv6") - machines="smartq5 bug mx31ads nokia800 " ;; + machines="smdk6410 smartq5 bug mx31ads nokia800 " ;; "armv7") machines="" ;; "armv7a") -- cgit v1.2.3 From 7779f2044aff04754fabb2f2c18fdc8485ff61cf Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 17 Mar 2010 09:23:10 +0100 Subject: angstrom: pin lighttpd to 1.4.26 --- conf/distro/include/angstrom-2008-preferred-versions.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc index f3874192bb..6f576d711b 100644 --- a/conf/distro/include/angstrom-2008-preferred-versions.inc +++ b/conf/distro/include/angstrom-2008-preferred-versions.inc @@ -23,6 +23,7 @@ PREFERRED_VERSION_libtool = "2.2.6b" PREFERRED_VERSION_libtool-native = "2.2.6b" PREFERRED_VERSION_libtool-cross = "2.2.6b" PREFERRED_VERSION_libtool-sdk = "2.2.6b" +PREFERRED_VERSION_lighttpd = "1.4.26" PREFERRED_VERSION_mesa = "7.6" PREFERRED_VERSION_mesa-dri = "7.6" PREFERRED_VERSION_mesa-xlib = "7.6" -- cgit v1.2.3 From 5a70033fdb4ff5370a5d2c5731a0e229497b8081 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 17 Mar 2010 10:03:18 +0100 Subject: sourcepkg: save lots of space by only making the diff arch specific --- classes/sourcepkg.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/classes/sourcepkg.bbclass b/classes/sourcepkg.bbclass index 7e73680f33..ce57ef0e0b 100644 --- a/classes/sourcepkg.bbclass +++ b/classes/sourcepkg.bbclass @@ -39,8 +39,8 @@ sourcepkg_do_create_orig_tgz(){ src_tree=$(basename ${S}) echo $src_tree - oenote "Creating .orig.tar.gz in ${DEPLOY_DIR_SRC}/${PN}/${PACKAGE_ARCH}/${P}.orig.tar.gz" - tar cvzf ${DEPLOY_DIR_SRC}/${PN}/${PACKAGE_ARCH}/${P}.orig.tar.gz --exclude-from temp/exclude-from-file $src_tree + oenote "Creating .orig.tar.gz in ${DEPLOY_DIR_SRC}/${PN}/${P}.orig.tar.gz" + tar cvzf ${DEPLOY_DIR_SRC}/${PN}/${P}.orig.tar.gz --exclude-from temp/exclude-from-file $src_tree cp -pPR $src_tree $src_tree.orig } -- cgit v1.2.3 From 10ca2773f9549a26f42e52c1030a178831a06a05 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 17 Mar 2010 10:20:51 +0100 Subject: ffmpeg: install more avutil headers, partially fixes the breakages introduced by the SRCREV bump --- recipes/ffmpeg/ffmpeg.inc | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/recipes/ffmpeg/ffmpeg.inc b/recipes/ffmpeg/ffmpeg.inc index 6b1bca6a00..857dad5f90 100644 --- a/recipes/ffmpeg/ffmpeg.inc +++ b/recipes/ffmpeg/ffmpeg.inc @@ -10,7 +10,7 @@ ARM_INSTRUCTION_SET = "arm" DEPENDS = "zlib libogg libvorbis libtheora faac faad2 ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'lame liba52', d)}" RSUGGESTS = "mplayer" -INC_PR = "r11" +INC_PR = "r12" inherit autotools pkgconfig @@ -53,10 +53,7 @@ do_stage() { install -m 0644 ${S}/libavformat/$h ${STAGING_INCDIR}/libavformat/$h done - for h in adler32.h attributes.h avstring.h avutil.h base64.h \ - bswap.h common.h crc.h fifo.h integer.h intfloat_readwrite.h \ - log.h lzo.h mathematics.h md5.h mem.h pixfmt.h random*.h \ - rational.h sha1.h + for h in adler32.h aes.h attributes.h avstring.h avutil.h base64.h bswap.h common.h crc_data.h crc.h des.h error.h fifo.h integer.h internal.h intfloat_readwrite.h intmath.h intreadwrite.h lfg.h libm.h lls.h log.h lzo.h mathematics.h md5.h mem.h pca.h pixdesc.h pixfmt.h random_seed.h rational.h rc4.h sha1.h sha.h softfloat.h timer.h tree.h x86_cpu.h do install -m 0644 ${S}/libavutil/$h ${STAGING_INCDIR}/ffmpeg/$h install -m 0644 ${S}/libavutil/$h ${STAGING_INCDIR}/libavutil/$h -- cgit v1.2.3 From ee29421cc87d08bf9a5b67922b4e4241dd7cafe7 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 17 Mar 2010 10:21:38 +0100 Subject: gst-ffmpeg: add 0.10.10, needed for newer ffmpeg_svn.bb --- recipes/gstreamer/gst-ffmpeg_0.10.10.bb | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 recipes/gstreamer/gst-ffmpeg_0.10.10.bb diff --git a/recipes/gstreamer/gst-ffmpeg_0.10.10.bb b/recipes/gstreamer/gst-ffmpeg_0.10.10.bb new file mode 100644 index 0000000000..bf3206f592 --- /dev/null +++ b/recipes/gstreamer/gst-ffmpeg_0.10.10.bb @@ -0,0 +1,28 @@ +DESCRIPTION = "FFmpeg-based GStreamer plug-in" +SECTION = "multimedia" +PRIORITY = "optional" +LICENSE = "LGPL" +HOMEPAGE = "http://www.gstreamer.net/" +DEPENDS = "ffmpeg gstreamer gst-plugins-base zlib" + +inherit autotools pkgconfig + +SRC_URI = "http://gstreamer.freedesktop.org/src/${PN}/${PN}-${PV}.tar.bz2;name=archive \ + file://lower-rank.diff;patch=1 \ +" +SRC_URI[archive.md5sum] = "447292deff5f3748444e6a5fba41da29" +SRC_URI[archive.sha256sum] = "697114483444a0a469028857a1d58145c99e6f5d2cd7edd8cb04cdc3fc72ad94" + +FILES_${PN} += "${libdir}/gstreamer-0.10/*.so" +FILES_${PN}-dbg += "${libdir}/gstreamer-0.10/.debug" +FILES_${PN}-dev += "${libdir}/gstreamer-0.10/*.la ${libdir}/gstreamer-0.10/*.a" + +EXTRA_OECONF = " --with-system-ffmpeg " + +# We do this because the install program is called with -s which causes it to +# call "strip" and it then mangles cross compiled stuff.. +PATH_prepend="${CROSS_DIR}/${TARGET_SYS}/bin:" + +# Hack to get STAGING_LIBDIR into the linker path when building ffmpeg +CC = "${CCACHE} ${HOST_PREFIX}gcc ${TARGET_CC_ARCH} -L${STAGING_LIBDIR}" + -- cgit v1.2.3 From 155d69ac42a08823dd67a3376011cf8d323da81b Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 17 Mar 2010 10:22:04 +0100 Subject: gegl: convert to new-style staging --- recipes/gimp/gegl_svn.bb | 5 ----- 1 file changed, 5 deletions(-) diff --git a/recipes/gimp/gegl_svn.bb b/recipes/gimp/gegl_svn.bb index af2e79aaaa..9562ffb456 100644 --- a/recipes/gimp/gegl_svn.bb +++ b/recipes/gimp/gegl_svn.bb @@ -19,8 +19,3 @@ EXTRA_OECONF = "--disable-docs " FILES_${PN} += "${libdir}/gegl-0.0" FILES_${PN}-dbg += "${libdir}/gegl-0.0/.debug" - -do_stage() { - autotools_stage_all -} - -- cgit v1.2.3 From 4935517e328364e9ebc6f5a73152e1fc51dd4ead Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 17 Mar 2010 10:26:09 +0100 Subject: orc: add license stub, packaging still needs to change to comply with it --- recipes/orc/orc.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes/orc/orc.inc b/recipes/orc/orc.inc index 7d48806c0e..b2c227689d 100644 --- a/recipes/orc/orc.inc +++ b/recipes/orc/orc.inc @@ -1,5 +1,6 @@ DESCRIPTION = "orc - The Oil Runtime Compiler" HOMEPAGE = "http://code.entropywave.com/projects/orc/" +LICENSE = "orc" SRC_URI = "http://code.entropywave.com/download/orc/orc-${PV}.tar.gz;name=orc" -- cgit v1.2.3 From 6cb0ae5c1960b51b53b9edc81dbfa48289794d97 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 17 Mar 2010 10:43:30 +0100 Subject: babl: add git version --- recipes/gimp/babl_git.bb | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 recipes/gimp/babl_git.bb diff --git a/recipes/gimp/babl_git.bb b/recipes/gimp/babl_git.bb new file mode 100644 index 0000000000..d7075a560e --- /dev/null +++ b/recipes/gimp/babl_git.bb @@ -0,0 +1,19 @@ +DESCRIPTION = "Babl is a dynamic, any to any, pixel format conversion library." +LICENSE = "LGPL" + +SRCREV = "5b1129a76f2f91d5f5503b078f975e55d9753312" +PV = "0.1.3" +PR = "r1+gitr${SRCREV}" +PE = "1" + +inherit gnome + +SRC_URI = "git://git.gnome.org/babl;protocol=git \ +" + +S = "${WORKDIR}/git" + +FILES_${PN} += "${libdir}/babl-*/" +FILES_${PN}-dbg += "${libdir}/babl-*/.debug/" + + -- cgit v1.2.3 From be85c2cf4c5b9aff7cda96facfe59e6beeee8f5b Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 17 Mar 2010 10:43:39 +0100 Subject: gegl: add git version --- recipes/gimp/gegl_git.bb | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 recipes/gimp/gegl_git.bb diff --git a/recipes/gimp/gegl_git.bb b/recipes/gimp/gegl_git.bb new file mode 100644 index 0000000000..8952cab90e --- /dev/null +++ b/recipes/gimp/gegl_git.bb @@ -0,0 +1,21 @@ +DESCRIPTION = "GEGL (Generic Graphics Library) is a graph based image processing framework." +LICENSE = "LGPL" +DEPENDS = "babl librsvg glib-2.0 gtk+ pango cairo expat zlib libpng jpeg virtual/libsdl" + +SRCREV = "fc674b5420cbc48f4dc6224381b8799db4e7afc4" +PV = "0.1.3" +PE = "1" +PR = "r1+gitr${SRCREV}" + +inherit gnome + +SRC_URI = "git://git.gnome.org/gegl;protocol=git \ +" + +S = "${WORKDIR}/git" + +EXTRA_OECONF = "--disable-docs " + +FILES_${PN} += "${libdir}/gegl-*" +FILES_${PN}-dbg += "${libdir}/gegl-*/.debug" + -- cgit v1.2.3 From 806b1f04ac7e605f99bd9dff92576b93adb90370 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 17 Mar 2010 08:36:27 +0100 Subject: ventura: bump SRCREV for https handling Signed-off-by: Martin Jansa --- recipes/openmoko-3rdparty/ventura_svn.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/openmoko-3rdparty/ventura_svn.bb b/recipes/openmoko-3rdparty/ventura_svn.bb index 22c1d89f5a..e312da57d9 100644 --- a/recipes/openmoko-3rdparty/ventura_svn.bb +++ b/recipes/openmoko-3rdparty/ventura_svn.bb @@ -10,7 +10,7 @@ PR = "1" SRC_URI = "svn://elm-browser.googlecode.com/svn;module=trunk;proto=http" -SRCREV = "11" +SRCREV = "13" S = "${WORKDIR}/trunk" inherit autotools -- cgit v1.2.3 From c588c7ecebd7e3f1f2983a55ee564877a7bfdf12 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 16 Mar 2010 09:24:51 +0100 Subject: findutils: convert to BBCLASSEXTEND, add 4.5.5 instead of 4.4, use more specific LICENCE GPLv2|3 Signed-off-by: Martin Jansa --- recipes/findutils/findutils-native_4.2.29.bb | 7 ------- recipes/findutils/findutils-native_4.4.bb | 9 --------- recipes/findutils/findutils.inc | 20 ++++++++++++++++++-- recipes/findutils/findutils_4.2.29.bb | 11 ++--------- recipes/findutils/findutils_4.4.bb | 14 -------------- recipes/findutils/findutils_4.5.5.bb | 8 ++++++++ 6 files changed, 28 insertions(+), 41 deletions(-) delete mode 100644 recipes/findutils/findutils-native_4.2.29.bb delete mode 100644 recipes/findutils/findutils-native_4.4.bb delete mode 100644 recipes/findutils/findutils_4.4.bb create mode 100644 recipes/findutils/findutils_4.5.5.bb diff --git a/recipes/findutils/findutils-native_4.2.29.bb b/recipes/findutils/findutils-native_4.2.29.bb deleted file mode 100644 index cb6d72f1e9..0000000000 --- a/recipes/findutils/findutils-native_4.2.29.bb +++ /dev/null @@ -1,7 +0,0 @@ -require findutils.inc - -inherit native - -FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/findutils-${PV}" - -S = "${WORKDIR}/findutils-${PV}" diff --git a/recipes/findutils/findutils-native_4.4.bb b/recipes/findutils/findutils-native_4.4.bb deleted file mode 100644 index 1a7b1fe4a8..0000000000 --- a/recipes/findutils/findutils-native_4.4.bb +++ /dev/null @@ -1,9 +0,0 @@ -require findutils.inc - -inherit native - -DEFAULT_PREFERENCE = "-1" - -FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/findutils-${PV}" - -S = "${WORKDIR}/findutils-${PV}" diff --git a/recipes/findutils/findutils.inc b/recipes/findutils/findutils.inc index 209edd60ad..02b2b1bb5b 100644 --- a/recipes/findutils/findutils.inc +++ b/recipes/findutils/findutils.inc @@ -1,11 +1,15 @@ DESCRIPTION = "find, locate, and xargs binaries." SECTION = "console/utils" -LICENSE = "GPL" +LICENSE = "GPLv3" -SRC_URI = "${GNU_MIRROR}/findutils/findutils-${PV}.tar.gz" +SRC_URI = "${GNU_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz;name=archive" + +BBCLASSEXTEND = "native" inherit autotools gettext +INC_PR = "r2" + # diffutils assumes non-glibc compilation with uclibc and # this causes it to generate its own implementations of # standard functionality. regex.c actually breaks compilation @@ -17,3 +21,15 @@ do_install_append() { cd ${D}${bindir} && mv find find.findutils cd ${D}${bindir} && mv xargs xargs.findutils } +# When staging native package, postinst/prerm is not called and find.findutils is not so usefull in -native +do_install_virtclass-native () { + autotools_do_install +} + +pkg_postinst_${PN} () { + for i in find xargs; do update-alternatives --install ${bindir}/$i $i $i.${PN} 100; done +} + +pkg_prerm_${PN} () { + for i in find xargs; do update-alternatives --remove $i $i.${PN}; done +} diff --git a/recipes/findutils/findutils_4.2.29.bb b/recipes/findutils/findutils_4.2.29.bb index a89d0924f4..c3c22fb0c2 100644 --- a/recipes/findutils/findutils_4.2.29.bb +++ b/recipes/findutils/findutils_4.2.29.bb @@ -1,15 +1,8 @@ require findutils.inc +LICENSE = "GPLv2" -PR = "r1" +PR = "${INC_PR}.0" SRC_URI += "file://mkinstalldirs.patch;patch=1" EXTRA_OECONF += " ac_cv_path_SORT=/usr/bin/sort " - -pkg_postinst_${PN} () { - for i in find xargs; do update-alternatives --install ${bindir}/$i $i $i.${PN} 100; done -} - -pkg_prerm_${PN} () { - for i in find xargs; do update-alternatives --remove $i $i.${PN}; done -} diff --git a/recipes/findutils/findutils_4.4.bb b/recipes/findutils/findutils_4.4.bb deleted file mode 100644 index 25dec2592e..0000000000 --- a/recipes/findutils/findutils_4.4.bb +++ /dev/null @@ -1,14 +0,0 @@ -require findutils.inc - -PR = "r1" -DEFAULT_PREFERENCE = "-1" - -EXTRA_OECONF += " ac_cv_path_SORT=/usr/bin/sort " - -pkg_postinst_${PN} () { - for i in find xargs; do update-alternatives --install ${bindir}/$i $i $i.${PN} 100; done -} - -pkg_prerm_${PN} () { - for i in find xargs; do update-alternatives --remove $i $i.${PN}; done -} diff --git a/recipes/findutils/findutils_4.5.5.bb b/recipes/findutils/findutils_4.5.5.bb new file mode 100644 index 0000000000..67ae8e0284 --- /dev/null +++ b/recipes/findutils/findutils_4.5.5.bb @@ -0,0 +1,8 @@ +require findutils.inc + +PR = "${INC_PR}.0" + +# newer version is not available on GNU_MIRROR from .inc file, and old 4.2.29 is not available on alpha.gnu.org +SRC_URI = "ftp://alpha.gnu.org/gnu/${BPN}/${BPN}-${PV}.tar.gz;name=archive" +SRC_URI[archive.md5sum] = "39f9dbee5db8e26f8fe01884cb99397b" +SRC_URI[archive.sha256sum] = "8388e1b26902e8f84320b320994071743b0e98c2831b189e8ba230747e8e0b8d" -- cgit v1.2.3 From 67b3baea2fd5203fe5dd6abec3530df4abe672ee Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 17 Mar 2010 11:41:21 +0100 Subject: sane-srcrevs: move SRCREVs to recipes for openmoko related svn recipes * As suggested few times on ML * I would move git revs too, but after merging SRCPV (don't want to resolve so much conflicts now) Signed-off-by: Martin Jansa --- conf/distro/include/sane-srcrevs.inc | 81 ---------------------- recipes/connman/mokonnect_svn.bb | 1 + recipes/dfu-util/dfu-util_svn.bb | 1 + recipes/e17/elmdentica_svn.bb | 1 + recipes/enotes/enotes_svn.bb | 1 + recipes/fltk/fltk2_svn.bb | 1 + recipes/freesmartphone/fsoraw_svn.bb | 1 + recipes/intone-video/intone-video_svn.bb | 1 + recipes/intone/intone_svn.bb | 1 + recipes/mokoko/mokoko_svn.bb | 1 + recipes/numptyphysics/numptyphysics_svn.bb | 1 + recipes/omgps/omgps_svn.bb | 1 + recipes/omoney/omoney_svn.bb | 1 + recipes/omview/omview_svn.bb | 1 + recipes/openmoko-3rdparty/babiloo-efl_bzr.bb | 1 + recipes/openmoko-3rdparty/guitartune_svn.bb | 1 + recipes/openmoko-3rdparty/neomis_svn.bb | 1 + recipes/openmoko-3rdparty/numberx_svn.bb | 1 + recipes/openmoko-3rdparty/om-neon_svn.bb | 2 +- .../openmoko-panel-demo-simple_svn.bb | 1 + .../openmoko-examples/openmoko-panel-demo_svn.bb | 1 + .../openmoko-panel-battery_svn.bb | 1 + .../openmoko-panel-bt_svn.bb | 1 + .../openmoko-panel-clock_svn.bb | 1 + .../openmoko-panel-gps_svn.bb | 1 + .../openmoko-panel-gsm_svn.bb | 1 + .../openmoko-panel-mainmenu_svn.bb | 1 + .../openmoko-panel-memory_svn.bb | 1 + .../openmoko-panel-usb_svn.bb | 1 + .../openmoko-panel-wifi_svn.bb | 1 + recipes/openmoko-projects/assassin-thumbnail.bb | 18 ----- .../openmoko-projects/assassin-thumbnail_svn.bb | 19 +++++ recipes/openmoko-projects/assassin_svn.bb | 1 + recipes/openmoko-projects/diversity-daemon_svn.bb | 1 + recipes/openmoko-projects/diversity-radar_svn.bb | 1 + recipes/openmoko-projects/enlazar_svn.bb | 1 + recipes/openmoko-projects/etk-theme-ninja_svn.bb | 1 + recipes/openmoko-projects/illume-theme-asu_svn.bb | 1 + recipes/openmoko-projects/om-settings_svn.bb | 1 + recipes/openmoko-projects/openmoko-agpsui_svn.bb | 1 + recipes/openmoko-projects/pyefl-sudoku_svn.bb | 1 + recipes/openmoko-system/ompower_svn.bb | 1 + recipes/openmoko-tools/app-restarter_svn.bb | 1 + .../openmoko-tools/openmoko-set-root-password.bb | 26 ------- .../openmoko-set-root-password_svn.bb | 27 ++++++++ .../openmoko-toolchain-scripts_svn.bb | 1 + recipes/openmoko2/libjana_svn.bb | 1 + recipes/openmoko2/libmokogsmd2_svn.bb | 1 + recipes/openmoko2/libmokojournal2_svn.bb | 1 + recipes/openmoko2/libmokopanelui2_svn.bb | 1 + recipes/openmoko2/libmokoui2_svn.bb | 1 + recipes/openmoko2/moko-gtk-engine_svn.bb | 1 + recipes/openmoko2/neod_svn.bb | 1 + recipes/openmoko2/openmoko-alsa-scenarios.bb | 24 ------- recipes/openmoko2/openmoko-alsa-scenarios_svn.bb | 25 +++++++ recipes/openmoko2/openmoko-appearance_svn.bb | 1 + recipes/openmoko2/openmoko-appmanager2_svn.bb | 1 + recipes/openmoko2/openmoko-browser2_svn.bb | 1 + recipes/openmoko2/openmoko-calculator2_svn.bb | 1 + recipes/openmoko2/openmoko-common2_svn.bb | 1 + recipes/openmoko2/openmoko-contacts2_svn.bb | 1 + recipes/openmoko2/openmoko-dates2_svn.bb | 1 + recipes/openmoko2/openmoko-dialer2_svn.bb | 1 + recipes/openmoko2/openmoko-feedreader2_svn.bb | 1 + recipes/openmoko2/openmoko-firststart2_svn.bb | 1 + .../openmoko-icon-theme-standard2-qvga_svn.bb | 1 + .../openmoko2/openmoko-icon-theme-standard2_svn.bb | 1 + recipes/openmoko2/openmoko-mediaplayer2_svn.bb | 1 + recipes/openmoko2/openmoko-messages2_svn.bb | 1 + recipes/openmoko2/openmoko-sample2_svn.bb | 1 + .../openmoko-sound-theme-standard2_svn.bb | 1 + recipes/openmoko2/openmoko-tasks2_svn.bb | 1 + .../openmoko2/openmoko-theme-standard2-qvga_svn.bb | 1 + recipes/openmoko2/openmoko-theme-standard2_svn.bb | 1 + recipes/openmoko2/openmoko-today2-folders_svn.bb | 1 + recipes/openmoko2/openmoko-today2_svn.bb | 1 + recipes/openmoko2/openmoko-worldclock2_svn.bb | 1 + recipes/remoko/remoko-server_svn.bb | 1 + recipes/remoko/remoko_svn.bb | 1 + recipes/samsung-soc-utils/s3c24xx-gpio_svn.bb | 1 + recipes/samsung-soc-utils/s3c64xx-gpio_svn.bb | 1 + .../samsung-soc-utils/sjf2410-linux-native_svn.bb | 1 + recipes/shr/shr-launcher_svn.bb | 2 +- recipes/wmiconfig/wmiconfig_svn.bb | 1 + 84 files changed, 148 insertions(+), 151 deletions(-) delete mode 100644 recipes/openmoko-projects/assassin-thumbnail.bb create mode 100644 recipes/openmoko-projects/assassin-thumbnail_svn.bb delete mode 100644 recipes/openmoko-tools/openmoko-set-root-password.bb create mode 100644 recipes/openmoko-tools/openmoko-set-root-password_svn.bb delete mode 100644 recipes/openmoko2/openmoko-alsa-scenarios.bb create mode 100644 recipes/openmoko2/openmoko-alsa-scenarios_svn.bb diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 5ebcab3a01..7e71b73ef3 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -16,11 +16,7 @@ SRCREV_pn-advancedcaching ?= "9c3661f5573d2dd712437f1590070153d12e4c02" SRCREV_pn-aircrack-ng ?= "802" SRCREV_pn-alsa-scenarii-shr ?= "2b62d1c9b02da047071105a7b5695acd6c6dbcca" SRCREV_pn-alsa-scenario ?= "8bd7f83d847424eb44704cf1649974b2fda8d8f1" -SRCREV_pn-app-restarter ?= "4552" -SRCREV_pn-assassin ?= "268" -SRCREV_pn-assassin-thumbnail ?= "4690" SRCREV_pn-aufs2-util ?= "f35ba2292fe40aa94aa83713e0b2719f35a25768" -SRCREV_pn-babiloo-efl ?= "296" SRCREV_pn-bfin-uclibc ?= "1857" SRCREV_pn-blipomoko ?= "93295f36f7b45c691df247cb2a65227facf13654" SRCREV_pn-bootchart-lite ?= "4" @@ -41,11 +37,7 @@ SRCREV_pn-contact ?= "1410" SRCREV_pn-dasher-gpe ?= "1251" SRCREV_pn-dbus-c++ ?= "13131" SRCREV_pn-dbus-c++-native ?= "13131" -SRCREV_pn-dfu-util ?= "4160" -SRCREV_pn-dfu-util-native ?= "4160" SRCREV_pn-disko ?= "f52597b8d5d584811cbe8f9e0bf25ea372526953" -SRCREV_pn-diversity-daemon ?= "571" -SRCREV_pn-diversity-radar ?= "453" SRCREV_pn-e-wm-config-illume-shr ?= "bbcec18f0ebd47e4f6eea88b9b774edf7400e752" SRCREV_pn-e-wm-illume-dict-pl ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb" SRCREV_pn-e-wm-menu-shr ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb" @@ -60,23 +52,17 @@ SRCREV_pn-elementary-theme-gry ?= "2b62d1c9b02da047071105a7b5695acd6c6dbcca" SRCREV_pn-elementary-theme-niebiee ?= "2ac643cc273d144bb731a8cbb8ec6b3615de43a0" SRCREV_pn-elementary-theme-sixteen ?= "2ac643cc273d144bb731a8cbb8ec6b3615de43a0" SRCREV_pn-elf2flt ?= "1786" -SRCREV_pn-elmdentica ?= "215" -SRCREV_pn-enlazar ?= "37" -SRCREV_pn-enotes ?= "19" SRCREV_pn-epdfview ?= "346" SRCREV_pn-epiphany ?= "7837" SRCREV_pn-essential-dialer ?= "194" -SRCREV_pn-etk-theme-ninja ?= "5" SRCREV_pn-ezx-boot-usb-native ?= "2371" SRCREV_pn-ezx-gen-blob ?= "2426" SRCREV_pn-ezxd ?= "2074" SRCREV_pn-fbgrab-viewer-native ?= "1943" SRCREV_pn-flashrom ?= "3682" -SRCREV_pn-fltk2 ?= "6916" SRCREV_pn-frameworkd-config-shr ?= "2b62d1c9b02da047071105a7b5695acd6c6dbcca" SRCREV_pn-frameworkd-config-shr_SHR_REV ?= ${SRCREV_pn-frameworkd-config-shr} SRCREV_pn-fsod ?= "2a33e5ffe96c611e6a6b8b6c33d2a83ba656f55b" -SRCREV_pn-fsoraw ?= "20" SRCREV_pn-fstests ?= "204" SRCREV_pn-gabriel ?= "38" SRCREV_pn-gabriel-native ?= "38" @@ -90,14 +76,10 @@ SRCREV_pn-gpe-mini-browser2 ?= "9900" SRCREV_pn-gpe-sketchbook ?= "9547" SRCREV_pn-gridpad ?= "194" SRCREV_pn-gtkhtml2 ?= "1158" -SRCREV_pn-guitartune ?= "11" SRCREV_pn-gypsy ?= "134" SRCREV_pn-hildon-1 ?= "14429" SRCREV_pn-illume-keyboards-shr ?= "7bcdd55dc0cf6f3b50fd0226345592f538301b8a" -SRCREV_pn-illume-theme-asu ?= "4881" SRCREV_pn-illume-theme-freesmartphone ?= "b1b0f6adc59e6f72a3929771058e3750bf181bc5" -SRCREV_pn-intone ?= "75" -SRCREV_pn-intone-video ?= "12" SRCREV_pn-intuition ?= "194" SRCREV_pn-kismet ?= "2285" SRCREV_pn-kismet-newcore ?= "2285" @@ -109,12 +91,7 @@ SRCREV_pn-libgee ?= "c21925bf1b714a2aa395192f7adbaeecf7a0e146" SRCREV_pn-libgee-native ?= "c21925bf1b714a2aa395192f7adbaeecf7a0e146" SRCREV_pn-libgsmd ?= "4505" SRCREV_pn-libiac ?= "1590" -SRCREV_pn-libjana ?= "749" SRCREV_pn-libmodulo ?= "7d2f657d248bd86377e66c329aa6826459d406da" -SRCREV_pn-libmokogsmd2 ?= "4334" -SRCREV_pn-libmokojournal2 ?= "3473" -SRCREV_pn-libmokopanelui2 ?= "4568" -SRCREV_pn-libmokoui2 ?= "4695" SRCREV_pn-libnl2 ?= "8808743839b0f459394ecd00cb0f7c1896c0ab7a" SRCREV_pn-libowl ?= "277" SRCREV_pn-libphone-ui ?= "18e9bce8ef0cfca067674e1a1b7300949a227d57" @@ -148,72 +125,22 @@ SRCREV_pn-matchbox-wm-2 ?= "2087" SRCREV_pn-midori ?= "400139644371c0b675723f9a986ddab4445a8794" SRCREV_pn-mobile-broadband-provider-info ?= "bc536218490377ccbd09c4e5858d37c91c2f03f7" SRCREV_pn-moblin-proto ?= "8f2cb524fe06555182c25b4ba3202d7b368ac0ce" -SRCREV_pn-moko-gtk-engine ?= "4734" -SRCREV_pn-mokoko ?= "127" -SRCREV_pn-mokonnect ?= "113" SRCREV_pn-mpd-alsa ?= "6952" SRCREV_pn-mplayer-maemo ?= "342" SRCREV_pn-msn-pecan ?= "e795b33b29d792f19fcf699275eb966dc68be257" SRCREV_pn-multitap-pad ?= "373" SRCREV_pn-mux ?= "72460e890dbb15edbf7dc193116be0dcf9794a8b" -SRCREV_pn-neod ?= "4617" -SRCREV_pn-neomis ?= "6" SRCREV_pn-net-snmp ?= "17367" SRCREV_pn-netsurf ?= "3859" -SRCREV_pn-numberx ?= "4" -SRCREV_pn-numptyphysics ?= "109" SRCREV_pn-oh-puzzles ?= "22" SRCREV_pn-ohm ?= "edfe25d49d67884bf004de7ae0724c162bb5e65e" SRCREV_pn-ologicd ?= "4a32af91a9479ebd4d1d39057354ac9904d74cbb" SRCREV_pn-om-locations ?= "942e88a1b689ffe3f11a2d982cce389cc965b2ec" -SRCREV_pn-om-neon ?= "68" -SRCREV_pn-om-settings ?= "74" -SRCREV_pn-omgps ?= "109" -SRCREV_pn-omoney ?= "29" -SRCREV_pn-ompower ?= "4727" -SRCREV_pn-omview ?= "34" SRCREV_pn-openbsc ?= "5e68183a201ab92f29cd2467df5209f7b351a66d" SRCREV_pn-openbsc-onwaves ?= "0d9ed87d5c7d5b6e21dc3bbb282e215068742566" SRCREV_pn-openezx-kernel ?= "43b844d1d38f0343272d3f0f844f80666186c526" -SRCREV_pn-openmoko-agpsui ?= "7" -SRCREV_pn-openmoko-alsa-scenarios ?= "4732" -SRCREV_pn-openmoko-appearance ?= "3262" -SRCREV_pn-openmoko-appmanager2 ?= "4530" -SRCREV_pn-openmoko-browser2 ?= "4172" -SRCREV_pn-openmoko-calculator2 ?= "3655" -SRCREV_pn-openmoko-common2 ?= "3259" -SRCREV_pn-openmoko-contacts2 ?= "419" -SRCREV_pn-openmoko-dates2 ?= "703" -SRCREV_pn-openmoko-dialer2 ?= "4364" -SRCREV_pn-openmoko-feedreader2 ?= "3645" -SRCREV_pn-openmoko-firststart2 ?= "3158" SRCREV_pn-openmoko-footer ?= "2354" -SRCREV_pn-openmoko-icon-theme-standard2 ?= "4232" -SRCREV_pn-openmoko-icon-theme-standard2-qvga ?= "4232" -SRCREV_pn-openmoko-mediaplayer2 ?= "4750" -SRCREV_pn-openmoko-messages2 ?= "4340" -SRCREV_pn-openmoko-panel-battery ?= "3360" -SRCREV_pn-openmoko-panel-bt ?= "4331" -SRCREV_pn-openmoko-panel-clock ?= "2567" -SRCREV_pn-openmoko-panel-demo ?= "1622" -SRCREV_pn-openmoko-panel-demo-simple ?= "1328" -SRCREV_pn-openmoko-panel-gps ?= "4330" -SRCREV_pn-openmoko-panel-gsm ?= "4335" -SRCREV_pn-openmoko-panel-mainmenu ?= "2567" -SRCREV_pn-openmoko-panel-memory ?= "3903" -SRCREV_pn-openmoko-panel-usb ?= "3360" -SRCREV_pn-openmoko-panel-wifi ?= "4344" -SRCREV_pn-openmoko-sample2 ?= "3537" -SRCREV_pn-openmoko-set-root-password ?= "4590" -SRCREV_pn-openmoko-sound-theme-standard2 ?= "4271" -SRCREV_pn-openmoko-tasks2 ?= "404" SRCREV_pn-openmoko-terminal2 ?= "4782" -SRCREV_pn-openmoko-theme-standard2 ?= "4338" -SRCREV_pn-openmoko-theme-standard2-qvga ?= "3425" -SRCREV_pn-openmoko-today2 ?= "4168" -SRCREV_pn-openmoko-today2-folders ?= "3704" -SRCREV_pn-openmoko-toolchain-scripts ?= "4913" -SRCREV_pn-openmoko-worldclock2 ?= "3365" SRCREV_pn-openmoocow ?= "39648419825cddfea1cb1321e552a12b71fede14" SRCREV_pn-openocd ?= "517" SRCREV_pn-openocd-native ?= "517" @@ -236,7 +163,6 @@ SRCREV_pn-phoneuid ?= "be0c9364a0b5e997be2151213249535d8e01f194" SRCREV_pn-portaudio-v19 ?= "1387" SRCREV_pn-psplash ?= "249" SRCREV_pn-pty-forward-native ?= "4662b55fdba528bb5b3349f83055bf236af5d63b" -SRCREV_pn-pyefl-sudoku ?= "49" SRCREV_pn-pygsm ?= "976477f6b403f422b4ea730f71ebf409f6671141" SRCREV_pn-pyphonelog ?= "b70058755df1f12cd48db51fa4cd933c027e20c6" SRCREV_pn-pythm ?= "19" @@ -252,15 +178,10 @@ SRCREV_pn-qemu-native ?= "${QEMUSRCREV}" SRCREV_pn-qemu-sdk ?= "${QEMUSRCREV}" SRCREV_pn-qtwebkit-performance-utilities ?= "27a630a74518ebb7810ed5886182e676b36c07a5" SRCREV_pn-qtwebkit-performance-utilities-e ?= "27a630a74518ebb7810ed5886182e676b36c07a5" -SRCREV_pn-remoko ?= "121" -SRCREV_pn-remoko-server ?= "121" -SRCREV_pn-s3c24xx-gpio ?= "4949" -SRCREV_pn-s3c64xx-gpio ?= "4949" SRCREV_pn-serial-forward ?= "50cf4ff2198589a8db369789fc038604a892a54d" SRCREV_pn-settings-daemon ?= "2006" SRCREV_pn-shr-config ?= "37dd7ac950e2bfd438801faf34c29fccfdbbaccf" SRCREV_pn-shr-installer ?= "8608816ea1a1ac14b6e9faaa3685dd2b6450e889" -SRCREV_pn-shr-launcher ?= "103" SRCREV_pn-shr-settings ?= "fd19508d43d8a0d990c63b329d935d2929c091dc" SRCREV_pn-shr-specs ?= "062fb8278132ce64eeef3e488bef068387b87aff" SRCREV_pn-shr-splash ?= "9d7ca1cecb93022e5b890cd87756ac6f072710ca" @@ -274,7 +195,6 @@ SRCREV_pn-shr-theme ?= "730da87ad75c814c16c856ca138605d985b6efdb" SRCREV_pn-shr-theme-gtk-e17lookalike ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb" SRCREV_pn-shr-today ?= "7b69649a9df0e85f0c0f7985fd1d93543c3b11e2" SRCREV_pn-shr-wizard ?= "24450cba257e7057045ad576530f158a03bd0f8b" -SRCREV_pn-sjf2410-linux-native ?= "4268" SRCREV_pn-socketcan-modules ?= "917" SRCREV_pn-socketcan-utils-test ?= "917" SRCREV_pn-sphyrna-python ?= "45" @@ -294,7 +214,6 @@ SRCREV_pn-webkit-efl ?= "3a5ee77664c898ed51a2b2d5759822f8c0a06472" SRCREV_pn-wesnoth ?= "39828" SRCREV_pn-wlan-ng-modules ?= "1859" SRCREV_pn-wlan-ng-utils ?= "1859" -SRCREV_pn-wmiconfig ?= "5394" SRCREV_pn-xoo ?= "1971" SRCREV_pn-xserver-kdrive-glamo ?= "9b28d998424c77fbc057dd3a022ccbb122793a52" diff --git a/recipes/connman/mokonnect_svn.bb b/recipes/connman/mokonnect_svn.bb index 0379549857..3dceb09b8d 100644 --- a/recipes/connman/mokonnect_svn.bb +++ b/recipes/connman/mokonnect_svn.bb @@ -5,6 +5,7 @@ LICENSE = "GPLv2" SECTION = "e/apps" RDEPENDS = "python-elementary connman connman-plugin-wifi connman-plugin-udhcp" +SRCREV = "113" PV = "0.4+svnr${SRCPV}" PR = "r3" diff --git a/recipes/dfu-util/dfu-util_svn.bb b/recipes/dfu-util/dfu-util_svn.bb index e4d7783a0c..7ac78140b5 100644 --- a/recipes/dfu-util/dfu-util_svn.bb +++ b/recipes/dfu-util/dfu-util_svn.bb @@ -2,6 +2,7 @@ DESCRIPTION = "USB Device Firmware Upgrade utility" SECTION = "devel" AUTHOR = "Harald Welte " LICENSE = "GPL" +SRCREV = "4160" PV = "0.1+svnr${SRCPV}" PR = "r2" diff --git a/recipes/e17/elmdentica_svn.bb b/recipes/e17/elmdentica_svn.bb index 8549b009f0..d5d441b629 100644 --- a/recipes/e17/elmdentica_svn.bb +++ b/recipes/e17/elmdentica_svn.bb @@ -4,6 +4,7 @@ LICENSE = "GPLv3+" SECTION = "e/apps" HOMEPAGE = "http://elmdentica.googlecode.com" AUTHOR = "seabra" +SRCREV = "215" PV = "0.7.0+svnr${SRCPV}" PR = "r1" diff --git a/recipes/enotes/enotes_svn.bb b/recipes/enotes/enotes_svn.bb index 4748c758dc..5603469d58 100644 --- a/recipes/enotes/enotes_svn.bb +++ b/recipes/enotes/enotes_svn.bb @@ -5,6 +5,7 @@ LICENSE = "GPL" SECTION = "e/apps" DEPENDS = "elementary evas sqlite3" +SRCREV = "19" PV = "0.2.2+svnr${SRCPV}" PR = "r2" SRC_URI = "svn://enotes.googlecode.com/svn/trunk;module=.;proto=http" diff --git a/recipes/fltk/fltk2_svn.bb b/recipes/fltk/fltk2_svn.bb index 0d25ff6cb1..95ed5c6d7f 100644 --- a/recipes/fltk/fltk2_svn.bb +++ b/recipes/fltk/fltk2_svn.bb @@ -5,6 +5,7 @@ PRIORITY = "optional" LICENSE = "LGPL" DEPENDS = "zlib jpeg libpng libxext libxft xinput" +SRCREV = "6916" PV = "1.9.9+svnr${SRCPV}" PR = "r1" diff --git a/recipes/freesmartphone/fsoraw_svn.bb b/recipes/freesmartphone/fsoraw_svn.bb index 402aea6393..74b1274782 100644 --- a/recipes/freesmartphone/fsoraw_svn.bb +++ b/recipes/freesmartphone/fsoraw_svn.bb @@ -4,6 +4,7 @@ PRIORITY = "optional" HOMEPAGE = "http://noko.sourceforge.net" LICENSE = "GPL" DEPENDS = "dbus" +SRCREV = "20" PV = "0.0.1+svnr${SRCPV}" PR = "r0" diff --git a/recipes/intone-video/intone-video_svn.bb b/recipes/intone-video/intone-video_svn.bb index 0f7979f122..352a1f571d 100644 --- a/recipes/intone-video/intone-video_svn.bb +++ b/recipes/intone-video/intone-video_svn.bb @@ -6,6 +6,7 @@ SECTION = "e/apps" DEPENDS = "elementary eina sqlite3 edbus" RDEPENDS = "mplayer lame libxv libsdl-x11" +SRCREV = "12" PV = "0.13+svnr${SRCPV}" PR = "r1" diff --git a/recipes/intone/intone_svn.bb b/recipes/intone/intone_svn.bb index d964a475c4..c92590f2c0 100644 --- a/recipes/intone/intone_svn.bb +++ b/recipes/intone/intone_svn.bb @@ -6,6 +6,7 @@ SECTION = "e/apps" DEPENDS = "elementary eina sqlite3 edbus libvorbis id3lib" RDEPENDS = "mplayer lame libxv libsdl-x11" +SRCREV = "75" PV = "0.66+svnr${SRCPV}" PR = "r3" diff --git a/recipes/mokoko/mokoko_svn.bb b/recipes/mokoko/mokoko_svn.bb index f22d445ae8..3196234b54 100644 --- a/recipes/mokoko/mokoko_svn.bb +++ b/recipes/mokoko/mokoko_svn.bb @@ -5,6 +5,7 @@ LICENSE = "GPL" DEPENDS = "gstreamer" RDEPENDS = "gstreamer" +SRCREV = "127" PV = "0.1+svnr${SRCPV}" PR = "r1" diff --git a/recipes/numptyphysics/numptyphysics_svn.bb b/recipes/numptyphysics/numptyphysics_svn.bb index 7ebde5086b..dec9cf14db 100644 --- a/recipes/numptyphysics/numptyphysics_svn.bb +++ b/recipes/numptyphysics/numptyphysics_svn.bb @@ -5,6 +5,7 @@ RDEPENDS += "libpng" LICENSE = "GPL" HOMEPAGE = "http://numptyphysics.garage.maemo.org/" SECTION = "x11/games" +SRCREV = "109" PV = "0.2+svnr${SRCPV}" PR = "r1" diff --git a/recipes/omgps/omgps_svn.bb b/recipes/omgps/omgps_svn.bb index d73ade1934..0745c18fbc 100644 --- a/recipes/omgps/omgps_svn.bb +++ b/recipes/omgps/omgps_svn.bb @@ -4,6 +4,7 @@ SECTION = "openmoko/applications" LICENSE = "GPLv2" DEPENDS = "gtk+ python-pygobject dbus-glib" #PACKAGES = "${PN}-dbg ${PN}" +SRCREV = "109" PV = "0.1+svnr${SRCPV}" PR = "r0" S = "${WORKDIR}/${PN}" diff --git a/recipes/omoney/omoney_svn.bb b/recipes/omoney/omoney_svn.bb index f566c92ada..9c3a3c6826 100644 --- a/recipes/omoney/omoney_svn.bb +++ b/recipes/omoney/omoney_svn.bb @@ -3,6 +3,7 @@ HOMEPAGE = "http://omoney.googlecode.com" AUTHOR = "Bumbl" LICENSE = "GPLv2" SECTION = "openmoko/money" +SRCREV = "29" PV = "milestone1+svnr${SRCPV}" PR = "r0" SRC_URI = "svn://omoney.googlecode.com/svn/trunk;module=.;proto=http;rev=29" diff --git a/recipes/omview/omview_svn.bb b/recipes/omview/omview_svn.bb index 8ce0a78160..81578205e3 100644 --- a/recipes/omview/omview_svn.bb +++ b/recipes/omview/omview_svn.bb @@ -3,6 +3,7 @@ SECTION = "x11/graphics" PKG_TAGS_${PN} = "group::communication" DEPENDS += " evas ewl epsilon" RDEPENDS += " epsilon-thumbd" +SRCREV = "34" PV = "0.0.1+svnr${SRCPV}" PR = "r2" diff --git a/recipes/openmoko-3rdparty/babiloo-efl_bzr.bb b/recipes/openmoko-3rdparty/babiloo-efl_bzr.bb index 614c095b8b..ce0e591e00 100644 --- a/recipes/openmoko-3rdparty/babiloo-efl_bzr.bb +++ b/recipes/openmoko-3rdparty/babiloo-efl_bzr.bb @@ -9,6 +9,7 @@ RDEPENDS = "python-elementary python-compression python-misc python-netclient" PACKAGE_ARCH = "all" DEFAULT_PREFERENCE = "-1" +SRCREV = "296" PV = "2.0.9-bzrr${SRCPV}" SRC_URI = "bzr://bazaar.launchpad.net/~vaudano/babiloo/efl" diff --git a/recipes/openmoko-3rdparty/guitartune_svn.bb b/recipes/openmoko-3rdparty/guitartune_svn.bb index 37fbd5ffa3..dc468dc77f 100644 --- a/recipes/openmoko-3rdparty/guitartune_svn.bb +++ b/recipes/openmoko-3rdparty/guitartune_svn.bb @@ -5,6 +5,7 @@ LICENSE = "GPLv2" SECTION = "e/apps" DEPENDS = "gtk+ libglade fftw sqlite3" +SRCREV = "11" PV = "0.36+svnr${SRCPV}" SRC_URI = "svn://guitartune.googlecode.com/svn;module=trunk;proto=http" diff --git a/recipes/openmoko-3rdparty/neomis_svn.bb b/recipes/openmoko-3rdparty/neomis_svn.bb index 1ea20a2d58..1af7619c6d 100644 --- a/recipes/openmoko-3rdparty/neomis_svn.bb +++ b/recipes/openmoko-3rdparty/neomis_svn.bb @@ -6,6 +6,7 @@ SECTION = "x11/applications" PRIORITY = "optional" DEPENDS = "python-native" +SRCREV = "6" PV = "1.1.0+svnr${SRCPV}" PR = "r1" diff --git a/recipes/openmoko-3rdparty/numberx_svn.bb b/recipes/openmoko-3rdparty/numberx_svn.bb index 446ed37b52..3deaf6a4eb 100644 --- a/recipes/openmoko-3rdparty/numberx_svn.bb +++ b/recipes/openmoko-3rdparty/numberx_svn.bb @@ -6,6 +6,7 @@ SECTION = "x11/applications" PRIORITY = "optional" DEPENDS = "python-native" +SRCREV = "4" PV = "1.0.0+svnr${SRCPV}" S = "${WORKDIR}/trunk" diff --git a/recipes/openmoko-3rdparty/om-neon_svn.bb b/recipes/openmoko-3rdparty/om-neon_svn.bb index 5ecaf14123..7e1f24ee4c 100644 --- a/recipes/openmoko-3rdparty/om-neon_svn.bb +++ b/recipes/openmoko-3rdparty/om-neon_svn.bb @@ -6,7 +6,7 @@ SECTION = "x11/applications" PRIORITY = "optional" DEPENDS = "edje-native python-native" -SRCREV = ${AUTOREV} +SRCREV = "68" PV = "1.0.0+svnr${SRCPV}" PR = "r2" diff --git a/recipes/openmoko-examples/openmoko-panel-demo-simple_svn.bb b/recipes/openmoko-examples/openmoko-panel-demo-simple_svn.bb index ff336be4de..82e5c6182c 100644 --- a/recipes/openmoko-examples/openmoko-panel-demo-simple_svn.bb +++ b/recipes/openmoko-examples/openmoko-panel-demo-simple_svn.bb @@ -1,6 +1,7 @@ DESCRIPTION = "A simple example panel plugin for Openmoko" SECTION = "openmoko/examples" DEPENDS += "libmatchbox" +SRCREV = "1328" PV = "0.0.1+svnr${SRCPV}" PR = "r1" diff --git a/recipes/openmoko-examples/openmoko-panel-demo_svn.bb b/recipes/openmoko-examples/openmoko-panel-demo_svn.bb index c44dc114e5..8e9a501c6d 100644 --- a/recipes/openmoko-examples/openmoko-panel-demo_svn.bb +++ b/recipes/openmoko-examples/openmoko-panel-demo_svn.bb @@ -1,6 +1,7 @@ DESCRIPTION = "An example panel plugin for Openmoko" SECTION = "openmoko/examples" DEPENDS += "libmatchbox" +SRCREV = "1622" PV = "0.0.1+svnr${SRCPV}" inherit openmoko diff --git a/recipes/openmoko-panel-plugins/openmoko-panel-battery_svn.bb b/recipes/openmoko-panel-plugins/openmoko-panel-battery_svn.bb index f8ff8a3a93..b4926affd6 100644 --- a/recipes/openmoko-panel-plugins/openmoko-panel-battery_svn.bb +++ b/recipes/openmoko-panel-plugins/openmoko-panel-battery_svn.bb @@ -1,5 +1,6 @@ DESCRIPTION = "Shows the battery/AC status in the Openmoko panel" DEPENDS = "apmd libnotify" +SRCREV = "3360" PV = "0.1.1+svnr${SRCPV}" inherit openmoko-panel-plugin diff --git a/recipes/openmoko-panel-plugins/openmoko-panel-bt_svn.bb b/recipes/openmoko-panel-plugins/openmoko-panel-bt_svn.bb index e823694f10..b9015a37da 100644 --- a/recipes/openmoko-panel-plugins/openmoko-panel-bt_svn.bb +++ b/recipes/openmoko-panel-plugins/openmoko-panel-bt_svn.bb @@ -1,5 +1,6 @@ DESCRIPTION = "Shows the bluetooth status in the Openmoko panel" DEPENDS = "bluez-libs libnotify" +SRCREV = "4331" PV = "0.1.0+svnr${SRCPV}" PR = "r1" diff --git a/recipes/openmoko-panel-plugins/openmoko-panel-clock_svn.bb b/recipes/openmoko-panel-plugins/openmoko-panel-clock_svn.bb index 91316b8066..90e5e92a73 100644 --- a/recipes/openmoko-panel-plugins/openmoko-panel-clock_svn.bb +++ b/recipes/openmoko-panel-plugins/openmoko-panel-clock_svn.bb @@ -1,4 +1,5 @@ DESCRIPTION = "Shows the current time in the Openmoko panel" +SRCREV = "2567" PV = "0.1.0+svnr${SRCPV}" inherit openmoko-panel-plugin diff --git a/recipes/openmoko-panel-plugins/openmoko-panel-gps_svn.bb b/recipes/openmoko-panel-plugins/openmoko-panel-gps_svn.bb index b28b670453..928a99379f 100644 --- a/recipes/openmoko-panel-plugins/openmoko-panel-gps_svn.bb +++ b/recipes/openmoko-panel-plugins/openmoko-panel-gps_svn.bb @@ -1,5 +1,6 @@ DESCRIPTION = "Shows the GPS status in the Openmoko panel" DEPENDS = "gpsd" +SRCREV = "4330" PV = "0.1.0+svnr${SRCPV}" inherit openmoko-panel-plugin diff --git a/recipes/openmoko-panel-plugins/openmoko-panel-gsm_svn.bb b/recipes/openmoko-panel-plugins/openmoko-panel-gsm_svn.bb index 00529ea360..1ce27a6a1f 100644 --- a/recipes/openmoko-panel-plugins/openmoko-panel-gsm_svn.bb +++ b/recipes/openmoko-panel-plugins/openmoko-panel-gsm_svn.bb @@ -1,5 +1,6 @@ DESCRIPTION = "Shows the GSM / GPRS status in the Openmoko panel" DEPENDS = "libmokogsmd2 libnotify" +SRCREV = "4335" PV = "0.1.0+svnr${SRCPV}" PR = "r2" diff --git a/recipes/openmoko-panel-plugins/openmoko-panel-mainmenu_svn.bb b/recipes/openmoko-panel-plugins/openmoko-panel-mainmenu_svn.bb index 7c0659ef51..ebc041640b 100644 --- a/recipes/openmoko-panel-plugins/openmoko-panel-mainmenu_svn.bb +++ b/recipes/openmoko-panel-plugins/openmoko-panel-mainmenu_svn.bb @@ -1,5 +1,6 @@ DESCRIPTION = "Main menu applet for the Openmoko panel" DEPENDS += "pulseaudio startup-notification" +SRCREV = "2567" PV = "0.1.0+svnr${SRCPV}" PR = "r1" diff --git a/recipes/openmoko-panel-plugins/openmoko-panel-memory_svn.bb b/recipes/openmoko-panel-plugins/openmoko-panel-memory_svn.bb index 0f0ca828d2..413f14e31e 100644 --- a/recipes/openmoko-panel-plugins/openmoko-panel-memory_svn.bb +++ b/recipes/openmoko-panel-plugins/openmoko-panel-memory_svn.bb @@ -1,6 +1,7 @@ DESCRIPTION = "Shows an out-of-memory warning in the Openmoko panel" DEPENDS = "libnotify" RDEPENDS = "openmoko-dialer2" +SRCREV = "3903" PV = "0.0.0+svnr${SRCPV}" PR = "r0" diff --git a/recipes/openmoko-panel-plugins/openmoko-panel-usb_svn.bb b/recipes/openmoko-panel-plugins/openmoko-panel-usb_svn.bb index 6af1b8c3f9..272df4c644 100644 --- a/recipes/openmoko-panel-plugins/openmoko-panel-usb_svn.bb +++ b/recipes/openmoko-panel-plugins/openmoko-panel-usb_svn.bb @@ -1,4 +1,5 @@ DESCRIPTION = "USB applet for the Openmoko panel" +SRCREV = "3360" PV = "0.1.0+svnr${SRCPV}" inherit openmoko-panel-plugin diff --git a/recipes/openmoko-panel-plugins/openmoko-panel-wifi_svn.bb b/recipes/openmoko-panel-plugins/openmoko-panel-wifi_svn.bb index 4b8000adb0..ae8a6977ea 100644 --- a/recipes/openmoko-panel-plugins/openmoko-panel-wifi_svn.bb +++ b/recipes/openmoko-panel-plugins/openmoko-panel-wifi_svn.bb @@ -1,5 +1,6 @@ DESCRIPTION = "Shows the wifi status in the Openmoko panel" DEPENDS = "libmokopanelui2" +SRCREV = "4344" PV = "0.0.0+svnr${SRCPV}" inherit openmoko-panel-plugin diff --git a/recipes/openmoko-projects/assassin-thumbnail.bb b/recipes/openmoko-projects/assassin-thumbnail.bb deleted file mode 100644 index 2e9afeb2d6..0000000000 --- a/recipes/openmoko-projects/assassin-thumbnail.bb +++ /dev/null @@ -1,18 +0,0 @@ -DESCRIPTION = "Assassin Packages Thumbnails" -HOMEPAGE = "http://assassin.projects.openmoko.org/" -LICENSE = "GPL" -RDEPENDS = "assassin" -PV = "0.1+svnr${SRCPV}" -PR = "r1" - -SRC_URI = "svn://svn.openmoko.org/trunk/src/target/thumbnails/;module=result;proto=https" - -do_install() { - install -d ${D}${THUMBNAIL_DIR} - cp -f ${WORKDIR}/result/${THUMBNAIL_FN} ${D}${THUMBNAIL_DIR} -} - -FILES_${PN} = "${THUMBNAIL_DIR}/${THUMBNAIL_FN}" - -THUMBNAIL_DIR = "${datadir}/assassin/" -THUMBNAIL_FN = "thumbnail.eet" diff --git a/recipes/openmoko-projects/assassin-thumbnail_svn.bb b/recipes/openmoko-projects/assassin-thumbnail_svn.bb new file mode 100644 index 0000000000..ccf55799c3 --- /dev/null +++ b/recipes/openmoko-projects/assassin-thumbnail_svn.bb @@ -0,0 +1,19 @@ +DESCRIPTION = "Assassin Packages Thumbnails" +HOMEPAGE = "http://assassin.projects.openmoko.org/" +LICENSE = "GPL" +RDEPENDS = "assassin" +SRCREV = "4690" +PV = "0.1+svnr${SRCPV}" +PR = "r1" + +SRC_URI = "svn://svn.openmoko.org/trunk/src/target/thumbnails/;module=result;proto=https" + +do_install() { + install -d ${D}${THUMBNAIL_DIR} + cp -f ${WORKDIR}/result/${THUMBNAIL_FN} ${D}${THUMBNAIL_DIR} +} + +FILES_${PN} = "${THUMBNAIL_DIR}/${THUMBNAIL_FN}" + +THUMBNAIL_DIR = "${datadir}/assassin/" +THUMBNAIL_FN = "thumbnail.eet" diff --git a/recipes/openmoko-projects/assassin_svn.bb b/recipes/openmoko-projects/assassin_svn.bb index 505a1dacb9..96189dc152 100644 --- a/recipes/openmoko-projects/assassin_svn.bb +++ b/recipes/openmoko-projects/assassin_svn.bb @@ -3,6 +3,7 @@ HOMEPAGE = "http://assassin.projects.openmoko.org/" LICENSE = "GPL" DEPENDS = "dbus (>= 1.1.1) glib-2.0 e-wm packagekit etk edbus eet" RDEPENDS = "etk-theme-ninja" +SRCREV = "268" PV = "0.2+svnr${SRCPV}" PR = "r6.04" diff --git a/recipes/openmoko-projects/diversity-daemon_svn.bb b/recipes/openmoko-projects/diversity-daemon_svn.bb index d78bde23a0..286e475639 100644 --- a/recipes/openmoko-projects/diversity-daemon_svn.bb +++ b/recipes/openmoko-projects/diversity-daemon_svn.bb @@ -4,6 +4,7 @@ SECTION = "network/misc" LICENSE = "GPL" DEPENDS = "glib-2.0 dbus dbus-glib eds-dbus libjana curl" RDEPENDS_${PN} = "eds-dbus" +SRCREV = "571" PV = "0.0+svnr${SRCPV}" PR = "r3" diff --git a/recipes/openmoko-projects/diversity-radar_svn.bb b/recipes/openmoko-projects/diversity-radar_svn.bb index 2a334a5021..e7edb1ac42 100644 --- a/recipes/openmoko-projects/diversity-radar_svn.bb +++ b/recipes/openmoko-projects/diversity-radar_svn.bb @@ -4,6 +4,7 @@ SECTION = "openmoko/applications" LICENSE = "GPL" DEPENDS = "python-evas python-edje python-ecore python-edbus python-dbus python-etk" RDEPENDS_${PN} = "diversity-daemon" +SRCREV = "453" PV = "0.0.4+svnr${SRCPV}" PR = "r0.02" diff --git a/recipes/openmoko-projects/enlazar_svn.bb b/recipes/openmoko-projects/enlazar_svn.bb index 925f6d98d5..1c16d531e5 100644 --- a/recipes/openmoko-projects/enlazar_svn.bb +++ b/recipes/openmoko-projects/enlazar_svn.bb @@ -3,6 +3,7 @@ HOMEPAGE = "http://enlazar.projects.openmoko.org/" LICENSE = "GPL" DEPENDS = "evas edje ecore edbus" RDEPENDS = "networkmanager" +SRCREV = "37" PV = "0.1+svnr${SRCPV}" PR = "r4" PE = "2" diff --git a/recipes/openmoko-projects/etk-theme-ninja_svn.bb b/recipes/openmoko-projects/etk-theme-ninja_svn.bb index 38468f5457..24c2ddf42f 100644 --- a/recipes/openmoko-projects/etk-theme-ninja_svn.bb +++ b/recipes/openmoko-projects/etk-theme-ninja_svn.bb @@ -3,6 +3,7 @@ HOMEPAGE = "http://ninja.projects.openmoko.org/" SECTION = "openmoko/misc" LICENSE = "GPL" DEPENDS = "edje" +SRCREV = "5" PV = "0.0.1+svnr${SRCPV}" PR = "r1" SRC_URI = "svn://svn.projects.openmoko.org/svnroot/ninja;module=trunk;proto=http" diff --git a/recipes/openmoko-projects/illume-theme-asu_svn.bb b/recipes/openmoko-projects/illume-theme-asu_svn.bb index bc4a649c0f..1798b80221 100644 --- a/recipes/openmoko-projects/illume-theme-asu_svn.bb +++ b/recipes/openmoko-projects/illume-theme-asu_svn.bb @@ -4,6 +4,7 @@ LICENSE = "MIT/BSD" DEPENDS = "edje-native eet-native" RPROVIDES_${PN} = "illume-theme" RCONFLICTS = "illume-config" +SRCREV = "4881" PV = "0.0+svnr${SRCPV}" PR = "r9" diff --git a/recipes/openmoko-projects/om-settings_svn.bb b/recipes/openmoko-projects/om-settings_svn.bb index 19ff7cf830..13132c6bd1 100644 --- a/recipes/openmoko-projects/om-settings_svn.bb +++ b/recipes/openmoko-projects/om-settings_svn.bb @@ -1,6 +1,7 @@ DESCRIPTION = "Exposure all devices on neo1973" DEPENDS = "python-etk python-edbus" RDEPENDS = "python-etk python-re python-codecs python-edbus python-pyxdg" +SRCREV = "74" PV = "0.0.1+svnr${SRCPV}" PR = "r3" PE = "1" diff --git a/recipes/openmoko-projects/openmoko-agpsui_svn.bb b/recipes/openmoko-projects/openmoko-agpsui_svn.bb index b341d1b544..043a0dea69 100644 --- a/recipes/openmoko-projects/openmoko-agpsui_svn.bb +++ b/recipes/openmoko-projects/openmoko-agpsui_svn.bb @@ -3,6 +3,7 @@ HOMEPAGE = "http://openmoko-agpsui.projects.openmoko.org/" SECTION = "openmoko/apps" LICENSE = "GPL" DEPENDS = "gtk+" +SRCREV = "7" PV = "0.1+svnr${SRCPV}" PR = "r1" diff --git a/recipes/openmoko-projects/pyefl-sudoku_svn.bb b/recipes/openmoko-projects/pyefl-sudoku_svn.bb index c22220437e..0cb9191dae 100644 --- a/recipes/openmoko-projects/pyefl-sudoku_svn.bb +++ b/recipes/openmoko-projects/pyefl-sudoku_svn.bb @@ -4,6 +4,7 @@ SECTION = "openmoko/applications" LICENSE = "GPL" DEPENDS = "python-evas python-edje python-ecore" RDEPENDS = "python-evas python-edje python-ecore" +SRCREV = "49" PV = "0.0.2+svnr${SRCPV}" PR = "r3" diff --git a/recipes/openmoko-system/ompower_svn.bb b/recipes/openmoko-system/ompower_svn.bb index 28381741c3..8ff55f8f1a 100644 --- a/recipes/openmoko-system/ompower_svn.bb +++ b/recipes/openmoko-system/ompower_svn.bb @@ -1,6 +1,7 @@ DESCRIPTION = "Openmoko Power State handling daemon via DBUS" LICENSE = "MIT BSD" DEPENDS = "ecore edbus" +SRCREV = "4727" PV = "0.0.0+svnr${SRCPV}" PR = "r4" RDEPENDS = "initscripts" diff --git a/recipes/openmoko-tools/app-restarter_svn.bb b/recipes/openmoko-tools/app-restarter_svn.bb index 9809d5f88d..2ccec3e61c 100644 --- a/recipes/openmoko-tools/app-restarter_svn.bb +++ b/recipes/openmoko-tools/app-restarter_svn.bb @@ -4,6 +4,7 @@ DEPENDS = "virtual/libx11" SRC_URI="svn://svn.openmoko.org/developers/zecke/;module=app_restarter;proto=http" S = "${WORKDIR}/app_restarter" +SRCREV = "4552" PV = "1.0+svnr${SRCPV}" PE = "2" diff --git a/recipes/openmoko-tools/openmoko-set-root-password.bb b/recipes/openmoko-tools/openmoko-set-root-password.bb deleted file mode 100644 index 7ea0de55ce..0000000000 --- a/recipes/openmoko-tools/openmoko-set-root-password.bb +++ /dev/null @@ -1,26 +0,0 @@ -DESCRIPTION = "Set a root password for your Neo." -SUMMARY = "On installation you will be prompted to set a root password. With \ -this password you can then log into the machine." -LICENSE = "GPL" -DEPENDS = "gtk+" - -SRC_URI = "svn://svn.openmoko.org/developers/zecke/;module=root-password;proto=http" -S = "${WORKDIR}/root-password" -PV = "1.0+svnr${SRCPV}" -PE = "1" -PR = "r1" - -do_compile () { - cd ${S} - oe_runmake -} - -do_install() { - install -d ${D}/${sbindir} - install -m 0755 ${S}/root-password ${D}/${sbindir}/${PN} -} - -pkg_postinst_${PN} () { - # assume we use display 0 - DISPLAY=:0 ${sbindir}/${PN} -} diff --git a/recipes/openmoko-tools/openmoko-set-root-password_svn.bb b/recipes/openmoko-tools/openmoko-set-root-password_svn.bb new file mode 100644 index 0000000000..fd5dc10484 --- /dev/null +++ b/recipes/openmoko-tools/openmoko-set-root-password_svn.bb @@ -0,0 +1,27 @@ +DESCRIPTION = "Set a root password for your Neo." +SUMMARY = "On installation you will be prompted to set a root password. With \ +this password you can then log into the machine." +LICENSE = "GPL" +DEPENDS = "gtk+" + +SRC_URI = "svn://svn.openmoko.org/developers/zecke/;module=root-password;proto=http" +S = "${WORKDIR}/root-password" +SRCREV = "4590" +PV = "1.0+svnr${SRCPV}" +PE = "1" +PR = "r1" + +do_compile () { + cd ${S} + oe_runmake +} + +do_install() { + install -d ${D}/${sbindir} + install -m 0755 ${S}/root-password ${D}/${sbindir}/${PN} +} + +pkg_postinst_${PN} () { + # assume we use display 0 + DISPLAY=:0 ${sbindir}/${PN} +} diff --git a/recipes/openmoko-tools/openmoko-toolchain-scripts_svn.bb b/recipes/openmoko-tools/openmoko-toolchain-scripts_svn.bb index 7762e61271..321a7d828f 100644 --- a/recipes/openmoko-tools/openmoko-toolchain-scripts_svn.bb +++ b/recipes/openmoko-tools/openmoko-toolchain-scripts_svn.bb @@ -1,5 +1,6 @@ DESCRIPTION = "Convenient scripts to be used with openmoko toolchain." +SRCREV = "4913" PV = "0.0+svnr${SRCPV}" PE = "1" PR = "r1" diff --git a/recipes/openmoko2/libjana_svn.bb b/recipes/openmoko2/libjana_svn.bb index a0b1b9557c..6ba17601c1 100644 --- a/recipes/openmoko2/libjana_svn.bb +++ b/recipes/openmoko2/libjana_svn.bb @@ -1,6 +1,7 @@ DESCRIPTION = "O-Hand Jana Library" DEPENDS = "libmokojournal2" DEPENDS = "gtk+ eds-dbus gconf" +SRCREV = "749" PV = "0.1.0+svnr${SRCPV}" PR = "r5" diff --git a/recipes/openmoko2/libmokogsmd2_svn.bb b/recipes/openmoko2/libmokogsmd2_svn.bb index fec4d1a3f2..f25c9a0426 100644 --- a/recipes/openmoko2/libmokogsmd2_svn.bb +++ b/recipes/openmoko2/libmokogsmd2_svn.bb @@ -1,5 +1,6 @@ SECTION = "openmoko/libs" DEPENDS = "libgsmd glib-2.0" +SRCREV = "4334" PV = "0.1.0+svnr${SRCPV}" PR = "r2" diff --git a/recipes/openmoko2/libmokojournal2_svn.bb b/recipes/openmoko2/libmokojournal2_svn.bb index 32da95bf93..91e0bda6df 100644 --- a/recipes/openmoko2/libmokojournal2_svn.bb +++ b/recipes/openmoko2/libmokojournal2_svn.bb @@ -1,5 +1,6 @@ SECTION = "openmoko/libs" DEPENDS = "eds-dbus" +SRCREV = "3473" PV = "0.1.0+svnr${SRCPV}" PR = "r2" diff --git a/recipes/openmoko2/libmokopanelui2_svn.bb b/recipes/openmoko2/libmokopanelui2_svn.bb index 21a74053d3..39ba690712 100644 --- a/recipes/openmoko2/libmokopanelui2_svn.bb +++ b/recipes/openmoko2/libmokopanelui2_svn.bb @@ -1,5 +1,6 @@ SECTION = "openmoko/libs" DEPENDS = "gtk+ matchbox-panel-2" +SRCREV = "4568" PV = "0.3.0+svnr${SRCPV}" PR = "r0" diff --git a/recipes/openmoko2/libmokoui2_svn.bb b/recipes/openmoko2/libmokoui2_svn.bb index 176f775c8b..97f7eb16f0 100644 --- a/recipes/openmoko2/libmokoui2_svn.bb +++ b/recipes/openmoko2/libmokoui2_svn.bb @@ -1,6 +1,7 @@ SECTION = "openmoko/libs" DEPENDS = "gtk+ python-pygtk" +SRCREV = "4695" PV = "0.1.0+svnr${SRCPV}" PR = "r5" diff --git a/recipes/openmoko2/moko-gtk-engine_svn.bb b/recipes/openmoko2/moko-gtk-engine_svn.bb index 0ac4864f19..72c0c2350c 100644 --- a/recipes/openmoko2/moko-gtk-engine_svn.bb +++ b/recipes/openmoko2/moko-gtk-engine_svn.bb @@ -1,5 +1,6 @@ DESCRIPTION = "Moko GTK+ theme engine" SECTION = "openmoko/libs" +SRCREV = "4734" PV = "0.1.0+svnr${SRCPV}" PR = "r0" diff --git a/recipes/openmoko2/neod_svn.bb b/recipes/openmoko2/neod_svn.bb index e57bf08068..13fd9f0df9 100644 --- a/recipes/openmoko2/neod_svn.bb +++ b/recipes/openmoko2/neod_svn.bb @@ -4,6 +4,7 @@ SECTION = "openmoko/daemons" DISTRO_APM ?= "apm" DEPENDS = "gtk+ pulseaudio apmd" RDEPENDS = "gpe-scap xrandr alsa-utils-amixer ${DISTRO_APM} dbus" +SRCREV = "4617" PV = "0.1.0+svnr${SRCPV}" PR = "r7" diff --git a/recipes/openmoko2/openmoko-alsa-scenarios.bb b/recipes/openmoko2/openmoko-alsa-scenarios.bb deleted file mode 100644 index 72edfef1d1..0000000000 --- a/recipes/openmoko2/openmoko-alsa-scenarios.bb +++ /dev/null @@ -1,24 +0,0 @@ -DESCRIPTION = "Package for the different scenarios used by Openmoko" -SECTION = "openmoko/base" -PV = "1.0+svnr${SRCPV}" -PR = "r2" - -PROVIDES = "virtual/alsa-scenarios" - -COMPATIBLE_MACHINE = "(om-gta01|om-gta02)" - -SRC_URI = "svn://svn.openmoko.org/trunk/src/target/audio/;module=om-gta01;proto=http" -SRC_URI_${MACHINE_ARCH} = "svn://svn.openmoko.org/trunk/src/target/audio/;module=${MACHINE_ARCH};proto=http" - -S = "${WORKDIR}/${MACHINE_ARCH}" - -do_install() { - install -d ${D}${datadir}/openmoko/scenarios/ - install -m 644 ${S}/*.state ${D}${datadir}/openmoko/scenarios/ - install -d ${D}${sysconfdir}/ - install -m 644 ${S}/stereoout.state ${D}${sysconfdir}/asound.state -} - -PACKAGE_ARCH_${PN} = "${MACHINE_ARCH}" - -FILES_${PN} += "${datadir}/openmoko" diff --git a/recipes/openmoko2/openmoko-alsa-scenarios_svn.bb b/recipes/openmoko2/openmoko-alsa-scenarios_svn.bb new file mode 100644 index 0000000000..315ea4d1b9 --- /dev/null +++ b/recipes/openmoko2/openmoko-alsa-scenarios_svn.bb @@ -0,0 +1,25 @@ +DESCRIPTION = "Package for the different scenarios used by Openmoko" +SECTION = "openmoko/base" +SRCREV = "4732" +PV = "1.0+svnr${SRCPV}" +PR = "r2" + +PROVIDES = "virtual/alsa-scenarios" + +COMPATIBLE_MACHINE = "(om-gta01|om-gta02)" + +SRC_URI = "svn://svn.openmoko.org/trunk/src/target/audio/;module=om-gta01;proto=http" +SRC_URI_${MACHINE_ARCH} = "svn://svn.openmoko.org/trunk/src/target/audio/;module=${MACHINE_ARCH};proto=http" + +S = "${WORKDIR}/${MACHINE_ARCH}" + +do_install() { + install -d ${D}${datadir}/openmoko/scenarios/ + install -m 644 ${S}/*.state ${D}${datadir}/openmoko/scenarios/ + install -d ${D}${sysconfdir}/ + install -m 644 ${S}/stereoout.state ${D}${sysconfdir}/asound.state +} + +PACKAGE_ARCH_${PN} = "${MACHINE_ARCH}" + +FILES_${PN} += "${datadir}/openmoko" diff --git a/recipes/openmoko2/openmoko-appearance_svn.bb b/recipes/openmoko2/openmoko-appearance_svn.bb index e277839f0a..850305b091 100644 --- a/recipes/openmoko2/openmoko-appearance_svn.bb +++ b/recipes/openmoko2/openmoko-appearance_svn.bb @@ -2,6 +2,7 @@ DESCRIPTION = "The Openmoko Appearance Editor" SECTION = "openmoko/pim" DEPENDS = "libmokoui2 gconf gtk+" RDEPENDS = "libedata-cal openmoko-today2-folders" +SRCREV = "3262" PV = "0.1.0+svnr${SRCPV}" PR = "r0" diff --git a/recipes/openmoko2/openmoko-appmanager2_svn.bb b/recipes/openmoko2/openmoko-appmanager2_svn.bb index 6ea79a2476..86d00adee6 100644 --- a/recipes/openmoko2/openmoko-appmanager2_svn.bb +++ b/recipes/openmoko2/openmoko-appmanager2_svn.bb @@ -1,6 +1,7 @@ DESCRIPTION = "The Openmoko Application Manager" SECTION = "openmoko/applications" DEPENDS = "libmokoui2 libmokojournal2 startup-notification dbus-glib libice libsm opkg" +SRCREV = "4530" PV = "0.1.0+svnr${SRCPV}" PR = "r2" diff --git a/recipes/openmoko2/openmoko-browser2_svn.bb b/recipes/openmoko2/openmoko-browser2_svn.bb index c1085a0167..6a0f5987d5 100644 --- a/recipes/openmoko2/openmoko-browser2_svn.bb +++ b/recipes/openmoko2/openmoko-browser2_svn.bb @@ -1,6 +1,7 @@ DESCRIPTION = "Om Webbrowser using webkit." SECTION = "openmoko/apps" DEPENDS += "intltool libmokoui2 check webkit-gtk" +SRCREV = "4172" PV = "0.0.1+svnr${SRCPV}" PR = "r2" diff --git a/recipes/openmoko2/openmoko-calculator2_svn.bb b/recipes/openmoko2/openmoko-calculator2_svn.bb index 1719ac5138..f52bbe337c 100644 --- a/recipes/openmoko2/openmoko-calculator2_svn.bb +++ b/recipes/openmoko2/openmoko-calculator2_svn.bb @@ -1,6 +1,7 @@ DESCRIPTION = "Legacy Om calculator application." SECTION = "openmoko/tools" DEPENDS = "libmokoui2" +SRCREV = "3655" PV = "0.1.0+svnr${SRCPV}" PR = "r1" diff --git a/recipes/openmoko2/openmoko-common2_svn.bb b/recipes/openmoko2/openmoko-common2_svn.bb index 63ec9825ad..5558e4f0a7 100644 --- a/recipes/openmoko2/openmoko-common2_svn.bb +++ b/recipes/openmoko2/openmoko-common2_svn.bb @@ -1,5 +1,6 @@ DESCRIPTION = "Common files for the Openmoko framework" SECTION = "openmoko/base" +SRCREV = "3259" PV = "0.1.0+svnr${SRCPV}" PR = "r0" diff --git a/recipes/openmoko2/openmoko-contacts2_svn.bb b/recipes/openmoko2/openmoko-contacts2_svn.bb index 407b59b5c2..82d3d85436 100644 --- a/recipes/openmoko2/openmoko-contacts2_svn.bb +++ b/recipes/openmoko2/openmoko-contacts2_svn.bb @@ -2,6 +2,7 @@ DESCRIPTION = "Legacy Om address book application." SECTION = "openmoko/pim" DEPENDS = "libmokoui2 libmokojournal2 dbus-glib" RDEPENDS = "libedata-book" +SRCREV = "419" PV = "0.1.0+svnr${SRCPV}" PR = "r6" diff --git a/recipes/openmoko2/openmoko-dates2_svn.bb b/recipes/openmoko2/openmoko-dates2_svn.bb index 5953460a9c..6f6ce93483 100644 --- a/recipes/openmoko2/openmoko-dates2_svn.bb +++ b/recipes/openmoko2/openmoko-dates2_svn.bb @@ -2,6 +2,7 @@ DESCRIPTION = "Legacy Om calendar application." SECTION = "openmoko/pim" DEPENDS = "libmokoui2 libmokojournal2 gtk+ libglade eds-dbus libjana" RDEPENDS = "libedata-cal" +SRCREV = "703" PV = "0.1.0+svnr${SRCPV}" PR = "r3" diff --git a/recipes/openmoko2/openmoko-dialer2_svn.bb b/recipes/openmoko2/openmoko-dialer2_svn.bb index 3aad78e2ef..49712a7f7c 100644 --- a/recipes/openmoko2/openmoko-dialer2_svn.bb +++ b/recipes/openmoko2/openmoko-dialer2_svn.bb @@ -1,6 +1,7 @@ DESCRIPTION = "Legacy Om dialer." SECTION = "openmoko/pim" DEPENDS = "libgsmd libjana libmokoui2 libmokojournal2 pulseaudio libnotify" +SRCREV = "4364" PV = "0.1.0+svnr${SRCPV}" PR = "r9" PE = "1" diff --git a/recipes/openmoko2/openmoko-feedreader2_svn.bb b/recipes/openmoko2/openmoko-feedreader2_svn.bb index 23ada3d255..550832ea14 100644 --- a/recipes/openmoko2/openmoko-feedreader2_svn.bb +++ b/recipes/openmoko2/openmoko-feedreader2_svn.bb @@ -1,6 +1,7 @@ DESCRIPTION = "The Openmoko Feed Reader" SECTION = "openmoko/apps" DEPENDS += "libmokoui2 libmrss check webkit-gtk" +SRCREV = "3645" PV = "0.0.1+svnr${SRCPV}" PR = "r1" diff --git a/recipes/openmoko2/openmoko-firststart2_svn.bb b/recipes/openmoko2/openmoko-firststart2_svn.bb index a00bd9ed13..68c211070c 100644 --- a/recipes/openmoko2/openmoko-firststart2_svn.bb +++ b/recipes/openmoko2/openmoko-firststart2_svn.bb @@ -1,6 +1,7 @@ DESCRIPTION = "The Openmoko First Start Wizard" SECTION = "openmoko/apps" DEPENDS += "libmokoui2 libglade" +SRCREV = "3158" PV = "0.1.0+svnr${SRCPV}" PR = "r0" diff --git a/recipes/openmoko2/openmoko-icon-theme-standard2-qvga_svn.bb b/recipes/openmoko2/openmoko-icon-theme-standard2-qvga_svn.bb index 1f75ce905b..4f37324252 100644 --- a/recipes/openmoko2/openmoko-icon-theme-standard2-qvga_svn.bb +++ b/recipes/openmoko2/openmoko-icon-theme-standard2-qvga_svn.bb @@ -1,6 +1,7 @@ DESCRIPTION = "Standard Gtk+ icon theme for the Openmoko framework, QVGA edition" SECTION = "openmoko/base" DEPENDS = "imagemagick-native librsvg-native" +SRCREV = "4232" PV = "0.1.0+svnr${SRCPV}" PR = "r2" diff --git a/recipes/openmoko2/openmoko-icon-theme-standard2_svn.bb b/recipes/openmoko2/openmoko-icon-theme-standard2_svn.bb index 1066474278..c1844455b0 100644 --- a/recipes/openmoko2/openmoko-icon-theme-standard2_svn.bb +++ b/recipes/openmoko2/openmoko-icon-theme-standard2_svn.bb @@ -3,6 +3,7 @@ HOMEPAGE = "http://www.openmoko.org" SECTION = "openmoko/base" LICENSE = "GPL" +SRCREV = "4232" PV = "0.1.0+svnr${SRCPV}" PR = "r3" diff --git a/recipes/openmoko2/openmoko-mediaplayer2_svn.bb b/recipes/openmoko2/openmoko-mediaplayer2_svn.bb index fa81c1c446..2fabcc926a 100644 --- a/recipes/openmoko2/openmoko-mediaplayer2_svn.bb +++ b/recipes/openmoko2/openmoko-mediaplayer2_svn.bb @@ -2,6 +2,7 @@ DESCRIPTION = "Om application for playing media files." SECTION = "openmoko/tools" DEPENDS = "libmokoui2 expat gstreamer libspiff curl" RDEPENDS = "gst-meta-audio gconf gst-plugin-alsa" +SRCREV = "4750" PV = "0.1.0+svnr${SRCPV}" PR = "r6" diff --git a/recipes/openmoko2/openmoko-messages2_svn.bb b/recipes/openmoko2/openmoko-messages2_svn.bb index b996b88648..81a0d8ddf9 100644 --- a/recipes/openmoko2/openmoko-messages2_svn.bb +++ b/recipes/openmoko2/openmoko-messages2_svn.bb @@ -1,6 +1,7 @@ DESCRIPTION = "Legacy Om application for sms." SECTION = "openmoko/pim" DEPENDS = "libmokogsmd2 libmokoui2 libmokojournal2 libjana" +SRCREV = "4340" PV = "0.1.0+svnr${SRCPV}" PR = "r2" diff --git a/recipes/openmoko2/openmoko-sample2_svn.bb b/recipes/openmoko2/openmoko-sample2_svn.bb index e2104fd086..d5eb61de58 100644 --- a/recipes/openmoko2/openmoko-sample2_svn.bb +++ b/recipes/openmoko2/openmoko-sample2_svn.bb @@ -1,6 +1,7 @@ DESCRIPTION = "The Openmoko Sample Project" SECTION = "openmoko/applications" DEPENDS = "libmokoui2 intltool gconf" +SRCREV = "3537" PV = "0.0.1+svnr${SRCPV}" PR = "r0" diff --git a/recipes/openmoko2/openmoko-sound-theme-standard2_svn.bb b/recipes/openmoko2/openmoko-sound-theme-standard2_svn.bb index 4a3d8c600f..01385f56fe 100644 --- a/recipes/openmoko2/openmoko-sound-theme-standard2_svn.bb +++ b/recipes/openmoko2/openmoko-sound-theme-standard2_svn.bb @@ -2,6 +2,7 @@ DESCRIPTION = "Standard sound theme for the Openmoko framework" SECTION = "openmoko/base" RREPLACES = "openmoko-sound-theme-standard" RPROVIDES = "openmoko-sound-theme-standard" +SRCREV = "4271" PV = "0.1+svnr${SRCPV}" PR = "r3" diff --git a/recipes/openmoko2/openmoko-tasks2_svn.bb b/recipes/openmoko2/openmoko-tasks2_svn.bb index 0ad5b601e7..934c8d88bd 100644 --- a/recipes/openmoko2/openmoko-tasks2_svn.bb +++ b/recipes/openmoko2/openmoko-tasks2_svn.bb @@ -2,6 +2,7 @@ DESCRIPTION = "The Openmoko Agenda" SECTION = "openmoko/pim" DEPENDS = "dbus-glib eds-dbus libmokoui2" RDEPENDS = "libedata-cal" +SRCREV = "404" PV = "0.1.0+svnr${SRCPV}" PR = "r1" diff --git a/recipes/openmoko2/openmoko-theme-standard2-qvga_svn.bb b/recipes/openmoko2/openmoko-theme-standard2-qvga_svn.bb index 39ced428ea..a85ad61a3f 100644 --- a/recipes/openmoko2/openmoko-theme-standard2-qvga_svn.bb +++ b/recipes/openmoko2/openmoko-theme-standard2-qvga_svn.bb @@ -2,6 +2,7 @@ DESCRIPTION = "Standard Gtk+ theme for the Openmoko framework, QVGA edition" SECTION = "openmoko/base" RCONFLICTS = "openmoko-theme-standard" RPROVIDES = "openmoko-theme-standard-2" +SRCREV = "3425" PV = "0.1.1+svnr${SRCPV}" PR = "r1" diff --git a/recipes/openmoko2/openmoko-theme-standard2_svn.bb b/recipes/openmoko2/openmoko-theme-standard2_svn.bb index 091391474d..cc73cc5934 100644 --- a/recipes/openmoko2/openmoko-theme-standard2_svn.bb +++ b/recipes/openmoko2/openmoko-theme-standard2_svn.bb @@ -1,6 +1,7 @@ DESCRIPTION = "Standard Gtk+ theme for the Openmoko framework" SECTION = "openmoko/base" RCONFLICTS = "openmoko-theme-standard" +SRCREV = "4338" PV = "0.1.1+svnr${SRCPV}" PR = "r5" diff --git a/recipes/openmoko2/openmoko-today2-folders_svn.bb b/recipes/openmoko2/openmoko-today2-folders_svn.bb index 3137012a97..d2badfb560 100644 --- a/recipes/openmoko2/openmoko-today2-folders_svn.bb +++ b/recipes/openmoko2/openmoko-today2-folders_svn.bb @@ -1,5 +1,6 @@ DESCRIPTION = "The Openmoko Today2 vfolder files" SECTION = "openmoko/misc" +SRCREV = "3704" PV = "0.1.0+svnr${SRCPV}" PR = "r3" RCONFLICTS_${PN} = "matchbox-common" diff --git a/recipes/openmoko2/openmoko-today2_svn.bb b/recipes/openmoko2/openmoko-today2_svn.bb index 3466659540..2ff5b90e3c 100644 --- a/recipes/openmoko2/openmoko-today2_svn.bb +++ b/recipes/openmoko2/openmoko-today2_svn.bb @@ -2,6 +2,7 @@ DESCRIPTION = "The Openmoko Application Launcher" SECTION = "openmoko/pim" DEPENDS = "libmokoui2 libmokojournal2 libjana startup-notification dbus-glib libice libsm" RDEPENDS = "libedata-cal openmoko-today2-folders" +SRCREV = "4168" PV = "0.1.0+svnr${SRCPV}" PR = "r2" diff --git a/recipes/openmoko2/openmoko-worldclock2_svn.bb b/recipes/openmoko2/openmoko-worldclock2_svn.bb index 186dce72fa..fad55a97c4 100644 --- a/recipes/openmoko2/openmoko-worldclock2_svn.bb +++ b/recipes/openmoko2/openmoko-worldclock2_svn.bb @@ -1,6 +1,7 @@ DESCRIPTION = "A World-Clock for Openmoko" SECTION = "openmoko/tools" DEPENDS = "libmokoui2 libjana" +SRCREV = "3365" PV = "0.1.0+svnr${SRCPV}" inherit openmoko2 diff --git a/recipes/remoko/remoko-server_svn.bb b/recipes/remoko/remoko-server_svn.bb index 1e17a9ec40..13ee0824ae 100644 --- a/recipes/remoko/remoko-server_svn.bb +++ b/recipes/remoko/remoko-server_svn.bb @@ -3,6 +3,7 @@ HOMEPAGE = "http://code.google.com/p/remoko/" AUTHOR = "Valério Valério" LICENSE = "GPL" SECTION = "console/network" +SRCREV = "121" PV = "0.2.1+svnr${SRCPV}" PE = "1" diff --git a/recipes/remoko/remoko_svn.bb b/recipes/remoko/remoko_svn.bb index 8d209daf14..8a70a9bd41 100644 --- a/recipes/remoko/remoko_svn.bb +++ b/recipes/remoko/remoko_svn.bb @@ -4,6 +4,7 @@ AUTHOR = "Valério Valério" LICENSE = "GPL" SECTION = "console/network" DEPENDS = "edje-native" +SRCREV = "121" PV = "0.3.2+svnr${SRCPV}" PE = "1" diff --git a/recipes/samsung-soc-utils/s3c24xx-gpio_svn.bb b/recipes/samsung-soc-utils/s3c24xx-gpio_svn.bb index 10ebf6b431..b813f76b16 100644 --- a/recipes/samsung-soc-utils/s3c24xx-gpio_svn.bb +++ b/recipes/samsung-soc-utils/s3c24xx-gpio_svn.bb @@ -2,6 +2,7 @@ DESCRIPTION = "A user-space tool to show and modify the state of GPIOs on the S3 SECTION = "console/utils" AUTHOR = "Werner Almesberger " LICENSE = "GPL" +SRCREV = "4949" PV = "1.0+svnr${SRCPV}" PR = "r2" diff --git a/recipes/samsung-soc-utils/s3c64xx-gpio_svn.bb b/recipes/samsung-soc-utils/s3c64xx-gpio_svn.bb index 473626fcdc..f8ca7947f3 100644 --- a/recipes/samsung-soc-utils/s3c64xx-gpio_svn.bb +++ b/recipes/samsung-soc-utils/s3c64xx-gpio_svn.bb @@ -2,6 +2,7 @@ DESCRIPTION = "A user-space tool to show and modify the state of GPIOs on the S3 SECTION = "console/utils" AUTHOR = "Werner Almesberger " LICENSE = "GPL" +SRCREV = "4949" PV = "1.0+svnr${SRCPV}" PR = "r0" diff --git a/recipes/samsung-soc-utils/sjf2410-linux-native_svn.bb b/recipes/samsung-soc-utils/sjf2410-linux-native_svn.bb index f6584109c6..2554ef2833 100644 --- a/recipes/samsung-soc-utils/sjf2410-linux-native_svn.bb +++ b/recipes/samsung-soc-utils/sjf2410-linux-native_svn.bb @@ -2,6 +2,7 @@ DESCRIPTION = "JTAG utility to interface w/ a S3C2410 device" SECTION = "devel" AUTHOR = "Harald Welte " LICENSE = "GPL" +SRCREV = "4268" PV = "0.1+svnr${SRCPV}" PR = "r0" diff --git a/recipes/shr/shr-launcher_svn.bb b/recipes/shr/shr-launcher_svn.bb index 3b72752daf..e8e260fa91 100644 --- a/recipes/shr/shr-launcher_svn.bb +++ b/recipes/shr/shr-launcher_svn.bb @@ -4,7 +4,7 @@ AUTHOR = "cchandel" LICENSE = "GPLv2" SECTION = "e/apps" DEPENDS = "elementary eina edbus" - +SRCREV = "103" PV = "0.0.1+svnr${SRCPV}" PR = "r5" diff --git a/recipes/wmiconfig/wmiconfig_svn.bb b/recipes/wmiconfig/wmiconfig_svn.bb index e1138adc4e..4b29b6622d 100644 --- a/recipes/wmiconfig/wmiconfig_svn.bb +++ b/recipes/wmiconfig/wmiconfig_svn.bb @@ -1,6 +1,7 @@ DESCRIPTION = "Atheros 6K Wifi configuration utility" LICENSE = "GPL" SECTION = "console/network" +SRCREV = "5394" PV = "0.0.0+svnr${SRCPV}" PR = "r1" -- cgit v1.2.3 From 60314be80a9f53adcba8840b12f667c66df42992 Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Wed, 17 Mar 2010 10:59:55 +0000 Subject: linux-omap-zoomsync_2.6.32.bb : update to the latest zoomsync kernel This is the version ti integration tree is using, updated the defconfig to include the wifi driver and UVC devices. --- .../linux-omap-zoomsync-2.6.32/omapzoom2/defconfig | 163 ++++++++++++++++----- recipes/linux/linux-omap-zoomsync_2.6.32.bb | 12 +- 2 files changed, 129 insertions(+), 46 deletions(-) diff --git a/recipes/linux/linux-omap-zoomsync-2.6.32/omapzoom2/defconfig b/recipes/linux/linux-omap-zoomsync-2.6.32/omapzoom2/defconfig index f3edfd905a..45ecc7a96e 100644 --- a/recipes/linux/linux-omap-zoomsync-2.6.32/omapzoom2/defconfig +++ b/recipes/linux/linux-omap-zoomsync-2.6.32/omapzoom2/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.32-rc7 -# Fri Jan 8 12:29:00 2010 +# Linux kernel version: 2.6.32.7 +# Wed Mar 17 10:33:20 2010 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -49,6 +49,7 @@ CONFIG_TASK_IO_ACCOUNTING=y # CONFIG_TREE_RCU=y # CONFIG_TREE_PREEMPT_RCU is not set +# CONFIG_TINY_RCU is not set # CONFIG_RCU_TRACE is not set CONFIG_RCU_FANOUT=32 # CONFIG_RCU_FANOUT_EXACT is not set @@ -123,21 +124,48 @@ CONFIG_MODVERSIONS=y CONFIG_MODULE_SRCVERSION_ALL=y CONFIG_BLOCK=y CONFIG_LBDAF=y -# CONFIG_BLK_DEV_BSG is not set +CONFIG_BLK_DEV_BSG=y # CONFIG_BLK_DEV_INTEGRITY 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_CFQ=y # CONFIG_DEFAULT_NOOP is not set -CONFIG_DEFAULT_IOSCHED="anticipatory" +CONFIG_DEFAULT_IOSCHED="cfq" +# CONFIG_INLINE_SPIN_TRYLOCK is not set +# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set +# CONFIG_INLINE_SPIN_LOCK is not set +# CONFIG_INLINE_SPIN_LOCK_BH is not set +# CONFIG_INLINE_SPIN_LOCK_IRQ is not set +# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set +CONFIG_INLINE_SPIN_UNLOCK=y +# CONFIG_INLINE_SPIN_UNLOCK_BH is not set +CONFIG_INLINE_SPIN_UNLOCK_IRQ=y +# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set +# CONFIG_INLINE_READ_TRYLOCK is not set +# CONFIG_INLINE_READ_LOCK is not set +# CONFIG_INLINE_READ_LOCK_BH is not set +# CONFIG_INLINE_READ_LOCK_IRQ is not set +# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set +CONFIG_INLINE_READ_UNLOCK=y +# CONFIG_INLINE_READ_UNLOCK_BH is not set +CONFIG_INLINE_READ_UNLOCK_IRQ=y +# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set +# CONFIG_INLINE_WRITE_TRYLOCK is not set +# CONFIG_INLINE_WRITE_LOCK is not set +# CONFIG_INLINE_WRITE_LOCK_BH is not set +# CONFIG_INLINE_WRITE_LOCK_IRQ is not set +# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set +CONFIG_INLINE_WRITE_UNLOCK=y +# CONFIG_INLINE_WRITE_UNLOCK_BH is not set +CONFIG_INLINE_WRITE_UNLOCK_IRQ=y +# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set +# CONFIG_MUTEX_SPIN_ON_OWNER is not set CONFIG_FREEZER=y # @@ -166,6 +194,7 @@ CONFIG_MMU=y # CONFIG_ARCH_IXP2000 is not set # CONFIG_ARCH_IXP4XX is not set # CONFIG_ARCH_L7200 is not set +# CONFIG_ARCH_DOVE is not set # CONFIG_ARCH_KIRKWOOD is not set # CONFIG_ARCH_LOKI is not set # CONFIG_ARCH_MV78XX0 is not set @@ -188,6 +217,7 @@ CONFIG_MMU=y # CONFIG_ARCH_DAVINCI is not set CONFIG_ARCH_OMAP=y # CONFIG_ARCH_BCMRING is not set +# CONFIG_ARCH_U8500 is not set # # TI OMAP Implementations @@ -201,20 +231,21 @@ CONFIG_ARCH_OMAP3=y # # OMAP Feature Selections # -# CONFIG_OMAP_DEBUG_POWERDOMAIN is not set -# CONFIG_OMAP_DEBUG_CLOCKDOMAIN is not set # CONFIG_OMAP_SMARTREFLEX is not set +# CONFIG_TWL5030_GLITCH_FIX is not set +CONFIG_OMAP_VOLT_VPFORCEUPDATE=y +# CONFIG_OMAP_VOLT_VCBYPASS is not set # CONFIG_OMAP_RESET_CLOCKS is not set CONFIG_OMAP_MUX=y CONFIG_OMAP_MUX_DEBUG=y CONFIG_OMAP_MUX_WARNINGS=y CONFIG_OMAP_MCBSP=y -# CONFIG_OMAP_MBOX_FWK is not set +CONFIG_OMAP_MBOX_FWK=y CONFIG_OMAP_IOMMU=y # CONFIG_OMAP_MPU_TIMER is not set CONFIG_OMAP_32K_TIMER=y -# CONFIG_OMAP3_DEBOBS is not set # CONFIG_OMAP3_L2_AUX_SECURE_SAVE_RESTORE is not set +# CONFIG_OMAP3_DEBOBS is not set CONFIG_OMAP_32K_TIMER_HZ=128 CONFIG_OMAP_DM_TIMER=y # CONFIG_OMAP_LL_DEBUG_UART1 is not set @@ -222,10 +253,11 @@ CONFIG_OMAP_DM_TIMER=y # CONFIG_OMAP_LL_DEBUG_UART3 is not set CONFIG_OMAP_LL_DEBUG_NONE=y # CONFIG_OMAP_PM_NONE is not set -CONFIG_OMAP_PM_NOOP=y -# CONFIG_OMAP_PM_SRF is not set +# CONFIG_OMAP_PM_NOOP is not set +CONFIG_OMAP_PM_SRF=y CONFIG_ARCH_OMAP34XX=y CONFIG_ARCH_OMAP3430=y +CONFIG_OMAP_PACKAGE_CBB=y # # OMAP Board Type @@ -234,18 +266,22 @@ CONFIG_ARCH_OMAP3430=y # CONFIG_MACH_OMAP_LDP is not set # CONFIG_MACH_OVERO is not set # CONFIG_MACH_OMAP3EVM is not set -# CONFIG_WLAN_1273 is not set +CONFIG_WLAN_1273=y # CONFIG_MACH_OMAP3517EVM is not set # CONFIG_MACH_OMAP3_PANDORA is not set +# CONFIG_MACH_OMAP3_TOUCHBOOK is not set # CONFIG_MACH_OMAP_3430SDP is not set # CONFIG_MACH_NOKIA_RX51 is not set CONFIG_MACH_OMAP_ZOOM2=y -# CONFIG_MACH_CM_T35 is not set # CONFIG_MACH_OMAP_ZOOM3 is not set -# CONFIG_WIFI_CONTROL_FUNC is not set -# CONFIG_TIWLAN_SDIO is not set -# CONFIG_MACH_OMAP_3630SDP is not set +CONFIG_WIFI_CONTROL_FUNC=y +CONFIG_TIWLAN_SDIO=y +CONFIG_TIWLAN_MMC_CONTROLLER=3 +# CONFIG_MACH_CM_T35 is not set # CONFIG_MACH_IGEP0020 is not set +# CONFIG_MACH_OMAP_3630SDP is not set +# CONFIG_OMAP3_EMU is not set +# CONFIG_OMAP3_SDRC_AC_TIMING is not set # # Processor Type @@ -318,8 +354,6 @@ CONFIG_SPLIT_PTLOCK_CPUS=4 # CONFIG_PHYS_ADDR_T_64BIT is not set CONFIG_ZONE_DMA_FLAG=0 CONFIG_VIRT_TO_BUS=y -CONFIG_HAVE_MLOCK=y -CONFIG_HAVE_MLOCKED_PAGE_BIT=y # CONFIG_KSM is not set CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 # CONFIG_LEDS is not set @@ -465,7 +499,18 @@ CONFIG_DEFAULT_TCP_CONG="cubic" # CONFIG_IRDA is not set # CONFIG_BT is not set # CONFIG_AF_RXRPC is not set -# CONFIG_WIRELESS is not set +CONFIG_WIRELESS=y +CONFIG_WIRELESS_EXT=y +CONFIG_WEXT_CORE=y +CONFIG_WEXT_PROC=y +CONFIG_WEXT_PRIV=y +# CONFIG_CFG80211 is not set +CONFIG_WIRELESS_EXT_SYSFS=y +# CONFIG_LIB80211 is not set + +# +# CFG80211 needs to be enabled for MAC80211 +# # CONFIG_WIMAX is not set # CONFIG_RFKILL is not set # CONFIG_NET_9P is not set @@ -477,8 +522,9 @@ CONFIG_DEFAULT_TCP_CONG="cubic" # # Generic Driver Options # -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -# CONFIG_DEVTMPFS is not set +CONFIG_UEVENT_HELPER_PATH="" +CONFIG_DEVTMPFS=y +CONFIG_DEVTMPFS_MOUNT=y CONFIG_STANDALONE=y CONFIG_PREVENT_FIRMWARE_BUILD=y # CONFIG_FW_LOADER is not set @@ -560,6 +606,7 @@ CONFIG_MTD_NAND_VERIFY_WRITE=y CONFIG_MTD_NAND_OMAP2=y CONFIG_MTD_NAND_OMAP_PREFETCH=y # CONFIG_MTD_NAND_OMAP_PREFETCH_DMA is not set +# CONFIG_MTD_NAND_OMAP_PREFETCH_IRQ is not set CONFIG_MTD_NAND_IDS=y # CONFIG_MTD_NAND_DISKONCHIP is not set # CONFIG_MTD_NAND_NANDSIM is not set @@ -581,6 +628,7 @@ CONFIG_BLK_DEV=y # CONFIG_BLK_DEV_COW_COMMON is not set CONFIG_BLK_DEV_LOOP=y # CONFIG_BLK_DEV_CRYPTOLOOP is not set +# CONFIG_BLK_DEV_DRBD is not set # CONFIG_BLK_DEV_NBD is not set # CONFIG_BLK_DEV_UB is not set CONFIG_BLK_DEV_RAM=y @@ -591,9 +639,13 @@ CONFIG_BLK_DEV_RAM_SIZE=16384 # CONFIG_ATA_OVER_ETH is not set # CONFIG_MG_DISK is not set CONFIG_MISC_DEVICES=y +# CONFIG_AD525X_DPOT is not set # CONFIG_ICS932S401 is not set # CONFIG_ENCLOSURE_SERVICES is not set +CONFIG_CS5535_MFGPT_DEFAULT_IRQ=7 # CONFIG_ISL29003 is not set +# CONFIG_DS1682 is not set +# CONFIG_TI_DAC7512 is not set # CONFIG_C2PORT is not set # @@ -604,6 +656,14 @@ CONFIG_MISC_DEVICES=y # CONFIG_EEPROM_LEGACY is not set # CONFIG_EEPROM_MAX6875 is not set # CONFIG_EEPROM_93CX6 is not set +# CONFIG_IWMC3200TOP is not set + +# +# Texas Instruments shared transport line discipline +# +# CONFIG_TI_ST is not set +# CONFIG_ST_BT is not set +# CONFIG_ST_FM is not set CONFIG_HAVE_IDE=y # CONFIG_IDE is not set @@ -638,6 +698,7 @@ CONFIG_SCSI_WAIT_SCAN=m # 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 # CONFIG_SCSI_SRP_ATTRS is not set CONFIG_SCSI_LOWLEVEL=y @@ -700,8 +761,8 @@ CONFIG_SMSC911X=y CONFIG_NETDEV_1000=y CONFIG_NETDEV_10000=y CONFIG_WLAN=y -# CONFIG_WLAN_PRE80211 is not set -# CONFIG_WLAN_80211 is not set +# CONFIG_USB_ZD1201 is not set +# CONFIG_HOSTAP is not set # # Enable WiMAX (Networking options) to see the WiMAX drivers @@ -730,6 +791,7 @@ CONFIG_WLAN=y CONFIG_INPUT=y # CONFIG_INPUT_FF_MEMLESS is not set # CONFIG_INPUT_POLLDEV is not set +# CONFIG_INPUT_SPARSEKMAP is not set # # Userland interfaces @@ -766,6 +828,7 @@ CONFIG_INPUT_TOUCHSCREEN=y # CONFIG_TOUCHSCREEN_AD7879_I2C is not set # CONFIG_TOUCHSCREEN_AD7879_SPI is not set # CONFIG_TOUCHSCREEN_AD7879 is not set +# CONFIG_TOUCHSCREEN_DYNAPRO is not set # CONFIG_TOUCHSCREEN_EETI is not set # CONFIG_TOUCHSCREEN_FUJITSU is not set # CONFIG_TOUCHSCREEN_GUNZE is not set @@ -792,6 +855,7 @@ CONFIG_SERIO=y CONFIG_SERIO_SERPORT=y CONFIG_SERIO_LIBPS2=y # CONFIG_SERIO_RAW is not set +# CONFIG_SERIO_ALTERA_PS2 is not set # CONFIG_GAMEPORT is not set # @@ -869,7 +933,6 @@ CONFIG_I2C_OMAP=y # # Miscellaneous I2C Chip support # -# CONFIG_DS1682 is not set # CONFIG_SENSORS_TSL2550 is not set # CONFIG_TWL4030_MADC is not set # CONFIG_I2C_DEBUG_CORE is not set @@ -886,6 +949,7 @@ CONFIG_SPI_MASTER=y # CONFIG_SPI_BITBANG is not set # CONFIG_SPI_GPIO is not set CONFIG_SPI_OMAP24XX=y +# CONFIG_SPI_XILINX is not set # # SPI Protocol Masters @@ -982,7 +1046,7 @@ CONFIG_SSB_POSSIBLE=y # # Multifunction device drivers # -# CONFIG_MFD_CORE is not set +CONFIG_MFD_CORE=y # CONFIG_MFD_SM501 is not set # CONFIG_MFD_ASIC3 is not set # CONFIG_HTC_EGPIO is not set @@ -990,12 +1054,13 @@ CONFIG_SSB_POSSIBLE=y # CONFIG_TPS65010 is not set CONFIG_TWL4030_CORE=y # CONFIG_TWL4030_POWER is not set -# CONFIG_TWL4030_CODEC is not set +CONFIG_TWL4030_CODEC=y # CONFIG_MFD_TMIO is not set # CONFIG_MFD_T7L66XB is not set # CONFIG_MFD_TC6387XB is not set # CONFIG_MFD_TC6393XB is not set # CONFIG_PMIC_DA903X is not set +# CONFIG_PMIC_ADP5520 is not set # CONFIG_MFD_WM8400 is not set # CONFIG_MFD_WM831X is not set # CONFIG_MFD_WM8350_I2C is not set @@ -1003,6 +1068,8 @@ CONFIG_TWL4030_CORE=y # CONFIG_MFD_MC13783 is not set # CONFIG_AB3100_CORE is not set # CONFIG_EZX_PCAP is not set +# CONFIG_MFD_88PM8607 is not set +# CONFIG_AB4500_CORE is not set CONFIG_REGULATOR=y # CONFIG_REGULATOR_DEBUG is not set # CONFIG_REGULATOR_FIXED_VOLTAGE is not set @@ -1133,7 +1200,7 @@ CONFIG_VIDEO_OMAP34XX_ISP_PREVIEWER=y CONFIG_VIDEO_OMAP34XX_ISP_RESIZER=y # CONFIG_SOC_CAMERA is not set CONFIG_V4L_USB_DRIVERS=y -# CONFIG_USB_VIDEO_CLASS is not set +CONFIG_USB_VIDEO_CLASS=y CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y CONFIG_USB_GSPCA=m # CONFIG_USB_M5602 is not set @@ -1148,6 +1215,7 @@ CONFIG_USB_GSPCA=m # CONFIG_USB_GSPCA_OV519 is not set # CONFIG_USB_GSPCA_OV534 is not set # CONFIG_USB_GSPCA_PAC207 is not set +# CONFIG_USB_GSPCA_PAC7302 is not set # CONFIG_USB_GSPCA_PAC7311 is not set # CONFIG_USB_GSPCA_SN9C20X is not set # CONFIG_USB_GSPCA_SONIXB is not set @@ -1161,6 +1229,7 @@ CONFIG_USB_GSPCA=m # CONFIG_USB_GSPCA_SQ905 is not set # CONFIG_USB_GSPCA_SQ905C is not set # CONFIG_USB_GSPCA_STK014 is not set +# CONFIG_USB_GSPCA_STV0680 is not set # CONFIG_USB_GSPCA_SUNPLUS is not set # CONFIG_USB_GSPCA_T613 is not set # CONFIG_USB_GSPCA_TV8532 is not set @@ -1185,6 +1254,7 @@ CONFIG_RADIO_ADAPTERS=y # CONFIG_RADIO_SI470X is not set # CONFIG_USB_MR800 is not set # CONFIG_RADIO_TEA5764 is not set +# CONFIG_RADIO_TEF6862 is not set CONFIG_DAB=y # CONFIG_USB_DABUSB is not set @@ -1217,6 +1287,7 @@ CONFIG_FB_CFB_IMAGEBLIT=y # # CONFIG_FB_UVESA is not set # CONFIG_FB_S1D13XXX is not set +# CONFIG_FB_TMIO is not set # CONFIG_FB_VIRTUAL is not set # CONFIG_FB_METRONOME is not set # CONFIG_FB_MB862XX is not set @@ -1229,6 +1300,7 @@ CONFIG_OMAP2_VRAM_SIZE=16 CONFIG_OMAP2_DSS_DEBUG_SUPPORT=y # CONFIG_OMAP2_DSS_RFBI is not set CONFIG_OMAP2_DSS_VENC=y +CONFIG_OMAP2_DSS_HDMI=y # CONFIG_OMAP2_DSS_SDI is not set # CONFIG_OMAP2_DSS_DSI is not set # CONFIG_OMAP2_DSS_FAKE_VSYNC is not set @@ -1242,9 +1314,7 @@ CONFIG_FB_OMAP2_NUM_FBS=3 # OMAP2/3 Display Device Drivers # CONFIG_PANEL_GENERIC=y -# CONFIG_PANEL_SAMSUNG_LTE430WQ_F0C is not set # CONFIG_PANEL_SHARP_LS037V7DW01 is not set -# CONFIG_PANEL_SHARP_LQ043T1DG01 is not set CONFIG_PANEL_NEC_NL8048HL11_01B=y # CONFIG_SIL9022 is not set CONFIG_BACKLIGHT_LCD_SUPPORT=y @@ -1353,7 +1423,7 @@ CONFIG_USB_HID=y CONFIG_USB_SUPPORT=y CONFIG_USB_ARCH_HAS_HCD=y CONFIG_USB_ARCH_HAS_OHCI=y -# CONFIG_USB_ARCH_HAS_EHCI is not set +CONFIG_USB_ARCH_HAS_EHCI=y CONFIG_USB=y CONFIG_USB_DEBUG=y CONFIG_USB_ANNOUNCE_NEW_DEVICES=y @@ -1376,6 +1446,7 @@ CONFIG_USB_MON=y # USB Host Controller Drivers # # CONFIG_USB_C67X00_HCD is not set +# CONFIG_USB_EHCI_HCD is not set # CONFIG_USB_OXU210HP_HCD is not set # CONFIG_USB_ISP116X_HCD is not set # CONFIG_USB_ISP1760_HCD is not set @@ -1501,10 +1572,12 @@ CONFIG_USB_ETH_EEM=y CONFIG_USB_GADGETFS=m CONFIG_USB_FILE_STORAGE=m CONFIG_USB_FILE_STORAGE_TEST=y +# CONFIG_USB_MASS_STORAGE is not set CONFIG_USB_G_SERIAL=m CONFIG_USB_MIDI_GADGET=m CONFIG_USB_G_PRINTER=m CONFIG_USB_CDC_COMPOSITE=m +# CONFIG_USB_G_MULTI is not set # # OTG and related infrastructure @@ -1512,11 +1585,13 @@ CONFIG_USB_CDC_COMPOSITE=m CONFIG_USB_OTG_UTILS=y # CONFIG_USB_GPIO_VBUS is not set # CONFIG_ISP1301_OMAP is not set +# CONFIG_USB_ULPI is not set CONFIG_TWL4030_USB=y # CONFIG_NOP_USB_XCEIV is not set CONFIG_MMC=y # CONFIG_MMC_DEBUG is not set CONFIG_MMC_UNSAFE_RESUME=y +CONFIG_MMC_EMBEDDED_SDIO=y # # MMC/SD/SDIO Card Drivers @@ -1621,7 +1696,9 @@ CONFIG_RTC_DRV_TWL4030=y # CONFIG_RTC_DRV_M48T86 is not set # CONFIG_RTC_DRV_M48T35 is not set # CONFIG_RTC_DRV_M48T59 is not set +# CONFIG_RTC_DRV_MSM6242 is not set # CONFIG_RTC_DRV_BQ4802 is not set +# CONFIG_RTC_DRV_RP5C01 is not set # CONFIG_RTC_DRV_V3020 is not set # @@ -1636,13 +1713,12 @@ CONFIG_RTC_DRV_TWL4030=y # # CONFIG_STAGING is not set CONFIG_MPU_BRIDGE=y +# CONFIG_BRIDGE_DVFS is not set CONFIG_BRIDGE_MEMPOOL_SIZE=0x600000 # CONFIG_BRIDGE_DEBUG is not set - -# -# Bridge Hacking -# -# CONFIG_BRIDGE_CHECK_ALIGN_128 is not set +# CONFIG_BRIDGE_WDT3 is not set +# CONFIG_BRIDGE_RECOVERY is not set +# CONFIG_BRIDGE_CACHE_LINE_CHECK is not set # # Bridge Notifications @@ -1657,6 +1733,7 @@ CONFIG_BRIDGE_MEMPOOL_SIZE=0x600000 # # File systems # +CONFIG_FS_JOURNAL_INFO=y CONFIG_EXT2_FS=y # CONFIG_EXT2_FS_XATTR is not set # CONFIG_EXT2_FS_XIP is not set @@ -1689,6 +1766,7 @@ CONFIG_QUOTACTL=y # CONFIG_AUTOFS_FS is not set # CONFIG_AUTOFS4_FS is not set # CONFIG_FUSE_FS is not set +CONFIG_GENERIC_ACL=y # # Caches @@ -1719,7 +1797,7 @@ CONFIG_PROC_SYSCTL=y CONFIG_PROC_PAGE_MONITOR=y CONFIG_SYSFS=y CONFIG_TMPFS=y -# CONFIG_TMPFS_POSIX_ACL is not set +CONFIG_TMPFS_POSIX_ACL=y # CONFIG_HUGETLB_PAGE is not set # CONFIG_CONFIGFS_FS is not set CONFIG_MISC_FILESYSTEMS=y @@ -1879,6 +1957,7 @@ CONFIG_DEBUG_INFO=y # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set # CONFIG_FAULT_INJECTION is not set # CONFIG_LATENCYTOP is not set +# CONFIG_SYSCTL_SYSCALL_CHECK is not set # CONFIG_PAGE_POISONING is not set CONFIG_HAVE_FUNCTION_TRACER=y CONFIG_TRACING_SUPPORT=y @@ -1904,7 +1983,9 @@ CONFIG_ARM_UNWIND=y # CONFIG_DEBUG_ERRORS is not set # CONFIG_DEBUG_STACK_USAGE is not set CONFIG_DEBUG_LL=y +# CONFIG_EARLY_PRINTK is not set # CONFIG_DEBUG_ICEDCC is not set +# CONFIG_OC_ETM is not set # # Security options @@ -1912,7 +1993,11 @@ CONFIG_DEBUG_LL=y # CONFIG_KEYS is not set # CONFIG_SECURITY is not set # CONFIG_SECURITYFS is not set -# CONFIG_SECURITY_FILE_CAPABILITIES is not set +# CONFIG_DEFAULT_SECURITY_SELINUX is not set +# CONFIG_DEFAULT_SECURITY_SMACK is not set +# CONFIG_DEFAULT_SECURITY_TOMOYO is not set +CONFIG_DEFAULT_SECURITY_DAC=y +CONFIG_DEFAULT_SECURITY="" CONFIG_CRYPTO=y # diff --git a/recipes/linux/linux-omap-zoomsync_2.6.32.bb b/recipes/linux/linux-omap-zoomsync_2.6.32.bb index f9aff13258..bff0319685 100644 --- a/recipes/linux/linux-omap-zoomsync_2.6.32.bb +++ b/recipes/linux/linux-omap-zoomsync_2.6.32.bb @@ -8,19 +8,17 @@ FILESPATHPKG_prepend = "${PN}-2.6.32:" COMPATIBLE_MACHINE = "omapzoom2" DEFAULT_PREFERENCE = "-1" -#DEFAULT_PREFERENCE_omapzoom2 = "1" +DEFAULT_PREFERENCE_omapzoom2 = "1" -LOBRANCH?= "master" - -SRCREV = "69eb2b26cc8b4d0a0db963a100c02d1acbfd90eb" -OEV = "oe1" +SRCREV = "015cbaf1035cd9a61d33a27de2a22902555db3c5" +OEV = "oe2" PE = "1" # The main PR is now using MACHINE_KERNEL_PR, for omap3 see conf/machine/include/omap3.inc -PV = "2.6.31+2.6.32-rc7-${OEV}" +PV = "2.6.32.7-${OEV}" PR_append = "+gitr${SRCREV}" -SRC_URI = "git://dev.omapzoom.org/pub/scm/integration/kernel-omap3.git;branch=${LOBRANCH};protocol=http \ +SRC_URI = "git://dev.omapzoom.org/pub/scm/integration/kernel-omap3.git;protocol=git \ file://defconfig" SRC_URI_append = " \ -- cgit v1.2.3 From ed446723c8c99885e40e57471c3fffedb3b15dbf Mon Sep 17 00:00:00 2001 From: Michael 'Mickey' Lauer Date: Wed, 17 Mar 2010 12:57:36 +0100 Subject: task-cli-tools: add gdb to task-cli-tools-debug --- recipes/tasks/task-cli-tools.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/recipes/tasks/task-cli-tools.bb b/recipes/tasks/task-cli-tools.bb index 93ab1945d3..dfb79e7e98 100644 --- a/recipes/tasks/task-cli-tools.bb +++ b/recipes/tasks/task-cli-tools.bb @@ -2,7 +2,7 @@ DESCRIPTION = "A set of command line tools useful for debugging" SECTION = "console" LICENSE = "MIT" PV = "1.0" -PR = "r12" +PR = "r13" inherit task @@ -31,6 +31,7 @@ RDEPENDS_${PN}-debug = "\ evtest \ devmem2 \ i2c-tools \ + gdb \ ltrace \ procps \ pxaregs \ -- cgit v1.2.3 From 3c3e5c5d529a9d6f90c64b63151a01e4fc6beb5d Mon Sep 17 00:00:00 2001 From: Michael 'Mickey' Lauer Date: Wed, 17 Mar 2010 12:57:59 +0100 Subject: task-fso2-compliance: remove unnecessary dependencies --- recipes/tasks/task-fso2-compliance.bb | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/recipes/tasks/task-fso2-compliance.bb b/recipes/tasks/task-fso2-compliance.bb index 2d38b47c5e..3e064785d2 100644 --- a/recipes/tasks/task-fso2-compliance.bb +++ b/recipes/tasks/task-fso2-compliance.bb @@ -3,13 +3,11 @@ Install this task to make your distribution FSO 2.0-compliant." SECTION = "fso/base" LICENSE = "MIT" PV = "1.9.0" -PR = "r6" +PR = "r7" inherit task RDEPENDS_${PN} = "\ - dbus-hlid \ - \ libfsobasics \ libfsotransport \ libfsoframework \ @@ -23,11 +21,7 @@ RDEPENDS_${PN} = "\ fsonetworkd \ fsousaged \ \ -# included in fsodeviced now -# fso-alsa-data \ fso-apm \ - fso-gpsd \ -# fso-monitord \ # connman \ # connman-scripts \ # connman-plugin-bluetooth \ @@ -44,7 +38,6 @@ RDEPENDS_${PN} = "\ " RRECOMMENDS_${PN} = "\ -# fso-abyss \ wmiconfig \ tzdata \ tzdata-africa \ -- cgit v1.2.3 From b32478bf383fe396185f7b235331da4843a333e7 Mon Sep 17 00:00:00 2001 From: Michael 'Mickey' Lauer Date: Wed, 17 Mar 2010 12:58:24 +0100 Subject: fso-image.inc: remove unconditional autostart of bluetooth, avahi, connman. FSO uses dbus system activation for that --- recipes/images/fso-image.inc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/recipes/images/fso-image.inc b/recipes/images/fso-image.inc index 6c381a054b..88fc1679ab 100644 --- a/recipes/images/fso-image.inc +++ b/recipes/images/fso-image.inc @@ -130,8 +130,11 @@ fso_rootfs_postprocess() { # set sensible default DNS entries echo "nameserver 208.67.222.222" > ./etc/resolv.conf echo "nameserver 208.67.220.220" >> ./etc/resolv.conf - # remove autostart of gspd (if installed), we have fso-gpsd and this conflicts + # remove autostart of certain packages which we rather want to start on demand rm -f ./etc/init.d/gpsd + rm -f ./etc/init.d/*blue* + rm -f ./etc/init.d/*connman* + rm -f ./etc/init.d/*avahi* # silence printk mkdir -p ./etc/profile.d/ echo "echo 0 0 0 0 >/proc/sys/kernel/printk" >./etc/profile.d/printk.sh -- cgit v1.2.3 From 00e29e85c140430b3e6e398a0191979f4d94a93e Mon Sep 17 00:00:00 2001 From: Michael 'Mickey' Lauer Date: Wed, 17 Mar 2010 12:58:54 +0100 Subject: fsodatad: DEPEND on mobile-broadband-provider info --- recipes/freesmartphone/fsodatad_git.bb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/recipes/freesmartphone/fsodatad_git.bb b/recipes/freesmartphone/fsodatad_git.bb index 9a44eddeaf..e8bf83ce2e 100644 --- a/recipes/freesmartphone/fsodatad_git.bb +++ b/recipes/freesmartphone/fsodatad_git.bb @@ -1,7 +1,10 @@ require cornucopia.inc inherit fso-plugin -PR = "${INC_PR}.1" +PR = "${INC_PR}.2" PV = "0.1.0+gitr${SRCREV}" -DEPENDS += "libxml2" +DEPENDS += "\ + libxml2 \ + mobile-broadband-provider-info \ +" RDEPENDS += "mobile-broadband-provider-info" -- cgit v1.2.3 From f94496c1c245882df0e2f8c9fb94774c8c9b3ce0 Mon Sep 17 00:00:00 2001 From: Joshua Lock Date: Thu, 4 Mar 2010 22:34:20 +0000 Subject: packaged-staging: Fix packagaging of cross packages packagedstaging_fastpath() was only copying the contents of CROSS_DIR to PSTAGE_TMPDIR resulting in the folders contents being packaged and then installed incorrectly at the top level of CROSS_DIR rather than in HOST_ARCH specific sub directories. This patch fixes that issue by copying the directory and its contents rather than just the directory contents. Signed-off-by: Joshua Lock Signed-off-by: Richard Purdie --- classes/packaged-staging.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/packaged-staging.bbclass b/classes/packaged-staging.bbclass index da9d0f34c6..f755d2340d 100644 --- a/classes/packaged-staging.bbclass +++ b/classes/packaged-staging.bbclass @@ -298,7 +298,7 @@ packagedstaging_fastpath () { mkdir -p ${PSTAGE_TMPDIR_STAGE}/staging/ mkdir -p ${PSTAGE_TMPDIR_STAGE}/cross/ cp -fpPR ${SYSROOT_DESTDIR}${STAGING_DIR}/* ${PSTAGE_TMPDIR_STAGE}/staging/ || /bin/true - cp -fpPR ${SYSROOT_DESTDIR}${CROSS_DIR}/* ${PSTAGE_TMPDIR_STAGE}/cross/ || /bin/true + cp -fpPR ${SYSROOT_DESTDIR}${CROSS_DIR}/* ${PSTAGE_TMPDIR_STAGE}/cross/${BASE_PACKAGE_ARCH}/ || /bin/true fi } -- cgit v1.2.3 From c240d00f5fdfec0d58b6e0d32975e2d6c74a2a05 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 17 Mar 2010 14:01:04 +0100 Subject: shr: bump SRCREVs for SHR projects, fsogsmd, remove frameworkd-config from autorev Signed-off-by: Martin Jansa --- conf/distro/include/sane-srcrevs-fso.inc | 2 +- conf/distro/include/sane-srcrevs.inc | 18 +++++++++--------- conf/distro/include/shr-autorev.inc | 5 ----- 3 files changed, 10 insertions(+), 15 deletions(-) diff --git a/conf/distro/include/sane-srcrevs-fso.inc b/conf/distro/include/sane-srcrevs-fso.inc index b018b99678..c087cc9f3e 100644 --- a/conf/distro/include/sane-srcrevs-fso.inc +++ b/conf/distro/include/sane-srcrevs-fso.inc @@ -7,7 +7,7 @@ SRCREV_pn-fso-apm ?= "${FSO_CORNUCOPIA_SRCREV}" SRCREV_pn-fso-boot ?= "${FSO_CORNUCOPIA_SRCREV}" SRCREV_pn-fsodatad ?= "${FSO_CORNUCOPIA_SRCREV}" SRCREV_pn-fsodeviced ?= "${FSO_CORNUCOPIA_SRCREV}" -SRCREV_pn-fsogsmd ?= "33206723461710d5c50cbed2eaf2fd2440b7dff9" +SRCREV_pn-fsogsmd ?= "8e89c8dbae569a08cac246a3805fca20988c0ad1" SRCREV_pn-fsolocationd ?= "${FSO_CORNUCOPIA_SRCREV}" SRCREV_pn-fsomusicd ?= "${FSO_CORNUCOPIA_SRCREV}" SRCREV_pn-fsonetworkd ?= "${FSO_CORNUCOPIA_SRCREV}" diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 7e71b73ef3..b4a6cbb7bb 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -14,7 +14,7 @@ SRCREV_pn-accelges ?= "206" SRCREV_pn-advancedcaching ?= "9c3661f5573d2dd712437f1590070153d12e4c02" SRCREV_pn-aircrack-ng ?= "802" -SRCREV_pn-alsa-scenarii-shr ?= "2b62d1c9b02da047071105a7b5695acd6c6dbcca" +SRCREV_pn-alsa-scenarii-shr ?= "8e89c8dbae569a08cac246a3805fca20988c0ad1" SRCREV_pn-alsa-scenario ?= "8bd7f83d847424eb44704cf1649974b2fda8d8f1" SRCREV_pn-aufs2-util ?= "f35ba2292fe40aa94aa83713e0b2719f35a25768" SRCREV_pn-bfin-uclibc ?= "1857" @@ -60,7 +60,7 @@ SRCREV_pn-ezx-gen-blob ?= "2426" SRCREV_pn-ezxd ?= "2074" SRCREV_pn-fbgrab-viewer-native ?= "1943" SRCREV_pn-flashrom ?= "3682" -SRCREV_pn-frameworkd-config-shr ?= "2b62d1c9b02da047071105a7b5695acd6c6dbcca" +SRCREV_pn-frameworkd-config-shr ?= "8e89c8dbae569a08cac246a3805fca20988c0ad1" SRCREV_pn-frameworkd-config-shr_SHR_REV ?= ${SRCREV_pn-frameworkd-config-shr} SRCREV_pn-fsod ?= "2a33e5ffe96c611e6a6b8b6c33d2a83ba656f55b" SRCREV_pn-fstests ?= "204" @@ -94,8 +94,8 @@ SRCREV_pn-libiac ?= "1590" SRCREV_pn-libmodulo ?= "7d2f657d248bd86377e66c329aa6826459d406da" SRCREV_pn-libnl2 ?= "8808743839b0f459394ecd00cb0f7c1896c0ab7a" SRCREV_pn-libowl ?= "277" -SRCREV_pn-libphone-ui ?= "18e9bce8ef0cfca067674e1a1b7300949a227d57" -SRCREV_pn-libphone-ui-shr ?= "a642fc4689c8f4256b4c531aa53619dd6bc58391" +SRCREV_pn-libphone-ui = "97fda168d8d5f4771267305ea0672b4bc7756957" +SRCREV_pn-libphone-ui-shr = "46c991d348419f504775df2d602158a7dfdc9bf1" SRCREV_pn-librfid ?= "2094" SRCREV_pn-libsnmp-perl ?= "17367" SRCREV_pn-libsynthesis ?= "70f0065aa3b085bdf059830f95e5b5766eecb0bb" @@ -157,9 +157,9 @@ SRCREV_pn-osb-nrcit ?= "125" SRCREV_pn-osb-nrcore ?= "126" SRCREV_pn-packagekit ?= "96823118e98515dd41748e8c7bdb9cf7b1d4a95f" SRCREV_pn-paroli ?= "bb9fb1969acdfbaa48b55902675a6d8949014c6d" -SRCREV_pn-phonefsod ?= "5f6c7b084c7103546924a5da9910f0c8da0d23bf" -SRCREV_pn-phoneui-apps ?= "b3ab560b66088dbbd183e060d3166e0ebeb2c55e" -SRCREV_pn-phoneuid ?= "be0c9364a0b5e997be2151213249535d8e01f194" +SRCREV_pn-phonefsod ?= "692a5b6b8a7d2cf6af6c4bc93e97cf041b4d805c" +SRCREV_pn-phoneui-apps ?= "d349e764400d7a4eaaa12f359d6c64b3ca55faaf" +SRCREV_pn-phoneuid ?= "a466c58560222c6b7ab7c9554c8c5b66ed017bd7" SRCREV_pn-portaudio-v19 ?= "1387" SRCREV_pn-psplash ?= "249" SRCREV_pn-pty-forward-native ?= "4662b55fdba528bb5b3349f83055bf236af5d63b" @@ -182,8 +182,8 @@ SRCREV_pn-serial-forward ?= "50cf4ff2198589a8db369789fc038604a892a54d" SRCREV_pn-settings-daemon ?= "2006" SRCREV_pn-shr-config ?= "37dd7ac950e2bfd438801faf34c29fccfdbbaccf" SRCREV_pn-shr-installer ?= "8608816ea1a1ac14b6e9faaa3685dd2b6450e889" -SRCREV_pn-shr-settings ?= "fd19508d43d8a0d990c63b329d935d2929c091dc" -SRCREV_pn-shr-specs ?= "062fb8278132ce64eeef3e488bef068387b87aff" +SRCREV_pn-shr-settings ?= "c0315c80f3236f1a9ddf23f38520bc88ed173ffd" +SRCREV_pn-shr-specs ?= "d8f0dc85f1a7a6c0c6d24755f3770a55229621ae" SRCREV_pn-shr-splash ?= "9d7ca1cecb93022e5b890cd87756ac6f072710ca" SRCREV_pn-shr-splash-theme-dontpanic ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb" SRCREV_pn-shr-splash-theme-handy ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb" diff --git a/conf/distro/include/shr-autorev.inc b/conf/distro/include/shr-autorev.inc index 6ae3e22874..a73e213a78 100644 --- a/conf/distro/include/shr-autorev.inc +++ b/conf/distro/include/shr-autorev.inc @@ -1,10 +1,5 @@ # SHR autorev include -SRCREV_pn-frameworkd-config-shr = "${AUTOREV}" -SRCREV_pn-frameworkd-config-shr_FSO_REV = "${AUTOREV}" -SRCREV_pn-frameworkd-config-shr_SHR_REV = "${AUTOREV}" - SRCREV_pn-e-wm-config-illume2-shr = "${AUTOREV}" -SRCREV_pn-alsa-scenarii-shr = "${AUTOREV}" SRCREV_pn-shr-settings = "${AUTOREV}" SRCREV_pn-shr-specs = "${AUTOREV}" SRCREV_pn-phoneui-apps = "${AUTOREV}" -- cgit v1.2.3 From 51b6131073d8d391f944aea1d8bb9c40200c6ba1 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 17 Mar 2010 14:07:46 +0100 Subject: fsogsmd: fix SRCREV bump --- conf/distro/include/sane-srcrevs-fso.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/distro/include/sane-srcrevs-fso.inc b/conf/distro/include/sane-srcrevs-fso.inc index c087cc9f3e..46f0c2ef00 100644 --- a/conf/distro/include/sane-srcrevs-fso.inc +++ b/conf/distro/include/sane-srcrevs-fso.inc @@ -7,7 +7,7 @@ SRCREV_pn-fso-apm ?= "${FSO_CORNUCOPIA_SRCREV}" SRCREV_pn-fso-boot ?= "${FSO_CORNUCOPIA_SRCREV}" SRCREV_pn-fsodatad ?= "${FSO_CORNUCOPIA_SRCREV}" SRCREV_pn-fsodeviced ?= "${FSO_CORNUCOPIA_SRCREV}" -SRCREV_pn-fsogsmd ?= "8e89c8dbae569a08cac246a3805fca20988c0ad1" +SRCREV_pn-fsogsmd ?= "617dcf866afc8db1a31d91d6a74c84e5f6cc276c" SRCREV_pn-fsolocationd ?= "${FSO_CORNUCOPIA_SRCREV}" SRCREV_pn-fsomusicd ?= "${FSO_CORNUCOPIA_SRCREV}" SRCREV_pn-fsonetworkd ?= "${FSO_CORNUCOPIA_SRCREV}" -- cgit v1.2.3 From d7c9e12cd26a5b3cae2fcb7a24defea492fd704b Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 17 Mar 2010 14:33:23 +0100 Subject: socat_1.7.1.2: change SRC_URI, it's available only without /Archive/ Signed-off-by: Martin Jansa --- recipes/socat/socat_1.7.1.2.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/socat/socat_1.7.1.2.bb b/recipes/socat/socat_1.7.1.2.bb index 769d3a73d6..0a2ab544ad 100644 --- a/recipes/socat/socat_1.7.1.2.bb +++ b/recipes/socat/socat_1.7.1.2.bb @@ -5,7 +5,7 @@ transfer between two independent data channels." LICENSE = "GPL" PR = "r0" -SRC_URI = "http://www.dest-unreach.org/socat/download/Archive/socat-${PV}.tar.bz2;name=src \ +SRC_URI = "http://www.dest-unreach.org/socat/download/socat-${PV}.tar.bz2;name=src \ file://compile.patch;patch=1" SRC_URI[src.md5sum] = "9c0c5e83ce665f38d4d3aababad275eb" SRC_URI[src.sha256sum] = "f7395b154914bdaa49805603aac2a90fb3d60255f95691d7779ab4680615e167" -- cgit v1.2.3 From bb75d7f3b63de61ed1f79efeb47df57a2328c37c Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 17 Mar 2010 14:59:18 +0100 Subject: sane-srcrevs-fso: bump all (because I forgot to bump libfso-glib, fos-specs before for newer fsogsmd) Signed-off-by: Martin Jansa --- conf/distro/include/sane-srcrevs-fso.inc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/conf/distro/include/sane-srcrevs-fso.inc b/conf/distro/include/sane-srcrevs-fso.inc index 46f0c2ef00..38a5ecfe05 100644 --- a/conf/distro/include/sane-srcrevs-fso.inc +++ b/conf/distro/include/sane-srcrevs-fso.inc @@ -1,13 +1,13 @@ # To be included from sane-srcrevs.inc # FSO Projects -- Cornucopia -FSO_CORNUCOPIA_SRCREV ?= "c8991f5c788a5df499a302ac6380b1df198c5283" +FSO_CORNUCOPIA_SRCREV ?= "617dcf866afc8db1a31d91d6a74c84e5f6cc276c" SRCREV_pn-fso-abyss ?= "${FSO_CORNUCOPIA_SRCREV}" SRCREV_pn-fso-apm ?= "${FSO_CORNUCOPIA_SRCREV}" SRCREV_pn-fso-boot ?= "${FSO_CORNUCOPIA_SRCREV}" SRCREV_pn-fsodatad ?= "${FSO_CORNUCOPIA_SRCREV}" SRCREV_pn-fsodeviced ?= "${FSO_CORNUCOPIA_SRCREV}" -SRCREV_pn-fsogsmd ?= "617dcf866afc8db1a31d91d6a74c84e5f6cc276c" +SRCREV_pn-fsogsmd ?= "${FSO_CORNUCOPIA_SRCREV}" SRCREV_pn-fsolocationd ?= "${FSO_CORNUCOPIA_SRCREV}" SRCREV_pn-fsomusicd ?= "${FSO_CORNUCOPIA_SRCREV}" SRCREV_pn-fsonetworkd ?= "${FSO_CORNUCOPIA_SRCREV}" @@ -30,16 +30,16 @@ SRCREV_pn-fso-gpsd ?= "39e810899110a9bb302cf2064e1c0f73541fb4e6" SRCREV_pn-fso-gsm0710muxd ?= "1d69fb5b666ac2a9e54e46978c7afa8fe5dfc3c9" SRCREV_pn-fso-monitord ?= "b4ae1e9b10e710042624c2cf1a15b91a7d5b1d44" SRCREV_pn-fso-sounds ?= "3a4767ec01988bd0fd8f72f0c35d6d36e5fbc815" -SRCREV_pn-fso-specs ?= "bd8a5d1cf461c6633ddc8f4c91a1101ec835faad" +SRCREV_pn-fso-specs ?= "76d8557042c322f495bfc6a9d7b3f85fd0308fe7" SRCREV_pn-gsmd2 ?= "c16883a079aeff8780e5d461ec4e8348537ab4d8" -SRCREV_pn-libfso-glib ?= "a1f2f14946ad154c5fb842fadf081fe377bd9924" +SRCREV_pn-libfso-glib ?= "1abe0a9e1faeb64ab18d6f8a3d3ac3d983bd2f65" SRCREV_pn-libframeworkd-glib ?= "1b4c0e21a6fec2c1952deb2bfeb2d85b924c3c36" SRCREV_pn-libgsm0710 ?= "52eea64bdbb79c09002b46e98a5e656509884f72" SRCREV_pn-libpersistence ?= "217ad803745f8ac1f3c72c6715e2c0faefb3fd06" FSO_PYTHONHELPERS_SRCREV ?= "63b1dff1bc8ac22efabcee8a90e957c3b2423317" SRCREV_pn-mdbus ?= "${FSO_PYTHONHELPERS_SRCREV}" SRCREV_pn-mickeyterm ?= "${FSO_PYTHONHELPERS_SRCREV}" -SRCREV_pn-msmcommd ?= "4997b45f2941d320d2e0f55d7646103877c6263c" +SRCREV_pn-msmcommd ?= "2ed618dd347c3245c5f62c00ce75c985ad90a0ea" SRCREV_pn-multicat ?= "${FSO_PYTHONHELPERS_SRCREV}" SRCREV_pn-python-pyrtc ?= "${FSO_PYTHONHELPERS_SRCREV}" SRCREV_pn-pycd ?= "${FSO_PYTHONHELPERS_SRCREV}" -- cgit v1.2.3 From d8a743b064f2b88fe43c8209dc06cd85b58bee2a Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Wed, 17 Mar 2010 15:26:06 +0100 Subject: linux-omap-zoomsync_2.6.32.bb : reinstate bootlogo --- recipes/linux/linux-omap-zoomsync_2.6.32.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/recipes/linux/linux-omap-zoomsync_2.6.32.bb b/recipes/linux/linux-omap-zoomsync_2.6.32.bb index bff0319685..5cbc94e488 100644 --- a/recipes/linux/linux-omap-zoomsync_2.6.32.bb +++ b/recipes/linux/linux-omap-zoomsync_2.6.32.bb @@ -11,7 +11,7 @@ DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_omapzoom2 = "1" SRCREV = "015cbaf1035cd9a61d33a27de2a22902555db3c5" -OEV = "oe2" +OEV = "oe3" PE = "1" # The main PR is now using MACHINE_KERNEL_PR, for omap3 see conf/machine/include/omap3.inc @@ -19,6 +19,7 @@ PV = "2.6.32.7-${OEV}" PR_append = "+gitr${SRCREV}" SRC_URI = "git://dev.omapzoom.org/pub/scm/integration/kernel-omap3.git;protocol=git \ + file://logo_linux_clut224.ppm \ file://defconfig" SRC_URI_append = " \ -- cgit v1.2.3 From 1b8480c8b513c35284e51c2d04989c1bd3c7993e Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Wed, 17 Mar 2010 15:54:04 +0100 Subject: linux-omap-zoomsync_2.6.32.bb : update defconfig --- .../linux-omap-zoomsync-2.6.32/omapzoom2/defconfig | 214 ++++++++++++++++++--- recipes/linux/linux-omap-zoomsync_2.6.32.bb | 2 +- 2 files changed, 193 insertions(+), 23 deletions(-) diff --git a/recipes/linux/linux-omap-zoomsync-2.6.32/omapzoom2/defconfig b/recipes/linux/linux-omap-zoomsync-2.6.32/omapzoom2/defconfig index 45ecc7a96e..28403aa4b5 100644 --- a/recipes/linux/linux-omap-zoomsync-2.6.32/omapzoom2/defconfig +++ b/recipes/linux/linux-omap-zoomsync-2.6.32/omapzoom2/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.32.7 -# Wed Mar 17 10:33:20 2010 +# Wed Mar 17 15:53:51 2010 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -54,7 +54,8 @@ CONFIG_TREE_RCU=y CONFIG_RCU_FANOUT=32 # CONFIG_RCU_FANOUT_EXACT is not set # CONFIG_TREE_RCU_TRACE is not set -# CONFIG_IKCONFIG is not set +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y CONFIG_LOG_BUF_SHIFT=14 CONFIG_GROUP_SCHED=y CONFIG_FAIR_GROUP_SCHED=y @@ -304,7 +305,7 @@ CONFIG_CPU_CP15_MMU=y # Processor Features # CONFIG_ARM_THUMB=y -# CONFIG_ARM_THUMBEE is not set +CONFIG_ARM_THUMBEE=y # CONFIG_CPU_ICACHE_DISABLE is not set # CONFIG_CPU_DCACHE_DISABLE is not set # CONFIG_CPU_BPREDICT_DISABLE is not set @@ -367,7 +368,8 @@ CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 CONFIG_CMDLINE=" debug " # CONFIG_XIP_KERNEL is not set -# CONFIG_KEXEC is not set +CONFIG_KEXEC=y +CONFIG_ATAGS_PROC=y # # CPU Power Management @@ -406,7 +408,7 @@ CONFIG_NEON=y CONFIG_BINFMT_ELF=y # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set CONFIG_HAVE_AOUT=y -# CONFIG_BINFMT_AOUT is not set +CONFIG_BINFMT_AOUT=m CONFIG_BINFMT_MISC=y # @@ -429,7 +431,7 @@ CONFIG_NET=y # Networking options # CONFIG_PACKET=y -# CONFIG_PACKET_MMAP is not set +CONFIG_PACKET_MMAP=y CONFIG_UNIX=y CONFIG_XFRM=y CONFIG_XFRM_USER=y @@ -474,10 +476,13 @@ CONFIG_DEFAULT_TCP_CONG="cubic" # CONFIG_RDS is not set # CONFIG_TIPC is not set # CONFIG_ATM is not set -# CONFIG_BRIDGE is not set +CONFIG_STP=m +CONFIG_BRIDGE=m # CONFIG_NET_DSA is not set -# CONFIG_VLAN_8021Q is not set +CONFIG_VLAN_8021Q=m +# CONFIG_VLAN_8021Q_GVRP is not set # CONFIG_DECNET is not set +CONFIG_LLC=m # CONFIG_LLC2 is not set # CONFIG_IPX is not set # CONFIG_ATALK is not set @@ -487,7 +492,39 @@ CONFIG_DEFAULT_TCP_CONG="cubic" # CONFIG_WAN_ROUTER is not set # CONFIG_PHONET is not set # CONFIG_IEEE802154 is not set -# CONFIG_NET_SCHED is not set +CONFIG_NET_SCHED=y + +# +# Queueing/Scheduling +# +# CONFIG_NET_SCH_CBQ is not set +# CONFIG_NET_SCH_HTB is not set +# CONFIG_NET_SCH_HFSC is not set +# CONFIG_NET_SCH_PRIO is not set +# CONFIG_NET_SCH_MULTIQ is not set +# CONFIG_NET_SCH_RED is not set +# CONFIG_NET_SCH_SFQ is not set +# CONFIG_NET_SCH_TEQL is not set +# CONFIG_NET_SCH_TBF is not set +# CONFIG_NET_SCH_GRED is not set +# CONFIG_NET_SCH_DSMARK is not set +# CONFIG_NET_SCH_NETEM is not set +# CONFIG_NET_SCH_DRR is not set + +# +# Classification +# +# CONFIG_NET_CLS_BASIC is not set +# CONFIG_NET_CLS_TCINDEX is not set +# CONFIG_NET_CLS_ROUTE4 is not set +# CONFIG_NET_CLS_FW is not set +# CONFIG_NET_CLS_U32 is not set +# CONFIG_NET_CLS_RSVP is not set +# CONFIG_NET_CLS_RSVP6 is not set +# CONFIG_NET_CLS_FLOW is not set +# CONFIG_NET_EMATCH is not set +# CONFIG_NET_CLS_ACT is not set +CONFIG_NET_SCH_FIFO=y # CONFIG_DCB is not set # @@ -497,7 +534,31 @@ CONFIG_DEFAULT_TCP_CONG="cubic" # CONFIG_HAMRADIO is not set # CONFIG_CAN is not set # CONFIG_IRDA is not set -# CONFIG_BT 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_HCIBTUSB=m +CONFIG_BT_HCIBTSDIO=m +CONFIG_BT_HCIUART=m +CONFIG_BT_HCIUART_H4=y +CONFIG_BT_HCIUART_BCSP=y +CONFIG_BT_HCIUART_LL=y +CONFIG_BT_HCIBCM203X=m +CONFIG_BT_HCIBPA10X=m +CONFIG_BT_HCIBFUSB=m +# CONFIG_BT_HCIVHCI is not set +CONFIG_BT_MRVL=m +CONFIG_BT_MRVL_SDIO=m # CONFIG_AF_RXRPC is not set CONFIG_WIRELESS=y CONFIG_WIRELESS_EXT=y @@ -511,8 +572,11 @@ CONFIG_WIRELESS_EXT_SYSFS=y # # CFG80211 needs to be enabled for MAC80211 # -# CONFIG_WIMAX is not set -# CONFIG_RFKILL is not set +CONFIG_WIMAX=m +CONFIG_WIMAX_DEBUG_LEVEL=8 +CONFIG_RFKILL=m +CONFIG_RFKILL_LEDS=y +CONFIG_RFKILL_INPUT=y # CONFIG_NET_9P is not set # @@ -527,7 +591,9 @@ CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS_MOUNT=y CONFIG_STANDALONE=y CONFIG_PREVENT_FIRMWARE_BUILD=y -# CONFIG_FW_LOADER is not set +CONFIG_FW_LOADER=m +CONFIG_FIRMWARE_IN_KERNEL=y +CONFIG_EXTRA_FIRMWARE="" # CONFIG_DEBUG_DRIVER is not set # CONFIG_DEBUG_DEVRES is not set # CONFIG_SYS_HYPERVISOR is not set @@ -686,10 +752,10 @@ CONFIG_BLK_DEV_SD=y # CONFIG_BLK_DEV_SR is not set # CONFIG_CHR_DEV_SG is not set # CONFIG_CHR_DEV_SCH is not set -# CONFIG_SCSI_MULTI_LUN is not set +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_SCAN_ASYNC=y CONFIG_SCSI_WAIT_SCAN=m # @@ -765,8 +831,10 @@ CONFIG_WLAN=y # CONFIG_HOSTAP is not set # -# Enable WiMAX (Networking options) to see the WiMAX drivers +# WiMAX Wireless Broadband devices # +# CONFIG_WIMAX_I2400M_USB is not set +# CONFIG_WIMAX_I2400M_SDIO is not set # # USB Network Adapters @@ -776,6 +844,7 @@ CONFIG_WLAN=y # CONFIG_USB_PEGASUS is not set # CONFIG_USB_RTL8150 is not set # CONFIG_USB_USBNET is not set +# CONFIG_USB_HSO is not set # CONFIG_WAN is not set # CONFIG_PPP is not set # CONFIG_SLIP is not set @@ -1338,9 +1407,16 @@ CONFIG_BACKLIGHT_GENERIC=y # # CONFIG_VGA_CONSOLE is not set CONFIG_DUMMY_CONSOLE=y -# CONFIG_FRAMEBUFFER_CONSOLE is not set +CONFIG_FRAMEBUFFER_CONSOLE=y +# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set +CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y +# CONFIG_FONTS is not set +CONFIG_FONT_8x8=y CONFIG_FONT_8x16=y -# CONFIG_LOGO is not set +CONFIG_LOGO=y +# CONFIG_LOGO_LINUX_MONO is not set +# CONFIG_LOGO_LINUX_VGA16 is not set +CONFIG_LOGO_LINUX_CLUT224=y CONFIG_SOUND=y # CONFIG_SOUND_OSS_CORE is not set CONFIG_SND=y @@ -1419,6 +1495,7 @@ CONFIG_USB_HID=y # CONFIG_HID_SMARTJOYPLUS is not set # CONFIG_HID_TOPSEED is not set # CONFIG_HID_THRUSTMASTER is not set +# CONFIG_HID_WACOM is not set # CONFIG_HID_ZEROPLUS is not set CONFIG_USB_SUPPORT=y CONFIG_USB_ARCH_HAS_HCD=y @@ -1510,7 +1587,66 @@ CONFIG_USB_STORAGE=m # # USB port drivers # -# CONFIG_USB_SERIAL is not set +CONFIG_USB_SERIAL=m +CONFIG_USB_EZUSB=y +CONFIG_USB_SERIAL_GENERIC=y +CONFIG_USB_SERIAL_AIRCABLE=m +CONFIG_USB_SERIAL_ARK3116=m +CONFIG_USB_SERIAL_BELKIN=m +CONFIG_USB_SERIAL_CH341=m +CONFIG_USB_SERIAL_WHITEHEAT=m +CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m +CONFIG_USB_SERIAL_CP210X=m +CONFIG_USB_SERIAL_CYPRESS_M8=m +CONFIG_USB_SERIAL_EMPEG=m +CONFIG_USB_SERIAL_FTDI_SIO=m +CONFIG_USB_SERIAL_FUNSOFT=m +CONFIG_USB_SERIAL_VISOR=m +CONFIG_USB_SERIAL_IPAQ=m +CONFIG_USB_SERIAL_IR=m +CONFIG_USB_SERIAL_EDGEPORT=m +CONFIG_USB_SERIAL_EDGEPORT_TI=m +CONFIG_USB_SERIAL_GARMIN=m +CONFIG_USB_SERIAL_IPW=m +CONFIG_USB_SERIAL_IUU=m +CONFIG_USB_SERIAL_KEYSPAN_PDA=m +CONFIG_USB_SERIAL_KEYSPAN=m +# CONFIG_USB_SERIAL_KEYSPAN_MPR is not set +# CONFIG_USB_SERIAL_KEYSPAN_USA28 is not set +# CONFIG_USB_SERIAL_KEYSPAN_USA28X is not set +# CONFIG_USB_SERIAL_KEYSPAN_USA28XA is not set +# CONFIG_USB_SERIAL_KEYSPAN_USA28XB is not set +# CONFIG_USB_SERIAL_KEYSPAN_USA19 is not set +# CONFIG_USB_SERIAL_KEYSPAN_USA18X is not set +# CONFIG_USB_SERIAL_KEYSPAN_USA19W is not set +# CONFIG_USB_SERIAL_KEYSPAN_USA19QW is not set +# CONFIG_USB_SERIAL_KEYSPAN_USA19QI is not set +# CONFIG_USB_SERIAL_KEYSPAN_USA49W is not set +# CONFIG_USB_SERIAL_KEYSPAN_USA49WLC is not set +CONFIG_USB_SERIAL_KLSI=m +CONFIG_USB_SERIAL_KOBIL_SCT=m +CONFIG_USB_SERIAL_MCT_U232=m +CONFIG_USB_SERIAL_MOS7720=m +CONFIG_USB_SERIAL_MOS7840=m +CONFIG_USB_SERIAL_MOTOROLA=m +CONFIG_USB_SERIAL_NAVMAN=m +CONFIG_USB_SERIAL_PL2303=m +CONFIG_USB_SERIAL_OTI6858=m +CONFIG_USB_SERIAL_QUALCOMM=m +CONFIG_USB_SERIAL_SPCP8X5=m +CONFIG_USB_SERIAL_HP4X=m +CONFIG_USB_SERIAL_SAFE=m +# CONFIG_USB_SERIAL_SAFE_PADDED is not set +CONFIG_USB_SERIAL_SIEMENS_MPI=m +CONFIG_USB_SERIAL_SIERRAWIRELESS=m +CONFIG_USB_SERIAL_SYMBOL=m +CONFIG_USB_SERIAL_TI=m +CONFIG_USB_SERIAL_CYBERJACK=m +CONFIG_USB_SERIAL_XIRCOM=m +CONFIG_USB_SERIAL_OPTION=m +CONFIG_USB_SERIAL_OMNINET=m +CONFIG_USB_SERIAL_OPTICON=m +CONFIG_USB_SERIAL_DEBUG=m # # USB Miscellaneous drivers @@ -1536,7 +1672,7 @@ CONFIG_USB_SISUSBVGA_CON=y # CONFIG_USB_IOWARRIOR is not set # CONFIG_USB_TEST is not set # CONFIG_USB_ISIGHTFW is not set -# CONFIG_USB_VST is not set +CONFIG_USB_VST=m CONFIG_USB_GADGET=y CONFIG_USB_GADGET_DEBUG=y CONFIG_USB_GADGET_DEBUG_FILES=y @@ -1711,7 +1847,41 @@ CONFIG_RTC_DRV_TWL4030=y # # TI VLYNQ # -# CONFIG_STAGING is not set +CONFIG_STAGING=y +# CONFIG_STAGING_EXCLUDE_BUILD is not set +# CONFIG_USB_IP_COMMON is not set +# CONFIG_PRISM2_USB is not set +# CONFIG_ECHO is not set +# CONFIG_COMEDI is not set +# CONFIG_ASUS_OLED is not set +# CONFIG_INPUT_MIMIO is not set +# CONFIG_TRANZPORT is not set + +# +# Qualcomm MSM Camera And Video +# + +# +# Camera Sensor Selection +# +# CONFIG_INPUT_GPIO is not set +# CONFIG_DST is not set +# CONFIG_POHMELFS is not set +# CONFIG_PLAN9AUTH is not set +# CONFIG_LINE6_USB is not set +# CONFIG_USB_SERIAL_QUATECH2 is not set +# CONFIG_USB_SERIAL_QUATECH_USB2 is not set +# CONFIG_VT6656 is not set +# CONFIG_FB_UDL is not set + +# +# RAR Register Driver +# +# CONFIG_RAR_REGISTER is not set +# CONFIG_IIO is not set +# CONFIG_RAMZSWAP is not set +# CONFIG_BATMAN_ADV is not set +# CONFIG_STRIP is not set CONFIG_MPU_BRIDGE=y # CONFIG_BRIDGE_DVFS is not set CONFIG_BRIDGE_MEMPOOL_SIZE=0x600000 @@ -2103,7 +2273,7 @@ CONFIG_CRYPTO_HW=y CONFIG_BITREVERSE=y CONFIG_GENERIC_FIND_LAST_BIT=y CONFIG_CRC_CCITT=y -# CONFIG_CRC16 is not set +CONFIG_CRC16=m CONFIG_CRC_T10DIF=y # CONFIG_CRC_ITU_T is not set CONFIG_CRC32=y diff --git a/recipes/linux/linux-omap-zoomsync_2.6.32.bb b/recipes/linux/linux-omap-zoomsync_2.6.32.bb index 5cbc94e488..61a2e0c817 100644 --- a/recipes/linux/linux-omap-zoomsync_2.6.32.bb +++ b/recipes/linux/linux-omap-zoomsync_2.6.32.bb @@ -11,7 +11,7 @@ DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_omapzoom2 = "1" SRCREV = "015cbaf1035cd9a61d33a27de2a22902555db3c5" -OEV = "oe3" +OEV = "oe4" PE = "1" # The main PR is now using MACHINE_KERNEL_PR, for omap3 see conf/machine/include/omap3.inc -- cgit v1.2.3 From 86ab2dc6608c2f4342f3a6dcad4bc175c19bda5a Mon Sep 17 00:00:00 2001 From: Martyn Welch Date: Wed, 17 Mar 2010 06:26:53 +0000 Subject: Add Freescale mpc8641_hpcn demo board A demo board from Freescale, based on the MPC8641D Freescale SOC. Acked-by: Tom Rini Signed-off-by: Tom Rini --- conf/machine/include/tune-ppce600.inc | 4 + conf/machine/mpc8641-hpcn.conf | 26 + recipes/linux/linux-2.6.33/mpc8641-hpcn/defconfig | 1752 +++++++++++++++++++++ recipes/linux/linux.inc | 1 + recipes/linux/linux_2.6.33.bb | 1 + recipes/u-boot/u-boot_git.bb | 1 + 6 files changed, 1785 insertions(+) create mode 100644 conf/machine/include/tune-ppce600.inc create mode 100644 conf/machine/mpc8641-hpcn.conf create mode 100644 recipes/linux/linux-2.6.33/mpc8641-hpcn/defconfig diff --git a/conf/machine/include/tune-ppce600.inc b/conf/machine/include/tune-ppce600.inc new file mode 100644 index 0000000000..77a7cb86b8 --- /dev/null +++ b/conf/machine/include/tune-ppce600.inc @@ -0,0 +1,4 @@ +TARGET_CC_ARCH = "-mcpu=7450" +BASE_PACKAGE_ARCH = "ppce600" +FEED_ARCH = "ppce600" +PACKAGE_EXTRA_ARCHS += "ppce600" diff --git a/conf/machine/mpc8641-hpcn.conf b/conf/machine/mpc8641-hpcn.conf new file mode 100644 index 0000000000..ef75be3112 --- /dev/null +++ b/conf/machine/mpc8641-hpcn.conf @@ -0,0 +1,26 @@ +#@TYPE: Machine +#@Name: MPC8641-hpcn +#@DESCRIPTION: Machine configuration for the freescale mpc8641_hpcn development board + +TARGET_ARCH = "powerpc" + +PREFERRED_PROVIDER_virtual/kernel ?= "linux" + +MACHINE_FEATURES = "kernel26 usbhost pci ext2 vfat nfs uboot" + +KERNEL_IMAGETYPE = "uImage" +UBOOT_ENTRYPOINT = "0" + +UBOOT_MACHINE = "MPC8641HPCN_config" + +# Need to create jffs2 images with the correct endianess +EXTRA_IMAGECMD_jffs2 = " --big-endian -e 0x10000" + +#don't try to access tty1 +USE_VT = "0" + +#setup serial console on Com1 +SERIAL_CONSOLE = "-L 115200 ttyS0" + +# Tune for e600 core +require conf/machine/include/tune-ppce600.inc diff --git a/recipes/linux/linux-2.6.33/mpc8641-hpcn/defconfig b/recipes/linux/linux-2.6.33/mpc8641-hpcn/defconfig new file mode 100644 index 0000000000..754a79ba74 --- /dev/null +++ b/recipes/linux/linux-2.6.33/mpc8641-hpcn/defconfig @@ -0,0 +1,1752 @@ +# +# Automatically generated make config: don't edit +# Linux kernel version: 2.6.32-rc5 +# Thu Nov 5 08:20:46 2009 +# +# CONFIG_PPC64 is not set + +# +# Processor support +# +CONFIG_PPC_BOOK3S_32=y +# CONFIG_PPC_85xx is not set +# CONFIG_PPC_8xx is not set +# CONFIG_40x is not set +# CONFIG_44x is not set +# CONFIG_E200 is not set +CONFIG_PPC_BOOK3S=y +CONFIG_6xx=y +CONFIG_PPC_FPU=y +# CONFIG_PHYS_64BIT is not set +CONFIG_ALTIVEC=y +CONFIG_PPC_STD_MMU=y +CONFIG_PPC_STD_MMU_32=y +# CONFIG_PPC_MM_SLICES is not set +CONFIG_PPC_HAVE_PMU_SUPPORT=y +CONFIG_SMP=y +CONFIG_NR_CPUS=2 +CONFIG_PPC32=y +CONFIG_WORD_SIZE=32 +# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set +CONFIG_MMU=y +CONFIG_GENERIC_CMOS_UPDATE=y +CONFIG_GENERIC_TIME=y +CONFIG_GENERIC_TIME_VSYSCALL=y +CONFIG_GENERIC_CLOCKEVENTS=y +CONFIG_GENERIC_HARDIRQS=y +CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y +# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set +# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set +CONFIG_IRQ_PER_CPU=y +CONFIG_STACKTRACE_SUPPORT=y +CONFIG_HAVE_LATENCYTOP_SUPPORT=y +CONFIG_TRACE_IRQFLAGS_SUPPORT=y +CONFIG_LOCKDEP_SUPPORT=y +CONFIG_RWSEM_XCHGADD_ALGORITHM=y +CONFIG_ARCH_HAS_ILOG2_U32=y +CONFIG_GENERIC_HWEIGHT=y +CONFIG_GENERIC_FIND_NEXT_BIT=y +# CONFIG_ARCH_NO_VIRT_TO_BUS is not set +CONFIG_PPC=y +CONFIG_EARLY_PRINTK=y +CONFIG_GENERIC_NVRAM=y +CONFIG_SCHED_OMIT_FRAME_POINTER=y +CONFIG_ARCH_MAY_HAVE_PC_FDC=y +CONFIG_PPC_OF=y +CONFIG_OF=y +CONFIG_PPC_UDBG_16550=y +CONFIG_GENERIC_TBSYNC=y +CONFIG_AUDIT_ARCH=y +CONFIG_GENERIC_BUG=y +CONFIG_DTC=y +CONFIG_DEFAULT_UIMAGE=y +# CONFIG_PPC_DCR_NATIVE is not set +# CONFIG_PPC_DCR_MMIO is not set +CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y +CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" +CONFIG_CONSTRUCTORS=y + +# +# General setup +# +CONFIG_EXPERIMENTAL=y +CONFIG_LOCK_KERNEL=y +CONFIG_INIT_ENV_ARG_LIMIT=32 +CONFIG_LOCALVERSION="" +CONFIG_LOCALVERSION_AUTO=y +CONFIG_SWAP=y +CONFIG_SYSVIPC=y +CONFIG_SYSVIPC_SYSCTL=y +CONFIG_POSIX_MQUEUE=y +CONFIG_POSIX_MQUEUE_SYSCTL=y +CONFIG_BSD_PROCESS_ACCT=y +# CONFIG_BSD_PROCESS_ACCT_V3 is not set +# CONFIG_TASKSTATS is not set +CONFIG_AUDIT=y +# CONFIG_AUDITSYSCALL is not set + +# +# RCU Subsystem +# +CONFIG_TREE_RCU=y +# CONFIG_TREE_PREEMPT_RCU is not set +# CONFIG_RCU_TRACE is not set +CONFIG_RCU_FANOUT=32 +# CONFIG_RCU_FANOUT_EXACT is not set +# CONFIG_TREE_RCU_TRACE is not set +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_LOG_BUF_SHIFT=14 +CONFIG_GROUP_SCHED=y +# CONFIG_FAIR_GROUP_SCHED is not set +# CONFIG_RT_GROUP_SCHED is not set +CONFIG_USER_SCHED=y +# CONFIG_CGROUP_SCHED is not set +# CONFIG_CGROUPS is not set +CONFIG_SYSFS_DEPRECATED=y +CONFIG_SYSFS_DEPRECATED_V2=y +# CONFIG_RELAY is not set +# CONFIG_NAMESPACES is not set +CONFIG_BLK_DEV_INITRD=y +CONFIG_INITRAMFS_SOURCE="" +CONFIG_RD_GZIP=y +# CONFIG_RD_BZIP2 is not set +# CONFIG_RD_LZMA is not set +# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set +CONFIG_SYSCTL=y +CONFIG_ANON_INODES=y +CONFIG_EMBEDDED=y +CONFIG_SYSCTL_SYSCALL=y +CONFIG_KALLSYMS=y +CONFIG_KALLSYMS_ALL=y +CONFIG_KALLSYMS_EXTRA_PASS=y +CONFIG_HOTPLUG=y +CONFIG_PRINTK=y +CONFIG_BUG=y +CONFIG_ELF_CORE=y +CONFIG_BASE_FULL=y +CONFIG_FUTEX=y +CONFIG_EPOLL=y +CONFIG_SIGNALFD=y +CONFIG_TIMERFD=y +CONFIG_EVENTFD=y +CONFIG_SHMEM=y +CONFIG_AIO=y +CONFIG_HAVE_PERF_EVENTS=y + +# +# Kernel Performance Events And Counters +# +# CONFIG_PERF_EVENTS is not set +# CONFIG_PERF_COUNTERS is not set +CONFIG_VM_EVENT_COUNTERS=y +CONFIG_PCI_QUIRKS=y +CONFIG_SLUB_DEBUG=y +CONFIG_COMPAT_BRK=y +# CONFIG_SLAB is not set +CONFIG_SLUB=y +# CONFIG_SLOB is not set +# CONFIG_PROFILING is not set +CONFIG_HAVE_OPROFILE=y +# CONFIG_KPROBES is not set +CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y +CONFIG_HAVE_IOREMAP_PROT=y +CONFIG_HAVE_KPROBES=y +CONFIG_HAVE_KRETPROBES=y +CONFIG_HAVE_ARCH_TRACEHOOK=y +CONFIG_HAVE_DMA_ATTRS=y +CONFIG_USE_GENERIC_SMP_HELPERS=y +CONFIG_HAVE_DMA_API_DEBUG=y + +# +# GCOV-based kernel profiling +# +# CONFIG_SLOW_WORK is not set +# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set +CONFIG_SLABINFO=y +CONFIG_RT_MUTEXES=y +CONFIG_BASE_SMALL=0 +CONFIG_MODULES=y +# CONFIG_MODULE_FORCE_LOAD is not set +CONFIG_MODULE_UNLOAD=y +CONFIG_MODULE_FORCE_UNLOAD=y +CONFIG_MODVERSIONS=y +# CONFIG_MODULE_SRCVERSION_ALL is not set +CONFIG_STOP_MACHINE=y +CONFIG_BLOCK=y +CONFIG_LBDAF=y +# CONFIG_BLK_DEV_BSG is not set +# CONFIG_BLK_DEV_INTEGRITY 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" +# CONFIG_FREEZER is not set + +# +# Platform support +# +# CONFIG_PPC_CHRP is not set +# CONFIG_MPC5121_ADS is not set +# CONFIG_MPC5121_GENERIC is not set +# CONFIG_PPC_MPC52xx is not set +# CONFIG_PPC_PMAC is not set +# CONFIG_PPC_CELL is not set +# CONFIG_PPC_CELL_NATIVE is not set +# CONFIG_PPC_82xx is not set +# CONFIG_PQ2ADS is not set +# CONFIG_PPC_83xx is not set +CONFIG_PPC_86xx=y +CONFIG_MPC8641_HPCN=y +# CONFIG_SBC8641D is not set +# CONFIG_MPC8610_HPCD is not set +# CONFIG_GEF_PPC9A is not set +# CONFIG_GEF_SBC310 is not set +# CONFIG_GEF_SBC610 is not set +CONFIG_MPC8641=y +CONFIG_PPC_OF_BOOT_TRAMPOLINE=y +# CONFIG_IPIC is not set +CONFIG_MPIC=y +# CONFIG_MPIC_WEIRD is not set +CONFIG_PPC_I8259=y +# CONFIG_PPC_RTAS is not set +# CONFIG_MMIO_NVRAM is not set +# CONFIG_PPC_MPC106 is not set +# CONFIG_PPC_970_NAP is not set +# CONFIG_PPC_INDIRECT_IO is not set +# CONFIG_GENERIC_IOMAP is not set +# CONFIG_CPU_FREQ is not set +# CONFIG_TAU is not set +# CONFIG_QUICC_ENGINE is not set +CONFIG_FSL_ULI1575=y +# CONFIG_MPC8xxx_GPIO is not set +# CONFIG_SIMPLE_GPIO is not set + +# +# Kernel options +# +CONFIG_HIGHMEM=y +CONFIG_TICK_ONESHOT=y +CONFIG_NO_HZ=y +CONFIG_HIGH_RES_TIMERS=y +CONFIG_GENERIC_CLOCKEVENTS_BUILD=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_SCHED_HRTICK=y +CONFIG_PREEMPT_NONE=y +# CONFIG_PREEMPT_VOLUNTARY is not set +# CONFIG_PREEMPT is not set +CONFIG_BINFMT_ELF=y +# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set +# CONFIG_HAVE_AOUT is not set +CONFIG_BINFMT_MISC=m +CONFIG_IOMMU_HELPER=y +CONFIG_SWIOTLB=y +CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y +CONFIG_ARCH_HAS_WALK_MEMORY=y +CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y +# CONFIG_KEXEC is not set +# CONFIG_CRASH_DUMP is not set +# CONFIG_IRQ_ALL_CPUS is not set +CONFIG_MAX_ACTIVE_REGIONS=32 +CONFIG_ARCH_FLATMEM_ENABLE=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_PAGEFLAGS_EXTENDED=y +CONFIG_SPLIT_PTLOCK_CPUS=4 +CONFIG_MIGRATION=y +# CONFIG_PHYS_ADDR_T_64BIT is not set +CONFIG_ZONE_DMA_FLAG=1 +CONFIG_BOUNCE=y +CONFIG_VIRT_TO_BUS=y +CONFIG_HAVE_MLOCK=y +CONFIG_HAVE_MLOCKED_PAGE_BIT=y +# CONFIG_KSM is not set +CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 +CONFIG_PPC_4K_PAGES=y +# CONFIG_PPC_16K_PAGES is not set +# CONFIG_PPC_64K_PAGES is not set +# CONFIG_PPC_256K_PAGES is not set +CONFIG_FORCE_MAX_ZONEORDER=11 +CONFIG_PROC_DEVICETREE=y +# CONFIG_CMDLINE_BOOL is not set +CONFIG_EXTRA_TARGETS="" +# CONFIG_PM is not set +CONFIG_SECCOMP=y +CONFIG_ISA_DMA_API=y + +# +# Bus options +# +CONFIG_ZONE_DMA=y +CONFIG_GENERIC_ISA_DMA=y +CONFIG_PPC_INDIRECT_PCI=y +CONFIG_FSL_SOC=y +CONFIG_FSL_PCI=y +CONFIG_PPC_PCI_CHOICE=y +CONFIG_PCI=y +CONFIG_PCI_DOMAINS=y +CONFIG_PCI_SYSCALL=y +# CONFIG_PCIEPORTBUS is not set +CONFIG_ARCH_SUPPORTS_MSI=y +# CONFIG_PCI_MSI is not set +# CONFIG_PCI_LEGACY is not set +# CONFIG_PCI_DEBUG is not set +# CONFIG_PCI_STUB is not set +# CONFIG_PCI_IOV is not set +# CONFIG_PCCARD is not set +# CONFIG_HOTPLUG_PCI is not set +CONFIG_HAS_RAPIDIO=y +# CONFIG_RAPIDIO is not set + +# +# Advanced setup +# +# CONFIG_ADVANCED_OPTIONS is not set + +# +# Default settings for advanced configuration options are used +# +CONFIG_LOWMEM_SIZE=0x30000000 +CONFIG_PAGE_OFFSET=0xc0000000 +CONFIG_KERNEL_START=0xc0000000 +CONFIG_PHYSICAL_START=0x00000000 +CONFIG_TASK_SIZE=0xc0000000 +CONFIG_NET=y + +# +# Networking options +# +CONFIG_PACKET=y +# CONFIG_PACKET_MMAP is not set +CONFIG_UNIX=y +CONFIG_XFRM=y +CONFIG_XFRM_USER=y +# CONFIG_XFRM_SUB_POLICY is not set +# CONFIG_XFRM_MIGRATE is not set +# CONFIG_XFRM_STATISTICS is not set +CONFIG_NET_KEY=m +# CONFIG_NET_KEY_MIGRATE is not set +CONFIG_INET=y +CONFIG_IP_MULTICAST=y +CONFIG_IP_ADVANCED_ROUTER=y +CONFIG_ASK_IP_FIB_HASH=y +# CONFIG_IP_FIB_TRIE is not set +CONFIG_IP_FIB_HASH=y +CONFIG_IP_MULTIPLE_TABLES=y +CONFIG_IP_ROUTE_MULTIPATH=y +CONFIG_IP_ROUTE_VERBOSE=y +CONFIG_IP_PNP=y +CONFIG_IP_PNP_DHCP=y +CONFIG_IP_PNP_BOOTP=y +CONFIG_IP_PNP_RARP=y +CONFIG_NET_IPIP=y +CONFIG_NET_IPGRE=y +CONFIG_NET_IPGRE_BROADCAST=y +CONFIG_IP_MROUTE=y +CONFIG_IP_PIMSM_V1=y +CONFIG_IP_PIMSM_V2=y +CONFIG_ARPD=y +# 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=y +# 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_LRO is not set +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=y +# CONFIG_IPV6_PRIVACY is not set +# CONFIG_IPV6_ROUTER_PREF is not set +# CONFIG_IPV6_OPTIMISTIC_DAD is not set +# CONFIG_INET6_AH is not set +# CONFIG_INET6_ESP is not set +# CONFIG_INET6_IPCOMP is not set +# CONFIG_IPV6_MIP6 is not set +# CONFIG_INET6_XFRM_TUNNEL is not set +# CONFIG_INET6_TUNNEL is not set +CONFIG_INET6_XFRM_MODE_TRANSPORT=y +CONFIG_INET6_XFRM_MODE_TUNNEL=y +CONFIG_INET6_XFRM_MODE_BEET=y +# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set +CONFIG_IPV6_SIT=y +CONFIG_IPV6_NDISC_NODETYPE=y +# CONFIG_IPV6_TUNNEL is not set +# CONFIG_IPV6_MULTIPLE_TABLES is not set +# CONFIG_IPV6_MROUTE is not set +# CONFIG_NETWORK_SECMARK is not set +# CONFIG_NETFILTER is not set +# CONFIG_IP_DCCP is not set +CONFIG_IP_SCTP=m +# CONFIG_SCTP_DBG_MSG is not set +# CONFIG_SCTP_DBG_OBJCNT is not set +# CONFIG_SCTP_HMAC_NONE is not set +# CONFIG_SCTP_HMAC_SHA1 is not set +CONFIG_SCTP_HMAC_MD5=y +# CONFIG_RDS is not set +# CONFIG_TIPC is not set +# CONFIG_ATM is not set +# CONFIG_BRIDGE is not set +# CONFIG_NET_DSA 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 +# CONFIG_PHONET is not set +# CONFIG_IEEE802154 is not set +# CONFIG_NET_SCHED is not set +# CONFIG_DCB is not set + +# +# Network testing +# +# CONFIG_NET_PKTGEN is not set +# CONFIG_HAMRADIO is not set +# CONFIG_CAN is not set +# CONFIG_IRDA is not set +# CONFIG_BT is not set +# CONFIG_AF_RXRPC is not set +CONFIG_FIB_RULES=y +CONFIG_WIRELESS=y +# CONFIG_CFG80211 is not set +CONFIG_CFG80211_DEFAULT_PS_VALUE=0 +CONFIG_WIRELESS_OLD_REGULATORY=y +# CONFIG_WIRELESS_EXT is not set +# CONFIG_LIB80211 is not set + +# +# CFG80211 needs to be enabled for MAC80211 +# +# CONFIG_WIMAX is not set +# CONFIG_RFKILL is not set +# CONFIG_NET_9P is not set + +# +# Device Drivers +# + +# +# Generic Driver Options +# +CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" +# CONFIG_DEVTMPFS is not set +CONFIG_STANDALONE=y +CONFIG_PREVENT_FIRMWARE_BUILD=y +CONFIG_FW_LOADER=y +CONFIG_FIRMWARE_IN_KERNEL=y +CONFIG_EXTRA_FIRMWARE="" +# CONFIG_DEBUG_DRIVER is not set +# CONFIG_DEBUG_DEVRES is not set +# CONFIG_SYS_HYPERVISOR is not set +# CONFIG_CONNECTOR is not set +# CONFIG_MTD is not set +CONFIG_OF_DEVICE=y +CONFIG_OF_I2C=y +CONFIG_OF_MDIO=y +# CONFIG_PARPORT is not set +CONFIG_BLK_DEV=y +# CONFIG_BLK_DEV_FD 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=y +# CONFIG_BLK_DEV_CRYPTOLOOP is not set +CONFIG_BLK_DEV_NBD=y +# 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=131072 +# CONFIG_BLK_DEV_XIP is not set +# CONFIG_CDROM_PKTCDVD is not set +# CONFIG_ATA_OVER_ETH is not set +# CONFIG_BLK_DEV_HD is not set +CONFIG_MISC_DEVICES=y +# CONFIG_PHANTOM is not set +# CONFIG_SGI_IOC4 is not set +# CONFIG_TIFM_CORE is not set +# CONFIG_ICS932S401 is not set +# CONFIG_ENCLOSURE_SERVICES is not set +# CONFIG_HP_ILO is not set +# CONFIG_ISL29003 is not set +# CONFIG_C2PORT is not set + +# +# EEPROM support +# +# CONFIG_EEPROM_AT24 is not set +CONFIG_EEPROM_LEGACY=y +# CONFIG_EEPROM_MAX6875 is not set +# CONFIG_EEPROM_93CX6 is not set +# CONFIG_CB710_CORE is not set +CONFIG_HAVE_IDE=y +# CONFIG_IDE is not set + +# +# SCSI device support +# +# CONFIG_RAID_ATTRS is not set +CONFIG_SCSI=y +CONFIG_SCSI_DMA=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=y +# 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 +CONFIG_SCSI_MULTI_LUN=y +# CONFIG_SCSI_CONSTANTS is not set +CONFIG_SCSI_LOGGING=y +# 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_LIBSAS is not set +# CONFIG_SCSI_SRP_ATTRS is not set +CONFIG_SCSI_LOWLEVEL=y +# CONFIG_ISCSI_TCP is not set +# CONFIG_SCSI_CXGB3_ISCSI is not set +# CONFIG_SCSI_BNX2_ISCSI is not set +# CONFIG_BE2ISCSI 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_MVSAS 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_MPT2SAS is not set +# CONFIG_SCSI_HPTIOP is not set +# CONFIG_SCSI_BUSLOGIC is not set +# CONFIG_LIBFC is not set +# CONFIG_LIBFCOE is not set +# CONFIG_FCOE 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_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_PMCRAID is not set +# CONFIG_SCSI_SRP is not set +# CONFIG_SCSI_BFA_FC is not set +# CONFIG_SCSI_DH is not set +# CONFIG_SCSI_OSD_INITIATOR is not set +CONFIG_ATA=y +# CONFIG_ATA_NONSTANDARD is not set +CONFIG_ATA_VERBOSE_ERROR=y +CONFIG_SATA_PMP=y +CONFIG_SATA_AHCI=y +# CONFIG_SATA_SIL24 is not set +# CONFIG_SATA_FSL is not set +CONFIG_ATA_SFF=y +# 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_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=y +# CONFIG_PATA_AMD is not set +# CONFIG_PATA_ARTOP is not set +# CONFIG_PATA_ATP867X 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_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_NINJA32 is not set +# CONFIG_PATA_NS87410 is not set +# CONFIG_PATA_NS87415 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_RDC 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 +# CONFIG_PATA_PLATFORM is not set +# CONFIG_PATA_SCH is not set +# CONFIG_MD is not set +# CONFIG_FUSION is not set + +# +# IEEE 1394 (FireWire) support +# + +# +# You can enable one or both FireWire driver stacks. +# + +# +# See the help texts for more information. +# +# CONFIG_FIREWIRE is not set +# CONFIG_IEEE1394 is not set +# CONFIG_I2O is not set +# CONFIG_MACINTOSH_DRIVERS is not set +CONFIG_NETDEVICES=y +CONFIG_DUMMY=y +# CONFIG_BONDING is not set +# CONFIG_MACVLAN is not set +# CONFIG_EQUALIZER is not set +# CONFIG_TUN is not set +# CONFIG_VETH is not set +# CONFIG_ARCNET is not set +CONFIG_PHYLIB=y + +# +# MII PHY device drivers +# +# CONFIG_MARVELL_PHY is not set +# CONFIG_DAVICOM_PHY is not set +# CONFIG_QSEMI_PHY is not set +# CONFIG_LXT_PHY is not set +# CONFIG_CICADA_PHY is not set +CONFIG_VITESSE_PHY=y +# CONFIG_SMSC_PHY is not set +# CONFIG_BROADCOM_PHY is not set +# CONFIG_ICPLUS_PHY is not set +# CONFIG_REALTEK_PHY is not set +# CONFIG_NATIONAL_PHY is not set +# CONFIG_STE10XP is not set +# CONFIG_LSI_ET1011C_PHY is not set +# CONFIG_FIXED_PHY is not set +# CONFIG_MDIO_BITBANG is not set +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_ETHOC is not set +# CONFIG_DNET is not set +# CONFIG_NET_TULIP is not set +# CONFIG_HP100 is not set +# CONFIG_IBM_NEW_EMAC_ZMII is not set +# CONFIG_IBM_NEW_EMAC_RGMII is not set +# CONFIG_IBM_NEW_EMAC_TAH is not set +# CONFIG_IBM_NEW_EMAC_EMAC4 is not set +# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set +# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set +# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set +# CONFIG_NET_PCI is not set +# CONFIG_B44 is not set +# CONFIG_KS8842 is not set +# CONFIG_KS8851_MLL is not set +# CONFIG_ATL2 is not set +# CONFIG_XILINX_EMACLITE is not set +CONFIG_NETDEV_1000=y +# CONFIG_ACENIC is not set +# CONFIG_DL2K is not set +# CONFIG_E1000 is not set +# CONFIG_E1000E is not set +# CONFIG_IP1000 is not set +# CONFIG_IGB is not set +# CONFIG_IGBVF 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_VIA_VELOCITY is not set +# CONFIG_TIGON3 is not set +# CONFIG_BNX2 is not set +# CONFIG_CNIC is not set +CONFIG_FSL_PQ_MDIO=y +CONFIG_GIANFAR=y +# CONFIG_MV643XX_ETH is not set +# CONFIG_QLA3XXX is not set +# CONFIG_ATL1 is not set +# CONFIG_ATL1E is not set +# CONFIG_ATL1C is not set +# CONFIG_JME is not set +CONFIG_NETDEV_10000=y +# CONFIG_CHELSIO_T1 is not set +CONFIG_CHELSIO_T3_DEPENDS=y +# CONFIG_CHELSIO_T3 is not set +# CONFIG_ENIC is not set +# CONFIG_IXGBE is not set +# CONFIG_IXGB is not set +# CONFIG_S2IO is not set +# CONFIG_VXGE is not set +# CONFIG_MYRI10GE is not set +# CONFIG_NETXEN_NIC is not set +# CONFIG_NIU is not set +# CONFIG_MLX4_EN is not set +# CONFIG_MLX4_CORE is not set +# CONFIG_TEHUTI is not set +# CONFIG_BNX2X is not set +# CONFIG_QLGE is not set +# CONFIG_SFC is not set +# CONFIG_BE2NET is not set +# CONFIG_TR is not set +CONFIG_WLAN=y +# CONFIG_WLAN_PRE80211 is not set +# CONFIG_WLAN_80211 is not set + +# +# Enable WiMAX (Networking options) to see the WiMAX drivers +# + +# +# USB Network Adapters +# +# CONFIG_USB_CATC is not set +# CONFIG_USB_KAWETH is not set +# CONFIG_USB_PEGASUS is not set +# CONFIG_USB_RTL8150 is not set +# CONFIG_USB_USBNET is not set +# CONFIG_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_NETCONSOLE is not set +# CONFIG_NETPOLL is not set +# CONFIG_NET_POLL_CONTROLLER is not set +# CONFIG_ISDN is not set +# CONFIG_PHONE is not set + +# +# Input device support +# +CONFIG_INPUT=y +CONFIG_INPUT_FF_MEMLESS=m +# CONFIG_INPUT_POLLDEV is not set + +# +# Userland interfaces +# +# CONFIG_INPUT_MOUSEDEV is not set +# CONFIG_INPUT_JOYDEV is not set +# CONFIG_INPUT_EVDEV is not set +# CONFIG_INPUT_EVBUG is not set + +# +# Input Device Drivers +# +# CONFIG_INPUT_KEYBOARD is not set +# CONFIG_INPUT_MOUSE is not set +# CONFIG_INPUT_JOYSTICK is not set +# CONFIG_INPUT_TABLET is not set +# CONFIG_INPUT_TOUCHSCREEN is not set +# CONFIG_INPUT_MISC is not set + +# +# Hardware I/O ports +# +CONFIG_SERIO=y +CONFIG_SERIO_I8042=y +CONFIG_SERIO_SERPORT=y +# CONFIG_SERIO_PCIPS2 is not set +CONFIG_SERIO_LIBPS2=y +# CONFIG_SERIO_RAW is not set +# CONFIG_SERIO_XILINX_XPS_PS2 is not set +# CONFIG_GAMEPORT is not set + +# +# Character devices +# +CONFIG_VT=y +CONFIG_CONSOLE_TRANSLATIONS=y +CONFIG_VT_CONSOLE=y +CONFIG_HW_CONSOLE=y +# CONFIG_VT_HW_CONSOLE_BINDING is not set +CONFIG_DEVKMEM=y +# CONFIG_SERIAL_NONSTANDARD is not set +# CONFIG_NOZOMI is not set + +# +# Serial drivers +# +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_SERIAL_8250_PCI=y +CONFIG_SERIAL_8250_NR_UARTS=2 +CONFIG_SERIAL_8250_RUNTIME_UARTS=2 +CONFIG_SERIAL_8250_EXTENDED=y +CONFIG_SERIAL_8250_MANY_PORTS=y +CONFIG_SERIAL_8250_SHARE_IRQ=y +CONFIG_SERIAL_8250_DETECT_IRQ=y +CONFIG_SERIAL_8250_RSA=y + +# +# Non-8250 serial port support +# +# CONFIG_SERIAL_UARTLITE is not set +CONFIG_SERIAL_CORE=y +CONFIG_SERIAL_CORE_CONSOLE=y +# CONFIG_SERIAL_JSM is not set +# CONFIG_SERIAL_OF_PLATFORM is not set +CONFIG_UNIX98_PTYS=y +# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set +CONFIG_LEGACY_PTYS=y +CONFIG_LEGACY_PTY_COUNT=256 +# CONFIG_HVC_UDBG is not set +# CONFIG_IPMI_HANDLER is not set +# CONFIG_HW_RANDOM is not set +CONFIG_NVRAM=y +# CONFIG_R3964 is not set +# CONFIG_APPLICOM is not set +# CONFIG_RAW_DRIVER is not set +# CONFIG_TCG_TPM is not set +CONFIG_DEVPORT=y +CONFIG_I2C=y +CONFIG_I2C_BOARDINFO=y +CONFIG_I2C_COMPAT=y +# CONFIG_I2C_CHARDEV is not set +CONFIG_I2C_HELPER_AUTO=y + +# +# I2C Hardware Bus support +# + +# +# PC SMBus host controller drivers +# +# 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_ISCH is not set +# CONFIG_I2C_PIIX4 is not set +# CONFIG_I2C_NFORCE2 is not set +# CONFIG_I2C_SIS5595 is not set +# CONFIG_I2C_SIS630 is not set +# CONFIG_I2C_SIS96X is not set +# CONFIG_I2C_VIA is not set +# CONFIG_I2C_VIAPRO is not set + +# +# I2C system bus drivers (mostly embedded / system-on-chip) +# +CONFIG_I2C_MPC=y +# CONFIG_I2C_OCORES is not set +# CONFIG_I2C_SIMTEC is not set + +# +# External I2C/SMBus adapter drivers +# +# CONFIG_I2C_PARPORT_LIGHT is not set +# CONFIG_I2C_TAOS_EVM is not set +# CONFIG_I2C_TINY_USB is not set + +# +# Graphics adapter I2C/DDC channel drivers +# +# CONFIG_I2C_VOODOO3 is not set + +# +# Other I2C/SMBus bus drivers +# +# CONFIG_I2C_PCA_PLATFORM is not set +# CONFIG_I2C_STUB is not set + +# +# Miscellaneous I2C Chip support +# +# CONFIG_DS1682 is not set +# CONFIG_SENSORS_TSL2550 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 +# CONFIG_SPI is not set + +# +# PPS support +# +# CONFIG_PPS is not set +CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y +# CONFIG_GPIOLIB is not set +# CONFIG_W1 is not set +# CONFIG_POWER_SUPPLY is not set +# CONFIG_HWMON is not set +# CONFIG_THERMAL is not set +# CONFIG_WATCHDOG is not set +CONFIG_SSB_POSSIBLE=y + +# +# Sonics Silicon Backplane +# +# CONFIG_SSB is not set + +# +# Multifunction device drivers +# +# CONFIG_MFD_CORE is not set +# CONFIG_MFD_SM501 is not set +# CONFIG_HTC_PASIC3 is not set +# CONFIG_TWL4030_CORE is not set +# CONFIG_MFD_TMIO is not set +# CONFIG_PMIC_DA903X is not set +# CONFIG_MFD_WM8400 is not set +# CONFIG_MFD_WM831X is not set +# CONFIG_MFD_WM8350_I2C is not set +# CONFIG_MFD_PCF50633 is not set +# CONFIG_AB3100_CORE is not set +# CONFIG_REGULATOR is not set +# CONFIG_MEDIA_SUPPORT is not set + +# +# Graphics support +# +# CONFIG_AGP is not set +CONFIG_VGA_ARB=y +# CONFIG_DRM is not set +# CONFIG_VGASTATE is not set +CONFIG_VIDEO_OUTPUT_CONTROL=y +# CONFIG_FB is not set +# CONFIG_BACKLIGHT_LCD_SUPPORT is not set + +# +# Display device support +# +# CONFIG_DISPLAY_SUPPORT is not set + +# +# Console display driver support +# +CONFIG_VGA_CONSOLE=y +# CONFIG_VGACON_SOFT_SCROLLBACK is not set +CONFIG_DUMMY_CONSOLE=y +CONFIG_SOUND=y +CONFIG_SOUND_OSS_CORE=y +CONFIG_SOUND_OSS_CORE_PRECLAIM=y +CONFIG_SND=y +CONFIG_SND_TIMER=y +CONFIG_SND_PCM=y +# CONFIG_SND_SEQUENCER is not set +CONFIG_SND_OSSEMUL=y +CONFIG_SND_MIXER_OSS=y +CONFIG_SND_PCM_OSS=y +CONFIG_SND_PCM_OSS_PLUGINS=y +# CONFIG_SND_HRTIMER is not set +# CONFIG_SND_DYNAMIC_MINORS is not set +# CONFIG_SND_SUPPORT_OLD_API is not set +CONFIG_SND_VERBOSE_PROCFS=y +# CONFIG_SND_VERBOSE_PRINTK is not set +# CONFIG_SND_DEBUG is not set +CONFIG_SND_VMASTER=y +# CONFIG_SND_RAWMIDI_SEQ is not set +# CONFIG_SND_OPL3_LIB_SEQ is not set +# CONFIG_SND_OPL4_LIB_SEQ is not set +# CONFIG_SND_SBAWE_SEQ is not set +# CONFIG_SND_EMU10K1_SEQ is not set +CONFIG_SND_AC97_CODEC=y +CONFIG_SND_DRIVERS=y +# 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 +# CONFIG_SND_AC97_POWER_SAVE is not set +CONFIG_SND_PCI=y +# 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_AW2 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_OXYGEN is not set +# CONFIG_SND_CS4281 is not set +# CONFIG_SND_CS46XX is not set +# CONFIG_SND_CS5530 is not set +# CONFIG_SND_CTXFI 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_INDIGOIOX is not set +# CONFIG_SND_INDIGODJX 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_HIFIER is not set +# CONFIG_SND_ICE1712 is not set +# CONFIG_SND_ICE1724 is not set +CONFIG_SND_INTEL8X0=y +# CONFIG_SND_INTEL8X0M is not set +# CONFIG_SND_KORG1212 is not set +# CONFIG_SND_LX6464ES 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_VIRTUOSO is not set +# CONFIG_SND_VX222 is not set +# CONFIG_SND_YMFPCI is not set +CONFIG_SND_PPC=y +CONFIG_SND_USB=y +# CONFIG_SND_USB_AUDIO is not set +# CONFIG_SND_USB_USX2Y is not set +# CONFIG_SND_USB_CAIAQ is not set +# CONFIG_SND_SOC is not set +# CONFIG_SOUND_PRIME is not set +CONFIG_AC97_BUS=y +CONFIG_HID_SUPPORT=y +CONFIG_HID=y +# CONFIG_HIDRAW is not set + +# +# USB Input Devices +# +CONFIG_USB_HID=y +# CONFIG_HID_PID is not set +# CONFIG_USB_HIDDEV is not set + +# +# Special HID drivers +# +CONFIG_HID_A4TECH=y +CONFIG_HID_APPLE=y +CONFIG_HID_BELKIN=y +CONFIG_HID_CHERRY=y +CONFIG_HID_CHICONY=y +CONFIG_HID_CYPRESS=y +# CONFIG_HID_DRAGONRISE is not set +CONFIG_HID_EZKEY=y +# CONFIG_HID_KYE is not set +CONFIG_HID_GYRATION=y +# CONFIG_HID_TWINHAN is not set +# CONFIG_HID_KENSINGTON is not set +CONFIG_HID_LOGITECH=y +# CONFIG_LOGITECH_FF is not set +# CONFIG_LOGIRUMBLEPAD2_FF is not set +CONFIG_HID_MICROSOFT=y +CONFIG_HID_MONTEREY=y +# CONFIG_HID_NTRIG is not set +CONFIG_HID_PANTHERLORD=y +# CONFIG_PANTHERLORD_FF is not set +CONFIG_HID_PETALYNX=y +CONFIG_HID_SAMSUNG=y +CONFIG_HID_SONY=y +CONFIG_HID_SUNPLUS=y +# CONFIG_HID_GREENASIA is not set +# CONFIG_HID_SMARTJOYPLUS is not set +# CONFIG_HID_TOPSEED is not set +# CONFIG_HID_THRUSTMASTER is not set +# CONFIG_HID_ZEROPLUS is not set +CONFIG_USB_SUPPORT=y +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 +# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set + +# +# Miscellaneous USB options +# +CONFIG_USB_DEVICEFS=y +CONFIG_USB_DEVICE_CLASS=y +# CONFIG_USB_DYNAMIC_MINORS is not set +# CONFIG_USB_OTG is not set +# CONFIG_USB_OTG_WHITELIST is not set +# CONFIG_USB_OTG_BLACKLIST_HUB is not set +CONFIG_USB_MON=y +# CONFIG_USB_WUSB is not set +# CONFIG_USB_WUSB_CBAF is not set + +# +# USB Host Controller Drivers +# +# CONFIG_USB_C67X00_HCD is not set +# CONFIG_USB_XHCI_HCD is not set +CONFIG_USB_EHCI_HCD=y +# CONFIG_USB_EHCI_ROOT_HUB_TT is not set +# CONFIG_USB_EHCI_TT_NEWSCHED is not set +# CONFIG_USB_EHCI_FSL is not set +CONFIG_USB_EHCI_HCD_PPC_OF=y +# CONFIG_USB_OXU210HP_HCD is not set +# CONFIG_USB_ISP116X_HCD is not set +# CONFIG_USB_ISP1760_HCD is not set +# CONFIG_USB_ISP1362_HCD is not set +CONFIG_USB_OHCI_HCD=y +CONFIG_USB_OHCI_HCD_PPC_OF_BE=y +CONFIG_USB_OHCI_HCD_PPC_OF_LE=y +CONFIG_USB_OHCI_HCD_PPC_OF=y +CONFIG_USB_OHCI_HCD_PCI=y +CONFIG_USB_OHCI_BIG_ENDIAN_DESC=y +CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y +CONFIG_USB_OHCI_LITTLE_ENDIAN=y +# CONFIG_USB_UHCI_HCD is not set +# CONFIG_USB_SL811_HCD is not set +# CONFIG_USB_R8A66597_HCD is not set +# CONFIG_USB_WHCI_HCD is not set +# CONFIG_USB_HWA_HCD is not set + +# +# USB Device Class drivers +# +# CONFIG_USB_ACM is not set +# CONFIG_USB_PRINTER is not set +# CONFIG_USB_WDM is not set +# CONFIG_USB_TMC is not set + +# +# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may +# + +# +# also be needed; see USB_STORAGE Help for more info +# +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_ISD200 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_STORAGE_CYPRESS_ATACB is not set +# CONFIG_USB_LIBUSUAL is not set + +# +# USB Imaging devices +# +# CONFIG_USB_MDC800 is not set +# CONFIG_USB_MICROTEK is not set + +# +# USB port drivers +# +# 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_SEVSEG 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_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 +# CONFIG_USB_ISIGHTFW is not set +# CONFIG_USB_VST is not set +# CONFIG_USB_GADGET is not set + +# +# OTG and related infrastructure +# +# CONFIG_NOP_USB_XCEIV is not set +# CONFIG_UWB is not set +# CONFIG_MMC is not set +# CONFIG_MEMSTICK is not set +# CONFIG_NEW_LEDS is not set +# CONFIG_ACCESSIBILITY is not set +# CONFIG_INFINIBAND is not set +# CONFIG_EDAC is not set +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 +# CONFIG_RTC_DRV_TEST is not set + +# +# I2C RTC drivers +# +# CONFIG_RTC_DRV_DS1307 is not set +# CONFIG_RTC_DRV_DS1374 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 +# CONFIG_RTC_DRV_M41T80 is not set +# CONFIG_RTC_DRV_S35390A is not set +# CONFIG_RTC_DRV_FM3130 is not set +# CONFIG_RTC_DRV_RX8581 is not set +# CONFIG_RTC_DRV_RX8025 is not set + +# +# SPI RTC drivers +# + +# +# Platform RTC drivers +# +CONFIG_RTC_DRV_CMOS=y +# CONFIG_RTC_DRV_DS1286 is not set +# CONFIG_RTC_DRV_DS1511 is not set +# CONFIG_RTC_DRV_DS1553 is not set +# CONFIG_RTC_DRV_DS1742 is not set +# CONFIG_RTC_DRV_STK17TA8 is not set +# CONFIG_RTC_DRV_M48T86 is not set +# CONFIG_RTC_DRV_M48T35 is not set +# CONFIG_RTC_DRV_M48T59 is not set +# CONFIG_RTC_DRV_BQ4802 is not set +# CONFIG_RTC_DRV_V3020 is not set + +# +# on-CPU RTC drivers +# +# CONFIG_RTC_DRV_GENERIC is not set +# CONFIG_DMADEVICES is not set +# CONFIG_AUXDISPLAY is not set +# CONFIG_UIO is not set + +# +# TI VLYNQ +# +# CONFIG_STAGING 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_DEFAULTS_TO_ORDERED is not set +CONFIG_EXT3_FS_XATTR=y +# CONFIG_EXT3_FS_POSIX_ACL is not set +# CONFIG_EXT3_FS_SECURITY is not set +# CONFIG_EXT4_FS is not set +CONFIG_JBD=y +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_BTRFS_FS is not set +# CONFIG_NILFS2_FS is not set +CONFIG_FILE_LOCKING=y +CONFIG_FSNOTIFY=y +CONFIG_DNOTIFY=y +CONFIG_INOTIFY=y +CONFIG_INOTIFY_USER=y +# CONFIG_QUOTA is not set +# CONFIG_AUTOFS_FS is not set +# CONFIG_AUTOFS4_FS is not set +# CONFIG_FUSE_FS is not set + +# +# Caches +# +# CONFIG_FSCACHE is not set + +# +# 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=y +CONFIG_MSDOS_FS=m +CONFIG_VFAT_FS=y +CONFIG_FAT_DEFAULT_CODEPAGE=437 +CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" +CONFIG_NTFS_FS=y +# 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_PROC_PAGE_MONITOR=y +CONFIG_SYSFS=y +CONFIG_TMPFS=y +# CONFIG_TMPFS_POSIX_ACL is not set +# CONFIG_HUGETLB_PAGE is not set +# CONFIG_CONFIGFS_FS is not set +CONFIG_MISC_FILESYSTEMS=y +CONFIG_ADFS_FS=m +# CONFIG_ADFS_FS_RW is not set +CONFIG_AFFS_FS=m +CONFIG_HFS_FS=m +CONFIG_HFSPLUS_FS=m +CONFIG_BEFS_FS=m +# CONFIG_BEFS_DEBUG is not set +CONFIG_BFS_FS=m +CONFIG_EFS_FS=m +CONFIG_CRAMFS=y +# CONFIG_SQUASHFS is not set +CONFIG_VXFS_FS=m +# CONFIG_MINIX_FS is not set +# CONFIG_OMFS_FS is not set +CONFIG_HPFS_FS=m +CONFIG_QNX4FS_FS=m +# CONFIG_ROMFS_FS is not set +CONFIG_SYSV_FS=m +CONFIG_UFS_FS=m +# CONFIG_UFS_FS_WRITE is not set +# CONFIG_UFS_DEBUG is not set +CONFIG_NETWORK_FILESYSTEMS=y +CONFIG_NFS_FS=y +CONFIG_NFS_V3=y +# CONFIG_NFS_V3_ACL is not set +CONFIG_NFS_V4=y +# CONFIG_NFS_V4_1 is not set +CONFIG_ROOT_NFS=y +CONFIG_NFSD=y +# CONFIG_NFSD_V3 is not set +# CONFIG_NFSD_V4 is not set +CONFIG_LOCKD=y +CONFIG_LOCKD_V4=y +CONFIG_EXPORTFS=y +CONFIG_NFS_COMMON=y +CONFIG_SUNRPC=y +CONFIG_SUNRPC_GSS=y +CONFIG_RPCSEC_GSS_KRB5=y +# CONFIG_RPCSEC_GSS_SPKM3 is not set +# CONFIG_SMB_FS is not set +# CONFIG_CIFS is not set +# CONFIG_NCP_FS is not set +# CONFIG_CODA_FS is not set +# CONFIG_AFS_FS is not set + +# +# Partition Types +# +CONFIG_PARTITION_ADVANCED=y +# CONFIG_ACORN_PARTITION is not set +# CONFIG_OSF_PARTITION is not set +# CONFIG_AMIGA_PARTITION is not set +# CONFIG_ATARI_PARTITION is not set +CONFIG_MAC_PARTITION=y +CONFIG_MSDOS_PARTITION=y +# CONFIG_BSD_DISKLABEL is not set +# CONFIG_MINIX_SUBPARTITION is not set +# CONFIG_SOLARIS_X86_PARTITION is not set +# CONFIG_UNIXWARE_DISKLABEL is not set +# CONFIG_LDM_PARTITION is not set +# CONFIG_SGI_PARTITION is not set +# CONFIG_ULTRIX_PARTITION is not set +# CONFIG_SUN_PARTITION is not set +# CONFIG_KARMA_PARTITION is not set +# CONFIG_EFI_PARTITION is not set +# CONFIG_SYSV68_PARTITION is not set +CONFIG_NLS=y +CONFIG_NLS_DEFAULT="iso8859-1" +# CONFIG_NLS_CODEPAGE_437 is not set +# 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 is not set +# 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=m +# CONFIG_DLM is not set +# CONFIG_BINARY_PRINTF is not set + +# +# Library routines +# +CONFIG_BITREVERSE=y +CONFIG_GENERIC_FIND_LAST_BIT=y +# CONFIG_CRC_CCITT is not set +# CONFIG_CRC16 is not set +CONFIG_CRC_T10DIF=y +CONFIG_CRC_ITU_T=m +CONFIG_CRC32=y +# CONFIG_CRC7 is not set +CONFIG_LIBCRC32C=m +CONFIG_ZLIB_INFLATE=y +CONFIG_DECOMPRESS_GZIP=y +CONFIG_HAS_IOMEM=y +CONFIG_HAS_IOPORT=y +CONFIG_HAS_DMA=y +CONFIG_HAVE_LMB=y +CONFIG_NLATTR=y +CONFIG_GENERIC_ATOMIC64=y + +# +# Kernel hacking +# +# CONFIG_PRINTK_TIME is not set +CONFIG_ENABLE_WARN_DEPRECATED=y +CONFIG_ENABLE_MUST_CHECK=y +CONFIG_FRAME_WARN=1024 +# CONFIG_MAGIC_SYSRQ is not set +# CONFIG_STRIP_ASM_SYMS is not set +# 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_DETECT_SOFTLOCKUP=y +# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set +CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 +CONFIG_DETECT_HUNG_TASK=y +# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set +CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0 +CONFIG_SCHED_DEBUG=y +# CONFIG_SCHEDSTATS is not set +# CONFIG_TIMER_STATS is not set +# CONFIG_DEBUG_OBJECTS is not set +# CONFIG_SLUB_DEBUG_ON is not set +# CONFIG_SLUB_STATS is not set +# CONFIG_DEBUG_KMEMLEAK 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_LOCK_ALLOC is not set +# CONFIG_PROVE_LOCKING is not set +# CONFIG_LOCK_STAT 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_HIGHMEM is not set +# CONFIG_DEBUG_BUGVERBOSE is not set +CONFIG_DEBUG_INFO=y +# CONFIG_DEBUG_VM is not set +# CONFIG_DEBUG_WRITECOUNT is not set +# CONFIG_DEBUG_MEMORY_INIT is not set +# CONFIG_DEBUG_LIST is not set +# CONFIG_DEBUG_SG is not set +# CONFIG_DEBUG_NOTIFIERS is not set +# CONFIG_DEBUG_CREDENTIALS is not set +# CONFIG_RCU_TORTURE_TEST is not set +# CONFIG_RCU_CPU_STALL_DETECTOR is not set +# CONFIG_BACKTRACE_SELF_TEST is not set +# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set +# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set +# CONFIG_FAULT_INJECTION is not set +# CONFIG_LATENCYTOP is not set +CONFIG_SYSCTL_SYSCALL_CHECK=y +# CONFIG_DEBUG_PAGEALLOC is not set +CONFIG_HAVE_FUNCTION_TRACER=y +CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y +CONFIG_HAVE_DYNAMIC_FTRACE=y +CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y +CONFIG_TRACING_SUPPORT=y +CONFIG_FTRACE=y +# CONFIG_FUNCTION_TRACER is not set +# CONFIG_IRQSOFF_TRACER is not set +# CONFIG_SCHED_TRACER is not set +# CONFIG_ENABLE_DEFAULT_TRACERS is not set +# CONFIG_BOOT_TRACER is not set +CONFIG_BRANCH_PROFILE_NONE=y +# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set +# CONFIG_PROFILE_ALL_BRANCHES is not set +# CONFIG_STACK_TRACER is not set +# CONFIG_KMEMTRACE is not set +# CONFIG_WORKQUEUE_TRACER is not set +# CONFIG_BLK_DEV_IO_TRACE is not set +# CONFIG_DMA_API_DEBUG is not set +# CONFIG_SAMPLES is not set +CONFIG_HAVE_ARCH_KGDB=y +# CONFIG_KGDB is not set +# CONFIG_PPC_DISABLE_WERROR is not set +CONFIG_PPC_WERROR=y +CONFIG_PRINT_STACK_DEPTH=64 +# CONFIG_DEBUG_STACKOVERFLOW is not set +# CONFIG_DEBUG_STACK_USAGE is not set +# CONFIG_CODE_PATCHING_SELFTEST is not set +# CONFIG_FTR_FIXUP_SELFTEST is not set +# CONFIG_MSI_BITMAP_SELFTEST is not set +# CONFIG_XMON is not set +# CONFIG_IRQSTACKS is not set +# CONFIG_BDI_SWITCH is not set +# CONFIG_BOOTX_TEXT is not set +# CONFIG_PPC_EARLY_DEBUG is not set + +# +# Security options +# +# CONFIG_KEYS is not set +# CONFIG_SECURITY is not set +# CONFIG_SECURITYFS is not set +# CONFIG_SECURITY_FILE_CAPABILITIES is not set +CONFIG_CRYPTO=y + +# +# Crypto core or helper +# +CONFIG_CRYPTO_ALGAPI=y +CONFIG_CRYPTO_ALGAPI2=y +CONFIG_CRYPTO_AEAD2=y +CONFIG_CRYPTO_BLKCIPHER=y +CONFIG_CRYPTO_BLKCIPHER2=y +CONFIG_CRYPTO_HASH=y +CONFIG_CRYPTO_HASH2=y +CONFIG_CRYPTO_RNG2=y +CONFIG_CRYPTO_PCOMP=y +CONFIG_CRYPTO_MANAGER=y +CONFIG_CRYPTO_MANAGER2=y +# CONFIG_CRYPTO_GF128MUL is not set +# CONFIG_CRYPTO_NULL is not set +CONFIG_CRYPTO_WORKQUEUE=y +# CONFIG_CRYPTO_CRYPTD is not set +# CONFIG_CRYPTO_AUTHENC is not set +# CONFIG_CRYPTO_TEST is not set + +# +# Authenticated Encryption with Associated Data +# +# CONFIG_CRYPTO_CCM is not set +# CONFIG_CRYPTO_GCM is not set +# CONFIG_CRYPTO_SEQIV is not set + +# +# Block modes +# +CONFIG_CRYPTO_CBC=y +# CONFIG_CRYPTO_CTR is not set +# CONFIG_CRYPTO_CTS is not set +# CONFIG_CRYPTO_ECB is not set +# CONFIG_CRYPTO_LRW is not set +CONFIG_CRYPTO_PCBC=m +# CONFIG_CRYPTO_XTS is not set + +# +# Hash modes +# +CONFIG_CRYPTO_HMAC=y +# CONFIG_CRYPTO_XCBC is not set +# CONFIG_CRYPTO_VMAC is not set + +# +# Digest +# +CONFIG_CRYPTO_CRC32C=m +# CONFIG_CRYPTO_GHASH is not set +# CONFIG_CRYPTO_MD4 is not set +CONFIG_CRYPTO_MD5=y +# CONFIG_CRYPTO_MICHAEL_MIC is not set +# CONFIG_CRYPTO_RMD128 is not set +# CONFIG_CRYPTO_RMD160 is not set +# CONFIG_CRYPTO_RMD256 is not set +# CONFIG_CRYPTO_RMD320 is not set +CONFIG_CRYPTO_SHA1=m +# CONFIG_CRYPTO_SHA256 is not set +# CONFIG_CRYPTO_SHA512 is not set +# CONFIG_CRYPTO_TGR192 is not set +# CONFIG_CRYPTO_WP512 is not set + +# +# Ciphers +# +# CONFIG_CRYPTO_AES is not set +# CONFIG_CRYPTO_ANUBIS is not set +# CONFIG_CRYPTO_ARC4 is not set +# CONFIG_CRYPTO_BLOWFISH is not set +# CONFIG_CRYPTO_CAMELLIA is not set +# CONFIG_CRYPTO_CAST5 is not set +# CONFIG_CRYPTO_CAST6 is not set +CONFIG_CRYPTO_DES=y +# CONFIG_CRYPTO_FCRYPT is not set +# CONFIG_CRYPTO_KHAZAD is not set +# CONFIG_CRYPTO_SALSA20 is not set +# CONFIG_CRYPTO_SEED is not set +# CONFIG_CRYPTO_SERPENT is not set +# CONFIG_CRYPTO_TEA is not set +# CONFIG_CRYPTO_TWOFISH is not set + +# +# Compression +# +# CONFIG_CRYPTO_DEFLATE is not set +# CONFIG_CRYPTO_ZLIB is not set +# CONFIG_CRYPTO_LZO is not set + +# +# Random Number Generation +# +# CONFIG_CRYPTO_ANSI_CPRNG is not set +CONFIG_CRYPTO_HW=y +# CONFIG_CRYPTO_DEV_HIFN_795X is not set +# CONFIG_CRYPTO_DEV_TALITOS is not set +# CONFIG_PPC_CLOCK is not set +# CONFIG_VIRTUALIZATION is not set diff --git a/recipes/linux/linux.inc b/recipes/linux/linux.inc index b0f78de668..2da1df82c8 100644 --- a/recipes/linux/linux.inc +++ b/recipes/linux/linux.inc @@ -38,6 +38,7 @@ KERNEL_DEVICETREE_mpc8313e-rdb = "arch/${ARCH}/boot/dts/mpc8313erdb.dts" KERNEL_DEVICETREE_mpc8315e-rdb = "arch/${ARCH}/boot/dts/mpc8315erdb.dts" KERNEL_DEVICETREE_mpc8323e-rdb = "arch/${ARCH}/boot/dts/mpc832x_rdb.dts" KERNEL_DEVICETREE_sequoia = "arch/${ARCH}/boot/dts/sequoia.dts" +KERNEL_DEVICETREE_mpc8641-hpcn = "arch/${ARCH}/boot/dts/mpc8641_hpcn.dts" KERNEL_DEVICETREE_p2020ds = "arch/${ARCH}/boot/dts/p2020ds.dts" KERNEL_DEVICETREE_xilinx-ml507 = "arch/${ARCH}/boot/dts/virtex440-ml507.dts" diff --git a/recipes/linux/linux_2.6.33.bb b/recipes/linux/linux_2.6.33.bb index 13a499a4a2..ddc810ef0f 100644 --- a/recipes/linux/linux_2.6.33.bb +++ b/recipes/linux/linux_2.6.33.bb @@ -5,6 +5,7 @@ PR="r1" # Mark archs/machines that this kernel supports DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_ts72xx = "-1" +DEFAULT_PREFERENCE_mpc8641-hpcn = "1" DEFAULT_PREFERENCE_p2020ds = "1" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/${P}.tar.bz2;name=kernel \ diff --git a/recipes/u-boot/u-boot_git.bb b/recipes/u-boot/u-boot_git.bb index 61095613e4..e8570e6f7e 100644 --- a/recipes/u-boot/u-boot_git.bb +++ b/recipes/u-boot/u-boot_git.bb @@ -12,6 +12,7 @@ SRCREV_afeb9260 = "6b8edfde22acc574b5532e9f086e6a7287a9bc78" SRCREV_afeb9260-180 = "6b8edfde22acc574b5532e9f086e6a7287a9bc78" SRCREV_palmpre = "6b8edfde22acc574b5532e9f086e6a7287a9bc78" SRCREV_cm-t35 = "3c014f1586d5bfe30dca7549396915c83f31cd30" +SRCREV_mpc8641-hpcn = "f20393c5e787b3776c179d20f82a86bda124d651" SRCREV_p2020ds = "f20393c5e787b3776c179d20f82a86bda124d651" SRC_URI_append_afeb9260 = " file://AFEB9260-network-fix.patch;patch=1" SRC_URI_append_afeb9260-180 = " file://AFEB9260-network-fix.patch;patch=1" -- cgit v1.2.3 From ba4ccaa71345505accd4d6064b865d9e574196a1 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 17 Mar 2010 17:43:26 +0100 Subject: util-macros: convert to BBCLASSEXTEND, add version 1.6.1 Signed-off-by: Martin Jansa --- recipes/xorg-util/util-macros-native_1.1.5.bb | 9 --------- recipes/xorg-util/util-macros-native_1.1.6.bb | 7 ------- recipes/xorg-util/util-macros-native_1.2.1.bb | 7 ------- recipes/xorg-util/util-macros-native_1.3.0.bb | 7 ------- recipes/xorg-util/util-macros-native_1.4.1.bb | 7 ------- recipes/xorg-util/util-macros-native_1.5.0.bb | 7 ------- recipes/xorg-util/util-macros-native_1.6.0.bb | 7 ------- recipes/xorg-util/util-macros.inc | 8 ++++++++ recipes/xorg-util/util-macros_1.1.5.bb | 10 ++-------- recipes/xorg-util/util-macros_1.1.6.bb | 8 ++------ recipes/xorg-util/util-macros_1.2.1.bb | 8 ++------ recipes/xorg-util/util-macros_1.3.0.bb | 8 ++------ recipes/xorg-util/util-macros_1.4.1.bb | 9 ++------- recipes/xorg-util/util-macros_1.5.0.bb | 8 ++------ recipes/xorg-util/util-macros_1.6.0.bb | 10 ++-------- recipes/xorg-util/util-macros_1.6.1.bb | 4 ++++ 16 files changed, 26 insertions(+), 98 deletions(-) delete mode 100644 recipes/xorg-util/util-macros-native_1.1.5.bb delete mode 100644 recipes/xorg-util/util-macros-native_1.1.6.bb delete mode 100644 recipes/xorg-util/util-macros-native_1.2.1.bb delete mode 100644 recipes/xorg-util/util-macros-native_1.3.0.bb delete mode 100644 recipes/xorg-util/util-macros-native_1.4.1.bb delete mode 100644 recipes/xorg-util/util-macros-native_1.5.0.bb delete mode 100644 recipes/xorg-util/util-macros-native_1.6.0.bb create mode 100644 recipes/xorg-util/util-macros.inc create mode 100644 recipes/xorg-util/util-macros_1.6.1.bb diff --git a/recipes/xorg-util/util-macros-native_1.1.5.bb b/recipes/xorg-util/util-macros-native_1.1.5.bb deleted file mode 100644 index c327f3f54e..0000000000 --- a/recipes/xorg-util/util-macros-native_1.1.5.bb +++ /dev/null @@ -1,9 +0,0 @@ -require util-macros_${PV}.bb - -inherit native - -PR = "r1" - -XORG_PN = "util-macros" - -S = "${WORKDIR}/util-macros-1.1.5" diff --git a/recipes/xorg-util/util-macros-native_1.1.6.bb b/recipes/xorg-util/util-macros-native_1.1.6.bb deleted file mode 100644 index 618e78f116..0000000000 --- a/recipes/xorg-util/util-macros-native_1.1.6.bb +++ /dev/null @@ -1,7 +0,0 @@ -require util-macros_${PV}.bb - -inherit native - -XORG_PN = "util-macros" - -S = "${WORKDIR}/util-macros-${PV}" diff --git a/recipes/xorg-util/util-macros-native_1.2.1.bb b/recipes/xorg-util/util-macros-native_1.2.1.bb deleted file mode 100644 index 618e78f116..0000000000 --- a/recipes/xorg-util/util-macros-native_1.2.1.bb +++ /dev/null @@ -1,7 +0,0 @@ -require util-macros_${PV}.bb - -inherit native - -XORG_PN = "util-macros" - -S = "${WORKDIR}/util-macros-${PV}" diff --git a/recipes/xorg-util/util-macros-native_1.3.0.bb b/recipes/xorg-util/util-macros-native_1.3.0.bb deleted file mode 100644 index 618e78f116..0000000000 --- a/recipes/xorg-util/util-macros-native_1.3.0.bb +++ /dev/null @@ -1,7 +0,0 @@ -require util-macros_${PV}.bb - -inherit native - -XORG_PN = "util-macros" - -S = "${WORKDIR}/util-macros-${PV}" diff --git a/recipes/xorg-util/util-macros-native_1.4.1.bb b/recipes/xorg-util/util-macros-native_1.4.1.bb deleted file mode 100644 index 618e78f116..0000000000 --- a/recipes/xorg-util/util-macros-native_1.4.1.bb +++ /dev/null @@ -1,7 +0,0 @@ -require util-macros_${PV}.bb - -inherit native - -XORG_PN = "util-macros" - -S = "${WORKDIR}/util-macros-${PV}" diff --git a/recipes/xorg-util/util-macros-native_1.5.0.bb b/recipes/xorg-util/util-macros-native_1.5.0.bb deleted file mode 100644 index 618e78f116..0000000000 --- a/recipes/xorg-util/util-macros-native_1.5.0.bb +++ /dev/null @@ -1,7 +0,0 @@ -require util-macros_${PV}.bb - -inherit native - -XORG_PN = "util-macros" - -S = "${WORKDIR}/util-macros-${PV}" diff --git a/recipes/xorg-util/util-macros-native_1.6.0.bb b/recipes/xorg-util/util-macros-native_1.6.0.bb deleted file mode 100644 index 618e78f116..0000000000 --- a/recipes/xorg-util/util-macros-native_1.6.0.bb +++ /dev/null @@ -1,7 +0,0 @@ -require util-macros_${PV}.bb - -inherit native - -XORG_PN = "util-macros" - -S = "${WORKDIR}/util-macros-${PV}" diff --git a/recipes/xorg-util/util-macros.inc b/recipes/xorg-util/util-macros.inc new file mode 100644 index 0000000000..9af52172f3 --- /dev/null +++ b/recipes/xorg-util/util-macros.inc @@ -0,0 +1,8 @@ +require xorg-util-common.inc + +DESCRIPTION = "X autotools macros" +INC_PR = "r2" +PE = "1" + +ALLOW_EMPTY = "1" +BBCLASSEXTEND = "native" diff --git a/recipes/xorg-util/util-macros_1.1.5.bb b/recipes/xorg-util/util-macros_1.1.5.bb index 46fc0a8d19..e67c9ef730 100644 --- a/recipes/xorg-util/util-macros_1.1.5.bb +++ b/recipes/xorg-util/util-macros_1.1.5.bb @@ -1,9 +1,3 @@ -require xorg-util-common.inc - -DESCRIPTION = "X autotools macros" -PR = "r1" -PE = "1" - -ALLOW_EMPTY = "1" - +require util-macros.inc SRC_URI += "file://unbreak_cross_compile.patch;patch=1" +PR = "${INC_PR}.0" diff --git a/recipes/xorg-util/util-macros_1.1.6.bb b/recipes/xorg-util/util-macros_1.1.6.bb index 4775fc6901..252a5cd10c 100644 --- a/recipes/xorg-util/util-macros_1.1.6.bb +++ b/recipes/xorg-util/util-macros_1.1.6.bb @@ -1,6 +1,2 @@ -require xorg-util-common.inc - -DESCRIPTION = "X autotools macros" -PE = "1" - -ALLOW_EMPTY = "1" +require util-macros.inc +PR = "${INC_PR}.0" diff --git a/recipes/xorg-util/util-macros_1.2.1.bb b/recipes/xorg-util/util-macros_1.2.1.bb index ddf8874a3b..2ff2e95d91 100644 --- a/recipes/xorg-util/util-macros_1.2.1.bb +++ b/recipes/xorg-util/util-macros_1.2.1.bb @@ -1,12 +1,8 @@ -require xorg-util-common.inc +require util-macros.inc # Version 1.2.1 uses plain `gcc' for checking the compiler version. # Instead, the cross compiler must be used. Whenever upgrading to # a new version, please recheck for this problem, otherwise it breaks # builds with older gcc versions! SRC_URI += " file://cross-compiler-for-checking.patch;patch=1" - -DESCRIPTION = "X autotools macros" -PE = "1" - -ALLOW_EMPTY = "1" +PR = "${INC_PR}.0" diff --git a/recipes/xorg-util/util-macros_1.3.0.bb b/recipes/xorg-util/util-macros_1.3.0.bb index 4775fc6901..252a5cd10c 100644 --- a/recipes/xorg-util/util-macros_1.3.0.bb +++ b/recipes/xorg-util/util-macros_1.3.0.bb @@ -1,6 +1,2 @@ -require xorg-util-common.inc - -DESCRIPTION = "X autotools macros" -PE = "1" - -ALLOW_EMPTY = "1" +require util-macros.inc +PR = "${INC_PR}.0" diff --git a/recipes/xorg-util/util-macros_1.4.1.bb b/recipes/xorg-util/util-macros_1.4.1.bb index 7e0b7d5cc9..3253d2b5a3 100644 --- a/recipes/xorg-util/util-macros_1.4.1.bb +++ b/recipes/xorg-util/util-macros_1.4.1.bb @@ -1,8 +1,3 @@ -require xorg-util-common.inc - -DESCRIPTION = "X autotools macros" -PE = "1" - +require util-macros.inc SRC_URI += " file://malloc_zero_returns_null.patch;patch=1" - -ALLOW_EMPTY = "1" +PR = "${INC_PR}.0" diff --git a/recipes/xorg-util/util-macros_1.5.0.bb b/recipes/xorg-util/util-macros_1.5.0.bb index 4775fc6901..252a5cd10c 100644 --- a/recipes/xorg-util/util-macros_1.5.0.bb +++ b/recipes/xorg-util/util-macros_1.5.0.bb @@ -1,6 +1,2 @@ -require xorg-util-common.inc - -DESCRIPTION = "X autotools macros" -PE = "1" - -ALLOW_EMPTY = "1" +require util-macros.inc +PR = "${INC_PR}.0" diff --git a/recipes/xorg-util/util-macros_1.6.0.bb b/recipes/xorg-util/util-macros_1.6.0.bb index 0fb42dc55f..c5a715f7be 100644 --- a/recipes/xorg-util/util-macros_1.6.0.bb +++ b/recipes/xorg-util/util-macros_1.6.0.bb @@ -1,10 +1,4 @@ -require xorg-util-common.inc - -DESCRIPTION = "X autotools macros" -PR = "r1" -PE = "1" - -ALLOW_EMPTY = "1" - +require util-macros.inc SRC_URI[archive.md5sum] = "eb991c709781f811fbfcdbd43f9edd16" SRC_URI[archive.sha256sum] = "12c7a8819f2df62ff7fca20152438d6b4e93ac581d7de211e31149739aa37ce9" +PR = "${INC_PR}.0" diff --git a/recipes/xorg-util/util-macros_1.6.1.bb b/recipes/xorg-util/util-macros_1.6.1.bb new file mode 100644 index 0000000000..80c59713ed --- /dev/null +++ b/recipes/xorg-util/util-macros_1.6.1.bb @@ -0,0 +1,4 @@ +require util-macros.inc +SRC_URI[archive.md5sum] = "a4bef59dd4a2e3450c07c77c6b45a79f" +SRC_URI[archive.sha256sum] = "ba91652d78f2a63d69253fb80af2f0a76c2e1b081c64521f90fac3866ee893d7" +PR = "${INC_PR}.0" -- cgit v1.2.3 From 741d040e05e0062548d5e40943914cb70d08fc6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Lanzend=C3=B6rfer?= Date: Sun, 31 Jan 2010 18:27:29 +0000 Subject: xserver-kdrive-common: add trout board to Xserver start script (kdrive) This patch should allow kdrive to use the touchscreen if you are booting SHR on trout bases devices like htcdream Signed-off-by: Martin Jansa --- recipes/xserver-kdrive-common/xserver-kdrive-common/Xserver | 4 ++++ recipes/xserver-kdrive-common/xserver-kdrive-common_0.1.bb | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/recipes/xserver-kdrive-common/xserver-kdrive-common/Xserver b/recipes/xserver-kdrive-common/xserver-kdrive-common/Xserver index f1c3e3e266..13173137da 100644 --- a/recipes/xserver-kdrive-common/xserver-kdrive-common/Xserver +++ b/recipes/xserver-kdrive-common/xserver-kdrive-common/Xserver @@ -60,6 +60,10 @@ fi # start off server in conventional location. case `module_id` in + "trout") + ARGS="$ARGS -mouse tslib" + XSERVER=/usr/bin/Xfbdev + ;; "AML M8050") ARGS="$ARGS -dpi 100 -screen 320x240@270" ;; "HP iPAQ H3100" | "HP iPAQ H3800") diff --git a/recipes/xserver-kdrive-common/xserver-kdrive-common_0.1.bb b/recipes/xserver-kdrive-common/xserver-kdrive-common_0.1.bb index 255df7accd..8e27c01b31 100644 --- a/recipes/xserver-kdrive-common/xserver-kdrive-common_0.1.bb +++ b/recipes/xserver-kdrive-common/xserver-kdrive-common_0.1.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Common X11 scripts" LICENSE = "GPL" SECTION = "x11" -PR = "r42" +PR = "r43" SRC_URI = "\ file://Xdefaults \ -- cgit v1.2.3 From d3780146af6fdc0f2de1b9485e9baf3f0f57ea97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Lanzend=C3=B6rfer?= Date: Sun, 31 Jan 2010 20:53:37 +0000 Subject: Added wl1251 firmware Hi I'd like to introduce a the bitbake file for the wl1251 firmware this firmware is needed to get wl1251 like its in the htcdream to initialize Signed-off-by: Martin Jansa --- recipes/firmwares/wl1251-fw_1.0-p1.bb | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 recipes/firmwares/wl1251-fw_1.0-p1.bb diff --git a/recipes/firmwares/wl1251-fw_1.0-p1.bb b/recipes/firmwares/wl1251-fw_1.0-p1.bb new file mode 100644 index 0000000000..ed4fef22b8 --- /dev/null +++ b/recipes/firmwares/wl1251-fw_1.0-p1.bb @@ -0,0 +1,25 @@ +DESCRIPTION = "Firmware for MSM wl1251 wifi chipset (e.g. trout/HTC Dream)" +LICENCE = "Texas Instruments" + +SRC_URI = "\ + http://ftp.o2s.ch/pub/openmoko/firmware-wl12xx/wl1251-fw.bin;name=fw \ + http://ftp.o2s.ch/pub/openmoko/firmware-wl12xx/wl1251-nvs.bin;name=nvs \ +" + +SRC_URI[fw.md5sum] = "ebf5c2036d37bc56b4d41ddcbda4311e" +SRC_URI[fw.sha156sum] = "c4b8a41024caa27218304d9cba4e3099900f365d3b006832457bfb8a563f740a" +SRC_URI[nvs.md5sum] = "e430dbf16bdc9fe6adfd9e108d059d76" +SRC_URI[nvs.sha156sum] = "67e4cf4d90fb65610125c2fded850d63900017aecafcadbaf50fe3d0369216f2" + +S = "${WORKDIR}/" + +do_install() { + install -d ${D}${base_libdir}/firmware + cp ${S}/wl1251-fw.bin ${D}${base_libdir}/firmware/wl1251-fw.bin + cp ${S}/wl1251-nvs.bin ${D}${base_libdir}/firmware/wl1251-nvs.bin +} + +PACKAGES = "${PN}" +FILES_${PN} += "${base_libdir}/firmware" + +PACKAGE_ARCH = "all" -- cgit v1.2.3 From 801d00f9292b44d4ebd80a4f86c625a2d0136b80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Lanzend=C3=B6rfer?= Date: Sat, 30 Jan 2010 21:50:00 +0000 Subject: alsa-scenarii-shr: make alsa-scenarii-shr available for htcdream Signed-off-by: Martin Jansa --- recipes/shr/alsa-scenarii-shr_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/shr/alsa-scenarii-shr_git.bb b/recipes/shr/alsa-scenarii-shr_git.bb index dff37cc083..a842086abe 100644 --- a/recipes/shr/alsa-scenarii-shr_git.bb +++ b/recipes/shr/alsa-scenarii-shr_git.bb @@ -1,9 +1,9 @@ DESCRIPTION = "Package for the different scenarios used by Openmoko" SECTION = "openmoko/base" PV = "1.0+gitr${SRCREV}" -PR = "r2" +PR = "r3" -COMPATIBLE_MACHINE = "(om-gta01|om-gta02|om-3d7k)" +COMPATIBLE_MACHINE = "(om-gta01|om-gta02|om-3d7k|htcdream)" SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master" -- cgit v1.2.3 From 76dc5ff734746a9d3106affd8afe10adb6118381 Mon Sep 17 00:00:00 2001 From: Michael 'Mickey' Lauer Date: Wed, 17 Mar 2010 18:01:58 +0100 Subject: vala: 0.7.10.4 -> 0.7.10.5 --- recipes/vala/vala-native_0.7.10.4.bb | 3 --- recipes/vala/vala-native_0.7.10.5.bb | 3 +++ recipes/vala/vala.inc | 2 +- recipes/vala/vala_0.7.10.4.bb | 2 -- recipes/vala/vala_0.7.10.5.bb | 2 ++ 5 files changed, 6 insertions(+), 6 deletions(-) delete mode 100644 recipes/vala/vala-native_0.7.10.4.bb create mode 100644 recipes/vala/vala-native_0.7.10.5.bb delete mode 100644 recipes/vala/vala_0.7.10.4.bb create mode 100644 recipes/vala/vala_0.7.10.5.bb diff --git a/recipes/vala/vala-native_0.7.10.4.bb b/recipes/vala/vala-native_0.7.10.4.bb deleted file mode 100644 index d6c239f7bf..0000000000 --- a/recipes/vala/vala-native_0.7.10.4.bb +++ /dev/null @@ -1,3 +0,0 @@ -require vala_${PV}.bb -inherit native -DEPENDS = "glib-2.0-native" diff --git a/recipes/vala/vala-native_0.7.10.5.bb b/recipes/vala/vala-native_0.7.10.5.bb new file mode 100644 index 0000000000..d6c239f7bf --- /dev/null +++ b/recipes/vala/vala-native_0.7.10.5.bb @@ -0,0 +1,3 @@ +require vala_${PV}.bb +inherit native +DEPENDS = "glib-2.0-native" diff --git a/recipes/vala/vala.inc b/recipes/vala/vala.inc index 7de0cf9f91..1e0b1dcdb4 100644 --- a/recipes/vala/vala.inc +++ b/recipes/vala/vala.inc @@ -4,7 +4,7 @@ SECTION = "devel" DEPENDS = "glib-2.0 dbus" HOMEPAGE = "http://vala-project.org" LICENSE = "LGPL" -INC_PR = "r2" +INC_PR = "r0" SRC_URI = "http://downloads.freesmartphone.org/sources/vala-${PV}.tar.bz2" diff --git a/recipes/vala/vala_0.7.10.4.bb b/recipes/vala/vala_0.7.10.4.bb deleted file mode 100644 index a5b1958f2c..0000000000 --- a/recipes/vala/vala_0.7.10.4.bb +++ /dev/null @@ -1,2 +0,0 @@ -require vala.inc -PR = "${INC_PR}.0" diff --git a/recipes/vala/vala_0.7.10.5.bb b/recipes/vala/vala_0.7.10.5.bb new file mode 100644 index 0000000000..a5b1958f2c --- /dev/null +++ b/recipes/vala/vala_0.7.10.5.bb @@ -0,0 +1,2 @@ +require vala.inc +PR = "${INC_PR}.0" -- cgit v1.2.3 From 6c5f9d4325be253fb3cb9b6d3bec11f7a7a13562 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 17 Mar 2010 18:33:39 +0100 Subject: pixman git: remove patches that were applied upstream --- .../0001-ARM-NEON-optimized-pixman_blt.patch | 104 -------- .../0001-Add-CONVERT_0565_TO_8888-macro.patch | 27 -- ...mplementation-of-pixman_blt-with-overlapp.patch | 114 +++++++++ ..._8888_TO_8888-and-CONVERT_0565_TO_0565-ma.patch | 28 -- ...of-overlapping-src-dst-for-pixman_blt_mmx.patch | 91 +++++++ ...0002-Test-program-for-pixman_blt-function.patch | 178 ------------- .../0003-Add-FAST_PATH_NO_NONE_REPEAT-flag.patch | 53 ---- ...mplementation-of-pixman_blt-with-overlapp.patch | 114 --------- ...f-overlapping-src-dst-for-pixman_blt_sse2.patch | 91 +++++++ ...TH_SAMPLES_COVER_CLIP-and-FAST_PATH_16BIT.patch | 167 ------------ ...of-overlapping-src-dst-for-pixman_blt_mmx.patch | 91 ------- ...f-overlapping-src-dst-for-pixman_blt_neon.patch | 94 +++++++ ...0005-Add-specialized-fast-nearest-scalers.patch | 284 --------------------- ...f-overlapping-src-dst-for-pixman_blt_sse2.patch | 91 ------- ...mplementation-of-pixman_blt-with-overlapp.patch | 114 --------- ...f-overlapping-src-dst-for-pixman_blt_neon.patch | 93 ------- ...of-overlapping-src-dst-for-pixman_blt_mmx.patch | 91 ------- ...f-overlapping-src-dst-for-pixman_blt_sse2.patch | 91 ------- ...f-overlapping-src-dst-for-pixman_blt_neon.patch | 94 ------- recipes/xorg-lib/pixman/0041-Fix-filler-bug.patch | 25 -- .../pixman/0042-Really-fix-filler-bug.patch | 35 --- recipes/xorg-lib/pixman_git.bb | 19 +- 22 files changed, 397 insertions(+), 1692 deletions(-) delete mode 100644 recipes/xorg-lib/pixman/0001-ARM-NEON-optimized-pixman_blt.patch delete mode 100644 recipes/xorg-lib/pixman/0001-Add-CONVERT_0565_TO_8888-macro.patch create mode 100644 recipes/xorg-lib/pixman/0001-Generic-C-implementation-of-pixman_blt-with-overlapp.patch delete mode 100644 recipes/xorg-lib/pixman/0002-Add-CONVERT_8888_TO_8888-and-CONVERT_0565_TO_0565-ma.patch create mode 100644 recipes/xorg-lib/pixman/0002-Support-of-overlapping-src-dst-for-pixman_blt_mmx.patch delete mode 100644 recipes/xorg-lib/pixman/0002-Test-program-for-pixman_blt-function.patch delete mode 100644 recipes/xorg-lib/pixman/0003-Add-FAST_PATH_NO_NONE_REPEAT-flag.patch delete mode 100644 recipes/xorg-lib/pixman/0003-Generic-C-implementation-of-pixman_blt-with-overlapp.patch create mode 100644 recipes/xorg-lib/pixman/0003-Support-of-overlapping-src-dst-for-pixman_blt_sse2.patch delete mode 100644 recipes/xorg-lib/pixman/0004-Add-FAST_PATH_SAMPLES_COVER_CLIP-and-FAST_PATH_16BIT.patch delete mode 100644 recipes/xorg-lib/pixman/0004-Support-of-overlapping-src-dst-for-pixman_blt_mmx.patch create mode 100644 recipes/xorg-lib/pixman/0004-Support-of-overlapping-src-dst-for-pixman_blt_neon.patch delete mode 100644 recipes/xorg-lib/pixman/0005-Add-specialized-fast-nearest-scalers.patch delete mode 100644 recipes/xorg-lib/pixman/0005-Support-of-overlapping-src-dst-for-pixman_blt_sse2.patch delete mode 100644 recipes/xorg-lib/pixman/0006-Generic-C-implementation-of-pixman_blt-with-overlapp.patch delete mode 100644 recipes/xorg-lib/pixman/0006-Support-of-overlapping-src-dst-for-pixman_blt_neon.patch delete mode 100644 recipes/xorg-lib/pixman/0007-Support-of-overlapping-src-dst-for-pixman_blt_mmx.patch delete mode 100644 recipes/xorg-lib/pixman/0008-Support-of-overlapping-src-dst-for-pixman_blt_sse2.patch delete mode 100644 recipes/xorg-lib/pixman/0009-Support-of-overlapping-src-dst-for-pixman_blt_neon.patch delete mode 100644 recipes/xorg-lib/pixman/0041-Fix-filler-bug.patch delete mode 100644 recipes/xorg-lib/pixman/0042-Really-fix-filler-bug.patch diff --git a/recipes/xorg-lib/pixman/0001-ARM-NEON-optimized-pixman_blt.patch b/recipes/xorg-lib/pixman/0001-ARM-NEON-optimized-pixman_blt.patch deleted file mode 100644 index ed2b68d782..0000000000 --- a/recipes/xorg-lib/pixman/0001-ARM-NEON-optimized-pixman_blt.patch +++ /dev/null @@ -1,104 +0,0 @@ -From e94b8057370a430eb91b914ed4c0050f72e9fa37 Mon Sep 17 00:00:00 2001 -From: Siarhei Siamashka -Date: Wed, 18 Nov 2009 04:26:18 +0200 -Subject: [PATCH 1/6] ARM: NEON optimized pixman_blt - ---- - pixman/pixman-arm-neon.c | 67 ++++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 67 insertions(+), 0 deletions(-) - -diff --git a/pixman/pixman-arm-neon.c b/pixman/pixman-arm-neon.c -index 2ed8b4b..495fda4 100644 ---- a/pixman/pixman-arm-neon.c -+++ b/pixman/pixman-arm-neon.c -@@ -292,6 +292,43 @@ pixman_fill_neon (uint32_t *bits, - } - } - -+static pixman_bool_t -+pixman_blt_neon (uint32_t *src_bits, -+ uint32_t *dst_bits, -+ int src_stride, -+ int dst_stride, -+ int src_bpp, -+ int dst_bpp, -+ int src_x, -+ int src_y, -+ int dst_x, -+ int dst_y, -+ int width, -+ int height) -+{ -+ switch (src_bpp) -+ { -+ case 16: -+ pixman_composite_src_0565_0565_asm_neon ( -+ width, height, -+ (uint16_t *)(((char *) dst_bits) + -+ dst_y * dst_stride * 4 + dst_x * 2), dst_stride * 2, -+ (uint16_t *)(((char *) src_bits) + -+ src_y * src_stride * 4 + src_x * 2), src_stride * 2); -+ return TRUE; -+ case 32: -+ pixman_composite_src_8888_8888_asm_neon ( -+ width, height, -+ (uint32_t *)(((char *) dst_bits) + -+ dst_y * dst_stride * 4 + dst_x * 4), dst_stride, -+ (uint32_t *)(((char *) src_bits) + -+ src_y * src_stride * 4 + src_x * 4), src_stride); -+ return TRUE; -+ default: -+ return FALSE; -+ } -+} -+ - static const pixman_fast_path_t arm_neon_fast_path_array[] = - { - { PIXMAN_OP_SRC, PIXMAN_r5g6b5, PIXMAN_null, PIXMAN_r5g6b5, neon_composite_src_0565_0565 }, -@@ -361,6 +398,35 @@ arm_neon_composite (pixman_implementation_t *imp, - } - - static pixman_bool_t -+arm_neon_blt (pixman_implementation_t *imp, -+ uint32_t * src_bits, -+ uint32_t * dst_bits, -+ int src_stride, -+ int dst_stride, -+ int src_bpp, -+ int dst_bpp, -+ int src_x, -+ int src_y, -+ int dst_x, -+ int dst_y, -+ int width, -+ int height) -+{ -+ if (!pixman_blt_neon ( -+ src_bits, dst_bits, src_stride, dst_stride, src_bpp, dst_bpp, -+ src_x, src_y, dst_x, dst_y, width, height)) -+ -+ { -+ return _pixman_implementation_blt ( -+ imp->delegate, -+ src_bits, dst_bits, src_stride, dst_stride, src_bpp, dst_bpp, -+ src_x, src_y, dst_x, dst_y, width, height); -+ } -+ -+ return TRUE; -+} -+ -+static pixman_bool_t - arm_neon_fill (pixman_implementation_t *imp, - uint32_t * bits, - int stride, -@@ -385,6 +451,7 @@ _pixman_implementation_create_arm_neon (void) - pixman_implementation_t *imp = _pixman_implementation_create (general); - - imp->composite = arm_neon_composite; -+ imp->blt = arm_neon_blt; - imp->fill = arm_neon_fill; - - return imp; --- -1.6.2.4 - diff --git a/recipes/xorg-lib/pixman/0001-Add-CONVERT_0565_TO_8888-macro.patch b/recipes/xorg-lib/pixman/0001-Add-CONVERT_0565_TO_8888-macro.patch deleted file mode 100644 index 4caf6393fc..0000000000 --- a/recipes/xorg-lib/pixman/0001-Add-CONVERT_0565_TO_8888-macro.patch +++ /dev/null @@ -1,27 +0,0 @@ -From deb3b0ab6a97f4584fe37b3ef708dcad59ceddde Mon Sep 17 00:00:00 2001 -From: Alexander Larsson -Date: Fri, 12 Mar 2010 16:23:42 +0100 -Subject: [PATCH 1/9] Add CONVERT_0565_TO_8888 macro - -This lets us simplify some fast paths since we get a consistent -naming that always has 8888 and gets some value for alpha. ---- - pixman/pixman-private.h | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -diff --git a/pixman/pixman-private.h b/pixman/pixman-private.h -index 9dcdca7..d0bec39 100644 ---- a/pixman/pixman-private.h -+++ b/pixman/pixman-private.h -@@ -704,6 +704,8 @@ pixman_region16_copy_from_region32 (pixman_region16_t *dst, - ((((s) << 5) & 0xfc00) | (((s) >> 1) & 0x300)) | \ - ((((s) << 8) & 0xf80000) | (((s) << 3) & 0x70000))) - -+#define CONVERT_0565_TO_8888(s) (CONVERT_0565_TO_0888(s) | 0xff000000) -+ - #define PIXMAN_FORMAT_IS_WIDE(f) \ - (PIXMAN_FORMAT_A (f) > 8 || \ - PIXMAN_FORMAT_R (f) > 8 || \ --- -1.6.6.1 - diff --git a/recipes/xorg-lib/pixman/0001-Generic-C-implementation-of-pixman_blt-with-overlapp.patch b/recipes/xorg-lib/pixman/0001-Generic-C-implementation-of-pixman_blt-with-overlapp.patch new file mode 100644 index 0000000000..210cb89c62 --- /dev/null +++ b/recipes/xorg-lib/pixman/0001-Generic-C-implementation-of-pixman_blt-with-overlapp.patch @@ -0,0 +1,114 @@ +From bf8fb2bf56478c11935dbb33e725f7a25746d347 Mon Sep 17 00:00:00 2001 +From: Siarhei Siamashka +Date: Tue, 16 Mar 2010 16:55:28 +0100 +Subject: [PATCH 1/4] Generic C implementation of pixman_blt with overlapping support + +Uses memcpy/memmove functions to copy pixels, can handle the +case when both source and destination areas are in the same +image (this is useful for scrolling). + +It is assumed that copying direction is only important when +using the same image for both source and destination (and +src_stride == dst_stride). Copying direction is undefined +for the images with different source and destination stride +which happen to be in the overlapped areas (but this is an +unrealistic case anyway). +--- + pixman/pixman-general.c | 21 ++++++++++++++++++--- + pixman/pixman-private.h | 43 +++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 61 insertions(+), 3 deletions(-) + +diff --git a/pixman/pixman-general.c b/pixman/pixman-general.c +index bddf79a..f525744 100644 +--- a/pixman/pixman-general.c ++++ b/pixman/pixman-general.c +@@ -285,9 +285,24 @@ general_blt (pixman_implementation_t *imp, + int width, + int height) + { +- /* We can't blit unless we have sse2 or mmx */ +- +- return FALSE; ++ uint8_t *dst_bytes = (uint8_t *)dst_bits; ++ uint8_t *src_bytes = (uint8_t *)src_bits; ++ int bpp; ++ ++ if (src_bpp != dst_bpp || src_bpp & 7) ++ return FALSE; ++ ++ bpp = src_bpp >> 3; ++ width *= bpp; ++ src_stride *= 4; ++ dst_stride *= 4; ++ pixman_blt_helper (src_bytes + src_y * src_stride + src_x * bpp, ++ dst_bytes + dst_y * dst_stride + dst_x * bpp, ++ src_stride, ++ dst_stride, ++ width, ++ height); ++ return TRUE; + } + + static pixman_bool_t +diff --git a/pixman/pixman-private.h b/pixman/pixman-private.h +index d5767af..eeb677d 100644 +--- a/pixman/pixman-private.h ++++ b/pixman/pixman-private.h +@@ -10,6 +10,7 @@ + + #include "pixman.h" + #include ++#include + #include + #include + #include +@@ -867,4 +868,46 @@ void pixman_timer_register (pixman_timer_t *timer); + + #endif /* PIXMAN_TIMERS */ + ++/* a helper function, can blit 8-bit images with src/dst overlapping support */ ++static inline void ++pixman_blt_helper (uint8_t *src_bytes, ++ uint8_t *dst_bytes, ++ int src_stride, ++ int dst_stride, ++ int width, ++ int height) ++{ ++ /* ++ * The second part of this check is not strictly needed, but it prevents ++ * unnecessary upside-down processing of areas which belong to different ++ * images. Upside-down processing can be slower with fixed-distance-ahead ++ * prefetch and perceived as having more tearing. ++ */ ++ if (src_bytes < dst_bytes + width && ++ src_bytes + src_stride * height > dst_bytes) ++ { ++ src_bytes += src_stride * height - src_stride; ++ dst_bytes += dst_stride * height - dst_stride; ++ dst_stride = -dst_stride; ++ src_stride = -src_stride; ++ /* Horizontal scrolling to the left needs memmove */ ++ if (src_bytes + width > dst_bytes) ++ { ++ while (--height >= 0) ++ { ++ memmove (dst_bytes, src_bytes, width); ++ dst_bytes += dst_stride; ++ src_bytes += src_stride; ++ } ++ return; ++ } ++ } ++ while (--height >= 0) ++ { ++ memcpy (dst_bytes, src_bytes, width); ++ dst_bytes += dst_stride; ++ src_bytes += src_stride; ++ } ++} ++ + #endif /* PIXMAN_PRIVATE_H */ +-- +1.6.6.1 + diff --git a/recipes/xorg-lib/pixman/0002-Add-CONVERT_8888_TO_8888-and-CONVERT_0565_TO_0565-ma.patch b/recipes/xorg-lib/pixman/0002-Add-CONVERT_8888_TO_8888-and-CONVERT_0565_TO_0565-ma.patch deleted file mode 100644 index 871ce75078..0000000000 --- a/recipes/xorg-lib/pixman/0002-Add-CONVERT_8888_TO_8888-and-CONVERT_0565_TO_0565-ma.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 7c2da7f27c2dd04d9ed3db5fd13f1da26cebfa3a Mon Sep 17 00:00:00 2001 -From: Alexander Larsson -Date: Tue, 16 Mar 2010 14:18:29 +0100 -Subject: [PATCH 2/9] Add CONVERT_8888_TO_8888 and CONVERT_0565_TO_0565 macros - -These are useful for macroization ---- - pixman/pixman-private.h | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -diff --git a/pixman/pixman-private.h b/pixman/pixman-private.h -index d0bec39..bc41249 100644 ---- a/pixman/pixman-private.h -+++ b/pixman/pixman-private.h -@@ -706,6 +706,10 @@ pixman_region16_copy_from_region32 (pixman_region16_t *dst, - - #define CONVERT_0565_TO_8888(s) (CONVERT_0565_TO_0888(s) | 0xff000000) - -+/* Trivial versions that are useful in macros */ -+#define CONVERT_8888_TO_8888(s) (s) -+#define CONVERT_0565_TO_0565(s) (s) -+ - #define PIXMAN_FORMAT_IS_WIDE(f) \ - (PIXMAN_FORMAT_A (f) > 8 || \ - PIXMAN_FORMAT_R (f) > 8 || \ --- -1.6.6.1 - diff --git a/recipes/xorg-lib/pixman/0002-Support-of-overlapping-src-dst-for-pixman_blt_mmx.patch b/recipes/xorg-lib/pixman/0002-Support-of-overlapping-src-dst-for-pixman_blt_mmx.patch new file mode 100644 index 0000000000..110edd5fd5 --- /dev/null +++ b/recipes/xorg-lib/pixman/0002-Support-of-overlapping-src-dst-for-pixman_blt_mmx.patch @@ -0,0 +1,91 @@ +From 4be9e0fa02f972174efd1788eb92d8fc07d37a53 Mon Sep 17 00:00:00 2001 +From: Siarhei Siamashka +Date: Thu, 22 Oct 2009 05:45:47 +0300 +Subject: [PATCH 2/4] Support of overlapping src/dst for pixman_blt_mmx + +--- + pixman/pixman-mmx.c | 55 +++++++++++++++++++++++++++++--------------------- + 1 files changed, 32 insertions(+), 23 deletions(-) + +diff --git a/pixman/pixman-mmx.c b/pixman/pixman-mmx.c +index e084e7f..6212b31 100644 +--- a/pixman/pixman-mmx.c ++++ b/pixman/pixman-mmx.c +@@ -2994,34 +2994,43 @@ pixman_blt_mmx (uint32_t *src_bits, + { + uint8_t * src_bytes; + uint8_t * dst_bytes; +- int byte_width; ++ int bpp; + +- if (src_bpp != dst_bpp) ++ if (src_bpp != dst_bpp || src_bpp & 7) + return FALSE; + +- if (src_bpp == 16) +- { +- src_stride = src_stride * (int) sizeof (uint32_t) / 2; +- dst_stride = dst_stride * (int) sizeof (uint32_t) / 2; +- src_bytes = (uint8_t *)(((uint16_t *)src_bits) + src_stride * (src_y) + (src_x)); +- dst_bytes = (uint8_t *)(((uint16_t *)dst_bits) + dst_stride * (dst_y) + (dst_x)); +- byte_width = 2 * width; +- src_stride *= 2; +- dst_stride *= 2; +- } +- else if (src_bpp == 32) ++ bpp = src_bpp >> 3; ++ width *= bpp; ++ src_stride *= 4; ++ dst_stride *= 4; ++ src_bytes = (uint8_t *)src_bits + src_y * src_stride + src_x * bpp; ++ dst_bytes = (uint8_t *)dst_bits + dst_y * dst_stride + dst_x * bpp; ++ ++ if (src_bpp != 16 && src_bpp != 32) + { +- src_stride = src_stride * (int) sizeof (uint32_t) / 4; +- dst_stride = dst_stride * (int) sizeof (uint32_t) / 4; +- src_bytes = (uint8_t *)(((uint32_t *)src_bits) + src_stride * (src_y) + (src_x)); +- dst_bytes = (uint8_t *)(((uint32_t *)dst_bits) + dst_stride * (dst_y) + (dst_x)); +- byte_width = 4 * width; +- src_stride *= 4; +- dst_stride *= 4; ++ pixman_blt_helper (src_bytes, dst_bytes, src_stride, dst_stride, ++ width, height); ++ return TRUE; + } +- else ++ ++ if (src_bytes < dst_bytes && src_bytes + src_stride * height > dst_bytes) + { +- return FALSE; ++ src_bytes += src_stride * height - src_stride; ++ dst_bytes += dst_stride * height - dst_stride; ++ dst_stride = -dst_stride; ++ src_stride = -src_stride; ++ ++ if (src_bytes + width > dst_bytes) ++ { ++ /* TODO: reverse scanline copy using MMX */ ++ while (--height >= 0) ++ { ++ memmove (dst_bytes, src_bytes, width); ++ dst_bytes += dst_stride; ++ src_bytes += src_stride; ++ } ++ return TRUE; ++ } + } + + while (height--) +@@ -3031,7 +3040,7 @@ pixman_blt_mmx (uint32_t *src_bits, + uint8_t *d = dst_bytes; + src_bytes += src_stride; + dst_bytes += dst_stride; +- w = byte_width; ++ w = width; + + while (w >= 2 && ((unsigned long)d & 3)) + { +-- +1.6.6.1 + diff --git a/recipes/xorg-lib/pixman/0002-Test-program-for-pixman_blt-function.patch b/recipes/xorg-lib/pixman/0002-Test-program-for-pixman_blt-function.patch deleted file mode 100644 index 143e79dabf..0000000000 --- a/recipes/xorg-lib/pixman/0002-Test-program-for-pixman_blt-function.patch +++ /dev/null @@ -1,178 +0,0 @@ -From 364406e03f9651aacb1bc684de6c00a27f9df66d Mon Sep 17 00:00:00 2001 -From: Siarhei Siamashka -Date: Mon, 19 Oct 2009 20:32:55 +0300 -Subject: [PATCH 2/6] Test program for pixman_blt function - -It can do some basic correctness tests and also check whether -overlapping of source and destination images is supported. ---- - test/Makefile.am | 2 + - test/overlapped-blt-test.c | 136 ++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 138 insertions(+), 0 deletions(-) - create mode 100644 test/overlapped-blt-test.c - -diff --git a/test/Makefile.am b/test/Makefile.am -index 89d32e9..40c305f 100644 ---- a/test/Makefile.am -+++ b/test/Makefile.am -@@ -9,6 +9,7 @@ TESTPROGRAMS = \ - fetch-test \ - oob-test \ - window-test \ -+ overlapped-blt-test \ - trap-crasher - - fetch_test_LDADD = $(TEST_LDADD) -@@ -17,6 +18,7 @@ composite_LDADD = $(TEST_LDADD) - trap_crasher_LDADD = $(TEST_LDADD) - oob_test_LDADD = $(TEST_LDADD) - window_test_LDADD = $(TEST_LDADD) -+overlapped_blt_test_LDADD = $(TEST_LDADD) - - blitters_test_LDADD = $(TEST_LDADD) - blitters_test_SOURCES = blitters-test.c utils.c utils.h -diff --git a/test/overlapped-blt-test.c b/test/overlapped-blt-test.c -new file mode 100644 -index 0000000..95fbc54 ---- /dev/null -+++ b/test/overlapped-blt-test.c -@@ -0,0 +1,136 @@ -+/* -+ * A small test program which can check whether pixman_blt function -+ * can support overlapping of source and destination images. -+ * Efficient blit with overlapping is useful for scrolling. -+ */ -+ -+#include -+#include -+#include -+#include -+#include "pixman.h" -+ -+/* reference implementation (slow) */ -+static void -+trivial_copy8_2d ( -+ uint8_t *dst, int dst_stride, -+ uint8_t *src, int src_stride, -+ int dx, int dy, int sx, int sy, -+ int w, int h) -+{ -+ int x, y; -+ uint8_t *tmp = malloc (src_stride * (sy + h)); -+ memcpy (tmp, src, src_stride * (sy + h)); -+ for (y = 0; y < h; y++) -+ { -+ for (x = 0; x < w; x++) -+ { -+ *(dst + (dy + y) * dst_stride + dx + x) = -+ *(tmp + (sy + y) * src_stride + sx + x); -+ } -+ } -+ free (tmp); -+} -+ -+static void -+trivial_copy_2d ( -+ uint8_t *dst, int dst_stride, -+ uint8_t *src, int src_stride, -+ int dx, int dy, int sx, int sy, -+ int w, int h, int bpp) -+{ -+ trivial_copy8_2d (dst, dst_stride, src, src_stride, -+ dx * (bpp / 8), dy, sx * (bpp / 8), sy, w * (bpp / 8), h); -+} -+ -+/* now the test itself */ -+ -+#define ST_UNSUPPORTED 1 -+#define ST_NORMAL_BUG 2 -+#define ST_OVERLAPPED_BUG 4 -+ -+#define MAX_SIZE_X 64 -+#define MAX_SIZE_Y 64 -+ -+static void print_result(int bpp, int flags) -+{ -+ printf("bpp=%d, supported=%d, normal_ok=%d, overlapped_ok=%d\n", -+ bpp, -+ !(flags & ST_UNSUPPORTED), -+ !(flags & ST_NORMAL_BUG), -+ !(flags & ST_OVERLAPPED_BUG)); -+} -+ -+int main() -+{ -+ int c = 100000, r; -+ int bpp_st[33] = {0}; -+ srand(0); -+ while (c-- > 0) -+ { -+ uint8_t *src1, *src2, *src3; -+ int i; -+ int sizex = rand() % MAX_SIZE_X + 1; -+ int sizey = rand() % MAX_SIZE_Y + 1; -+ int sx = rand() % sizex; -+ int sy = rand() % sizey; -+ int dx = rand() % sizex; -+ int dy = rand() % sizey; -+ int w = rand() % sizex; -+ int h = rand() % sizex; -+ int bpp = 8 * (1 << (rand() % 3)); -+ int stride_delta = rand() % 8; -+ int bufsize; -+ if ((sizex + stride_delta) % 4) -+ stride_delta += 4 - ((sizex + stride_delta) % 4); -+ bufsize = (sizex + stride_delta) * sizey * bpp / 8; -+ src1 = malloc (bufsize); -+ src2 = malloc (bufsize); -+ src3 = malloc (bufsize); -+ for (i = 0; i < bufsize; i++) -+ src1[i] = rand(); -+ memcpy (src2, src1, bufsize); -+ memcpy (src3, src1, bufsize); -+ if (sx + w > sizex) -+ w = sizex - sx; -+ if (dx + w > sizex) -+ w = sizex - dx; -+ if (sy + h > sizey) -+ h = sizey - sy; -+ if (dy + h > sizey) -+ h = sizey - dy; -+ /* get reference result */ -+ trivial_copy_2d (src1, (sizex + stride_delta) * bpp / 8, -+ src1, (sizex + stride_delta) * bpp / 8, -+ dx, dy, sx, sy, w, h, bpp); -+ /* check nonoverlapped pixman result */ -+ r = pixman_blt ((uint32_t *)src3, (uint32_t *)src2, -+ (sizex + stride_delta) * bpp / 8 / 4, -+ (sizex + stride_delta) * bpp / 8 / 4, -+ bpp, bpp, sx, sy, dx, dy, w, h); -+ if (!r) -+ bpp_st[bpp] |= ST_UNSUPPORTED; -+ if (memcmp (src1, src2, bufsize) != 0) -+ bpp_st[bpp] |= ST_NORMAL_BUG; -+ /* check overlapped pixman result */ -+ r = pixman_blt ((uint32_t *)src3, (uint32_t *)src3, -+ (sizex + stride_delta) * bpp / 8 / 4, -+ (sizex + stride_delta) * bpp / 8 / 4, -+ bpp, bpp, sx, sy, dx, dy, w, h); -+ if (!r) -+ bpp_st[bpp] |= ST_UNSUPPORTED; -+ if (memcmp (src1, src3, bufsize) != 0) -+ bpp_st[bpp] |= ST_OVERLAPPED_BUG; -+ /* free buffers */ -+ free (src1); -+ free (src2); -+ free (src3); -+ } -+ -+ /* report results */ -+ print_result (8, bpp_st[8]); -+ print_result (16, bpp_st[16]); -+ print_result (32, bpp_st[32]); -+ -+ return 0; -+} --- -1.6.2.4 - diff --git a/recipes/xorg-lib/pixman/0003-Add-FAST_PATH_NO_NONE_REPEAT-flag.patch b/recipes/xorg-lib/pixman/0003-Add-FAST_PATH_NO_NONE_REPEAT-flag.patch deleted file mode 100644 index d9a79985a8..0000000000 --- a/recipes/xorg-lib/pixman/0003-Add-FAST_PATH_NO_NONE_REPEAT-flag.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 6e80b9148a7f43b7b40235a57c1066fe64e371e5 Mon Sep 17 00:00:00 2001 -From: Alexander Larsson -Date: Fri, 12 Mar 2010 15:40:07 +0100 -Subject: [PATCH 3/9] Add FAST_PATH_NO_NONE_REPEAT flag - ---- - pixman/pixman-image.c | 10 +++++++--- - pixman/pixman-private.h | 1 + - 2 files changed, 8 insertions(+), 3 deletions(-) - -diff --git a/pixman/pixman-image.c b/pixman/pixman-image.c -index d09d193..df5b457 100644 ---- a/pixman/pixman-image.c -+++ b/pixman/pixman-image.c -@@ -335,16 +335,20 @@ compute_image_info (pixman_image_t *image) - /* Repeat mode */ - switch (image->common.repeat) - { -+ case PIXMAN_REPEAT_NONE: -+ flags |= FAST_PATH_NO_REFLECT_REPEAT | FAST_PATH_NO_PAD_REPEAT; -+ break; -+ - case PIXMAN_REPEAT_REFLECT: -- flags |= FAST_PATH_NO_PAD_REPEAT; -+ flags |= FAST_PATH_NO_PAD_REPEAT | FAST_PATH_NO_NONE_REPEAT; - break; - - case PIXMAN_REPEAT_PAD: -- flags |= FAST_PATH_NO_REFLECT_REPEAT; -+ flags |= FAST_PATH_NO_REFLECT_REPEAT | FAST_PATH_NO_NONE_REPEAT; - break; - - default: -- flags |= (FAST_PATH_NO_REFLECT_REPEAT | FAST_PATH_NO_PAD_REPEAT); -+ flags |= FAST_PATH_NO_REFLECT_REPEAT | FAST_PATH_NO_PAD_REPEAT | FAST_PATH_NO_NONE_REPEAT; - break; - } - -diff --git a/pixman/pixman-private.h b/pixman/pixman-private.h -index bc41249..65314b9 100644 ---- a/pixman/pixman-private.h -+++ b/pixman/pixman-private.h -@@ -579,6 +579,7 @@ _pixman_choose_implementation (void); - #define FAST_PATH_SIMPLE_REPEAT (1 << 12) - #define FAST_PATH_IS_OPAQUE (1 << 13) - #define FAST_PATH_NEEDS_WORKAROUND (1 << 14) -+#define FAST_PATH_NO_NONE_REPEAT (1 << 15) - - #define _FAST_PATH_STANDARD_FLAGS \ - (FAST_PATH_ID_TRANSFORM | \ --- -1.6.6.1 - diff --git a/recipes/xorg-lib/pixman/0003-Generic-C-implementation-of-pixman_blt-with-overlapp.patch b/recipes/xorg-lib/pixman/0003-Generic-C-implementation-of-pixman_blt-with-overlapp.patch deleted file mode 100644 index 25ce7ee3b8..0000000000 --- a/recipes/xorg-lib/pixman/0003-Generic-C-implementation-of-pixman_blt-with-overlapp.patch +++ /dev/null @@ -1,114 +0,0 @@ -From c29c9fa826b7112156fd6150b5f1564227935c05 Mon Sep 17 00:00:00 2001 -From: Siarhei Siamashka -Date: Thu, 22 Oct 2009 05:27:33 +0300 -Subject: [PATCH 3/6] Generic C implementation of pixman_blt with overlapping support - -Uses memcpy/memmove functions to copy pixels, can handle the -case when both source and destination areas are in the same -image (this is useful for scrolling). - -It is assumed that copying direction is only important when -using the same image for both source and destination (and -src_stride == dst_stride). Copying direction is undefined -for the images with different source and destination stride -which happen to be in the overlapped areas (but this is an -unrealistic case anyway). ---- - pixman/pixman-general.c | 21 ++++++++++++++++++--- - pixman/pixman-private.h | 43 +++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 61 insertions(+), 3 deletions(-) - -diff --git a/pixman/pixman-general.c b/pixman/pixman-general.c -index c96a3f9..d71a299 100644 ---- a/pixman/pixman-general.c -+++ b/pixman/pixman-general.c -@@ -300,9 +300,24 @@ general_blt (pixman_implementation_t *imp, - int width, - int height) - { -- /* We can't blit unless we have sse2 or mmx */ -- -- return FALSE; -+ uint8_t *dst_bytes = (uint8_t *)dst_bits; -+ uint8_t *src_bytes = (uint8_t *)src_bits; -+ int bpp; -+ -+ if (src_bpp != dst_bpp || src_bpp & 7) -+ return FALSE; -+ -+ bpp = src_bpp >> 3; -+ width *= bpp; -+ src_stride *= 4; -+ dst_stride *= 4; -+ pixman_blt_helper (src_bytes + src_y * src_stride + src_x * bpp, -+ dst_bytes + dst_y * dst_stride + dst_x * bpp, -+ src_stride, -+ dst_stride, -+ width, -+ height); -+ return TRUE; - } - - static pixman_bool_t -diff --git a/pixman/pixman-private.h b/pixman/pixman-private.h -index 5000f91..8c5d4fd 100644 ---- a/pixman/pixman-private.h -+++ b/pixman/pixman-private.h -@@ -10,6 +10,7 @@ - - #include "pixman.h" - #include -+#include - #include - - #include "pixman-compiler.h" -@@ -794,4 +795,46 @@ void pixman_timer_register (pixman_timer_t *timer); - - #endif /* PIXMAN_TIMERS */ - -+/* a helper function, can blit 8-bit images with src/dst overlapping support */ -+static inline void -+pixman_blt_helper (uint8_t *src_bytes, -+ uint8_t *dst_bytes, -+ int src_stride, -+ int dst_stride, -+ int width, -+ int height) -+{ -+ /* -+ * The second part of this check is not strictly needed, but it prevents -+ * unnecessary upside-down processing of areas which belong to different -+ * images. Upside-down processing can be slower with fixed-distance-ahead -+ * prefetch and perceived as having more tearing. -+ */ -+ if (src_bytes < dst_bytes + width && -+ src_bytes + src_stride * height > dst_bytes) -+ { -+ src_bytes += src_stride * height - src_stride; -+ dst_bytes += dst_stride * height - dst_stride; -+ dst_stride = -dst_stride; -+ src_stride = -src_stride; -+ /* Horizontal scrolling to the left needs memmove */ -+ if (src_bytes + width > dst_bytes) -+ { -+ while (--height >= 0) -+ { -+ memmove (dst_bytes, src_bytes, width); -+ dst_bytes += dst_stride; -+ src_bytes += src_stride; -+ } -+ return; -+ } -+ } -+ while (--height >= 0) -+ { -+ memcpy (dst_bytes, src_bytes, width); -+ dst_bytes += dst_stride; -+ src_bytes += src_stride; -+ } -+} -+ - #endif /* PIXMAN_PRIVATE_H */ --- -1.6.2.4 - diff --git a/recipes/xorg-lib/pixman/0003-Support-of-overlapping-src-dst-for-pixman_blt_sse2.patch b/recipes/xorg-lib/pixman/0003-Support-of-overlapping-src-dst-for-pixman_blt_sse2.patch new file mode 100644 index 0000000000..ae27f38cf0 --- /dev/null +++ b/recipes/xorg-lib/pixman/0003-Support-of-overlapping-src-dst-for-pixman_blt_sse2.patch @@ -0,0 +1,91 @@ +From 1a29e4029250b4adb52061a68e94c84523e785e2 Mon Sep 17 00:00:00 2001 +From: Siarhei Siamashka +Date: Thu, 22 Oct 2009 05:45:54 +0300 +Subject: [PATCH 3/4] Support of overlapping src/dst for pixman_blt_sse2 + +--- + pixman/pixman-sse2.c | 55 +++++++++++++++++++++++++++++-------------------- + 1 files changed, 32 insertions(+), 23 deletions(-) + +diff --git a/pixman/pixman-sse2.c b/pixman/pixman-sse2.c +index 946e7ba..66053ae 100644 +--- a/pixman/pixman-sse2.c ++++ b/pixman/pixman-sse2.c +@@ -5299,34 +5299,43 @@ pixman_blt_sse2 (uint32_t *src_bits, + { + uint8_t * src_bytes; + uint8_t * dst_bytes; +- int byte_width; ++ int bpp; + +- if (src_bpp != dst_bpp) ++ if (src_bpp != dst_bpp || src_bpp & 7) + return FALSE; + +- if (src_bpp == 16) +- { +- src_stride = src_stride * (int) sizeof (uint32_t) / 2; +- dst_stride = dst_stride * (int) sizeof (uint32_t) / 2; +- src_bytes =(uint8_t *)(((uint16_t *)src_bits) + src_stride * (src_y) + (src_x)); +- dst_bytes = (uint8_t *)(((uint16_t *)dst_bits) + dst_stride * (dst_y) + (dst_x)); +- byte_width = 2 * width; +- src_stride *= 2; +- dst_stride *= 2; +- } +- else if (src_bpp == 32) ++ bpp = src_bpp >> 3; ++ width *= bpp; ++ src_stride *= 4; ++ dst_stride *= 4; ++ src_bytes = (uint8_t *)src_bits + src_y * src_stride + src_x * bpp; ++ dst_bytes = (uint8_t *)dst_bits + dst_y * dst_stride + dst_x * bpp; ++ ++ if (src_bpp != 16 && src_bpp != 32) + { +- src_stride = src_stride * (int) sizeof (uint32_t) / 4; +- dst_stride = dst_stride * (int) sizeof (uint32_t) / 4; +- src_bytes = (uint8_t *)(((uint32_t *)src_bits) + src_stride * (src_y) + (src_x)); +- dst_bytes = (uint8_t *)(((uint32_t *)dst_bits) + dst_stride * (dst_y) + (dst_x)); +- byte_width = 4 * width; +- src_stride *= 4; +- dst_stride *= 4; ++ pixman_blt_helper (src_bytes, dst_bytes, src_stride, dst_stride, ++ width, height); ++ return TRUE; + } +- else ++ ++ if (src_bytes < dst_bytes && src_bytes + src_stride * height > dst_bytes) + { +- return FALSE; ++ src_bytes += src_stride * height - src_stride; ++ dst_bytes += dst_stride * height - dst_stride; ++ dst_stride = -dst_stride; ++ src_stride = -src_stride; ++ ++ if (src_bytes + width > dst_bytes) ++ { ++ /* TODO: reverse scanline copy using SSE2 */ ++ while (--height >= 0) ++ { ++ memmove (dst_bytes, src_bytes, width); ++ dst_bytes += dst_stride; ++ src_bytes += src_stride; ++ } ++ return TRUE; ++ } + } + + cache_prefetch ((__m128i*)src_bytes); +@@ -5339,7 +5348,7 @@ pixman_blt_sse2 (uint32_t *src_bits, + uint8_t *d = dst_bytes; + src_bytes += src_stride; + dst_bytes += dst_stride; +- w = byte_width; ++ w = width; + + cache_prefetch_next ((__m128i*)s); + cache_prefetch_next ((__m128i*)d); +-- +1.6.6.1 + diff --git a/recipes/xorg-lib/pixman/0004-Add-FAST_PATH_SAMPLES_COVER_CLIP-and-FAST_PATH_16BIT.patch b/recipes/xorg-lib/pixman/0004-Add-FAST_PATH_SAMPLES_COVER_CLIP-and-FAST_PATH_16BIT.patch deleted file mode 100644 index eb388475d9..0000000000 --- a/recipes/xorg-lib/pixman/0004-Add-FAST_PATH_SAMPLES_COVER_CLIP-and-FAST_PATH_16BIT.patch +++ /dev/null @@ -1,167 +0,0 @@ -From 8e7e8e3f96b094616f37fdf8a35043d7c5f64417 Mon Sep 17 00:00:00 2001 -From: Alexander Larsson -Date: Fri, 12 Mar 2010 15:41:01 +0100 -Subject: [PATCH 4/9] Add FAST_PATH_SAMPLES_COVER_CLIP and FAST_PATH_16BIT_SAFE - -FAST_PATH_SAMPLES_COVER_CLIP: - -This is set of the source sample grid, unrepeated but transformed -completely completely covers the clip destination. If this is set -you can use a simple scaled that doesn't have to care about the repeat -mode. - -FAST_PATH_16BIT_SAFE: - -This signifies two things: -1) The size of the src/mask fits in a 16.16 fixed point, so something like: - - max_vx = src_image->bits.width << 16; - - Is allowed and is guaranteed to not overflow max_vx - -2) When stepping the source space we're guaranteed to never overflow - a 16.16 bit fix point variable, even if we step one extra step - in the destination space. This means that a loop doing: - - x = vx >> 16; - vx += unit_x; d = src_row[x]; - - will never overflow vx causing x to be negative. - - And additionally, if you track vx like above and apply NORMAL repeat - after the vx addition with something like: - - while (vx >= max_vx) vx -= max_vx; - - This will never overflow the vx even on the final increment that - takes vx one past the end of where we will read, which makes the - repeat loop safe. ---- - pixman/pixman-private.h | 2 + - pixman/pixman.c | 84 +++++++++++++++++++++++++++++++++++++--------- - 2 files changed, 69 insertions(+), 17 deletions(-) - -diff --git a/pixman/pixman-private.h b/pixman/pixman-private.h -index 65314b9..0cf9113 100644 ---- a/pixman/pixman-private.h -+++ b/pixman/pixman-private.h -@@ -580,6 +580,8 @@ _pixman_choose_implementation (void); - #define FAST_PATH_IS_OPAQUE (1 << 13) - #define FAST_PATH_NEEDS_WORKAROUND (1 << 14) - #define FAST_PATH_NO_NONE_REPEAT (1 << 15) -+#define FAST_PATH_SAMPLES_COVER_CLIP (1 << 16) -+#define FAST_PATH_16BIT_SAFE (1 << 17) - - #define _FAST_PATH_STANDARD_FLAGS \ - (FAST_PATH_ID_TRANSFORM | \ -diff --git a/pixman/pixman.c b/pixman/pixman.c -index c71617e..e967e34 100644 ---- a/pixman/pixman.c -+++ b/pixman/pixman.c -@@ -479,24 +479,75 @@ walk_region_internal (pixman_implementation_t *imp, - } - } - --static force_inline pixman_bool_t --image_covers (pixman_image_t *image, -- pixman_box32_t *extents, -- int x, -- int y) -+#define IS_16BIT(x) (((x) >= INT16_MIN) && ((x) <= INT16_MAX)) -+ -+static force_inline uint32_t -+compute_src_extents_flags (pixman_image_t *image, -+ pixman_box32_t *extents, -+ int x, -+ int y) - { -- if (image->common.type == BITS && -- image->common.repeat == PIXMAN_REPEAT_NONE) -+ pixman_box16_t extents16; -+ uint32_t flags; -+ -+ flags = FAST_PATH_COVERS_CLIP; -+ -+ if (image->common.type != BITS) -+ return flags; -+ -+ if (image->common.repeat == PIXMAN_REPEAT_NONE && -+ (x > extents->x1 || y > extents->y1 || -+ x + image->bits.width < extents->x2 || -+ y + image->bits.height < extents->y2)) -+ { -+ flags &= ~FAST_PATH_COVERS_CLIP; -+ } -+ -+ if (IS_16BIT (extents->x1 - x) && -+ IS_16BIT (extents->y1 - y) && -+ IS_16BIT (extents->x2 - x) && -+ IS_16BIT (extents->y2 - y)) - { -- if (x > extents->x1 || y > extents->y1 || -- x + image->bits.width < extents->x2 || -- y + image->bits.height < extents->y2) -+ extents16.x1 = extents->x1 - x; -+ extents16.y1 = extents->y1 - y; -+ extents16.x2 = extents->x2 - x; -+ extents16.y2 = extents->y2 - y; -+ -+ if (!image->common.transform || -+ pixman_transform_bounds (image->common.transform, &extents16)) - { -- return FALSE; -+ if (extents16.x1 >= 0 && extents16.y1 >= 0 && -+ extents16.x2 <= image->bits.width && -+ extents16.y2 <= image->bits.height) -+ { -+ flags |= FAST_PATH_SAMPLES_COVER_CLIP; -+ } - } - } - -- return TRUE; -+ if (IS_16BIT (extents->x1 - x - 1) && -+ IS_16BIT (extents->y1 - y - 1) && -+ IS_16BIT (extents->x2 - x + 1) && -+ IS_16BIT (extents->y2 - y + 1)) -+ { -+ extents16.x1 = extents->x1 - x - 1; -+ extents16.y1 = extents->y1 - y - 1; -+ extents16.x2 = extents->x2 - x + 1; -+ extents16.y2 = extents->y2 - y + 1; -+ -+ if (/* src space expanded by one in dest space fits in 16 bit */ -+ (!image->common.transform || -+ pixman_transform_bounds (image->common.transform, &extents16)) && -+ /* And src image size can be used as 16.16 fixed point */ -+ image->bits.width < 0x7fff && -+ image->bits.height < 0x7fff) -+ { -+ /* Then we're "16bit safe" */ -+ flags |= FAST_PATH_16BIT_SAFE; -+ } -+ } -+ -+ return flags; - } - - static void -@@ -581,11 +632,10 @@ do_composite (pixman_implementation_t *imp, - - extents = pixman_region32_extents (®ion); - -- if (image_covers (src, extents, dest_x - src_x, dest_y - src_y)) -- src_flags |= FAST_PATH_COVERS_CLIP; -- -- if (mask && image_covers (mask, extents, dest_x - mask_x, dest_y - mask_y)) -- mask_flags |= FAST_PATH_COVERS_CLIP; -+ src_flags |= compute_src_extents_flags (src, extents, dest_x - src_x, dest_y - src_y); -+ -+ if (mask) -+ mask_flags |= compute_src_extents_flags (mask, extents, dest_x - mask_x, dest_y - mask_y); - - /* - * Check if we can replace our operator by a simpler one --- -1.6.6.1 - diff --git a/recipes/xorg-lib/pixman/0004-Support-of-overlapping-src-dst-for-pixman_blt_mmx.patch b/recipes/xorg-lib/pixman/0004-Support-of-overlapping-src-dst-for-pixman_blt_mmx.patch deleted file mode 100644 index 74c7b45bc4..0000000000 --- a/recipes/xorg-lib/pixman/0004-Support-of-overlapping-src-dst-for-pixman_blt_mmx.patch +++ /dev/null @@ -1,91 +0,0 @@ -From 7ca32542c957ff308a6ca7e3715e6552a65ae395 Mon Sep 17 00:00:00 2001 -From: Siarhei Siamashka -Date: Thu, 22 Oct 2009 05:45:47 +0300 -Subject: [PATCH 4/6] Support of overlapping src/dst for pixman_blt_mmx - ---- - pixman/pixman-mmx.c | 55 +++++++++++++++++++++++++++++--------------------- - 1 files changed, 32 insertions(+), 23 deletions(-) - -diff --git a/pixman/pixman-mmx.c b/pixman/pixman-mmx.c -index 819e3a0..dcccadb 100644 ---- a/pixman/pixman-mmx.c -+++ b/pixman/pixman-mmx.c -@@ -3002,34 +3002,43 @@ pixman_blt_mmx (uint32_t *src_bits, - { - uint8_t * src_bytes; - uint8_t * dst_bytes; -- int byte_width; -+ int bpp; - -- if (src_bpp != dst_bpp) -+ if (src_bpp != dst_bpp || src_bpp & 7) - return FALSE; - -- if (src_bpp == 16) -- { -- src_stride = src_stride * (int) sizeof (uint32_t) / 2; -- dst_stride = dst_stride * (int) sizeof (uint32_t) / 2; -- src_bytes = (uint8_t *)(((uint16_t *)src_bits) + src_stride * (src_y) + (src_x)); -- dst_bytes = (uint8_t *)(((uint16_t *)dst_bits) + dst_stride * (dst_y) + (dst_x)); -- byte_width = 2 * width; -- src_stride *= 2; -- dst_stride *= 2; -- } -- else if (src_bpp == 32) -+ bpp = src_bpp >> 3; -+ width *= bpp; -+ src_stride *= 4; -+ dst_stride *= 4; -+ src_bytes = (uint8_t *)src_bits + src_y * src_stride + src_x * bpp; -+ dst_bytes = (uint8_t *)dst_bits + dst_y * dst_stride + dst_x * bpp; -+ -+ if (src_bpp != 16 && src_bpp != 32) - { -- src_stride = src_stride * (int) sizeof (uint32_t) / 4; -- dst_stride = dst_stride * (int) sizeof (uint32_t) / 4; -- src_bytes = (uint8_t *)(((uint32_t *)src_bits) + src_stride * (src_y) + (src_x)); -- dst_bytes = (uint8_t *)(((uint32_t *)dst_bits) + dst_stride * (dst_y) + (dst_x)); -- byte_width = 4 * width; -- src_stride *= 4; -- dst_stride *= 4; -+ pixman_blt_helper (src_bytes, dst_bytes, src_stride, dst_stride, -+ width, height); -+ return TRUE; - } -- else -+ -+ if (src_bytes < dst_bytes && src_bytes + src_stride * height > dst_bytes) - { -- return FALSE; -+ src_bytes += src_stride * height - src_stride; -+ dst_bytes += dst_stride * height - dst_stride; -+ dst_stride = -dst_stride; -+ src_stride = -src_stride; -+ -+ if (src_bytes + width > dst_bytes) -+ { -+ /* TODO: reverse scanline copy using MMX */ -+ while (--height >= 0) -+ { -+ memmove (dst_bytes, src_bytes, width); -+ dst_bytes += dst_stride; -+ src_bytes += src_stride; -+ } -+ return TRUE; -+ } - } - - while (height--) -@@ -3039,7 +3048,7 @@ pixman_blt_mmx (uint32_t *src_bits, - uint8_t *d = dst_bytes; - src_bytes += src_stride; - dst_bytes += dst_stride; -- w = byte_width; -+ w = width; - - while (w >= 2 && ((unsigned long)d & 3)) - { --- -1.6.2.4 - diff --git a/recipes/xorg-lib/pixman/0004-Support-of-overlapping-src-dst-for-pixman_blt_neon.patch b/recipes/xorg-lib/pixman/0004-Support-of-overlapping-src-dst-for-pixman_blt_neon.patch new file mode 100644 index 0000000000..3dcba178ef --- /dev/null +++ b/recipes/xorg-lib/pixman/0004-Support-of-overlapping-src-dst-for-pixman_blt_neon.patch @@ -0,0 +1,94 @@ +From 6d52bc4c8f4f29643a3353deb9cb06769e2f0186 Mon Sep 17 00:00:00 2001 +From: Siarhei Siamashka +Date: Wed, 18 Nov 2009 06:08:48 +0200 +Subject: [PATCH 4/4] Support of overlapping src/dst for pixman_blt_neon + +--- + pixman/pixman-arm-neon.c | 62 +++++++++++++++++++++++++++++++++++++-------- + 1 files changed, 51 insertions(+), 11 deletions(-) + +diff --git a/pixman/pixman-arm-neon.c b/pixman/pixman-arm-neon.c +index 24ceeeb..134493d 100644 +--- a/pixman/pixman-arm-neon.c ++++ b/pixman/pixman-arm-neon.c +@@ -360,26 +360,66 @@ pixman_blt_neon (uint32_t *src_bits, + int width, + int height) + { +- if (src_bpp != dst_bpp) ++ uint8_t * src_bytes; ++ uint8_t * dst_bytes; ++ int bpp; ++ ++ if (src_bpp != dst_bpp || src_bpp & 7) + return FALSE; + ++ bpp = src_bpp >> 3; ++ width *= bpp; ++ src_stride *= 4; ++ dst_stride *= 4; ++ src_bytes = (uint8_t *)src_bits + src_y * src_stride + src_x * bpp; ++ dst_bytes = (uint8_t *)dst_bits + dst_y * dst_stride + dst_x * bpp; ++ ++ if (src_bpp != 16 && src_bpp != 32) ++ { ++ pixman_blt_helper (src_bytes, dst_bytes, src_stride, dst_stride, ++ width, height); ++ return TRUE; ++ } ++ ++ if (src_bytes < dst_bytes && src_bytes + src_stride * height > dst_bytes) ++ { ++ src_bytes += src_stride * height - src_stride; ++ dst_bytes += dst_stride * height - dst_stride; ++ dst_stride = -dst_stride; ++ src_stride = -src_stride; ++ ++ if (src_bytes + width > dst_bytes) ++ { ++ /* TODO: reverse scanline copy using NEON */ ++ while (--height >= 0) ++ { ++ memmove (dst_bytes, src_bytes, width); ++ dst_bytes += dst_stride; ++ src_bytes += src_stride; ++ } ++ return TRUE; ++ } ++ } ++ + switch (src_bpp) + { + case 16: + pixman_composite_src_0565_0565_asm_neon ( +- width, height, +- (uint16_t *)(((char *) dst_bits) + +- dst_y * dst_stride * 4 + dst_x * 2), dst_stride * 2, +- (uint16_t *)(((char *) src_bits) + +- src_y * src_stride * 4 + src_x * 2), src_stride * 2); ++ width >> 1, ++ height, ++ (uint16_t *) dst_bytes, ++ dst_stride >> 1, ++ (uint16_t *) src_bytes, ++ src_stride >> 1); + return TRUE; + case 32: + pixman_composite_src_8888_8888_asm_neon ( +- width, height, +- (uint32_t *)(((char *) dst_bits) + +- dst_y * dst_stride * 4 + dst_x * 4), dst_stride, +- (uint32_t *)(((char *) src_bits) + +- src_y * src_stride * 4 + src_x * 4), src_stride); ++ width >> 2, ++ height, ++ (uint32_t *) dst_bytes, ++ dst_stride >> 2, ++ (uint32_t *) src_bytes, ++ src_stride >> 2); + return TRUE; + default: + return FALSE; +-- +1.6.6.1 + diff --git a/recipes/xorg-lib/pixman/0005-Add-specialized-fast-nearest-scalers.patch b/recipes/xorg-lib/pixman/0005-Add-specialized-fast-nearest-scalers.patch deleted file mode 100644 index 962b4e03e2..0000000000 --- a/recipes/xorg-lib/pixman/0005-Add-specialized-fast-nearest-scalers.patch +++ /dev/null @@ -1,284 +0,0 @@ -From def20085302693c032e81456d975454acd356acd Mon Sep 17 00:00:00 2001 -From: Alexander Larsson -Date: Fri, 12 Mar 2010 15:45:04 +0100 -Subject: [PATCH 5/9] Add specialized fast nearest scalers - -This is a macroized version of SRC/OVER repeat normal/unneeded nearest -neighbour scaling instantiated for some common 8888 and 565 formats. - -Based on work by Siarhei Siamashka ---- - pixman/pixman-fast-path.c | 243 +++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 243 insertions(+), 0 deletions(-) - -diff --git a/pixman/pixman-fast-path.c b/pixman/pixman-fast-path.c -index 4d26b0f..6607a47 100644 ---- a/pixman/pixman-fast-path.c -+++ b/pixman/pixman-fast-path.c -@@ -27,6 +27,7 @@ - #include - #endif - #include -+#include - #include "pixman-private.h" - #include "pixman-combine32.h" - -@@ -1373,6 +1374,208 @@ repeat (pixman_repeat_t repeat, int *c, int size) - return TRUE; - } - -+/* A macroified version of specialized nearest scalers for some -+ * common 8888 and 565 formats. It supports SRC and OVER ops. -+ * -+ * There are two repeat versions, one that handles repeat normal, -+ * and one without repeat handling that only works if the src region -+ * used is completely covered by the pre-repeated source samples. -+ * -+ * The loops are unrolled to process two pixels per iteration for better -+ * performance on most CPU architectures (superscalar processors -+ * can issue several operations simultaneously, other processors can hide -+ * instructions latencies by pipelining operations). Unrolling more -+ * does not make much sense because the compiler will start running out -+ * of spare registers soon. -+ */ -+ -+#define GET_8888_ALPHA(s) ((s) >> 24) -+ /* This is not actually used since we don't have an OVER with -+ 565 source, but it is needed to build. */ -+#define GET_0565_ALPHA(s) 0xff -+ -+#define FAST_NEAREST(scale_func_name, SRC_FORMAT, DST_FORMAT, \ -+ src_type_t, dst_type_t, OP, do_repeat) \ -+static void \ -+fast_composite_scaled_nearest_ ## scale_func_name ## _ ## OP (pixman_implementation_t *imp, \ -+ pixman_op_t op, \ -+ pixman_image_t * src_image, \ -+ pixman_image_t * mask_image, \ -+ pixman_image_t * dst_image, \ -+ int32_t src_x, \ -+ int32_t src_y, \ -+ int32_t mask_x, \ -+ int32_t mask_y, \ -+ int32_t dst_x, \ -+ int32_t dst_y, \ -+ int32_t width, \ -+ int32_t height) \ -+{ \ -+ dst_type_t *dst_line; \ -+ src_type_t *src_first_line; \ -+ uint32_t d; \ -+ src_type_t s1, s2; \ -+ uint8_t a1, a2; \ -+ int w; \ -+ int x1, x2, y; \ -+ pixman_fixed_t orig_vx; \ -+ pixman_fixed_t max_vx, max_vy; \ -+ pixman_vector_t v; \ -+ pixman_fixed_t vx, vy; \ -+ pixman_fixed_t unit_x, unit_y; \ -+ \ -+ src_type_t *src; \ -+ dst_type_t *dst; \ -+ int src_stride, dst_stride; \ -+ \ -+ if (PIXMAN_OP_ ## OP != PIXMAN_OP_SRC && PIXMAN_OP_ ## OP != PIXMAN_OP_OVER) \ -+ abort(); \ -+ \ -+ PIXMAN_IMAGE_GET_LINE (dst_image, dst_x, dst_y, dst_type_t, dst_stride, dst_line, 1); \ -+ /* pass in 0 instead of src_x and src_y because src_x and src_y need to be \ -+ * transformed from destination space to source space */ \ -+ PIXMAN_IMAGE_GET_LINE (src_image, 0, 0, src_type_t, src_stride, src_first_line, 1); \ -+ \ -+ /* reference point is the center of the pixel */ \ -+ v.vector[0] = pixman_int_to_fixed (src_x) + pixman_fixed_1 / 2; \ -+ v.vector[1] = pixman_int_to_fixed (src_y) + pixman_fixed_1 / 2; \ -+ v.vector[2] = pixman_fixed_1; \ -+ \ -+ if (!pixman_transform_point_3d (src_image->common.transform, &v)) \ -+ return; \ -+ \ -+ unit_x = src_image->common.transform->matrix[0][0]; \ -+ unit_y = src_image->common.transform->matrix[1][1]; \ -+ \ -+ /* Round down to closest integer, ensuring that 0.5 rounds to 0, not 1 */ \ -+ v.vector[0] -= pixman_fixed_e; \ -+ v.vector[1] -= pixman_fixed_e; \ -+ \ -+ vx = v.vector[0]; \ -+ vy = v.vector[1]; \ -+ \ -+ if (do_repeat) \ -+ { \ -+ /* Clamp repeating positions inside the actual samples */ \ -+ max_vx = src_image->bits.width << 16; \ -+ max_vy = src_image->bits.height << 16; \ -+ \ -+ repeat (PIXMAN_REPEAT_NORMAL, &vx, max_vx); \ -+ repeat (PIXMAN_REPEAT_NORMAL, &vy, max_vy); \ -+ } \ -+ \ -+ orig_vx = vx; \ -+ \ -+ while (--height >= 0) \ -+ { \ -+ dst = dst_line; \ -+ dst_line += dst_stride; \ -+ \ -+ y = vy >> 16; \ -+ vy += unit_y; \ -+ if (do_repeat) \ -+ repeat (PIXMAN_REPEAT_NORMAL, &vy, max_vy); \ -+ \ -+ src = src_first_line + src_stride * y; \ -+ \ -+ w = width; \ -+ vx = orig_vx; \ -+ while ((w -= 2) >= 0) \ -+ { \ -+ x1 = vx >> 16; \ -+ vx += unit_x; \ -+ if (do_repeat) \ -+ repeat (PIXMAN_REPEAT_NORMAL, &vx, max_vx); \ -+ s1 = src[x1]; \ -+ \ -+ x2 = vx >> 16; \ -+ vx += unit_x; \ -+ if (do_repeat) \ -+ repeat (PIXMAN_REPEAT_NORMAL, &vx, max_vx); \ -+ s2 = src[x2]; \ -+ \ -+ if (PIXMAN_OP_ ## OP == PIXMAN_OP_OVER) \ -+ { \ -+ a1 = GET_ ## SRC_FORMAT ## _ALPHA(s1); \ -+ a2 = GET_ ## SRC_FORMAT ## _ALPHA(s2); \ -+ \ -+ if (a1 == 0xff) \ -+ { \ -+ *dst = CONVERT_ ## SRC_FORMAT ## _TO_ ## DST_FORMAT (s1); \ -+ } \ -+ else if (s1) \ -+ { \ -+ d = CONVERT_## DST_FORMAT ## _TO_8888 (*dst); \ -+ a1 ^= 0xff; \ -+ UN8x4_MUL_UN8_ADD_UN8x4 (d, a1, s1); \ -+ *dst = CONVERT_8888_TO_ ## DST_FORMAT (d); \ -+ } \ -+ dst++; \ -+ \ -+ if (a2 == 0xff) \ -+ { \ -+ *dst = CONVERT_ ## SRC_FORMAT ## _TO_ ## DST_FORMAT (s2); \ -+ } \ -+ else if (s2) \ -+ { \ -+ d = CONVERT_## DST_FORMAT ## _TO_8888 (*dst); \ -+ a2 ^= 0xff; \ -+ UN8x4_MUL_UN8_ADD_UN8x4 (d, a2, s2); \ -+ *dst = CONVERT_8888_TO_ ## DST_FORMAT (d); \ -+ } \ -+ dst++; \ -+ } \ -+ else /* PIXMAN_OP_SRC */ \ -+ { \ -+ *dst++ = CONVERT_ ## SRC_FORMAT ## _TO_ ## DST_FORMAT (s1); \ -+ *dst++ = CONVERT_ ## SRC_FORMAT ## _TO_ ## DST_FORMAT (s2); \ -+ } \ -+ } \ -+ \ -+ if (w & 1) \ -+ { \ -+ x1 = vx >> 16; \ -+ vx += unit_x; \ -+ if (do_repeat) \ -+ repeat (PIXMAN_REPEAT_NORMAL, &vx, max_vx); \ -+ s1 = src[x1]; \ -+ \ -+ if (PIXMAN_OP_ ## OP == PIXMAN_OP_OVER) \ -+ { \ -+ a1 = GET_ ## SRC_FORMAT ## _ALPHA(s1); \ -+ \ -+ if (a1 == 0xff) \ -+ { \ -+ *dst = CONVERT_ ## SRC_FORMAT ## _TO_ ## DST_FORMAT (s1); \ -+ } \ -+ else if (s1) \ -+ { \ -+ d = CONVERT_## DST_FORMAT ## _TO_8888 (*dst); \ -+ a1 ^= 0xff; \ -+ UN8x4_MUL_UN8_ADD_UN8x4 (d, a1, s1); \ -+ *dst = CONVERT_8888_TO_ ## DST_FORMAT (d); \ -+ } \ -+ dst++; \ -+ } \ -+ else /* PIXMAN_OP_SRC */ \ -+ { \ -+ *dst++ = CONVERT_ ## SRC_FORMAT ## _TO_ ## DST_FORMAT (s1); \ -+ } \ -+ } \ -+ } \ -+} -+ -+FAST_NEAREST(x888_x888_none, 8888, 8888, uint32_t, uint32_t, SRC, /*repeat: */ 0); -+FAST_NEAREST(x888_x888_normal, 8888, 8888, uint32_t, uint32_t, SRC, /*repeat: */ 1); -+FAST_NEAREST(x888_x888_none, 8888, 8888, uint32_t, uint32_t, OVER, /*repeat: */ 0); -+FAST_NEAREST(x888_x888_normal, 8888, 8888, uint32_t, uint32_t, OVER, /*repeat: */ 1); -+FAST_NEAREST(x888_565_none, 8888, 0565, uint32_t, uint16_t, SRC, /*repeat: */ 0); -+FAST_NEAREST(x888_565_normal, 8888, 0565, uint32_t, uint16_t, SRC, /*repeat: */ 1); -+FAST_NEAREST(565_565_none, 0565, 0565, uint16_t, uint16_t, SRC, /*repeat: */ 0); -+FAST_NEAREST(565_565_normal, 0565, 0565, uint16_t, uint16_t, SRC, /*repeat: */ 1); -+FAST_NEAREST(8888_565_none, 8888, 0565, uint32_t, uint16_t, OVER, /*repeat: */ 0); -+FAST_NEAREST(8888_565_normal, 8888, 0565, uint32_t, uint16_t, OVER, /*repeat: */ 1); -+ - static force_inline uint32_t - fetch_nearest (pixman_repeat_t src_repeat, - pixman_format_code_t format, -@@ -1595,6 +1798,46 @@ static const pixman_fast_path_t c_fast_paths[] = - FAST_PATH_NO_ACCESSORS | \ - FAST_PATH_NO_WIDE_FORMAT) - -+#define HAS_NORMAL_REPEAT_FLAGS \ -+ (FAST_PATH_NO_REFLECT_REPEAT | \ -+ FAST_PATH_NO_PAD_REPEAT | \ -+ FAST_PATH_NO_NONE_REPEAT) -+ -+#define SIMPLE_NEAREST_FAST_PATH(op,s,d,func) \ -+ { PIXMAN_OP_ ## op, \ -+ PIXMAN_ ## s, \ -+ SCALED_NEAREST_FLAGS | HAS_NORMAL_REPEAT_FLAGS | FAST_PATH_16BIT_SAFE, \ -+ PIXMAN_null, 0, \ -+ PIXMAN_ ## d, FAST_PATH_STD_DEST_FLAGS, \ -+ fast_composite_scaled_nearest_ ## func ## _normal ## _ ## op, \ -+ }, \ -+ { PIXMAN_OP_ ## op, \ -+ PIXMAN_ ## s, \ -+ SCALED_NEAREST_FLAGS | FAST_PATH_SAMPLES_COVER_CLIP, \ -+ PIXMAN_null, 0, \ -+ PIXMAN_ ## d, FAST_PATH_STD_DEST_FLAGS, \ -+ fast_composite_scaled_nearest_ ## func ## _none ## _ ## op, \ -+ } -+ SIMPLE_NEAREST_FAST_PATH (SRC, x8r8g8b8, x8r8g8b8, x888_x888), -+ SIMPLE_NEAREST_FAST_PATH (SRC, a8r8g8b8, x8r8g8b8, x888_x888), -+ SIMPLE_NEAREST_FAST_PATH (SRC, x8b8g8r8, x8b8g8r8, x888_x888), -+ SIMPLE_NEAREST_FAST_PATH (SRC, a8b8g8r8, x8b8g8r8, x888_x888), -+ -+ SIMPLE_NEAREST_FAST_PATH (SRC, a8r8g8b8, a8r8g8b8, x888_x888), -+ SIMPLE_NEAREST_FAST_PATH (SRC, a8b8g8r8, a8b8g8r8, x888_x888), -+ -+ SIMPLE_NEAREST_FAST_PATH (SRC, x8r8g8b8, r5g6b5, x888_565), -+ SIMPLE_NEAREST_FAST_PATH (SRC, a8r8g8b8, r5g6b5, x888_565), -+ -+ SIMPLE_NEAREST_FAST_PATH (SRC, r5g6b5, r5g6b5, 565_565), -+ -+ SIMPLE_NEAREST_FAST_PATH (OVER, a8r8g8b8, x8r8g8b8, x888_x888), -+ SIMPLE_NEAREST_FAST_PATH (OVER, a8b8g8r8, x8b8g8r8, x888_x888), -+ SIMPLE_NEAREST_FAST_PATH (OVER, a8r8g8b8, a8r8g8b8, x888_x888), -+ SIMPLE_NEAREST_FAST_PATH (OVER, a8b8g8r8, a8b8g8r8, x888_x888), -+ -+ SIMPLE_NEAREST_FAST_PATH (OVER, a8r8g8b8, r5g6b5, 8888_565), -+ - #define NEAREST_FAST_PATH(op,s,d) \ - { PIXMAN_OP_ ## op, \ - PIXMAN_ ## s, SCALED_NEAREST_FLAGS, \ --- -1.6.6.1 - diff --git a/recipes/xorg-lib/pixman/0005-Support-of-overlapping-src-dst-for-pixman_blt_sse2.patch b/recipes/xorg-lib/pixman/0005-Support-of-overlapping-src-dst-for-pixman_blt_sse2.patch deleted file mode 100644 index 3704fbf1cf..0000000000 --- a/recipes/xorg-lib/pixman/0005-Support-of-overlapping-src-dst-for-pixman_blt_sse2.patch +++ /dev/null @@ -1,91 +0,0 @@ -From edc80b41c6480b7c80ec5f7c835c92b2debb3774 Mon Sep 17 00:00:00 2001 -From: Siarhei Siamashka -Date: Thu, 22 Oct 2009 05:45:54 +0300 -Subject: [PATCH 5/6] Support of overlapping src/dst for pixman_blt_sse2 - ---- - pixman/pixman-sse2.c | 55 +++++++++++++++++++++++++++++-------------------- - 1 files changed, 32 insertions(+), 23 deletions(-) - -diff --git a/pixman/pixman-sse2.c b/pixman/pixman-sse2.c -index 78b0ad1..b84636b 100644 ---- a/pixman/pixman-sse2.c -+++ b/pixman/pixman-sse2.c -@@ -5300,34 +5300,43 @@ pixman_blt_sse2 (uint32_t *src_bits, - { - uint8_t * src_bytes; - uint8_t * dst_bytes; -- int byte_width; -+ int bpp; - -- if (src_bpp != dst_bpp) -+ if (src_bpp != dst_bpp || src_bpp & 7) - return FALSE; - -- if (src_bpp == 16) -- { -- src_stride = src_stride * (int) sizeof (uint32_t) / 2; -- dst_stride = dst_stride * (int) sizeof (uint32_t) / 2; -- src_bytes =(uint8_t *)(((uint16_t *)src_bits) + src_stride * (src_y) + (src_x)); -- dst_bytes = (uint8_t *)(((uint16_t *)dst_bits) + dst_stride * (dst_y) + (dst_x)); -- byte_width = 2 * width; -- src_stride *= 2; -- dst_stride *= 2; -- } -- else if (src_bpp == 32) -+ bpp = src_bpp >> 3; -+ width *= bpp; -+ src_stride *= 4; -+ dst_stride *= 4; -+ src_bytes = (uint8_t *)src_bits + src_y * src_stride + src_x * bpp; -+ dst_bytes = (uint8_t *)dst_bits + dst_y * dst_stride + dst_x * bpp; -+ -+ if (src_bpp != 16 && src_bpp != 32) - { -- src_stride = src_stride * (int) sizeof (uint32_t) / 4; -- dst_stride = dst_stride * (int) sizeof (uint32_t) / 4; -- src_bytes = (uint8_t *)(((uint32_t *)src_bits) + src_stride * (src_y) + (src_x)); -- dst_bytes = (uint8_t *)(((uint32_t *)dst_bits) + dst_stride * (dst_y) + (dst_x)); -- byte_width = 4 * width; -- src_stride *= 4; -- dst_stride *= 4; -+ pixman_blt_helper (src_bytes, dst_bytes, src_stride, dst_stride, -+ width, height); -+ return TRUE; - } -- else -+ -+ if (src_bytes < dst_bytes && src_bytes + src_stride * height > dst_bytes) - { -- return FALSE; -+ src_bytes += src_stride * height - src_stride; -+ dst_bytes += dst_stride * height - dst_stride; -+ dst_stride = -dst_stride; -+ src_stride = -src_stride; -+ -+ if (src_bytes + width > dst_bytes) -+ { -+ /* TODO: reverse scanline copy using SSE2 */ -+ while (--height >= 0) -+ { -+ memmove (dst_bytes, src_bytes, width); -+ dst_bytes += dst_stride; -+ src_bytes += src_stride; -+ } -+ return TRUE; -+ } - } - - cache_prefetch ((__m128i*)src_bytes); -@@ -5340,7 +5349,7 @@ pixman_blt_sse2 (uint32_t *src_bits, - uint8_t *d = dst_bytes; - src_bytes += src_stride; - dst_bytes += dst_stride; -- w = byte_width; -+ w = width; - - cache_prefetch_next ((__m128i*)s); - cache_prefetch_next ((__m128i*)d); --- -1.6.2.4 - diff --git a/recipes/xorg-lib/pixman/0006-Generic-C-implementation-of-pixman_blt-with-overlapp.patch b/recipes/xorg-lib/pixman/0006-Generic-C-implementation-of-pixman_blt-with-overlapp.patch deleted file mode 100644 index 8b265c0d74..0000000000 --- a/recipes/xorg-lib/pixman/0006-Generic-C-implementation-of-pixman_blt-with-overlapp.patch +++ /dev/null @@ -1,114 +0,0 @@ -From 8d1125fd6a25a0d1d758fd93384bf1baf07bcdf0 Mon Sep 17 00:00:00 2001 -From: Siarhei Siamashka -Date: Tue, 16 Mar 2010 16:55:28 +0100 -Subject: [PATCH 6/9] Generic C implementation of pixman_blt with overlapping support - -Uses memcpy/memmove functions to copy pixels, can handle the -case when both source and destination areas are in the same -image (this is useful for scrolling). - -It is assumed that copying direction is only important when -using the same image for both source and destination (and -src_stride == dst_stride). Copying direction is undefined -for the images with different source and destination stride -which happen to be in the overlapped areas (but this is an -unrealistic case anyway). ---- - pixman/pixman-general.c | 21 ++++++++++++++++++--- - pixman/pixman-private.h | 43 +++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 61 insertions(+), 3 deletions(-) - -diff --git a/pixman/pixman-general.c b/pixman/pixman-general.c -index bddf79a..f525744 100644 ---- a/pixman/pixman-general.c -+++ b/pixman/pixman-general.c -@@ -285,9 +285,24 @@ general_blt (pixman_implementation_t *imp, - int width, - int height) - { -- /* We can't blit unless we have sse2 or mmx */ -- -- return FALSE; -+ uint8_t *dst_bytes = (uint8_t *)dst_bits; -+ uint8_t *src_bytes = (uint8_t *)src_bits; -+ int bpp; -+ -+ if (src_bpp != dst_bpp || src_bpp & 7) -+ return FALSE; -+ -+ bpp = src_bpp >> 3; -+ width *= bpp; -+ src_stride *= 4; -+ dst_stride *= 4; -+ pixman_blt_helper (src_bytes + src_y * src_stride + src_x * bpp, -+ dst_bytes + dst_y * dst_stride + dst_x * bpp, -+ src_stride, -+ dst_stride, -+ width, -+ height); -+ return TRUE; - } - - static pixman_bool_t -diff --git a/pixman/pixman-private.h b/pixman/pixman-private.h -index 0cf9113..3478e1b 100644 ---- a/pixman/pixman-private.h -+++ b/pixman/pixman-private.h -@@ -10,6 +10,7 @@ - - #include "pixman.h" - #include -+#include - #include - #include - #include -@@ -866,4 +867,46 @@ void pixman_timer_register (pixman_timer_t *timer); - - #endif /* PIXMAN_TIMERS */ - -+/* a helper function, can blit 8-bit images with src/dst overlapping support */ -+static inline void -+pixman_blt_helper (uint8_t *src_bytes, -+ uint8_t *dst_bytes, -+ int src_stride, -+ int dst_stride, -+ int width, -+ int height) -+{ -+ /* -+ * The second part of this check is not strictly needed, but it prevents -+ * unnecessary upside-down processing of areas which belong to different -+ * images. Upside-down processing can be slower with fixed-distance-ahead -+ * prefetch and perceived as having more tearing. -+ */ -+ if (src_bytes < dst_bytes + width && -+ src_bytes + src_stride * height > dst_bytes) -+ { -+ src_bytes += src_stride * height - src_stride; -+ dst_bytes += dst_stride * height - dst_stride; -+ dst_stride = -dst_stride; -+ src_stride = -src_stride; -+ /* Horizontal scrolling to the left needs memmove */ -+ if (src_bytes + width > dst_bytes) -+ { -+ while (--height >= 0) -+ { -+ memmove (dst_bytes, src_bytes, width); -+ dst_bytes += dst_stride; -+ src_bytes += src_stride; -+ } -+ return; -+ } -+ } -+ while (--height >= 0) -+ { -+ memcpy (dst_bytes, src_bytes, width); -+ dst_bytes += dst_stride; -+ src_bytes += src_stride; -+ } -+} -+ - #endif /* PIXMAN_PRIVATE_H */ --- -1.6.6.1 - diff --git a/recipes/xorg-lib/pixman/0006-Support-of-overlapping-src-dst-for-pixman_blt_neon.patch b/recipes/xorg-lib/pixman/0006-Support-of-overlapping-src-dst-for-pixman_blt_neon.patch deleted file mode 100644 index af75716bb8..0000000000 --- a/recipes/xorg-lib/pixman/0006-Support-of-overlapping-src-dst-for-pixman_blt_neon.patch +++ /dev/null @@ -1,93 +0,0 @@ -From 86870ff530b5e435034bd80207e5758466d96cff Mon Sep 17 00:00:00 2001 -From: Siarhei Siamashka -Date: Wed, 18 Nov 2009 06:08:48 +0200 -Subject: [PATCH 6/6] Support of overlapping src/dst for pixman_blt_neon - ---- - pixman/pixman-arm-neon.c | 63 ++++++++++++++++++++++++++++++++++++++------- - 1 files changed, 53 insertions(+), 10 deletions(-) - -diff --git a/pixman/pixman-arm-neon.c b/pixman/pixman-arm-neon.c -index 495fda4..c632ff5 100644 ---- a/pixman/pixman-arm-neon.c -+++ b/pixman/pixman-arm-neon.c -@@ -306,23 +306,66 @@ pixman_blt_neon (uint32_t *src_bits, - int width, - int height) - { -+ uint8_t * src_bytes; -+ uint8_t * dst_bytes; -+ int bpp; -+ -+ if (src_bpp != dst_bpp || src_bpp & 7) -+ return FALSE; -+ -+ bpp = src_bpp >> 3; -+ width *= bpp; -+ src_stride *= 4; -+ dst_stride *= 4; -+ src_bytes = (uint8_t *)src_bits + src_y * src_stride + src_x * bpp; -+ dst_bytes = (uint8_t *)dst_bits + dst_y * dst_stride + dst_x * bpp; -+ -+ if (src_bpp != 16 && src_bpp != 32) -+ { -+ pixman_blt_helper (src_bytes, dst_bytes, src_stride, dst_stride, -+ width, height); -+ return TRUE; -+ } -+ -+ if (src_bytes < dst_bytes && src_bytes + src_stride * height > dst_bytes) -+ { -+ src_bytes += src_stride * height - src_stride; -+ dst_bytes += dst_stride * height - dst_stride; -+ dst_stride = -dst_stride; -+ src_stride = -src_stride; -+ -+ if (src_bytes + width > dst_bytes) -+ { -+ /* TODO: reverse scanline copy using NEON */ -+ while (--height >= 0) -+ { -+ memmove (dst_bytes, src_bytes, width); -+ dst_bytes += dst_stride; -+ src_bytes += src_stride; -+ } -+ return TRUE; -+ } -+ } -+ - switch (src_bpp) - { - case 16: - pixman_composite_src_0565_0565_asm_neon ( -- width, height, -- (uint16_t *)(((char *) dst_bits) + -- dst_y * dst_stride * 4 + dst_x * 2), dst_stride * 2, -- (uint16_t *)(((char *) src_bits) + -- src_y * src_stride * 4 + src_x * 2), src_stride * 2); -+ width >> 1, -+ height, -+ (uint16_t *) dst_bytes, -+ dst_stride >> 1, -+ (uint16_t *) src_bytes, -+ src_stride >> 1); - return TRUE; - case 32: - pixman_composite_src_8888_8888_asm_neon ( -- width, height, -- (uint32_t *)(((char *) dst_bits) + -- dst_y * dst_stride * 4 + dst_x * 4), dst_stride, -- (uint32_t *)(((char *) src_bits) + -- src_y * src_stride * 4 + src_x * 4), src_stride); -+ width >> 2, -+ height, -+ (uint32_t *) dst_bytes, -+ dst_stride >> 2, -+ (uint32_t *) src_bytes, -+ src_stride >> 2); - return TRUE; - default: - return FALSE; --- -1.6.2.4 - diff --git a/recipes/xorg-lib/pixman/0007-Support-of-overlapping-src-dst-for-pixman_blt_mmx.patch b/recipes/xorg-lib/pixman/0007-Support-of-overlapping-src-dst-for-pixman_blt_mmx.patch deleted file mode 100644 index f9a812e376..0000000000 --- a/recipes/xorg-lib/pixman/0007-Support-of-overlapping-src-dst-for-pixman_blt_mmx.patch +++ /dev/null @@ -1,91 +0,0 @@ -From ac9b18e8aefad1992c3057dc3cf7c309f14544d2 Mon Sep 17 00:00:00 2001 -From: Siarhei Siamashka -Date: Thu, 22 Oct 2009 05:45:47 +0300 -Subject: [PATCH 7/9] Support of overlapping src/dst for pixman_blt_mmx - ---- - pixman/pixman-mmx.c | 55 +++++++++++++++++++++++++++++--------------------- - 1 files changed, 32 insertions(+), 23 deletions(-) - -diff --git a/pixman/pixman-mmx.c b/pixman/pixman-mmx.c -index e084e7f..6212b31 100644 ---- a/pixman/pixman-mmx.c -+++ b/pixman/pixman-mmx.c -@@ -2994,34 +2994,43 @@ pixman_blt_mmx (uint32_t *src_bits, - { - uint8_t * src_bytes; - uint8_t * dst_bytes; -- int byte_width; -+ int bpp; - -- if (src_bpp != dst_bpp) -+ if (src_bpp != dst_bpp || src_bpp & 7) - return FALSE; - -- if (src_bpp == 16) -- { -- src_stride = src_stride * (int) sizeof (uint32_t) / 2; -- dst_stride = dst_stride * (int) sizeof (uint32_t) / 2; -- src_bytes = (uint8_t *)(((uint16_t *)src_bits) + src_stride * (src_y) + (src_x)); -- dst_bytes = (uint8_t *)(((uint16_t *)dst_bits) + dst_stride * (dst_y) + (dst_x)); -- byte_width = 2 * width; -- src_stride *= 2; -- dst_stride *= 2; -- } -- else if (src_bpp == 32) -+ bpp = src_bpp >> 3; -+ width *= bpp; -+ src_stride *= 4; -+ dst_stride *= 4; -+ src_bytes = (uint8_t *)src_bits + src_y * src_stride + src_x * bpp; -+ dst_bytes = (uint8_t *)dst_bits + dst_y * dst_stride + dst_x * bpp; -+ -+ if (src_bpp != 16 && src_bpp != 32) - { -- src_stride = src_stride * (int) sizeof (uint32_t) / 4; -- dst_stride = dst_stride * (int) sizeof (uint32_t) / 4; -- src_bytes = (uint8_t *)(((uint32_t *)src_bits) + src_stride * (src_y) + (src_x)); -- dst_bytes = (uint8_t *)(((uint32_t *)dst_bits) + dst_stride * (dst_y) + (dst_x)); -- byte_width = 4 * width; -- src_stride *= 4; -- dst_stride *= 4; -+ pixman_blt_helper (src_bytes, dst_bytes, src_stride, dst_stride, -+ width, height); -+ return TRUE; - } -- else -+ -+ if (src_bytes < dst_bytes && src_bytes + src_stride * height > dst_bytes) - { -- return FALSE; -+ src_bytes += src_stride * height - src_stride; -+ dst_bytes += dst_stride * height - dst_stride; -+ dst_stride = -dst_stride; -+ src_stride = -src_stride; -+ -+ if (src_bytes + width > dst_bytes) -+ { -+ /* TODO: reverse scanline copy using MMX */ -+ while (--height >= 0) -+ { -+ memmove (dst_bytes, src_bytes, width); -+ dst_bytes += dst_stride; -+ src_bytes += src_stride; -+ } -+ return TRUE; -+ } - } - - while (height--) -@@ -3031,7 +3040,7 @@ pixman_blt_mmx (uint32_t *src_bits, - uint8_t *d = dst_bytes; - src_bytes += src_stride; - dst_bytes += dst_stride; -- w = byte_width; -+ w = width; - - while (w >= 2 && ((unsigned long)d & 3)) - { --- -1.6.6.1 - diff --git a/recipes/xorg-lib/pixman/0008-Support-of-overlapping-src-dst-for-pixman_blt_sse2.patch b/recipes/xorg-lib/pixman/0008-Support-of-overlapping-src-dst-for-pixman_blt_sse2.patch deleted file mode 100644 index 5b311fe81f..0000000000 --- a/recipes/xorg-lib/pixman/0008-Support-of-overlapping-src-dst-for-pixman_blt_sse2.patch +++ /dev/null @@ -1,91 +0,0 @@ -From f6d6ad1063e29a95bad4c4a2e43f3ecf90344ef7 Mon Sep 17 00:00:00 2001 -From: Siarhei Siamashka -Date: Thu, 22 Oct 2009 05:45:54 +0300 -Subject: [PATCH 8/9] Support of overlapping src/dst for pixman_blt_sse2 - ---- - pixman/pixman-sse2.c | 55 +++++++++++++++++++++++++++++-------------------- - 1 files changed, 32 insertions(+), 23 deletions(-) - -diff --git a/pixman/pixman-sse2.c b/pixman/pixman-sse2.c -index 946e7ba..66053ae 100644 ---- a/pixman/pixman-sse2.c -+++ b/pixman/pixman-sse2.c -@@ -5299,34 +5299,43 @@ pixman_blt_sse2 (uint32_t *src_bits, - { - uint8_t * src_bytes; - uint8_t * dst_bytes; -- int byte_width; -+ int bpp; - -- if (src_bpp != dst_bpp) -+ if (src_bpp != dst_bpp || src_bpp & 7) - return FALSE; - -- if (src_bpp == 16) -- { -- src_stride = src_stride * (int) sizeof (uint32_t) / 2; -- dst_stride = dst_stride * (int) sizeof (uint32_t) / 2; -- src_bytes =(uint8_t *)(((uint16_t *)src_bits) + src_stride * (src_y) + (src_x)); -- dst_bytes = (uint8_t *)(((uint16_t *)dst_bits) + dst_stride * (dst_y) + (dst_x)); -- byte_width = 2 * width; -- src_stride *= 2; -- dst_stride *= 2; -- } -- else if (src_bpp == 32) -+ bpp = src_bpp >> 3; -+ width *= bpp; -+ src_stride *= 4; -+ dst_stride *= 4; -+ src_bytes = (uint8_t *)src_bits + src_y * src_stride + src_x * bpp; -+ dst_bytes = (uint8_t *)dst_bits + dst_y * dst_stride + dst_x * bpp; -+ -+ if (src_bpp != 16 && src_bpp != 32) - { -- src_stride = src_stride * (int) sizeof (uint32_t) / 4; -- dst_stride = dst_stride * (int) sizeof (uint32_t) / 4; -- src_bytes = (uint8_t *)(((uint32_t *)src_bits) + src_stride * (src_y) + (src_x)); -- dst_bytes = (uint8_t *)(((uint32_t *)dst_bits) + dst_stride * (dst_y) + (dst_x)); -- byte_width = 4 * width; -- src_stride *= 4; -- dst_stride *= 4; -+ pixman_blt_helper (src_bytes, dst_bytes, src_stride, dst_stride, -+ width, height); -+ return TRUE; - } -- else -+ -+ if (src_bytes < dst_bytes && src_bytes + src_stride * height > dst_bytes) - { -- return FALSE; -+ src_bytes += src_stride * height - src_stride; -+ dst_bytes += dst_stride * height - dst_stride; -+ dst_stride = -dst_stride; -+ src_stride = -src_stride; -+ -+ if (src_bytes + width > dst_bytes) -+ { -+ /* TODO: reverse scanline copy using SSE2 */ -+ while (--height >= 0) -+ { -+ memmove (dst_bytes, src_bytes, width); -+ dst_bytes += dst_stride; -+ src_bytes += src_stride; -+ } -+ return TRUE; -+ } - } - - cache_prefetch ((__m128i*)src_bytes); -@@ -5339,7 +5348,7 @@ pixman_blt_sse2 (uint32_t *src_bits, - uint8_t *d = dst_bytes; - src_bytes += src_stride; - dst_bytes += dst_stride; -- w = byte_width; -+ w = width; - - cache_prefetch_next ((__m128i*)s); - cache_prefetch_next ((__m128i*)d); --- -1.6.6.1 - diff --git a/recipes/xorg-lib/pixman/0009-Support-of-overlapping-src-dst-for-pixman_blt_neon.patch b/recipes/xorg-lib/pixman/0009-Support-of-overlapping-src-dst-for-pixman_blt_neon.patch deleted file mode 100644 index ae7b043194..0000000000 --- a/recipes/xorg-lib/pixman/0009-Support-of-overlapping-src-dst-for-pixman_blt_neon.patch +++ /dev/null @@ -1,94 +0,0 @@ -From 41572ca5aa9e50e4d1000b3da1e6ee43c6f4088a Mon Sep 17 00:00:00 2001 -From: Siarhei Siamashka -Date: Wed, 18 Nov 2009 06:08:48 +0200 -Subject: [PATCH 9/9] Support of overlapping src/dst for pixman_blt_neon - ---- - pixman/pixman-arm-neon.c | 62 +++++++++++++++++++++++++++++++++++++-------- - 1 files changed, 51 insertions(+), 11 deletions(-) - -diff --git a/pixman/pixman-arm-neon.c b/pixman/pixman-arm-neon.c -index 24ceeeb..134493d 100644 ---- a/pixman/pixman-arm-neon.c -+++ b/pixman/pixman-arm-neon.c -@@ -360,26 +360,66 @@ pixman_blt_neon (uint32_t *src_bits, - int width, - int height) - { -- if (src_bpp != dst_bpp) -+ uint8_t * src_bytes; -+ uint8_t * dst_bytes; -+ int bpp; -+ -+ if (src_bpp != dst_bpp || src_bpp & 7) - return FALSE; - -+ bpp = src_bpp >> 3; -+ width *= bpp; -+ src_stride *= 4; -+ dst_stride *= 4; -+ src_bytes = (uint8_t *)src_bits + src_y * src_stride + src_x * bpp; -+ dst_bytes = (uint8_t *)dst_bits + dst_y * dst_stride + dst_x * bpp; -+ -+ if (src_bpp != 16 && src_bpp != 32) -+ { -+ pixman_blt_helper (src_bytes, dst_bytes, src_stride, dst_stride, -+ width, height); -+ return TRUE; -+ } -+ -+ if (src_bytes < dst_bytes && src_bytes + src_stride * height > dst_bytes) -+ { -+ src_bytes += src_stride * height - src_stride; -+ dst_bytes += dst_stride * height - dst_stride; -+ dst_stride = -dst_stride; -+ src_stride = -src_stride; -+ -+ if (src_bytes + width > dst_bytes) -+ { -+ /* TODO: reverse scanline copy using NEON */ -+ while (--height >= 0) -+ { -+ memmove (dst_bytes, src_bytes, width); -+ dst_bytes += dst_stride; -+ src_bytes += src_stride; -+ } -+ return TRUE; -+ } -+ } -+ - switch (src_bpp) - { - case 16: - pixman_composite_src_0565_0565_asm_neon ( -- width, height, -- (uint16_t *)(((char *) dst_bits) + -- dst_y * dst_stride * 4 + dst_x * 2), dst_stride * 2, -- (uint16_t *)(((char *) src_bits) + -- src_y * src_stride * 4 + src_x * 2), src_stride * 2); -+ width >> 1, -+ height, -+ (uint16_t *) dst_bytes, -+ dst_stride >> 1, -+ (uint16_t *) src_bytes, -+ src_stride >> 1); - return TRUE; - case 32: - pixman_composite_src_8888_8888_asm_neon ( -- width, height, -- (uint32_t *)(((char *) dst_bits) + -- dst_y * dst_stride * 4 + dst_x * 4), dst_stride, -- (uint32_t *)(((char *) src_bits) + -- src_y * src_stride * 4 + src_x * 4), src_stride); -+ width >> 2, -+ height, -+ (uint32_t *) dst_bytes, -+ dst_stride >> 2, -+ (uint32_t *) src_bytes, -+ src_stride >> 2); - return TRUE; - default: - return FALSE; --- -1.6.6.1 - diff --git a/recipes/xorg-lib/pixman/0041-Fix-filler-bug.patch b/recipes/xorg-lib/pixman/0041-Fix-filler-bug.patch deleted file mode 100644 index 02bd13a0db..0000000000 --- a/recipes/xorg-lib/pixman/0041-Fix-filler-bug.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 82ea3295e435b49478cf7943100b22286baf47dc Mon Sep 17 00:00:00 2001 -From: Jonathan Morton -Date: Thu, 4 Jun 2009 10:43:41 +0300 -Subject: [PATCH] Fix filler bug. - ---- - pixman/pixman-arm-neon.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/pixman/pixman-arm-neon.c b/pixman/pixman-arm-neon.c -index 18e9a16..67f0b63 100644 ---- a/pixman/pixman-arm-neon.c -+++ b/pixman/pixman-arm-neon.c -@@ -1377,7 +1377,7 @@ pixman_fill_neon (uint32_t *bits, - "beq 2f\n" - "strh %[color], [r4]!\n" - "2:\n" -- "tst r5, #1\n" -+ "tst %[width], #1\n" - "beq 2f\n" - "strb %[color], [r4]!\n" - "2:\n" --- -1.5.6.3 - diff --git a/recipes/xorg-lib/pixman/0042-Really-fix-filler-bug.patch b/recipes/xorg-lib/pixman/0042-Really-fix-filler-bug.patch deleted file mode 100644 index e23b9cd133..0000000000 --- a/recipes/xorg-lib/pixman/0042-Really-fix-filler-bug.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 5cdd43ac753780ef2cfd6adde822af5dcba6091f Mon Sep 17 00:00:00 2001 -From: Jonathan Morton -Date: Thu, 4 Jun 2009 15:11:40 +0300 -Subject: [PATCH] Really fix filler bug. - ---- - pixman/pixman-arm-neon.c | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/pixman/pixman-arm-neon.c b/pixman/pixman-arm-neon.c -index cfb69f4..0c05f64 100644 ---- a/pixman/pixman-arm-neon.c -+++ b/pixman/pixman-arm-neon.c -@@ -1369,15 +1369,15 @@ pixman_fill_neon (uint32_t *bits, - "2:\n" - "tst %[width], #4\n" - "beq 2f\n" -- "str %[color], [r4]!\n" -+ "str %[color], [r4], #4\n" - "2:\n" - "tst %[width], #2\n" - "beq 2f\n" -- "strh %[color], [r4]!\n" -+ "strh %[color], [r4], #2\n" - "2:\n" - "tst %[width], #1\n" - "beq 2f\n" -- "strb %[color], [r4]!\n" -+ "strb %[color], [r4], #1\n" - "2:\n" - - "subs %[height], %[height], #1\n" --- -1.5.6.3 - diff --git a/recipes/xorg-lib/pixman_git.bb b/recipes/xorg-lib/pixman_git.bb index aae86e92fe..6b2e8e567d 100644 --- a/recipes/xorg-lib/pixman_git.bb +++ b/recipes/xorg-lib/pixman_git.bb @@ -3,26 +3,21 @@ PRIORITY = "optional" DESCRIPTION = "Low-level pixel manipulation library." LICENSE = "X11" -PV = "0.17.10" -PR = "r1" +PV = "0.17.11" +PR = "r2" PR_append = "+gitr${SRCREV}" BBCLASSEXTEND="native" -SRCREV = "313353f1fb9d40d0c3aaf7cfb99ca978b29003a4" +SRCREV = "265ea1fb4d05a920323f23a02f9dc379312bbdae" DEFAULT_PREFERENCE = "-1" SRC_URI = "git://anongit.freedesktop.org/pixman;protocol=git;branch=master \ - file://0001-Add-CONVERT_0565_TO_8888-macro.patch;patch=1 \ - file://0002-Add-CONVERT_8888_TO_8888-and-CONVERT_0565_TO_0565-ma.patch;patch=1 \ - file://0003-Add-FAST_PATH_NO_NONE_REPEAT-flag.patch;patch=1 \ - file://0004-Add-FAST_PATH_SAMPLES_COVER_CLIP-and-FAST_PATH_16BIT.patch;patch=1 \ - file://0005-Add-specialized-fast-nearest-scalers.patch;patch=1 \ - file://0006-Generic-C-implementation-of-pixman_blt-with-overlapp.patch;patch=1 \ - file://0007-Support-of-overlapping-src-dst-for-pixman_blt_mmx.patch;patch=1 \ - file://0008-Support-of-overlapping-src-dst-for-pixman_blt_sse2.patch;patch=1 \ - file://0009-Support-of-overlapping-src-dst-for-pixman_blt_neon.patch;patch=1 \ + file://0001-Generic-C-implementation-of-pixman_blt-with-overlapp.patch;patch=1 \ + file://0002-Support-of-overlapping-src-dst-for-pixman_blt_mmx.patch;patch=1 \ + file://0003-Support-of-overlapping-src-dst-for-pixman_blt_sse2.patch;patch=1 \ + file://0004-Support-of-overlapping-src-dst-for-pixman_blt_neon.patch;patch=1 \ file://over-n-8-0565.patch;patch=1 \ file://src-8888-0565.patch;patch=1 \ " -- cgit v1.2.3 From d695f337bdaa0e297ad89c6fdd99edf97bc270db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Lanzend=C3=B6rfer?= Date: Wed, 17 Mar 2010 21:25:38 +0100 Subject: xf86-video-msm: fix build errors --- recipes/xorg-driver/xf86-video-msm/no_neon.patch | 2901 ++++++++++++++++++++ .../xorg-driver/xf86-video-msm/no_neon_flags.patch | 36 + .../xf86-video-msm/renaming_variables.patch | 116 + recipes/xorg-driver/xf86-video-msm_git.bb | 10 +- 4 files changed, 3061 insertions(+), 2 deletions(-) create mode 100644 recipes/xorg-driver/xf86-video-msm/no_neon.patch create mode 100644 recipes/xorg-driver/xf86-video-msm/no_neon_flags.patch create mode 100644 recipes/xorg-driver/xf86-video-msm/renaming_variables.patch diff --git a/recipes/xorg-driver/xf86-video-msm/no_neon.patch b/recipes/xorg-driver/xf86-video-msm/no_neon.patch new file mode 100644 index 0000000000..c0aa92e76a --- /dev/null +++ b/recipes/xorg-driver/xf86-video-msm/no_neon.patch @@ -0,0 +1,2901 @@ +commit d8910bf773fbecf7cdea359d4b530a3672e27180 +Author: David Lanzendörfer +Date: Wed Feb 10 16:18:39 2010 +0100 + + Removed neon because its not available in our kerneÃl + and so its causing trubble (Illegal instruction) + +diff --git git/src/msm-swblits.h git/src/msm-swblits.h +index f89f00e..a40b24b 100755 +--- git/src/msm-swblits.h ++++ git/src/msm-swblits.h +@@ -38,16 +38,6 @@ + #include + #include + +-/* Neon intrinsics are part of the ARM or GCC compiler used. */ +-/* Tested with: /pkg/asw/compilers/gnu/codesourcery/arm-2008q3-72/lib/gcc/arm-none-linux-gnueabi/4.3.2/include/arm_neon.h */ +-#include +- +-/* These are NEON-optimized functions linked to by various tests. */ +-extern void * neon_memcpy (void * dest, const void * source, unsigned int numBytes); +-extern void * neon_memmove (void * dest, const void * source, unsigned int numBytes); +-extern void memset16(uint16_t *dst, uint16_t value, int count); +-extern void memset32(uint32_t *dst, uint32_t value, int count); +- + /* Make definitions to clarify memory-related sizes to enable avoidance of magic numbers. */ + #define BITS_PER_BYTE (8) + #define BYTES_PER_16BPP_PIXEL (2) +diff --git git/src/msm-swfill.c git/src/msm-swfill.c +index 108fd94..3dd1ef2 100755 +--- git/src/msm-swfill.c ++++ git/src/msm-swfill.c +@@ -212,7 +212,7 @@ memset16_NeonAlignmentAssumptions_UpTo7Count(uint8_t *dst, uint16_t src, int cou + } + } + +- ++/* + static inline void + memset16_AssumesNeonAlignment(uint8_t *dst, uint16_t src, int count) + { +@@ -333,7 +333,7 @@ memset16_AssumesNeonAlignment(uint8_t *dst, uint16_t src, int count) + // Quickly fill remaining pixels (up to 7). + memset16_NeonAlignmentAssumptions_UpTo7Count(dst, src, count); + } +- ++*/ + + static inline void + memset16_Test(uint16_t *dst, uint16_t src, int count) +@@ -368,7 +368,8 @@ memset16_Test(uint16_t *dst, uint16_t src, int count) + + // Copy remaining pixels using Neon and non-Neon instructions. + // NOTE: This assumes that dst is aligned optimally for Neon instructions. +- memset16_AssumesNeonAlignment((void *) dst, src, count); ++ //memset16_AssumesNeonAlignment((void *) dst, src, count); ++ memset((void *) dst, src, count); + } + } + +@@ -435,12 +436,14 @@ swFillRect32Bpp_Unaligned(unsigned char *dst, uint32_t src, int w, int h, int dp + if (w < 32) { + // For narrow rectangles, block signals only once for the entire rectangles. + BLOCK_SIGNALS_BEFORE_VFP_OPERATIONS(); +- DO_MULTIPLE_FILLS_WITH_MEMSET(memset32,SIGNAL_BLOCK_NOOP,SIGNAL_BLOCK_NOOP); ++ //DO_MULTIPLE_FILLS_WITH_MEMSET(memset32,SIGNAL_BLOCK_NOOP,SIGNAL_BLOCK_NOOP); ++ DO_MULTIPLE_FILLS_WITH_MEMSET(memset,SIGNAL_BLOCK_NOOP,SIGNAL_BLOCK_NOOP); + UNBLOCK_SIGNALS_AFTER_VFP_OPERATIONS(); + } + else { + // For wider rectangles, block and unblock signals for every row. +- DO_MULTIPLE_FILLS_WITH_MEMSET(memset32,BLOCK_SIGNALS_BEFORE_VFP_OPERATIONS,UNBLOCK_SIGNALS_AFTER_VFP_OPERATIONS); ++ //DO_MULTIPLE_FILLS_WITH_MEMSET(memset32,BLOCK_SIGNALS_BEFORE_VFP_OPERATIONS,UNBLOCK_SIGNALS_AFTER_VFP_OPERATIONS); ++ DO_MULTIPLE_FILLS_WITH_MEMSET(memset,BLOCK_SIGNALS_BEFORE_VFP_OPERATIONS,UNBLOCK_SIGNALS_AFTER_VFP_OPERATIONS); + } + } + +diff --git git/src/msm-swrender.c git/src/msm-swrender.c +index a7a9abc..835dc03 100755 +--- git/src/msm-swrender.c ++++ git/src/msm-swrender.c +@@ -214,160 +214,6 @@ swCopy16BppSmallFixedWidths1Row_Unaligned(unsigned char *dst, unsigned char *src + } + } + break; +- case 7: if (xdir >= 0) { +- swCopy16BppSmallFixedWidths1Row_Unaligned(dst, src, 4, xdir); +- swCopy16BppSmallFixedWidths1Row_Unaligned(dst + 4 * BYTES_PER_UINT16_T, src + 4 * BYTES_PER_UINT16_T, 3, xdir); +- return TRUE; +- } else { +- swCopy16BppSmallFixedWidths1Row_Unaligned(dst + 4 * BYTES_PER_UINT16_T, src + 4 * BYTES_PER_UINT16_T, 3, xdir); +- swCopy16BppSmallFixedWidths1Row_Unaligned(dst, src, 4, xdir); +- return TRUE; +- } +- break; +- case 8: if (SW_CHECK_ALIGNMENT(QUAD_WORD_ALIGNMENT_BYTE_SIZE,dst,src,0)) { +- uint32x4_t src1 = vld1q_u32((uint32_t *)(src+0*BYTES_PER_UINT32X4_T)); +- vst1q_u32((uint32_t *)(dst+0*BYTES_PER_UINT32X4_T),src1); +- return TRUE; +- } +- else if (SW_CHECK_ALIGNMENT(DOUBLE_WORD_ALIGNMENT_BYTE_SIZE,dst,src,0)) { +- uint64_t src1 = *(uint64_t *) (src+0*BYTES_PER_UINT64_T); +- uint64_t src2 = *(uint64_t *) (src+1*BYTES_PER_UINT64_T); +- *(uint64_t *) (dst+0*BYTES_PER_UINT64_T) = src1; +- *(uint64_t *) (dst+1*BYTES_PER_UINT64_T) = src2; +- return TRUE; +- } +- else if (SW_CHECK_ALIGNMENT(WORD_ALIGNMENT_BYTE_SIZE,dst,src,0)) { +- uint32_t src1 = *(uint32_t *) (src+0*BYTES_PER_UINT32_T); +- uint32_t src2 = *(uint32_t *) (src+1*BYTES_PER_UINT32_T); +- uint32_t src3 = *(uint32_t *) (src+2*BYTES_PER_UINT32_T); +- uint32_t src4 = *(uint32_t *) (src+3*BYTES_PER_UINT32_T); +- *(uint32_t *) (dst+0*BYTES_PER_UINT32_T) = src1; +- *(uint32_t *) (dst+1*BYTES_PER_UINT32_T) = src2; +- *(uint32_t *) (dst+2*BYTES_PER_UINT32_T) = src3; +- *(uint32_t *) (dst+3*BYTES_PER_UINT32_T) = src4; +- return TRUE; +- } +- else { +- uint16_t src1 = *(uint16_t *) (src+0*BYTES_PER_UINT16_T); +- uint16_t src2 = *(uint16_t *) (src+1*BYTES_PER_UINT16_T); +- uint16_t src3 = *(uint16_t *) (src+2*BYTES_PER_UINT16_T); +- uint16_t src4 = *(uint16_t *) (src+3*BYTES_PER_UINT16_T); +- uint16_t src5 = *(uint16_t *) (src+4*BYTES_PER_UINT16_T); +- uint16_t src6 = *(uint16_t *) (src+5*BYTES_PER_UINT16_T); +- uint16_t src7 = *(uint16_t *) (src+6*BYTES_PER_UINT16_T); +- uint16_t src8 = *(uint16_t *) (src+7*BYTES_PER_UINT16_T); +- *(uint16_t *) (dst+0*BYTES_PER_UINT16_T) = src1; +- *(uint16_t *) (dst+1*BYTES_PER_UINT16_T) = src2; +- *(uint16_t *) (dst+2*BYTES_PER_UINT16_T) = src3; +- *(uint16_t *) (dst+3*BYTES_PER_UINT16_T) = src4; +- *(uint16_t *) (dst+4*BYTES_PER_UINT16_T) = src5; +- *(uint16_t *) (dst+5*BYTES_PER_UINT16_T) = src6; +- *(uint16_t *) (dst+6*BYTES_PER_UINT16_T) = src7; +- *(uint16_t *) (dst+7*BYTES_PER_UINT16_T) = src8; +- return TRUE; +- } +- break; +- case 16: if (SW_CHECK_ALIGNMENT(QUAD_WORD_ALIGNMENT_BYTE_SIZE,dst,src,0)) { +- uint32x4_t src1 = vld1q_u32((uint32_t *)(src+0*BYTES_PER_UINT32X4_T)); +- uint32x4_t src2 = vld1q_u32((uint32_t *)(src+1*BYTES_PER_UINT32X4_T)); +- vst1q_u32((uint32_t *)(dst+0*BYTES_PER_UINT32X4_T),src1); +- vst1q_u32((uint32_t *)(dst+1*BYTES_PER_UINT32X4_T),src2); +- return TRUE; +- } +- else if (SW_CHECK_ALIGNMENT(DOUBLE_WORD_ALIGNMENT_BYTE_SIZE,dst,src,0)) { +- uint64_t src1 = *(uint64_t *) (src+0*BYTES_PER_UINT64_T); +- uint64_t src2 = *(uint64_t *) (src+1*BYTES_PER_UINT64_T); +- uint64_t src3 = *(uint64_t *) (src+2*BYTES_PER_UINT64_T); +- uint64_t src4 = *(uint64_t *) (src+3*BYTES_PER_UINT64_T); +- *(uint64_t *) (dst+0*BYTES_PER_UINT64_T) = src1; +- *(uint64_t *) (dst+1*BYTES_PER_UINT64_T) = src2; +- *(uint64_t *) (dst+2*BYTES_PER_UINT64_T) = src3; +- *(uint64_t *) (dst+3*BYTES_PER_UINT64_T) = src4; +- return TRUE; +- } +- else if (SW_CHECK_ALIGNMENT(WORD_ALIGNMENT_BYTE_SIZE,dst,src,0)) { +- uint32_t src1 = *(uint32_t *) (src+0*BYTES_PER_UINT32_T); +- uint32_t src2 = *(uint32_t *) (src+1*BYTES_PER_UINT32_T); +- uint32_t src3 = *(uint32_t *) (src+2*BYTES_PER_UINT32_T); +- uint32_t src4 = *(uint32_t *) (src+3*BYTES_PER_UINT32_T); +- uint32_t src5 = *(uint32_t *) (src+4*BYTES_PER_UINT32_T); +- uint32_t src6 = *(uint32_t *) (src+5*BYTES_PER_UINT32_T); +- uint32_t src7 = *(uint32_t *) (src+6*BYTES_PER_UINT32_T); +- uint32_t src8 = *(uint32_t *) (src+7*BYTES_PER_UINT32_T); +- *(uint32_t *) (dst+0*BYTES_PER_UINT32_T) = src1; +- *(uint32_t *) (dst+1*BYTES_PER_UINT32_T) = src2; +- *(uint32_t *) (dst+2*BYTES_PER_UINT32_T) = src3; +- *(uint32_t *) (dst+3*BYTES_PER_UINT32_T) = src4; +- *(uint32_t *) (dst+4*BYTES_PER_UINT32_T) = src5; +- *(uint32_t *) (dst+5*BYTES_PER_UINT32_T) = src6; +- *(uint32_t *) (dst+6*BYTES_PER_UINT32_T) = src7; +- *(uint32_t *) (dst+7*BYTES_PER_UINT32_T) = src8; +- return TRUE; +- } +- else { +- // Don't bother unrolling loops here, since that won't help for more than around 8 operations. +- // Instead, just call multiple fixed functions. +- if (xdir >= 0) { +- swCopy16BppSmallFixedWidths1Row_Unaligned(dst, src, 8, xdir); +- swCopy16BppSmallFixedWidths1Row_Unaligned(dst + 8 * BYTES_PER_UINT16_T, src + 8 * BYTES_PER_UINT16_T, 8, xdir); +- } else { +- swCopy16BppSmallFixedWidths1Row_Unaligned(dst + 8 * BYTES_PER_UINT16_T, src + 8 * BYTES_PER_UINT16_T, 8, xdir); +- swCopy16BppSmallFixedWidths1Row_Unaligned(dst, src, 8, xdir); +- } +- return TRUE; +- } +- break; +- case 32: if (SW_CHECK_ALIGNMENT(QUAD_WORD_ALIGNMENT_BYTE_SIZE,dst,src,0)) { +- uint32x4_t src1 = vld1q_u32((uint32_t *)(src+0*BYTES_PER_UINT32X4_T)); +- uint32x4_t src2 = vld1q_u32((uint32_t *)(src+1*BYTES_PER_UINT32X4_T)); +- uint32x4_t src3 = vld1q_u32((uint32_t *)(src+2*BYTES_PER_UINT32X4_T)); +- uint32x4_t src4 = vld1q_u32((uint32_t *)(src+3*BYTES_PER_UINT32X4_T)); +- vst1q_u32((uint32_t *)(dst+0*BYTES_PER_UINT32X4_T),src1); +- vst1q_u32((uint32_t *)(dst+1*BYTES_PER_UINT32X4_T),src2); +- vst1q_u32((uint32_t *)(dst+2*BYTES_PER_UINT32X4_T),src3); +- vst1q_u32((uint32_t *)(dst+3*BYTES_PER_UINT32X4_T),src4); +- return TRUE; +- } +- else if (SW_CHECK_ALIGNMENT(DOUBLE_WORD_ALIGNMENT_BYTE_SIZE,dst,src,0)) { +- uint64_t src1 = *(uint64_t *) (src+0*BYTES_PER_UINT64_T); +- uint64_t src2 = *(uint64_t *) (src+1*BYTES_PER_UINT64_T); +- uint64_t src3 = *(uint64_t *) (src+2*BYTES_PER_UINT64_T); +- uint64_t src4 = *(uint64_t *) (src+3*BYTES_PER_UINT64_T); +- uint64_t src5 = *(uint64_t *) (src+4*BYTES_PER_UINT64_T); +- uint64_t src6 = *(uint64_t *) (src+5*BYTES_PER_UINT64_T); +- uint64_t src7 = *(uint64_t *) (src+6*BYTES_PER_UINT64_T); +- uint64_t src8 = *(uint64_t *) (src+7*BYTES_PER_UINT64_T); +- *(uint64_t *) (dst+0*BYTES_PER_UINT64_T) = src1; +- *(uint64_t *) (dst+1*BYTES_PER_UINT64_T) = src2; +- *(uint64_t *) (dst+2*BYTES_PER_UINT64_T) = src3; +- *(uint64_t *) (dst+3*BYTES_PER_UINT64_T) = src4; +- *(uint64_t *) (dst+4*BYTES_PER_UINT64_T) = src5; +- *(uint64_t *) (dst+5*BYTES_PER_UINT64_T) = src6; +- *(uint64_t *) (dst+6*BYTES_PER_UINT64_T) = src7; +- *(uint64_t *) (dst+7*BYTES_PER_UINT64_T) = src8; +- return TRUE; +- } +- break; +- case 64: if (SW_CHECK_ALIGNMENT(QUAD_WORD_ALIGNMENT_BYTE_SIZE,dst,src,0)) { +- uint32x4_t src1 = vld1q_u32((uint32_t *)(src+0*BYTES_PER_UINT32X4_T)); +- uint32x4_t src2 = vld1q_u32((uint32_t *)(src+1*BYTES_PER_UINT32X4_T)); +- uint32x4_t src3 = vld1q_u32((uint32_t *)(src+2*BYTES_PER_UINT32X4_T)); +- uint32x4_t src4 = vld1q_u32((uint32_t *)(src+3*BYTES_PER_UINT32X4_T)); +- uint32x4_t src5 = vld1q_u32((uint32_t *)(src+4*BYTES_PER_UINT32X4_T)); +- uint32x4_t src6 = vld1q_u32((uint32_t *)(src+5*BYTES_PER_UINT32X4_T)); +- uint32x4_t src7 = vld1q_u32((uint32_t *)(src+6*BYTES_PER_UINT32X4_T)); +- uint32x4_t src8 = vld1q_u32((uint32_t *)(src+7*BYTES_PER_UINT32X4_T)); +- vst1q_u32((uint32_t *)(dst+0*BYTES_PER_UINT32X4_T),src1); +- vst1q_u32((uint32_t *)(dst+1*BYTES_PER_UINT32X4_T),src2); +- vst1q_u32((uint32_t *)(dst+2*BYTES_PER_UINT32X4_T),src3); +- vst1q_u32((uint32_t *)(dst+3*BYTES_PER_UINT32X4_T),src4); +- vst1q_u32((uint32_t *)(dst+4*BYTES_PER_UINT32X4_T),src5); +- vst1q_u32((uint32_t *)(dst+5*BYTES_PER_UINT32X4_T),src6); +- vst1q_u32((uint32_t *)(dst+6*BYTES_PER_UINT32X4_T),src7); +- vst1q_u32((uint32_t *)(dst+7*BYTES_PER_UINT32X4_T),src8); +- return TRUE; +- } +- break; + } + + return FALSE; +@@ -519,427 +365,6 @@ swCopy16BppSmallFixedWidths2Rows_Unaligned(unsigned char *dst, unsigned char *sr + } + return TRUE; + break; +- case 7: if (xdir >= 0) { +- swCopy16BppSmallFixedWidths2Rows_Unaligned(dst, src, 4, xdir, dpitch, spitch); +- swCopy16BppSmallFixedWidths2Rows_Unaligned(dst + 4 * BYTES_PER_UINT16_T, src + 4 * BYTES_PER_UINT16_T, 3, xdir, dpitch, spitch); +- } else { +- swCopy16BppSmallFixedWidths2Rows_Unaligned(dst + 4 * BYTES_PER_UINT16_T, src + 4 * BYTES_PER_UINT16_T, 3, xdir, dpitch, spitch); +- swCopy16BppSmallFixedWidths2Rows_Unaligned(dst, src, 4, xdir, dpitch, spitch); +- } +- return TRUE; +- break; +- case 8: if (SW_CHECK_PITCHED_ALIGNMENT(QUAD_WORD_ALIGNMENT_BYTE_SIZE,dst,src,dpitch,spitch,0)) { +- uint32x4_t src1a = vld1q_u32((uint32_t *)(src+0*spitch+0*BYTES_PER_UINT32X4_T)); +- uint32x4_t src1b = vld1q_u32((uint32_t *)(src+1*spitch+0*BYTES_PER_UINT32X4_T)); +- vst1q_u32((uint32_t *)(dst+0*dpitch+0*BYTES_PER_UINT32X4_T),src1a); +- vst1q_u32((uint32_t *)(dst+1*dpitch+0*BYTES_PER_UINT32X4_T),src1b); +- return TRUE; +- } +- else if (SW_CHECK_PITCHED_ALIGNMENT(DOUBLE_WORD_ALIGNMENT_BYTE_SIZE,dst,src,dpitch,spitch,0)) { +- uint64_t src1a = *(uint64_t *) (src+0*spitch+0*BYTES_PER_UINT64_T); +- uint64_t src2a = *(uint64_t *) (src+0*spitch+1*BYTES_PER_UINT64_T); +- uint64_t src1b = *(uint64_t *) (src+1*spitch+0*BYTES_PER_UINT64_T); +- uint64_t src2b = *(uint64_t *) (src+1*spitch+1*BYTES_PER_UINT64_T); +- *(uint64_t *) (dst+0*dpitch+0*BYTES_PER_UINT64_T) = src1a; +- *(uint64_t *) (dst+0*dpitch+1*BYTES_PER_UINT64_T) = src2a; +- *(uint64_t *) (dst+1*dpitch+0*BYTES_PER_UINT64_T) = src1b; +- *(uint64_t *) (dst+1*dpitch+1*BYTES_PER_UINT64_T) = src2b; +- return TRUE; +- } +- else if (SW_CHECK_PITCHED_ALIGNMENT(WORD_ALIGNMENT_BYTE_SIZE,dst,src,dpitch,spitch,0)) { +- uint32_t src1a = *(uint32_t *) (src+0*spitch+0*BYTES_PER_UINT32_T); +- uint32_t src2a = *(uint32_t *) (src+0*spitch+1*BYTES_PER_UINT32_T); +- uint32_t src3a = *(uint32_t *) (src+0*spitch+2*BYTES_PER_UINT32_T); +- uint32_t src4a = *(uint32_t *) (src+0*spitch+3*BYTES_PER_UINT32_T); +- uint32_t src1b = *(uint32_t *) (src+1*spitch+0*BYTES_PER_UINT32_T); +- uint32_t src2b = *(uint32_t *) (src+1*spitch+1*BYTES_PER_UINT32_T); +- uint32_t src3b = *(uint32_t *) (src+1*spitch+2*BYTES_PER_UINT32_T); +- uint32_t src4b = *(uint32_t *) (src+1*spitch+3*BYTES_PER_UINT32_T); +- *(uint32_t *) (dst+0*dpitch+0*BYTES_PER_UINT32_T) = src1a; +- *(uint32_t *) (dst+0*dpitch+1*BYTES_PER_UINT32_T) = src2a; +- *(uint32_t *) (dst+0*dpitch+2*BYTES_PER_UINT32_T) = src3a; +- *(uint32_t *) (dst+0*dpitch+3*BYTES_PER_UINT32_T) = src4a; +- *(uint32_t *) (dst+1*dpitch+0*BYTES_PER_UINT32_T) = src1b; +- *(uint32_t *) (dst+1*dpitch+1*BYTES_PER_UINT32_T) = src2b; +- *(uint32_t *) (dst+1*dpitch+2*BYTES_PER_UINT32_T) = src3b; +- *(uint32_t *) (dst+1*dpitch+3*BYTES_PER_UINT32_T) = src4b; +- return TRUE; +- } +- else if (SW_CHECK_PITCHED_ALIGNMENT(WORD_ALIGNMENT_BYTE_SIZE,dst,src,dpitch,spitch,BYTES_PER_UINT16_T)) { +- uint16_t src1a = *(uint16_t *) (src+0*spitch+0); +- uint32_t src2a = *(uint32_t *) (src+0*spitch+BYTES_PER_UINT16_T+0*BYTES_PER_UINT32_T); +- uint32_t src3a = *(uint32_t *) (src+0*spitch+BYTES_PER_UINT16_T+1*BYTES_PER_UINT32_T); +- uint32_t src4a = *(uint32_t *) (src+0*spitch+BYTES_PER_UINT16_T+2*BYTES_PER_UINT32_T); +- uint16_t src5a = *(uint16_t *) (src+0*spitch+BYTES_PER_UINT16_T+3*BYTES_PER_UINT32_T); +- uint16_t src1b = *(uint16_t *) (src+1*spitch+0); +- uint32_t src2b = *(uint32_t *) (src+1*spitch+BYTES_PER_UINT16_T+0*BYTES_PER_UINT32_T); +- uint32_t src3b = *(uint32_t *) (src+1*spitch+BYTES_PER_UINT16_T+1*BYTES_PER_UINT32_T); +- uint32_t src4b = *(uint32_t *) (src+1*spitch+BYTES_PER_UINT16_T+2*BYTES_PER_UINT32_T); +- uint16_t src5b = *(uint16_t *) (src+1*spitch+BYTES_PER_UINT16_T+3*BYTES_PER_UINT32_T); +- *(uint16_t *) (dst+0*dpitch+0) = src1a; +- *(uint32_t *) (dst+0*dpitch+BYTES_PER_UINT16_T+0*BYTES_PER_UINT32_T) = src2a; +- *(uint32_t *) (dst+0*dpitch+BYTES_PER_UINT16_T+1*BYTES_PER_UINT32_T) = src3a; +- *(uint32_t *) (dst+0*dpitch+BYTES_PER_UINT16_T+2*BYTES_PER_UINT32_T) = src4a; +- *(uint16_t *) (dst+0*dpitch+BYTES_PER_UINT16_T+3*BYTES_PER_UINT32_T) = src5a; +- *(uint16_t *) (dst+1*dpitch+0) = src1b; +- *(uint32_t *) (dst+1*dpitch+BYTES_PER_UINT16_T+0*BYTES_PER_UINT32_T) = src2b; +- *(uint32_t *) (dst+1*dpitch+BYTES_PER_UINT16_T+1*BYTES_PER_UINT32_T) = src3b; +- *(uint32_t *) (dst+1*dpitch+BYTES_PER_UINT16_T+2*BYTES_PER_UINT32_T) = src4b; +- *(uint16_t *) (dst+1*dpitch+BYTES_PER_UINT16_T+3*BYTES_PER_UINT32_T) = src5b; +- return TRUE; +- } +- else { +- uint16_t src1a = *(uint16_t *) (src+0*spitch+0*BYTES_PER_UINT16_T); +- uint16_t src2a = *(uint16_t *) (src+0*spitch+1*BYTES_PER_UINT16_T); +- uint16_t src3a = *(uint16_t *) (src+0*spitch+2*BYTES_PER_UINT16_T); +- uint16_t src4a = *(uint16_t *) (src+0*spitch+3*BYTES_PER_UINT16_T); +- uint16_t src5a = *(uint16_t *) (src+0*spitch+4*BYTES_PER_UINT16_T); +- uint16_t src6a = *(uint16_t *) (src+0*spitch+5*BYTES_PER_UINT16_T); +- uint16_t src7a = *(uint16_t *) (src+0*spitch+6*BYTES_PER_UINT16_T); +- uint16_t src8a = *(uint16_t *) (src+0*spitch+7*BYTES_PER_UINT16_T); +- uint16_t src1b = *(uint16_t *) (src+1*spitch+0*BYTES_PER_UINT16_T); +- uint16_t src2b = *(uint16_t *) (src+1*spitch+1*BYTES_PER_UINT16_T); +- uint16_t src3b = *(uint16_t *) (src+1*spitch+2*BYTES_PER_UINT16_T); +- uint16_t src4b = *(uint16_t *) (src+1*spitch+3*BYTES_PER_UINT16_T); +- uint16_t src5b = *(uint16_t *) (src+1*spitch+4*BYTES_PER_UINT16_T); +- uint16_t src6b = *(uint16_t *) (src+1*spitch+5*BYTES_PER_UINT16_T); +- uint16_t src7b = *(uint16_t *) (src+1*spitch+6*BYTES_PER_UINT16_T); +- uint16_t src8b = *(uint16_t *) (src+1*spitch+7*BYTES_PER_UINT16_T); +- *(uint16_t *) (dst+0*dpitch+0*BYTES_PER_UINT16_T) = src1a; +- *(uint16_t *) (dst+0*dpitch+1*BYTES_PER_UINT16_T) = src2a; +- *(uint16_t *) (dst+0*dpitch+2*BYTES_PER_UINT16_T) = src3a; +- *(uint16_t *) (dst+0*dpitch+3*BYTES_PER_UINT16_T) = src4a; +- *(uint16_t *) (dst+0*dpitch+4*BYTES_PER_UINT16_T) = src5a; +- *(uint16_t *) (dst+0*dpitch+5*BYTES_PER_UINT16_T) = src6a; +- *(uint16_t *) (dst+0*dpitch+6*BYTES_PER_UINT16_T) = src7a; +- *(uint16_t *) (dst+0*dpitch+7*BYTES_PER_UINT16_T) = src8a; +- *(uint16_t *) (dst+1*dpitch+0*BYTES_PER_UINT16_T) = src1b; +- *(uint16_t *) (dst+1*dpitch+1*BYTES_PER_UINT16_T) = src2b; +- *(uint16_t *) (dst+1*dpitch+2*BYTES_PER_UINT16_T) = src3b; +- *(uint16_t *) (dst+1*dpitch+3*BYTES_PER_UINT16_T) = src4b; +- *(uint16_t *) (dst+1*dpitch+4*BYTES_PER_UINT16_T) = src5b; +- *(uint16_t *) (dst+1*dpitch+5*BYTES_PER_UINT16_T) = src6b; +- *(uint16_t *) (dst+1*dpitch+6*BYTES_PER_UINT16_T) = src7b; +- *(uint16_t *) (dst+1*dpitch+7*BYTES_PER_UINT16_T) = src8b; +- return TRUE; +- } +- break; +- case 16: if (SW_CHECK_PITCHED_ALIGNMENT(QUAD_WORD_ALIGNMENT_BYTE_SIZE,dst,src,dpitch,spitch,0)) { +- uint32x4_t src1a = vld1q_u32((uint32_t *)(src+0*spitch+0*BYTES_PER_UINT32X4_T)); +- uint32x4_t src2a = vld1q_u32((uint32_t *)(src+0*spitch+1*BYTES_PER_UINT32X4_T)); +- uint32x4_t src1b = vld1q_u32((uint32_t *)(src+1*spitch+0*BYTES_PER_UINT32X4_T)); +- uint32x4_t src2b = vld1q_u32((uint32_t *)(src+1*spitch+1*BYTES_PER_UINT32X4_T)); +- vst1q_u32((uint32_t *)(dst+0*dpitch+0*BYTES_PER_UINT32X4_T),src1a); +- vst1q_u32((uint32_t *)(dst+0*dpitch+1*BYTES_PER_UINT32X4_T),src2a); +- vst1q_u32((uint32_t *)(dst+1*dpitch+0*BYTES_PER_UINT32X4_T),src1b); +- vst1q_u32((uint32_t *)(dst+1*dpitch+1*BYTES_PER_UINT32X4_T),src2b); +- return TRUE; +- } +- else if (SW_CHECK_PITCHED_ALIGNMENT(DOUBLE_WORD_ALIGNMENT_BYTE_SIZE,dst,src,dpitch,spitch,0)) { +- uint64_t src1a = *(uint64_t *) (src+0*spitch+0*BYTES_PER_UINT64_T); +- uint64_t src2a = *(uint64_t *) (src+0*spitch+1*BYTES_PER_UINT64_T); +- uint64_t src3a = *(uint64_t *) (src+0*spitch+2*BYTES_PER_UINT64_T); +- uint64_t src4a = *(uint64_t *) (src+0*spitch+3*BYTES_PER_UINT64_T); +- uint64_t src1b = *(uint64_t *) (src+1*spitch+0*BYTES_PER_UINT64_T); +- uint64_t src2b = *(uint64_t *) (src+1*spitch+1*BYTES_PER_UINT64_T); +- uint64_t src3b = *(uint64_t *) (src+1*spitch+2*BYTES_PER_UINT64_T); +- uint64_t src4b = *(uint64_t *) (src+1*spitch+3*BYTES_PER_UINT64_T); +- *(uint64_t *) (dst+0*dpitch+0*BYTES_PER_UINT64_T) = src1a; +- *(uint64_t *) (dst+0*dpitch+1*BYTES_PER_UINT64_T) = src2a; +- *(uint64_t *) (dst+0*dpitch+2*BYTES_PER_UINT64_T) = src3a; +- *(uint64_t *) (dst+0*dpitch+3*BYTES_PER_UINT64_T) = src4a; +- *(uint64_t *) (dst+1*dpitch+0*BYTES_PER_UINT64_T) = src1b; +- *(uint64_t *) (dst+1*dpitch+1*BYTES_PER_UINT64_T) = src2b; +- *(uint64_t *) (dst+1*dpitch+2*BYTES_PER_UINT64_T) = src3b; +- *(uint64_t *) (dst+1*dpitch+3*BYTES_PER_UINT64_T) = src4b; +- return TRUE; +- } +- else if (SW_CHECK_PITCHED_ALIGNMENT(DOUBLE_WORD_ALIGNMENT_BYTE_SIZE,dst,src,dpitch,spitch,BYTES_PER_UINT32_T)) { +- uint32_t src1a = *(uint32_t *) (src+0*spitch+0); +- uint64_t src2a = *(uint64_t *) (src+0*spitch+BYTES_PER_UINT32_T+0*BYTES_PER_UINT64_T); +- uint64_t src3a = *(uint64_t *) (src+0*spitch+BYTES_PER_UINT32_T+1*BYTES_PER_UINT64_T); +- uint64_t src4a = *(uint64_t *) (src+0*spitch+BYTES_PER_UINT32_T+2*BYTES_PER_UINT64_T); +- uint32_t src5a = *(uint32_t *) (src+0*spitch+BYTES_PER_UINT32_T+3*BYTES_PER_UINT64_T); +- uint32_t src1b = *(uint32_t *) (src+1*spitch+0); +- uint64_t src2b = *(uint64_t *) (src+1*spitch+BYTES_PER_UINT32_T+0*BYTES_PER_UINT64_T); +- uint64_t src3b = *(uint64_t *) (src+1*spitch+BYTES_PER_UINT32_T+1*BYTES_PER_UINT64_T); +- uint64_t src4b = *(uint64_t *) (src+1*spitch+BYTES_PER_UINT32_T+2*BYTES_PER_UINT64_T); +- uint32_t src5b = *(uint32_t *) (src+1*spitch+BYTES_PER_UINT32_T+3*BYTES_PER_UINT64_T); +- *(uint32_t *) (dst+0*dpitch+0) = src1a; +- *(uint64_t *) (dst+0*dpitch+BYTES_PER_UINT32_T+0*BYTES_PER_UINT64_T) = src2a; +- *(uint64_t *) (dst+0*dpitch+BYTES_PER_UINT32_T+1*BYTES_PER_UINT64_T) = src3a; +- *(uint64_t *) (dst+0*dpitch+BYTES_PER_UINT32_T+2*BYTES_PER_UINT64_T) = src4a; +- *(uint32_t *) (dst+0*dpitch+BYTES_PER_UINT32_T+3*BYTES_PER_UINT64_T) = src5a; +- *(uint32_t *) (dst+1*dpitch+0) = src1b; +- *(uint64_t *) (dst+1*dpitch+BYTES_PER_UINT32_T+0*BYTES_PER_UINT64_T) = src2b; +- *(uint64_t *) (dst+1*dpitch+BYTES_PER_UINT32_T+1*BYTES_PER_UINT64_T) = src3b; +- *(uint64_t *) (dst+1*dpitch+BYTES_PER_UINT32_T+2*BYTES_PER_UINT64_T) = src4b; +- *(uint32_t *) (dst+1*dpitch+BYTES_PER_UINT32_T+3*BYTES_PER_UINT64_T) = src5b; +- return TRUE; +- } +- else if (SW_CHECK_PITCHED_ALIGNMENT(WORD_ALIGNMENT_BYTE_SIZE,dst,src,dpitch,spitch,0)) { +- uint32_t src1a = *(uint32_t *) (src+0*spitch+0*BYTES_PER_UINT32_T); +- uint32_t src2a = *(uint32_t *) (src+0*spitch+1*BYTES_PER_UINT32_T); +- uint32_t src3a = *(uint32_t *) (src+0*spitch+2*BYTES_PER_UINT32_T); +- uint32_t src4a = *(uint32_t *) (src+0*spitch+3*BYTES_PER_UINT32_T); +- uint32_t src5a = *(uint32_t *) (src+0*spitch+4*BYTES_PER_UINT32_T); +- uint32_t src6a = *(uint32_t *) (src+0*spitch+5*BYTES_PER_UINT32_T); +- uint32_t src7a = *(uint32_t *) (src+0*spitch+6*BYTES_PER_UINT32_T); +- uint32_t src8a = *(uint32_t *) (src+0*spitch+7*BYTES_PER_UINT32_T); +- uint32_t src1b = *(uint32_t *) (src+1*spitch+0*BYTES_PER_UINT32_T); +- uint32_t src2b = *(uint32_t *) (src+1*spitch+1*BYTES_PER_UINT32_T); +- uint32_t src3b = *(uint32_t *) (src+1*spitch+2*BYTES_PER_UINT32_T); +- uint32_t src4b = *(uint32_t *) (src+1*spitch+3*BYTES_PER_UINT32_T); +- uint32_t src5b = *(uint32_t *) (src+1*spitch+4*BYTES_PER_UINT32_T); +- uint32_t src6b = *(uint32_t *) (src+1*spitch+5*BYTES_PER_UINT32_T); +- uint32_t src7b = *(uint32_t *) (src+1*spitch+6*BYTES_PER_UINT32_T); +- uint32_t src8b = *(uint32_t *) (src+1*spitch+7*BYTES_PER_UINT32_T); +- *(uint32_t *) (dst+0*dpitch+0*BYTES_PER_UINT32_T) = src1a; +- *(uint32_t *) (dst+0*dpitch+1*BYTES_PER_UINT32_T) = src2a; +- *(uint32_t *) (dst+0*dpitch+2*BYTES_PER_UINT32_T) = src3a; +- *(uint32_t *) (dst+0*dpitch+3*BYTES_PER_UINT32_T) = src4a; +- *(uint32_t *) (dst+0*dpitch+4*BYTES_PER_UINT32_T) = src5a; +- *(uint32_t *) (dst+0*dpitch+5*BYTES_PER_UINT32_T) = src6a; +- *(uint32_t *) (dst+0*dpitch+6*BYTES_PER_UINT32_T) = src7a; +- *(uint32_t *) (dst+0*dpitch+7*BYTES_PER_UINT32_T) = src8a; +- *(uint32_t *) (dst+1*dpitch+0*BYTES_PER_UINT32_T) = src1b; +- *(uint32_t *) (dst+1*dpitch+1*BYTES_PER_UINT32_T) = src2b; +- *(uint32_t *) (dst+1*dpitch+2*BYTES_PER_UINT32_T) = src3b; +- *(uint32_t *) (dst+1*dpitch+3*BYTES_PER_UINT32_T) = src4b; +- *(uint32_t *) (dst+1*dpitch+4*BYTES_PER_UINT32_T) = src5b; +- *(uint32_t *) (dst+1*dpitch+5*BYTES_PER_UINT32_T) = src6b; +- *(uint32_t *) (dst+1*dpitch+6*BYTES_PER_UINT32_T) = src7b; +- *(uint32_t *) (dst+1*dpitch+7*BYTES_PER_UINT32_T) = src8b; +- return TRUE; +- } +- else { +- // Don't bother unrolling loops, since that won't help for more than around 8 operations. +- // Instead, just call multiple fixed functions. +- if (xdir >= 0) { +- swCopy16BppSmallFixedWidths2Rows_Unaligned(dst, src, 8, xdir, dpitch, spitch); +- swCopy16BppSmallFixedWidths2Rows_Unaligned(dst + 8 * BYTES_PER_UINT16_T, src + 8 * BYTES_PER_UINT16_T, 8, xdir, dpitch, spitch); +- } else { +- swCopy16BppSmallFixedWidths2Rows_Unaligned(dst + 8 * BYTES_PER_UINT16_T, src + 8 * BYTES_PER_UINT16_T, 8, xdir, dpitch, spitch); +- swCopy16BppSmallFixedWidths2Rows_Unaligned(dst, src, 8, xdir, dpitch, spitch); +- } +- return TRUE; +- } +- break; +- case 32: if (SW_CHECK_PITCHED_ALIGNMENT(QUAD_WORD_ALIGNMENT_BYTE_SIZE,dst,src,dpitch,spitch,0)) { +- uint32x4_t src1a = vld1q_u32((uint32_t *)(src+0*spitch+0*BYTES_PER_UINT32X4_T)); +- uint32x4_t src2a = vld1q_u32((uint32_t *)(src+0*spitch+1*BYTES_PER_UINT32X4_T)); +- uint32x4_t src3a = vld1q_u32((uint32_t *)(src+0*spitch+2*BYTES_PER_UINT32X4_T)); +- uint32x4_t src4a = vld1q_u32((uint32_t *)(src+0*spitch+3*BYTES_PER_UINT32X4_T)); +- uint32x4_t src1b = vld1q_u32((uint32_t *)(src+1*spitch+0*BYTES_PER_UINT32X4_T)); +- uint32x4_t src2b = vld1q_u32((uint32_t *)(src+1*spitch+1*BYTES_PER_UINT32X4_T)); +- uint32x4_t src3b = vld1q_u32((uint32_t *)(src+1*spitch+2*BYTES_PER_UINT32X4_T)); +- uint32x4_t src4b = vld1q_u32((uint32_t *)(src+1*spitch+3*BYTES_PER_UINT32X4_T)); +- vst1q_u32((uint32_t *)(dst+0*dpitch+0*BYTES_PER_UINT32X4_T),src1a); +- vst1q_u32((uint32_t *)(dst+0*dpitch+1*BYTES_PER_UINT32X4_T),src2a); +- vst1q_u32((uint32_t *)(dst+0*dpitch+2*BYTES_PER_UINT32X4_T),src3a); +- vst1q_u32((uint32_t *)(dst+0*dpitch+3*BYTES_PER_UINT32X4_T),src4a); +- vst1q_u32((uint32_t *)(dst+1*dpitch+0*BYTES_PER_UINT32X4_T),src1b); +- vst1q_u32((uint32_t *)(dst+1*dpitch+1*BYTES_PER_UINT32X4_T),src2b); +- vst1q_u32((uint32_t *)(dst+1*dpitch+2*BYTES_PER_UINT32X4_T),src3b); +- vst1q_u32((uint32_t *)(dst+1*dpitch+3*BYTES_PER_UINT32X4_T),src4b); +- return TRUE; +- } +- else if (SW_CHECK_PITCHED_ALIGNMENT(QUAD_WORD_ALIGNMENT_BYTE_SIZE,dst,src,dpitch,spitch,4*BYTES_PER_UINT16_T)) { +- if (xdir >= 0) { +- swCopy16BppSmallFixedWidths2Rows_Unaligned(dst + 0, src + 0, 4, xdir, dpitch, spitch); +- swCopy16BppSmallFixedWidths2Rows_Unaligned(dst + (4)*BYTES_PER_UINT16_T, src + (4)*BYTES_PER_UINT16_T, 16, xdir, dpitch, spitch); +- swCopy16BppSmallFixedWidths2Rows_Unaligned(dst + (16+4)*BYTES_PER_UINT16_T, src + (16+4)*BYTES_PER_UINT16_T, 8, xdir, dpitch, spitch); +- swCopy16BppSmallFixedWidths2Rows_Unaligned(dst + (8+16+4)*BYTES_PER_UINT16_T, src + (8+16+4)*BYTES_PER_UINT16_T, 4, xdir, dpitch, spitch); +- } else { +- swCopy16BppSmallFixedWidths2Rows_Unaligned(dst + (8+16+4)*BYTES_PER_UINT16_T, src + (8+16+4)*BYTES_PER_UINT16_T, 4, xdir, dpitch, spitch); +- swCopy16BppSmallFixedWidths2Rows_Unaligned(dst + (16+4)*BYTES_PER_UINT16_T, src + (16+4)*BYTES_PER_UINT16_T, 8, xdir, dpitch, spitch); +- swCopy16BppSmallFixedWidths2Rows_Unaligned(dst + (4)*BYTES_PER_UINT16_T, src + (4)*BYTES_PER_UINT16_T, 16, xdir, dpitch, spitch); +- swCopy16BppSmallFixedWidths2Rows_Unaligned(dst + 0, src + 0, 4, xdir, dpitch, spitch); +- } +- return TRUE; +- } +- else if (SW_CHECK_PITCHED_ALIGNMENT(DOUBLE_WORD_ALIGNMENT_BYTE_SIZE,dst,src,dpitch,spitch,0)) { +- uint64_t src1a = *(uint64_t *) (src+0*spitch+0*BYTES_PER_UINT64_T); +- uint64_t src2a = *(uint64_t *) (src+0*spitch+1*BYTES_PER_UINT64_T); +- uint64_t src3a = *(uint64_t *) (src+0*spitch+2*BYTES_PER_UINT64_T); +- uint64_t src4a = *(uint64_t *) (src+0*spitch+3*BYTES_PER_UINT64_T); +- uint64_t src5a = *(uint64_t *) (src+0*spitch+4*BYTES_PER_UINT64_T); +- uint64_t src6a = *(uint64_t *) (src+0*spitch+5*BYTES_PER_UINT64_T); +- uint64_t src7a = *(uint64_t *) (src+0*spitch+6*BYTES_PER_UINT64_T); +- uint64_t src8a = *(uint64_t *) (src+0*spitch+7*BYTES_PER_UINT64_T); +- uint64_t src1b = *(uint64_t *) (src+1*spitch+0*BYTES_PER_UINT64_T); +- uint64_t src2b = *(uint64_t *) (src+1*spitch+1*BYTES_PER_UINT64_T); +- uint64_t src3b = *(uint64_t *) (src+1*spitch+2*BYTES_PER_UINT64_T); +- uint64_t src4b = *(uint64_t *) (src+1*spitch+3*BYTES_PER_UINT64_T); +- uint64_t src5b = *(uint64_t *) (src+1*spitch+4*BYTES_PER_UINT64_T); +- uint64_t src6b = *(uint64_t *) (src+1*spitch+5*BYTES_PER_UINT64_T); +- uint64_t src7b = *(uint64_t *) (src+1*spitch+6*BYTES_PER_UINT64_T); +- uint64_t src8b = *(uint64_t *) (src+1*spitch+7*BYTES_PER_UINT64_T); +- *(uint64_t *) (dst+0*dpitch+0*BYTES_PER_UINT64_T) = src1a; +- *(uint64_t *) (dst+0*dpitch+1*BYTES_PER_UINT64_T) = src2a; +- *(uint64_t *) (dst+0*dpitch+2*BYTES_PER_UINT64_T) = src3a; +- *(uint64_t *) (dst+0*dpitch+3*BYTES_PER_UINT64_T) = src4a; +- *(uint64_t *) (dst+0*dpitch+4*BYTES_PER_UINT64_T) = src5a; +- *(uint64_t *) (dst+0*dpitch+5*BYTES_PER_UINT64_T) = src6a; +- *(uint64_t *) (dst+0*dpitch+6*BYTES_PER_UINT64_T) = src7a; +- *(uint64_t *) (dst+0*dpitch+7*BYTES_PER_UINT64_T) = src8a; +- *(uint64_t *) (dst+1*dpitch+0*BYTES_PER_UINT64_T) = src1b; +- *(uint64_t *) (dst+1*dpitch+1*BYTES_PER_UINT64_T) = src2b; +- *(uint64_t *) (dst+1*dpitch+2*BYTES_PER_UINT64_T) = src3b; +- *(uint64_t *) (dst+1*dpitch+3*BYTES_PER_UINT64_T) = src4b; +- *(uint64_t *) (dst+1*dpitch+4*BYTES_PER_UINT64_T) = src5b; +- *(uint64_t *) (dst+1*dpitch+5*BYTES_PER_UINT64_T) = src6b; +- *(uint64_t *) (dst+1*dpitch+6*BYTES_PER_UINT64_T) = src7b; +- *(uint64_t *) (dst+1*dpitch+7*BYTES_PER_UINT64_T) = src8b; +- return TRUE; +- } +- else if (SW_CHECK_PITCHED_ALIGNMENT(DOUBLE_WORD_ALIGNMENT_BYTE_SIZE,dst,src,dpitch,spitch,2*BYTES_PER_UINT16_T)) { +- if (xdir >= 0) { +- swCopy16BppSmallFixedWidths2Rows_Unaligned(dst + 0, src + 0 , 2, xdir, dpitch, spitch); +- swCopy16BppSmallFixedWidths2Rows_Unaligned(dst + (0*8+2)*BYTES_PER_UINT16_T, src + (0*8+2)*BYTES_PER_UINT16_T, 8, xdir, dpitch, spitch); +- swCopy16BppSmallFixedWidths2Rows_Unaligned(dst + (1*8+2)*BYTES_PER_UINT16_T, src + (1*8+2)*BYTES_PER_UINT16_T, 8, xdir, dpitch, spitch); +- swCopy16BppSmallFixedWidths2Rows_Unaligned(dst + (2*8+2)*BYTES_PER_UINT16_T, src + (2*8+2)*BYTES_PER_UINT16_T, 8, xdir, dpitch, spitch); +- swCopy16BppSmallFixedWidths2Rows_Unaligned(dst + (3*8+2)*BYTES_PER_UINT16_T, src + (3*8+2)*BYTES_PER_UINT16_T, 6, xdir, dpitch, spitch); +- } else { +- swCopy16BppSmallFixedWidths2Rows_Unaligned(dst + (3*8+2)*BYTES_PER_UINT16_T, src + (3*8+2)*BYTES_PER_UINT16_T, 6, xdir, dpitch, spitch); +- swCopy16BppSmallFixedWidths2Rows_Unaligned(dst + (2*8+2)*BYTES_PER_UINT16_T, src + (2*8+2)*BYTES_PER_UINT16_T, 8, xdir, dpitch, spitch); +- swCopy16BppSmallFixedWidths2Rows_Unaligned(dst + (1*8+2)*BYTES_PER_UINT16_T, src + (1*8+2)*BYTES_PER_UINT16_T, 8, xdir, dpitch, spitch); +- swCopy16BppSmallFixedWidths2Rows_Unaligned(dst + (0*8+2)*BYTES_PER_UINT16_T, src + (0*8+2)*BYTES_PER_UINT16_T, 8, xdir, dpitch, spitch); +- swCopy16BppSmallFixedWidths2Rows_Unaligned(dst + 0, src + 0 , 2, xdir, dpitch, spitch); +- } +- return TRUE; +- } +- else if (SW_CHECK_PITCHED_ALIGNMENT(WORD_ALIGNMENT_BYTE_SIZE,dst,src,dpitch,spitch,BYTES_PER_UINT16_T)) { +- if (xdir >= 0) { +- swCopy16BppSmallFixedWidths2Rows_Unaligned(dst + 0, src + 0 , 1, xdir, dpitch, spitch); +- swCopy16BppSmallFixedWidths2Rows_Unaligned(dst + (0*8+1)*BYTES_PER_UINT16_T, src + (0*8+1)*BYTES_PER_UINT16_T, 8, xdir, dpitch, spitch); +- swCopy16BppSmallFixedWidths2Rows_Unaligned(dst + (1*8+1)*BYTES_PER_UINT16_T, src + (1*8+1)*BYTES_PER_UINT16_T, 8, xdir, dpitch, spitch); +- swCopy16BppSmallFixedWidths2Rows_Unaligned(dst + (2*8+1)*BYTES_PER_UINT16_T, src + (2*8+1)*BYTES_PER_UINT16_T, 8, xdir, dpitch, spitch); +- swCopy16BppSmallFixedWidths2Rows_Unaligned(dst + (3*8+1)*BYTES_PER_UINT16_T, src + (3*8+1)*BYTES_PER_UINT16_T, 7, xdir, dpitch, spitch); +- } else { +- swCopy16BppSmallFixedWidths2Rows_Unaligned(dst + (3*8+1)*BYTES_PER_UINT16_T, src + (3*8+1)*BYTES_PER_UINT16_T, 7, xdir, dpitch, spitch); +- swCopy16BppSmallFixedWidths2Rows_Unaligned(dst + (2*8+1)*BYTES_PER_UINT16_T, src + (2*8+1)*BYTES_PER_UINT16_T, 8, xdir, dpitch, spitch); +- swCopy16BppSmallFixedWidths2Rows_Unaligned(dst + (1*8+1)*BYTES_PER_UINT16_T, src + (1*8+1)*BYTES_PER_UINT16_T, 8, xdir, dpitch, spitch); +- swCopy16BppSmallFixedWidths2Rows_Unaligned(dst + (0*8+1)*BYTES_PER_UINT16_T, src + (0*8+1)*BYTES_PER_UINT16_T, 8, xdir, dpitch, spitch); +- swCopy16BppSmallFixedWidths2Rows_Unaligned(dst + 0, src + 0 , 1, xdir, dpitch, spitch); +- } +- return TRUE; +- } +- else { +- if (xdir >= 0) { +- swCopy16BppSmallFixedWidths2Rows_Unaligned(dst + 0*8*BYTES_PER_UINT16_T, src + 0*8*BYTES_PER_UINT16_T, 8, xdir, dpitch, spitch); +- swCopy16BppSmallFixedWidths2Rows_Unaligned(dst + 1*8*BYTES_PER_UINT16_T, src + 1*8*BYTES_PER_UINT16_T, 8, xdir, dpitch, spitch); +- swCopy16BppSmallFixedWidths2Rows_Unaligned(dst + 2*8*BYTES_PER_UINT16_T, src + 2*8*BYTES_PER_UINT16_T, 8, xdir, dpitch, spitch); +- swCopy16BppSmallFixedWidths2Rows_Unaligned(dst + 3*8*BYTES_PER_UINT16_T, src + 3*8*BYTES_PER_UINT16_T, 8, xdir, dpitch, spitch); +- } else { +- swCopy16BppSmallFixedWidths2Rows_Unaligned(dst + 3*8*BYTES_PER_UINT16_T, src + 3*8*BYTES_PER_UINT16_T, 8, xdir, dpitch, spitch); +- swCopy16BppSmallFixedWidths2Rows_Unaligned(dst + 2*8*BYTES_PER_UINT16_T, src + 2*8*BYTES_PER_UINT16_T, 8, xdir, dpitch, spitch); +- swCopy16BppSmallFixedWidths2Rows_Unaligned(dst + 1*8*BYTES_PER_UINT16_T, src + 1*8*BYTES_PER_UINT16_T, 8, xdir, dpitch, spitch); +- swCopy16BppSmallFixedWidths2Rows_Unaligned(dst + 0*8*BYTES_PER_UINT16_T, src + 0*8*BYTES_PER_UINT16_T, 8, xdir, dpitch, spitch); +- } +- return TRUE; +- } +- break; +- case 64: if (SW_CHECK_PITCHED_ALIGNMENT(QUAD_WORD_ALIGNMENT_BYTE_SIZE,dst,src,dpitch,spitch,0)) { +- uint32x4_t src1a = vld1q_u32((uint32_t *)(src+0*spitch+0*BYTES_PER_UINT32X4_T)); +- uint32x4_t src2a = vld1q_u32((uint32_t *)(src+0*spitch+1*BYTES_PER_UINT32X4_T)); +- uint32x4_t src3a = vld1q_u32((uint32_t *)(src+0*spitch+2*BYTES_PER_UINT32X4_T)); +- uint32x4_t src4a = vld1q_u32((uint32_t *)(src+0*spitch+3*BYTES_PER_UINT32X4_T)); +- uint32x4_t src5a = vld1q_u32((uint32_t *)(src+0*spitch+4*BYTES_PER_UINT32X4_T)); +- uint32x4_t src6a = vld1q_u32((uint32_t *)(src+0*spitch+5*BYTES_PER_UINT32X4_T)); +- uint32x4_t src7a = vld1q_u32((uint32_t *)(src+0*spitch+6*BYTES_PER_UINT32X4_T)); +- uint32x4_t src8a = vld1q_u32((uint32_t *)(src+0*spitch+7*BYTES_PER_UINT32X4_T)); +- uint32x4_t src1b = vld1q_u32((uint32_t *)(src+1*spitch+0*BYTES_PER_UINT32X4_T)); +- uint32x4_t src2b = vld1q_u32((uint32_t *)(src+1*spitch+1*BYTES_PER_UINT32X4_T)); +- uint32x4_t src3b = vld1q_u32((uint32_t *)(src+1*spitch+2*BYTES_PER_UINT32X4_T)); +- uint32x4_t src4b = vld1q_u32((uint32_t *)(src+1*spitch+3*BYTES_PER_UINT32X4_T)); +- uint32x4_t src5b = vld1q_u32((uint32_t *)(src+1*spitch+4*BYTES_PER_UINT32X4_T)); +- uint32x4_t src6b = vld1q_u32((uint32_t *)(src+1*spitch+5*BYTES_PER_UINT32X4_T)); +- uint32x4_t src7b = vld1q_u32((uint32_t *)(src+1*spitch+6*BYTES_PER_UINT32X4_T)); +- uint32x4_t src8b = vld1q_u32((uint32_t *)(src+1*spitch+7*BYTES_PER_UINT32X4_T)); +- vst1q_u32((uint32_t *)(dst+0*dpitch+0*BYTES_PER_UINT32X4_T),src1a); +- vst1q_u32((uint32_t *)(dst+0*dpitch+1*BYTES_PER_UINT32X4_T),src2a); +- vst1q_u32((uint32_t *)(dst+0*dpitch+2*BYTES_PER_UINT32X4_T),src3a); +- vst1q_u32((uint32_t *)(dst+0*dpitch+3*BYTES_PER_UINT32X4_T),src4a); +- vst1q_u32((uint32_t *)(dst+0*dpitch+4*BYTES_PER_UINT32X4_T),src5a); +- vst1q_u32((uint32_t *)(dst+0*dpitch+5*BYTES_PER_UINT32X4_T),src6a); +- vst1q_u32((uint32_t *)(dst+0*dpitch+6*BYTES_PER_UINT32X4_T),src7a); +- vst1q_u32((uint32_t *)(dst+0*dpitch+7*BYTES_PER_UINT32X4_T),src8a); +- vst1q_u32((uint32_t *)(dst+1*dpitch+0*BYTES_PER_UINT32X4_T),src1b); +- vst1q_u32((uint32_t *)(dst+1*dpitch+1*BYTES_PER_UINT32X4_T),src2b); +- vst1q_u32((uint32_t *)(dst+1*dpitch+2*BYTES_PER_UINT32X4_T),src3b); +- vst1q_u32((uint32_t *)(dst+1*dpitch+3*BYTES_PER_UINT32X4_T),src4b); +- vst1q_u32((uint32_t *)(dst+1*dpitch+4*BYTES_PER_UINT32X4_T),src5b); +- vst1q_u32((uint32_t *)(dst+1*dpitch+5*BYTES_PER_UINT32X4_T),src6b); +- vst1q_u32((uint32_t *)(dst+1*dpitch+6*BYTES_PER_UINT32X4_T),src7b); +- vst1q_u32((uint32_t *)(dst+1*dpitch+7*BYTES_PER_UINT32X4_T),src8b); +- return TRUE; +- }//HERE +- else if (SW_CHECK_PITCHED_ALIGNMENT(QUAD_WORD_ALIGNMENT_BYTE_SIZE,dst,src,dpitch,spitch,4*BYTES_PER_UINT16_T)) { +- if (xdir >= 0) { +- swCopy16BppSmallFixedWidths2Rows_Unaligned(dst + 0, src + 0, 4, xdir, dpitch, spitch); +- swCopy16BppSmallFixedWidths2Rows_Unaligned(dst + (0*16+4)*BYTES_PER_UINT16_T, src + (0*16+4)*BYTES_PER_UINT16_T, 2*16, xdir, dpitch, spitch); +- swCopy16BppSmallFixedWidths2Rows_Unaligned(dst + (2*16+4)*BYTES_PER_UINT16_T, src + (2*16+4)*BYTES_PER_UINT16_T, 16, xdir, dpitch, spitch); +- swCopy16BppSmallFixedWidths2Rows_Unaligned(dst + (3*16+4)*BYTES_PER_UINT16_T, src + (3*16+4)*BYTES_PER_UINT16_T, 8, xdir, dpitch, spitch); +- swCopy16BppSmallFixedWidths2Rows_Unaligned(dst + (8+3*16+4)*BYTES_PER_UINT16_T, src + (8+3*16+4)*BYTES_PER_UINT16_T, 4, xdir, dpitch, spitch); +- } else { +- swCopy16BppSmallFixedWidths2Rows_Unaligned(dst + (8+3*16+4)*BYTES_PER_UINT16_T, src + (8+3*16+4)*BYTES_PER_UINT16_T, 4, xdir, dpitch, spitch); +- swCopy16BppSmallFixedWidths2Rows_Unaligned(dst + (3*16+4)*BYTES_PER_UINT16_T, src + (3*16+4)*BYTES_PER_UINT16_T, 8, xdir, dpitch, spitch); +- swCopy16BppSmallFixedWidths2Rows_Unaligned(dst + (2*16+4)*BYTES_PER_UINT16_T, src + (2*16+4)*BYTES_PER_UINT16_T, 16, xdir, dpitch, spitch); +- swCopy16BppSmallFixedWidths2Rows_Unaligned(dst + (0*16+4)*BYTES_PER_UINT16_T, src + (0*16+4)*BYTES_PER_UINT16_T, 2*16, xdir, dpitch, spitch); +- swCopy16BppSmallFixedWidths2Rows_Unaligned(dst + 0, src + 0, 4, xdir, dpitch, spitch); +- } +- return TRUE; +- } +- else if (SW_CHECK_PITCHED_ALIGNMENT(DOUBLE_WORD_ALIGNMENT_BYTE_SIZE,dst,src,dpitch,spitch,2*BYTES_PER_UINT16_T)) { +- if (xdir >= 0) { +- swCopy16BppSmallFixedWidths2Rows_Unaligned(dst + 0, src + 0 , 2, xdir, dpitch, spitch); +- swCopy16BppSmallFixedWidths2Rows_Unaligned(dst + (0*8+2)*BYTES_PER_UINT16_T, src + (0*8+2)*BYTES_PER_UINT16_T, 8, xdir, dpitch, spitch); +- swCopy16BppSmallFixedWidths2Rows_Unaligned(dst + (1*8+2)*BYTES_PER_UINT16_T, src + (1*8+2)*BYTES_PER_UINT16_T, 8, xdir, dpitch, spitch); +- swCopy16BppSmallFixedWidths2Rows_Unaligned(dst + (2*8+2)*BYTES_PER_UINT16_T, src + (2*8+2)*BYTES_PER_UINT16_T, 8, xdir, dpitch, spitch); +- swCopy16BppSmallFixedWidths2Rows_Unaligned(dst + (3*8+2)*BYTES_PER_UINT16_T, src + (3*8+2)*BYTES_PER_UINT16_T, 8, xdir, dpitch, spitch); +- swCopy16BppSmallFixedWidths2Rows_Unaligned(dst + (4*8+2)*BYTES_PER_UINT16_T, src + (4*8+2)*BYTES_PER_UINT16_T, 8, xdir, dpitch, spitch); +- swCopy16BppSmallFixedWidths2Rows_Unaligned(dst + (5*8+2)*BYTES_PER_UINT16_T, src + (5*8+2)*BYTES_PER_UINT16_T, 8, xdir, dpitch, spitch); +- swCopy16BppSmallFixedWidths2Rows_Unaligned(dst + (6*8+2)*BYTES_PER_UINT16_T, src + (6*8+2)*BYTES_PER_UINT16_T, 8, xdir, dpitch, spitch); +- swCopy16BppSmallFixedWidths2Rows_Unaligned(dst + (7*8+2)*BYTES_PER_UINT16_T, src + (7*8+2)*BYTES_PER_UINT16_T, 6, xdir, dpitch, spitch); +- } else { +- swCopy16BppSmallFixedWidths2Rows_Unaligned(dst + (7*8+2)*BYTES_PER_UINT16_T, src + (7*8+2)*BYTES_PER_UINT16_T, 6, xdir, dpitch, spitch); +- swCopy16BppSmallFixedWidths2Rows_Unaligned(dst + (6*8+2)*BYTES_PER_UINT16_T, src + (6*8+2)*BYTES_PER_UINT16_T, 8, xdir, dpitch, spitch); +- swCopy16BppSmallFixedWidths2Rows_Unaligned(dst + (5*8+2)*BYTES_PER_UINT16_T, src + (5*8+2)*BYTES_PER_UINT16_T, 8, xdir, dpitch, spitch); +- swCopy16BppSmallFixedWidths2Rows_Unaligned(dst + (4*8+2)*BYTES_PER_UINT16_T, src + (4*8+2)*BYTES_PER_UINT16_T, 8, xdir, dpitch, spitch); +- swCopy16BppSmallFixedWidths2Rows_Unaligned(dst + (3*8+2)*BYTES_PER_UINT16_T, src + (3*8+2)*BYTES_PER_UINT16_T, 8, xdir, dpitch, spitch); +- swCopy16BppSmallFixedWidths2Rows_Unaligned(dst + (2*8+2)*BYTES_PER_UINT16_T, src + (2*8+2)*BYTES_PER_UINT16_T, 8, xdir, dpitch, spitch); +- swCopy16BppSmallFixedWidths2Rows_Unaligned(dst + (1*8+2)*BYTES_PER_UINT16_T, src + (1*8+2)*BYTES_PER_UINT16_T, 8, xdir, dpitch, spitch); +- swCopy16BppSmallFixedWidths2Rows_Unaligned(dst + (0*8+2)*BYTES_PER_UINT16_T, src + (0*8+2)*BYTES_PER_UINT16_T, 8, xdir, dpitch, spitch); +- swCopy16BppSmallFixedWidths2Rows_Unaligned(dst + 0, src + 0 , 2, xdir, dpitch, spitch); +- } +- return TRUE; +- } +- else if (SW_CHECK_PITCHED_ALIGNMENT(WORD_ALIGNMENT_BYTE_SIZE,dst,src,dpitch,spitch,BYTES_PER_UINT16_T)) { +- if (xdir >= 0) { +- swCopy16BppSmallFixedWidths2Rows_Unaligned(dst + 0, src + 0 , 1, xdir, dpitch, spitch); +- swCopy16BppSmallFixedWidths2Rows_Unaligned(dst + (0*8+1)*BYTES_PER_UINT16_T, src + (0*8+1)*BYTES_PER_UINT16_T, 8, xdir, dpitch, spitch); +- swCopy16BppSmallFixedWidths2Rows_Unaligned(dst + (1*8+1)*BYTES_PER_UINT16_T, src + (1*8+1)*BYTES_PER_UINT16_T, 8, xdir, dpitch, spitch); +- swCopy16BppSmallFixedWidths2Rows_Unaligned(dst + (2*8+1)*BYTES_PER_UINT16_T, src + (2*8+1)*BYTES_PER_UINT16_T, 8, xdir, dpitch, spitch); +- swCopy16BppSmallFixedWidths2Rows_Unaligned(dst + (3*8+1)*BYTES_PER_UINT16_T, src + (3*8+1)*BYTES_PER_UINT16_T, 8, xdir, dpitch, spitch); +- swCopy16BppSmallFixedWidths2Rows_Unaligned(dst + (4*8+1)*BYTES_PER_UINT16_T, src + (4*8+1)*BYTES_PER_UINT16_T, 8, xdir, dpitch, spitch); +- swCopy16BppSmallFixedWidths2Rows_Unaligned(dst + (5*8+1)*BYTES_PER_UINT16_T, src + (5*8+1)*BYTES_PER_UINT16_T, 8, xdir, dpitch, spitch); +- swCopy16BppSmallFixedWidths2Rows_Unaligned(dst + (6*8+1)*BYTES_PER_UINT16_T, src + (6*8+1)*BYTES_PER_UINT16_T, 8, xdir, dpitch, spitch); +- swCopy16BppSmallFixedWidths2Rows_Unaligned(dst + (7*8+1)*BYTES_PER_UINT16_T, src + (7*8+1)*BYTES_PER_UINT16_T, 7, xdir, dpitch, spitch); +- } else { +- swCopy16BppSmallFixedWidths2Rows_Unaligned(dst + (7*8+1)*BYTES_PER_UINT16_T, src + (7*8+1)*BYTES_PER_UINT16_T, 7, xdir, dpitch, spitch); +- swCopy16BppSmallFixedWidths2Rows_Unaligned(dst + (6*8+1)*BYTES_PER_UINT16_T, src + (6*8+1)*BYTES_PER_UINT16_T, 8, xdir, dpitch, spitch); +- swCopy16BppSmallFixedWidths2Rows_Unaligned(dst + (5*8+1)*BYTES_PER_UINT16_T, src + (5*8+1)*BYTES_PER_UINT16_T, 8, xdir, dpitch, spitch); +- swCopy16BppSmallFixedWidths2Rows_Unaligned(dst + (4*8+1)*BYTES_PER_UINT16_T, src + (4*8+1)*BYTES_PER_UINT16_T, 8, xdir, dpitch, spitch); +- swCopy16BppSmallFixedWidths2Rows_Unaligned(dst + (3*8+1)*BYTES_PER_UINT16_T, src + (3*8+1)*BYTES_PER_UINT16_T, 8, xdir, dpitch, spitch); +- swCopy16BppSmallFixedWidths2Rows_Unaligned(dst + (2*8+1)*BYTES_PER_UINT16_T, src + (2*8+1)*BYTES_PER_UINT16_T, 8, xdir, dpitch, spitch); +- swCopy16BppSmallFixedWidths2Rows_Unaligned(dst + (1*8+1)*BYTES_PER_UINT16_T, src + (1*8+1)*BYTES_PER_UINT16_T, 8, xdir, dpitch, spitch); +- swCopy16BppSmallFixedWidths2Rows_Unaligned(dst + (0*8+1)*BYTES_PER_UINT16_T, src + (0*8+1)*BYTES_PER_UINT16_T, 8, xdir, dpitch, spitch); +- swCopy16BppSmallFixedWidths2Rows_Unaligned(dst + 0, src + 0 , 1, xdir, dpitch, spitch); +- } +- return TRUE; +- } +- break; + } + + return FALSE; +@@ -1161,484 +586,7 @@ swCopy16BppSmallFixedWidths4Rows_Unaligned(unsigned char *dst, unsigned char *sr + } + return TRUE; + break; +- case 7: if (xdir >= 0) { +- swCopy16BppSmallFixedWidths4Rows_Unaligned(dst, src, 4, xdir, dpitch, spitch); +- swCopy16BppSmallFixedWidths4Rows_Unaligned(dst + 4 * BYTES_PER_UINT16_T, src + 4 * BYTES_PER_UINT16_T, 3, xdir, dpitch, spitch); +- } else { +- swCopy16BppSmallFixedWidths4Rows_Unaligned(dst + 4 * BYTES_PER_UINT16_T, src + 4 * BYTES_PER_UINT16_T, 3, xdir, dpitch, spitch); +- swCopy16BppSmallFixedWidths4Rows_Unaligned(dst, src, 4, xdir, dpitch, spitch); +- } +- return TRUE; +- break; +- // TODO: Add more alignment checks for 8 pixel-wide cases for performance reasons? +- // For example, handling (SW_CHECK_PITCHED_ALIGNMENT(DOUBLE_WORD_ALIGNMENT_BYTE_SIZE,dst,src,dpitch,spitch,DOUBLE_WORD_ALIGNMENT_BYTE_SIZE/2)) and related half-aligned cases... +- case 8: if (SW_CHECK_PITCHED_ALIGNMENT(QUAD_WORD_ALIGNMENT_BYTE_SIZE,dst,src,dpitch,spitch,0)) { +- uint32x4_t src1a = vld1q_u32((uint32_t *)(src+0*spitch+0*BYTES_PER_UINT32X4_T)); +- uint32x4_t src1b = vld1q_u32((uint32_t *)(src+1*spitch+0*BYTES_PER_UINT32X4_T)); +- uint32x4_t src1c = vld1q_u32((uint32_t *)(src+2*spitch+0*BYTES_PER_UINT32X4_T)); +- uint32x4_t src1d = vld1q_u32((uint32_t *)(src+3*spitch+0*BYTES_PER_UINT32X4_T)); +- vst1q_u32((uint32_t *)(dst+0*dpitch+0*BYTES_PER_UINT32X4_T),src1a); +- vst1q_u32((uint32_t *)(dst+1*dpitch+0*BYTES_PER_UINT32X4_T),src1b); +- vst1q_u32((uint32_t *)(dst+2*dpitch+0*BYTES_PER_UINT32X4_T),src1c); +- vst1q_u32((uint32_t *)(dst+3*dpitch+0*BYTES_PER_UINT32X4_T),src1d); +- return TRUE; +- } +- else if (SW_CHECK_PITCHED_ALIGNMENT(DOUBLE_WORD_ALIGNMENT_BYTE_SIZE,dst,src,dpitch,spitch,0)) { +- uint64_t src1a = *(uint64_t *) (src+0*spitch+0*BYTES_PER_UINT64_T); +- uint64_t src2a = *(uint64_t *) (src+0*spitch+1*BYTES_PER_UINT64_T); +- uint64_t src1b = *(uint64_t *) (src+1*spitch+0*BYTES_PER_UINT64_T); +- uint64_t src2b = *(uint64_t *) (src+1*spitch+1*BYTES_PER_UINT64_T); +- uint64_t src1c = *(uint64_t *) (src+2*spitch+0*BYTES_PER_UINT64_T); +- uint64_t src2c = *(uint64_t *) (src+2*spitch+1*BYTES_PER_UINT64_T); +- uint64_t src1d = *(uint64_t *) (src+3*spitch+0*BYTES_PER_UINT64_T); +- uint64_t src2d = *(uint64_t *) (src+3*spitch+1*BYTES_PER_UINT64_T); +- *(uint64_t *) (dst+0*dpitch+0*BYTES_PER_UINT64_T) = src1a; +- *(uint64_t *) (dst+0*dpitch+1*BYTES_PER_UINT64_T) = src2a; +- *(uint64_t *) (dst+1*dpitch+0*BYTES_PER_UINT64_T) = src1b; +- *(uint64_t *) (dst+1*dpitch+1*BYTES_PER_UINT64_T) = src2b; +- *(uint64_t *) (dst+2*dpitch+0*BYTES_PER_UINT64_T) = src1c; +- *(uint64_t *) (dst+2*dpitch+1*BYTES_PER_UINT64_T) = src2c; +- *(uint64_t *) (dst+3*dpitch+0*BYTES_PER_UINT64_T) = src1d; +- *(uint64_t *) (dst+3*dpitch+1*BYTES_PER_UINT64_T) = src2d; +- return TRUE; +- } +- else if (SW_CHECK_PITCHED_ALIGNMENT(WORD_ALIGNMENT_BYTE_SIZE,dst,src,dpitch,spitch,0)) { +- uint32_t src1a = *(uint32_t *) (src+0*spitch+0*BYTES_PER_UINT32_T); +- uint32_t src2a = *(uint32_t *) (src+0*spitch+1*BYTES_PER_UINT32_T); +- uint32_t src3a = *(uint32_t *) (src+0*spitch+2*BYTES_PER_UINT32_T); +- uint32_t src4a = *(uint32_t *) (src+0*spitch+3*BYTES_PER_UINT32_T); +- uint32_t src1b = *(uint32_t *) (src+1*spitch+0*BYTES_PER_UINT32_T); +- uint32_t src2b = *(uint32_t *) (src+1*spitch+1*BYTES_PER_UINT32_T); +- uint32_t src3b = *(uint32_t *) (src+1*spitch+2*BYTES_PER_UINT32_T); +- uint32_t src4b = *(uint32_t *) (src+1*spitch+3*BYTES_PER_UINT32_T); +- uint32_t src1c = *(uint32_t *) (src+2*spitch+0*BYTES_PER_UINT32_T); +- uint32_t src2c = *(uint32_t *) (src+2*spitch+1*BYTES_PER_UINT32_T); +- uint32_t src3c = *(uint32_t *) (src+2*spitch+2*BYTES_PER_UINT32_T); +- uint32_t src4c = *(uint32_t *) (src+2*spitch+3*BYTES_PER_UINT32_T); +- uint32_t src1d = *(uint32_t *) (src+3*spitch+0*BYTES_PER_UINT32_T); +- uint32_t src2d = *(uint32_t *) (src+3*spitch+1*BYTES_PER_UINT32_T); +- uint32_t src3d = *(uint32_t *) (src+3*spitch+2*BYTES_PER_UINT32_T); +- uint32_t src4d = *(uint32_t *) (src+3*spitch+3*BYTES_PER_UINT32_T); +- *(uint32_t *) (dst+0*dpitch+0*BYTES_PER_UINT32_T) = src1a; +- *(uint32_t *) (dst+0*dpitch+1*BYTES_PER_UINT32_T) = src2a; +- *(uint32_t *) (dst+0*dpitch+2*BYTES_PER_UINT32_T) = src3a; +- *(uint32_t *) (dst+0*dpitch+3*BYTES_PER_UINT32_T) = src4a; +- *(uint32_t *) (dst+1*dpitch+0*BYTES_PER_UINT32_T) = src1b; +- *(uint32_t *) (dst+1*dpitch+1*BYTES_PER_UINT32_T) = src2b; +- *(uint32_t *) (dst+1*dpitch+2*BYTES_PER_UINT32_T) = src3b; +- *(uint32_t *) (dst+1*dpitch+3*BYTES_PER_UINT32_T) = src4b; +- *(uint32_t *) (dst+2*dpitch+0*BYTES_PER_UINT32_T) = src1c; +- *(uint32_t *) (dst+2*dpitch+1*BYTES_PER_UINT32_T) = src2c; +- *(uint32_t *) (dst+2*dpitch+2*BYTES_PER_UINT32_T) = src3c; +- *(uint32_t *) (dst+2*dpitch+3*BYTES_PER_UINT32_T) = src4c; +- *(uint32_t *) (dst+3*dpitch+0*BYTES_PER_UINT32_T) = src1d; +- *(uint32_t *) (dst+3*dpitch+1*BYTES_PER_UINT32_T) = src2d; +- *(uint32_t *) (dst+3*dpitch+2*BYTES_PER_UINT32_T) = src3d; +- *(uint32_t *) (dst+3*dpitch+3*BYTES_PER_UINT32_T) = src4d; +- return TRUE; +- } +- else if (SW_CHECK_PITCHED_ALIGNMENT(WORD_ALIGNMENT_BYTE_SIZE,dst,src,dpitch,spitch,BYTES_PER_UINT16_T)) { +- uint16_t src1a = *(uint16_t *) (src+0*spitch+0); +- uint32_t src2a = *(uint32_t *) (src+0*spitch+BYTES_PER_UINT16_T+0*BYTES_PER_UINT32_T); +- uint32_t src3a = *(uint32_t *) (src+0*spitch+BYTES_PER_UINT16_T+1*BYTES_PER_UINT32_T); +- uint32_t src4a = *(uint32_t *) (src+0*spitch+BYTES_PER_UINT16_T+2*BYTES_PER_UINT32_T); +- uint16_t src5a = *(uint16_t *) (src+0*spitch+BYTES_PER_UINT16_T+3*BYTES_PER_UINT32_T); +- uint16_t src1b = *(uint16_t *) (src+1*spitch+0); +- uint32_t src2b = *(uint32_t *) (src+1*spitch+BYTES_PER_UINT16_T+0*BYTES_PER_UINT32_T); +- uint32_t src3b = *(uint32_t *) (src+1*spitch+BYTES_PER_UINT16_T+1*BYTES_PER_UINT32_T); +- uint32_t src4b = *(uint32_t *) (src+1*spitch+BYTES_PER_UINT16_T+2*BYTES_PER_UINT32_T); +- uint16_t src5b = *(uint16_t *) (src+1*spitch+BYTES_PER_UINT16_T+3*BYTES_PER_UINT32_T); +- uint16_t src1c = *(uint16_t *) (src+2*spitch+0); +- uint32_t src2c = *(uint32_t *) (src+2*spitch+BYTES_PER_UINT16_T+0*BYTES_PER_UINT32_T); +- uint32_t src3c = *(uint32_t *) (src+2*spitch+BYTES_PER_UINT16_T+1*BYTES_PER_UINT32_T); +- uint32_t src4c = *(uint32_t *) (src+2*spitch+BYTES_PER_UINT16_T+2*BYTES_PER_UINT32_T); +- uint16_t src5c = *(uint16_t *) (src+2*spitch+BYTES_PER_UINT16_T+3*BYTES_PER_UINT32_T); +- uint16_t src1d = *(uint16_t *) (src+3*spitch+0); +- uint32_t src2d = *(uint32_t *) (src+3*spitch+BYTES_PER_UINT16_T+0*BYTES_PER_UINT32_T); +- uint32_t src3d = *(uint32_t *) (src+3*spitch+BYTES_PER_UINT16_T+1*BYTES_PER_UINT32_T); +- uint32_t src4d = *(uint32_t *) (src+3*spitch+BYTES_PER_UINT16_T+2*BYTES_PER_UINT32_T); +- uint16_t src5d = *(uint16_t *) (src+3*spitch+BYTES_PER_UINT16_T+3*BYTES_PER_UINT32_T); +- *(uint16_t *) (dst+0*dpitch+0) = src1a; +- *(uint32_t *) (dst+0*dpitch+BYTES_PER_UINT16_T+0*BYTES_PER_UINT32_T) = src2a; +- *(uint32_t *) (dst+0*dpitch+BYTES_PER_UINT16_T+1*BYTES_PER_UINT32_T) = src3a; +- *(uint32_t *) (dst+0*dpitch+BYTES_PER_UINT16_T+2*BYTES_PER_UINT32_T) = src4a; +- *(uint16_t *) (dst+0*dpitch+BYTES_PER_UINT16_T+3*BYTES_PER_UINT32_T) = src5a; +- *(uint16_t *) (dst+1*dpitch+0) = src1b; +- *(uint32_t *) (dst+1*dpitch+BYTES_PER_UINT16_T+0*BYTES_PER_UINT32_T) = src2b; +- *(uint32_t *) (dst+1*dpitch+BYTES_PER_UINT16_T+1*BYTES_PER_UINT32_T) = src3b; +- *(uint32_t *) (dst+1*dpitch+BYTES_PER_UINT16_T+2*BYTES_PER_UINT32_T) = src4b; +- *(uint16_t *) (dst+1*dpitch+BYTES_PER_UINT16_T+3*BYTES_PER_UINT32_T) = src5b; +- *(uint16_t *) (dst+2*dpitch+0) = src1c; +- *(uint32_t *) (dst+2*dpitch+BYTES_PER_UINT16_T+0*BYTES_PER_UINT32_T) = src2c; +- *(uint32_t *) (dst+2*dpitch+BYTES_PER_UINT16_T+1*BYTES_PER_UINT32_T) = src3c; +- *(uint32_t *) (dst+2*dpitch+BYTES_PER_UINT16_T+2*BYTES_PER_UINT32_T) = src4c; +- *(uint16_t *) (dst+2*dpitch+BYTES_PER_UINT16_T+3*BYTES_PER_UINT32_T) = src5c; +- *(uint16_t *) (dst+3*dpitch+0) = src1d; +- *(uint32_t *) (dst+3*dpitch+BYTES_PER_UINT16_T+0*BYTES_PER_UINT32_T) = src2d; +- *(uint32_t *) (dst+3*dpitch+BYTES_PER_UINT16_T+1*BYTES_PER_UINT32_T) = src3d; +- *(uint32_t *) (dst+3*dpitch+BYTES_PER_UINT16_T+2*BYTES_PER_UINT32_T) = src4d; +- *(uint16_t *) (dst+3*dpitch+BYTES_PER_UINT16_T+3*BYTES_PER_UINT32_T) = src5d; +- return TRUE; +- } +- else { +- uint16_t src1a = *(uint16_t *) (src+0*spitch+0*BYTES_PER_UINT16_T); +- uint16_t src2a = *(uint16_t *) (src+0*spitch+1*BYTES_PER_UINT16_T); +- uint16_t src3a = *(uint16_t *) (src+0*spitch+2*BYTES_PER_UINT16_T); +- uint16_t src4a = *(uint16_t *) (src+0*spitch+3*BYTES_PER_UINT16_T); +- uint16_t src5a = *(uint16_t *) (src+0*spitch+4*BYTES_PER_UINT16_T); +- uint16_t src6a = *(uint16_t *) (src+0*spitch+5*BYTES_PER_UINT16_T); +- uint16_t src7a = *(uint16_t *) (src+0*spitch+6*BYTES_PER_UINT16_T); +- uint16_t src8a = *(uint16_t *) (src+0*spitch+7*BYTES_PER_UINT16_T); +- uint16_t src1b = *(uint16_t *) (src+1*spitch+0*BYTES_PER_UINT16_T); +- uint16_t src2b = *(uint16_t *) (src+1*spitch+1*BYTES_PER_UINT16_T); +- uint16_t src3b = *(uint16_t *) (src+1*spitch+2*BYTES_PER_UINT16_T); +- uint16_t src4b = *(uint16_t *) (src+1*spitch+3*BYTES_PER_UINT16_T); +- uint16_t src5b = *(uint16_t *) (src+1*spitch+4*BYTES_PER_UINT16_T); +- uint16_t src6b = *(uint16_t *) (src+1*spitch+5*BYTES_PER_UINT16_T); +- uint16_t src7b = *(uint16_t *) (src+1*spitch+6*BYTES_PER_UINT16_T); +- uint16_t src8b = *(uint16_t *) (src+1*spitch+7*BYTES_PER_UINT16_T); +- uint16_t src1c = *(uint16_t *) (src+2*spitch+0*BYTES_PER_UINT16_T); +- uint16_t src2c = *(uint16_t *) (src+2*spitch+1*BYTES_PER_UINT16_T); +- uint16_t src3c = *(uint16_t *) (src+2*spitch+2*BYTES_PER_UINT16_T); +- uint16_t src4c = *(uint16_t *) (src+2*spitch+3*BYTES_PER_UINT16_T); +- uint16_t src5c = *(uint16_t *) (src+2*spitch+4*BYTES_PER_UINT16_T); +- uint16_t src6c = *(uint16_t *) (src+2*spitch+5*BYTES_PER_UINT16_T); +- uint16_t src7c = *(uint16_t *) (src+2*spitch+6*BYTES_PER_UINT16_T); +- uint16_t src8c = *(uint16_t *) (src+2*spitch+7*BYTES_PER_UINT16_T); +- uint16_t src1d = *(uint16_t *) (src+3*spitch+0*BYTES_PER_UINT16_T); +- uint16_t src2d = *(uint16_t *) (src+3*spitch+1*BYTES_PER_UINT16_T); +- uint16_t src3d = *(uint16_t *) (src+3*spitch+2*BYTES_PER_UINT16_T); +- uint16_t src4d = *(uint16_t *) (src+3*spitch+3*BYTES_PER_UINT16_T); +- uint16_t src5d = *(uint16_t *) (src+3*spitch+4*BYTES_PER_UINT16_T); +- uint16_t src6d = *(uint16_t *) (src+3*spitch+5*BYTES_PER_UINT16_T); +- uint16_t src7d = *(uint16_t *) (src+3*spitch+6*BYTES_PER_UINT16_T); +- uint16_t src8d = *(uint16_t *) (src+3*spitch+7*BYTES_PER_UINT16_T); +- *(uint16_t *) (dst+0*dpitch+0*BYTES_PER_UINT16_T) = src1a; +- *(uint16_t *) (dst+0*dpitch+1*BYTES_PER_UINT16_T) = src2a; +- *(uint16_t *) (dst+0*dpitch+2*BYTES_PER_UINT16_T) = src3a; +- *(uint16_t *) (dst+0*dpitch+3*BYTES_PER_UINT16_T) = src4a; +- *(uint16_t *) (dst+0*dpitch+4*BYTES_PER_UINT16_T) = src5a; +- *(uint16_t *) (dst+0*dpitch+5*BYTES_PER_UINT16_T) = src6a; +- *(uint16_t *) (dst+0*dpitch+6*BYTES_PER_UINT16_T) = src7a; +- *(uint16_t *) (dst+0*dpitch+7*BYTES_PER_UINT16_T) = src8a; +- *(uint16_t *) (dst+1*dpitch+0*BYTES_PER_UINT16_T) = src1b; +- *(uint16_t *) (dst+1*dpitch+1*BYTES_PER_UINT16_T) = src2b; +- *(uint16_t *) (dst+1*dpitch+2*BYTES_PER_UINT16_T) = src3b; +- *(uint16_t *) (dst+1*dpitch+3*BYTES_PER_UINT16_T) = src4b; +- *(uint16_t *) (dst+1*dpitch+4*BYTES_PER_UINT16_T) = src5b; +- *(uint16_t *) (dst+1*dpitch+5*BYTES_PER_UINT16_T) = src6b; +- *(uint16_t *) (dst+1*dpitch+6*BYTES_PER_UINT16_T) = src7b; +- *(uint16_t *) (dst+1*dpitch+7*BYTES_PER_UINT16_T) = src8b; +- *(uint16_t *) (dst+2*dpitch+0*BYTES_PER_UINT16_T) = src1c; +- *(uint16_t *) (dst+2*dpitch+1*BYTES_PER_UINT16_T) = src2c; +- *(uint16_t *) (dst+2*dpitch+2*BYTES_PER_UINT16_T) = src3c; +- *(uint16_t *) (dst+2*dpitch+3*BYTES_PER_UINT16_T) = src4c; +- *(uint16_t *) (dst+2*dpitch+4*BYTES_PER_UINT16_T) = src5c; +- *(uint16_t *) (dst+2*dpitch+5*BYTES_PER_UINT16_T) = src6c; +- *(uint16_t *) (dst+2*dpitch+6*BYTES_PER_UINT16_T) = src7c; +- *(uint16_t *) (dst+2*dpitch+7*BYTES_PER_UINT16_T) = src8c; +- *(uint16_t *) (dst+3*dpitch+0*BYTES_PER_UINT16_T) = src1d; +- *(uint16_t *) (dst+3*dpitch+1*BYTES_PER_UINT16_T) = src2d; +- *(uint16_t *) (dst+3*dpitch+2*BYTES_PER_UINT16_T) = src3d; +- *(uint16_t *) (dst+3*dpitch+3*BYTES_PER_UINT16_T) = src4d; +- *(uint16_t *) (dst+3*dpitch+4*BYTES_PER_UINT16_T) = src5d; +- *(uint16_t *) (dst+3*dpitch+5*BYTES_PER_UINT16_T) = src6d; +- *(uint16_t *) (dst+3*dpitch+6*BYTES_PER_UINT16_T) = src7d; +- *(uint16_t *) (dst+3*dpitch+7*BYTES_PER_UINT16_T) = src8d; +- return TRUE; +- } +- break; +- case 16: if (SW_CHECK_PITCHED_ALIGNMENT(QUAD_WORD_ALIGNMENT_BYTE_SIZE,dst,src,dpitch,spitch,0)) { +- uint32x4_t src1a = vld1q_u32((uint32_t *)(src+0*spitch+0*BYTES_PER_UINT32X4_T)); +- uint32x4_t src2a = vld1q_u32((uint32_t *)(src+0*spitch+1*BYTES_PER_UINT32X4_T)); +- uint32x4_t src1b = vld1q_u32((uint32_t *)(src+1*spitch+0*BYTES_PER_UINT32X4_T)); +- uint32x4_t src2b = vld1q_u32((uint32_t *)(src+1*spitch+1*BYTES_PER_UINT32X4_T)); +- uint32x4_t src1c = vld1q_u32((uint32_t *)(src+2*spitch+0*BYTES_PER_UINT32X4_T)); +- uint32x4_t src2c = vld1q_u32((uint32_t *)(src+2*spitch+1*BYTES_PER_UINT32X4_T)); +- uint32x4_t src1d = vld1q_u32((uint32_t *)(src+3*spitch+0*BYTES_PER_UINT32X4_T)); +- uint32x4_t src2d = vld1q_u32((uint32_t *)(src+3*spitch+1*BYTES_PER_UINT32X4_T)); +- vst1q_u32((uint32_t *)(dst+0*dpitch+0*BYTES_PER_UINT32X4_T),src1a); +- vst1q_u32((uint32_t *)(dst+0*dpitch+1*BYTES_PER_UINT32X4_T),src2a); +- vst1q_u32((uint32_t *)(dst+1*dpitch+0*BYTES_PER_UINT32X4_T),src1b); +- vst1q_u32((uint32_t *)(dst+1*dpitch+1*BYTES_PER_UINT32X4_T),src2b); +- vst1q_u32((uint32_t *)(dst+2*dpitch+0*BYTES_PER_UINT32X4_T),src1c); +- vst1q_u32((uint32_t *)(dst+2*dpitch+1*BYTES_PER_UINT32X4_T),src2c); +- vst1q_u32((uint32_t *)(dst+3*dpitch+0*BYTES_PER_UINT32X4_T),src1d); +- vst1q_u32((uint32_t *)(dst+3*dpitch+1*BYTES_PER_UINT32X4_T),src2d); +- return TRUE; +- } +- else if (SW_CHECK_PITCHED_ALIGNMENT(DOUBLE_WORD_ALIGNMENT_BYTE_SIZE,dst,src,dpitch,spitch,0)) { +- uint64_t src1a = *(uint64_t *) (src+0*spitch+0*BYTES_PER_UINT64_T); +- uint64_t src2a = *(uint64_t *) (src+0*spitch+1*BYTES_PER_UINT64_T); +- uint64_t src3a = *(uint64_t *) (src+0*spitch+2*BYTES_PER_UINT64_T); +- uint64_t src4a = *(uint64_t *) (src+0*spitch+3*BYTES_PER_UINT64_T); +- uint64_t src1b = *(uint64_t *) (src+1*spitch+0*BYTES_PER_UINT64_T); +- uint64_t src2b = *(uint64_t *) (src+1*spitch+1*BYTES_PER_UINT64_T); +- uint64_t src3b = *(uint64_t *) (src+1*spitch+2*BYTES_PER_UINT64_T); +- uint64_t src4b = *(uint64_t *) (src+1*spitch+3*BYTES_PER_UINT64_T); +- uint64_t src1c = *(uint64_t *) (src+2*spitch+0*BYTES_PER_UINT64_T); +- uint64_t src2c = *(uint64_t *) (src+2*spitch+1*BYTES_PER_UINT64_T); +- uint64_t src3c = *(uint64_t *) (src+2*spitch+2*BYTES_PER_UINT64_T); +- uint64_t src4c = *(uint64_t *) (src+2*spitch+3*BYTES_PER_UINT64_T); +- uint64_t src1d = *(uint64_t *) (src+3*spitch+0*BYTES_PER_UINT64_T); +- uint64_t src2d = *(uint64_t *) (src+3*spitch+1*BYTES_PER_UINT64_T); +- uint64_t src3d = *(uint64_t *) (src+3*spitch+2*BYTES_PER_UINT64_T); +- uint64_t src4d = *(uint64_t *) (src+3*spitch+3*BYTES_PER_UINT64_T); +- *(uint64_t *) (dst+0*dpitch+0*BYTES_PER_UINT64_T) = src1a; +- *(uint64_t *) (dst+0*dpitch+1*BYTES_PER_UINT64_T) = src2a; +- *(uint64_t *) (dst+0*dpitch+2*BYTES_PER_UINT64_T) = src3a; +- *(uint64_t *) (dst+0*dpitch+3*BYTES_PER_UINT64_T) = src4a; +- *(uint64_t *) (dst+1*dpitch+0*BYTES_PER_UINT64_T) = src1b; +- *(uint64_t *) (dst+1*dpitch+1*BYTES_PER_UINT64_T) = src2b; +- *(uint64_t *) (dst+1*dpitch+2*BYTES_PER_UINT64_T) = src3b; +- *(uint64_t *) (dst+1*dpitch+3*BYTES_PER_UINT64_T) = src4b; +- *(uint64_t *) (dst+2*dpitch+0*BYTES_PER_UINT64_T) = src1c; +- *(uint64_t *) (dst+2*dpitch+1*BYTES_PER_UINT64_T) = src2c; +- *(uint64_t *) (dst+2*dpitch+2*BYTES_PER_UINT64_T) = src3c; +- *(uint64_t *) (dst+2*dpitch+3*BYTES_PER_UINT64_T) = src4c; +- *(uint64_t *) (dst+3*dpitch+0*BYTES_PER_UINT64_T) = src1d; +- *(uint64_t *) (dst+3*dpitch+1*BYTES_PER_UINT64_T) = src2d; +- *(uint64_t *) (dst+3*dpitch+2*BYTES_PER_UINT64_T) = src3d; +- *(uint64_t *) (dst+3*dpitch+3*BYTES_PER_UINT64_T) = src4d; +- return TRUE; +- } +- else if (SW_CHECK_PITCHED_ALIGNMENT(DOUBLE_WORD_ALIGNMENT_BYTE_SIZE,dst,src,dpitch,spitch,2*BYTES_PER_UINT16_T)) { +- uint32_t src1a = *(uint32_t *) (src+0*spitch+0); +- uint64_t src2a = *(uint64_t *) (src+0*spitch+BYTES_PER_UINT32_T+0*BYTES_PER_UINT64_T); +- uint64_t src3a = *(uint64_t *) (src+0*spitch+BYTES_PER_UINT32_T+1*BYTES_PER_UINT64_T); +- uint64_t src4a = *(uint64_t *) (src+0*spitch+BYTES_PER_UINT32_T+2*BYTES_PER_UINT64_T); +- uint32_t src5a = *(uint32_t *) (src+0*spitch+BYTES_PER_UINT32_T+3*BYTES_PER_UINT64_T); +- uint32_t src1b = *(uint32_t *) (src+1*spitch+0); +- uint64_t src2b = *(uint64_t *) (src+1*spitch+BYTES_PER_UINT32_T+0*BYTES_PER_UINT64_T); +- uint64_t src3b = *(uint64_t *) (src+1*spitch+BYTES_PER_UINT32_T+1*BYTES_PER_UINT64_T); +- uint64_t src4b = *(uint64_t *) (src+1*spitch+BYTES_PER_UINT32_T+2*BYTES_PER_UINT64_T); +- uint32_t src5b = *(uint32_t *) (src+1*spitch+BYTES_PER_UINT32_T+3*BYTES_PER_UINT64_T); +- uint32_t src1c = *(uint32_t *) (src+2*spitch+0); +- uint64_t src2c = *(uint64_t *) (src+2*spitch+BYTES_PER_UINT32_T+0*BYTES_PER_UINT64_T); +- uint64_t src3c = *(uint64_t *) (src+2*spitch+BYTES_PER_UINT32_T+1*BYTES_PER_UINT64_T); +- uint64_t src4c = *(uint64_t *) (src+2*spitch+BYTES_PER_UINT32_T+2*BYTES_PER_UINT64_T); +- uint32_t src5c = *(uint32_t *) (src+2*spitch+BYTES_PER_UINT32_T+3*BYTES_PER_UINT64_T); +- uint32_t src1d = *(uint32_t *) (src+3*spitch+0); +- uint64_t src2d = *(uint64_t *) (src+3*spitch+BYTES_PER_UINT32_T+0*BYTES_PER_UINT64_T); +- uint64_t src3d = *(uint64_t *) (src+3*spitch+BYTES_PER_UINT32_T+1*BYTES_PER_UINT64_T); +- uint64_t src4d = *(uint64_t *) (src+3*spitch+BYTES_PER_UINT32_T+2*BYTES_PER_UINT64_T); +- uint32_t src5d = *(uint32_t *) (src+3*spitch+BYTES_PER_UINT32_T+3*BYTES_PER_UINT64_T); +- *(uint32_t *) (dst+0*dpitch+0) = src1a; +- *(uint64_t *) (dst+0*dpitch+BYTES_PER_UINT32_T+0*BYTES_PER_UINT64_T) = src2a; +- *(uint64_t *) (dst+0*dpitch+BYTES_PER_UINT32_T+1*BYTES_PER_UINT64_T) = src3a; +- *(uint64_t *) (dst+0*dpitch+BYTES_PER_UINT32_T+2*BYTES_PER_UINT64_T) = src4a; +- *(uint32_t *) (dst+0*dpitch+BYTES_PER_UINT32_T+3*BYTES_PER_UINT64_T) = src5a; +- *(uint32_t *) (dst+1*dpitch+0) = src1b; +- *(uint64_t *) (dst+1*dpitch+BYTES_PER_UINT32_T+0*BYTES_PER_UINT64_T) = src2b; +- *(uint64_t *) (dst+1*dpitch+BYTES_PER_UINT32_T+1*BYTES_PER_UINT64_T) = src3b; +- *(uint64_t *) (dst+1*dpitch+BYTES_PER_UINT32_T+2*BYTES_PER_UINT64_T) = src4b; +- *(uint32_t *) (dst+1*dpitch+BYTES_PER_UINT32_T+3*BYTES_PER_UINT64_T) = src5b; +- *(uint32_t *) (dst+2*dpitch+0) = src1c; +- *(uint64_t *) (dst+2*dpitch+BYTES_PER_UINT32_T+0*BYTES_PER_UINT64_T) = src2c; +- *(uint64_t *) (dst+2*dpitch+BYTES_PER_UINT32_T+1*BYTES_PER_UINT64_T) = src3c; +- *(uint64_t *) (dst+2*dpitch+BYTES_PER_UINT32_T+2*BYTES_PER_UINT64_T) = src4c; +- *(uint32_t *) (dst+2*dpitch+BYTES_PER_UINT32_T+3*BYTES_PER_UINT64_T) = src5c; +- *(uint32_t *) (dst+3*dpitch+0) = src1d; +- *(uint64_t *) (dst+3*dpitch+BYTES_PER_UINT32_T+0*BYTES_PER_UINT64_T) = src2d; +- *(uint64_t *) (dst+3*dpitch+BYTES_PER_UINT32_T+1*BYTES_PER_UINT64_T) = src3d; +- *(uint64_t *) (dst+3*dpitch+BYTES_PER_UINT32_T+2*BYTES_PER_UINT64_T) = src4d; +- *(uint32_t *) (dst+3*dpitch+BYTES_PER_UINT32_T+3*BYTES_PER_UINT64_T) = src5d; +- return TRUE; +- } +- else if (SW_CHECK_PITCHED_ALIGNMENT(WORD_ALIGNMENT_BYTE_SIZE,dst,src,dpitch,spitch,0)) { +- uint32_t src1a = *(uint32_t *) (src+0*spitch+0*BYTES_PER_UINT32_T); +- uint32_t src2a = *(uint32_t *) (src+0*spitch+1*BYTES_PER_UINT32_T); +- uint32_t src3a = *(uint32_t *) (src+0*spitch+2*BYTES_PER_UINT32_T); +- uint32_t src4a = *(uint32_t *) (src+0*spitch+3*BYTES_PER_UINT32_T); +- uint32_t src5a = *(uint32_t *) (src+0*spitch+4*BYTES_PER_UINT32_T); +- uint32_t src6a = *(uint32_t *) (src+0*spitch+5*BYTES_PER_UINT32_T); +- uint32_t src7a = *(uint32_t *) (src+0*spitch+6*BYTES_PER_UINT32_T); +- uint32_t src8a = *(uint32_t *) (src+0*spitch+7*BYTES_PER_UINT32_T); +- uint32_t src1b = *(uint32_t *) (src+1*spitch+0*BYTES_PER_UINT32_T); +- uint32_t src2b = *(uint32_t *) (src+1*spitch+1*BYTES_PER_UINT32_T); +- uint32_t src3b = *(uint32_t *) (src+1*spitch+2*BYTES_PER_UINT32_T); +- uint32_t src4b = *(uint32_t *) (src+1*spitch+3*BYTES_PER_UINT32_T); +- uint32_t src5b = *(uint32_t *) (src+1*spitch+4*BYTES_PER_UINT32_T); +- uint32_t src6b = *(uint32_t *) (src+1*spitch+5*BYTES_PER_UINT32_T); +- uint32_t src7b = *(uint32_t *) (src+1*spitch+6*BYTES_PER_UINT32_T); +- uint32_t src8b = *(uint32_t *) (src+1*spitch+7*BYTES_PER_UINT32_T); +- uint32_t src1c = *(uint32_t *) (src+2*spitch+0*BYTES_PER_UINT32_T); +- uint32_t src2c = *(uint32_t *) (src+2*spitch+1*BYTES_PER_UINT32_T); +- uint32_t src3c = *(uint32_t *) (src+2*spitch+2*BYTES_PER_UINT32_T); +- uint32_t src4c = *(uint32_t *) (src+2*spitch+3*BYTES_PER_UINT32_T); +- uint32_t src5c = *(uint32_t *) (src+2*spitch+4*BYTES_PER_UINT32_T); +- uint32_t src6c = *(uint32_t *) (src+2*spitch+5*BYTES_PER_UINT32_T); +- uint32_t src7c = *(uint32_t *) (src+2*spitch+6*BYTES_PER_UINT32_T); +- uint32_t src8c = *(uint32_t *) (src+2*spitch+7*BYTES_PER_UINT32_T); +- uint32_t src1d = *(uint32_t *) (src+3*spitch+0*BYTES_PER_UINT32_T); +- uint32_t src2d = *(uint32_t *) (src+3*spitch+1*BYTES_PER_UINT32_T); +- uint32_t src3d = *(uint32_t *) (src+3*spitch+2*BYTES_PER_UINT32_T); +- uint32_t src4d = *(uint32_t *) (src+3*spitch+3*BYTES_PER_UINT32_T); +- uint32_t src5d = *(uint32_t *) (src+3*spitch+4*BYTES_PER_UINT32_T); +- uint32_t src6d = *(uint32_t *) (src+3*spitch+5*BYTES_PER_UINT32_T); +- uint32_t src7d = *(uint32_t *) (src+3*spitch+6*BYTES_PER_UINT32_T); +- uint32_t src8d = *(uint32_t *) (src+3*spitch+7*BYTES_PER_UINT32_T); +- *(uint32_t *) (dst+0*dpitch+0*BYTES_PER_UINT32_T) = src1a; +- *(uint32_t *) (dst+0*dpitch+1*BYTES_PER_UINT32_T) = src2a; +- *(uint32_t *) (dst+0*dpitch+2*BYTES_PER_UINT32_T) = src3a; +- *(uint32_t *) (dst+0*dpitch+3*BYTES_PER_UINT32_T) = src4a; +- *(uint32_t *) (dst+0*dpitch+4*BYTES_PER_UINT32_T) = src5a; +- *(uint32_t *) (dst+0*dpitch+5*BYTES_PER_UINT32_T) = src6a; +- *(uint32_t *) (dst+0*dpitch+6*BYTES_PER_UINT32_T) = src7a; +- *(uint32_t *) (dst+0*dpitch+7*BYTES_PER_UINT32_T) = src8a; +- *(uint32_t *) (dst+1*dpitch+0*BYTES_PER_UINT32_T) = src1b; +- *(uint32_t *) (dst+1*dpitch+1*BYTES_PER_UINT32_T) = src2b; +- *(uint32_t *) (dst+1*dpitch+2*BYTES_PER_UINT32_T) = src3b; +- *(uint32_t *) (dst+1*dpitch+3*BYTES_PER_UINT32_T) = src4b; +- *(uint32_t *) (dst+1*dpitch+4*BYTES_PER_UINT32_T) = src5b; +- *(uint32_t *) (dst+1*dpitch+5*BYTES_PER_UINT32_T) = src6b; +- *(uint32_t *) (dst+1*dpitch+6*BYTES_PER_UINT32_T) = src7b; +- *(uint32_t *) (dst+1*dpitch+7*BYTES_PER_UINT32_T) = src8b; +- *(uint32_t *) (dst+2*dpitch+0*BYTES_PER_UINT32_T) = src1c; +- *(uint32_t *) (dst+2*dpitch+1*BYTES_PER_UINT32_T) = src2c; +- *(uint32_t *) (dst+2*dpitch+2*BYTES_PER_UINT32_T) = src3c; +- *(uint32_t *) (dst+2*dpitch+3*BYTES_PER_UINT32_T) = src4c; +- *(uint32_t *) (dst+2*dpitch+4*BYTES_PER_UINT32_T) = src5c; +- *(uint32_t *) (dst+2*dpitch+5*BYTES_PER_UINT32_T) = src6c; +- *(uint32_t *) (dst+2*dpitch+6*BYTES_PER_UINT32_T) = src7c; +- *(uint32_t *) (dst+2*dpitch+7*BYTES_PER_UINT32_T) = src8c; +- *(uint32_t *) (dst+3*dpitch+0*BYTES_PER_UINT32_T) = src1d; +- *(uint32_t *) (dst+3*dpitch+1*BYTES_PER_UINT32_T) = src2d; +- *(uint32_t *) (dst+3*dpitch+2*BYTES_PER_UINT32_T) = src3d; +- *(uint32_t *) (dst+3*dpitch+3*BYTES_PER_UINT32_T) = src4d; +- *(uint32_t *) (dst+3*dpitch+4*BYTES_PER_UINT32_T) = src5d; +- *(uint32_t *) (dst+3*dpitch+5*BYTES_PER_UINT32_T) = src6d; +- *(uint32_t *) (dst+3*dpitch+6*BYTES_PER_UINT32_T) = src7d; +- *(uint32_t *) (dst+3*dpitch+7*BYTES_PER_UINT32_T) = src8d; +- return TRUE; +- } +- else if (SW_CHECK_PITCHED_ALIGNMENT(WORD_ALIGNMENT_BYTE_SIZE,dst,src,dpitch,spitch,BYTES_PER_UINT16_T)) { +- uint16_t src1a = *(uint16_t *) (src+0*spitch+0); +- uint32_t src2a = *(uint32_t *) (src+0*spitch+BYTES_PER_UINT16_T+0*BYTES_PER_UINT32_T); +- uint32_t src3a = *(uint32_t *) (src+0*spitch+BYTES_PER_UINT16_T+1*BYTES_PER_UINT32_T); +- uint32_t src4a = *(uint32_t *) (src+0*spitch+BYTES_PER_UINT16_T+2*BYTES_PER_UINT32_T); +- uint32_t src5a = *(uint32_t *) (src+0*spitch+BYTES_PER_UINT16_T+3*BYTES_PER_UINT32_T); +- uint32_t src6a = *(uint32_t *) (src+0*spitch+BYTES_PER_UINT16_T+4*BYTES_PER_UINT32_T); +- uint32_t src7a = *(uint32_t *) (src+0*spitch+BYTES_PER_UINT16_T+5*BYTES_PER_UINT32_T); +- uint32_t src8a = *(uint32_t *) (src+0*spitch+BYTES_PER_UINT16_T+6*BYTES_PER_UINT32_T); +- uint16_t src9a = *(uint16_t *) (src+0*spitch+BYTES_PER_UINT16_T+7*BYTES_PER_UINT32_T); +- uint16_t src1b = *(uint16_t *) (src+1*spitch+0); +- uint32_t src2b = *(uint32_t *) (src+1*spitch+BYTES_PER_UINT16_T+0*BYTES_PER_UINT32_T); +- uint32_t src3b = *(uint32_t *) (src+1*spitch+BYTES_PER_UINT16_T+1*BYTES_PER_UINT32_T); +- uint32_t src4b = *(uint32_t *) (src+1*spitch+BYTES_PER_UINT16_T+2*BYTES_PER_UINT32_T); +- uint32_t src5b = *(uint32_t *) (src+1*spitch+BYTES_PER_UINT16_T+3*BYTES_PER_UINT32_T); +- uint32_t src6b = *(uint32_t *) (src+1*spitch+BYTES_PER_UINT16_T+4*BYTES_PER_UINT32_T); +- uint32_t src7b = *(uint32_t *) (src+1*spitch+BYTES_PER_UINT16_T+5*BYTES_PER_UINT32_T); +- uint32_t src8b = *(uint32_t *) (src+1*spitch+BYTES_PER_UINT16_T+6*BYTES_PER_UINT32_T); +- uint16_t src9b = *(uint16_t *) (src+1*spitch+BYTES_PER_UINT16_T+7*BYTES_PER_UINT32_T); +- uint16_t src1c = *(uint16_t *) (src+2*spitch+0); +- uint32_t src2c = *(uint32_t *) (src+2*spitch+BYTES_PER_UINT16_T+0*BYTES_PER_UINT32_T); +- uint32_t src3c = *(uint32_t *) (src+2*spitch+BYTES_PER_UINT16_T+1*BYTES_PER_UINT32_T); +- uint32_t src4c = *(uint32_t *) (src+2*spitch+BYTES_PER_UINT16_T+2*BYTES_PER_UINT32_T); +- uint32_t src5c = *(uint32_t *) (src+2*spitch+BYTES_PER_UINT16_T+3*BYTES_PER_UINT32_T); +- uint32_t src6c = *(uint32_t *) (src+2*spitch+BYTES_PER_UINT16_T+4*BYTES_PER_UINT32_T); +- uint32_t src7c = *(uint32_t *) (src+2*spitch+BYTES_PER_UINT16_T+5*BYTES_PER_UINT32_T); +- uint32_t src8c = *(uint32_t *) (src+2*spitch+BYTES_PER_UINT16_T+6*BYTES_PER_UINT32_T); +- uint16_t src9c = *(uint16_t *) (src+2*spitch+BYTES_PER_UINT16_T+7*BYTES_PER_UINT32_T); +- uint16_t src1d = *(uint16_t *) (src+3*spitch+0); +- uint32_t src2d = *(uint32_t *) (src+3*spitch+BYTES_PER_UINT16_T+0*BYTES_PER_UINT32_T); +- uint32_t src3d = *(uint32_t *) (src+3*spitch+BYTES_PER_UINT16_T+1*BYTES_PER_UINT32_T); +- uint32_t src4d = *(uint32_t *) (src+3*spitch+BYTES_PER_UINT16_T+2*BYTES_PER_UINT32_T); +- uint32_t src5d = *(uint32_t *) (src+3*spitch+BYTES_PER_UINT16_T+3*BYTES_PER_UINT32_T); +- uint32_t src6d = *(uint32_t *) (src+3*spitch+BYTES_PER_UINT16_T+4*BYTES_PER_UINT32_T); +- uint32_t src7d = *(uint32_t *) (src+3*spitch+BYTES_PER_UINT16_T+5*BYTES_PER_UINT32_T); +- uint32_t src8d = *(uint32_t *) (src+3*spitch+BYTES_PER_UINT16_T+6*BYTES_PER_UINT32_T); +- uint16_t src9d = *(uint16_t *) (src+3*spitch+BYTES_PER_UINT16_T+7*BYTES_PER_UINT32_T); +- *(uint16_t *) (dst+0*dpitch+0) = src1a; +- *(uint32_t *) (dst+0*dpitch+BYTES_PER_UINT16_T+0*BYTES_PER_UINT32_T) = src2a; +- *(uint32_t *) (dst+0*dpitch+BYTES_PER_UINT16_T+1*BYTES_PER_UINT32_T) = src3a; +- *(uint32_t *) (dst+0*dpitch+BYTES_PER_UINT16_T+2*BYTES_PER_UINT32_T) = src4a; +- *(uint32_t *) (dst+0*dpitch+BYTES_PER_UINT16_T+3*BYTES_PER_UINT32_T) = src5a; +- *(uint32_t *) (dst+0*dpitch+BYTES_PER_UINT16_T+4*BYTES_PER_UINT32_T) = src6a; +- *(uint32_t *) (dst+0*dpitch+BYTES_PER_UINT16_T+5*BYTES_PER_UINT32_T) = src7a; +- *(uint32_t *) (dst+0*dpitch+BYTES_PER_UINT16_T+6*BYTES_PER_UINT32_T) = src8a; +- *(uint16_t *) (dst+0*dpitch+BYTES_PER_UINT16_T+7*BYTES_PER_UINT32_T) = src9a; +- *(uint16_t *) (dst+1*dpitch+0) = src1b; +- *(uint32_t *) (dst+1*dpitch+BYTES_PER_UINT16_T+0*BYTES_PER_UINT32_T) = src2b; +- *(uint32_t *) (dst+1*dpitch+BYTES_PER_UINT16_T+1*BYTES_PER_UINT32_T) = src3b; +- *(uint32_t *) (dst+1*dpitch+BYTES_PER_UINT16_T+2*BYTES_PER_UINT32_T) = src4b; +- *(uint32_t *) (dst+1*dpitch+BYTES_PER_UINT16_T+3*BYTES_PER_UINT32_T) = src5b; +- *(uint32_t *) (dst+1*dpitch+BYTES_PER_UINT16_T+4*BYTES_PER_UINT32_T) = src6b; +- *(uint32_t *) (dst+1*dpitch+BYTES_PER_UINT16_T+5*BYTES_PER_UINT32_T) = src7b; +- *(uint32_t *) (dst+1*dpitch+BYTES_PER_UINT16_T+6*BYTES_PER_UINT32_T) = src8b; +- *(uint16_t *) (dst+1*dpitch+BYTES_PER_UINT16_T+7*BYTES_PER_UINT32_T) = src9b; +- *(uint16_t *) (dst+2*dpitch+0) = src1c; +- *(uint32_t *) (dst+2*dpitch+BYTES_PER_UINT16_T+0*BYTES_PER_UINT32_T) = src2c; +- *(uint32_t *) (dst+2*dpitch+BYTES_PER_UINT16_T+1*BYTES_PER_UINT32_T) = src3c; +- *(uint32_t *) (dst+2*dpitch+BYTES_PER_UINT16_T+2*BYTES_PER_UINT32_T) = src4c; +- *(uint32_t *) (dst+2*dpitch+BYTES_PER_UINT16_T+3*BYTES_PER_UINT32_T) = src5c; +- *(uint32_t *) (dst+2*dpitch+BYTES_PER_UINT16_T+4*BYTES_PER_UINT32_T) = src6c; +- *(uint32_t *) (dst+2*dpitch+BYTES_PER_UINT16_T+5*BYTES_PER_UINT32_T) = src7c; +- *(uint32_t *) (dst+2*dpitch+BYTES_PER_UINT16_T+6*BYTES_PER_UINT32_T) = src8c; +- *(uint16_t *) (dst+2*dpitch+BYTES_PER_UINT16_T+7*BYTES_PER_UINT32_T) = src9c; +- *(uint16_t *) (dst+3*dpitch+0) = src1d; +- *(uint32_t *) (dst+3*dpitch+BYTES_PER_UINT16_T+0*BYTES_PER_UINT32_T) = src2d; +- *(uint32_t *) (dst+3*dpitch+BYTES_PER_UINT16_T+1*BYTES_PER_UINT32_T) = src3d; +- *(uint32_t *) (dst+3*dpitch+BYTES_PER_UINT16_T+2*BYTES_PER_UINT32_T) = src4d; +- *(uint32_t *) (dst+3*dpitch+BYTES_PER_UINT16_T+3*BYTES_PER_UINT32_T) = src5d; +- *(uint32_t *) (dst+3*dpitch+BYTES_PER_UINT16_T+4*BYTES_PER_UINT32_T) = src6d; +- *(uint32_t *) (dst+3*dpitch+BYTES_PER_UINT16_T+5*BYTES_PER_UINT32_T) = src7d; +- *(uint32_t *) (dst+3*dpitch+BYTES_PER_UINT16_T+6*BYTES_PER_UINT32_T) = src8d; +- *(uint16_t *) (dst+3*dpitch+BYTES_PER_UINT16_T+7*BYTES_PER_UINT32_T) = src9d; +- return TRUE; +- } +- else { +- // Don't bother unrolling loops, since that won't help for more than around 8 operations. +- // Instead, just call multiple fixed functions. +- if (xdir >= 0) { +- swCopy16BppSmallFixedWidths4Rows_Unaligned(dst, src, 8, xdir, dpitch, spitch); +- swCopy16BppSmallFixedWidths4Rows_Unaligned(dst + 8 * BYTES_PER_UINT16_T, src + 8 * BYTES_PER_UINT16_T, 8, xdir, dpitch, spitch); +- } else { +- swCopy16BppSmallFixedWidths4Rows_Unaligned(dst + 8 * BYTES_PER_UINT16_T, src + 8 * BYTES_PER_UINT16_T, 8, xdir, dpitch, spitch); +- swCopy16BppSmallFixedWidths4Rows_Unaligned(dst, src, 8, xdir, dpitch, spitch); +- } +- return TRUE; +- } +- break; +- // TODO: Add more alignment checks for 32 pixel-wide cases for performance reasons? +- // For example, handling (SW_CHECK_PITCHED_ALIGNMENT(DOUBLE_WORD_ALIGNMENT_BYTE_SIZE,dst,src,dpitch,spitch,XXX)) and related cases could make a big difference here... +- case 32: if (SW_CHECK_PITCHED_ALIGNMENT(QUAD_WORD_ALIGNMENT_BYTE_SIZE,dst,src,dpitch,spitch,0)) { +- uint32x4_t src1a = vld1q_u32((uint32_t *)(src+0*spitch+0*BYTES_PER_UINT32X4_T)); +- uint32x4_t src2a = vld1q_u32((uint32_t *)(src+0*spitch+1*BYTES_PER_UINT32X4_T)); +- uint32x4_t src3a = vld1q_u32((uint32_t *)(src+0*spitch+2*BYTES_PER_UINT32X4_T)); +- uint32x4_t src4a = vld1q_u32((uint32_t *)(src+0*spitch+3*BYTES_PER_UINT32X4_T)); +- uint32x4_t src1b = vld1q_u32((uint32_t *)(src+1*spitch+0*BYTES_PER_UINT32X4_T)); +- uint32x4_t src2b = vld1q_u32((uint32_t *)(src+1*spitch+1*BYTES_PER_UINT32X4_T)); +- uint32x4_t src3b = vld1q_u32((uint32_t *)(src+1*spitch+2*BYTES_PER_UINT32X4_T)); +- uint32x4_t src4b = vld1q_u32((uint32_t *)(src+1*spitch+3*BYTES_PER_UINT32X4_T)); +- uint32x4_t src1c = vld1q_u32((uint32_t *)(src+2*spitch+0*BYTES_PER_UINT32X4_T)); +- uint32x4_t src2c = vld1q_u32((uint32_t *)(src+2*spitch+1*BYTES_PER_UINT32X4_T)); +- uint32x4_t src3c = vld1q_u32((uint32_t *)(src+2*spitch+2*BYTES_PER_UINT32X4_T)); +- uint32x4_t src4c = vld1q_u32((uint32_t *)(src+2*spitch+3*BYTES_PER_UINT32X4_T)); +- uint32x4_t src1d = vld1q_u32((uint32_t *)(src+3*spitch+0*BYTES_PER_UINT32X4_T)); +- uint32x4_t src2d = vld1q_u32((uint32_t *)(src+3*spitch+1*BYTES_PER_UINT32X4_T)); +- uint32x4_t src3d = vld1q_u32((uint32_t *)(src+3*spitch+2*BYTES_PER_UINT32X4_T)); +- uint32x4_t src4d = vld1q_u32((uint32_t *)(src+3*spitch+3*BYTES_PER_UINT32X4_T)); +- vst1q_u32((uint32_t *)(dst+0*dpitch+0*BYTES_PER_UINT32X4_T),src1a); +- vst1q_u32((uint32_t *)(dst+0*dpitch+1*BYTES_PER_UINT32X4_T),src2a); +- vst1q_u32((uint32_t *)(dst+0*dpitch+2*BYTES_PER_UINT32X4_T),src3a); +- vst1q_u32((uint32_t *)(dst+0*dpitch+3*BYTES_PER_UINT32X4_T),src4a); +- vst1q_u32((uint32_t *)(dst+1*dpitch+0*BYTES_PER_UINT32X4_T),src1b); +- vst1q_u32((uint32_t *)(dst+1*dpitch+1*BYTES_PER_UINT32X4_T),src2b); +- vst1q_u32((uint32_t *)(dst+1*dpitch+2*BYTES_PER_UINT32X4_T),src3b); +- vst1q_u32((uint32_t *)(dst+1*dpitch+3*BYTES_PER_UINT32X4_T),src4b); +- vst1q_u32((uint32_t *)(dst+2*dpitch+0*BYTES_PER_UINT32X4_T),src1c); +- vst1q_u32((uint32_t *)(dst+2*dpitch+1*BYTES_PER_UINT32X4_T),src2c); +- vst1q_u32((uint32_t *)(dst+2*dpitch+2*BYTES_PER_UINT32X4_T),src3c); +- vst1q_u32((uint32_t *)(dst+2*dpitch+3*BYTES_PER_UINT32X4_T),src4c); +- vst1q_u32((uint32_t *)(dst+3*dpitch+0*BYTES_PER_UINT32X4_T),src1d); +- vst1q_u32((uint32_t *)(dst+3*dpitch+1*BYTES_PER_UINT32X4_T),src2d); +- vst1q_u32((uint32_t *)(dst+3*dpitch+2*BYTES_PER_UINT32X4_T),src3d); +- vst1q_u32((uint32_t *)(dst+3*dpitch+3*BYTES_PER_UINT32X4_T),src4d); +- return TRUE; +- } +- break; +- } ++ } + + return FALSE; + } +@@ -1924,10 +872,12 @@ swCopyRect16BppFixedWidth_Unaligned(unsigned char *dst, unsigned char *src, int + if (rowsOverlap) + { + if (w > 64) { +- DRAW_MULTIPLE_ROWS_WITH_MEMORY_COPY_NO_NARROW_COPIES(neon_memmove, BLOCK_SIGNALS_BEFORE_VFP_OPERATIONS, UNBLOCK_SIGNALS_AFTER_VFP_OPERATIONS); ++ //DRAW_MULTIPLE_ROWS_WITH_MEMORY_COPY_NO_NARROW_COPIES(neon_memmove, BLOCK_SIGNALS_BEFORE_VFP_OPERATIONS, UNBLOCK_SIGNALS_AFTER_VFP_OPERATIONS); ++ DRAW_MULTIPLE_ROWS_WITH_MEMORY_COPY_NO_NARROW_COPIES(memmove, BLOCK_SIGNALS_BEFORE_VFP_OPERATIONS, UNBLOCK_SIGNALS_AFTER_VFP_OPERATIONS); + } + else if (w == 64) { +- DRAW_MULTIPLE_ROWS_WITH_MEMORY_COPY(neon_memmove, BLOCK_SIGNALS_BEFORE_VFP_OPERATIONS, UNBLOCK_SIGNALS_AFTER_VFP_OPERATIONS); ++ //DRAW_MULTIPLE_ROWS_WITH_MEMORY_COPY(neon_memmove, BLOCK_SIGNALS_BEFORE_VFP_OPERATIONS, UNBLOCK_SIGNALS_AFTER_VFP_OPERATIONS); ++ DRAW_MULTIPLE_ROWS_WITH_MEMORY_COPY(memmove, BLOCK_SIGNALS_BEFORE_VFP_OPERATIONS, UNBLOCK_SIGNALS_AFTER_VFP_OPERATIONS); + } + else { + DRAW_MULTIPLE_ROWS_WITH_MEMORY_COPY(memmove, SIGNAL_BLOCK_NOOP, SIGNAL_BLOCK_NOOP); +@@ -1936,10 +886,12 @@ swCopyRect16BppFixedWidth_Unaligned(unsigned char *dst, unsigned char *src, int + else + { + if (w > 64) { +- DRAW_MULTIPLE_ROWS_WITH_MEMORY_COPY_NO_NARROW_COPIES(neon_memcpy, BLOCK_SIGNALS_BEFORE_VFP_OPERATIONS, UNBLOCK_SIGNALS_AFTER_VFP_OPERATIONS); ++ //DRAW_MULTIPLE_ROWS_WITH_MEMORY_COPY_NO_NARROW_COPIES(neon_memcpy, BLOCK_SIGNALS_BEFORE_VFP_OPERATIONS, UNBLOCK_SIGNALS_AFTER_VFP_OPERATIONS); ++ DRAW_MULTIPLE_ROWS_WITH_MEMORY_COPY_NO_NARROW_COPIES(memcpy, BLOCK_SIGNALS_BEFORE_VFP_OPERATIONS, UNBLOCK_SIGNALS_AFTER_VFP_OPERATIONS); + } + else if (w == 64) { +- DRAW_MULTIPLE_ROWS_WITH_MEMORY_COPY(neon_memcpy, BLOCK_SIGNALS_BEFORE_VFP_OPERATIONS, UNBLOCK_SIGNALS_AFTER_VFP_OPERATIONS); ++ //DRAW_MULTIPLE_ROWS_WITH_MEMORY_COPY(neon_memcpy, BLOCK_SIGNALS_BEFORE_VFP_OPERATIONS, UNBLOCK_SIGNALS_AFTER_VFP_OPERATIONS); ++ DRAW_MULTIPLE_ROWS_WITH_MEMORY_COPY(memcpy, BLOCK_SIGNALS_BEFORE_VFP_OPERATIONS, UNBLOCK_SIGNALS_AFTER_VFP_OPERATIONS); + } + else { + DRAW_MULTIPLE_ROWS_WITH_MEMORY_COPY(memcpy, SIGNAL_BLOCK_NOOP, SIGNAL_BLOCK_NOOP); +@@ -1973,7 +925,8 @@ swCopyRect8Bpp_Unaligned(unsigned char *dst, unsigned char *src, int w, int h, i + if (xdir >= 0 || !rowsOverlap) { + if (w >= 128) { + BLOCK_SIGNALS_BEFORE_VFP_OPERATIONS(); +- neon_memcpy(dst, src, w); ++ //neon_memcpy(dst, src, w); ++ memcpy(dst, src, w); + UNBLOCK_SIGNALS_AFTER_VFP_OPERATIONS(); + } + else +@@ -1982,7 +935,8 @@ swCopyRect8Bpp_Unaligned(unsigned char *dst, unsigned char *src, int w, int h, i + else { + if (w >= 128) { + BLOCK_SIGNALS_BEFORE_VFP_OPERATIONS(); +- neon_memmove(dst, src, w); ++ //neon_memmove(dst, src, w); ++ memmove(dst, src, w); + UNBLOCK_SIGNALS_AFTER_VFP_OPERATIONS(); + } + else +@@ -2029,7 +983,8 @@ swCopyRect24Bpp_Unaligned(unsigned char *dst, unsigned char *src, int w, int h, + if (xdir >= 0 || !rowsOverlap) { + if (w >= 42) { + BLOCK_SIGNALS_BEFORE_VFP_OPERATIONS(); +- neon_memcpy(dst, src, w * BYTES_PER_24BPP_PIXEL); ++ //neon_memcpy(dst, src, w * BYTES_PER_24BPP_PIXEL); ++ memcpy(dst, src, w * BYTES_PER_24BPP_PIXEL); + UNBLOCK_SIGNALS_AFTER_VFP_OPERATIONS(); + } + else +@@ -2038,7 +993,8 @@ swCopyRect24Bpp_Unaligned(unsigned char *dst, unsigned char *src, int w, int h, + else { + if (w >= 42) { + BLOCK_SIGNALS_BEFORE_VFP_OPERATIONS(); +- neon_memmove(dst, src, w * BYTES_PER_24BPP_PIXEL); ++ //neon_memmove(dst, src, w * BYTES_PER_24BPP_PIXEL); ++ memmove(dst, src, w * BYTES_PER_24BPP_PIXEL); + UNBLOCK_SIGNALS_AFTER_VFP_OPERATIONS(); + } + else +diff --git git/src/neon_memcpy.S git/src/neon_memcpy.S +deleted file mode 100644 +index 5ecc5ce..0000000 +--- git/src/neon_memcpy.S ++++ /dev/null +@@ -1,549 +0,0 @@ +-/*************************************************************************** +- Copyright (c) 2009, Code Aurora Forum. All rights reserved. +- +- Redistribution and use in source and binary forms, with or without +- modification, are permitted provided that the following conditions are met: +- * Redistributions of source code must retain the above copyright +- notice, this list of conditions and the following disclaimer. +- * Redistributions in binary form must reproduce the above copyright +- notice, this list of conditions and the following disclaimer in the +- documentation and/or other materials provided with the distribution. +- * Neither the name of Code Aurora nor the names of its contributors may +- be used to endorse or promote products derived from this software +- without specific prior written permission. +- +- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE +- LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +- INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +- CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +- ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +- POSSIBILITY OF SUCH DAMAGE. +- ***************************************************************************/ +- +-/*************************************************************************** +- Neon memcpy: Attempts to do a memcpy with Neon registers if possible, +- Inputs: +- dest: The destination buffer +- src: The source buffer +- n: The size of the buffer to transfer +- Outputs: +- +-***************************************************************************/ +- +-/* +- * General note: +- * The original code that was compiled for rvct used PUSH/POP and VPUSH/VPOP +- * However, it looks like the 2006 CodeSourcery Assembler has issues generating +- * the correct object code for VPOP, resulting in horrific stack crashes. +- * As a result, I've temporarily move PUSH->STMDB, POP->LDMIA, VPUSH->VSTMDB, +- * and VPOP->VLDMIA. We can revert this back once we update our toolchain. +- * +- * Also, VSHL swaps the source register and the shift-amount register +- * around in 2006-q3. I've coded this incorrectly so it turns out correct +- * in the object code, but we'll need to undo that later... +- */ +- +- .code 32 +- .align 4 +- .globl neon_memcpy +- .func +- +-neon_memcpy: +- /* +- * First, make sure we're not copying < 4 bytes. If so, we'll +- * just handle it here. +- */ +-#if defined __GNUC__ && (4 == __GNUC__ && 1 == __GNUC_MINOR__ && 1 == __GNUC_PATCHLEVEL__) +- stmdb sp!, {r0} +-#else +- push {r0} +-#endif +- cmp r2, #4 +- bgt neon_gt_4 +- /* Copy 0-4 bytes, if needed, and return.*/ +- cmp r2, #0 +-neon_smallcopy_loop: +- beq neon_smallcopy_done +- ldrb r12, [r1], #1 +- subs r2, r2, #1 +- strb r12, [r0], #1 +- b neon_smallcopy_loop +-neon_smallcopy_done: +-#if defined __GNUC__ && (4 == __GNUC__ && 1 == __GNUC_MINOR__ && 1 == __GNUC_PATCHLEVEL__) +- ldmia sp!, {r0} +-#else +- pop {r0} +-#endif +- bx lr +- +- /* Copy 4 or more bytes*/ +-neon_gt_4: +- /* Preload what we can...*/ +- pld [r0,#0] +- pld [r1,#0] +-#if defined __GNUC__ && (4 == __GNUC__ && 1 == __GNUC_MINOR__ && 1 == __GNUC_PATCHLEVEL__) +- stmdb sp!, {r4-r5} +-#else +- push {r4-r5} +-#endif +- +-neon_check_align: +- /* Check normal word alignment for target. */ +- ands r12, r0, #0x3 +- beq source_alignment_check +- +- /* +- * Target is not aligned. Step through until we get that +- * word-aligned. This works better than a loop, according +- * to our pipeline modeler. +- */ +- cmp r12, #2 +- ldrb r3, [r1], #1 +- ldrleb r4, [r1], #1 +- ldrltb r5, [r1], #1 +- rsb r12, r12, #4 +- sub r2, r2, r12 +- strb r3, [r0], #1 +- strleb r4, [r0], #1 +- strltb r5, [r0], #1 +- +-source_alignment_check: +- ands r12, r1, #0x3 +- bne neon_memcpy_nonaligned /* Source is not word aligned.*/ +-neon_try_16_align: +- cmp r2, #64 +- blt neon_align_route +- /* This is where we try 16-byte alignment. */ +- ands r12, r0, #0xf +- beq neon_align_route +- rsb r12, r12, #16 +-neon_16_start: +- sub r2, r2, r12 +- lsrs r3, r12, #2 +-neon_align_16_4: +- ldr r4, [r1], #4 +- subs r3, r3, #1 +- str r4, [r0], #4 +- bne neon_align_16_4 +-neon_align_route: +- /* In this case, both source and target are word-aligned. */ +- cmp r2, #32768 +- bge neon_copy_128p_a +- cmp r2, #256 +- bge neon_copy_128_a +- cmp r2, #64 +- bge neon_copy_32_a +- b neon_copy_finish_a +- nop +-neon_copy_128p_a: +- /* We'll copy blocks 128-bytes at a time, but try to call pld to +- * load in the next page, if possible. +- */ +-#if defined __GNUC__ && (4 == __GNUC__ && 1 == __GNUC_MINOR__ && 1 == __GNUC_PATCHLEVEL__) +- vstmdb sp!, {q4-q7} +-#else +- vpush {q4-q7} +-#endif +- mov r12, r2, lsr #7 +-neon_copy_128p_loop_a: +- vld1.32 {q0, q1}, [r1]! +- vld1.32 {q2, q3}, [r1]! +- vld1.32 {q4, q5}, [r1]! +- vld1.32 {q6, q7}, [r1]! +- pld [r1, #0] +- pld [r1, #1024] +- vst1.32 {q0, q1}, [r0]! +- vst1.32 {q2, q3}, [r0]! +- vst1.32 {q4, q5}, [r0]! +- vst1.32 {q6, q7}, [r0]! +- subs r12, r12, #1 +- bne neon_copy_128p_loop_a +-#if defined __GNUC__ && (4 == __GNUC__ && 1 == __GNUC_MINOR__ && 1 == __GNUC_PATCHLEVEL__) +- vldmia sp!, {q4-q7} +-#else +- vpop {q4-q7} +-#endif +- ands r2, r2, #0x7f +- beq neon_end +- cmp r2, #32 +- blt neon_copy_finish_a +- b neon_copy_32_a +- /* Copy blocks of 128-bytes (word-aligned) at a time*/ +-neon_copy_128_a: +-#if defined __GNUC__ && (4 == __GNUC__ && 1 == __GNUC_MINOR__ && 1 == __GNUC_PATCHLEVEL__) +- vstmdb sp!, {q4-q7} +-#else +- vpush {q4-q7} +-#endif +- /* +- * Move to a 1-s based countdown to determine when to loop. That +- * allows the subs to set the Z flag without having to explicitly +- * call cmp to a value. +- */ +- mov r12, r2, lsr #7 +-neon_copy_128_loop_a: +- vld1.32 {q0, q1}, [r1]! +- vld1.32 {q2, q3}, [r1]! +- vld1.32 {q4, q5}, [r1]! +- vld1.32 {q6, q7}, [r1]! +- pld [r1, #0] +- pld [r1, #128] +- vst1.32 {q0, q1}, [r0]! +- vst1.32 {q2, q3}, [r0]! +- vst1.32 {q4, q5}, [r0]! +- vst1.32 {q6, q7}, [r0]! +- subs r12, r12, #1 +- pld [r0, #0] +- pld [r0, #128] +- bne neon_copy_128_loop_a +-#if defined __GNUC__ && (4 == __GNUC__ && 1 == __GNUC_MINOR__ && 1 == __GNUC_PATCHLEVEL__) +- vldmia sp!, {q4-q7} +-#else +- vpop {q4-q7} +-#endif +- ands r2, r2, #0x7f +- beq neon_end +- cmp r2, #32 +- blt neon_copy_finish_a +- /* Copy blocks of 32-bytes (word aligned) at a time*/ +-neon_copy_32_a: +- mov r12, r2, lsr #5 +-neon_copy_32_loop_a: +- vld1.32 {q0,q1}, [r1]! +- subs r12, r12, #1 +- pld [r1,#0] +- vst1.32 {q0,q1}, [r0]! +- bne neon_copy_32_loop_a +- ands r2, r2, #0x1f +- beq neon_end +-neon_copy_finish_a: +-neon_copy_16_a: +- movs r12, r2, lsr #4 +- beq neon_copy_8_a +-neon_copy_16_a_loop: +- vld1.32 {q0}, [r1]! +- subs r12, r12, #1 +- vst1.32 {q0}, [r0]! +- bne neon_copy_16_a_loop +- ands r2, r2, #0xf +- beq neon_end +-neon_copy_8_a: +- cmp r2, #8 +- blt neon_copy_4_a +- ldm r1!, {r4-r5} +- subs r2, r2, #8 +- stm r0!, {r4-r5} +- /* Copy 4-bytes of word-aligned data at a time*/ +-neon_copy_4_a: +- cmp r2, #4 +- blt neon_copy_finish +- ldr r4, [r1], #4 +- subs r2, r2, #4 +- str r4, [r0], #4 +- b neon_copy_finish +- +- /* +- * Handle unaligned data. The basic concept here is that we'll +- * try to pull out enough data from the source to get that word- +- * aligned, then do our writes word-aligned, storing the difference +- * in a register, and shifting the data as needed. +- */ +-neon_memcpy_nonaligned: +- /* +- * If this is <8 bytes, it makes more sense to just copy it +- * quickly instead of incurring all kinds of overhead. +- */ +- cmp r2, #8 /* Let's try this...*/ +- ble neon_copy_finish +- /* +- * This is where we'll pull out either 1, 2, or 3 bytes of data +- * from the source as needed to align it, then store off those +- * bytes in r4. When we read in the (now) aligned data from the +- * source, we'll shift the bytes and AND in the r4 data, then write +- * to the target aligned. +- * +- * The conditional ldr calls work slightly faster than the +- * previous method, confirmed by our pipeline modeler. +- */ +-#if defined __GNUC__ && (4 == __GNUC__ && 1 == __GNUC_MINOR__ && 1 == __GNUC_PATCHLEVEL__) +- stmdb sp!, {r6-r9} +-#else +- push {r6-r9} +-#endif +- cmp r12, #2 +- ldrb r4, [r1], #1 +- ldrleb r5, [r1], #1 +- ldrltb r6, [r1], #1 +- rsb r8, r12, #4 +- sub r2, r2, r8 +- lsl r8, r8, #3 +- orrle r4, r4, r5, lsl #8 +- orrlt r4, r4, r6, lsl #16 +- rsb r9, r8, #32 +- +- cmp r2, #64 +- blt neon_unaligned_route +- ands r12, r0, #0xf +- beq neon_unaligned_route +- rsb r12, r12, #16 +-neon_16_start_u: +- sub r2, r2, r12 +- lsrs r6, r12, #2 +-neon_align_16_4_u: +- ldr r5, [r1], #4 +- subs r6, r6, #1 +- orr r4, r4, r5, lsl r8 +- str r4, [r0], #4 +- mov r4, r5, lsr r9 +- bne neon_align_16_4_u +-neon_unaligned_route: +- /* Decide which loop block to branch to.*/ +- cmp r2, #256 +- bge neon_copy_64_u +- cmp r2, #64 +- bge neon_copy_32_u +- b neon_copy_finish_u +- /* Copy data in 64-byte blocks.*/ +-neon_copy_64_u: +-#if defined __GNUC__ && (4 == __GNUC__ && 1 == __GNUC_MINOR__ && 1 == __GNUC_PATCHLEVEL__) +- vstmdb sp!, {q4} +- vstmdb sp!, {q5-q8} +-#else +- vpush {q4} +- vpush {q5-q8} +-#endif +- /* We'll need this for the q register shift later.*/ +- vdup.u32 q8, r8 +- /* +- * As above, we determine how many times we can go through the +- * 64-byte copy loop, then countdown. +- */ +- mov r12, r2, lsr #6 +- and r2, r2, #0x3f +-neon_copy_64_u_loop: +- /* Load 64-bytes into q4-q7.*/ +- vld1.32 {q4, q5}, [r1]! +- vld1.32 {q6, q7}, [r1]! +- /* +- * Shift q0-q3 right so everything but the data we need due to the +- * alignment falls off the right-hand side. The branching +- * is needed, since vshr requires the shift to be an immediate +- * value. +- */ +- lsls r5, r8, #28 +- bcc neon_copy_64_u_b8 +- bpl neon_copy_64_u_b16 +- vshr.u64 q0, q4, #40 +- vshr.u64 q1, q5, #40 +- vshr.u64 q2, q6, #40 +- vshr.u64 q3, q7, #40 +- b neon_copy_64_unify +-neon_copy_64_u_b8: +- vshr.u64 q0, q4, #56 +- vshr.u64 q1, q5, #56 +- vshr.u64 q2, q6, #56 +- vshr.u64 q3, q7, #56 +- b neon_copy_64_unify +-neon_copy_64_u_b16: +- vshr.u64 q0, q4, #48 +- vshr.u64 q1, q5, #48 +- vshr.u64 q2, q6, #48 +- vshr.u64 q3, q7, #48 +-neon_copy_64_unify: +- /* +- * Shift q4-q7 left by r8 bits to take the alignment into +- * account. +- */ +-#if defined __GNUC__ && (4 == __GNUC__ && 1 == __GNUC_MINOR__ && 1 == __GNUC_PATCHLEVEL__) +- vshl.u64 q4, q8, q4 +- vshl.u64 q5, q8, q5 +- vshl.u64 q6, q8, q6 +- vshl.u64 q7, q8, q7 +-#else +- vshl.u64 q4, q4, q8 +- vshl.u64 q5, q5, q8 +- vshl.u64 q6, q6, q8 +- vshl.u64 q7, q7, q8 +-#endif +- /* +- * The data in s14 will be needed for the next loop iteration. Move +- * that to r5. +- */ +- vmov r5, s14 +- /* We'll vorr the shifted data with the data that needs to move back.*/ +- vorr d9, d9, d0 +- /* Copy the data from the previous loop into s14.*/ +- vmov s14, r4 +- vorr d10, d10, d1 +- vorr d11, d11, d2 +- vorr d12, d12, d3 +- vorr d13, d13, d4 +- vorr d14, d14, d5 +- vorr d15, d15, d6 +- vorr d8, d8, d7 +- subs r12, r12, #1 +- pld [r1, #0] +- pld [r1, #128] +- /* Save off the r5 data into r4 for the next iteration.*/ +- mov r4, r5 +- vst1.32 {q4, q5}, [r0]! +- vst1.32 {q6, q7}, [r0]! +- pld [r0, #0] +- pld [r0, #128] +- bne neon_copy_64_u_loop +-#if defined __GNUC__ && (4 == __GNUC__ && 1 == __GNUC_MINOR__ && 1 == __GNUC_PATCHLEVEL__) +- vldmia sp!, {q5-q8} +- vldmia sp!, {q4} +-#else +- vpop {q5-q8} +- vpop {q4} +-#endif +- cmp r2, #32 +- bge neon_copy_32_u +- b neon_copy_finish_u +-neon_copy_32_u: +-#if defined __GNUC__ && (4 == __GNUC__ && 1 == __GNUC_MINOR__ && 1 == __GNUC_PATCHLEVEL__) +- vstmdb sp!, {q4} +-#else +- vpush {q4} +-#endif +- vdup.u32 q4, r8 +- mov r12, r2, lsr #5 +- and r2, r2, #0x1f +-neon_copy_32_u_loop: +- vld1.32 {q0, q1}, [r1]! +- lsls r5, r8, #28 +- bcc neon_copy_32_u_b8 +- bpl neon_copy_32_u_b16 +- vshr.u64 q2, q0, #40 +- vshr.u64 q3, q1, #40 +- b neon_copy_32_unify +-neon_copy_32_u_b8: +- vshr.u64 q2, q0, #56 +- vshr.u64 q3, q1, #56 +- b neon_copy_32_unify +-neon_copy_32_u_b16: +- vshr.u64 q2, q0, #48 +- vshr.u64 q3, q1, #48 +-neon_copy_32_unify: +-#if defined __GNUC__ && (4 == __GNUC__ && 1 == __GNUC_MINOR__ && 1 == __GNUC_PATCHLEVEL__) +- vshl.u64 q0, q4, q0 +- vshl.u64 q1, q4, q1 +-#else +- vshl.u64 q0, q0, q4 +- vshl.u64 q1, q1, q4 +-#endif +- vmov r5, s14 +- vorr d1, d1, d4 +- vmov s14, r4 +- vorr d2, d2, d5 +- vorr d3, d3, d6 +- vorr d0, d0, d7 +- subs r12, r12, #1 +- pld [r1, #0] +- mov r4, r5 +- vst1.32 {q0, q1}, [r0]! +- bne neon_copy_32_u_loop +-#if defined __GNUC__ && (4 == __GNUC__ && 1 == __GNUC_MINOR__ && 1 == __GNUC_PATCHLEVEL__) +- vldmia sp!, {q4} +-#else +- vpop {q4} +-#endif +-neon_copy_finish_u: +-neon_copy_16_u: +- movs r12, r2, lsr #4 +- beq neon_copy_8_u +- vdup.u32 q2, r8 +- and r2, r2, #0xf +-neon_copy_16_u_loop: +- vld1.32 {q0}, [r1]! +- lsls r5, r8, #28 +- bcc neon_copy_16_u_b8 +- bpl neon_copy_16_u_b16 +- vshr.u64 q1, q0, #40 +- b neon_copy_16_unify +-neon_copy_16_u_b8: +- vshr.u64 q1, q0, #56 +- b neon_copy_16_unify +-neon_copy_16_u_b16: +- vshr.u64 q1, q0, #48 +-neon_copy_16_unify: +-#if defined __GNUC__ && (4 == __GNUC__ && 1 == __GNUC_MINOR__ && 1 == __GNUC_PATCHLEVEL__) +- vshl.u64 q0, q2, q0 +-#else +- vshl.u64 q0, q0, q2 +-#endif +- vmov r5, s6 +- vorr d1, d1, d2 +- vmov s6, r4 +- vorr d0, d0, d3 +- subs r12, r12, #1 +- mov r4, r5 +- vst1.32 {q0}, [r0]! +- bne neon_copy_16_u_loop +-neon_copy_8_u: +- cmp r2, #8 +- blt neon_copy_4_u +- ldm r1!, {r6-r7} +- subs r2, r2, #8 +- orr r4, r4, r6, lsl r8 +- mov r5, r6, lsr r9 +- orr r5, r5, r7, lsl r8 +- stm r0!, {r4-r5} +- mov r4, r7, lsr r9 +-neon_copy_4_u: +- cmp r2, #4 +- blt neon_copy_last_bits_u +- ldr r5, [r1], #4 +- subs r2, r2, #4 +- orr r4, r4, r5, lsl r8 +- str r4, [r0], #4 +- mov r4, r5, lsr r9 +-neon_copy_last_bits_u: +- /* +- * Remember, r8 contains the size of the data in r4 in bits, +- * so to get to bytes we'll need to shift 3 places +- */ +- lsr r8, r8, #0x3 +- /* Write out the bytes stored in r4.*/ +-neon_copy_last_bits_u_loop: +- strb r4, [r0], #1 +- subs r8, r8, #1 +- lsrne r4, r4, #8 +- bne neon_copy_last_bits_u_loop +-#if defined __GNUC__ && (4 == __GNUC__ && 1 == __GNUC_MINOR__ && 1 == __GNUC_PATCHLEVEL__) +- ldmia sp!, {r6-r9} +-#else +- pop {r6-r9} +-#endif +-neon_copy_finish: +- cmp r2, #0 +- beq neon_end +- /* +- * This just copies the data from source to target one byte +- * at a time. For some small values, this makes more sense. +- * Note that since this code copies data a byte at a time, +- * both the aligned and unaligned paths can use it. +- */ +-neon_copy_finish_loop: +- ldrb r4, [r1], #1 +- subs r2, r2, #1 +- strb r4, [r0], #1 +- bne neon_copy_finish_loop +-neon_end: +-#if defined __GNUC__ && (4 == __GNUC__ && 1 == __GNUC_MINOR__ && 1 == __GNUC_PATCHLEVEL__) +- ldmia sp!, {r4-r5} +- ldmia sp!, {r0} +-#else +- pop {r4-r5} +- pop {r0} +-#endif +- bx lr +- +- .endfunc +- .end +diff --git git/src/neon_memmove.S git/src/neon_memmove.S +deleted file mode 100644 +index 1bfe597..0000000 +--- git/src/neon_memmove.S ++++ /dev/null +@@ -1,939 +0,0 @@ +-/*************************************************************************** +- Copyright (c) 2009, Code Aurora Forum. All rights reserved. +- +- Redistribution and use in source and binary forms, with or without +- modification, are permitted provided that the following conditions are met: +- * Redistributions of source code must retain the above copyright +- notice, this list of conditions and the following disclaimer. +- * Redistributions in binary form must reproduce the above copyright +- notice, this list of conditions and the following disclaimer in the +- documentation and/or other materials provided with the distribution. +- * Neither the name of Code Aurora nor the names of its contributors may +- be used to endorse or promote products derived from this software +- without specific prior written permission. +- +- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE +- LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +- INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +- CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +- ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +- POSSIBILITY OF SUCH DAMAGE. +- ***************************************************************************/ +- +-/*************************************************************************** +- * Neon memmove: Attempts to do a memmove with Neon registers if possible, +- * Inputs: +- * dest: The destination buffer +- * src: The source buffer +- * n: The size of the buffer to transfer +- * Outputs: +- * +- ***************************************************************************/ +- +-/* +- * General note: +- * The original code that was compiled for rvct used PUSH/POP and VPUSH/VPOP +- * However, it looks like the 2006 CodeSourcery Assembler has issues generating +- * the correct object code for VPOP, resulting in horrific stack crashes. +- * As a result, I've temporarily move PUSH->STMDB, POP->LDMIA, VPUSH->VSTMDB, +- * and VPOP->VLDMIA. We can revert this back once we update our toolchain. +- * +- * Also, VSHL swaps the source register and the shift-amount register +- * around in 2006-q3. I've coded this incorrectly so it turns out correct +- * in the object code, but we'll need to undo that later... +- */ +- .code 32 +- .align 4 +- .globl neon_memmove +- .func +- +-neon_memmove: +-#if defined __GNUC__ && (4 == __GNUC__ && 1 == __GNUC_MINOR__ && 1 == __GNUC_PATCHLEVEL__) +- stmdb sp!, {r0} +-#else +- push {r0} +-#endif +- +- /* +- * The requirements for memmove state that the function should +- * operate as if data were being copied from the source to a +- * buffer, then to the destination. This is to allow a user +- * to copy data from a source and target that overlap. +- * +- * We can't just do byte copies front-to-back automatically, since +- * there's a good chance we may have an overlap (why else would someone +- * intentionally use memmove then?). +- * +- * We'll break this into two parts. Front-to-back, or back-to-front +- * copies. +- */ +-neon_memmove_cmf: +- cmp r0, r1 +- blt neon_front_to_back_copy +- bgt neon_back_to_front_copy +- b neon_memmove_done +- +- /* ############################################################# +- * Front to Back copy +- */ +-neon_front_to_back_copy: +- /* +- * For small copies, just do a quick memcpy. We can do this for +- * front-to-back copies, aligned or unaligned, since we're only +- * doing 1 byte at a time... +- */ +- cmp r2, #4 +- bgt neon_f2b_gt4 +- cmp r2, #0 +-neon_f2b_smallcopy_loop: +- beq neon_memmove_done +- ldrb r12, [r1], #1 +- subs r2, r2, #1 +- strb r12, [r0], #1 +- b neon_f2b_smallcopy_loop +-neon_f2b_gt4: +- /* Preload what we can...*/ +- pld [r0,#0] +- pld [r1,#0] +- /* The window size is in r3. */ +- sub r3, r1, r0 +-#if defined __GNUC__ && (4 == __GNUC__ && 1 == __GNUC_MINOR__ && 1 == __GNUC_PATCHLEVEL__) +- stmdb sp!, {r4-r6} +-#else +- push {r4-r6} +-#endif +- +-neon_f2b_check_align: +- /* Check alignment. */ +- ands r12, r0, #0x3 +- beq neon_f2b_source_align_check +- cmp r12, #2 +- ldrb r4, [r1], #1 +- ldrleb r5, [r1], #1 +- ldrltb r6, [r1], #1 +- rsb r12, r12, #4 +- sub r2, r2, r12 +- strb r4, [r0], #1 +- strleb r5, [r0], #1 +- strltb r6, [r0], #1 +- +-neon_f2b_source_align_check: +- ands r12, r1, #0x3 +- bne neon_f2b_nonaligned +- +-neon_f2b_try_16_align: +- /* If we're >64, attempt to align on 16-bytes. Smaller amounts +- * don't seem to be worth handling. */ +- cmp r2, #64 +- blt neon_f2b_align_route +- /* This is where we try 16-byte alignment. */ +- ands r12, r0, #0xf +- beq neon_f2b_align_route +- rsb r12, r12, #16 +-neon_f2b_16_start: +- sub r2, r2, r12 +- lsrs r5, r12, #2 +-neon_f2b_align_16_4: +- ldr r4, [r1], #4 +- subs r5, r5, #1 +- str r4, [r0], #4 +- bne neon_f2b_align_16_4 +-neon_f2b_align_route: +- /* ############################################################# +- * Front to Back copy - aligned +- */ +- /* +- * Note that we can't just route based on the size in r2. If that's +- * larger than the overlap window in r3, we could potentially +- * (and likely!) destroy data we're copying. +- */ +- cmp r2, r3 +- movle r12, r2 +- movgt r12, r3 +- cmp r12, #256 +- bge neon_f2b_copy_128_a +- cmp r12, #64 +- bge neon_f2b_copy_32_a +- cmp r12, #16 +- bge neon_f2b_copy_16_a +- cmp r12, #8 +- bge neon_f2b_copy_8_a +- cmp r12, #4 +- bge neon_f2b_copy_4_a +- b neon_f2b_copy_1_a +-neon_f2b_copy_128_a: +-#if defined __GNUC__ && (4 == __GNUC__ && 1 == __GNUC_MINOR__ && 1 == __GNUC_PATCHLEVEL__) +- vstmdb sp!, {q4-q7} +-#else +- vpush {q4-q7} +-#endif +- mov r12, r2, lsr #7 +-neon_f2b_copy_128_a_loop: +- vld1.32 {q0,q1}, [r1]! +- vld1.32 {q2,q3}, [r1]! +- vld1.32 {q4,q5}, [r1]! +- vld1.32 {q6,q7}, [r1]! +- pld [r1, #0] +- pld [r1, #128] +- vst1.32 {q0,q1}, [r0]! +- vst1.32 {q2,q3}, [r0]! +- vst1.32 {q4,q5}, [r0]! +- vst1.32 {q6,q7}, [r0]! +- subs r12, r12, #1 +- pld [r0, #0] +- pld [r0, #128] +- bne neon_f2b_copy_128_a_loop +-#if defined __GNUC__ && (4 == __GNUC__ && 1 == __GNUC_MINOR__ && 1 == __GNUC_PATCHLEVEL__) +- vldmia sp!, {q4-q7} +-#else +- vpop {q4-q7} +-#endif +- ands r2, r2, #0x7f +- beq neon_f2b_finish +- cmp r2, #32 +- bge neon_f2b_copy_32_a +- b neon_f2b_copy_finish_a +-neon_f2b_copy_32_a: +- mov r12, r2, lsr #5 +-neon_f2b_copy_32_a_loop: +- vld1.32 {q0,q1}, [r1]! +- subs r12, r12, #1 +- pld [r1, #0] +- vst1.32 {q0,q1}, [r0]! +- bne neon_f2b_copy_32_a_loop +- ands r2, r2, #0x1f +- beq neon_f2b_finish +-neon_f2b_copy_finish_a: +-neon_f2b_copy_16_a: +- movs r12, r2, lsr #4 +- beq neon_f2b_copy_8_a +-neon_f2b_copy_16_a_loop: +- vld1.32 {q0}, [r1]! +- subs r12, r12, #1 +- vst1.32 {q0}, [r0]! +- bne neon_f2b_copy_16_a_loop +- ands r2, r2, #0xf +- beq neon_f2b_finish +-neon_f2b_copy_8_a: +- cmp r2, #8 +- blt neon_f2b_copy_4_a +- ldm r1!, {r4-r5} +- subs r2, r2, #8 +- stm r0!, {r4-r5} +-neon_f2b_copy_4_a: +- cmp r2, #4 +- blt neon_f2b_copy_1_a +- ldr r4, [r1], #4 +- subs r2, r2, #4 +- str r4, [r0], #4 +-neon_f2b_copy_1_a: +- cmp r2, #0 +- beq neon_f2b_finish +-neon_f2b_copy_1_a_loop: +- ldrb r12, [r1], #1 +- subs r2, r2, #1 +- strb r12, [r0], #1 +- bne neon_f2b_copy_1_a_loop +- b neon_f2b_finish +- +- /* ############################################################# +- * Front to Back copy - unaligned +- */ +-neon_f2b_nonaligned: +- /* +- * For sizes < 8, does it really make sense to do the whole shift +- * party? Note that we DON'T want to call neon_f2b_copy_1_u, +- * since we'll end up trying to pop r8-r11, and we DON'T want +- * to do that... +- */ +- cmp r2, #8 +- ble neon_f2b_copy_1_a +- +-#if defined __GNUC__ && (4 == __GNUC__ && 1 == __GNUC_MINOR__ && 1 == __GNUC_PATCHLEVEL__) +- stmdb sp!, {r7-r9} +-#else +- push {r7-r9} +-#endif +- cmp r12, #2 +- ldrb r4, [r1], #1 +- ldrleb r5, [r1], #1 +- ldrltb r6, [r1], #1 +- rsb r8, r12, #4 +- sub r2, r2, r8 +- lsl r8, r8, #3 +- orrle r4, r4, r5, lsl #8 +- orrlt r4, r4, r6, lsl #16 +- rsb r9, r8, #32 +- /* +- * r4 = overflow bits +- * r8 = # of bits we copied into the r4 register to align source. +- * r9 = 32 - r8 +- * r12 = Index counter for each size, so we determine how many times +- * the given size will go into r2, then count down that # of +- * times in r12. +- */ +- cmp r2, #64 +- blt neon_f2b_unaligned_route +- ands r12, r0, #0xf +- beq neon_f2b_unaligned_route +- cmp r3, #4 +- blt neon_f2b_unaligned_route +- rsb r12, r12, #16 +-neon_f2b_16_start_u: +- sub r2, r2, r12 +- lsrs r6, r12, #2 +-neon_f2b_align_16_4_u: +- ldr r5, [r1], #4 +- subs r6, r6, #1 +- orr r4, r4, r5, lsl r8 +- str r4, [r0], #4 +- mov r4, r5, lsr r9 +- bne neon_f2b_align_16_4_u +-neon_f2b_unaligned_route: +- cmp r2, r3 +- movle r12, r2 +- movgt r12, r3 +- cmp r12, #256 +- bge neon_f2b_copy_64_u +- cmp r12, #64 +- bge neon_f2b_copy_32_u +- cmp r12, #16 +- bge neon_f2b_copy_16_u +- cmp r12, #8 +- bge neon_f2b_copy_8_u +- cmp r12, #4 +- bge neon_f2b_copy_4_u +- b neon_f2b_last_bits_u +-neon_f2b_copy_64_u: +-#if defined __GNUC__ && (4 == __GNUC__ && 1 == __GNUC_MINOR__ && 1 == __GNUC_PATCHLEVEL__) +- vstmdb sp!, {q4} +- vstmdb sp!, {q5-q8} +-#else +- vpush {q4} +- vpush {q5-q8} +-#endif +- vdup.u32 q8, r8 +- mov r12, r2, lsr #6 +- and r2, r2, #0x3f +-neon_f2b_copy_64_u_loop: +- vld1.32 {q4, q5}, [r1]! +- vld1.32 {q6, q7}, [r1]! +- lsls r5, r8, #28 +- bcc neon_f2b_copy_64_u_b8 +- bpl neon_f2b_copy_64_u_b16 +- vshr.u64 q0, q4, #40 +- vshr.u64 q1, q5, #40 +- vshr.u64 q2, q6, #40 +- vshr.u64 q3, q7, #40 +- b neon_f2b_copy_64_unify +-neon_f2b_copy_64_u_b8: +- vshr.u64 q0, q4, #56 +- vshr.u64 q1, q5, #56 +- vshr.u64 q2, q6, #56 +- vshr.u64 q3, q7, #56 +- b neon_f2b_copy_64_unify +-neon_f2b_copy_64_u_b16: +- vshr.u64 q0, q4, #48 +- vshr.u64 q1, q5, #48 +- vshr.u64 q2, q6, #48 +- vshr.u64 q3, q7, #48 +-neon_f2b_copy_64_unify: +-#if defined __GNUC__ && (4 == __GNUC__ && 1 == __GNUC_MINOR__ && 1 == __GNUC_PATCHLEVEL__) +- vshl.u64 q4, q8, q4 +- vshl.u64 q5, q8, q5 +- vshl.u64 q6, q8, q6 +- vshl.u64 q7, q8, q7 +-#else +- vshl.u64 q4, q4, q8 +- vshl.u64 q5, q5, q8 +- vshl.u64 q6, q6, q8 +- vshl.u64 q7, q7, q8 +-#endif +- vmov r5, s14 +- vorr d9, d9, d0 +- vmov s14, r4 +- vorr d10, d10, d1 +- vorr d11, d11, d2 +- vorr d12, d12, d3 +- vorr d13, d13, d4 +- vorr d14, d14, d5 +- vorr d15, d15, d6 +- vorr d8, d8, d7 +- subs r12, r12, #1 +- pld [r1, #0] +- pld [r1, #128] +- mov r4, r5 +- vst1.32 {q4, q5}, [r0]! +- vst1.32 {q6, q7}, [r0]! +- pld [r0, #0] +- pld [r0, #128] +- bne neon_f2b_copy_64_u_loop +-#if defined __GNUC__ && (4 == __GNUC__ && 1 == __GNUC_MINOR__ && 1 == __GNUC_PATCHLEVEL__) +- vldmia sp!, {q5-q8} +- vldmia sp!, {q4} +-#else +- vpop {q5-q8} +- vpop {q4} +-#endif +- cmp r2, #32 +- bge neon_f2b_copy_32_u +- b neon_f2b_copy_finish_u +-neon_f2b_copy_32_u: +-#if defined __GNUC__ && (4 == __GNUC__ && 1 == __GNUC_MINOR__ && 1 == __GNUC_PATCHLEVEL__) +- vstmdb sp!, {q4} +-#else +- vpush {q4} +-#endif +- vdup.u32 q4, r8 +- mov r12, r2, lsr #5 +- and r2, r2, #0x1f +-neon_f2b_copy_32_u_loop: +- vld1.32 {q0, q1}, [r1]! +- lsls r5, r8, #28 +- bcc neon_f2b_copy_32_u_b8 +- bpl neon_f2b_copy_32_u_b16 +- vshr.u64 q2, q0, #40 +- vshr.u64 q3, q1, #40 +- b neon_f2b_copy_32_unify +-neon_f2b_copy_32_u_b8: +- vshr.u64 q2, q0, #56 +- vshr.u64 q3, q1, #56 +- b neon_f2b_copy_32_unify +-neon_f2b_copy_32_u_b16: +- vshr.u64 q2, q0, #48 +- vshr.u64 q3, q1, #48 +-neon_f2b_copy_32_unify: +-#if defined __GNUC__ && (4 == __GNUC__ && 1 == __GNUC_MINOR__ && 1 == __GNUC_PATCHLEVEL__) +- vshl.u64 q0, q4, q0 +- vshl.u64 q1, q4, q1 +-#else +- vshl.u64 q0, q0, q4 +- vshl.u64 q1, q1, q4 +-#endif +- vmov r5, s14 +- vorr d1, d1, d4 +- vmov s14, r4 +- vorr d2, d2, d5 +- vorr d3, d3, d6 +- vorr d0, d0, d7 +- subs r12, r12, #1 +- pld [r1, #0] +- mov r4, r5 +- vst1.32 {q0, q1}, [r0]! +- bne neon_f2b_copy_32_u_loop +-#if defined __GNUC__ && (4 == __GNUC__ && 1 == __GNUC_MINOR__ && 1 == __GNUC_PATCHLEVEL__) +- vldmia sp!, {q4} +-#else +- vpop {q4} +-#endif +-neon_f2b_copy_finish_u: +-neon_f2b_copy_16_u: +- movs r12, r2, lsr #4 +- beq neon_f2b_copy_8_u +- vdup.u32 q2, r8 +- and r2, r2, #0xf +-neon_f2b_copy_16_u_loop: +- vld1.32 {q0}, [r1]! +- lsls r5, r8, #28 +- bcc neon_f2b_copy_16_u_b8 +- bpl neon_f2b_copy_16_u_b16 +- vshr.u64 q1, q0, #40 +- b neon_f2b_copy_16_unify +-neon_f2b_copy_16_u_b8: +- vshr.u64 q1, q0, #56 +- b neon_f2b_copy_16_unify +-neon_f2b_copy_16_u_b16: +- vshr.u64 q1, q0, #48 +-neon_f2b_copy_16_unify: +-#if defined __GNUC__ && (4 == __GNUC__ && 1 == __GNUC_MINOR__ && 1 == __GNUC_PATCHLEVEL__) +- vshl.u64 q0, q2, q0 +-#else +- vshl.u64 q0, q0, q2 +-#endif +- vmov r5, s6 +- vorr d1, d1, d2 +- vmov s6, r4 +- vorr d0, d0, d3 +- subs r12, r12, #1 +- mov r4, r5 +- vst1.32 {q0}, [r0]! +- bne neon_f2b_copy_16_u_loop +-neon_f2b_copy_8_u: +- cmp r2, #8 +- blt neon_f2b_copy_4_u +- ldm r1!, {r6-r7} +- subs r2, r2, #8 +- orr r4, r4, r6, lsl r8 +- mov r5, r6, lsr r9 +- orr r5, r5, r7, lsl r8 +- stm r0!, {r4-r5} +- mov r4, r7, lsr r9 +-neon_f2b_copy_4_u: +- cmp r2, #4 +- blt neon_f2b_last_bits_u +- ldr r5, [r1], #4 +- subs r2, r2, #4 +- orr r4, r4, r5, lsl r8 +- str r4, [r0], #4 +- mov r4, r5, lsr r9 +-neon_f2b_last_bits_u: +- lsr r8, r8, #0x3 +-neon_f2b_last_bits_u_loop: +- strb r4, [r0], #1 +- subs r8, r8, #1 +- lsr r4, r4, #8 +- bne neon_f2b_last_bits_u_loop +-neon_f2b_copy_1_u: +- cmp r2, #0 +- beq neon_f2b_finish_u +-neon_f2b_copy_1_u_loop: +- ldrb r12, [r1], #1 +- subs r2, r2, #1 +- strb r12, [r0], #1 +- bne neon_f2b_copy_1_u_loop +-neon_f2b_finish_u: +-#if defined __GNUC__ && (4 == __GNUC__ && 1 == __GNUC_MINOR__ && 1 == __GNUC_PATCHLEVEL__) +- ldmia sp!, {r7-r9} +-#else +- pop {r7-r9} +-#endif +- /* ############################################################# +- * Front to Back copy - finish +- */ +-neon_f2b_finish: +-#if defined __GNUC__ && (4 == __GNUC__ && 1 == __GNUC_MINOR__ && 1 == __GNUC_PATCHLEVEL__) +- ldmia sp!, {r4-r6} +-#else +- pop {r4-r6} +-#endif +- b neon_memmove_done +- +- /* ############################################################# +- * Back to Front copy +- */ +-neon_back_to_front_copy: +- /* +- * Here, we'll want to shift to the end of the buffers. This +- * actually points us one past where we need to go, but since +- * we'll pre-decrement throughout, this will be fine. +- */ +- add r0, r0, r2 +- add r1, r1, r2 +- cmp r2, #4 +- bgt neon_b2f_gt4 +- cmp r2, #0 +-neon_b2f_smallcopy_loop: +- beq neon_memmove_done +- ldrb r12, [r1, #-1]! +- subs r2, r2, #1 +- strb r12, [r0, #-1]! +- b neon_b2f_smallcopy_loop +-neon_b2f_gt4: +- pld [r0, #0] +- pld [r1, #0] +- /* +- * The minimum of the overlap window size and the copy size +- * is in r3. +- */ +- sub r3, r0, r1 +-#if defined __GNUC__ && (4 == __GNUC__ && 1 == __GNUC_MINOR__ && 1 == __GNUC_PATCHLEVEL__) +- stmdb sp!, {r4-r5} +-#else +- push {r4-r5} +-#endif +- +- /* +- * Check alignment. Since we'll pre-decrement as we step thru, we'll +- * need to make sure we're on word-alignment. +- */ +-neon_b2f_check_align: +- ands r12, r0, #0x3 +- beq neon_b2f_source_align_check +- sub r2, r2, r12 +-neon_b2f_shift_align: +- ldrb r4, [r1, #-1]! +- subs r12, r12, #1 +- strb r4, [r0, #-1]! +- bne neon_b2f_shift_align +-neon_b2f_source_align_check: +- ands r4, r1, #0x3 +- bne neon_b2f_nonaligned +- +-neon_b2f_try_16_align: +- /* If we're >64, attempt to align on 16-bytes. Smaller amounts +- * don't seem to be worth handling. */ +- cmp r2, #64 +- blt neon_b2f_align_route +- ands r12, r0, #0xf +- beq neon_b2f_align_route +- /* In this case, r12 has the number of bytes to roll backward. */ +-neon_b2f_16_start: +- sub r2, r2, r12 +- lsrs r5, r12, #2 +-neon_b2f_align_16_4: +- ldr r4, [r1, #-4]! +- subs r5, r5, #1 +- str r4, [r0, #-4]! +- bne neon_b2f_align_16_4 +-neon_b2f_align_route: +- /* +- * ############################################################# +- * Back to Front copy - aligned +- */ +- cmp r2, r3 +- movle r12, r2 +- movgt r12, r3 +- cmp r12, #256 +- bge neon_b2f_copy_128_a +- cmp r12, #64 +- bge neon_b2f_copy_32_a +- cmp r12, #8 +- bge neon_b2f_copy_8_a +- cmp r12, #4 +- bge neon_b2f_copy_4_a +- b neon_b2f_copy_1_a +-neon_b2f_copy_128_a: +-#if defined __GNUC__ && (4 == __GNUC__ && 1 == __GNUC_MINOR__ && 1 == __GNUC_PATCHLEVEL__) +- vstmdb sp!, {q4-q7} +-#else +- vpush {q4-q7} +-#endif +- movs r12, r2, lsr #7 +- /* +- * This irks me. There MUST be a better way to read these in and +- * scan the register backward instead of making it go forward. Then +- * we need to do two subtractions... +- */ +-neon_b2f_copy_128_a_loop: +- sub r1, r1, #128 +- sub r0, r0, #128 +- vld1.32 {q0, q1}, [r1]! +- vld1.32 {q2, q3}, [r1]! +- vld1.32 {q4, q5}, [r1]! +- vld1.32 {q6, q7}, [r1]! +- pld [r1, #-128] +- pld [r1, #-256] +- vst1.32 {q0, q1}, [r0]! +- vst1.32 {q2, q3}, [r0]! +- vst1.32 {q4, q5}, [r0]! +- vst1.32 {q6, q7}, [r0]! +- subs r12, r12, #1 +- pld [r0, #-128] +- pld [r0, #-256] +- sub r1, r1, #128 +- sub r0, r0, #128 +- bne neon_b2f_copy_128_a_loop +-#if defined __GNUC__ && (4 == __GNUC__ && 1 == __GNUC_MINOR__ && 1 == __GNUC_PATCHLEVEL__) +- vldmia sp!, {q4-q7} +-#else +- vpop {q4-q7} +-#endif +- ands r2, r2, #0x7f +- beq neon_b2f_finish +- cmp r2, #32 +- bge neon_b2f_copy_32_a +- b neon_b2f_copy_finish_a +-neon_b2f_copy_32_a: +- mov r12, r2, lsr #5 +-neon_b2f_copy_32_a_loop: +- sub r1, r1, #32 +- sub r0, r0, #32 +- vld1.32 {q0,q1}, [r1] +- subs r12, r12, #1 +- vst1.32 {q0,q1}, [r0] +- pld [r1, #0] +- bne neon_b2f_copy_32_a_loop +- ands r2, r2, #0x1f +- beq neon_b2f_finish +-neon_b2f_copy_finish_a: +-neon_b2f_copy_8_a: +- movs r12, r2, lsr #0x3 +- beq neon_b2f_copy_4_a +-neon_b2f_copy_8_a_loop: +- ldmdb r1!, {r4-r5} +- subs r12, r12, #1 +- stmdb r0!, {r4-r5} +- bne neon_b2f_copy_8_a_loop +- and r2, r2, #0x7 +-neon_b2f_copy_4_a: +- movs r12, r2, lsr #0x2 +- beq neon_b2f_copy_1_a +- and r2, r2, #0x3 +-neon_b2f_copy_4_a_loop: +- ldr r4, [r1, #-4]! +- subs r12, r12, #1 +- str r4, [r0, #-4]! +- bne neon_b2f_copy_4_a_loop +-neon_b2f_copy_1_a: +- cmp r2, #0 +- beq neon_b2f_finish +-neon_b2f_copy_1_a_loop: +- ldrb r12, [r1, #-1]! +- subs r2, r2, #1 +- strb r12, [r0, #-1]! +- bne neon_b2f_copy_1_a_loop +- +- /* ############################################################# +- * Back to Front copy - unaligned +- */ +-neon_b2f_nonaligned: +- /* +- * For sizes < 8, does it really make sense to do the whole shift +- * party? +- */ +- cmp r2, #8 +- ble neon_b2f_copy_1_a +-#if defined __GNUC__ && (4 == __GNUC__ && 1 == __GNUC_MINOR__ && 1 == __GNUC_PATCHLEVEL__) +- stmdb sp!, {r6-r11} +-#else +- push {r6-r11} +-#endif +- /* +- * r3 = max window size +- * r4 = overflow bytes +- * r5 = bytes we're reading into +- * r6 = # bytes we're off. +- * r10 = copy of r6 +- */ +- and r6, r1, #0x3 +- eor r4, r4, r4 +- mov r10, r6 +-neon_b2f_realign: +- ldrb r5, [r1, #-1]! +- subs r6, r6, #1 +- orr r4, r5, r4, lsl #8 +- bne neon_b2f_realign +- /* +- * r10 = # of bits we copied into the r4 register to align source. +- * r11 = 32 - r10 +- * r12 = Index counter for each size, so we determine how many times +- * the given size will go into r2, then count down that # of +- * times in r12. +- */ +- sub r2, r2, r10 +- lsl r10, r10, #0x3 +- rsb r11, r10, #32 +- +- cmp r2, r3 +- movle r12, r2 +- movgt r12, r3 +- cmp r12, #256 +- bge neon_b2f_copy_64_u +- cmp r12, #64 +- bge neon_b2f_copy_32_u +- cmp r12, #8 +- bge neon_b2f_copy_8_u +- cmp r12, #4 +- bge neon_b2f_copy_4_u +- b neon_b2f_last_bits_u +-neon_b2f_copy_64_u: +-#if defined __GNUC__ && (4 == __GNUC__ && 1 == __GNUC_MINOR__ && 1 == __GNUC_PATCHLEVEL__) +- vstmdb sp!, {q4,q5} +- vstmdb sp!, {q6-q8} +-#else +- vpush {q4,q5} +- vpush {q6-q8} +-#endif +- add r7, r11, #32 +- movs r12, r2, lsr #6 +- vdup.u32 q8, r7 +-neon_b2f_copy_64_u_loop: +- sub r1, r1, #64 +- sub r0, r0, #64 +- vld1.32 {q0, q1}, [r1]! +- vld1.32 {q2, q3}, [r1] +- sub r1, r1, #32 +- vmov q4, q0 +- vmov q5, q1 +- vmov q6, q2 +- vmov q7, q3 +- vmov r5, s0 +- mov r4, r4, lsl r11 +- lsls r6, r10, #28 +- bcc neon_b2f_copy_64_u_b8 +- bpl neon_b2f_copy_64_u_b16 +- vshr.u64 q0, q0, #24 +- vshr.u64 q1, q1, #24 +- vshr.u64 q2, q2, #24 +- vshr.u64 q3, q3, #24 +- b neon_b2f_copy_64_unify +-neon_b2f_copy_64_u_b8: +- vshr.u64 q0, q0, #8 +- vshr.u64 q1, q1, #8 +- vshr.u64 q2, q2, #8 +- vshr.u64 q3, q3, #8 +- b neon_b2f_copy_64_unify +-neon_b2f_copy_64_u_b16: +- vshr.u64 q0, q0, #16 +- vshr.u64 q1, q1, #16 +- vshr.u64 q2, q2, #16 +- vshr.u64 q3, q3, #16 +-neon_b2f_copy_64_unify: +-#if defined __GNUC__ && (4 == __GNUC__ && 1 == __GNUC_MINOR__ && 1 == __GNUC_PATCHLEVEL__) +- vshl.u64 q4, q8, q4 +- vshl.u64 q5, q8, q5 +- vshl.u64 q6, q8, q6 +- vshl.u64 q7, q8, q7 +-#else +- vshl.u64 q4, q4, q8 +- vshl.u64 q5, q5, q8 +- vshl.u64 q6, q6, q8 +- vshl.u64 q7, q7, q8 +-#endif +- vmov s17, r4 +- vorr d7, d7, d8 +- vorr d6, d6, d15 +- vorr d5, d5, d14 +- vorr d4, d4, d13 +- vorr d3, d3, d12 +- vorr d2, d2, d11 +- vorr d1, d1, d10 +- vorr d0, d0, d9 +- mov r4, r5, lsl r11 +- subs r12, r12, #1 +- lsr r4, r4, r11 +- vst1.32 {q0, q1}, [r0]! +- vst1.32 {q2, q3}, [r0] +- pld [r1, #0] +- sub r0, r0, #32 +- bne neon_b2f_copy_64_u_loop +-#if defined __GNUC__ && (4 == __GNUC__ && 1 == __GNUC_MINOR__ && 1 == __GNUC_PATCHLEVEL__) +- vldmia sp!, {q6-q8} +- vldmia sp!, {q4,q5} +-#else +- vpop {q6-q8} +- vpop {q4,q5} +-#endif +- ands r2, r2, #0x3f +- cmp r2, #32 +- bge neon_b2f_copy_32_u +- b neon_b2f_copy_finish_u +-neon_b2f_copy_32_u: +-#if defined __GNUC__ && (4 == __GNUC__ && 1 == __GNUC_MINOR__ && 1 == __GNUC_PATCHLEVEL__) +- vstmdb sp!, {q4} +-#else +- vpush {q4} +-#endif +- add r7, r11, #32 +- movs r12, r2, lsr #5 +- vdup.u32 q4, r7 +- and r2, r2, #0x1f +-neon_b2f_copy_32_u_loop: +- sub r1, r1, #32 +- sub r0, r0, #32 +- vld1.32 {q0, q1}, [r1] +- vmov q2, q0 +- vmov q3, q1 +- vmov r5, s0 +- mov r4, r4, lsl r11 +- lsls r6, r10, #28 +- bcc neon_b2f_copy_32_u_b8 +- bpl neon_b2f_copy_32_u_b16 +- vshr.u64 q0, q0, #24 +- vshr.u64 q1, q1, #24 +- b neon_b2f_copy_32_unify +-neon_b2f_copy_32_u_b8: +- vshr.u64 q0, q0, #8 +- vshr.u64 q1, q1, #8 +- b neon_b2f_copy_32_unify +-neon_b2f_copy_32_u_b16: +- vshr.u64 q0, q0, #16 +- vshr.u64 q1, q1, #16 +-neon_b2f_copy_32_unify: +-#if defined __GNUC__ && (4 == __GNUC__ && 1 == __GNUC_MINOR__ && 1 == __GNUC_PATCHLEVEL__) +- vshl.u64 q2, q4, q2 +- vshl.u64 q3, q4, q3 +-#else +- vshl.u64 q2, q2, q4 +- vshl.u64 q3, q3, q4 +-#endif +- vmov s9, r4 +- vorr d3, d3, d4 +- vorr d2, d2, d7 +- vorr d1, d1, d6 +- vorr d0, d0, d5 +- mov r4, r5, lsl r11 +- subs r12, r12, #1 +- lsr r4, r4, r11 +- vst1.32 {q0, q1}, [r0] +- pld [r1, #0] +- bne neon_b2f_copy_32_u_loop +-#if defined __GNUC__ && (4 == __GNUC__ && 1 == __GNUC_MINOR__ && 1 == __GNUC_PATCHLEVEL__) +- vldmia sp!, {q4} +-#else +- vpop {q4} +-#endif +-neon_b2f_copy_finish_u: +-neon_b2f_copy_8_u: +- movs r12, r2, lsr #0x3 +- beq neon_b2f_copy_4_u +- mov r5, r4, lsl r11 +-neon_b2f_copy_8_u_loop: +- ldmdb r1!, {r6-r7} +- subs r12, r12, #1 +- orr r5, r5, r7, lsr r10 +- mov r4, r7, lsl r11 +- orr r4, r4, r6, lsr r10 +- stmdb r0!, {r4-r5} +- mov r4, r6, lsl r11 +- lsr r4, r4, r11 +- mov r5, r4, lsl r11 +- bne neon_b2f_copy_8_u_loop +- ands r2, r2, #0x7 +-neon_b2f_copy_4_u: +- movs r12, r2, lsr #0x2 +- beq neon_b2f_last_bits_u +- mov r5, r4, lsl r11 +-neon_b2f_copy_4_u_loop: +- ldr r6, [r1, #-4]! +- subs r12, r12, #1 +- orr r5, r5, r6, lsr r10 +- str r5, [r0, #-4]! +- mov r4, r6, lsl r11 +- lsr r4, r4, r11 +- mov r5, r4, lsl r11 +- bne neon_b2f_copy_4_u_loop +- and r2, r2, #0x3 +-neon_b2f_last_bits_u: +-neon_b2f_last_bits_u_loop: +- subs r10, r10, #8 +- mov r5, r4, lsr r10 +- strb r5, [r0, #-1]! +- bne neon_b2f_last_bits_u_loop +-neon_b2f_copy_1_u: +- cmp r2, #0 +- beq neon_b2f_finish_u +-neon_b2f_copy_1_u_loop: +- ldrb r12, [r1, #-1]! +- subs r2, r2, #1 +- strb r12, [r0, #-1]! +- bne neon_b2f_copy_1_u_loop +-neon_b2f_finish_u: +-#if defined __GNUC__ && (4 == __GNUC__ && 1 == __GNUC_MINOR__ && 1 == __GNUC_PATCHLEVEL__) +- ldmia sp!, {r6-r11} +-#else +- pop {r6-r11} +-#endif +- +-neon_b2f_finish: +-#if defined __GNUC__ && (4 == __GNUC__ && 1 == __GNUC_MINOR__ && 1 == __GNUC_PATCHLEVEL__) +- ldmia sp!, {r4-r5} +-#else +- pop {r4-r5} +-#endif +- +-neon_memmove_done: +-#if defined __GNUC__ && (4 == __GNUC__ && 1 == __GNUC_MINOR__ && 1 == __GNUC_PATCHLEVEL__) +- ldmia sp!, {r0} +-#else +- pop {r0} +-#endif +- bx lr +- +- .endfunc +- .end +diff --git git/src/neon_memsets.c git/src/neon_memsets.c +deleted file mode 100755 +index 740fc1e..0000000 +--- git/src/neon_memsets.c ++++ /dev/null +@@ -1,169 +0,0 @@ +-/* neon_memsets.c +- * +- * Copyright (c) 2009, Code Aurora Forum. All rights reserved. +- * +- * Redistribution and use in source and binary forms, with or without +- * modification, are permitted provided that the following conditions are met: +- * * Redistributions of source code must retain the above copyright +- * notice, this list of conditions and the following disclaimer. +- * * Redistributions in binary form must reproduce the above copyright +- * notice, this list of conditions and the following disclaimer in the +- * documentation and/or other materials provided with the distribution. +- * * Neither the name of Code Aurora nor +- * the names of its contributors may be used to endorse or promote +- * products derived from this software without specific prior written +- * permission. +- * +- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +- * IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +- * NON-INFRINGEMENT ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR +- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +- */ +- +-#include "msm-swblits.h" +- +-void memset16(uint16_t dst[], uint16_t value, int count) +-{ +- if (count <= 0) +- return; +- +- asm volatile( +- " pld [%[dst], #0] \n" +- " cmp %[count], #4 \n" +- " blt 6f \n" +- " tst %[dst], #0x3 \n" +- " strneh %[value], [%[dst]], #2 \n" +- " subne %[count], %[count], #1 \n" +- " vdup.u16 q8, %[value] \n" +- " vmov q9, q8 \n" +- " cmp %[count], #64 \n" +- " bge 0f \n" +- " cmp %[count], #32 \n" +- " bge 2f \n" +- " cmp %[count], #16 \n" +- " bge 3f \n" +- " cmp %[count], #8 \n" +- " bge 4f \n" +- " b 5f \n" +- "0: \n" +- " mov r12, %[count], lsr #6 \n" +- "1: \n" +- " vst1.16 {q8, q9}, [%[dst]]! \n" +- " vst1.16 {q8, q9}, [%[dst]]! \n" +- " vst1.16 {q8, q9}, [%[dst]]! \n" +- " vst1.16 {q8, q9}, [%[dst]]! \n" +- " subs r12, r12, #1 \n" +- " bne 1b \n" +- " ands %[count], %[count], #0x3f \n" +- " beq 7f \n" +- "2: \n" +- " cmp %[count], #32 \n" +- " blt 3f \n" +- " vst1.16 {q8, q9}, [%[dst]]! \n" +- " vst1.16 {q8, q9}, [%[dst]]! \n" +- " subs %[count], %[count], #32 \n" +- " beq 7f \n" +- "3: \n" +- " cmp %[count], #16 \n" +- " blt 4f \n" +- " vst1.16 {q8, q9}, [%[dst]]! \n" +- " subs %[count], %[count], #16 \n" +- " beq 7f \n" +- "4: \n" +- " cmp %[count], #8 \n" +- " blt 5f \n" +- " vst1.16 {q8}, [%[dst]]! \n" +- " subs %[count], %[count], #8 \n" +- " beq 7f \n" +- "5: \n" +- " cmp %[count], #4 \n" +- " blt 6f \n" +- " vst1.16 {d16}, [%[dst]]! \n" +- " subs %[count], %[count], #4 \n" +- " beq 7f \n" +- "6: \n" +- " cmp %[count], #0 \n" +- " blt 7f \n" +- " lsls %[count], #31 \n" +- " strmih %[value], [%[dst]], #2 \n" +- " strcsh %[value], [%[dst]], #2 \n" +- " strcsh %[value], [%[dst]], #2 \n" +- "7: \n" +- // Clobbered input registers +- : [dst] "+r" (dst), [count] "+r" (count) +- // Unclobbered input +- : [value] "r" (value) +- // Clobbered registers +- : "q8", "q9", "r12", "cc", "memory" +- ); +-} +- +-void memset32(uint32_t dst[], uint32_t value, int count) +-{ +- asm volatile( +- " pld [%[dst], #0] \n" +- " cmp %[count], #4 \n" +- " blt 5f \n" +- " vdup.u32 q8, %[value] \n" +- " vmov q9, q8 \n" +- " cmp %[count], #32 \n" +- " bge 0f \n" +- " cmp %[count], #16 \n" +- " bge 2f \n" +- " cmp %[count], #8 \n" +- " bge 3f \n" +- " b 4f \n" +- "0: \n" +- " mov r12, %[count], lsr #5 \n" +- "1: \n" +- " vst1.32 {q8, q9}, [%[dst]]! \n" +- " vst1.32 {q8, q9}, [%[dst]]! \n" +- " vst1.32 {q8, q9}, [%[dst]]! \n" +- " vst1.32 {q8, q9}, [%[dst]]! \n" +- " pld [%[dst], #0] \n" +- " subs r12, r12, #1 \n" +- " bne 1b \n" +- " ands %[count], %[count], #0x1f \n" +- " beq 6f \n" +- "2: \n" +- " cmp %[count], #16 \n" +- " blt 3f \n" +- " vst1.32 {q8, q9}, [%[dst]]! \n" +- " vst1.32 {q8, q9}, [%[dst]]! \n" +- " subs %[count], %[count], #16 \n" +- " beq 6f \n" +- "3: \n" +- " cmp %[count], #8 \n" +- " blt 4f \n" +- " vst1.32 {q8, q9}, [%[dst]]! \n" +- " subs %[count], %[count], #8 \n" +- " beq 6f \n" +- "4: \n" +- " cmp %[count], #4 \n" +- " blt 5f \n" +- " vst1.32 {q8}, [%[dst]]! \n" +- " subs %[count], %[count], #4 \n" +- " beq 6f \n" +- "5: \n" +- " cmp %[count], #0 \n" +- " beq 6f \n" +- " lsls %[count], #31 \n" +- " strmi %[value], [%[dst]], #4 \n" +- " strcs %[value], [%[dst]], #4 \n" +- " strcs %[value], [%[dst]], #4 \n" +- "6: @end \n" +- // Clobbered input registers +- : [dst] "+r" (dst), [count] "+r" (count) +- // Unclobbered input +- : [value] "r" (value) +- // Clobbered registers +- : "q8", "q9", "r12", "cc", "memory" +- ); +-} diff --git a/recipes/xorg-driver/xf86-video-msm/no_neon_flags.patch b/recipes/xorg-driver/xf86-video-msm/no_neon_flags.patch new file mode 100644 index 0000000000..97ad380e27 --- /dev/null +++ b/recipes/xorg-driver/xf86-video-msm/no_neon_flags.patch @@ -0,0 +1,36 @@ +commit 18515a56822fcd9c0a71240edce97ea5623b0448 +Author: David Lanzendörfer +Date: Wed Feb 10 16:29:55 2010 +0100 + + Modify Makefile.am + Removed depencies for neon + +diff --git git/src/Makefile.am git/src/Makefile.am +index 8ab1856..08da5a5 100755 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -12,13 +12,7 @@ MSM_DRI_SRCS += msm-drm.c msm-dri2.c + msm_drv_la_LIBADD += $(DRI2_LIBS) + endif + +-NEON_CFLAGS=-march=armv7-a -mfpu=neon -mfloat-abi=softfp +-NEON_CCASFLAGS=$(NEON_CFLAGS) -mthumb-interwork +-NEON_ASFLAGS=-k -mcpu=cortex-a8 $(NEON_CCASFLAGS) +- +-AM_CFLAGS = @XORG_CFLAGS@ @DRI_CFLAGS@ @DRI2_CFLAGS@ $(NEON_CFLAGS) -Wall -Werror +-AM_ASFLAGS = $(NEON_ASFLAGS) +-AM_CCASFLAGS = $(NEON_CCASFLAGS) ++AM_CFLAGS = @XORG_CFLAGS@ @DRI_CFLAGS@ @DRI2_CFLAGS@ -Wall -Werror + + msm_drv_la_LTLIBRARIES = msm_drv.la + msm_drv_la_LDFLAGS = -module -avoid-version +@@ -37,9 +31,6 @@ msm_drv_la_SOURCES = \ + msm-swfill.c \ + msm-hwrender.c \ + msm-pixmap.c \ +- neon_memsets.c \ +- neon_memcpy.S \ +- neon_memmove.S \ + $(MSM_DRI_SRCS) + + diff --git a/recipes/xorg-driver/xf86-video-msm/renaming_variables.patch b/recipes/xorg-driver/xf86-video-msm/renaming_variables.patch new file mode 100644 index 0000000000..90dd31f605 --- /dev/null +++ b/recipes/xorg-driver/xf86-video-msm/renaming_variables.patch @@ -0,0 +1,116 @@ +commit cc83ba5835d5b55347fd0c0775156493b0cf3a15 +Author: David Lanzendörfer +Date: Thu Feb 11 16:26:52 2010 +0100 + + Renaming variables for getting Xorg (xf86-video-msm) work + under linux-leviathan (htcdream): + cd src + sed 's/fixed_info/fix/' -i *.h + sed 's/fixed_info/fix/' -i *.c + +diff --git git/src/msm-dri.c git/src/msm-dri.c +index a51d3bd..a74368b 100644 +--- git/src/msm-dri.c ++++ git/src/msm-dri.c +@@ -151,10 +151,10 @@ MSMDRIScreenInit(ScreenPtr pScreen) + pDRIInfo->ddxDriverMinorVersion = 0; + pDRIInfo->ddxDriverPatchVersion = 0; + +- pDRIInfo->frameBufferPhysicalAddress = (void *)pMsm->fixed_info.smem_start; ++ pDRIInfo->frameBufferPhysicalAddress = (void *)pMsm->fix.smem_start; + +- pDRIInfo->frameBufferSize = pMsm->fixed_info.smem_len; +- pDRIInfo->frameBufferStride = pMsm->fixed_info.line_length; ++ pDRIInfo->frameBufferSize = pMsm->fix.smem_len; ++ pDRIInfo->frameBufferStride = pMsm->fix.line_length; + + /* FIXME: How many drawables can we do (should we do)? */ + +diff --git git/src/msm-driver.c git/src/msm-driver.c +index 803197f..15378f8 100755 +--- git/src/msm-driver.c ++++ git/src/msm-driver.c +@@ -399,7 +399,7 @@ MSMPreInit(ScrnInfoPtr pScrn, int flags) + + /* Get the fixed info (par) structure */ + +- if (ioctl(pMsm->fd, FBIOGET_FSCREENINFO, &pMsm->fixed_info)) { ++ if (ioctl(pMsm->fd, FBIOGET_FSCREENINFO, &pMsm->fix)) { + xf86DrvMsg(pScrn->scrnIndex, X_ERROR, + "Unable to read hardware info from %s: %s\n", + dev, strerror(errno)); +@@ -410,7 +410,7 @@ MSMPreInit(ScrnInfoPtr pScrn, int flags) + /* Parse the ID and figure out what version of the MDP and what + * panel ID we have */ + +- if (sscanf(pMsm->fixed_info.id, "msmfb%d_%x", &mdpver, &panelid) < 2) { ++ if (sscanf(pMsm->fix.id, "msmfb%d_%x", &mdpver, &panelid) < 2) { + + xf86DrvMsg(pScrn->scrnIndex, X_ERROR, + "Unable to determine the MDP and panel type\n"); +@@ -435,7 +435,7 @@ MSMPreInit(ScrnInfoPtr pScrn, int flags) + * the fbdev driver to allocate memory. In the mean time, we + * just reuse the framebuffer memory */ + +- pScrn->videoRam = pMsm->fixed_info.smem_len; ++ pScrn->videoRam = pMsm->fix.smem_len; + + /* Get the current screen setting */ + if (ioctl(pMsm->fd, FBIOGET_VSCREENINFO, &pMsm->mode_info)) { +@@ -671,8 +671,8 @@ MSMPreInit(ScrnInfoPtr pScrn, int flags) + /* The framebuffer driver should always report the line length, + * but in case it doesn't, we can calculate it ourselves */ + +- if (pMsm->fixed_info.line_length) { +- pScrn->displayWidth = pMsm->fixed_info.line_length; ++ if (pMsm->fix.line_length) { ++ pScrn->displayWidth = pMsm->fix.line_length; + } else { + pScrn->displayWidth = pMsm->mode_info.xres_virtual * + pMsm->mode_info.bits_per_pixel / 8; +@@ -811,7 +811,7 @@ MSMCloseScreen(int scrnIndex, ScreenPtr pScreen) + #endif + + /* Unmap the framebuffer memory */ +- munmap(pMsm->fbmem, pMsm->fixed_info.smem_len); ++ munmap(pMsm->fbmem, pMsm->fix.smem_len); + + pScreen->CloseScreen = pMsm->CloseScreen; + +@@ -857,7 +857,7 @@ MSMScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) + #endif // defined (MSMFB_GET_PAGE_PROTECTION) && defined (MSMFB_SET_PAGE_PROTECTION) + + /* Map the framebuffer memory */ +- pMsm->fbmem = mmap(NULL, pMsm->fixed_info.smem_len, ++ pMsm->fbmem = mmap(NULL, pMsm->fix.smem_len, + PROT_READ | PROT_WRITE, MAP_SHARED, pMsm->fd, 0); + + /* If we can't map the memory, then this is a short trip */ +diff --git git/src/msm-exa.c git/src/msm-exa.c +index 301923f..ce16a93 100755 +--- git/src/msm-exa.c ++++ git/src/msm-exa.c +@@ -740,8 +740,8 @@ MSMSetupExa(ScreenPtr pScreen) + pExa->flags = EXA_OFFSCREEN_PIXMAPS; + + pExa->offScreenBase = +- (pMsm->fixed_info.line_length * pMsm->mode_info.yres); +- pExa->memorySize = pMsm->fixed_info.smem_len; ++ (pMsm->fix.line_length * pMsm->mode_info.yres); ++ pExa->memorySize = pMsm->fix.smem_len; + + /* Align pixmap offsets along page boundaries */ + pExa->pixmapOffsetAlign = 4096; +diff --git git/src/msm.h git/src/msm.h +index e1e2bc7..520d390 100755 +--- git/src/msm.h ++++ git/src/msm.h +@@ -85,7 +85,7 @@ typedef struct _MSMRec + int fd; + + /* Fixed and var strutures from the framebuffer */ +- struct fb_fix_screeninfo fixed_info; ++ struct fb_fix_screeninfo fix; + struct fb_var_screeninfo mode_info; + + /* Pointer to the mapped framebuffer memory */ diff --git a/recipes/xorg-driver/xf86-video-msm_git.bb b/recipes/xorg-driver/xf86-video-msm_git.bb index faccb87e35..4723b867f0 100644 --- a/recipes/xorg-driver/xf86-video-msm_git.bb +++ b/recipes/xorg-driver/xf86-video-msm_git.bb @@ -8,9 +8,15 @@ SRCREV = "5f7df59155ae301a3ebc40aec22ed16d203cb5fc" PV = "1.1.0+${PR}+gitr${SRCREV}" PE = "1" -SRC_URI = "git://codeaurora.org/quic/xwin/xf86-video-msm.git;protocol=git\ - " +SRC_URI = "git://codeaurora.org/quic/xwin/xf86-video-msm.git;protocol=git" +SRC_URI_htcdream = "git://codeaurora.org/quic/xwin/xf86-video-msm.git;protocol=git \ + file://no_neon.patch;patch=1 \ + file://no_neon_flags.patch;patch=1 \ + file://renaming_variables.patch;patch=1" S = "${WORKDIR}/git" CFLAGS += " -I${STAGING_INCDIR}/xorg " +CFLAGS += " -Wno-error " + +ARM_INSTRUCTION_SET="arm" -- cgit v1.2.3 From e04b826e9b24dbe3b9332da8da9b9310f5125dc4 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 17 Mar 2010 20:46:31 +0100 Subject: gstreamer: updates * switch to new-style staging * add support for new-style checksums * move plugins to newer versions, so plugins moved (e.g. ivorbis) * fixup gstconfig header parsing --- recipes/gstreamer/gst-common.inc | 5 ----- recipes/gstreamer/gst-plugins-bad_0.10.18.bb | 9 +++++++++ recipes/gstreamer/gst-plugins-base_0.10.28.bb | 26 ++++++++++++++++++++++++++ recipes/gstreamer/gst-plugins-good_0.10.21.bb | 16 ++++++++++++++++ recipes/gstreamer/gst-plugins-ugly_0.10.14.bb | 21 +++++++++++++++++++++ recipes/gstreamer/gst-plugins.inc | 13 ++++++++++++- recipes/gstreamer/gst-rtsp_0.10.4.bb | 3 +-- recipes/gstreamer/gstreamer.inc | 4 ++-- recipes/gstreamer/gstreamer_0.10.28.bb | 11 +++++++++++ 9 files changed, 98 insertions(+), 10 deletions(-) create mode 100644 recipes/gstreamer/gst-plugins-bad_0.10.18.bb create mode 100644 recipes/gstreamer/gst-plugins-base_0.10.28.bb create mode 100644 recipes/gstreamer/gst-plugins-good_0.10.21.bb create mode 100644 recipes/gstreamer/gst-plugins-ugly_0.10.14.bb create mode 100644 recipes/gstreamer/gstreamer_0.10.28.bb diff --git a/recipes/gstreamer/gst-common.inc b/recipes/gstreamer/gst-common.inc index c6a3fd057d..c7420eede9 100644 --- a/recipes/gstreamer/gst-common.inc +++ b/recipes/gstreamer/gst-common.inc @@ -12,8 +12,3 @@ OE_LT_RPATH_ALLOW[export]="1" AUTOTOOLS_STAGE_PKGCONFIG = "1" -do_stage() { - autotools_stage_all -} - - diff --git a/recipes/gstreamer/gst-plugins-bad_0.10.18.bb b/recipes/gstreamer/gst-plugins-bad_0.10.18.bb new file mode 100644 index 0000000000..82710c7b25 --- /dev/null +++ b/recipes/gstreamer/gst-plugins-bad_0.10.18.bb @@ -0,0 +1,9 @@ +require gst-plugins.inc + +SRC_URI[archive.md5sum] = "84838893b447e774d401a698ff812b32" +SRC_URI[archive.sha256sum] = "2f800127e00da0f157358f87b06563b3de23cbc630fbf6295b43405e52e02070" + +DEPENDS += "orc-native gst-plugins-base openssl directfb" + +# We don't have vdpau headers in OE and it creates crosscompile badness +EXTRA_OECONF_append = " --disable-vdpau " diff --git a/recipes/gstreamer/gst-plugins-base_0.10.28.bb b/recipes/gstreamer/gst-plugins-base_0.10.28.bb new file mode 100644 index 0000000000..621a8918fe --- /dev/null +++ b/recipes/gstreamer/gst-plugins-base_0.10.28.bb @@ -0,0 +1,26 @@ +require gst-plugins.inc + +SRC_URI += " \ + file://gst-plugins-base_rowstride.patch;patch=1 \ +" + +SRC_URI[archive.md5sum] = "0107cf985ac90544bae70288220f5bab" +SRC_URI[archive.sha256sum] = "132b6fd7749fcbfa9ad88c854aada44b6870c4175bda21cdb01a52b59a98e14f" + +PR = "${INC_PR}.0" + +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 += "udev cdparanoia pango libtheora alsa-lib libsm virtual/libx11 freetype gnome-vfs libxv" + +# Needs a udev that enabled gudev, which isn't the default +EXTRA_OECONF_append = " --with-gudev" + +do_configure_prepend() { + sed -i -e s:QtGui:NoQtGui:g ${S}/configure.ac +} + diff --git a/recipes/gstreamer/gst-plugins-good_0.10.21.bb b/recipes/gstreamer/gst-plugins-good_0.10.21.bb new file mode 100644 index 0000000000..d93a37d53c --- /dev/null +++ b/recipes/gstreamer/gst-plugins-good_0.10.21.bb @@ -0,0 +1,16 @@ +require gst-plugins.inc + +SRC_URI += "file://flvdemux-ecma.diff;patch=1 \ +" + +SRC_URI[archive.md5sum] = "9bc5c9b390edbb96bda42fc553eae5ae" +SRC_URI[archive.sha256sum] = "24445a1cf56302ab4ad5f56055d5c3d81c704b8f9f6875fe78a25d4f72716d22" + +inherit gconf + +DEPENDS += "hal pulseaudio speex libsoup-2.4 flac gst-plugins-base openssl popt esound libv4l" + +PACKAGES =+ "gst-plugin-gconfelements" +FILES_gst-plugin-gconfelements += "${sysconfdir}/gconf" + +EXTRA_OECONF += " --with-libv4l2 " diff --git a/recipes/gstreamer/gst-plugins-ugly_0.10.14.bb b/recipes/gstreamer/gst-plugins-ugly_0.10.14.bb new file mode 100644 index 0000000000..d8295f5763 --- /dev/null +++ b/recipes/gstreamer/gst-plugins-ugly_0.10.14.bb @@ -0,0 +1,21 @@ +require gst-plugins.inc + +PR = "${INC_PR}.0" + +DEPENDS += "gst-plugins-base mpeg2dec libsidplay" + +SRC_URI += "\ + file://gstmad_16bit.patch;patch=1 \ + file://gstsid_autofoo_HACK.patch;patch=1 \ +" + +SRC_URI[archive.md5sum] = "0bc0d27bcce88c73ef6c81e88624e686" +SRC_URI[archive.sha256sum] = "78dba9963e130cfd09f294b60219e6562459c5d848bc3b38a653db7f21fc850b" + +python() { + # Don't build, if we are building an ENTERPRISE distro + enterprise = bb.data.getVar("ENTERPRISE_DISTRO", d, 1) + if enterprise == "1": + raise bb.parse.SkipPackage("gst-plugins-ugly will only build if ENTERPRISE_DISTRO != 1") +} + diff --git a/recipes/gstreamer/gst-plugins.inc b/recipes/gstreamer/gst-plugins.inc index 32df9ece21..b060eb2bd4 100644 --- a/recipes/gstreamer/gst-plugins.inc +++ b/recipes/gstreamer/gst-plugins.inc @@ -9,13 +9,24 @@ INC_PR = "r7" PACKAGES_DYNAMIC = "gst-plugin-*" -SRC_URI = "http://gstreamer.freedesktop.org/src/${PN}/${PN}-${PV}.tar.bz2" +SRC_URI = "http://gstreamer.freedesktop.org/src/${PN}/${PN}-${PV}.tar.bz2;name=archive" EXTRA_OECONF = "--enable-introspection=no --disable-aalib --disable-shout2 --disable-sdl --disable-cdaudio --x-includes=${STAGING_INCDIR} --x-libraries=${STAGING_LIBDIR} " EXTRA_OECONF_append_shr = " --disable-dvdnav " acpaths = "-I ${S}/common/m4 -I ${S}/m4" +# Fix up path to gstconfig.h +do_configure_prepend() { + sed -i -e 's:`$PKG_CONFIG --variable=includedir gstreamer-0.10`:${STAGING_INCDIR}/gstreamer-0.10:g' ${S}/configure.ac +} + +do_configure_append() { + for i in $(find ${S} -name "Makefile") ; do + sed -i -e s:/usr/bin/orcc:${STAGING_BINDIR_NATIVE}/orcc:g $i + done +} + OE_LT_RPATH_ALLOW = "any" OE_LT_RPATH_ALLOW[export]="1" diff --git a/recipes/gstreamer/gst-rtsp_0.10.4.bb b/recipes/gstreamer/gst-rtsp_0.10.4.bb index 11c57aa71f..ac7565bd9b 100644 --- a/recipes/gstreamer/gst-rtsp_0.10.4.bb +++ b/recipes/gstreamer/gst-rtsp_0.10.4.bb @@ -5,8 +5,7 @@ DEPENDS = "gst-plugins-base gstreamer" SRC_URI = "http://people.freedesktop.org/~wtay/gst-rtsp-${PV}.tar.bz2" -inherit autotools_stage +inherit autotools -AUTOTOOLS_STAGE_PKGCONFIG = "1" diff --git a/recipes/gstreamer/gstreamer.inc b/recipes/gstreamer/gstreamer.inc index 87a6f82135..aff25e7baa 100644 --- a/recipes/gstreamer/gstreamer.inc +++ b/recipes/gstreamer/gstreamer.inc @@ -5,10 +5,10 @@ It supports a wide range of formats including mp3, ogg, avi, mpeg and quicktime. DEPENDS = "libxml2 glib-2.0 gettext-native popt" -SRC_URI = "http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.bz2" +SRC_URI = "http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.bz2;name=archive" EXTRA_OECONF = "--disable-docs-build --disable-dependency-tracking --with-check=no" FILES_${PN} += " ${libdir}/gstreamer-0.10/*.so" FILES_${PN}-dev += " ${libdir}/gstreamer-0.10/*.la ${libdir}/gstreamer-0.10/*.a" -FILES_${PN}-dbg += "${libdir}/gstreamer-0.10/.debug" +FILES_${PN}-dbg += "${libexecdir}/gstreamer-0.10/.debug ${libdir}/gstreamer-0.10/.debug" diff --git a/recipes/gstreamer/gstreamer_0.10.28.bb b/recipes/gstreamer/gstreamer_0.10.28.bb new file mode 100644 index 0000000000..c44646c60d --- /dev/null +++ b/recipes/gstreamer/gstreamer_0.10.28.bb @@ -0,0 +1,11 @@ +require gstreamer.inc + +SRC_URI[archive.md5sum] = "1c7accac718fe211ff91323c27d4ae02" +SRC_URI[archive.sha256sum] = "61613ec7574d22230e8cc893f91b66faec6b21288a22d2f21c9d9eeb7667eb2c" + +EXTRA_OECONF += "ac_cv_func_register_printf_function=no" + +do_configure_prepend() { + sed -i -e s:docs::g Makefile.am +} + -- cgit v1.2.3 From 2530a0e3688205b660de04c31439290ad96a573b Mon Sep 17 00:00:00 2001 From: Roman I Khimov Date: Tue, 16 Mar 2010 19:11:24 +0300 Subject: ipsec-tools: convert to INC_PR Signed-off-by: Roman I Khimov --- recipes/ipsec-tools/ipsec-tools.inc | 2 ++ recipes/ipsec-tools/ipsec-tools_0.6.6.bb | 2 +- recipes/ipsec-tools/ipsec-tools_0.6.7.bb | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/recipes/ipsec-tools/ipsec-tools.inc b/recipes/ipsec-tools/ipsec-tools.inc index ed265f12ed..f79210dc5a 100644 --- a/recipes/ipsec-tools/ipsec-tools.inc +++ b/recipes/ipsec-tools/ipsec-tools.inc @@ -9,6 +9,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/ipsec-tools/ipsec-tools-${PV}.tar.bz2 \ file://racoon-search-missing.patch;patch=1 \ file://gcc-4.2.patch;patch=1" +INC_PR = "r1" + inherit autotools # Options: diff --git a/recipes/ipsec-tools/ipsec-tools_0.6.6.bb b/recipes/ipsec-tools/ipsec-tools_0.6.6.bb index 1ccc60c18d..efac342aaa 100644 --- a/recipes/ipsec-tools/ipsec-tools_0.6.6.bb +++ b/recipes/ipsec-tools/ipsec-tools_0.6.6.bb @@ -1,3 +1,3 @@ -PR = "r1" +PR = "${INC_PR}.0" require ipsec-tools.inc diff --git a/recipes/ipsec-tools/ipsec-tools_0.6.7.bb b/recipes/ipsec-tools/ipsec-tools_0.6.7.bb index 3f23b198c1..efac342aaa 100644 --- a/recipes/ipsec-tools/ipsec-tools_0.6.7.bb +++ b/recipes/ipsec-tools/ipsec-tools_0.6.7.bb @@ -1,3 +1,3 @@ -PR = "r0" +PR = "${INC_PR}.0" require ipsec-tools.inc -- cgit v1.2.3 From 6b423dc2fc758bd34716ae5384363e97b505f0cb Mon Sep 17 00:00:00 2001 From: Roman I Khimov Date: Tue, 16 Mar 2010 19:11:25 +0300 Subject: ipsec-tools: add version 0.7.2 Fixes CVE-2008-3651 and CVE-2008-3652. Signed-off-by: Roman I Khimov --- recipes/ipsec-tools/ipsec-tools.inc | 6 ++---- recipes/ipsec-tools/ipsec-tools_0.6.6.bb | 2 ++ recipes/ipsec-tools/ipsec-tools_0.6.7.bb | 2 ++ recipes/ipsec-tools/ipsec-tools_0.7.2.bb | 8 ++++++++ 4 files changed, 14 insertions(+), 4 deletions(-) create mode 100644 recipes/ipsec-tools/ipsec-tools_0.7.2.bb diff --git a/recipes/ipsec-tools/ipsec-tools.inc b/recipes/ipsec-tools/ipsec-tools.inc index f79210dc5a..cb7b411626 100644 --- a/recipes/ipsec-tools/ipsec-tools.inc +++ b/recipes/ipsec-tools/ipsec-tools.inc @@ -5,11 +5,9 @@ SECTION = "console/network" LICENSE = "BSD" DEPENDS = "virtual/kernel openssl readline flex" -SRC_URI = "${SOURCEFORGE_MIRROR}/ipsec-tools/ipsec-tools-${PV}.tar.bz2 \ - file://racoon-search-missing.patch;patch=1 \ - file://gcc-4.2.patch;patch=1" +SRC_URI = "${SOURCEFORGE_MIRROR}/ipsec-tools/ipsec-tools-${PV}.tar.bz2;name=ipsec-tools-${PV}" -INC_PR = "r1" +INC_PR = "r2" inherit autotools diff --git a/recipes/ipsec-tools/ipsec-tools_0.6.6.bb b/recipes/ipsec-tools/ipsec-tools_0.6.6.bb index efac342aaa..c8842b75fd 100644 --- a/recipes/ipsec-tools/ipsec-tools_0.6.6.bb +++ b/recipes/ipsec-tools/ipsec-tools_0.6.6.bb @@ -1,3 +1,5 @@ PR = "${INC_PR}.0" require ipsec-tools.inc + +SRC_URI += "file://racoon-search-missing.patch;patch=1 file://gcc-4.2.patch;patch=1" \ No newline at end of file diff --git a/recipes/ipsec-tools/ipsec-tools_0.6.7.bb b/recipes/ipsec-tools/ipsec-tools_0.6.7.bb index efac342aaa..c8842b75fd 100644 --- a/recipes/ipsec-tools/ipsec-tools_0.6.7.bb +++ b/recipes/ipsec-tools/ipsec-tools_0.6.7.bb @@ -1,3 +1,5 @@ PR = "${INC_PR}.0" require ipsec-tools.inc + +SRC_URI += "file://racoon-search-missing.patch;patch=1 file://gcc-4.2.patch;patch=1" \ No newline at end of file diff --git a/recipes/ipsec-tools/ipsec-tools_0.7.2.bb b/recipes/ipsec-tools/ipsec-tools_0.7.2.bb new file mode 100644 index 0000000000..4255598ed8 --- /dev/null +++ b/recipes/ipsec-tools/ipsec-tools_0.7.2.bb @@ -0,0 +1,8 @@ +PR = "${INC_PR}.0" + +require ipsec-tools.inc + +SRC_URI[ipsec-tools-0.7.2.md5sum] = "72861f005746ee27984b2ee715ecc629" +SRC_URI[ipsec-tools-0.7.2.sha256sum] = "08722ff6c62de3e042fef337454f03622a79053108d6dcc686c9c854f9f9e031" + +EXTRA_OECONF += " --disable-security-context" \ No newline at end of file -- cgit v1.2.3 From 5cca66257cb46960378e302069fbf8353390fef3 Mon Sep 17 00:00:00 2001 From: Mario Domenech Goulart Date: Fri, 12 Mar 2010 14:24:50 -0300 Subject: xinput-calibrator: install xinput_calibrator_get_hal_calibration.sh Signed-off-by: Mario Domenech Goulart Signed-off-by: Otavio Salvador --- recipes/xinput-calibrator/xinput-calibrator_0.6.0.bb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/recipes/xinput-calibrator/xinput-calibrator_0.6.0.bb b/recipes/xinput-calibrator/xinput-calibrator_0.6.0.bb index 517f919549..21194ae0be 100644 --- a/recipes/xinput-calibrator/xinput-calibrator_0.6.0.bb +++ b/recipes/xinput-calibrator/xinput-calibrator_0.6.0.bb @@ -5,10 +5,13 @@ SRC_URI = "git://github.com/tias/xinput_calibrator.git;protocol=git" SRCREV = "d6e01d780001948f55006698e8e9e48c12894810" S = "${WORKDIR}/git/" +PR = "r1" + do_install_append() { install -d ${D}${bindir} install -m 0755 scripts/xinput_calibrator_pointercal.sh ${D}${bindir}/xinput_calibrator_once.sh ln -s ${bindir}/xinput_calibrator_x11 ${D}${bindir}/xinput_calibrator install -d ${D}${datadir}/applications/ install -m 0755 scripts/xinput_calibrator.desktop ${D}${datadir}/applications/xinput-calibrator.desktop + install -m 0755 scripts/xinput_calibrator_get_hal_calibration.sh ${D}${bindir}/xinput_calibrator_get_hal_calibration.sh } -- cgit v1.2.3 From 98764601e536047238130cb8ad02c74250656346 Mon Sep 17 00:00:00 2001 From: Mario Domenech Goulart Date: Fri, 12 Mar 2010 14:27:08 -0300 Subject: xinput-calibrator: patch to fix miny and maxx printing order for UDEV and HAL Signed-off-by: Mario Domenech Goulart Signed-off-by: Otavio Salvador --- ...orgPrint.cpp-fix-miny-and-maxx-printing-o.patch | 36 ++++++++++++++++++++++ .../xinput-calibrator/xinput-calibrator_0.6.0.bb | 5 +-- 2 files changed, 39 insertions(+), 2 deletions(-) create mode 100644 recipes/xinput-calibrator/xinput-calibrator-0.6.0/0001-calibratorXorgPrint.cpp-fix-miny-and-maxx-printing-o.patch diff --git a/recipes/xinput-calibrator/xinput-calibrator-0.6.0/0001-calibratorXorgPrint.cpp-fix-miny-and-maxx-printing-o.patch b/recipes/xinput-calibrator/xinput-calibrator-0.6.0/0001-calibratorXorgPrint.cpp-fix-miny-and-maxx-printing-o.patch new file mode 100644 index 0000000000..fa0314726b --- /dev/null +++ b/recipes/xinput-calibrator/xinput-calibrator-0.6.0/0001-calibratorXorgPrint.cpp-fix-miny-and-maxx-printing-o.patch @@ -0,0 +1,36 @@ +From 383a3a8523814d1b108d2dc1ed812f80d6c9f050 Mon Sep 17 00:00:00 2001 +From: Mario Domenech Goulart +Date: Thu, 11 Mar 2010 11:05:18 -0300 +Subject: [PATCH] calibratorXorgPrint.cpp: fix miny and maxx printing order for UDEV and HAL + + +Signed-off-by: Mario Domenech Goulart +--- + src/calibrator/calibratorXorgPrint.cpp | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/calibrator/calibratorXorgPrint.cpp b/src/calibrator/calibratorXorgPrint.cpp +index 92d297a..1f74de0 100644 +--- a/src/calibrator/calibratorXorgPrint.cpp ++++ b/src/calibrator/calibratorXorgPrint.cpp +@@ -69,7 +69,7 @@ bool CalibratorXorgPrint::finish_data(const XYinfo new_axys, int swap_xy) + \tENV{x11_options.miny}=\"%d\"\n\ + \tENV{x11_options.maxx}=\"%d\"\n\ + \tENV{x11_options.maxy}=\"%d\"\n" +- , new_axys.x_min, new_axys.x_max, new_axys.y_min, new_axys.y_max); ++ , new_axys.x_min, new_axys.y_min, new_axys.x_max, new_axys.y_max); + if (swap_xy != 0) + printf("\tENV{x11_options.swapxy}=\"%d\"\n", swap_xy); + printf("\tLABEL=\"xorg_touchscreen_end\"\n"); +@@ -81,7 +81,7 @@ bool CalibratorXorgPrint::finish_data(const XYinfo new_axys, int swap_xy) + \t %d\n\ + \t %d\n\ + \t %d\n" +- , new_axys.x_min, new_axys.x_max, new_axys.y_min, new_axys.y_max); ++ , new_axys.x_min, new_axys.y_min, new_axys.x_max, new_axys.y_max); + if (swap_xy != 0) + printf("\t %d\n", swap_xy); + printf("\t\n"); +-- +1.6.3.3.444.g4ecbc + diff --git a/recipes/xinput-calibrator/xinput-calibrator_0.6.0.bb b/recipes/xinput-calibrator/xinput-calibrator_0.6.0.bb index 21194ae0be..fb43231e24 100644 --- a/recipes/xinput-calibrator/xinput-calibrator_0.6.0.bb +++ b/recipes/xinput-calibrator/xinput-calibrator_0.6.0.bb @@ -1,11 +1,12 @@ require xinput-calibrator.inc -SRC_URI = "git://github.com/tias/xinput_calibrator.git;protocol=git" +SRC_URI = "git://github.com/tias/xinput_calibrator.git;protocol=git \ + file://0001-calibratorXorgPrint.cpp-fix-miny-and-maxx-printing-o.patch;patch=1" SRCREV = "d6e01d780001948f55006698e8e9e48c12894810" S = "${WORKDIR}/git/" -PR = "r1" +PR = "r2" do_install_append() { install -d ${D}${bindir} -- cgit v1.2.3 From 5eb0c55119af8a99b0106e1c881448d73b3b3d37 Mon Sep 17 00:00:00 2001 From: Mario Domenech Goulart Date: Tue, 16 Mar 2010 15:44:40 -0300 Subject: chicken: added recipe for version 4.4.0 Signed-off-by: Mario Domenech Goulart Signed-off-by: Otavio Salvador --- recipes/chicken/chicken_4.4.0.bb | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 recipes/chicken/chicken_4.4.0.bb diff --git a/recipes/chicken/chicken_4.4.0.bb b/recipes/chicken/chicken_4.4.0.bb new file mode 100644 index 0000000000..125cdede5d --- /dev/null +++ b/recipes/chicken/chicken_4.4.0.bb @@ -0,0 +1,26 @@ +require chicken.inc + +DEPENDS = "chicken-cross" + +PR = "${INC_PR}.1" + +do_compile() { + make PLATFORM="linux" DESTDIR="${D}" PREFIX="${prefix}" HOSTSYSTEM="${TARGET_SYS}" ARCH=${CHICKEN_ARCH} +} + +do_install() { + make PLATFORM="linux" DESTDIR="${D}" PREFIX="${prefix}" HOSTSYSTEM="${TARGET_SYS}" ARCH=${CHICKEN_ARCH} install +} + +do_stage() { + make PLATFORM="linux" DESTDIR="${STAGING_DIR_TARGET}" PREFIX="${prefix}" HOSTSYSTEM="${TARGET_SYS}" ARCH=${CHICKEN_ARCH} install +} + +PACKAGES += "chicken-bin libchicken libuchicken" + +FILES_${PN} = "" +FILES_libchicken = "${libdir}/libchicken.so.*" +FILES_libuchicken = "${libdir}/libuchicken.so.*" +FILES_${PN}-bin = "${bindir}/* ${datadir}/chicken/*.* ${libdir}/chicken/*/*.so" +FILES_${PN}-doc += "${datadir}/chicken/doc" +FILES_${PN}-dbg += "${libdir}/chicken/*/.debug" -- cgit v1.2.3 From 3e87f78f406699aaaad139e1cb184f4337073c37 Mon Sep 17 00:00:00 2001 From: Mario Domenech Goulart Date: Tue, 16 Mar 2010 15:45:17 -0300 Subject: chicken-cross: added recipe for chicken-cross version 4.4.0 Signed-off-by: Mario Domenech Goulart Signed-off-by: Otavio Salvador --- recipes/chicken/chicken-cross_4.4.0.bb | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 recipes/chicken/chicken-cross_4.4.0.bb diff --git a/recipes/chicken/chicken-cross_4.4.0.bb b/recipes/chicken/chicken-cross_4.4.0.bb new file mode 100644 index 0000000000..387247b58a --- /dev/null +++ b/recipes/chicken/chicken-cross_4.4.0.bb @@ -0,0 +1,26 @@ +require chicken.inc + +PR = "${INC_PR}.1" + +inherit cross + +do_compile() { + make PLATFORM="linux" PREFIX="${prefix}" TARGET_PREFIX="${STAGING_DIR_TARGET}${layout_prefix}" TARGETSYSTEM="${TARGET_SYS}" LIBRARIAN=ar +} + +do_install() { + make PLATFORM="linux" PREFIX="${prefix}" TARGET_PREFIX="${STAGING_DIR_TARGET}${layout_prefix}" TARGETSYSTEM="${TARGET_SYS}" LIBRARIAN=ar install +} + +do_stage() { + make PLATFORM="linux" PREFIX="${prefix}" TARGET_PREFIX="${STAGING_DIR_TARGET}${layout_prefix}" TARGETSYSTEM="${TARGET_SYS}" LIBRARIAN=ar install +} + +PACKAGES += "chicken-bin libchicken libuchicken" + +FILES_${PN} = "" +FILES_libchicken = "${libdir}/libchicken.so.*" +FILES_libuchicken = "${libdir}/libuchicken.so.*" +FILES_${PN}-bin = "${bindir}/* ${datadir}/chicken/*.* ${libdir}/chicken/*/*.so" +FILES_${PN}-doc += "${datadir}/chicken/doc" +FILES_${PN}-dbg += "${libdir}/chicken/*/.debug" -- cgit v1.2.3 From c914d3308df4025d39d4fde4de198b8c392d6a41 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Wed, 17 Mar 2010 23:32:11 +0000 Subject: opkg: update to include upstream libopkg C++ header fixes --- conf/distro/include/sane-srcrevs.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index b4a6cbb7bb..b07d8d011c 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -145,7 +145,7 @@ SRCREV_pn-openmoocow ?= "39648419825cddfea1cb1321e552a12b71fede14" SRCREV_pn-openocd ?= "517" SRCREV_pn-openocd-native ?= "517" SRCREV_pn-opimd-utils ?= "1872cdebe1209123710259e25cb8c8b47a627112" -SRCREV_pn-opkg ?= "526" +SRCREV_pn-opkg ?= "527" SRCREV_pn-opkg-native ?= "526" SRCREV_pn-opkg-sdk ?= "526" SRCREV_pn-opkg-utils ?= "4578" -- cgit v1.2.3 From bad37557beda5e968cdaaa605e5dc5a7e82c51a3 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Wed, 17 Mar 2010 23:33:27 +0000 Subject: opie-packagemanager: fix for recent opkg SRCREV bump --- .../opie-packagemanager/files/opkg_update.patch | 469 +++++++++++++++++++++ .../opie-packagemanager_1.2.4.bb | 5 +- 2 files changed, 472 insertions(+), 2 deletions(-) create mode 100644 recipes/opie-packagemanager/files/opkg_update.patch diff --git a/recipes/opie-packagemanager/files/opkg_update.patch b/recipes/opie-packagemanager/files/opkg_update.patch new file mode 100644 index 0000000000..8da0a847c9 --- /dev/null +++ b/recipes/opie-packagemanager/files/opkg_update.patch @@ -0,0 +1,469 @@ +--- packagemanager/oipkg.cpp 2010-03-17 21:43:48.000000000 +0000 ++++ packagemanager/oipkg.cpp 2010-03-17 22:48:03.000000000 +0000 +@@ -39,26 +39,45 @@ + #include + #include + ++#ifdef USE_LIBOPKG ++ + const QString IPKG_CONF = "/etc/opkg.conf"; // Fully-qualified name of Ipkg primary configuration file + const QString IPKG_CONF_DIR = "/etc/opkg"; // Directory of secondary Ipkg configuration files + const QString IPKG_PKG_PATH = "/usr/lib/opkg/lists"; // Directory containing server package lists + const QString IPKG_STATUS_PATH = "usr/lib/opkg/status"; // Destination status file location + const QString IPKG_INFO_PATH = "usr/lib/opkg/info"; // Package file lists location ++#define OPKG_NO_ERROR 0 ++ ++#else ++ ++extern "C" { ++#include ++}; ++args_t m_ipkgArgs; // libipkg configuration arguments ++ ++const QString IPKG_CONF = "/etc/ipkg.conf"; // Fully-qualified name of Ipkg primary configuration file ++const QString IPKG_CONF_DIR = "/etc/ipkg"; // Directory of secondary Ipkg configuration files ++const QString IPKG_PKG_PATH = "/usr/lib/ipkg/lists"; // Directory containing server package lists ++const QString IPKG_STATUS_PATH = "usr/lib/ipkg/status"; // Destination status file location ++const QString IPKG_INFO_PATH = "usr/lib/ipkg/info"; // Package file lists location ++ ++#endif + + OIpkg *oipkg; + + // Ipkg callback functions + + +-void fsignalOpkgProgress (opkg_t *opkg, const opkg_progress_data_t *progress, void *user_data) ++#ifdef USE_LIBOPKG ++void fsignalOpkgProgress (const opkg_progress_data_t *progress, void *user_data) + { + QString msg; + + QString pkginfo; +- if( progress->package ) { +- pkginfo = progress->package->name; ++ if( progress->pkg ) { ++ pkginfo = progress->pkg->name; + pkginfo += " "; +- pkginfo += progress->package->version; ++ pkginfo += progress->pkg->version; + } + switch( progress->action ) { + case OPKG_INSTALL: +@@ -86,13 +105,21 @@ + oipkg->progress( (const char *)msg, progress->percentage ); + } + +-void fsignalOpkgPackage (opkg_t *opkg, opkg_package_t *package, void *user_data) ++void fsignalOpkgPackage (pkg_t *package, void *user_data) + { + + } + ++void fsignalOpkgMessage (int, const char *fmt, va_list ap) ++{ ++ QString msg; ++ msg.sprintf(fmt, ap); ++ oipkg->ipkgMessage( msg ); ++} ++#endif + +-/*X ++ ++#ifndef USE_LIBOPKG + int fsignalIpkgMessage( ipkg_conf_t *conf, message_level_t level, char *msg ) + { + // Display message only if it is below the message level threshold +@@ -103,7 +130,8 @@ + + return 0; + } +-*/ ++#endif ++ + + char *fIpkgResponse( char */*question*/ ) + { +@@ -116,40 +144,14 @@ + return 0; + } + +-QString opkg_error_message( int err ) ++#ifndef USE_LIBOPKG ++int fIpkgFiles( char */*name*/, char *desc, char */*version*/, pkg_state_status_t /*status*/, ++ void */*userdata*/ ) + { +- switch(err) { +- case OPKG_NO_ERROR: +- return "Success"; +- case OPKG_UNKNOWN_ERROR: +- return "Unknown error"; +- case OPKG_DOWNLOAD_FAILED: +- return "Download failed"; +- case OPKG_DEPENDENCIES_FAILED: +- return "Unable to complete operation due to dependencies"; +- case OPKG_PACKAGE_ALREADY_INSTALLED: +- return "Specified package is already installed"; +- case OPKG_PACKAGE_NOT_AVAILABLE: +- return "Specified package is not available"; +- case OPKG_PACKAGE_NOT_FOUND: +- return "Specified package could not be found"; +- case OPKG_PACKAGE_NOT_INSTALLED: +- return "Specified package is not installed"; +- case OPKG_GPG_ERROR: +- return "GPG verification failed"; +- case OPKG_MD5_ERROR: +- return "MD5 verification failed"; +- default: +- return "Unrecognised error code"; +- } ++ oipkg->ipkgList( desc ); ++ return 0; + } +- +-//Xint fIpkgFiles( char */*name*/, char *desc, char */*version*/, pkg_state_status_t /*status*/, +-//X void */*userdata*/ ) +-//X{ +-//X oipkg->ipkgList( desc ); +-//X return 0; +-//X} ++#endif + + OIpkg::OIpkg( Config *config, QObject *parent, const char *name ) + : QObject( parent, name ) +@@ -162,7 +164,17 @@ + oipkg = this; + + // Initialize libipkg +- m_opkg = opkg_new(); ++#ifdef USE_LIBOPKG ++ opkg_new(); ++ opkg_conf_init(); ++ conf->opkg_vmessage = fsignalOpkgMessage; ++#else ++ ipkg_init( &fsignalIpkgMessage, &fIpkgResponse, &m_ipkgArgs ); ++ ++ // Default ipkg run-time arguments ++ m_ipkgArgs.noaction = false; ++ m_ipkgArgs.force_defaults = true; ++#endif + } + + OIpkg::~OIpkg() +@@ -172,7 +184,12 @@ + m_confInfo->setAutoDelete( true ); + + // Free up libipkg resources +- opkg_free( m_opkg ); ++#ifdef USE_LIBOPKG ++ opkg_conf_deinit(); ++ opkg_free(); ++#else ++ ipkg_deinit( &m_ipkgArgs ); ++#endif + } + + OConfItemList *OIpkg::configItems() +@@ -206,13 +223,13 @@ + switch ( item->type() ) + { + case OConfItem::Source : +- case OConfItem::Destination : ++ case OConfItem::Destination : + item->setFile( IPKG_CONF_DIR + "/" + item->name() + ".conf" ); + break; +- case OConfItem::Arch : ++ case OConfItem::Arch : + item->setFile( IPKG_CONF_DIR + "/arch.conf" ); + break; +- default : ++ default : + item->setFile( IPKG_CONF ); + break; + }; +@@ -253,7 +270,7 @@ + break; + } + lastFile = item->file(); +- ++ + confStream = new QTextStream( confFile ); + // (*confStream) << "# Generated by Opie Package Manager\n\n"; + } +@@ -301,7 +318,14 @@ + } + + // Reinitialize libipkg to pick up new configuration +- opkg_re_read_config_files( m_opkg ); ++#ifdef USE_LIBOPKG ++ opkg_re_read_config_files(); ++#else ++ ipkg_deinit( &m_ipkgArgs ); ++ ipkg_init( &fsignalIpkgMessage, &fIpkgResponse, &m_ipkgArgs ); ++ m_ipkgArgs.noaction = false; ++ m_ipkgArgs.force_defaults = true; ++#endif + } + + void OIpkg::saveSettings() +@@ -497,23 +521,30 @@ + return false; + + // Set ipkg run-time options/arguments ++#ifdef USE_LIBOPKG + optvalue = ( m_ipkgExecOptions & FORCE_DEPENDS ) ? 1 : 0; +- opkg_set_option( m_opkg, "force_depends", &optvalue ); ++ opkg_set_option( "force_depends", &optvalue ); + + optvalue = ( m_ipkgExecOptions & FORCE_REINSTALL ) ? 1 : 0; +- opkg_set_option( m_opkg, "force_reinstall", &optvalue ); ++ opkg_set_option( "force_reinstall", &optvalue ); + + optvalue = ( m_ipkgExecOptions & FORCE_OVERWRITE ) ? 1 : 0; +- opkg_set_option( m_opkg, "force_overwrite", &optvalue ); ++ opkg_set_option( "force_overwrite", &optvalue ); + + optvalue = ( m_ipkgExecOptions & FORCE_RECURSIVE ) ? 1 : 0; +- opkg_set_option( m_opkg, "force_removal_of_dependent_packages", &optvalue ); ++ opkg_set_option( "force_removal_of_dependent_packages", &optvalue ); + ++ + optvalue = m_ipkgExecVerbosity; +- opkg_set_option( m_opkg, "verbosity", &optvalue ); +- +-/*X // TODO m_ipkgArgs.force_remove = ( m_ipkgExecOptions & FORCE_REMOVE ); ++ opkg_set_option( "verbosity", &optvalue ); ++#else ++ m_ipkgArgs.force_depends = ( m_ipkgExecOptions & FORCE_DEPENDS ); ++ m_ipkgArgs.force_reinstall = ( m_ipkgExecOptions & FORCE_REINSTALL ); ++ // TODO m_ipkgArgs.force_remove = ( m_ipkgExecOptions & FORCE_REMOVE ); ++ m_ipkgArgs.force_overwrite = ( m_ipkgExecOptions & FORCE_OVERWRITE ); ++ m_ipkgArgs.force_removal_of_dependent_packages = ( m_ipkgExecOptions & FORCE_RECURSIVE ); + m_ipkgArgs.verbose_wget = ( m_ipkgExecOptions & FORCE_VERBOSE_WGET ); ++ m_ipkgArgs.verbosity = m_ipkgExecVerbosity; + if ( m_ipkgArgs.dest ) + free( m_ipkgArgs.dest ); + if ( !destination.isNull() ) +@@ -525,7 +556,8 @@ + } + else + m_ipkgArgs.dest = 0l; +-*/ ++#endif ++ + // Connect output signal to widget + + if ( !rawOutput ) +@@ -539,23 +571,33 @@ + { + case OPackage::Update : { + connect( this, SIGNAL(signalIpkgMessage(const QString &)), receiver, slotOutput ); +- ret = opkg_update_package_lists( m_opkg, &fsignalOpkgProgress, NULL ); ++#ifdef USE_LIBOPKG ++ ret = opkg_update_package_lists( &fsignalOpkgProgress, NULL ); ++#else ++ ipkg_lists_update( &m_ipkgArgs ); ++#endif + disconnect( this, SIGNAL(signalIpkgMessage(const QString &)), 0, 0 ); + ++#ifdef USE_LIBOPKG + if( ret != OPKG_NO_ERROR ) { +- emit signalIpkgMessage( tr("Update failed: ") + opkg_error_message( ret ) ); ++ emit signalIpkgMessage( tr("Update failed") ); + return false; + } ++#endif + }; + break; + case OPackage::Upgrade : { + connect( this, SIGNAL(signalIpkgMessage(const QString &)), receiver, slotOutput ); +- ret = opkg_upgrade_all( m_opkg, &fsignalOpkgProgress, NULL ); ++#ifdef USE_LIBOPKG ++ ret = opkg_upgrade_all( &fsignalOpkgProgress, NULL ); + if( ret != OPKG_NO_ERROR ) { +- emit signalIpkgMessage( tr("Upgrade failed: ") + opkg_error_message( ret ) ); ++ emit signalIpkgMessage( tr("Upgrade failed") ); + disconnect( this, SIGNAL(signalIpkgMessage(const QString &)), 0, 0 ); + return false; + } ++#else ++ ipkg_packages_upgrade( &m_ipkgArgs ); ++#endif + + // Re-link non-root destinations to make sure everything is in sync + OConfItemList *destList = destinations(); +@@ -574,12 +616,16 @@ + connect( this, SIGNAL(signalIpkgMessage(const QString &)), receiver, slotOutput ); + for ( QStringList::ConstIterator it = parameters.begin(); it != parameters.end(); ++it ) + { +- ret = opkg_install_package( m_opkg, (*it), &fsignalOpkgProgress, NULL ); ++#ifdef USE_LIBOPKG ++ ret = opkg_install_package( (*it), &fsignalOpkgProgress, NULL ); + if( ret != OPKG_NO_ERROR ) { +- emit signalIpkgMessage( tr("Install failed: ") + opkg_error_message( ret ) ); ++ emit signalIpkgMessage( tr("Install failed") ); + disconnect( this, SIGNAL(signalIpkgMessage(const QString &)), 0, 0 ); + return false; + } ++#else ++ ipkg_packages_install( &m_ipkgArgs, (*it) ); ++#endif + } + if ( destination != "root" ) + linkPackageDir( destination ); +@@ -595,18 +641,17 @@ + for ( QStringList::ConstIterator it = parameters.begin(); it != parameters.end(); ++it ) + { + unlinkPackage( (*it), destList ); +- ret = opkg_remove_package( m_opkg, (*it), &fsignalOpkgProgress, NULL ); ++#ifdef USE_LIBOPKG ++ ret = opkg_remove_package( (*it), &fsignalOpkgProgress, NULL ); + if( ret != OPKG_NO_ERROR ) { +- if ( ret == OPKG_DEPENDENCIES_FAILED || ret == OPKG_UNKNOWN_ERROR ) { +- emit signalIpkgMessage( tr("Remove failed: other package(s) depend on the specified package") ); +- } +- else { +- emit signalIpkgMessage( tr("Remove failed: ") + opkg_error_message( ret ) ); +- } ++ emit signalIpkgMessage( tr("Remove failed") ); + delete destList; + disconnect( this, SIGNAL(signalIpkgMessage(const QString &)), 0, 0 ); + return false; + } ++#else ++ ipkg_packages_remove( &m_ipkgArgs, (*it), true ); ++#endif + } + + delete destList; +@@ -614,42 +659,74 @@ + }; + break; + case OPackage::Download : { ++#ifndef USE_LIBOPKG + connect( this, SIGNAL(signalIpkgMessage(const QString &)), receiver, slotOutput ); + for ( QStringList::ConstIterator it = parameters.begin(); it != parameters.end(); ++it ) + { +-//X ipkg_packages_download( &m_ipkgArgs, (*it) ); ++ ipkg_packages_download( &m_ipkgArgs, (*it) ); + } + disconnect( this, SIGNAL(signalIpkgMessage(const QString &)), 0, 0 ); ++#endif + }; + break; + case OPackage::Info : { + connect( this, SIGNAL(signalIpkgStatus(const QString &)), receiver, slotOutput ); +-//X ipkg_packages_info( &m_ipkgArgs, (*parameters.begin()), &fIpkgStatus, 0l ); +- opkg_package_t *pkginfo = opkg_find_package( m_opkg, (*parameters.begin()), NULL, NULL, NULL ); ++#ifdef USE_LIBOPKG ++ pkg_t *pkginfo = opkg_find_package( (*parameters.begin()), NULL, NULL, NULL ); + if(pkginfo) { + QString msg = tr("Package: %1\n").arg( pkginfo->name ); + msg += tr("Version: %1\n").arg( pkginfo->version ); + msg += tr("Architecture: %1\n").arg( pkginfo->architecture ); +- if( pkginfo->repository ) +- msg += tr("Repository: %1\n").arg( pkginfo->repository ); ++ if( pkginfo->source ) ++ msg += tr("Source: %1\n").arg( pkginfo->source ); + if( pkginfo->description ) + msg += tr("Description: %1\n\n").arg( pkginfo->description ); + if( pkginfo->tags ) + msg += tr("Tags: %1\n").arg( pkginfo->tags ); +- if( pkginfo->url ) +- msg += tr("URL: %1\n").arg( pkginfo->url ); + if( pkginfo->size > 0 ) + msg += tr("Size: %1\n").arg( pkginfo->size ); +- msg += tr("Status: %1").arg( pkginfo->installed ? tr("installed") : "" ); ++ QString status; ++ switch( pkginfo->state_status ) { ++ case SS_NOT_INSTALLED: ++ status = tr( "Not installed" ); ++ break; ++ case SS_UNPACKED: ++ status = tr( "Unpacked" ); ++ break; ++ case SS_HALF_CONFIGURED: ++ status = tr( "Partially configured" ); ++ break; ++ case SS_INSTALLED: ++ status = tr( "Installed" ); ++ break; ++ case SS_HALF_INSTALLED: ++ status = tr( "Partially installed" ); ++ break; ++// case SS_CONFIG_FILES: ++ case SS_POST_INST_FAILED: ++ status = tr( "Postinst failed" ); ++ break; ++ case SS_REMOVAL_FAILED: ++ status = tr( "Removal failed" ); ++ break; ++ default: ++ status = tr( "Unknown" ); ++ } ++ msg += tr("Status: %1").arg( status ); + emit signalIpkgStatus( msg ); + } ++#else ++ ipkg_packages_info( &m_ipkgArgs, (*parameters.begin()), &fIpkgStatus, 0l ); ++#endif + disconnect( this, SIGNAL(signalIpkgStatus(const QString &)), 0, 0 ); + }; + break; + case OPackage::Files : { ++#ifndef USE_LIBOPKG + connect( this, SIGNAL(signalIpkgList(const QString &)), receiver, slotOutput ); +-//X ipkg_package_files( &m_ipkgArgs, (*parameters.begin()), &fIpkgFiles, 0l ); ++ ipkg_package_files( &m_ipkgArgs, (*parameters.begin()), &fIpkgFiles, 0l ); + disconnect( this, SIGNAL(signalIpkgList(const QString &)), 0, 0 ); ++#endif + }; + break; + default : break; +--- packagemanager/oipkg.h 2010-03-17 21:43:48.000000000 +0000 ++++ packagemanager/oipkg.h 2010-03-17 22:50:24.000000000 +0000 +@@ -31,6 +31,8 @@ + #ifndef OIPKG_H + #define OIPKG_H + ++#include ++ + #include "oconfitem.h" + #include "opackage.h" + +@@ -38,10 +40,27 @@ + + #include + ++// Hack for 1.2.4 patch ++#define USE_LIBOPKG ++ ++#ifdef USE_LIBOPKG ++// Some hacks are required due to poor naming in opkg headers ++#ifdef DEBUG ++ #define DEBUG_FIX ++ #undef DEBUG ++#endif ++ + extern "C" { + #include + }; + ++#ifdef DEBUG_FIX ++ #define DEBUG ++ #undef DEBUG_FIX ++#endif ++ ++#endif ++ + // Ipkg execution options (m_ipkgExecOptions) + #define FORCE_DEPENDS 0x0001 + #define FORCE_REMOVE 0x0002 +@@ -102,7 +121,6 @@ + int m_ipkgExecOptions; // Bit-mapped flags for Ipkg execution options + int m_ipkgExecVerbosity; // Ipkg execution verbosity level + QString m_rootPath; // Directory path where the 'root' destination is located +- opkg_t *m_opkg; + + void loadConfiguration(); + OConfItemList *filterConfItems( OConfItem::Type typefilter = OConfItem::NotDefined ); diff --git a/recipes/opie-packagemanager/opie-packagemanager_1.2.4.bb b/recipes/opie-packagemanager/opie-packagemanager_1.2.4.bb index 57c6ab5cfa..28fc5b873b 100644 --- a/recipes/opie-packagemanager/opie-packagemanager_1.2.4.bb +++ b/recipes/opie-packagemanager/opie-packagemanager_1.2.4.bb @@ -1,6 +1,6 @@ require ${PN}.inc -PR = "r1" +PR = "r2" DEPENDS = "opkg" @@ -10,4 +10,5 @@ SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/${APPNAME};c ${HANDHELDS_CVS};tag=${TAG};module=opie/pics;cvsdate=${SRCDATE} \ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \ file://split-config.patch;patch=1 \ - file://opkg.patch;patch=1" + file://opkg.patch;patch=1 \ + file://opkg_update.patch;patch=1" -- cgit v1.2.3 From 39a6937fd60d946b405b35547a041c617e541d17 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Wed, 17 Mar 2010 15:32:57 +0800 Subject: curl-sdk: Upgrade to 7.19.7 This addresses CVE-2009-0037 --- recipes/curl/curl-sdk-7.19.7/pkgconfig_fix.patch | 13 +++++++++++++ recipes/curl/curl-sdk_7.18.2.bb | 6 ------ recipes/curl/curl-sdk_7.19.7.bb | 10 ++++++++++ 3 files changed, 23 insertions(+), 6 deletions(-) create mode 100644 recipes/curl/curl-sdk-7.19.7/pkgconfig_fix.patch delete mode 100644 recipes/curl/curl-sdk_7.18.2.bb create mode 100644 recipes/curl/curl-sdk_7.19.7.bb diff --git a/recipes/curl/curl-sdk-7.19.7/pkgconfig_fix.patch b/recipes/curl/curl-sdk-7.19.7/pkgconfig_fix.patch new file mode 100644 index 0000000000..7966779d4a --- /dev/null +++ b/recipes/curl/curl-sdk-7.19.7/pkgconfig_fix.patch @@ -0,0 +1,13 @@ +Index: curl-7.16.4/libcurl.pc.in +=================================================================== +--- curl-7.16.4.orig/libcurl.pc.in 2007-02-18 09:41:27.000000000 +0000 ++++ curl-7.16.4/libcurl.pc.in 2008-03-18 11:42:43.000000000 +0000 +@@ -33,6 +33,6 @@ + URL: http://curl.haxx.se/ + Description: Library to transfer files with ftp, http, etc. + Version: @VERSION@ +-Libs: -L${libdir} -lcurl @LDFLAGS@ @LIBS@ +-Libs.private: @LIBCURL_LIBS@ @LIBS@ ++Libs: -L${libdir} -lcurl ++Libs.private: -ldl -lz + Cflags: -I${includedir} diff --git a/recipes/curl/curl-sdk_7.18.2.bb b/recipes/curl/curl-sdk_7.18.2.bb deleted file mode 100644 index e26c53299d..0000000000 --- a/recipes/curl/curl-sdk_7.18.2.bb +++ /dev/null @@ -1,6 +0,0 @@ -require curl-common.inc -inherit sdk -DEPENDS = "zlib-sdk" -SRC_URI += "file://curl-7.18.1-CVE-2009-2417.patch;patch=1;pnum=0" - -PR = "${INC_PR}.2" diff --git a/recipes/curl/curl-sdk_7.19.7.bb b/recipes/curl/curl-sdk_7.19.7.bb new file mode 100644 index 0000000000..0b2a6069da --- /dev/null +++ b/recipes/curl/curl-sdk_7.19.7.bb @@ -0,0 +1,10 @@ +require curl-common.inc +inherit sdk +DEPENDS = "zlib-sdk" + +SRC_URI[tarball.md5sum] = "79a8fbb2eed5464b97bdf94bee109380" +SRC_URI[tarball.sha256sum] = "1a15f94ae3401e3bd6208ce64155c2577815019824bceae7fd3221a12bc54a70" + +EXTRA_OECONF = " --without-gnutls " + +PR = "${INC_PR}.0" -- cgit v1.2.3 From 0331fa55449e686d0ecba81fdd9d3a1248461a41 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Thu, 18 Mar 2010 16:02:01 +0800 Subject: dpkg: Upgrade to 1.14.29 to address a flaw in dpkg-source Addresses CVE-2010-0396. --- conf/checksums.ini | 12 ----------- .../dpkg/dpkg-1.14.25/ignore_extra_fields.patch | 24 ---------------------- .../dpkg/dpkg-1.14.29/ignore_extra_fields.patch | 24 ++++++++++++++++++++++ recipes/dpkg/dpkg-native_1.14.25.bb | 3 --- recipes/dpkg/dpkg-native_1.14.29.bb | 6 ++++++ recipes/dpkg/dpkg.inc | 2 +- recipes/dpkg/dpkg_1.14.25.bb | 12 ----------- recipes/dpkg/dpkg_1.14.29.bb | 14 +++++++++++++ 8 files changed, 45 insertions(+), 52 deletions(-) delete mode 100644 recipes/dpkg/dpkg-1.14.25/ignore_extra_fields.patch create mode 100644 recipes/dpkg/dpkg-1.14.29/ignore_extra_fields.patch delete mode 100644 recipes/dpkg/dpkg-native_1.14.25.bb create mode 100644 recipes/dpkg/dpkg-native_1.14.29.bb delete mode 100644 recipes/dpkg/dpkg_1.14.25.bb create mode 100644 recipes/dpkg/dpkg_1.14.29.bb diff --git a/conf/checksums.ini b/conf/checksums.ini index e8ee8c2dab..059b2199f3 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -5718,18 +5718,6 @@ sha256=5287e943265b9efe5bd59cd1f3145d3fbf9e266df28938ad78e2107fde3c1587 md5=9c1744d32ceed71cbe1db863f64d329d sha256=7d27f2389e05b8727c6a7126c0b65d67749c170ba143e648912a88f2fe707bca -[ftp://ftp.debian.org/debian/pool/main/d/dpkg/dpkg_1.14.25.tar.gz] -md5=6bf3504b07d8fe2175a5d794391280de -sha256=545ce9830f0cf649e3b1b40d25d13989c23302623bf9b50f4c24402f63c82184 - -[ftp://ftp.pl.debian.org/pub/debian/pool/main/d/dpkg/dpkg_1.14.25.tar.gz] -md5=6bf3504b07d8fe2175a5d794391280de -sha256=545ce9830f0cf649e3b1b40d25d13989c23302623bf9b50f4c24402f63c82184 - -[ftp://ftp.us.debian.org/debian/pool/main/d/dpkg/dpkg_1.14.25.tar.gz] -md5=6bf3504b07d8fe2175a5d794391280de -sha256=545ce9830f0cf649e3b1b40d25d13989c23302623bf9b50f4c24402f63c82184 - [http://xorg.freedesktop.org/releases/individual/proto/dri2proto-1.1.tar.bz2] md5=1d70f0653b0b3a837853262dc5d34da4 sha256=69def6d1f64b3699ec9c729596d8b096623a62bdda6bbea78ed690421d174c11 diff --git a/recipes/dpkg/dpkg-1.14.25/ignore_extra_fields.patch b/recipes/dpkg/dpkg-1.14.25/ignore_extra_fields.patch deleted file mode 100644 index e47af42bc6..0000000000 --- a/recipes/dpkg/dpkg-1.14.25/ignore_extra_fields.patch +++ /dev/null @@ -1,24 +0,0 @@ - dpkg-deb/build.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -Index: dpkg-1.14.23/dpkg-deb/build.c -=================================================================== ---- dpkg-1.14.23.orig/dpkg-deb/build.c 2008-11-18 10:57:33.000000000 +0000 -+++ dpkg-1.14.23/dpkg-deb/build.c 2008-12-15 11:27:08.000000000 +0000 -@@ -243,14 +243,14 @@ - controlfile, checkedinfo->otherpriority); - warns++; - } -- for (field= checkedinfo->available.arbs; field; field= field->next) { -+ /*for (field= checkedinfo->available.arbs; field; field= field->next) { - if (known_arbitrary_field(field)) - continue; - - fprintf(stderr, _("warning, `%s' contains user-defined field `%s'\n"), - controlfile, field->name); - warns++; -- } -+ }*/ - checkversion(checkedinfo->available.version.version,"(upstream) version",&errs); - checkversion(checkedinfo->available.version.revision,"Debian revision",&errs); - if (errs) ohshit(_("%d errors in control file"),errs); diff --git a/recipes/dpkg/dpkg-1.14.29/ignore_extra_fields.patch b/recipes/dpkg/dpkg-1.14.29/ignore_extra_fields.patch new file mode 100644 index 0000000000..e47af42bc6 --- /dev/null +++ b/recipes/dpkg/dpkg-1.14.29/ignore_extra_fields.patch @@ -0,0 +1,24 @@ + dpkg-deb/build.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +Index: dpkg-1.14.23/dpkg-deb/build.c +=================================================================== +--- dpkg-1.14.23.orig/dpkg-deb/build.c 2008-11-18 10:57:33.000000000 +0000 ++++ dpkg-1.14.23/dpkg-deb/build.c 2008-12-15 11:27:08.000000000 +0000 +@@ -243,14 +243,14 @@ + controlfile, checkedinfo->otherpriority); + warns++; + } +- for (field= checkedinfo->available.arbs; field; field= field->next) { ++ /*for (field= checkedinfo->available.arbs; field; field= field->next) { + if (known_arbitrary_field(field)) + continue; + + fprintf(stderr, _("warning, `%s' contains user-defined field `%s'\n"), + controlfile, field->name); + warns++; +- } ++ }*/ + checkversion(checkedinfo->available.version.version,"(upstream) version",&errs); + checkversion(checkedinfo->available.version.revision,"Debian revision",&errs); + if (errs) ohshit(_("%d errors in control file"),errs); diff --git a/recipes/dpkg/dpkg-native_1.14.25.bb b/recipes/dpkg/dpkg-native_1.14.25.bb deleted file mode 100644 index 47c03424be..0000000000 --- a/recipes/dpkg/dpkg-native_1.14.25.bb +++ /dev/null @@ -1,3 +0,0 @@ -require dpkg-native.inc - -PR = "r1" diff --git a/recipes/dpkg/dpkg-native_1.14.29.bb b/recipes/dpkg/dpkg-native_1.14.29.bb new file mode 100644 index 0000000000..f04662caa9 --- /dev/null +++ b/recipes/dpkg/dpkg-native_1.14.29.bb @@ -0,0 +1,6 @@ +require dpkg-native.inc + +SRC_URI[src.md5sum] = "4326172a959b5b6484b4bc126e9f628d" +SRC_URI[src.sha256sum] = "ea7ec1c861af43ba534a0d7997774a5f1fd4e25a7eea4ff229c9c7bf89aed633" + +PR = "r1" diff --git a/recipes/dpkg/dpkg.inc b/recipes/dpkg/dpkg.inc index b15a6365b4..f665b4ba15 100644 --- a/recipes/dpkg/dpkg.inc +++ b/recipes/dpkg/dpkg.inc @@ -2,7 +2,7 @@ DESCRIPTION = "Package maintenance system for Debian." LICENSE = "GPL" SECTION = "base" -SRC_URI = "${DEBIAN_MIRROR}/main/d/dpkg/dpkg_${PV}.tar.gz \ +SRC_URI = "${DEBIAN_MIRROR}/main/d/dpkg/dpkg_${PV}.tar.gz;name=src \ file://ignore_extra_fields.patch;patch=1 \ file://noupdalt.patch;patch=1" diff --git a/recipes/dpkg/dpkg_1.14.25.bb b/recipes/dpkg/dpkg_1.14.25.bb deleted file mode 100644 index 0377ce10f1..0000000000 --- a/recipes/dpkg/dpkg_1.14.25.bb +++ /dev/null @@ -1,12 +0,0 @@ -require dpkg.inc -PR = "r1" -DEPENDS += "zlib bzip2" -#RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_update-alternatives}" -SRC_URI += "file://noman.patch;patch=1" - -EXTRA_OECONF = "--without-static-progs \ - --without-dselect \ - --with-start-stop-daemon \ - --with-zlib \ - --with-bz2lib \ - --without-sgml-doc" diff --git a/recipes/dpkg/dpkg_1.14.29.bb b/recipes/dpkg/dpkg_1.14.29.bb new file mode 100644 index 0000000000..a5016e7ebd --- /dev/null +++ b/recipes/dpkg/dpkg_1.14.29.bb @@ -0,0 +1,14 @@ +require dpkg.inc +PR = "r1" +DEPENDS += "zlib bzip2" +#RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_update-alternatives}" +SRC_URI += "file://noman.patch;patch=1" +SRC_URI[src.md5sum] = "4326172a959b5b6484b4bc126e9f628d" +SRC_URI[src.sha256sum] = "ea7ec1c861af43ba534a0d7997774a5f1fd4e25a7eea4ff229c9c7bf89aed633" + +EXTRA_OECONF = "--without-static-progs \ + --without-dselect \ + --with-start-stop-daemon \ + --with-zlib \ + --with-bz2lib \ + --without-sgml-doc" -- cgit v1.2.3 From 75d85f77f336fb67b752f227f24351131b329924 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Thu, 18 Mar 2010 19:29:19 +0800 Subject: ez-ipzpdate.bb: Address flaw in syslog handling Address CVE-2004-0980. --- recipes/ez-ipupdate/ez-ipupdate_3.0.10.bb | 3 ++- recipes/ez-ipupdate/files/CVE-2004-0980.patch | 13 +++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 recipes/ez-ipupdate/files/CVE-2004-0980.patch diff --git a/recipes/ez-ipupdate/ez-ipupdate_3.0.10.bb b/recipes/ez-ipupdate/ez-ipupdate_3.0.10.bb index f3434e16f9..661ff96a48 100644 --- a/recipes/ez-ipupdate/ez-ipupdate_3.0.10.bb +++ b/recipes/ez-ipupdate/ez-ipupdate_3.0.10.bb @@ -4,12 +4,13 @@ HOMEPAGE = "http://www.ez-ipupdate.com/" SECTION = "console/network" PRIORITY = "optional" LICENSE = "GPL" -PR = "r1" +PR = "r2" SRC_URI = "http://www.ez-ipupdate.com/dist/ez-ipupdate-${PV}.tar.gz \ file://configure.patch;patch=1 \ file://conffile.patch;patch=1 \ file://zoneedit.patch;patch=1 \ + file://CVE-2004-0980.patch;patch=1;pnum=0 \ file://init \ file://ipupdate.conf \ " diff --git a/recipes/ez-ipupdate/files/CVE-2004-0980.patch b/recipes/ez-ipupdate/files/CVE-2004-0980.patch new file mode 100644 index 0000000000..27b7ee9056 --- /dev/null +++ b/recipes/ez-ipupdate/files/CVE-2004-0980.patch @@ -0,0 +1,13 @@ +$FreeBSD: ports/dns/ez-ipupdate/files/patch-ez-ipupdate.c,v 1.1 2004/11/11 15:46:04 naddy Exp $ + +--- ez-ipupdate.c.orig ++++ ez-ipupdate.c +@@ -798,7 +798,7 @@ + sprintf(buf, "message incomplete because your OS sucks: %s\n", fmt); + #endif + +- syslog(LOG_NOTICE, buf); ++ syslog(LOG_NOTICE, "%s", buf); + } + else + { -- cgit v1.2.3 From 1d85542eb64ec28aae9b70694b4f8b7680b42c0d Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Thu, 18 Mar 2010 13:51:10 +0100 Subject: oe_audit.py: Document a bug which was uncovered on chat --- contrib/qa/oe_audit.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/contrib/qa/oe_audit.py b/contrib/qa/oe_audit.py index 6a820cd618..7e04480626 100755 --- a/contrib/qa/oe_audit.py +++ b/contrib/qa/oe_audit.py @@ -169,7 +169,7 @@ def create_infos(line): break if is_not_in_oe(name): - print "Not in oe %s" % name + #print "Not in oe %s" % name return [] link = split[1] @@ -213,6 +213,7 @@ def strip_bsd_version(bsd_version): """ FreeBSD is adding ,1 for revisions.. remove that """ + # FIXME return a tuple with a revision... split = bsd_version.rsplit(',', 1) split = split[0] split = split.rsplit('_', 1) -- cgit v1.2.3 From bd415877ea420a848481f72a3227fdc577c5242c Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Thu, 18 Mar 2010 13:56:59 +0100 Subject: oe_audit.py: Parse the full output of bitbake -s Instead of being forced to manually edit we can now parse the full output of bitbake -s. --- contrib/qa/oe_audit.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/contrib/qa/oe_audit.py b/contrib/qa/oe_audit.py index 7e04480626..905f1108d3 100755 --- a/contrib/qa/oe_audit.py +++ b/contrib/qa/oe_audit.py @@ -11,6 +11,9 @@ def read_available(filename): packages = {} for line in f: + if line.startswith("NOTE: ") or line.startswith("Parsing .bb"): + continue + # str.split can not be used as we have multiple whitespace first_space = line.find(" ") package = line[0:first_space] -- cgit v1.2.3 From f6f5cd1ab81b90a0cefff168ad5c9f69950a8553 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 18 Mar 2010 14:05:59 +0100 Subject: dbus: add 1.2.22 --- ...e-default-DBus-reply-timeout-configurable.patch | 78 +++++++++++++++ recipes/dbus/dbus-1.2.22/dbus-1.init | 111 +++++++++++++++++++++ recipes/dbus/dbus-1.2.22/fix-install-daemon.patch | 13 +++ recipes/dbus/dbus-1.2.22/tmpdir.patch | 30 ++++++ recipes/dbus/dbus_1.2.22.bb | 13 +++ 5 files changed, 245 insertions(+) create mode 100644 recipes/dbus/dbus-1.2.22/0001-Make-the-default-DBus-reply-timeout-configurable.patch create mode 100644 recipes/dbus/dbus-1.2.22/dbus-1.init create mode 100644 recipes/dbus/dbus-1.2.22/fix-install-daemon.patch create mode 100644 recipes/dbus/dbus-1.2.22/tmpdir.patch create mode 100644 recipes/dbus/dbus_1.2.22.bb diff --git a/recipes/dbus/dbus-1.2.22/0001-Make-the-default-DBus-reply-timeout-configurable.patch b/recipes/dbus/dbus-1.2.22/0001-Make-the-default-DBus-reply-timeout-configurable.patch new file mode 100644 index 0000000000..a38e3db0de --- /dev/null +++ b/recipes/dbus/dbus-1.2.22/0001-Make-the-default-DBus-reply-timeout-configurable.patch @@ -0,0 +1,78 @@ +From fb546488e93a1638d377b228bbb0d2ab58462168 Mon Sep 17 00:00:00 2001 +From: Daniel Willmann +Date: Thu, 2 Oct 2008 15:50:17 +0800 +Subject: [PATCH] Make the default DBus reply timeout configurable + +This patch adds an option --with-dbus-default-reply-timeout to configure +that will set the default reply timeout used by libdbus in milliseconds. +autoconf and autoheader need to be rerun in order to regenerate the +correct configure and config.h.in files. +--- + configure.in | 9 +++++++++ + dbus/dbus-connection-internal.h | 3 --- + dbus/dbus-pending-call.c | 1 + + 3 files changed, 10 insertions(+), 3 deletions(-) + +diff --git a/configure.in b/configure.in +index 62ac387..5c912d7 100644 +--- a/configure.in ++++ b/configure.in +@@ -88,6 +88,7 @@ AC_ARG_WITH(console-auth-dir, AS_HELP_STRING([--with-console-auth-dir=[dirname]] + AC_ARG_WITH(console-owner-file, AS_HELP_STRING([--with-console-owner-file=[filename]],[file whose owner determines current console owner])) + AC_ARG_WITH(dbus_user, AS_HELP_STRING([--with-dbus-user=],[User for running the DBUS daemon (messagebus)])) + AC_ARG_WITH(dbus_daemondir, AS_HELP_STRING([--with-dbus-daemondir=[dirname]],[Directory for installing the DBUS daemon])) ++AC_ARG_WITH(dbus_default_reply_timeout, AS_HELP_STRING([--with-dbus-default-reply-timeout=[milliseconds]],[Default reply timeout for DBus method calls])) + + AC_DEFINE(DBUS_UNIX,1,[dbus on unix]) + +@@ -986,6 +987,13 @@ if test x$have_libaudit = xyes ; then + AC_DEFINE(HAVE_LIBAUDIT,1,[audit daemon SELinux support]) + fi + ++if test -z "$with_dbus_default_reply_timeout" ; then ++ DBUS_DEFAULT_REPLY_TIMEOUT=25000 ++else ++ DBUS_DEFAULT_REPLY_TIMEOUT=$with_dbus_default_reply_timeout ++fi ++AC_DEFINE_UNQUOTED(_DBUS_DEFAULT_TIMEOUT_VALUE,$DBUS_DEFAULT_REPLY_TIMEOUT,[default timeout value for dbus calls]) ++ + #### Set up final flags + DBUS_CLIENT_CFLAGS= + DBUS_CLIENT_LIBS="$THREAD_LIBS" +@@ -1348,6 +1356,7 @@ echo " + Gettext libs (empty OK): ${INTLLIBS} + Using XML parser: ${with_xml} + Init scripts style: ${with_init_scripts} ++ Default reply timeout: ${DBUS_DEFAULT_REPLY_TIMEOUT} + Abstract socket names: ${ac_cv_have_abstract_sockets} + System bus socket: ${DBUS_SYSTEM_SOCKET} + System bus address: ${DBUS_SYSTEM_BUS_DEFAULT_ADDRESS} +diff --git a/dbus/dbus-connection-internal.h b/dbus/dbus-connection-internal.h +index df54412..5fe536b 100644 +--- a/dbus/dbus-connection-internal.h ++++ b/dbus/dbus-connection-internal.h +@@ -41,9 +41,6 @@ typedef enum + DBUS_ITERATION_BLOCK = 1 << 2 /**< Block if nothing to do. */ + } DBusIterationFlags; + +-/** default timeout value when waiting for a message reply, 25 seconds */ +-#define _DBUS_DEFAULT_TIMEOUT_VALUE (25 * 1000) +- + void _dbus_connection_lock (DBusConnection *connection); + void _dbus_connection_unlock (DBusConnection *connection); + DBusConnection * _dbus_connection_ref_unlocked (DBusConnection *connection); +diff --git a/dbus/dbus-pending-call.c b/dbus/dbus-pending-call.c +index 51b9378..5a7a5f4 100644 +--- a/dbus/dbus-pending-call.c ++++ b/dbus/dbus-pending-call.c +@@ -21,6 +21,7 @@ + * + */ + ++#include + #include "dbus-internals.h" + #include "dbus-connection-internal.h" + #include "dbus-pending-call-internal.h" +-- +1.5.6.4 + diff --git a/recipes/dbus/dbus-1.2.22/dbus-1.init b/recipes/dbus/dbus-1.2.22/dbus-1.init new file mode 100644 index 0000000000..8209454088 --- /dev/null +++ b/recipes/dbus/dbus-1.2.22/dbus-1.init @@ -0,0 +1,111 @@ +#! /bin/sh +# -*- coding: utf-8 -*- +# Debian init.d script for D-BUS +# Copyright © 2003 Colin Walters +# Copyright 2008 OE Team + +set -e + +DAEMON=/usr/bin/dbus-daemon +NAME=dbus +DAEMONUSER=messagebus +RUNDIR=/var/run/dbus +PIDFILE=/var/run/dbus/pid +UUIDDIR=/var/lib/dbus +DESC="system message bus" +EVENTDIR=/etc/dbus-1/event.d + +test -x $DAEMON || exit 0 + +# Source defaults file; edit that file to configure this script. +ENABLED=1 +PARAMS="" +if [ -e /etc/default/dbus ]; then + . /etc/default/dbus +fi + +test "$ENABLED" != "0" || exit 0 + +start_it_up() +{ + if [ ! -d $RUNDIR ]; then + mkdir -p $RUNDIR + chown $DAEMONUSER $RUNDIR + chgrp $DAEMONUSER $RUNDIR + fi + if [ -e $PIDFILE ]; then + PIDDIR=/proc/$(cat $PIDFILE) + if [ -d ${PIDDIR} -a "$(readlink -f ${PIDDIR}/exe)" = "${DAEMON}" ]; then + echo "$DESC already started; not starting." + else + echo "Removing stale PID file $PIDFILE." + rm -f $PIDFILE + fi + fi + + if [ ! -d $UUIDDIR ]; then + mkdir -p $UUIDDIR + chown $DAEMONUSER $UUIDDIR + chgrp $DAEMONUSER $UUIDDIR + fi + + dbus-uuidgen --ensure + + echo -n "Starting $DESC: " + start-stop-daemon --start --pidfile $PIDFILE \ + --user $DAEMONUSER --exec $DAEMON -- --system $PARAMS + echo "$NAME." + if [ -d $EVENTDIR ]; then + run-parts --arg=start $EVENTDIR + fi +} + +shut_it_down() +{ + if [ -d $EVENTDIR ]; then + # TODO: --reverse when busybox supports it + run-parts --arg=stop $EVENTDIR + fi + echo -n "Stopping $DESC: " + start-stop-daemon --stop --oknodo --pidfile $PIDFILE \ + --user $DAEMONUSER + # We no longer include these arguments so that start-stop-daemon + # can do its job even given that we may have been upgraded. + # We rely on the pidfile being sanely managed + # --exec $DAEMON -- --system $PARAMS + echo "$NAME." + rm -f $PIDFILE +} + +reload_it() +{ + echo -n "Reloading $DESC config: " + dbus-send --print-reply --system --type=method_call \ + --dest=org.freedesktop.DBus \ + / org.freedesktop.DBus.ReloadConfig > /dev/null + # hopefully this is enough time for dbus to reload it's config file. + echo "done." +} + +case "$1" in + start) + start_it_up + ;; + stop) + shut_it_down + ;; + reload|force-reload) + reload_it + ;; + restart) + shut_it_down + sleep 1 + start_it_up + ;; + *) + echo "Usage: /etc/init.d/$NAME {start|stop|restart|reload|force-reload}" >&2 + exit 1 + ;; +esac + +exit 0 diff --git a/recipes/dbus/dbus-1.2.22/fix-install-daemon.patch b/recipes/dbus/dbus-1.2.22/fix-install-daemon.patch new file mode 100644 index 0000000000..c31786357d --- /dev/null +++ b/recipes/dbus/dbus-1.2.22/fix-install-daemon.patch @@ -0,0 +1,13 @@ +Index: dbus-0.94/bus/Makefile.am +=================================================================== +--- dbus-0.94.orig/bus/Makefile.am 2006-10-01 17:36:18.000000000 +0200 ++++ dbus-0.94/bus/Makefile.am 2006-10-14 21:40:05.000000000 +0200 +@@ -110,7 +110,7 @@ + $(mkinstalldirs) $(DESTDIR)$(DBUS_DAEMONDIR); \ + chmod 755 $(DESTDIR)$(DBUS_DAEMONDIR); \ + fi +- $(INSTALL_PROGRAM) dbus-daemon $(DESTDIR)$(DBUS_DAEMONDIR) ++ $(INSTALL_PROGRAM) .libs/dbus-daemon $(DESTDIR)$(DBUS_DAEMONDIR) + $(mkinstalldirs) $(DESTDIR)$(localstatedir)/run/dbus + $(mkinstalldirs) $(DESTDIR)$(configdir)/system.d + $(mkinstalldirs) $(DESTDIR)$(datadir)/dbus-1/services diff --git a/recipes/dbus/dbus-1.2.22/tmpdir.patch b/recipes/dbus/dbus-1.2.22/tmpdir.patch new file mode 100644 index 0000000000..838b903f0a --- /dev/null +++ b/recipes/dbus/dbus-1.2.22/tmpdir.patch @@ -0,0 +1,30 @@ +--- dbus-0.22/configure.in.orig 2004-08-13 00:57:16.000000000 +0200 ++++ dbus-0.22/configure.in 2004-12-30 21:15:57.000000000 +0100 +@@ -1047,15 +1048,18 @@ + AC_SUBST(ABSOLUTE_TOP_BUILDDIR) + + #### Find socket directories +-if ! test -z "$TMPDIR" ; then +- DEFAULT_SOCKET_DIR=$TMPDIR +-elif ! test -z "$TEMP" ; then +- DEFAULT_SOCKET_DIR=$TEMP +-elif ! test -z "$TMP" ; then +- DEFAULT_SOCKET_DIR=$TMP +-else +- DEFAULT_SOCKET_DIR=/tmp +-fi ++#if ! test -z "$TMPDIR" ; then ++# DEFAULT_SOCKET_DIR=$TMPDIR ++#elif ! test -z "$TEMP" ; then ++# DEFAULT_SOCKET_DIR=$TEMP ++#elif ! test -z "$TMP" ; then ++# DEFAULT_SOCKET_DIR=$TMP ++#else ++# DEFAULT_SOCKET_DIR=/tmp ++#fi ++ ++# checks disabled to avoid expanding this at build time ++DEFAULT_SOCKET_DIR=/tmp + + if ! test -z "$with_test_socket_dir" ; then + TEST_SOCKET_DIR="$with_test_socket_dir" diff --git a/recipes/dbus/dbus_1.2.22.bb b/recipes/dbus/dbus_1.2.22.bb new file mode 100644 index 0000000000..2e10ddebaf --- /dev/null +++ b/recipes/dbus/dbus_1.2.22.bb @@ -0,0 +1,13 @@ +include dbus.inc + +SRC_URI = "\ + http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz;name=dbus \ + file://tmpdir.patch;patch=1 \ + file://fix-install-daemon.patch;patch=1 \ + file://0001-Make-the-default-DBus-reply-timeout-configurable.patch;patch=1 \ + file://dbus-1.init \ +" + +SRC_URI[dbus.md5sum] = "54c5f3c79a1f852d2256aca07163813c" +SRC_URI[dbus.sha256sum] = "4cc258b4bc27f4af1233cf100e832c952fd4b7ce8ecb07d291d65ee137a38db7" + -- cgit v1.2.3 From 9355f83bdabdfa59df848638d909fbaffda6c23a Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 18 Mar 2010 14:06:09 +0100 Subject: angstrom: prefer dbus 1.2.22 --- conf/distro/include/angstrom-2008-preferred-versions.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc index 6f576d711b..168eb1634c 100644 --- a/conf/distro/include/angstrom-2008-preferred-versions.inc +++ b/conf/distro/include/angstrom-2008-preferred-versions.inc @@ -5,7 +5,7 @@ PREFERRED_VERSION_autoconf-native = "2.63" PREFERRED_VERSION_automake-native = "1.10.2" PREFERRED_VERSION_busybox = "1.13.2" PREFERRED_VERSION_cairo = "1.8.10" -PREFERRED_VERSION_dbus = "1.2.20" +PREFERRED_VERSION_dbus = "1.2.22" PREFERRED_VERSION_dropbear = "0.51" PREFERRED_VERSION_fontconfig = "2.6.0" PREFERRED_VERSION_glib-2.0 = "2.22.4" -- cgit v1.2.3 From 091ae3e58b2c658d7d820126fa3ac70923395dc7 Mon Sep 17 00:00:00 2001 From: Valery Febvre Date: Wed, 17 Mar 2010 15:47:51 +0000 Subject: NeoLight: new recipe (version 1.4.0 from svn) NeoLight turns your mobile device into a flashlight. Signed-off-by: Martin Jansa --- recipes/openmoko-3rdparty/neolight_svn.bb | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 recipes/openmoko-3rdparty/neolight_svn.bb diff --git a/recipes/openmoko-3rdparty/neolight_svn.bb b/recipes/openmoko-3rdparty/neolight_svn.bb new file mode 100644 index 0000000000..8568072d85 --- /dev/null +++ b/recipes/openmoko-3rdparty/neolight_svn.bb @@ -0,0 +1,24 @@ +DESCRIPTION = "An application to turn your mobile device into a flashlight" +HOMEPAGE = "http://code.google.com/p/neolight/" +LICENSE = "GPLv3" +AUTHOR = "Valéry Febvre " +SECTION = "x11/applications" +PRIORITY = "optional" + +SRCREV = "16" +PV = "1.4.0+svnr${SRCPV}" + +PACKAGE_ARCH = "all" + +SRC_URI = "svn://neolight.googlecode.com/svn;module=trunk;proto=http" +S = "${WORKDIR}/trunk" + +inherit distutils + +FILES_${PN} += "${datadir}/neolight ${datadir}/applications/neolight.desktop ${datadir}/pixmaps/neolight.png" + +RDEPENDS += "python-edbus python-elementary" + +do_compile_prepend() { + ${STAGING_BINDIR_NATIVE}/edje_cc -id ${S}/data ${S}/data/neolight.edc +} -- cgit v1.2.3 From d8fd10392b2c47ee5cb13125f85c5ca39e063e5a Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 17 Mar 2010 15:55:51 +0100 Subject: task-shr-feed: add neolight Signed-off-by: Martin Jansa --- recipes/tasks/task-shr-feed.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/recipes/tasks/task-shr-feed.bb b/recipes/tasks/task-shr-feed.bb index ef47ec5da0..6e32310ac6 100644 --- a/recipes/tasks/task-shr-feed.bb +++ b/recipes/tasks/task-shr-feed.bb @@ -1,5 +1,5 @@ DESCRIPTION = "SHR Feed" -PR = "r46" +PR = "r47" PV = "1.0" LICENSE = "GPL" @@ -282,6 +282,7 @@ RDEPENDS_${PN} += "\ emtooth \ podboy \ mcnavi \ + neolight \ " # this is only usefull on gta02 and on other devices it's trying to pull mesa-dri (not respecting DEFAULT_PROVIDER for virtual/libgl) -- cgit v1.2.3 From 637b3e48686a0e07c729ba0412c6f3e1377a332d Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 18 Mar 2010 09:21:28 +0100 Subject: makedepend: convert to BBCLASSEXTEND, .inc, move checksums to recipe Signed-off-by: Martin Jansa --- recipes/xorg-util/makedepend-native_1.0.1.bb | 9 --------- recipes/xorg-util/makedepend-native_1.0.2.bb | 9 --------- recipes/xorg-util/makedepend.inc | 8 ++++++++ recipes/xorg-util/makedepend_1.0.1.bb | 10 ++++------ recipes/xorg-util/makedepend_1.0.2.bb | 10 ++++------ 5 files changed, 16 insertions(+), 30 deletions(-) delete mode 100644 recipes/xorg-util/makedepend-native_1.0.1.bb delete mode 100644 recipes/xorg-util/makedepend-native_1.0.2.bb create mode 100644 recipes/xorg-util/makedepend.inc diff --git a/recipes/xorg-util/makedepend-native_1.0.1.bb b/recipes/xorg-util/makedepend-native_1.0.1.bb deleted file mode 100644 index 9facfc69fa..0000000000 --- a/recipes/xorg-util/makedepend-native_1.0.1.bb +++ /dev/null @@ -1,9 +0,0 @@ -require xorg-util-common.inc -inherit native - -DESCRIPTION = "create dependencies in makefiles" -DEPENDS = "xproto-native util-macros-native" -PR = "r2" -PE = "1" - -XORG_PN = "makedepend" diff --git a/recipes/xorg-util/makedepend-native_1.0.2.bb b/recipes/xorg-util/makedepend-native_1.0.2.bb deleted file mode 100644 index 9facfc69fa..0000000000 --- a/recipes/xorg-util/makedepend-native_1.0.2.bb +++ /dev/null @@ -1,9 +0,0 @@ -require xorg-util-common.inc -inherit native - -DESCRIPTION = "create dependencies in makefiles" -DEPENDS = "xproto-native util-macros-native" -PR = "r2" -PE = "1" - -XORG_PN = "makedepend" diff --git a/recipes/xorg-util/makedepend.inc b/recipes/xorg-util/makedepend.inc new file mode 100644 index 0000000000..b1a27c69e0 --- /dev/null +++ b/recipes/xorg-util/makedepend.inc @@ -0,0 +1,8 @@ +require xorg-util-common.inc +DESCRIPTION = "create dependencies in makefiles" +DEPENDS = "xproto util-macros" + +PE = "1" +INC_PR = "r4" + +BBCLASSEXTEND = "native" diff --git a/recipes/xorg-util/makedepend_1.0.1.bb b/recipes/xorg-util/makedepend_1.0.1.bb index e998bba1b0..05cc5e63c7 100644 --- a/recipes/xorg-util/makedepend_1.0.1.bb +++ b/recipes/xorg-util/makedepend_1.0.1.bb @@ -1,6 +1,4 @@ -require xorg-util-common.inc - -DESCRIPTION = "create dependencies in makefiles" -DEPENDS = "xproto util-macros" -PR = "r2" -PE = "1" +require makedepend.inc +PR = "${INC_PR}.0" +SRC_URI[archive.md5sum] = "90f5f3b987497a481b94d49372f17dce" +SRC_URI[archive.sha256sum] = "0a4a0d4e2613b0cd4321e55fd4741788b728736fc8a517996e2015fa49862e61" diff --git a/recipes/xorg-util/makedepend_1.0.2.bb b/recipes/xorg-util/makedepend_1.0.2.bb index a7a2385506..2f7850de6d 100644 --- a/recipes/xorg-util/makedepend_1.0.2.bb +++ b/recipes/xorg-util/makedepend_1.0.2.bb @@ -1,6 +1,4 @@ -require xorg-util-common.inc - -DESCRIPTION = "create dependencies in makefiles" -DEPENDS = "xproto util-macros" -PR = "r3" -PE = "1" +require makedepend.inc +PR = "${INC_PR}.0" +SRC_URI[archive.md5sum] = "905bfeb1a59929d950e5d638fbadcf39" +SRC_URI[archive.sha256sum] = "008e6e117372e04cdc9a72ffc7dfae2e2d6617c9b399e052ae12dc2a1a03079a" -- cgit v1.2.3 From ea1b207ddfc13bd2cd278bbf0a4ed2eee799d73d Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 18 Mar 2010 09:22:41 +0100 Subject: xorg-util: add checksums to recipe Signed-off-by: Martin Jansa --- recipes/xorg-util/gccmakedep_1.0.2.bb | 2 ++ recipes/xorg-util/imake_1.0.2.bb | 2 ++ recipes/xorg-util/lndir_1.0.1.bb | 2 ++ recipes/xorg-util/util-macros_1.1.5.bb | 2 ++ recipes/xorg-util/util-macros_1.1.6.bb | 2 ++ recipes/xorg-util/util-macros_1.2.1.bb | 2 ++ recipes/xorg-util/util-macros_1.3.0.bb | 2 ++ recipes/xorg-util/util-macros_1.4.1.bb | 2 ++ recipes/xorg-util/util-macros_1.5.0.bb | 2 ++ recipes/xorg-util/xorg-cf-files_1.0.2.bb | 2 ++ recipes/xorg-util/xorg-cf-files_1.0.3.bb | 2 ++ 11 files changed, 22 insertions(+) diff --git a/recipes/xorg-util/gccmakedep_1.0.2.bb b/recipes/xorg-util/gccmakedep_1.0.2.bb index cb28a86703..1abaec582c 100644 --- a/recipes/xorg-util/gccmakedep_1.0.2.bb +++ b/recipes/xorg-util/gccmakedep_1.0.2.bb @@ -5,3 +5,5 @@ RDEPENDS = "gcc" PR = "r3" PE = "1" +SRC_URI[archive.md5sum] = "fc49f45251c1336fe1dad5dba1c83fcd" +SRC_URI[archive.sha256sum] = "fdd3963294e80b27416f902a5c029c033d321f03310d3cafa3afb62b50ddce92" diff --git a/recipes/xorg-util/imake_1.0.2.bb b/recipes/xorg-util/imake_1.0.2.bb index b0eda35823..4d3efd6d33 100644 --- a/recipes/xorg-util/imake_1.0.2.bb +++ b/recipes/xorg-util/imake_1.0.2.bb @@ -5,3 +5,5 @@ RDEPENDS = "perl xproto" PR = "r2" PE = "1" +SRC_URI[archive.md5sum] = "b5c3a719d60a14ca2378dc1259ee60df" +SRC_URI[archive.sha256sum] = "8008b4366ab96abfdac2c91808b79ec2cc5649966b41cfb07b14b6fbd798651c" diff --git a/recipes/xorg-util/lndir_1.0.1.bb b/recipes/xorg-util/lndir_1.0.1.bb index fffc71034e..05125179b3 100644 --- a/recipes/xorg-util/lndir_1.0.1.bb +++ b/recipes/xorg-util/lndir_1.0.1.bb @@ -3,3 +3,5 @@ require xorg-util-common.inc DESCRIPTION = "create a shadow directory of symbolic links to another directory tree" PR = "r2" PE = "1" +SRC_URI[archive.md5sum] = "1a53ddd7e1804abe8f3d9799a88b6aa8" +SRC_URI[archive.sha256sum] = "89bff89702ebf2e5cc2268d79d5a27c62190c5a85ab080935d4425d3e309bc57" diff --git a/recipes/xorg-util/util-macros_1.1.5.bb b/recipes/xorg-util/util-macros_1.1.5.bb index e67c9ef730..f8d0b14c16 100644 --- a/recipes/xorg-util/util-macros_1.1.5.bb +++ b/recipes/xorg-util/util-macros_1.1.5.bb @@ -1,3 +1,5 @@ require util-macros.inc SRC_URI += "file://unbreak_cross_compile.patch;patch=1" PR = "${INC_PR}.0" +SRC_URI[archive.md5sum] = "d168aa001b946b58d9aab6088c09d256" +SRC_URI[archive.sha256sum] = "4f2a8a19e90ad82bc2da4eb52799a299a1c94bf5143bc2711e9e5d4cc5a7cdb4" diff --git a/recipes/xorg-util/util-macros_1.1.6.bb b/recipes/xorg-util/util-macros_1.1.6.bb index 252a5cd10c..39ba8fab21 100644 --- a/recipes/xorg-util/util-macros_1.1.6.bb +++ b/recipes/xorg-util/util-macros_1.1.6.bb @@ -1,2 +1,4 @@ require util-macros.inc PR = "${INC_PR}.0" +SRC_URI[archive.md5sum] = "ea2d9cd33ca6fd05923f007bd74d7c37" +SRC_URI[archive.sha256sum] = "97748154c41a1cd12635a79aee0c2846fd48ecb555fc8b54e3e5baec174e6e74" diff --git a/recipes/xorg-util/util-macros_1.2.1.bb b/recipes/xorg-util/util-macros_1.2.1.bb index 2ff2e95d91..4cc3b25019 100644 --- a/recipes/xorg-util/util-macros_1.2.1.bb +++ b/recipes/xorg-util/util-macros_1.2.1.bb @@ -6,3 +6,5 @@ require util-macros.inc # builds with older gcc versions! SRC_URI += " file://cross-compiler-for-checking.patch;patch=1" PR = "${INC_PR}.0" +SRC_URI[archive.md5sum] = "81b9746d6202ccf0b4a498cfd0731e71" +SRC_URI[archive.sha256sum] = "f3804f02f51a1be243ce7413dc67dca774f000686f8f2efedc77203a1962d401" diff --git a/recipes/xorg-util/util-macros_1.3.0.bb b/recipes/xorg-util/util-macros_1.3.0.bb index 252a5cd10c..1663b7ca36 100644 --- a/recipes/xorg-util/util-macros_1.3.0.bb +++ b/recipes/xorg-util/util-macros_1.3.0.bb @@ -1,2 +1,4 @@ require util-macros.inc PR = "${INC_PR}.0" +SRC_URI[archive.md5sum] = "51bb54c08415ee3c3000b7df9e9b07c5" +SRC_URI[archive.sha256sum] = "57d2629849796b4dc919261eadd1eea3ee6e634d58979797287f7e09408cde67" diff --git a/recipes/xorg-util/util-macros_1.4.1.bb b/recipes/xorg-util/util-macros_1.4.1.bb index 3253d2b5a3..12e6b1e2cb 100644 --- a/recipes/xorg-util/util-macros_1.4.1.bb +++ b/recipes/xorg-util/util-macros_1.4.1.bb @@ -1,3 +1,5 @@ require util-macros.inc SRC_URI += " file://malloc_zero_returns_null.patch;patch=1" PR = "${INC_PR}.0" +SRC_URI[archive.md5sum] = "8ac38951e753f250aaefbd4ba0afda94" +SRC_URI[archive.sha256sum] = "d49ab68cad724ae51f6cb69f7f5cfff7629cbb066f4c5c8bda81d62675a21986" diff --git a/recipes/xorg-util/util-macros_1.5.0.bb b/recipes/xorg-util/util-macros_1.5.0.bb index 252a5cd10c..ff3b6f4bdc 100644 --- a/recipes/xorg-util/util-macros_1.5.0.bb +++ b/recipes/xorg-util/util-macros_1.5.0.bb @@ -1,2 +1,4 @@ require util-macros.inc PR = "${INC_PR}.0" +SRC_URI[archive.md5sum] = "ffef78135535c60c2b68d0a2a4ecae9b" +SRC_URI[archive.sha256sum] = "d47116ce5df198859a6082af7a72505575d1685b8c82bb4ef6fbedfa3316617e" diff --git a/recipes/xorg-util/xorg-cf-files_1.0.2.bb b/recipes/xorg-util/xorg-cf-files_1.0.2.bb index 7c3fb8d7e9..dcf1f1798d 100644 --- a/recipes/xorg-util/xorg-cf-files_1.0.2.bb +++ b/recipes/xorg-util/xorg-cf-files_1.0.2.bb @@ -6,3 +6,5 @@ PR = "r1" PE = "1" FILES_${PN} += " /usr/lib/X11/config" +SRC_URI[archive.md5sum] = "f96f44b87132afd2fff677a8c89166dd" +SRC_URI[archive.sha256sum] = "4edcaf61ad8b4bef65169af2b98d3992be07260f90cca65128dc523d6935bdd8" diff --git a/recipes/xorg-util/xorg-cf-files_1.0.3.bb b/recipes/xorg-util/xorg-cf-files_1.0.3.bb index 3f0f4b3f06..222b23923a 100644 --- a/recipes/xorg-util/xorg-cf-files_1.0.3.bb +++ b/recipes/xorg-util/xorg-cf-files_1.0.3.bb @@ -6,3 +6,5 @@ PR = "r2" PE = "1" FILES_${PN} += " /usr/lib/X11/config" +SRC_URI[archive.md5sum] = "bca2403beb209952d66dc57be5a2f789" +SRC_URI[archive.sha256sum] = "9a5e3533a4156a0e308ced437bde722cb291becc2276bdd0952e30b3b5060e92" -- cgit v1.2.3 From 870669a353c643abebc565cdd66a2c250cb49ddb Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 18 Mar 2010 09:23:05 +0100 Subject: checksums.ini: remove entries for xorg-util (moved to recipes) Signed-off-by: Martin Jansa --- conf/checksums.ini | 96 ------------------------------------------------------ 1 file changed, 96 deletions(-) diff --git a/conf/checksums.ini b/conf/checksums.ini index 059b2199f3..b52ae5c4a2 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -8378,18 +8378,6 @@ sha256=ec7a963c0dfd986697350be26e53577b0a39c86970b4e9485d85ca99b0cb2197 md5=2bffc1e314f2efb1034b3d3ea1ce2f7d sha256=a8a3c0f0a38f819b87ff9282f1e40536f5050153f0f60db5c869509a70497c2c -[http://xorg.freedesktop.org/releases/individual/util/gccmakedep-1.0.2.tar.gz] -md5=fc49f45251c1336fe1dad5dba1c83fcd -sha256=fdd3963294e80b27416f902a5c029c033d321f03310d3cafa3afb62b50ddce92 - -[http://xorg.freedesktop.org/releases/X11R7.0/src/util/gccmakedep-X11R7.0-1.0.1.tar.bz2] -md5=328eea864d27b2d3a88ceb2fa66eca6d -sha256=dc126b21e2e9b93df2587b55418d8593642eaa8e14a74e14bd4cf93262a64443 - -[http://xorg.freedesktop.org/releases/X11R7.1/src/util/gccmakedep-X11R7.1-1.0.2.tar.bz2] -md5=519e8b1a9911bdddfa2ee46fb36b9774 -sha256=d166685bbae221c8cd1ad5efa7903f8520b117228e9ef0e85261c99ebfc5f66a - [http://ftp.gnome.org/pub/GNOME/sources/gconf-editor/2.22/gconf-editor-2.22.0.tar.bz2] md5=7ca99aec214dd855b5de7dacc8937055 sha256=e701134a1f5293070ca7d8d6311468f61e3a9765ebc520fcca6a0a38b214b7dc @@ -12574,18 +12562,6 @@ sha256=a606e230b22d9d029998b84e5d6311a8ba35a304fe457e254eb5fd19943cd639 md5=a080f5a4ed42c56767c07e55c1266727 sha256=9c6f58c44051563a788f7e9202957d839822081d99ecb001314265166c20eb95 -[http://xorg.freedesktop.org/releases/individual/util/imake-1.0.2.tar.gz] -md5=b5c3a719d60a14ca2378dc1259ee60df -sha256=8008b4366ab96abfdac2c91808b79ec2cc5649966b41cfb07b14b6fbd798651c - -[http://xorg.freedesktop.org/releases/X11R7.0/src/util/imake-X11R7.0-1.0.1.tar.bz2] -md5=487b4b86b2bd0c09e6d220a85d94efae -sha256=dec5cee4e529ac218e7d99a550122e065daf29a3a4105d0b545620e4ca57edc4 - -[http://xorg.freedesktop.org/releases/X11R7.1/src/util/imake-X11R7.1-1.0.2.tar.bz2] -md5=db33c65135ebc78e55c6009292c51b43 -sha256=76167e10c30d60534dc2b04fa4e202e16531df8170fc23cc4414d9afff09c32a - [ftp://ftp.cac.washington.edu/imap/imap-2007a1.tar.Z] md5=828a84c64ef933bfcc805b838576a774 sha256=8ba0eda3157193643eb3c5ccd46c0ca8060d702f260df60f89656cb891cbeeb8 @@ -17862,14 +17838,6 @@ sha256=e7431530a4cf4c44b5068e23454f95765dc0b51e7d98bc2bd70451b17d505bd9 md5=d5b05498af26d5c09b372caab82a0337 sha256=e7431530a4cf4c44b5068e23454f95765dc0b51e7d98bc2bd70451b17d505bd9 -[http://xorg.freedesktop.org/releases/individual/util/lndir-1.0.1.tar.gz] -md5=1a53ddd7e1804abe8f3d9799a88b6aa8 -sha256=89bff89702ebf2e5cc2268d79d5a27c62190c5a85ab080935d4425d3e309bc57 - -[http://xorg.freedesktop.org/releases/X11R7.0/src/util/lndir-X11R7.0-1.0.1.tar.bz2] -md5=aa3616b9795e2445c85b2c79b0f94f7b -sha256=8f563e178ac29c64fcc0144c60d415092d998194a6797c7b45a95802d2df8410 - [http://wl500g.dyndns.org/loader/loader-0.04.tar.gz] md5=c0b7c36232d3910c425d03e56d0f532b sha256=6f11fc04a1f3f04ebb996723fc86ca363c3959ca1ef76d1057db9db3ea5a98d0 @@ -18482,18 +18450,6 @@ sha256=f3e69023771e23908f5d5592954d8271d3d6af09693cecfd29cee6fde8550dc8 md5=b94605c3b7ba90bc01648ca6e5cc1aaf sha256=16ff3ea972065925338da1a1f37322dc4d8774f6d34d2dde2ce85121c08c99e0 -[http://xorg.freedesktop.org/releases/individual/util/makedepend-1.0.1.tar.gz] -md5=90f5f3b987497a481b94d49372f17dce -sha256=0a4a0d4e2613b0cd4321e55fd4741788b728736fc8a517996e2015fa49862e61 - -[http://xorg.freedesktop.org/releases/individual/util/makedepend-1.0.2.tar.gz] -md5=905bfeb1a59929d950e5d638fbadcf39 -sha256=008e6e117372e04cdc9a72ffc7dfae2e2d6617c9b399e052ae12dc2a1a03079a - -[http://xorg.freedesktop.org/releases/X11R7.0/src/util/makedepend-X11R7.0-1.0.0.tar.bz2] -md5=7494c7ff65d8c31ef8db13661487b54c -sha256=1caf464a967ff9335a040f2d3ffe050c881efda13c14531be49cf1aa8dabda92 - [ftp://ftp.debian.org/debian/pool/main/m/makedev/makedev_2.3.1.orig.tar.gz] md5=89c4b6b4a89f6502626783716fc7d887 sha256=8599712f2b2b3778eea344f59e1512cea284e802560317fac436585885a41dfa @@ -27350,42 +27306,6 @@ sha256=db4dcbf99d989a8f539d7521e9e64047367fa2ccdcbb91517cdec19693a41ffd md5=9623380641b0c2e0449f5b1ecc567663 sha256=a6365fcb2b34439faa52164e1a018086c2b6818f8a189c487c79e09dc3c62722 -[http://xorg.freedesktop.org/releases/individual/util/util-macros-1.1.5.tar.bz2] -md5=51952682d8b42aeda3af5cee0133ce2c -sha256=75939790e16b8bcc122e83f3f060d6f000ed1a98e97b4972fac0903142f5651b - -[http://xorg.freedesktop.org/releases/individual/util/util-macros-1.1.5.tar.gz] -md5=d168aa001b946b58d9aab6088c09d256 -sha256=4f2a8a19e90ad82bc2da4eb52799a299a1c94bf5143bc2711e9e5d4cc5a7cdb4 - -[http://xorg.freedesktop.org/releases/individual/util/util-macros-1.1.6.tar.gz] -md5=ea2d9cd33ca6fd05923f007bd74d7c37 -sha256=97748154c41a1cd12635a79aee0c2846fd48ecb555fc8b54e3e5baec174e6e74 - -[http://xorg.freedesktop.org/releases/individual/util/util-macros-1.2.1.tar.gz] -md5=81b9746d6202ccf0b4a498cfd0731e71 -sha256=f3804f02f51a1be243ce7413dc67dca774f000686f8f2efedc77203a1962d401 - -[http://xorg.freedesktop.org/releases/individual/util/util-macros-1.3.0.tar.gz] -md5=51bb54c08415ee3c3000b7df9e9b07c5 -sha256=57d2629849796b4dc919261eadd1eea3ee6e634d58979797287f7e09408cde67 - -[http://xorg.freedesktop.org/releases/individual/util/util-macros-1.4.1.tar.gz] -md5=8ac38951e753f250aaefbd4ba0afda94 -sha256=d49ab68cad724ae51f6cb69f7f5cfff7629cbb066f4c5c8bda81d62675a21986 - -[http://xorg.freedesktop.org/releases/individual/util/util-macros-1.5.0.tar.gz] -md5=ffef78135535c60c2b68d0a2a4ecae9b -sha256=d47116ce5df198859a6082af7a72505575d1685b8c82bb4ef6fbedfa3316617e - -[http://xorg.freedesktop.org/releases/X11R7.0/src/util/util-macros-X11R7.0-1.0.1.tar.bz2] -md5=bc6be634532d4936eb753de54e1663d3 -sha256=e95a45db65b33be472a3134492e348c4cd6edc200d02a85654ffe62bc2e6fdcd - -[http://xorg.freedesktop.org/releases/X11R7.1/src/util/util-macros-X11R7.1-1.0.2.tar.bz2] -md5=6ce5a6e85653afdd10c48b89b4bcc8aa -sha256=cef1e438a2f936efe00ffbb3758c80de72ed514f210e067cb8469a8b00b8feb4 - [http://ftp.linux-vserver.org/pub/utils/util-vserver/util-vserver-0.30.214.tar.bz2] md5=8bad879e36a6a1b9b4858d0d6d3c8c76 sha256=c88a27ccd1593f4396e1cf4aca37c715c7618a77d709ad63c7cc744ca1557c45 @@ -31286,22 +31206,6 @@ sha256=0616d2c8d7aa990787f6c27e412c65b3f5e1b9a42b12562700bc2da953def4c1 md5=e5ae82568d7b1faeb950140c34fbbcb1 sha256=d648fd1f7b7437123afa63df06f6a6409a0487c99ca8f8beba75aaa474d65818 -[http://xorg.freedesktop.org/releases/individual/util/xorg-cf-files-1.0.2.tar.gz] -md5=f96f44b87132afd2fff677a8c89166dd -sha256=4edcaf61ad8b4bef65169af2b98d3992be07260f90cca65128dc523d6935bdd8 - -[http://xorg.freedesktop.org/releases/individual/util/xorg-cf-files-1.0.3.tar.gz] -md5=bca2403beb209952d66dc57be5a2f789 -sha256=9a5e3533a4156a0e308ced437bde722cb291becc2276bdd0952e30b3b5060e92 - -[http://xorg.freedesktop.org/releases/X11R7.0/src/util/xorg-cf-files-X11R7.0-1.0.1.tar.bz2] -md5=f2dd453c37386293fb207431b4a073dd -sha256=019ba3dbfe2f23e5847cc839a26c630cea20fe8d62df4775a21087176908b9d7 - -[http://xorg.freedesktop.org/releases/X11R7.1/src/util/xorg-cf-files-X11R7.1-1.0.2.tar.bz2] -md5=073c1b4f0029249a05800900abd13077 -sha256=6044df7ff07d38c4ce1020453f259f4caa16272aca7d835204852e416dfa2605 - [http://xorg.freedesktop.org/releases/individual/doc/xorg-docs-1.0.1.tar.bz2] md5=78fd95f6d5ea69d91723dcc16280c664 sha256=b7b8593b055e29dedc0631e1db9781583038afc67bce0f715fdf3201570d1e4e -- cgit v1.2.3 From c853d5b877257a4b2addc762ea2fea918968c7e4 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 18 Mar 2010 09:28:42 +0100 Subject: xorg-drivers: add checksums to recipes Signed-off-by: Martin Jansa --- recipes/xorg-driver/xf86-input-acecad_1.1.0.bb | 2 ++ recipes/xorg-driver/xf86-input-acecad_1.2.1.bb | 2 ++ recipes/xorg-driver/xf86-input-acecad_1.2.2.bb | 2 ++ recipes/xorg-driver/xf86-input-acecad_1.4.0.bb | 2 ++ recipes/xorg-driver/xf86-input-aiptek_1.0.1.bb | 2 ++ recipes/xorg-driver/xf86-input-aiptek_1.1.1.bb | 2 ++ recipes/xorg-driver/xf86-input-aiptek_1.3.0.bb | 2 ++ recipes/xorg-driver/xf86-input-calcomp_1.1.0.bb | 2 ++ recipes/xorg-driver/xf86-input-calcomp_1.1.1.bb | 2 ++ recipes/xorg-driver/xf86-input-calcomp_1.1.2.bb | 2 ++ recipes/xorg-driver/xf86-input-citron_2.2.0.bb | 2 ++ recipes/xorg-driver/xf86-input-citron_2.2.1.bb | 2 ++ recipes/xorg-driver/xf86-input-citron_2.2.2.bb | 2 ++ recipes/xorg-driver/xf86-input-digitaledge_1.1.0.bb | 2 ++ recipes/xorg-driver/xf86-input-digitaledge_1.1.1.bb | 2 ++ recipes/xorg-driver/xf86-input-dmc_1.1.0.bb | 2 ++ recipes/xorg-driver/xf86-input-dmc_1.1.1.bb | 2 ++ recipes/xorg-driver/xf86-input-dmc_1.1.2.bb | 2 ++ recipes/xorg-driver/xf86-input-dynapro_1.1.0.bb | 2 ++ recipes/xorg-driver/xf86-input-dynapro_1.1.1.bb | 2 ++ recipes/xorg-driver/xf86-input-dynapro_1.1.2.bb | 2 ++ recipes/xorg-driver/xf86-input-elo2300_1.1.0.bb | 2 ++ recipes/xorg-driver/xf86-input-elo2300_1.1.1.bb | 2 ++ recipes/xorg-driver/xf86-input-elo2300_1.1.2.bb | 2 ++ recipes/xorg-driver/xf86-input-elographics_1.1.0.bb | 2 ++ recipes/xorg-driver/xf86-input-elographics_1.2.2.bb | 2 ++ recipes/xorg-driver/xf86-input-elographics_1.2.3.bb | 2 ++ recipes/xorg-driver/xf86-input-elographics_X11R7.0-1.0.0.5.bb | 2 ++ recipes/xorg-driver/xf86-input-evdev_1.1.5.bb | 2 ++ recipes/xorg-driver/xf86-input-evdev_1.2.0.bb | 2 ++ recipes/xorg-driver/xf86-input-evdev_1.99.4.bb | 2 ++ recipes/xorg-driver/xf86-input-evdev_2.0.4.bb | 2 ++ recipes/xorg-driver/xf86-input-evdev_2.1.0.bb | 2 ++ recipes/xorg-driver/xf86-input-evdev_2.2.5.bb | 2 ++ recipes/xorg-driver/xf86-input-evdev_2.2.6.bb | 2 ++ recipes/xorg-driver/xf86-input-evdev_2.3.0.bb | 2 ++ recipes/xorg-driver/xf86-input-evdev_2.3.1.bb | 2 ++ recipes/xorg-driver/xf86-input-evdev_2.3.2.bb | 2 ++ recipes/xorg-driver/xf86-input-evtouch_0.8.8.bb | 4 +++- recipes/xorg-driver/xf86-input-fpit_1.1.0.bb | 2 ++ recipes/xorg-driver/xf86-input-fpit_1.2.0.bb | 2 ++ recipes/xorg-driver/xf86-input-fpit_1.3.0.bb | 2 ++ recipes/xorg-driver/xf86-input-hyperpen_1.1.0.bb | 2 ++ recipes/xorg-driver/xf86-input-hyperpen_1.2.0.bb | 2 ++ recipes/xorg-driver/xf86-input-hyperpen_1.3.0.bb | 2 ++ recipes/xorg-driver/xf86-input-jamstudio_1.1.0.bb | 2 ++ recipes/xorg-driver/xf86-input-jamstudio_1.2.0.bb | 2 ++ recipes/xorg-driver/xf86-input-joystick_1.1.0.bb | 2 ++ recipes/xorg-driver/xf86-input-joystick_1.3.1.bb | 2 ++ recipes/xorg-driver/xf86-input-joystick_1.3.2.bb | 2 ++ recipes/xorg-driver/xf86-input-joystick_1.5.0.bb | 2 ++ recipes/xorg-driver/xf86-input-keyboard_1.1.1.bb | 2 ++ recipes/xorg-driver/xf86-input-keyboard_1.2.0.bb | 2 ++ recipes/xorg-driver/xf86-input-keyboard_1.2.2.bb | 2 ++ recipes/xorg-driver/xf86-input-keyboard_1.3.1.bb | 2 ++ recipes/xorg-driver/xf86-input-keyboard_1.3.2.bb | 2 ++ recipes/xorg-driver/xf86-input-keyboard_1.4.0.bb | 2 ++ recipes/xorg-driver/xf86-input-magellan_1.1.0.bb | 2 ++ recipes/xorg-driver/xf86-input-magellan_1.1.1.bb | 2 ++ recipes/xorg-driver/xf86-input-magellan_1.2.0.bb | 2 ++ recipes/xorg-driver/xf86-input-magictouch_1.0.0.5.bb | 2 ++ recipes/xorg-driver/xf86-input-microtouch_1.1.0.bb | 2 ++ recipes/xorg-driver/xf86-input-microtouch_1.1.1.bb | 2 ++ recipes/xorg-driver/xf86-input-microtouch_1.2.0.bb | 2 ++ recipes/xorg-driver/xf86-input-mouse_1.1.2.bb | 2 ++ recipes/xorg-driver/xf86-input-mouse_1.2.1.bb | 2 ++ recipes/xorg-driver/xf86-input-mouse_1.2.2.bb | 2 ++ recipes/xorg-driver/xf86-input-mouse_1.2.3.bb | 2 ++ recipes/xorg-driver/xf86-input-mouse_1.3.0.bb | 2 ++ recipes/xorg-driver/xf86-input-mouse_1.4.0.bb | 2 ++ recipes/xorg-driver/xf86-input-mouse_1.5.0.bb | 2 ++ recipes/xorg-driver/xf86-input-mutouch_1.1.0.bb | 2 ++ recipes/xorg-driver/xf86-input-mutouch_1.2.0.bb | 2 ++ recipes/xorg-driver/xf86-input-mutouch_1.2.1.bb | 2 ++ recipes/xorg-driver/xf86-input-palmax_1.1.0.bb | 2 ++ recipes/xorg-driver/xf86-input-palmax_1.2.0.bb | 2 ++ recipes/xorg-driver/xf86-input-penmount_1.2.0.bb | 2 ++ recipes/xorg-driver/xf86-input-penmount_1.2.1.bb | 2 ++ recipes/xorg-driver/xf86-input-penmount_1.3.0.bb | 2 ++ recipes/xorg-driver/xf86-input-penmount_1.4.0.bb | 2 ++ recipes/xorg-driver/xf86-input-spaceorb_1.1.0.bb | 2 ++ recipes/xorg-driver/xf86-input-spaceorb_1.1.1.bb | 2 ++ recipes/xorg-driver/xf86-input-summa_1.1.0.bb | 2 ++ recipes/xorg-driver/xf86-input-summa_1.2.0.bb | 2 ++ recipes/xorg-driver/xf86-input-synaptics_0.15.0.bb | 2 ++ recipes/xorg-driver/xf86-input-synaptics_1.2.0.bb | 2 ++ recipes/xorg-driver/xf86-input-synaptics_1.2.1.bb | 2 ++ recipes/xorg-driver/xf86-input-tek4957_1.1.0.bb | 2 ++ recipes/xorg-driver/xf86-input-tek4957_1.2.0.bb | 2 ++ recipes/xorg-driver/xf86-input-tslib_0.0.5.bb | 4 +++- recipes/xorg-driver/xf86-input-tslib_0.0.6.bb | 4 +++- recipes/xorg-driver/xf86-input-ur98_1.1.0.bb | 2 ++ recipes/xorg-driver/xf86-input-vmmouse_12.4.0.bb | 2 ++ recipes/xorg-driver/xf86-input-vmmouse_12.4.3.bb | 2 ++ recipes/xorg-driver/xf86-input-void_1.1.0.bb | 2 ++ recipes/xorg-driver/xf86-input-void_1.1.1.bb | 2 ++ recipes/xorg-driver/xf86-input-void_1.3.0.bb | 2 ++ recipes/xorg-driver/xf86-video-apm_1.1.1.bb | 2 ++ recipes/xorg-driver/xf86-video-apm_1.2.0.bb | 2 ++ recipes/xorg-driver/xf86-video-apm_1.2.2.bb | 2 ++ recipes/xorg-driver/xf86-video-ark_0.6.0.bb | 2 ++ recipes/xorg-driver/xf86-video-ark_0.7.0.bb | 2 ++ recipes/xorg-driver/xf86-video-ark_0.7.2.bb | 2 ++ recipes/xorg-driver/xf86-video-ast_0.81.0.bb | 2 ++ recipes/xorg-driver/xf86-video-ast_0.85.0.bb | 2 ++ recipes/xorg-driver/xf86-video-ast_0.89.9.bb | 2 ++ recipes/xorg-driver/xf86-video-ati_6.12.4.bb | 2 ++ recipes/xorg-driver/xf86-video-ati_6.6.193.bb | 2 ++ recipes/xorg-driver/xf86-video-ati_6.6.3.bb | 2 ++ recipes/xorg-driver/xf86-video-ati_6.7.196.bb | 2 ++ recipes/xorg-driver/xf86-video-ati_6.7.197.bb | 2 ++ recipes/xorg-driver/xf86-video-ati_6.8.0.bb | 2 ++ recipes/xorg-driver/xf86-video-chips_1.1.1.bb | 2 ++ recipes/xorg-driver/xf86-video-chips_1.2.0.bb | 2 ++ recipes/xorg-driver/xf86-video-chips_1.2.2.bb | 2 ++ recipes/xorg-driver/xf86-video-cirrus_1.1.0.bb | 2 ++ recipes/xorg-driver/xf86-video-cirrus_1.2.1.bb | 2 ++ recipes/xorg-driver/xf86-video-cirrus_1.3.2.bb | 2 ++ recipes/xorg-driver/xf86-video-cyrix_1.1.0.bb | 2 ++ recipes/xorg-driver/xf86-video-displaylink_0.3.bb | 4 +++- recipes/xorg-driver/xf86-video-dummy_0.2.0.bb | 2 ++ recipes/xorg-driver/xf86-video-dummy_0.3.0.bb | 2 ++ recipes/xorg-driver/xf86-video-dummy_0.3.2.bb | 2 ++ recipes/xorg-driver/xf86-video-dummy_0.3.3.bb | 2 ++ recipes/xorg-driver/xf86-video-fbdev_0.3.1.bb | 2 ++ recipes/xorg-driver/xf86-video-fbdev_0.4.0.bb | 2 ++ recipes/xorg-driver/xf86-video-fbdev_0.4.1.bb | 2 ++ recipes/xorg-driver/xf86-video-geode_2.11.0.bb | 2 ++ recipes/xorg-driver/xf86-video-geode_2.11.4.1.bb | 2 ++ recipes/xorg-driver/xf86-video-geode_2.8.0.bb | 2 ++ recipes/xorg-driver/xf86-video-glint_1.1.1.bb | 2 ++ recipes/xorg-driver/xf86-video-glint_1.2.0.bb | 2 ++ recipes/xorg-driver/xf86-video-glint_1.2.1.bb | 2 ++ recipes/xorg-driver/xf86-video-glint_1.2.4.bb | 2 ++ recipes/xorg-driver/xf86-video-i128_1.1.0.5.bb | 2 ++ recipes/xorg-driver/xf86-video-i128_1.1.0.6.bb | 2 ++ recipes/xorg-driver/xf86-video-i128_1.2.1.bb | 2 ++ recipes/xorg-driver/xf86-video-i128_1.3.0.bb | 2 ++ recipes/xorg-driver/xf86-video-i128_1.3.1.bb | 2 ++ recipes/xorg-driver/xf86-video-i128_1.3.3.bb | 2 ++ recipes/xorg-driver/xf86-video-i740_1.1.0.bb | 2 ++ recipes/xorg-driver/xf86-video-i740_1.2.0.bb | 2 ++ recipes/xorg-driver/xf86-video-i740_1.3.2.bb | 2 ++ recipes/xorg-driver/xf86-video-i810_1.6.5.bb | 2 ++ recipes/xorg-driver/xf86-video-i810_1.7.4.bb | 2 ++ recipes/xorg-driver/xf86-video-impact_0.2.0.bb | 2 ++ recipes/xorg-driver/xf86-video-imstt_1.1.0.bb | 2 ++ recipes/xorg-driver/xf86-video-intel_2.10.0.bb | 2 ++ recipes/xorg-driver/xf86-video-intel_2.2.1.bb | 2 ++ recipes/xorg-driver/xf86-video-intel_2.4.2.bb | 2 ++ recipes/xorg-driver/xf86-video-intel_2.6.3.bb | 2 ++ recipes/xorg-driver/xf86-video-intel_2.9.1.bb | 2 ++ recipes/xorg-driver/xf86-video-mach64_6.8.0.bb | 2 ++ recipes/xorg-driver/xf86-video-mach64_6.8.2.bb | 2 ++ recipes/xorg-driver/xf86-video-mga_1.4.1.bb | 2 ++ recipes/xorg-driver/xf86-video-mga_1.4.11.bb | 2 ++ recipes/xorg-driver/xf86-video-mga_1.4.9.bb | 2 ++ recipes/xorg-driver/xf86-video-mga_1.9.100.bb | 2 ++ recipes/xorg-driver/xf86-video-mga_1.9.99.bb | 2 ++ recipes/xorg-driver/xf86-video-neomagic_1.1.1.bb | 2 ++ recipes/xorg-driver/xf86-video-neomagic_1.2.1.bb | 2 ++ recipes/xorg-driver/xf86-video-neomagic_1.2.4.bb | 2 ++ recipes/xorg-driver/xf86-video-newport_0.2.1.bb | 2 ++ recipes/xorg-driver/xf86-video-newport_0.2.3.bb | 2 ++ recipes/xorg-driver/xf86-video-nsc_2.8.2.bb | 2 ++ recipes/xorg-driver/xf86-video-nsc_2.8.3.bb | 2 ++ recipes/xorg-driver/xf86-video-nv_1.2.2.1.bb | 2 ++ recipes/xorg-driver/xf86-video-nv_2.1.12.bb | 2 ++ recipes/xorg-driver/xf86-video-nv_2.1.15.bb | 2 ++ recipes/xorg-driver/xf86-video-nv_2.1.16.bb | 2 ++ recipes/xorg-driver/xf86-video-nv_2.1.3.bb | 2 ++ recipes/xorg-driver/xf86-video-nv_2.1.7.bb | 2 ++ recipes/xorg-driver/xf86-video-nv_2.1.8.bb | 2 ++ recipes/xorg-driver/xf86-video-nv_2.1.9.bb | 2 ++ recipes/xorg-driver/xf86-video-openchrome_0.2.903.bb | 2 ++ recipes/xorg-driver/xf86-video-openchrome_0.2.904.bb | 2 ++ recipes/xorg-driver/xf86-video-r128_6.8.0.bb | 2 ++ recipes/xorg-driver/xf86-video-r128_6.8.1.bb | 2 ++ recipes/xorg-driver/xf86-video-radeonhd_1.2.0.bb | 2 ++ recipes/xorg-driver/xf86-video-radeonhd_1.3.0.bb | 2 ++ recipes/xorg-driver/xf86-video-rendition_4.1.3.bb | 2 ++ recipes/xorg-driver/xf86-video-rendition_4.2.0.bb | 2 ++ recipes/xorg-driver/xf86-video-rendition_4.2.3.bb | 2 ++ recipes/xorg-driver/xf86-video-s3_0.5.0.bb | 2 ++ recipes/xorg-driver/xf86-video-s3_0.6.0.bb | 2 ++ recipes/xorg-driver/xf86-video-s3_0.6.3.bb | 2 ++ recipes/xorg-driver/xf86-video-s3virge_1.10.1.bb | 2 ++ recipes/xorg-driver/xf86-video-s3virge_1.10.4.bb | 2 ++ recipes/xorg-driver/xf86-video-s3virge_1.9.1.bb | 2 ++ recipes/xorg-driver/xf86-video-savage_2.1.2.bb | 2 ++ recipes/xorg-driver/xf86-video-savage_2.1.3.bb | 2 ++ recipes/xorg-driver/xf86-video-savage_2.2.1.bb | 2 ++ recipes/xorg-driver/xf86-video-savage_2.3.1.bb | 2 ++ recipes/xorg-driver/xf86-video-siliconmotion_1.5.1.bb | 2 ++ recipes/xorg-driver/xf86-video-siliconmotion_1.6.0.bb | 2 ++ recipes/xorg-driver/xf86-video-siliconmotion_1.7.3.bb | 2 ++ recipes/xorg-driver/xf86-video-sis_0.10.0.bb | 2 ++ recipes/xorg-driver/xf86-video-sis_0.10.1.bb | 2 ++ recipes/xorg-driver/xf86-video-sis_0.10.2.bb | 2 ++ recipes/xorg-driver/xf86-video-sis_0.9.3.bb | 2 ++ recipes/xorg-driver/xf86-video-sis_0.9.4.bb | 2 ++ recipes/xorg-driver/xf86-video-sisusb_0.8.1.bb | 2 ++ recipes/xorg-driver/xf86-video-sisusb_0.9.0.bb | 2 ++ recipes/xorg-driver/xf86-video-sisusb_0.9.1.bb | 2 ++ recipes/xorg-driver/xf86-video-sisusb_0.9.3.bb | 2 ++ recipes/xorg-driver/xf86-video-sunbw2_1.1.0.bb | 2 ++ recipes/xorg-driver/xf86-video-suncg14_1.1.0.bb | 2 ++ recipes/xorg-driver/xf86-video-suncg14_1.1.1.bb | 2 ++ recipes/xorg-driver/xf86-video-suncg3_1.1.0.bb | 2 ++ recipes/xorg-driver/xf86-video-suncg3_1.1.1.bb | 2 ++ recipes/xorg-driver/xf86-video-suncg6_1.1.0.bb | 2 ++ recipes/xorg-driver/xf86-video-suncg6_1.1.1.bb | 2 ++ recipes/xorg-driver/xf86-video-sunffb_1.1.0.bb | 2 ++ recipes/xorg-driver/xf86-video-sunffb_1.2.0.bb | 2 ++ recipes/xorg-driver/xf86-video-sunffb_1.2.1.bb | 2 ++ recipes/xorg-driver/xf86-video-sunleo_1.1.0.bb | 2 ++ recipes/xorg-driver/xf86-video-sunleo_1.2.0.bb | 2 ++ recipes/xorg-driver/xf86-video-suntcx_1.1.0.bb | 2 ++ recipes/xorg-driver/xf86-video-suntcx_1.1.1.bb | 2 ++ recipes/xorg-driver/xf86-video-tdfx_1.3.0.bb | 2 ++ recipes/xorg-driver/xf86-video-tdfx_1.4.0.bb | 2 ++ recipes/xorg-driver/xf86-video-tdfx_1.4.3.bb | 2 ++ recipes/xorg-driver/xf86-video-tga_1.1.0.bb | 2 ++ recipes/xorg-driver/xf86-video-tga_1.2.0.bb | 2 ++ recipes/xorg-driver/xf86-video-tga_1.2.1.bb | 2 ++ recipes/xorg-driver/xf86-video-trident_1.2.3.bb | 2 ++ recipes/xorg-driver/xf86-video-trident_1.2.4.bb | 2 ++ recipes/xorg-driver/xf86-video-trident_1.3.0.bb | 2 ++ recipes/xorg-driver/xf86-video-trident_1.3.3.bb | 2 ++ recipes/xorg-driver/xf86-video-tseng_1.1.1.bb | 2 ++ recipes/xorg-driver/xf86-video-tseng_1.2.0.bb | 2 ++ recipes/xorg-driver/xf86-video-tseng_1.2.3.bb | 2 ++ recipes/xorg-driver/xf86-video-v4l_0.1.1.bb | 2 ++ recipes/xorg-driver/xf86-video-v4l_0.2.0.bb | 2 ++ recipes/xorg-driver/xf86-video-vermilion_1.0.1.bb | 2 ++ recipes/xorg-driver/xf86-video-vesa_1.3.0.bb | 2 ++ recipes/xorg-driver/xf86-video-vesa_2.0.0.bb | 2 ++ recipes/xorg-driver/xf86-video-vesa_2.2.0.bb | 2 ++ recipes/xorg-driver/xf86-video-vesa_2.2.1.bb | 2 ++ recipes/xorg-driver/xf86-video-vesa_2.3.0.bb | 2 ++ recipes/xorg-driver/xf86-video-vga_4.1.0.bb | 2 ++ recipes/xorg-driver/xf86-video-via_0.2.2.bb | 2 ++ recipes/xorg-driver/xf86-video-vmware_10.14.1.bb | 2 ++ recipes/xorg-driver/xf86-video-vmware_10.15.2.bb | 2 ++ recipes/xorg-driver/xf86-video-vmware_10.16.1.bb | 2 ++ recipes/xorg-driver/xf86-video-vmware_10.16.5.bb | 2 ++ recipes/xorg-driver/xf86-video-vmware_10.16.8.bb | 2 ++ recipes/xorg-driver/xf86-video-vmware_10.16.9.bb | 2 ++ recipes/xorg-driver/xf86-video-voodoo_1.1.1.bb | 2 ++ recipes/xorg-driver/xf86-video-voodoo_1.2.0.bb | 2 ++ recipes/xorg-driver/xf86-video-voodoo_1.2.3.bb | 2 ++ recipes/xorg-driver/xf86-video-wsfb_0.2.1.bb | 2 ++ recipes/xorg-driver/xf86-video-wsfb_0.3.0.bb | 2 ++ recipes/xorg-driver/xf86-video-xgi_1.5.0.bb | 2 ++ recipes/xorg-driver/xf86-video-xgi_1.5.1.bb | 2 ++ recipes/xorg-driver/xf86-video-xgixp_1.7.99.3.bb | 2 ++ recipes/xorg-driver/xf86-video-xgixp_1.7.99.4.bb | 2 ++ 257 files changed, 518 insertions(+), 4 deletions(-) diff --git a/recipes/xorg-driver/xf86-input-acecad_1.1.0.bb b/recipes/xorg-driver/xf86-input-acecad_1.1.0.bb index 311caf6553..32f528a19e 100644 --- a/recipes/xorg-driver/xf86-input-acecad_1.1.0.bb +++ b/recipes/xorg-driver/xf86-input-acecad_1.1.0.bb @@ -1,3 +1,5 @@ require xorg-driver-input.inc PE = "1" +SRC_URI[archive.md5sum] = "ce0b7bec500273ad935cbfa212b8ac8a" +SRC_URI[archive.sha256sum] = "3e5feea79f1d48cd46a2a40661140042ac586f90311669f79d65fea6cfc112ad" diff --git a/recipes/xorg-driver/xf86-input-acecad_1.2.1.bb b/recipes/xorg-driver/xf86-input-acecad_1.2.1.bb index c993bc7718..9933824222 100644 --- a/recipes/xorg-driver/xf86-input-acecad_1.2.1.bb +++ b/recipes/xorg-driver/xf86-input-acecad_1.2.1.bb @@ -3,3 +3,5 @@ require xorg-driver-input.inc DESCRIPTION = "X.Org X server -- AceCad input driver" PE = "1" +SRC_URI[archive.md5sum] = "2c371317f2aae34c04db63c19759a44e" +SRC_URI[archive.sha256sum] = "07d2f8a1153d34a6516b8f1129fc32a18f2862bbb58c9bad4637fb282d60385a" diff --git a/recipes/xorg-driver/xf86-input-acecad_1.2.2.bb b/recipes/xorg-driver/xf86-input-acecad_1.2.2.bb index c993bc7718..c3b1dc3756 100644 --- a/recipes/xorg-driver/xf86-input-acecad_1.2.2.bb +++ b/recipes/xorg-driver/xf86-input-acecad_1.2.2.bb @@ -3,3 +3,5 @@ require xorg-driver-input.inc DESCRIPTION = "X.Org X server -- AceCad input driver" PE = "1" +SRC_URI[archive.md5sum] = "2d6596b2b0cfa527b5ed4df2014684bf" +SRC_URI[archive.sha256sum] = "953ebb7d7ed579ce648dd6f6a25307c37ad8230a0336ec6fc58247732835f26e" diff --git a/recipes/xorg-driver/xf86-input-acecad_1.4.0.bb b/recipes/xorg-driver/xf86-input-acecad_1.4.0.bb index c993bc7718..20e533f935 100644 --- a/recipes/xorg-driver/xf86-input-acecad_1.4.0.bb +++ b/recipes/xorg-driver/xf86-input-acecad_1.4.0.bb @@ -3,3 +3,5 @@ require xorg-driver-input.inc DESCRIPTION = "X.Org X server -- AceCad input driver" PE = "1" +SRC_URI[archive.md5sum] = "51247dc0d73185e35bec326283bc49a5" +SRC_URI[archive.sha256sum] = "48341d8b6b0060228134b36543986c949ea828d6ce6d0484d29b3dde9ddbd556" diff --git a/recipes/xorg-driver/xf86-input-aiptek_1.0.1.bb b/recipes/xorg-driver/xf86-input-aiptek_1.0.1.bb index 34a497438b..04f66a0949 100644 --- a/recipes/xorg-driver/xf86-input-aiptek_1.0.1.bb +++ b/recipes/xorg-driver/xf86-input-aiptek_1.0.1.bb @@ -1,2 +1,4 @@ require xorg-driver-input.inc PE = "1" +SRC_URI[archive.md5sum] = "951b2b1a270f67d28e2e89fd2b9f15ae" +SRC_URI[archive.sha256sum] = "3db0e3259034d838c2ff7ae26718422db6d33d89cd1a2defa0efdddbbbfcc28a" diff --git a/recipes/xorg-driver/xf86-input-aiptek_1.1.1.bb b/recipes/xorg-driver/xf86-input-aiptek_1.1.1.bb index 34a497438b..64340436c7 100644 --- a/recipes/xorg-driver/xf86-input-aiptek_1.1.1.bb +++ b/recipes/xorg-driver/xf86-input-aiptek_1.1.1.bb @@ -1,2 +1,4 @@ require xorg-driver-input.inc PE = "1" +SRC_URI[archive.md5sum] = "2aa75313ea5652a8cf93581c65ee6493" +SRC_URI[archive.sha256sum] = "219116b0275b93333b8471fc94d97320a116d695c4249837fd97763f00a85d77" diff --git a/recipes/xorg-driver/xf86-input-aiptek_1.3.0.bb b/recipes/xorg-driver/xf86-input-aiptek_1.3.0.bb index 34a497438b..52801a37e0 100644 --- a/recipes/xorg-driver/xf86-input-aiptek_1.3.0.bb +++ b/recipes/xorg-driver/xf86-input-aiptek_1.3.0.bb @@ -1,2 +1,4 @@ require xorg-driver-input.inc PE = "1" +SRC_URI[archive.md5sum] = "ae3ec07aff6c156cf5307f53feb6b293" +SRC_URI[archive.sha256sum] = "b37f35bb021dffc337c731bfbbb6ce7c0953dc69f7c660cbe48b0f84a07b5e5c" diff --git a/recipes/xorg-driver/xf86-input-calcomp_1.1.0.bb b/recipes/xorg-driver/xf86-input-calcomp_1.1.0.bb index 34a497438b..e40301a255 100644 --- a/recipes/xorg-driver/xf86-input-calcomp_1.1.0.bb +++ b/recipes/xorg-driver/xf86-input-calcomp_1.1.0.bb @@ -1,2 +1,4 @@ require xorg-driver-input.inc PE = "1" +SRC_URI[archive.md5sum] = "af13f9de2af4e1d03b2da0c037fd718a" +SRC_URI[archive.sha256sum] = "ebc446e74eea72d391104b1ce3b2a5376bced098154ec089a944f4311d240904" diff --git a/recipes/xorg-driver/xf86-input-calcomp_1.1.1.bb b/recipes/xorg-driver/xf86-input-calcomp_1.1.1.bb index a309230801..8aac474119 100644 --- a/recipes/xorg-driver/xf86-input-calcomp_1.1.1.bb +++ b/recipes/xorg-driver/xf86-input-calcomp_1.1.1.bb @@ -2,3 +2,5 @@ require xorg-driver-input.inc DESCRIPTION = "X.Org X server -- Calcomp input driver" PE = "1" +SRC_URI[archive.md5sum] = "689099e2ade8a8c9f68f82fdf569b3ad" +SRC_URI[archive.sha256sum] = "8117b37da2e031eb983e1e98034710a1511299496fcf235f936caff252fa8957" diff --git a/recipes/xorg-driver/xf86-input-calcomp_1.1.2.bb b/recipes/xorg-driver/xf86-input-calcomp_1.1.2.bb index a309230801..2fadc8cd24 100644 --- a/recipes/xorg-driver/xf86-input-calcomp_1.1.2.bb +++ b/recipes/xorg-driver/xf86-input-calcomp_1.1.2.bb @@ -2,3 +2,5 @@ require xorg-driver-input.inc DESCRIPTION = "X.Org X server -- Calcomp input driver" PE = "1" +SRC_URI[archive.md5sum] = "ebc9a64dc72ae3015c16011bbd2d3557" +SRC_URI[archive.sha256sum] = "bf6edb9d78c90952a16c8bab9e69aebb3e1361e4423ec90e47df57e8c873254b" diff --git a/recipes/xorg-driver/xf86-input-citron_2.2.0.bb b/recipes/xorg-driver/xf86-input-citron_2.2.0.bb index 311caf6553..039d7c4e77 100644 --- a/recipes/xorg-driver/xf86-input-citron_2.2.0.bb +++ b/recipes/xorg-driver/xf86-input-citron_2.2.0.bb @@ -1,3 +1,5 @@ require xorg-driver-input.inc PE = "1" +SRC_URI[archive.md5sum] = "1fe53cd055a69650f3c2e02377ec728c" +SRC_URI[archive.sha256sum] = "26cfa755d3a383f80039fcd286c44ba5f7b353feb8c674f386bb08d741d2c3fe" diff --git a/recipes/xorg-driver/xf86-input-citron_2.2.1.bb b/recipes/xorg-driver/xf86-input-citron_2.2.1.bb index 4c449b12d7..d3fc928211 100644 --- a/recipes/xorg-driver/xf86-input-citron_2.2.1.bb +++ b/recipes/xorg-driver/xf86-input-citron_2.2.1.bb @@ -3,3 +3,5 @@ require xorg-driver-input.inc DESCRIPTION = "X.Org X Server -- Citron input driver" PE = "1" +SRC_URI[archive.md5sum] = "4e254fcefb3bea55772e63c12570f6d9" +SRC_URI[archive.sha256sum] = "1480ba63b342c00a53292d513bd79a69e1ea7c01a0c77d1a368ffb22e37c1a83" diff --git a/recipes/xorg-driver/xf86-input-citron_2.2.2.bb b/recipes/xorg-driver/xf86-input-citron_2.2.2.bb index 4c449b12d7..c4538ca287 100644 --- a/recipes/xorg-driver/xf86-input-citron_2.2.2.bb +++ b/recipes/xorg-driver/xf86-input-citron_2.2.2.bb @@ -3,3 +3,5 @@ require xorg-driver-input.inc DESCRIPTION = "X.Org X Server -- Citron input driver" PE = "1" +SRC_URI[archive.md5sum] = "8cad35da16ea4688ebb74533ccc7f190" +SRC_URI[archive.sha256sum] = "6d1908d1f1be1ce94fdc946f47d163c45b0a1fc4b9ffb05cc436bac865e1ecaf" diff --git a/recipes/xorg-driver/xf86-input-digitaledge_1.1.0.bb b/recipes/xorg-driver/xf86-input-digitaledge_1.1.0.bb index 311caf6553..4bc768708c 100644 --- a/recipes/xorg-driver/xf86-input-digitaledge_1.1.0.bb +++ b/recipes/xorg-driver/xf86-input-digitaledge_1.1.0.bb @@ -1,3 +1,5 @@ require xorg-driver-input.inc PE = "1" +SRC_URI[archive.md5sum] = "53461c34cc0712aacab92b820b9fcb84" +SRC_URI[archive.sha256sum] = "24001f19b46b5bc2fcf8212f04863e4efa90175fac797350525e14848ab98a38" diff --git a/recipes/xorg-driver/xf86-input-digitaledge_1.1.1.bb b/recipes/xorg-driver/xf86-input-digitaledge_1.1.1.bb index 311caf6553..fb67e32854 100644 --- a/recipes/xorg-driver/xf86-input-digitaledge_1.1.1.bb +++ b/recipes/xorg-driver/xf86-input-digitaledge_1.1.1.bb @@ -1,3 +1,5 @@ require xorg-driver-input.inc PE = "1" +SRC_URI[archive.md5sum] = "4c27e0f3c6447e76df39a837fd46a00f" +SRC_URI[archive.sha256sum] = "ded010f82b1dbb57b1ee0ad6707902b31540e0592c94d6bbf3b43a7a35220775" diff --git a/recipes/xorg-driver/xf86-input-dmc_1.1.0.bb b/recipes/xorg-driver/xf86-input-dmc_1.1.0.bb index 311caf6553..c8f5d94d14 100644 --- a/recipes/xorg-driver/xf86-input-dmc_1.1.0.bb +++ b/recipes/xorg-driver/xf86-input-dmc_1.1.0.bb @@ -1,3 +1,5 @@ require xorg-driver-input.inc PE = "1" +SRC_URI[archive.md5sum] = "e1bcbdefcb839173de79aeb3cd038b77" +SRC_URI[archive.sha256sum] = "c5ca8fb2dfe0130767b2c10bd0661277a67e7d5b9171a7f5f6264ec48790473f" diff --git a/recipes/xorg-driver/xf86-input-dmc_1.1.1.bb b/recipes/xorg-driver/xf86-input-dmc_1.1.1.bb index fea3ce83aa..24a76e6475 100644 --- a/recipes/xorg-driver/xf86-input-dmc_1.1.1.bb +++ b/recipes/xorg-driver/xf86-input-dmc_1.1.1.bb @@ -3,3 +3,5 @@ require xorg-driver-input.inc DESCRIPTION = "X.Org X server -- DMC input driver" PE = "1" +SRC_URI[archive.md5sum] = "f21f008220bc7687ce1c34ab557ec32f" +SRC_URI[archive.sha256sum] = "f98c5a7010fa71cee88b4c2470e5cd804e42dfbc5292cf1c20eb75e9b1814002" diff --git a/recipes/xorg-driver/xf86-input-dmc_1.1.2.bb b/recipes/xorg-driver/xf86-input-dmc_1.1.2.bb index fea3ce83aa..7298d801fe 100644 --- a/recipes/xorg-driver/xf86-input-dmc_1.1.2.bb +++ b/recipes/xorg-driver/xf86-input-dmc_1.1.2.bb @@ -3,3 +3,5 @@ require xorg-driver-input.inc DESCRIPTION = "X.Org X server -- DMC input driver" PE = "1" +SRC_URI[archive.md5sum] = "91021ea8f3593221c0d9ee9cc14deb48" +SRC_URI[archive.sha256sum] = "b6f4eb367ab1aa7da5ac5218953d7cdde409c9ddf59f6cb6b2e1aa2789b3f361" diff --git a/recipes/xorg-driver/xf86-input-dynapro_1.1.0.bb b/recipes/xorg-driver/xf86-input-dynapro_1.1.0.bb index 311caf6553..a2b9aa5149 100644 --- a/recipes/xorg-driver/xf86-input-dynapro_1.1.0.bb +++ b/recipes/xorg-driver/xf86-input-dynapro_1.1.0.bb @@ -1,3 +1,5 @@ require xorg-driver-input.inc PE = "1" +SRC_URI[archive.md5sum] = "1683178d09dfc604dde9ea2aab950a28" +SRC_URI[archive.sha256sum] = "fc2ad50b1aa027fe57da53cbb73db0b4b9d0de9032f00dd42e7cc0aae7c50d6a" diff --git a/recipes/xorg-driver/xf86-input-dynapro_1.1.1.bb b/recipes/xorg-driver/xf86-input-dynapro_1.1.1.bb index 0033ffe7fa..3198bf1f12 100644 --- a/recipes/xorg-driver/xf86-input-dynapro_1.1.1.bb +++ b/recipes/xorg-driver/xf86-input-dynapro_1.1.1.bb @@ -3,3 +3,5 @@ require xorg-driver-input.inc DESCRIPTION = "X.Org X server -- Dynapro input driver" PE = "1" +SRC_URI[archive.md5sum] = "d47be12a230c44a05d56d6b79ebcfc38" +SRC_URI[archive.sha256sum] = "ed0f1ba81febf8e7a20cfaf32b021fcaa102af37f3070d67d6a101eeb6964992" diff --git a/recipes/xorg-driver/xf86-input-dynapro_1.1.2.bb b/recipes/xorg-driver/xf86-input-dynapro_1.1.2.bb index 0033ffe7fa..5d58a1eb96 100644 --- a/recipes/xorg-driver/xf86-input-dynapro_1.1.2.bb +++ b/recipes/xorg-driver/xf86-input-dynapro_1.1.2.bb @@ -3,3 +3,5 @@ require xorg-driver-input.inc DESCRIPTION = "X.Org X server -- Dynapro input driver" PE = "1" +SRC_URI[archive.md5sum] = "ceb5efbd3d62e24ab3a5f9f180777f7c" +SRC_URI[archive.sha256sum] = "55b7b2e950331292ec05c81d566af6d1000ac3cf904068964c3b9d43cea4deec" diff --git a/recipes/xorg-driver/xf86-input-elo2300_1.1.0.bb b/recipes/xorg-driver/xf86-input-elo2300_1.1.0.bb index 311caf6553..e5dcfb56a6 100644 --- a/recipes/xorg-driver/xf86-input-elo2300_1.1.0.bb +++ b/recipes/xorg-driver/xf86-input-elo2300_1.1.0.bb @@ -1,3 +1,5 @@ require xorg-driver-input.inc PE = "1" +SRC_URI[archive.md5sum] = "43885769d6f741272dda162e82902b0d" +SRC_URI[archive.sha256sum] = "9551f67e24c4573867a64d032d1ff6b63654caab8a85d3c6b2af7748daaa2134" diff --git a/recipes/xorg-driver/xf86-input-elo2300_1.1.1.bb b/recipes/xorg-driver/xf86-input-elo2300_1.1.1.bb index 7841287fb0..564c3056d1 100644 --- a/recipes/xorg-driver/xf86-input-elo2300_1.1.1.bb +++ b/recipes/xorg-driver/xf86-input-elo2300_1.1.1.bb @@ -3,3 +3,5 @@ require xorg-driver-input.inc DESCRIPTION = "X.Org X server -- ELO2300 input driver" PE = "1" +SRC_URI[archive.md5sum] = "4eef20f44954d49571a10b9134fdb663" +SRC_URI[archive.sha256sum] = "cc2cd97f49cce1795ea74034b1416ff7cd5107e1a69258b09a741d55a98ba005" diff --git a/recipes/xorg-driver/xf86-input-elo2300_1.1.2.bb b/recipes/xorg-driver/xf86-input-elo2300_1.1.2.bb index 7841287fb0..0ecb28766c 100644 --- a/recipes/xorg-driver/xf86-input-elo2300_1.1.2.bb +++ b/recipes/xorg-driver/xf86-input-elo2300_1.1.2.bb @@ -3,3 +3,5 @@ require xorg-driver-input.inc DESCRIPTION = "X.Org X server -- ELO2300 input driver" PE = "1" +SRC_URI[archive.md5sum] = "611d0a77a80286bc926dd3c414e59555" +SRC_URI[archive.sha256sum] = "ce575f79a5a93f4129a4e63572911d54cdc6640abc303afeb3c74741bb3c9627" diff --git a/recipes/xorg-driver/xf86-input-elographics_1.1.0.bb b/recipes/xorg-driver/xf86-input-elographics_1.1.0.bb index cb49a58d4c..d38b92823b 100644 --- a/recipes/xorg-driver/xf86-input-elographics_1.1.0.bb +++ b/recipes/xorg-driver/xf86-input-elographics_1.1.0.bb @@ -2,3 +2,5 @@ require xorg-driver-input.inc DESCRIPTION = "X.Org X server -- ELOGraphics input driver" PE = "2" +SRC_URI[archive.md5sum] = "ecb2bf1f800d4f5f4c295f2a0e6b1de7" +SRC_URI[archive.sha256sum] = "1583e1dae6e3ecd34ba55deae7dfc052efede0378f852de6224308d7e7d5b2d8" diff --git a/recipes/xorg-driver/xf86-input-elographics_1.2.2.bb b/recipes/xorg-driver/xf86-input-elographics_1.2.2.bb index cb49a58d4c..c3159b04fb 100644 --- a/recipes/xorg-driver/xf86-input-elographics_1.2.2.bb +++ b/recipes/xorg-driver/xf86-input-elographics_1.2.2.bb @@ -2,3 +2,5 @@ require xorg-driver-input.inc DESCRIPTION = "X.Org X server -- ELOGraphics input driver" PE = "2" +SRC_URI[archive.md5sum] = "50a9c32af12ca4733afe23042f012f9c" +SRC_URI[archive.sha256sum] = "76ded0e6977f7d562a8236bc810423cd050320531be9621d868a48309ebc4d63" diff --git a/recipes/xorg-driver/xf86-input-elographics_1.2.3.bb b/recipes/xorg-driver/xf86-input-elographics_1.2.3.bb index cb49a58d4c..160658050b 100644 --- a/recipes/xorg-driver/xf86-input-elographics_1.2.3.bb +++ b/recipes/xorg-driver/xf86-input-elographics_1.2.3.bb @@ -2,3 +2,5 @@ require xorg-driver-input.inc DESCRIPTION = "X.Org X server -- ELOGraphics input driver" PE = "2" +SRC_URI[archive.md5sum] = "cc2923460c8eff9652b01889a063058d" +SRC_URI[archive.sha256sum] = "67550c8f4a85a8029f08880adf487e2efd4585e7adbe8da357fbd49750b08d8f" diff --git a/recipes/xorg-driver/xf86-input-elographics_X11R7.0-1.0.0.5.bb b/recipes/xorg-driver/xf86-input-elographics_X11R7.0-1.0.0.5.bb index 34a497438b..efe4e823d6 100644 --- a/recipes/xorg-driver/xf86-input-elographics_X11R7.0-1.0.0.5.bb +++ b/recipes/xorg-driver/xf86-input-elographics_X11R7.0-1.0.0.5.bb @@ -1,2 +1,4 @@ require xorg-driver-input.inc PE = "1" +SRC_URI[archive.md5sum] = "24c33f833bb2db72a07c3d28bfc0aae9" +SRC_URI[archive.sha256sum] = "f1b7f84175d33f4d18c83cd0d37bd3962acd668922fa074a8ae29e18517cdda7" diff --git a/recipes/xorg-driver/xf86-input-evdev_1.1.5.bb b/recipes/xorg-driver/xf86-input-evdev_1.1.5.bb index 8260dd6a60..6303a3b482 100644 --- a/recipes/xorg-driver/xf86-input-evdev_1.1.5.bb +++ b/recipes/xorg-driver/xf86-input-evdev_1.1.5.bb @@ -5,3 +5,5 @@ PE = "1" DEPENDS += " kbproto" +SRC_URI[archive.md5sum] = "01705ea9a4d1699d5eeb17e7f297a581" +SRC_URI[archive.sha256sum] = "52b7daab86dade2d189f0378ddf196c018cdc9dd47ade0b3b8fc7591cb4bbe9e" diff --git a/recipes/xorg-driver/xf86-input-evdev_1.2.0.bb b/recipes/xorg-driver/xf86-input-evdev_1.2.0.bb index 792909621a..4f343a1dbd 100644 --- a/recipes/xorg-driver/xf86-input-evdev_1.2.0.bb +++ b/recipes/xorg-driver/xf86-input-evdev_1.2.0.bb @@ -2,3 +2,5 @@ require xorg-driver-input.inc DESCRIPTION = "X.Org X server -- evdev input driver" PE = "1" +SRC_URI[archive.md5sum] = "0c7c41d3f1637bb559e80c2ad708f05d" +SRC_URI[archive.sha256sum] = "b23b231d754cab717a4b145ee3a5f3e73db46d877d23502326e9794d92d976ba" diff --git a/recipes/xorg-driver/xf86-input-evdev_1.99.4.bb b/recipes/xorg-driver/xf86-input-evdev_1.99.4.bb index 792909621a..46e39759cf 100644 --- a/recipes/xorg-driver/xf86-input-evdev_1.99.4.bb +++ b/recipes/xorg-driver/xf86-input-evdev_1.99.4.bb @@ -2,3 +2,5 @@ require xorg-driver-input.inc DESCRIPTION = "X.Org X server -- evdev input driver" PE = "1" +SRC_URI[archive.md5sum] = "f56d98ab11ef77cfcbafb5d93c697791" +SRC_URI[archive.sha256sum] = "71e896168819bcf50044c175482d03873c31bc6eb355305a87e94772580789dd" diff --git a/recipes/xorg-driver/xf86-input-evdev_2.0.4.bb b/recipes/xorg-driver/xf86-input-evdev_2.0.4.bb index 792909621a..00fdb034ec 100644 --- a/recipes/xorg-driver/xf86-input-evdev_2.0.4.bb +++ b/recipes/xorg-driver/xf86-input-evdev_2.0.4.bb @@ -2,3 +2,5 @@ require xorg-driver-input.inc DESCRIPTION = "X.Org X server -- evdev input driver" PE = "1" +SRC_URI[archive.md5sum] = "ac97e155ea4db87a8393297493f9c406" +SRC_URI[archive.sha256sum] = "825adcadaf4c90d4cb1d0bd21dcf67bf3b895f12f8e7bf186ed936445dc015ca" diff --git a/recipes/xorg-driver/xf86-input-evdev_2.1.0.bb b/recipes/xorg-driver/xf86-input-evdev_2.1.0.bb index 792909621a..f5bfb890b8 100644 --- a/recipes/xorg-driver/xf86-input-evdev_2.1.0.bb +++ b/recipes/xorg-driver/xf86-input-evdev_2.1.0.bb @@ -2,3 +2,5 @@ require xorg-driver-input.inc DESCRIPTION = "X.Org X server -- evdev input driver" PE = "1" +SRC_URI[archive.md5sum] = "a6070ead29b2d81b5b386a96df2661b8" +SRC_URI[archive.sha256sum] = "45c4b6df8d1dbc4db8aa580be4f3c693ebba4eba4908d82489948827d3bed0e5" diff --git a/recipes/xorg-driver/xf86-input-evdev_2.2.5.bb b/recipes/xorg-driver/xf86-input-evdev_2.2.5.bb index 792909621a..4afdf24762 100644 --- a/recipes/xorg-driver/xf86-input-evdev_2.2.5.bb +++ b/recipes/xorg-driver/xf86-input-evdev_2.2.5.bb @@ -2,3 +2,5 @@ require xorg-driver-input.inc DESCRIPTION = "X.Org X server -- evdev input driver" PE = "1" +SRC_URI[archive.md5sum] = "e926692d74ee81ed459d0fe89439ff8b" +SRC_URI[archive.sha256sum] = "433fd29043cd427ba486bcce471aae3ad1abca94c8682feff92da0c380b8dff3" diff --git a/recipes/xorg-driver/xf86-input-evdev_2.2.6.bb b/recipes/xorg-driver/xf86-input-evdev_2.2.6.bb index 792909621a..1ebaa5a43e 100644 --- a/recipes/xorg-driver/xf86-input-evdev_2.2.6.bb +++ b/recipes/xorg-driver/xf86-input-evdev_2.2.6.bb @@ -2,3 +2,5 @@ require xorg-driver-input.inc DESCRIPTION = "X.Org X server -- evdev input driver" PE = "1" +SRC_URI[archive.md5sum] = "bc4b2356e1dbf2d21e1e95249b18f5f8" +SRC_URI[archive.sha256sum] = "dbf3799e207175e91f50492d51343e5cfdc706f637f6e9f14257b764e86bb3f9" diff --git a/recipes/xorg-driver/xf86-input-evdev_2.3.0.bb b/recipes/xorg-driver/xf86-input-evdev_2.3.0.bb index 792909621a..bc20fa9a33 100644 --- a/recipes/xorg-driver/xf86-input-evdev_2.3.0.bb +++ b/recipes/xorg-driver/xf86-input-evdev_2.3.0.bb @@ -2,3 +2,5 @@ require xorg-driver-input.inc DESCRIPTION = "X.Org X server -- evdev input driver" PE = "1" +SRC_URI[archive.md5sum] = "21dac6461379d67ee3b333c77f63e7bf" +SRC_URI[archive.sha256sum] = "6d57420cce9201a14f2fb5c5f6bc8999ffdcc9520020d54290eb22db27c366c8" diff --git a/recipes/xorg-driver/xf86-input-evdev_2.3.1.bb b/recipes/xorg-driver/xf86-input-evdev_2.3.1.bb index 792909621a..0d6e79cc6d 100644 --- a/recipes/xorg-driver/xf86-input-evdev_2.3.1.bb +++ b/recipes/xorg-driver/xf86-input-evdev_2.3.1.bb @@ -2,3 +2,5 @@ require xorg-driver-input.inc DESCRIPTION = "X.Org X server -- evdev input driver" PE = "1" +SRC_URI[archive.md5sum] = "e56ce4424b89b2409c6e73e007a85da7" +SRC_URI[archive.sha256sum] = "462f2ae2fd389a87e09fa764a236cd04dcbf85bcfcd8000aa9a3810055511d8f" diff --git a/recipes/xorg-driver/xf86-input-evdev_2.3.2.bb b/recipes/xorg-driver/xf86-input-evdev_2.3.2.bb index 792909621a..e577f51e13 100644 --- a/recipes/xorg-driver/xf86-input-evdev_2.3.2.bb +++ b/recipes/xorg-driver/xf86-input-evdev_2.3.2.bb @@ -2,3 +2,5 @@ require xorg-driver-input.inc DESCRIPTION = "X.Org X server -- evdev input driver" PE = "1" +SRC_URI[archive.md5sum] = "b2bfe368022eedf2671ee28daba31efc" +SRC_URI[archive.sha256sum] = "029bf469bd013bcc3e384c1297a05a59e4b9b3ba90a26c022b32c0819d115e28" diff --git a/recipes/xorg-driver/xf86-input-evtouch_0.8.8.bb b/recipes/xorg-driver/xf86-input-evtouch_0.8.8.bb index 4cb8e569b5..32a39c5346 100644 --- a/recipes/xorg-driver/xf86-input-evtouch_0.8.8.bb +++ b/recipes/xorg-driver/xf86-input-evtouch_0.8.8.bb @@ -4,7 +4,7 @@ PR = "r12" DESCRIPTION = "X.Org X server -- evtouch input driver" -SRC_URI = "http://www.conan.de/touchscreen/xf86-input-evtouch-${PV}.tar.bz2 \ +SRC_URI = "http://www.conan.de/touchscreen/xf86-input-evtouch-${PV}.tar.bz2;name=archive \ file://fdi/*.fdi \ file://udev-ett-tc5uh.patch;patch=1 \ file://02_calibration_1.6.patch;patch=1 \ @@ -22,3 +22,5 @@ do_install_append() { } FILES_${PN} += "${datadir}/hal" +SRC_URI[archive.md5sum] = "4d8e092356d8353002f60a4907046c13" +SRC_URI[archive.sha256sum] = "eafc4a09729a4b2b6120430c71e1954c5cac299ad6adf2f9a40aee8a7b51e476" diff --git a/recipes/xorg-driver/xf86-input-fpit_1.1.0.bb b/recipes/xorg-driver/xf86-input-fpit_1.1.0.bb index 311caf6553..c7e92f18ef 100644 --- a/recipes/xorg-driver/xf86-input-fpit_1.1.0.bb +++ b/recipes/xorg-driver/xf86-input-fpit_1.1.0.bb @@ -1,3 +1,5 @@ require xorg-driver-input.inc PE = "1" +SRC_URI[archive.md5sum] = "a31066a2076d18619ceaea67f6d89698" +SRC_URI[archive.sha256sum] = "8ee3b2df90516182460fbda025153aa7fb2c6ba343e4239d225963a287f694f8" diff --git a/recipes/xorg-driver/xf86-input-fpit_1.2.0.bb b/recipes/xorg-driver/xf86-input-fpit_1.2.0.bb index 311caf6553..f22f53ef16 100644 --- a/recipes/xorg-driver/xf86-input-fpit_1.2.0.bb +++ b/recipes/xorg-driver/xf86-input-fpit_1.2.0.bb @@ -1,3 +1,5 @@ require xorg-driver-input.inc PE = "1" +SRC_URI[archive.md5sum] = "0f3e013d5ff58e0aba3d9e1d18830291" +SRC_URI[archive.sha256sum] = "87e3dd97d57ddb520cafa5e68fa7846cfc3d9d71cb054cdf0e1d650c7b1cff7e" diff --git a/recipes/xorg-driver/xf86-input-fpit_1.3.0.bb b/recipes/xorg-driver/xf86-input-fpit_1.3.0.bb index 311caf6553..3fac32a498 100644 --- a/recipes/xorg-driver/xf86-input-fpit_1.3.0.bb +++ b/recipes/xorg-driver/xf86-input-fpit_1.3.0.bb @@ -1,3 +1,5 @@ require xorg-driver-input.inc PE = "1" +SRC_URI[archive.md5sum] = "e5bfda480f25121e3c4222e5e1eb5880" +SRC_URI[archive.sha256sum] = "d1ced3b8c6d799c3af1c93e72dc571cb30d38083e1221b8ea0b2d4fc48a7eef8" diff --git a/recipes/xorg-driver/xf86-input-hyperpen_1.1.0.bb b/recipes/xorg-driver/xf86-input-hyperpen_1.1.0.bb index 311caf6553..4b0f52892e 100644 --- a/recipes/xorg-driver/xf86-input-hyperpen_1.1.0.bb +++ b/recipes/xorg-driver/xf86-input-hyperpen_1.1.0.bb @@ -1,3 +1,5 @@ require xorg-driver-input.inc PE = "1" +SRC_URI[archive.md5sum] = "1dfccb75069e61e0c6f990b47eb58c40" +SRC_URI[archive.sha256sum] = "d1c20a3340e06c5634759832dcf2edc6acb41476a4f637eba6880730e607f493" diff --git a/recipes/xorg-driver/xf86-input-hyperpen_1.2.0.bb b/recipes/xorg-driver/xf86-input-hyperpen_1.2.0.bb index 311caf6553..a20df3cedf 100644 --- a/recipes/xorg-driver/xf86-input-hyperpen_1.2.0.bb +++ b/recipes/xorg-driver/xf86-input-hyperpen_1.2.0.bb @@ -1,3 +1,5 @@ require xorg-driver-input.inc PE = "1" +SRC_URI[archive.md5sum] = "175c1e1ad668ebbbe212c1e975dd14f9" +SRC_URI[archive.sha256sum] = "689d1c5c1f21eed00ae03a01c57482f7bbef36d7e07156556c99febe28c7d413" diff --git a/recipes/xorg-driver/xf86-input-hyperpen_1.3.0.bb b/recipes/xorg-driver/xf86-input-hyperpen_1.3.0.bb index 311caf6553..f43383efc7 100644 --- a/recipes/xorg-driver/xf86-input-hyperpen_1.3.0.bb +++ b/recipes/xorg-driver/xf86-input-hyperpen_1.3.0.bb @@ -1,3 +1,5 @@ require xorg-driver-input.inc PE = "1" +SRC_URI[archive.md5sum] = "c50d0da3206d18d9d94f720e3688eca5" +SRC_URI[archive.sha256sum] = "e7a13a7597fa32f05d595d05a66cf94c529ba8ce1d03249bb9da5be9512c4b7b" diff --git a/recipes/xorg-driver/xf86-input-jamstudio_1.1.0.bb b/recipes/xorg-driver/xf86-input-jamstudio_1.1.0.bb index 34a497438b..cfb82de82b 100644 --- a/recipes/xorg-driver/xf86-input-jamstudio_1.1.0.bb +++ b/recipes/xorg-driver/xf86-input-jamstudio_1.1.0.bb @@ -1,2 +1,4 @@ require xorg-driver-input.inc PE = "1" +SRC_URI[archive.md5sum] = "a32e36a24545791a3408cdc5563b6523" +SRC_URI[archive.sha256sum] = "ce41b360bd08ea31036b79cfc25a32c854147522e4580f5ca1a203233e657e1a" diff --git a/recipes/xorg-driver/xf86-input-jamstudio_1.2.0.bb b/recipes/xorg-driver/xf86-input-jamstudio_1.2.0.bb index 34a497438b..6ba69e163a 100644 --- a/recipes/xorg-driver/xf86-input-jamstudio_1.2.0.bb +++ b/recipes/xorg-driver/xf86-input-jamstudio_1.2.0.bb @@ -1,2 +1,4 @@ require xorg-driver-input.inc PE = "1" +SRC_URI[archive.md5sum] = "8011f90d7dd801d26e8c3dd058633978" +SRC_URI[archive.sha256sum] = "c5bbade96f1849b45f665a54e08ac8f9d5a94d31a8a680edc4d3c9361d164ac0" diff --git a/recipes/xorg-driver/xf86-input-joystick_1.1.0.bb b/recipes/xorg-driver/xf86-input-joystick_1.1.0.bb index 311caf6553..4785a55fe7 100644 --- a/recipes/xorg-driver/xf86-input-joystick_1.1.0.bb +++ b/recipes/xorg-driver/xf86-input-joystick_1.1.0.bb @@ -1,3 +1,5 @@ require xorg-driver-input.inc PE = "1" +SRC_URI[archive.md5sum] = "e0025215542c7a11c5a7f9548631dbd7" +SRC_URI[archive.sha256sum] = "11c3e8056e8f44b9a6f348b5366c7e725155563374770b82e339e913b9a60d16" diff --git a/recipes/xorg-driver/xf86-input-joystick_1.3.1.bb b/recipes/xorg-driver/xf86-input-joystick_1.3.1.bb index a53297fd8a..fb43f55bd7 100644 --- a/recipes/xorg-driver/xf86-input-joystick_1.3.1.bb +++ b/recipes/xorg-driver/xf86-input-joystick_1.3.1.bb @@ -2,3 +2,5 @@ require xorg-driver-input.inc DESCRIPTION = "X.Org X server -- joystick input driver" PE = "1" +SRC_URI[archive.md5sum] = "ff25ea697cfa1570cc28f4b9cf9c761f" +SRC_URI[archive.sha256sum] = "1d33b9668e039ea9adc0680c1f2971785508cfd74b2215749db23af23ef8f9ce" diff --git a/recipes/xorg-driver/xf86-input-joystick_1.3.2.bb b/recipes/xorg-driver/xf86-input-joystick_1.3.2.bb index a53297fd8a..71994c6525 100644 --- a/recipes/xorg-driver/xf86-input-joystick_1.3.2.bb +++ b/recipes/xorg-driver/xf86-input-joystick_1.3.2.bb @@ -2,3 +2,5 @@ require xorg-driver-input.inc DESCRIPTION = "X.Org X server -- joystick input driver" PE = "1" +SRC_URI[archive.md5sum] = "e48b99e55093525ebb7811a014391a0b" +SRC_URI[archive.sha256sum] = "6cad238e0a54dec75c5224f9c0774b4fce2a03b06f1c61b404e9ea97d4941d4b" diff --git a/recipes/xorg-driver/xf86-input-joystick_1.5.0.bb b/recipes/xorg-driver/xf86-input-joystick_1.5.0.bb index a53297fd8a..9c567aa883 100644 --- a/recipes/xorg-driver/xf86-input-joystick_1.5.0.bb +++ b/recipes/xorg-driver/xf86-input-joystick_1.5.0.bb @@ -2,3 +2,5 @@ require xorg-driver-input.inc DESCRIPTION = "X.Org X server -- joystick input driver" PE = "1" +SRC_URI[archive.md5sum] = "79b20f86d1b2e625ae65e35c3457027f" +SRC_URI[archive.sha256sum] = "718118c5d769529f604c1ff099fe637173442cf01fc40bdef7d45f4baea282a9" diff --git a/recipes/xorg-driver/xf86-input-keyboard_1.1.1.bb b/recipes/xorg-driver/xf86-input-keyboard_1.1.1.bb index b4ef6c683e..a6eba7c21d 100644 --- a/recipes/xorg-driver/xf86-input-keyboard_1.1.1.bb +++ b/recipes/xorg-driver/xf86-input-keyboard_1.1.1.bb @@ -5,3 +5,5 @@ PE = "1" DEPENDS += " kbproto" +SRC_URI[archive.md5sum] = "babf094e37bdfc08076d4adb4c69c1d9" +SRC_URI[archive.sha256sum] = "b7e7377d75f3a10cceb5df18019b8e4498fbed0100478edd4af75bf8cd45d6fd" diff --git a/recipes/xorg-driver/xf86-input-keyboard_1.2.0.bb b/recipes/xorg-driver/xf86-input-keyboard_1.2.0.bb index b4ef6c683e..3949dea628 100644 --- a/recipes/xorg-driver/xf86-input-keyboard_1.2.0.bb +++ b/recipes/xorg-driver/xf86-input-keyboard_1.2.0.bb @@ -5,3 +5,5 @@ PE = "1" DEPENDS += " kbproto" +SRC_URI[archive.md5sum] = "06e14029e00b32ed085769775b398efd" +SRC_URI[archive.sha256sum] = "8c45fc324ea01377f9932250824ee1769bdf1eab6e4b661c22a39deb0b01580a" diff --git a/recipes/xorg-driver/xf86-input-keyboard_1.2.2.bb b/recipes/xorg-driver/xf86-input-keyboard_1.2.2.bb index b4ef6c683e..d1f111febe 100644 --- a/recipes/xorg-driver/xf86-input-keyboard_1.2.2.bb +++ b/recipes/xorg-driver/xf86-input-keyboard_1.2.2.bb @@ -5,3 +5,5 @@ PE = "1" DEPENDS += " kbproto" +SRC_URI[archive.md5sum] = "ab3122921f6359c54e250879288ffd47" +SRC_URI[archive.sha256sum] = "c25b35524eaf00928d97bd0d8bf9e489d92993b133461b5f4d8d9655d37ec072" diff --git a/recipes/xorg-driver/xf86-input-keyboard_1.3.1.bb b/recipes/xorg-driver/xf86-input-keyboard_1.3.1.bb index 28a834a274..94aefb6be6 100644 --- a/recipes/xorg-driver/xf86-input-keyboard_1.3.1.bb +++ b/recipes/xorg-driver/xf86-input-keyboard_1.3.1.bb @@ -4,3 +4,5 @@ PE = "1" DESCRIPTION = "X.Org X server -- keyboard input driver" DEPENDS += " kbproto" +SRC_URI[archive.md5sum] = "ebe5dcf8eed819103909f18321fc3b9d" +SRC_URI[archive.sha256sum] = "7b514715dfb5a2512dea3355bc3f09eb879d7184440c5525f0a9d29ec9f3be42" diff --git a/recipes/xorg-driver/xf86-input-keyboard_1.3.2.bb b/recipes/xorg-driver/xf86-input-keyboard_1.3.2.bb index 28a834a274..b8ba441e28 100644 --- a/recipes/xorg-driver/xf86-input-keyboard_1.3.2.bb +++ b/recipes/xorg-driver/xf86-input-keyboard_1.3.2.bb @@ -4,3 +4,5 @@ PE = "1" DESCRIPTION = "X.Org X server -- keyboard input driver" DEPENDS += " kbproto" +SRC_URI[archive.md5sum] = "d6fe929c4f6085d6dd67f197ae9c42f6" +SRC_URI[archive.sha256sum] = "33939ec65dbf56f49e1e7de854a1cf95446e40c533950431901567e67112aef2" diff --git a/recipes/xorg-driver/xf86-input-keyboard_1.4.0.bb b/recipes/xorg-driver/xf86-input-keyboard_1.4.0.bb index 28a834a274..079cf6d256 100644 --- a/recipes/xorg-driver/xf86-input-keyboard_1.4.0.bb +++ b/recipes/xorg-driver/xf86-input-keyboard_1.4.0.bb @@ -4,3 +4,5 @@ PE = "1" DESCRIPTION = "X.Org X server -- keyboard input driver" DEPENDS += " kbproto" +SRC_URI[archive.md5sum] = "fd17158ffeacecc8cc670604460cb98b" +SRC_URI[archive.sha256sum] = "842d36cfca68ddab4f2c562c73bfd43ba76de2d490d60034f0c5dd524aa6d6a5" diff --git a/recipes/xorg-driver/xf86-input-magellan_1.1.0.bb b/recipes/xorg-driver/xf86-input-magellan_1.1.0.bb index 311caf6553..66c9f2b5a9 100644 --- a/recipes/xorg-driver/xf86-input-magellan_1.1.0.bb +++ b/recipes/xorg-driver/xf86-input-magellan_1.1.0.bb @@ -1,3 +1,5 @@ require xorg-driver-input.inc PE = "1" +SRC_URI[archive.md5sum] = "0d6a81aa864ac790d9a8b517ca7016ad" +SRC_URI[archive.sha256sum] = "8eef54b50c428513a330ed7183ce37f269050252a4d1199d3b00ad6bf0a7833d" diff --git a/recipes/xorg-driver/xf86-input-magellan_1.1.1.bb b/recipes/xorg-driver/xf86-input-magellan_1.1.1.bb index 2bbf253d53..5db4a2c568 100644 --- a/recipes/xorg-driver/xf86-input-magellan_1.1.1.bb +++ b/recipes/xorg-driver/xf86-input-magellan_1.1.1.bb @@ -2,3 +2,5 @@ require xorg-driver-input.inc DESCRIPTION = "X.Org X server -- Magellan input driver" PE = "1" +SRC_URI[archive.md5sum] = "8a966d3b74dc2a801ff09b895037090c" +SRC_URI[archive.sha256sum] = "06da7d1b222ba47ba0c7fd561965d78f2c8e46f44c998cb768e98bdc3c0e1741" diff --git a/recipes/xorg-driver/xf86-input-magellan_1.2.0.bb b/recipes/xorg-driver/xf86-input-magellan_1.2.0.bb index 2bbf253d53..78b6631a04 100644 --- a/recipes/xorg-driver/xf86-input-magellan_1.2.0.bb +++ b/recipes/xorg-driver/xf86-input-magellan_1.2.0.bb @@ -2,3 +2,5 @@ require xorg-driver-input.inc DESCRIPTION = "X.Org X server -- Magellan input driver" PE = "1" +SRC_URI[archive.md5sum] = "9801ba10f15f8be2420dfb3f3b5d5d27" +SRC_URI[archive.sha256sum] = "c5285147a4df0b5b0fd5dcb7c0e5953bc982d3d6f2a2ed2e7767ead909a510e4" diff --git a/recipes/xorg-driver/xf86-input-magictouch_1.0.0.5.bb b/recipes/xorg-driver/xf86-input-magictouch_1.0.0.5.bb index 311caf6553..150cdb5b38 100644 --- a/recipes/xorg-driver/xf86-input-magictouch_1.0.0.5.bb +++ b/recipes/xorg-driver/xf86-input-magictouch_1.0.0.5.bb @@ -1,3 +1,5 @@ require xorg-driver-input.inc PE = "1" +SRC_URI[archive.md5sum] = "d23f2791cd634ef85b7cc5e9da8f8407" +SRC_URI[archive.sha256sum] = "9cedc831e9d86889f473fbe3b8f1478afe5ed8c0dd71492aeb896cc681d7444c" diff --git a/recipes/xorg-driver/xf86-input-microtouch_1.1.0.bb b/recipes/xorg-driver/xf86-input-microtouch_1.1.0.bb index 34a497438b..4516305731 100644 --- a/recipes/xorg-driver/xf86-input-microtouch_1.1.0.bb +++ b/recipes/xorg-driver/xf86-input-microtouch_1.1.0.bb @@ -1,2 +1,4 @@ require xorg-driver-input.inc PE = "1" +SRC_URI[archive.md5sum] = "7b3cc0330d70e7e4e07914fcb325b331" +SRC_URI[archive.sha256sum] = "7f92f5531495ecfbfd00744198fd4b2aa3b8f5c188b115e55e865e961bca2039" diff --git a/recipes/xorg-driver/xf86-input-microtouch_1.1.1.bb b/recipes/xorg-driver/xf86-input-microtouch_1.1.1.bb index 9a90a80b9f..1f1965c35e 100644 --- a/recipes/xorg-driver/xf86-input-microtouch_1.1.1.bb +++ b/recipes/xorg-driver/xf86-input-microtouch_1.1.1.bb @@ -2,3 +2,5 @@ require xorg-driver-input.inc DESCRIPTION = "X.Org X server -- MicroTouch input driver" PE = "1" +SRC_URI[archive.md5sum] = "9843fbea6cc0c4129e96ce9a6c893cf6" +SRC_URI[archive.sha256sum] = "5f2f0b16705c6226081a452f9f876508c388b384fca69106d377cd134cfddfd3" diff --git a/recipes/xorg-driver/xf86-input-microtouch_1.2.0.bb b/recipes/xorg-driver/xf86-input-microtouch_1.2.0.bb index 9a90a80b9f..c99881b8bf 100644 --- a/recipes/xorg-driver/xf86-input-microtouch_1.2.0.bb +++ b/recipes/xorg-driver/xf86-input-microtouch_1.2.0.bb @@ -2,3 +2,5 @@ require xorg-driver-input.inc DESCRIPTION = "X.Org X server -- MicroTouch input driver" PE = "1" +SRC_URI[archive.md5sum] = "1ad1aee7d8df84b9ea832d1e75963257" +SRC_URI[archive.sha256sum] = "b3034e0a768c4f646ea954d59dd414d00df3238e845848081221af6efe864f3b" diff --git a/recipes/xorg-driver/xf86-input-mouse_1.1.2.bb b/recipes/xorg-driver/xf86-input-mouse_1.1.2.bb index eb464ad5a6..2edea15dcc 100644 --- a/recipes/xorg-driver/xf86-input-mouse_1.1.2.bb +++ b/recipes/xorg-driver/xf86-input-mouse_1.1.2.bb @@ -5,3 +5,5 @@ DESCRIPTION = "Mouse Support in X11" #DEPENDS += " " +SRC_URI[archive.md5sum] = "d8bcd9fb1b4efb02acd251495f9a30c1" +SRC_URI[archive.sha256sum] = "7d4c2ecbe8f9327f7c8093c05401ab68b22f3343bcf04e4838cc40c21b7f8e0a" diff --git a/recipes/xorg-driver/xf86-input-mouse_1.2.1.bb b/recipes/xorg-driver/xf86-input-mouse_1.2.1.bb index eb464ad5a6..3f17b11a1b 100644 --- a/recipes/xorg-driver/xf86-input-mouse_1.2.1.bb +++ b/recipes/xorg-driver/xf86-input-mouse_1.2.1.bb @@ -5,3 +5,5 @@ DESCRIPTION = "Mouse Support in X11" #DEPENDS += " " +SRC_URI[archive.md5sum] = "72b07e65bbea6ab484d84c048f6835fb" +SRC_URI[archive.sha256sum] = "82671998e2b02ad097e3d5cc7d964e11de0b3ca3dfec4876e8fa2a13af6aacc3" diff --git a/recipes/xorg-driver/xf86-input-mouse_1.2.2.bb b/recipes/xorg-driver/xf86-input-mouse_1.2.2.bb index eb464ad5a6..62723344bb 100644 --- a/recipes/xorg-driver/xf86-input-mouse_1.2.2.bb +++ b/recipes/xorg-driver/xf86-input-mouse_1.2.2.bb @@ -5,3 +5,5 @@ DESCRIPTION = "Mouse Support in X11" #DEPENDS += " " +SRC_URI[archive.md5sum] = "c47c598e55e7080b8ea30f70781f7ca3" +SRC_URI[archive.sha256sum] = "80e9cb52b2036b71289b2140bcd3ac202cf46fd42830761c53120ddac38e7edf" diff --git a/recipes/xorg-driver/xf86-input-mouse_1.2.3.bb b/recipes/xorg-driver/xf86-input-mouse_1.2.3.bb index e6325675f8..baf9b9b227 100644 --- a/recipes/xorg-driver/xf86-input-mouse_1.2.3.bb +++ b/recipes/xorg-driver/xf86-input-mouse_1.2.3.bb @@ -2,3 +2,5 @@ require xorg-driver-input.inc DESCRIPTION = "X.Org X server -- mouse input driver" PE = "1" +SRC_URI[archive.md5sum] = "47da1fa52584933d045528109f094eff" +SRC_URI[archive.sha256sum] = "a07cb2169f43018c90b7889781c0db30cda0da03811edccb8c4db533166357ab" diff --git a/recipes/xorg-driver/xf86-input-mouse_1.3.0.bb b/recipes/xorg-driver/xf86-input-mouse_1.3.0.bb index e6325675f8..acc9826e55 100644 --- a/recipes/xorg-driver/xf86-input-mouse_1.3.0.bb +++ b/recipes/xorg-driver/xf86-input-mouse_1.3.0.bb @@ -2,3 +2,5 @@ require xorg-driver-input.inc DESCRIPTION = "X.Org X server -- mouse input driver" PE = "1" +SRC_URI[archive.md5sum] = "31a51b0e5ddc4fac19754f48a3adf881" +SRC_URI[archive.sha256sum] = "054b253f366795c2865714ce8bc545c79e59aa9ce1b7a9a4a05b9c674dff9dec" diff --git a/recipes/xorg-driver/xf86-input-mouse_1.4.0.bb b/recipes/xorg-driver/xf86-input-mouse_1.4.0.bb index e6325675f8..55cbfac8f0 100644 --- a/recipes/xorg-driver/xf86-input-mouse_1.4.0.bb +++ b/recipes/xorg-driver/xf86-input-mouse_1.4.0.bb @@ -2,3 +2,5 @@ require xorg-driver-input.inc DESCRIPTION = "X.Org X server -- mouse input driver" PE = "1" +SRC_URI[archive.md5sum] = "e7dc0759c14a9bfd373917a49e5f7c7d" +SRC_URI[archive.sha256sum] = "e6e1dbd64d41c826619a5881c5aeed46095bfdcb87c3e27d65292fc12a5bb7c7" diff --git a/recipes/xorg-driver/xf86-input-mouse_1.5.0.bb b/recipes/xorg-driver/xf86-input-mouse_1.5.0.bb index e6325675f8..8684a67362 100644 --- a/recipes/xorg-driver/xf86-input-mouse_1.5.0.bb +++ b/recipes/xorg-driver/xf86-input-mouse_1.5.0.bb @@ -2,3 +2,5 @@ require xorg-driver-input.inc DESCRIPTION = "X.Org X server -- mouse input driver" PE = "1" +SRC_URI[archive.md5sum] = "c58629fddf0782dad5c02da6aeb35521" +SRC_URI[archive.sha256sum] = "f303e20872ab2fb20e07a7f734d17723346d2b4b8687ea2086f7a7468d1ab397" diff --git a/recipes/xorg-driver/xf86-input-mutouch_1.1.0.bb b/recipes/xorg-driver/xf86-input-mutouch_1.1.0.bb index 34a497438b..b173e8e579 100644 --- a/recipes/xorg-driver/xf86-input-mutouch_1.1.0.bb +++ b/recipes/xorg-driver/xf86-input-mutouch_1.1.0.bb @@ -1,2 +1,4 @@ require xorg-driver-input.inc PE = "1" +SRC_URI[archive.md5sum] = "98ae915c67cabf0e6d40a425dbdbe10b" +SRC_URI[archive.sha256sum] = "cc67e0dd4f4fcc8d798f0bfe42b975132c5739bdd80809580a74182e4d1b62ea" diff --git a/recipes/xorg-driver/xf86-input-mutouch_1.2.0.bb b/recipes/xorg-driver/xf86-input-mutouch_1.2.0.bb index cce8e75524..e7dd5f0c1e 100644 --- a/recipes/xorg-driver/xf86-input-mutouch_1.2.0.bb +++ b/recipes/xorg-driver/xf86-input-mutouch_1.2.0.bb @@ -2,3 +2,5 @@ require xorg-driver-input.inc PE = "1" DESCRIPTION = "X.Org X server -- muTouch input driver" +SRC_URI[archive.md5sum] = "50711d390d2867e3fa7e06b59b2d575b" +SRC_URI[archive.sha256sum] = "214f0831f36ebfc081b9f31f91ae27972ced9371b9b2256650998596a097061d" diff --git a/recipes/xorg-driver/xf86-input-mutouch_1.2.1.bb b/recipes/xorg-driver/xf86-input-mutouch_1.2.1.bb index cce8e75524..d5a137553b 100644 --- a/recipes/xorg-driver/xf86-input-mutouch_1.2.1.bb +++ b/recipes/xorg-driver/xf86-input-mutouch_1.2.1.bb @@ -2,3 +2,5 @@ require xorg-driver-input.inc PE = "1" DESCRIPTION = "X.Org X server -- muTouch input driver" +SRC_URI[archive.md5sum] = "f28998cdfae2a4c41589299a4ee1f459" +SRC_URI[archive.sha256sum] = "53bfe976042de69f87e28261ad581cf418c67b5cb69a09cfe1eea169021db35b" diff --git a/recipes/xorg-driver/xf86-input-palmax_1.1.0.bb b/recipes/xorg-driver/xf86-input-palmax_1.1.0.bb index 311caf6553..903f889bfa 100644 --- a/recipes/xorg-driver/xf86-input-palmax_1.1.0.bb +++ b/recipes/xorg-driver/xf86-input-palmax_1.1.0.bb @@ -1,3 +1,5 @@ require xorg-driver-input.inc PE = "1" +SRC_URI[archive.md5sum] = "0959dbf7972dfb95f56e4bd3f56447cf" +SRC_URI[archive.sha256sum] = "5c00c85eed2950a575362bee2f21c2fa68eb8af81e7f1d451273a1302eac4145" diff --git a/recipes/xorg-driver/xf86-input-palmax_1.2.0.bb b/recipes/xorg-driver/xf86-input-palmax_1.2.0.bb index 1334751ca6..a3c93a0cb0 100644 --- a/recipes/xorg-driver/xf86-input-palmax_1.2.0.bb +++ b/recipes/xorg-driver/xf86-input-palmax_1.2.0.bb @@ -2,3 +2,5 @@ require xorg-driver-input.inc PE = "1" DESCRIPTION = "X.Org X server -- Palmax input driver" +SRC_URI[archive.md5sum] = "9655d2235569c5a6ac321c6fb89a6f3b" +SRC_URI[archive.sha256sum] = "02177c339ba60fb6cc942d3bc93a322e94247f36a6fe90c7c1121694c929b05b" diff --git a/recipes/xorg-driver/xf86-input-penmount_1.2.0.bb b/recipes/xorg-driver/xf86-input-penmount_1.2.0.bb index f6032bceaa..0b5cfb0806 100644 --- a/recipes/xorg-driver/xf86-input-penmount_1.2.0.bb +++ b/recipes/xorg-driver/xf86-input-penmount_1.2.0.bb @@ -5,3 +5,5 @@ PE = "1" #DEPENDS += " " +SRC_URI[archive.md5sum] = "0589f2eaa84afb9bd49b226ce7dacdda" +SRC_URI[archive.sha256sum] = "dea18a07cf8f59e7bc981cfa1f6ef476dd14f7d9bee3bb1a55a6cc49f766150e" diff --git a/recipes/xorg-driver/xf86-input-penmount_1.2.1.bb b/recipes/xorg-driver/xf86-input-penmount_1.2.1.bb index 1ed62d4cad..8d85f6b743 100644 --- a/recipes/xorg-driver/xf86-input-penmount_1.2.1.bb +++ b/recipes/xorg-driver/xf86-input-penmount_1.2.1.bb @@ -2,3 +2,5 @@ require xorg-driver-input.inc DESCRIPTION = "X.Org X server -- Penmount input driver" PE = "1" +SRC_URI[archive.md5sum] = "268af4dceda544d8c815b9b7e87d4536" +SRC_URI[archive.sha256sum] = "fab08de727da6f56b82d8ecee451a52e7129ff80522e711c5322f1bd2fa9970a" diff --git a/recipes/xorg-driver/xf86-input-penmount_1.3.0.bb b/recipes/xorg-driver/xf86-input-penmount_1.3.0.bb index 1ed62d4cad..eef18af9c1 100644 --- a/recipes/xorg-driver/xf86-input-penmount_1.3.0.bb +++ b/recipes/xorg-driver/xf86-input-penmount_1.3.0.bb @@ -2,3 +2,5 @@ require xorg-driver-input.inc DESCRIPTION = "X.Org X server -- Penmount input driver" PE = "1" +SRC_URI[archive.md5sum] = "24594c0222e631fedccc7c540c420b03" +SRC_URI[archive.sha256sum] = "9cb4e0e83dcefe1ece814d638bd186785b6bc1debe1aa2101ce2a4ea0376805a" diff --git a/recipes/xorg-driver/xf86-input-penmount_1.4.0.bb b/recipes/xorg-driver/xf86-input-penmount_1.4.0.bb index 1ed62d4cad..94255d4ac8 100644 --- a/recipes/xorg-driver/xf86-input-penmount_1.4.0.bb +++ b/recipes/xorg-driver/xf86-input-penmount_1.4.0.bb @@ -2,3 +2,5 @@ require xorg-driver-input.inc DESCRIPTION = "X.Org X server -- Penmount input driver" PE = "1" +SRC_URI[archive.md5sum] = "d5f1395b2dcefc7533ff5580e63f2066" +SRC_URI[archive.sha256sum] = "8cb15e9a30f3602d22eba6c7bcca2c1040889ed0851c7b575273671c2da1bff1" diff --git a/recipes/xorg-driver/xf86-input-spaceorb_1.1.0.bb b/recipes/xorg-driver/xf86-input-spaceorb_1.1.0.bb index 34a497438b..7d053aace1 100644 --- a/recipes/xorg-driver/xf86-input-spaceorb_1.1.0.bb +++ b/recipes/xorg-driver/xf86-input-spaceorb_1.1.0.bb @@ -1,2 +1,4 @@ require xorg-driver-input.inc PE = "1" +SRC_URI[archive.md5sum] = "294810ca9e93c4096458c6a0f2fb5679" +SRC_URI[archive.sha256sum] = "9cd53cb719bf401ff3f72233d3a88c59539b94eaf11e586e307c807a325f0815" diff --git a/recipes/xorg-driver/xf86-input-spaceorb_1.1.1.bb b/recipes/xorg-driver/xf86-input-spaceorb_1.1.1.bb index cf099b8193..c93458fba2 100644 --- a/recipes/xorg-driver/xf86-input-spaceorb_1.1.1.bb +++ b/recipes/xorg-driver/xf86-input-spaceorb_1.1.1.bb @@ -2,3 +2,5 @@ require xorg-driver-input.inc DESCRIPTION = "X.Org X server -- SpaceOrb input driver" PE = "1" +SRC_URI[archive.md5sum] = "c7fb96281874733480ba86a5a0a3b5af" +SRC_URI[archive.sha256sum] = "be8f052e7132d39094f42a08c0b7171a9e280e9fa1b162a62343d1dc0d2449cf" diff --git a/recipes/xorg-driver/xf86-input-summa_1.1.0.bb b/recipes/xorg-driver/xf86-input-summa_1.1.0.bb index 34a497438b..080840ce7c 100644 --- a/recipes/xorg-driver/xf86-input-summa_1.1.0.bb +++ b/recipes/xorg-driver/xf86-input-summa_1.1.0.bb @@ -1,2 +1,4 @@ require xorg-driver-input.inc PE = "1" +SRC_URI[archive.md5sum] = "b37a432fd87bb9f46d011622d6fce6b3" +SRC_URI[archive.sha256sum] = "f10f2cadd4120b40b3658000c87f910e3005f4d787441c7dd83b48ebbf2a11f2" diff --git a/recipes/xorg-driver/xf86-input-summa_1.2.0.bb b/recipes/xorg-driver/xf86-input-summa_1.2.0.bb index 84fee74e7b..7106bed6da 100644 --- a/recipes/xorg-driver/xf86-input-summa_1.2.0.bb +++ b/recipes/xorg-driver/xf86-input-summa_1.2.0.bb @@ -2,3 +2,5 @@ require xorg-driver-input.inc PE = "1" DESCRIPTION = "X.Org X server -- Summa input driver" +SRC_URI[archive.md5sum] = "7e17468c0d90dcbbb6202a8242efff4b" +SRC_URI[archive.sha256sum] = "3e8bcd89b4b3f86677f338a4584f41acb2a3cca7fe492cbea32664aa6f4f8cd8" diff --git a/recipes/xorg-driver/xf86-input-synaptics_0.15.0.bb b/recipes/xorg-driver/xf86-input-synaptics_0.15.0.bb index e6325675f8..8e7db800c3 100644 --- a/recipes/xorg-driver/xf86-input-synaptics_0.15.0.bb +++ b/recipes/xorg-driver/xf86-input-synaptics_0.15.0.bb @@ -2,3 +2,5 @@ require xorg-driver-input.inc DESCRIPTION = "X.Org X server -- mouse input driver" PE = "1" +SRC_URI[archive.md5sum] = "939f1c831c5cd3a6f027e982592dfc5b" +SRC_URI[archive.sha256sum] = "e7d481c375a11df55eb8f12390c329c2bfda3258c689cec11cfec27cb5895c8b" diff --git a/recipes/xorg-driver/xf86-input-synaptics_1.2.0.bb b/recipes/xorg-driver/xf86-input-synaptics_1.2.0.bb index e6325675f8..b506a45cda 100644 --- a/recipes/xorg-driver/xf86-input-synaptics_1.2.0.bb +++ b/recipes/xorg-driver/xf86-input-synaptics_1.2.0.bb @@ -2,3 +2,5 @@ require xorg-driver-input.inc DESCRIPTION = "X.Org X server -- mouse input driver" PE = "1" +SRC_URI[archive.md5sum] = "2cf0a2b0b3006bcfcd85bb77d966244a" +SRC_URI[archive.sha256sum] = "ddd5ad4c25ad2f2e46134272bf047522882deba8ac3ac04d5e11f8bd9718620c" diff --git a/recipes/xorg-driver/xf86-input-synaptics_1.2.1.bb b/recipes/xorg-driver/xf86-input-synaptics_1.2.1.bb index e6325675f8..2016384785 100644 --- a/recipes/xorg-driver/xf86-input-synaptics_1.2.1.bb +++ b/recipes/xorg-driver/xf86-input-synaptics_1.2.1.bb @@ -2,3 +2,5 @@ require xorg-driver-input.inc DESCRIPTION = "X.Org X server -- mouse input driver" PE = "1" +SRC_URI[archive.md5sum] = "29a6f9da5123149e4abc8ff83880ed5c" +SRC_URI[archive.sha256sum] = "a63b48c5c8eb09416b941dea591a948e111d1b2e14d4620f25377cf47cf877e6" diff --git a/recipes/xorg-driver/xf86-input-tek4957_1.1.0.bb b/recipes/xorg-driver/xf86-input-tek4957_1.1.0.bb index 34a497438b..b3fe200333 100644 --- a/recipes/xorg-driver/xf86-input-tek4957_1.1.0.bb +++ b/recipes/xorg-driver/xf86-input-tek4957_1.1.0.bb @@ -1,2 +1,4 @@ require xorg-driver-input.inc PE = "1" +SRC_URI[archive.md5sum] = "be8a4bd474ad6c85b93f66dd6fcfa6ee" +SRC_URI[archive.sha256sum] = "09b9506d1bb1deaaf69872392bc56e1d75997bb8157e85a9121749bf5fe15727" diff --git a/recipes/xorg-driver/xf86-input-tek4957_1.2.0.bb b/recipes/xorg-driver/xf86-input-tek4957_1.2.0.bb index facf967f18..085077d076 100644 --- a/recipes/xorg-driver/xf86-input-tek4957_1.2.0.bb +++ b/recipes/xorg-driver/xf86-input-tek4957_1.2.0.bb @@ -2,3 +2,5 @@ require xorg-driver-input.inc PE = "1" DESCRIPTION = "X.Org X server -- Tek4957 input driver" +SRC_URI[archive.md5sum] = "8103db1ca5c55726e0b58148e4b1fc06" +SRC_URI[archive.sha256sum] = "b097a5b1acbd732d9ca5d28c13003a1f1c8a3465f4fa77c1578d36330f3358a2" diff --git a/recipes/xorg-driver/xf86-input-tslib_0.0.5.bb b/recipes/xorg-driver/xf86-input-tslib_0.0.5.bb index 31dd9121b8..01f41d1ef4 100644 --- a/recipes/xorg-driver/xf86-input-tslib_0.0.5.bb +++ b/recipes/xorg-driver/xf86-input-tslib_0.0.5.bb @@ -6,7 +6,7 @@ DEPENDS += "tslib" PR = "r8" -SRC_URI = "http://www.pengutronix.de/software/xf86-input-tslib/download/xf86-input-tslib-${PV}.tar.bz2 \ +SRC_URI = "http://www.pengutronix.de/software/xf86-input-tslib/download/xf86-input-tslib-${PV}.tar.bz2;name=archive \ file://use-hal-for-device.diff;patch=1 \ file://01_fix-wrong-value-range-for-the-axises.diff;patch=1 \ file://dynamic-xy.patch;patch=1 \ @@ -24,3 +24,5 @@ do_install_append() { FILES_${PN} += "${datadir}/hal" +SRC_URI[archive.md5sum] = "4231b517d216e9f80ba66f13a0f30afd" +SRC_URI[archive.sha256sum] = "d70c64f3f4fe931e12d5af7f91ff04cd0d16dd7459061c50b3149f9e35de8091" diff --git a/recipes/xorg-driver/xf86-input-tslib_0.0.6.bb b/recipes/xorg-driver/xf86-input-tslib_0.0.6.bb index 6252459535..020502cd6d 100644 --- a/recipes/xorg-driver/xf86-input-tslib_0.0.6.bb +++ b/recipes/xorg-driver/xf86-input-tslib_0.0.6.bb @@ -6,7 +6,7 @@ DEPENDS += "tslib" PR = "r11" -SRC_URI = "http://www.pengutronix.de/software/xf86-input-tslib/download/xf86-input-tslib-${PV}.tar.bz2 \ +SRC_URI = "http://www.pengutronix.de/software/xf86-input-tslib/download/xf86-input-tslib-${PV}.tar.bz2;name=archive \ file://double-free-crash.patch;patch=1 \ file://10-x11-input-tslib.fdi \ file://xserver-174-XGetPointerControl.patch;patch=1 \ @@ -22,3 +22,5 @@ do_install_append() { } FILES_${PN} += "${datadir}/hal" +SRC_URI[archive.md5sum] = "b7a4d2f11637ee3fcf432e044b1d017f" +SRC_URI[archive.sha256sum] = "5f46fdef095a6e44a69e0f0b57c7d665224b26d990d006611236d8332e85b105" diff --git a/recipes/xorg-driver/xf86-input-ur98_1.1.0.bb b/recipes/xorg-driver/xf86-input-ur98_1.1.0.bb index 34a497438b..a5ea537c9b 100644 --- a/recipes/xorg-driver/xf86-input-ur98_1.1.0.bb +++ b/recipes/xorg-driver/xf86-input-ur98_1.1.0.bb @@ -1,2 +1,4 @@ require xorg-driver-input.inc PE = "1" +SRC_URI[archive.md5sum] = "3cf8928411458baaa9e726e51772c550" +SRC_URI[archive.sha256sum] = "214bceb0fd52a932d448ce03d66539eed2e6660617e3d42977704cb7eec6472a" diff --git a/recipes/xorg-driver/xf86-input-vmmouse_12.4.0.bb b/recipes/xorg-driver/xf86-input-vmmouse_12.4.0.bb index 292d2804a8..44aa19500b 100644 --- a/recipes/xorg-driver/xf86-input-vmmouse_12.4.0.bb +++ b/recipes/xorg-driver/xf86-input-vmmouse_12.4.0.bb @@ -5,3 +5,5 @@ DESCRIPTION = "The VMMouse driver enables support for the special VMMouse protoc that is provided by VMware virtual machines to give absolute pointer \ positioning. " +SRC_URI[archive.md5sum] = "313e403e56702f6c38d1a5c830b60dc2" +SRC_URI[archive.sha256sum] = "383e0973aad0e96812fc019cb579abaf016f97427fc07466b150fe15739ba63c" diff --git a/recipes/xorg-driver/xf86-input-vmmouse_12.4.3.bb b/recipes/xorg-driver/xf86-input-vmmouse_12.4.3.bb index 7af9f7ddc9..c5faf8434b 100644 --- a/recipes/xorg-driver/xf86-input-vmmouse_12.4.3.bb +++ b/recipes/xorg-driver/xf86-input-vmmouse_12.4.3.bb @@ -2,3 +2,5 @@ require xorg-driver-input.inc DESCRIPTION = "X.Org X server -- VMMouse input driver to use with VMWare" PE = "1" +SRC_URI[archive.md5sum] = "44730af795616ed4d4a0cd9a3a07935d" +SRC_URI[archive.sha256sum] = "d668c4cacd4be6d56608fbdf7779d60120f38f3315e6385a7cc87339124e77ab" diff --git a/recipes/xorg-driver/xf86-input-void_1.1.0.bb b/recipes/xorg-driver/xf86-input-void_1.1.0.bb index 311caf6553..8c83cdd5e9 100644 --- a/recipes/xorg-driver/xf86-input-void_1.1.0.bb +++ b/recipes/xorg-driver/xf86-input-void_1.1.0.bb @@ -1,3 +1,5 @@ require xorg-driver-input.inc PE = "1" +SRC_URI[archive.md5sum] = "ea72a92d43b95f413347df96d6a73933" +SRC_URI[archive.sha256sum] = "b43c5d920821bd06b6a1a131dd071ab838bf024c3cb092c6d1f10d57b648b0e4" diff --git a/recipes/xorg-driver/xf86-input-void_1.1.1.bb b/recipes/xorg-driver/xf86-input-void_1.1.1.bb index 2fa7021d95..bef3b7451c 100644 --- a/recipes/xorg-driver/xf86-input-void_1.1.1.bb +++ b/recipes/xorg-driver/xf86-input-void_1.1.1.bb @@ -2,3 +2,5 @@ require xorg-driver-input.inc DESCRIPTION = "X.Org X server -- void input driver" PE = "1" +SRC_URI[archive.md5sum] = "862c230f5f6e0c545f232b4c0fa9537a" +SRC_URI[archive.sha256sum] = "dde062d6267a3fd9d51b0daee88fd84fceea52a6019de51dece46e92012dbc4f" diff --git a/recipes/xorg-driver/xf86-input-void_1.3.0.bb b/recipes/xorg-driver/xf86-input-void_1.3.0.bb index 2fa7021d95..3e44da735e 100644 --- a/recipes/xorg-driver/xf86-input-void_1.3.0.bb +++ b/recipes/xorg-driver/xf86-input-void_1.3.0.bb @@ -2,3 +2,5 @@ require xorg-driver-input.inc DESCRIPTION = "X.Org X server -- void input driver" PE = "1" +SRC_URI[archive.md5sum] = "53bdac9ca56418f4675810ed8a78b3e8" +SRC_URI[archive.sha256sum] = "e2165ddf637703e21b3c45d83d56485c39b082b9440053d3885557c4d52b130f" diff --git a/recipes/xorg-driver/xf86-video-apm_1.1.1.bb b/recipes/xorg-driver/xf86-video-apm_1.1.1.bb index 5f0ed183e6..e3da9f81fc 100644 --- a/recipes/xorg-driver/xf86-video-apm_1.1.1.bb +++ b/recipes/xorg-driver/xf86-video-apm_1.1.1.bb @@ -5,3 +5,5 @@ DESCRIPTION = "This is the Alliance Promotion driver for XFree86 4.0+" DEPENDS += " xf86rushproto" +SRC_URI[archive.md5sum] = "ac7e05f0dfc7e02cac0bf17b9eb89b11" +SRC_URI[archive.sha256sum] = "09d7e6cf30b94f141f8ebe2560b301a058f645e74108edc28c908e750865dcec" diff --git a/recipes/xorg-driver/xf86-video-apm_1.2.0.bb b/recipes/xorg-driver/xf86-video-apm_1.2.0.bb index 1cef0fbb55..8f56390f73 100644 --- a/recipes/xorg-driver/xf86-video-apm_1.2.0.bb +++ b/recipes/xorg-driver/xf86-video-apm_1.2.0.bb @@ -6,3 +6,5 @@ DESCRIPTION = "This is the Alliance Promotion driver for XFree86 4.0+" DEPENDS += " xf86rushproto" SRC_URI += "file://get-rid-of-host-includes.patch;patch=1" +SRC_URI[archive.md5sum] = "4f78650d79656dc803a720049d65682e" +SRC_URI[archive.sha256sum] = "f0fe020f892e6e3a696a490c86312a1b32672bffb7dead153c24f103540a6185" diff --git a/recipes/xorg-driver/xf86-video-apm_1.2.2.bb b/recipes/xorg-driver/xf86-video-apm_1.2.2.bb index 1cef0fbb55..8a1ded8cbb 100644 --- a/recipes/xorg-driver/xf86-video-apm_1.2.2.bb +++ b/recipes/xorg-driver/xf86-video-apm_1.2.2.bb @@ -6,3 +6,5 @@ DESCRIPTION = "This is the Alliance Promotion driver for XFree86 4.0+" DEPENDS += " xf86rushproto" SRC_URI += "file://get-rid-of-host-includes.patch;patch=1" +SRC_URI[archive.md5sum] = "48441a19aaf015570b267f2a8e67d8ab" +SRC_URI[archive.sha256sum] = "678edd063e1d5e7c7f72ccdda2388c5857559847b3d313c94d659f9bd51c1752" diff --git a/recipes/xorg-driver/xf86-video-ark_0.6.0.bb b/recipes/xorg-driver/xf86-video-ark_0.6.0.bb index c2b6b7608a..6979d9c26f 100644 --- a/recipes/xorg-driver/xf86-video-ark_0.6.0.bb +++ b/recipes/xorg-driver/xf86-video-ark_0.6.0.bb @@ -1,2 +1,4 @@ require xorg-driver-video.inc PE = "1" +SRC_URI[archive.md5sum] = "6921479baca8f7b156029489fd335854" +SRC_URI[archive.sha256sum] = "e5abc4f4ae643ce56d5773f052515196f05786235e4afd155a3232e20dbc84d7" diff --git a/recipes/xorg-driver/xf86-video-ark_0.7.0.bb b/recipes/xorg-driver/xf86-video-ark_0.7.0.bb index f62f5a3586..e88ff5fdd8 100644 --- a/recipes/xorg-driver/xf86-video-ark_0.7.0.bb +++ b/recipes/xorg-driver/xf86-video-ark_0.7.0.bb @@ -4,3 +4,5 @@ PE = "1" DESCRIPTION = "X.Org X server -- ark display driver" SRC_URI += "file://get-rid-of-host-includes.patch;patch=1" +SRC_URI[archive.md5sum] = "6826c556ebe9a1248cbc7f7edd44f956" +SRC_URI[archive.sha256sum] = "8e65e73045fabe37c15f6d4895baa09346bdac2f7537607b523aacd7bcf57594" diff --git a/recipes/xorg-driver/xf86-video-ark_0.7.2.bb b/recipes/xorg-driver/xf86-video-ark_0.7.2.bb index f62f5a3586..ef029e11b2 100644 --- a/recipes/xorg-driver/xf86-video-ark_0.7.2.bb +++ b/recipes/xorg-driver/xf86-video-ark_0.7.2.bb @@ -4,3 +4,5 @@ PE = "1" DESCRIPTION = "X.Org X server -- ark display driver" SRC_URI += "file://get-rid-of-host-includes.patch;patch=1" +SRC_URI[archive.md5sum] = "4745f5c722b030962cc56eb2443894a0" +SRC_URI[archive.sha256sum] = "db1ef3e15ebd382837f16c1143035dfd9fa6465a77ae2e850201f71508065741" diff --git a/recipes/xorg-driver/xf86-video-ast_0.81.0.bb b/recipes/xorg-driver/xf86-video-ast_0.81.0.bb index c2b6b7608a..9a9e267f8c 100644 --- a/recipes/xorg-driver/xf86-video-ast_0.81.0.bb +++ b/recipes/xorg-driver/xf86-video-ast_0.81.0.bb @@ -1,2 +1,4 @@ require xorg-driver-video.inc PE = "1" +SRC_URI[archive.md5sum] = "04bc08907da13612dbc4918fe54e63e3" +SRC_URI[archive.sha256sum] = "b95553aaf89bef28051c82914cee2b91102dbc2370d0d855404ba453902459b8" diff --git a/recipes/xorg-driver/xf86-video-ast_0.85.0.bb b/recipes/xorg-driver/xf86-video-ast_0.85.0.bb index c2b6b7608a..5f537d08a8 100644 --- a/recipes/xorg-driver/xf86-video-ast_0.85.0.bb +++ b/recipes/xorg-driver/xf86-video-ast_0.85.0.bb @@ -1,2 +1,4 @@ require xorg-driver-video.inc PE = "1" +SRC_URI[archive.md5sum] = "b415bf3259ad0acdaf62e3dde76e3289" +SRC_URI[archive.sha256sum] = "9018ff84e4866d895c037aad33fb31c79d5f47d3f54707600cc3fe6076485b28" diff --git a/recipes/xorg-driver/xf86-video-ast_0.89.9.bb b/recipes/xorg-driver/xf86-video-ast_0.89.9.bb index c2b6b7608a..15c0aba6fe 100644 --- a/recipes/xorg-driver/xf86-video-ast_0.89.9.bb +++ b/recipes/xorg-driver/xf86-video-ast_0.89.9.bb @@ -1,2 +1,4 @@ require xorg-driver-video.inc PE = "1" +SRC_URI[archive.md5sum] = "619f6ff15db869be3800bb001d5b0468" +SRC_URI[archive.sha256sum] = "880f16d32a373a052515f4ae28a3f1a97543d0d73d2ea5d74baf23bdc3a6b401" diff --git a/recipes/xorg-driver/xf86-video-ati_6.12.4.bb b/recipes/xorg-driver/xf86-video-ati_6.12.4.bb index 4aae05a747..96353f2c0b 100644 --- a/recipes/xorg-driver/xf86-video-ati_6.12.4.bb +++ b/recipes/xorg-driver/xf86-video-ati_6.12.4.bb @@ -3,3 +3,5 @@ require xorg-driver-video.inc DESCRIPTION = "X.Org X server -- ATI display driver" DEPENDS += " xineramaproto xf86miscproto drm xf86driproto" PE = "1" +SRC_URI[archive.md5sum] = "e662348f6f957fcedf52818d668ab9f5" +SRC_URI[archive.sha256sum] = "cfde066a7087a19b624f79e95cb9a6c97a847b8802cf38d4ae6022758bf338f6" diff --git a/recipes/xorg-driver/xf86-video-ati_6.6.193.bb b/recipes/xorg-driver/xf86-video-ati_6.6.193.bb index 994b8b6a3c..640b576d0f 100644 --- a/recipes/xorg-driver/xf86-video-ati_6.6.193.bb +++ b/recipes/xorg-driver/xf86-video-ati_6.6.193.bb @@ -4,3 +4,5 @@ PE = "1" #DESCRIPTION = "" DEPENDS += " xineramaproto xf86miscproto drm xf86driproto" +SRC_URI[archive.md5sum] = "102b781f543213852401f3422b18ccc7" +SRC_URI[archive.sha256sum] = "9b0899694000cb91d5643e2482376af24bd495cb01b4c9dcdd6ee3545b0aefae" diff --git a/recipes/xorg-driver/xf86-video-ati_6.6.3.bb b/recipes/xorg-driver/xf86-video-ati_6.6.3.bb index 994b8b6a3c..5106a6d465 100644 --- a/recipes/xorg-driver/xf86-video-ati_6.6.3.bb +++ b/recipes/xorg-driver/xf86-video-ati_6.6.3.bb @@ -4,3 +4,5 @@ PE = "1" #DESCRIPTION = "" DEPENDS += " xineramaproto xf86miscproto drm xf86driproto" +SRC_URI[archive.md5sum] = "f6d559f9d20f61567d381916b376590f" +SRC_URI[archive.sha256sum] = "d08a429e1fb1620ae81839181a4dc6cd579d52fc440d44d7bba36d19be355780" diff --git a/recipes/xorg-driver/xf86-video-ati_6.7.196.bb b/recipes/xorg-driver/xf86-video-ati_6.7.196.bb index 994b8b6a3c..0c7eeb892c 100644 --- a/recipes/xorg-driver/xf86-video-ati_6.7.196.bb +++ b/recipes/xorg-driver/xf86-video-ati_6.7.196.bb @@ -4,3 +4,5 @@ PE = "1" #DESCRIPTION = "" DEPENDS += " xineramaproto xf86miscproto drm xf86driproto" +SRC_URI[archive.md5sum] = "06db625391c75c8be86c4dd5a5d713e6" +SRC_URI[archive.sha256sum] = "8923a08232255ceacf770ef767d86bbfb195dffa9559baa1b1de90f9c947a6d9" diff --git a/recipes/xorg-driver/xf86-video-ati_6.7.197.bb b/recipes/xorg-driver/xf86-video-ati_6.7.197.bb index 4aae05a747..5684213650 100644 --- a/recipes/xorg-driver/xf86-video-ati_6.7.197.bb +++ b/recipes/xorg-driver/xf86-video-ati_6.7.197.bb @@ -3,3 +3,5 @@ require xorg-driver-video.inc DESCRIPTION = "X.Org X server -- ATI display driver" DEPENDS += " xineramaproto xf86miscproto drm xf86driproto" PE = "1" +SRC_URI[archive.md5sum] = "7bd53945ce6d0b48b7fd558039e82aa2" +SRC_URI[archive.sha256sum] = "b6c67996cfdbbf9b3a191b9092f5d515dd7fae564544626792dd5ef404e29134" diff --git a/recipes/xorg-driver/xf86-video-ati_6.8.0.bb b/recipes/xorg-driver/xf86-video-ati_6.8.0.bb index 4aae05a747..86b0c133d9 100644 --- a/recipes/xorg-driver/xf86-video-ati_6.8.0.bb +++ b/recipes/xorg-driver/xf86-video-ati_6.8.0.bb @@ -3,3 +3,5 @@ require xorg-driver-video.inc DESCRIPTION = "X.Org X server -- ATI display driver" DEPENDS += " xineramaproto xf86miscproto drm xf86driproto" PE = "1" +SRC_URI[archive.md5sum] = "3c97c7925ebf4162eeb3463e23adc0e3" +SRC_URI[archive.sha256sum] = "3863851e3c85d25cc38941eec63e866656806821b028519ae32ab8b276664fba" diff --git a/recipes/xorg-driver/xf86-video-chips_1.1.1.bb b/recipes/xorg-driver/xf86-video-chips_1.1.1.bb index c2b6b7608a..7a5444da65 100644 --- a/recipes/xorg-driver/xf86-video-chips_1.1.1.bb +++ b/recipes/xorg-driver/xf86-video-chips_1.1.1.bb @@ -1,2 +1,4 @@ require xorg-driver-video.inc PE = "1" +SRC_URI[archive.md5sum] = "3182d43439ca4cbf08ff9aa76990bba3" +SRC_URI[archive.sha256sum] = "16a81cdb6b311176936c3326d279c0d75530adbcf9a3489eea55992ac5bc7494" diff --git a/recipes/xorg-driver/xf86-video-chips_1.2.0.bb b/recipes/xorg-driver/xf86-video-chips_1.2.0.bb index 9e09d8e81c..ffc816a3fa 100644 --- a/recipes/xorg-driver/xf86-video-chips_1.2.0.bb +++ b/recipes/xorg-driver/xf86-video-chips_1.2.0.bb @@ -2,3 +2,5 @@ require xorg-driver-video.inc PE = "1" DESCRIPTION = "X.Org X server -- Chips display driver" +SRC_URI[archive.md5sum] = "0fec6bee65383790485d917247a61629" +SRC_URI[archive.sha256sum] = "05f38c49b23be36afa68b738faf520b8dbf05b92c769107039426651801d4f99" diff --git a/recipes/xorg-driver/xf86-video-chips_1.2.2.bb b/recipes/xorg-driver/xf86-video-chips_1.2.2.bb index 9e09d8e81c..26c13f6b56 100644 --- a/recipes/xorg-driver/xf86-video-chips_1.2.2.bb +++ b/recipes/xorg-driver/xf86-video-chips_1.2.2.bb @@ -2,3 +2,5 @@ require xorg-driver-video.inc PE = "1" DESCRIPTION = "X.Org X server -- Chips display driver" +SRC_URI[archive.md5sum] = "a3969c28c3b36ab2caa852a9324e9b70" +SRC_URI[archive.sha256sum] = "ff6fef2cffc62feb3b23f3fee375e502ab7356d571517a89b4de67f0f6037f0e" diff --git a/recipes/xorg-driver/xf86-video-cirrus_1.1.0.bb b/recipes/xorg-driver/xf86-video-cirrus_1.1.0.bb index c2b6b7608a..21cee60b2d 100644 --- a/recipes/xorg-driver/xf86-video-cirrus_1.1.0.bb +++ b/recipes/xorg-driver/xf86-video-cirrus_1.1.0.bb @@ -1,2 +1,4 @@ require xorg-driver-video.inc PE = "1" +SRC_URI[archive.md5sum] = "66344e315def275605dafb314ce59851" +SRC_URI[archive.sha256sum] = "5988962199d5013274f6a6952939e4f405df658bb6616ebf9954c993b1179b1b" diff --git a/recipes/xorg-driver/xf86-video-cirrus_1.2.1.bb b/recipes/xorg-driver/xf86-video-cirrus_1.2.1.bb index ce19dd4f73..26af94142c 100644 --- a/recipes/xorg-driver/xf86-video-cirrus_1.2.1.bb +++ b/recipes/xorg-driver/xf86-video-cirrus_1.2.1.bb @@ -2,3 +2,5 @@ require xorg-driver-video.inc PE = "1" DESCRIPTION = "X.Org X server -- Cirrus display driver" +SRC_URI[archive.md5sum] = "bc28fdedaee9059180e2534f9dbcd2f6" +SRC_URI[archive.sha256sum] = "e7c99ed66326df5fadf6e5d875859a430fec4369415a27cde72a91109f78bb9c" diff --git a/recipes/xorg-driver/xf86-video-cirrus_1.3.2.bb b/recipes/xorg-driver/xf86-video-cirrus_1.3.2.bb index ce19dd4f73..0ab97efa7a 100644 --- a/recipes/xorg-driver/xf86-video-cirrus_1.3.2.bb +++ b/recipes/xorg-driver/xf86-video-cirrus_1.3.2.bb @@ -2,3 +2,5 @@ require xorg-driver-video.inc PE = "1" DESCRIPTION = "X.Org X server -- Cirrus display driver" +SRC_URI[archive.md5sum] = "8195d03ed0be0975c03441e66a9f53b3" +SRC_URI[archive.sha256sum] = "529a98a42c94ba5e1b9269e6f7b32a9e76cfd2d4728df08aeba615df8b28ca1a" diff --git a/recipes/xorg-driver/xf86-video-cyrix_1.1.0.bb b/recipes/xorg-driver/xf86-video-cyrix_1.1.0.bb index c2b6b7608a..e591991973 100644 --- a/recipes/xorg-driver/xf86-video-cyrix_1.1.0.bb +++ b/recipes/xorg-driver/xf86-video-cyrix_1.1.0.bb @@ -1,2 +1,4 @@ require xorg-driver-video.inc PE = "1" +SRC_URI[archive.md5sum] = "02ed7d5215610a3463a0307b30bb5425" +SRC_URI[archive.sha256sum] = "d6a66778e0f6ddd907cba5784386bd6bb526f773b5db9faa35875ba67c2ca6ad" diff --git a/recipes/xorg-driver/xf86-video-displaylink_0.3.bb b/recipes/xorg-driver/xf86-video-displaylink_0.3.bb index cbc3637d78..23c0ff2b08 100644 --- a/recipes/xorg-driver/xf86-video-displaylink_0.3.bb +++ b/recipes/xorg-driver/xf86-video-displaylink_0.3.bb @@ -4,8 +4,10 @@ DESCRIPTION = "X.Org X server -- displaylink driver" RRECOMMENDS_${PN} = "kernel-module-udlfb" -SRC_URI = "http://projects.unbit.it/downloads/udlfb-0.2.3_and_xf86-video-displaylink-${PV}.tar.gz \ +SRC_URI = "http://projects.unbit.it/downloads/udlfb-0.2.3_and_xf86-video-displaylink-${PV}.tar.gz;name=archive \ file://xf86-video-displaylink-0.3-xorg-abi-fix.patch;patch=1 \ " S = "${WORKDIR}/${PN}" +SRC_URI[archive.md5sum] = "c2aedc8130c2e4d52e334b6804ab70da" +SRC_URI[archive.sha256sum] = "487a1d7bf4b896d9a4b9e7dd1bd293adcadde5684fe9fe32aa209761c3191b3e" diff --git a/recipes/xorg-driver/xf86-video-dummy_0.2.0.bb b/recipes/xorg-driver/xf86-video-dummy_0.2.0.bb index c2b6b7608a..f7d76c7d6e 100644 --- a/recipes/xorg-driver/xf86-video-dummy_0.2.0.bb +++ b/recipes/xorg-driver/xf86-video-dummy_0.2.0.bb @@ -1,2 +1,4 @@ require xorg-driver-video.inc PE = "1" +SRC_URI[archive.md5sum] = "22b7cc20a33443cbd218bd2521850cfe" +SRC_URI[archive.sha256sum] = "46013885696f3c1a5e05c5d503abc69e691443319a97cf2c6a01ec031e06c910" diff --git a/recipes/xorg-driver/xf86-video-dummy_0.3.0.bb b/recipes/xorg-driver/xf86-video-dummy_0.3.0.bb index d85ae168b0..eff49fc2ed 100644 --- a/recipes/xorg-driver/xf86-video-dummy_0.3.0.bb +++ b/recipes/xorg-driver/xf86-video-dummy_0.3.0.bb @@ -4,3 +4,5 @@ PE = "1" DESCRIPTION = "X.Org X server -- dummy display driver" SRC_URI += "file://get-rid-of-host-includes.patch;patch=1" +SRC_URI[archive.md5sum] = "3d96297556846bee02a74166ffb5d052" +SRC_URI[archive.sha256sum] = "5a4bbde0b7f0334bb63b159e5ef6e164be3699e3424734c2bd9823f20a30a278" diff --git a/recipes/xorg-driver/xf86-video-dummy_0.3.2.bb b/recipes/xorg-driver/xf86-video-dummy_0.3.2.bb index d85ae168b0..c7dc8301ec 100644 --- a/recipes/xorg-driver/xf86-video-dummy_0.3.2.bb +++ b/recipes/xorg-driver/xf86-video-dummy_0.3.2.bb @@ -4,3 +4,5 @@ PE = "1" DESCRIPTION = "X.Org X server -- dummy display driver" SRC_URI += "file://get-rid-of-host-includes.patch;patch=1" +SRC_URI[archive.md5sum] = "2a6f1f07462fbe336865068cd69c8593" +SRC_URI[archive.sha256sum] = "9389cbc21b0b5f90920fdfaad4466f4ec07674bb1ddbbf63cbb8759ace5c45fa" diff --git a/recipes/xorg-driver/xf86-video-dummy_0.3.3.bb b/recipes/xorg-driver/xf86-video-dummy_0.3.3.bb index d85ae168b0..e4fca58a42 100644 --- a/recipes/xorg-driver/xf86-video-dummy_0.3.3.bb +++ b/recipes/xorg-driver/xf86-video-dummy_0.3.3.bb @@ -4,3 +4,5 @@ PE = "1" DESCRIPTION = "X.Org X server -- dummy display driver" SRC_URI += "file://get-rid-of-host-includes.patch;patch=1" +SRC_URI[archive.md5sum] = "3ffe3a28f4452e66bf56180e7da9cbc5" +SRC_URI[archive.sha256sum] = "df3f55de7953dba6d7ce10cc5f355da1a6164f781ad9393a38dae502dba4955d" diff --git a/recipes/xorg-driver/xf86-video-fbdev_0.3.1.bb b/recipes/xorg-driver/xf86-video-fbdev_0.3.1.bb index 843aa707b7..9237430242 100644 --- a/recipes/xorg-driver/xf86-video-fbdev_0.3.1.bb +++ b/recipes/xorg-driver/xf86-video-fbdev_0.3.1.bb @@ -4,3 +4,5 @@ PE = "1" #DESCRIPTION = "" #DEPENDS += " " +SRC_URI[archive.md5sum] = "9ae810c6c6c3c9713a67866fe794d4ff" +SRC_URI[archive.sha256sum] = "309d1f618c77559ea494c05d45b09577790c44900685e17bc812e4e1b19df6e7" diff --git a/recipes/xorg-driver/xf86-video-fbdev_0.4.0.bb b/recipes/xorg-driver/xf86-video-fbdev_0.4.0.bb index ea21fd3dc8..11b04a2172 100644 --- a/recipes/xorg-driver/xf86-video-fbdev_0.4.0.bb +++ b/recipes/xorg-driver/xf86-video-fbdev_0.4.0.bb @@ -6,3 +6,5 @@ DESCRIPTION = "X.Org X server -- fbdev display driver" FILES_${PN} += " file://use-staged-headers.patch;patch=1" #DEPENDS += " " +SRC_URI[archive.md5sum] = "6572b39fec77b8e6de1c858a93992924" +SRC_URI[archive.sha256sum] = "bba725daeb2a313b83f2b92855a9ae8aa72c4cc8581f9f62f101ebdf00ac359d" diff --git a/recipes/xorg-driver/xf86-video-fbdev_0.4.1.bb b/recipes/xorg-driver/xf86-video-fbdev_0.4.1.bb index ee2ec96eb5..03ebbb68d1 100644 --- a/recipes/xorg-driver/xf86-video-fbdev_0.4.1.bb +++ b/recipes/xorg-driver/xf86-video-fbdev_0.4.1.bb @@ -4,3 +4,5 @@ PE = "1" DESCRIPTION = "X.Org X server -- fbdev display driver" #DEPENDS += " " +SRC_URI[archive.md5sum] = "79ce1eb9f9d2ed56de70d8e06cb767d9" +SRC_URI[archive.sha256sum] = "2bf857179523433a9cc6c6eea059298db4c865e649aa58dfc67c828f28b7288f" diff --git a/recipes/xorg-driver/xf86-video-geode_2.11.0.bb b/recipes/xorg-driver/xf86-video-geode_2.11.0.bb index 380ce2ea0b..2a650401f4 100644 --- a/recipes/xorg-driver/xf86-video-geode_2.11.0.bb +++ b/recipes/xorg-driver/xf86-video-geode_2.11.0.bb @@ -3,3 +3,5 @@ PE = "1" COMPATIBLE_HOST = 'i.86.*-linux' DESCRIPTION = "X.org server -- Geode GX2/LX display driver" +SRC_URI[archive.md5sum] = "1dbede8f6393edfe6c1ecab2f754b3b2" +SRC_URI[archive.sha256sum] = "d70c198cde981c3a53b1c41b717dea4bbf1d397d82957f584c641bb5fd02c82d" diff --git a/recipes/xorg-driver/xf86-video-geode_2.11.4.1.bb b/recipes/xorg-driver/xf86-video-geode_2.11.4.1.bb index 93f734b989..6e45aa3419 100644 --- a/recipes/xorg-driver/xf86-video-geode_2.11.4.1.bb +++ b/recipes/xorg-driver/xf86-video-geode_2.11.4.1.bb @@ -6,3 +6,5 @@ COMPATIBLE_HOST = 'i.86.*-linux' DESCRIPTION = "X.org server -- Geode GX2/LX display driver" SRC_URI += "file://fixes.patch;patch=1" +SRC_URI[archive.md5sum] = "05f85d897ef41d13de354ac0252bf923" +SRC_URI[archive.sha256sum] = "d739f6762fe3aa7ef7ca74f87fbe4d6ec3bb13a735e5dfb82b6748eda2b31138" diff --git a/recipes/xorg-driver/xf86-video-geode_2.8.0.bb b/recipes/xorg-driver/xf86-video-geode_2.8.0.bb index c2b6b7608a..0184bed172 100644 --- a/recipes/xorg-driver/xf86-video-geode_2.8.0.bb +++ b/recipes/xorg-driver/xf86-video-geode_2.8.0.bb @@ -1,2 +1,4 @@ require xorg-driver-video.inc PE = "1" +SRC_URI[archive.md5sum] = "a2b9c70a32b0a6436d837d67fa7aae18" +SRC_URI[archive.sha256sum] = "f0b68171dd4256c927fbee91ecf84fa28c409b5b6b39cbf47eaa48fd73db305f" diff --git a/recipes/xorg-driver/xf86-video-glint_1.1.1.bb b/recipes/xorg-driver/xf86-video-glint_1.1.1.bb index 4b57f17b9e..d1f9d0f06d 100644 --- a/recipes/xorg-driver/xf86-video-glint_1.1.1.bb +++ b/recipes/xorg-driver/xf86-video-glint_1.1.1.bb @@ -3,3 +3,5 @@ require xorg-driver-video.inc #DESCRIPTION = "" DEPENDS += " xf86dgaproto drm xf86driproto" +SRC_URI[archive.md5sum] = "2cf49f701024a145bd25aff9da11d479" +SRC_URI[archive.sha256sum] = "d63e0dd3f5cecebaf1915193a68ac83e90c1e973e3276a71bd14651d67115e6d" diff --git a/recipes/xorg-driver/xf86-video-glint_1.2.0.bb b/recipes/xorg-driver/xf86-video-glint_1.2.0.bb index 0426c98ff6..13f65e211c 100644 --- a/recipes/xorg-driver/xf86-video-glint_1.2.0.bb +++ b/recipes/xorg-driver/xf86-video-glint_1.2.0.bb @@ -9,3 +9,5 @@ EXTRA_OECONF += " \ ac_cv_file__usr_include_xorg_sarea_h=yes \ ac_cv_file__usr_include_xorg_dristruct_h=yes \ " +SRC_URI[archive.md5sum] = "1f5271ac01d4475efe73ab6f2c3646f4" +SRC_URI[archive.sha256sum] = "a0edd1109c03efdb0f6defc18745f89fb3c11142381e2657f94d492ddd1e7419" diff --git a/recipes/xorg-driver/xf86-video-glint_1.2.1.bb b/recipes/xorg-driver/xf86-video-glint_1.2.1.bb index eac23c74d9..e65c4aa568 100644 --- a/recipes/xorg-driver/xf86-video-glint_1.2.1.bb +++ b/recipes/xorg-driver/xf86-video-glint_1.2.1.bb @@ -4,3 +4,5 @@ DESCRIPTION = "X.Org X server -- Glint display driver" DEPENDS += " xf86dgaproto drm xf86driproto" +SRC_URI[archive.md5sum] = "6d7afdac0a26cf201c3f3b417c31c5e1" +SRC_URI[archive.sha256sum] = "161780d2127d0548a2017ca461ce38e7a69afce5d921a08604e91478c6be1cda" diff --git a/recipes/xorg-driver/xf86-video-glint_1.2.4.bb b/recipes/xorg-driver/xf86-video-glint_1.2.4.bb index eac23c74d9..a61bda3b7b 100644 --- a/recipes/xorg-driver/xf86-video-glint_1.2.4.bb +++ b/recipes/xorg-driver/xf86-video-glint_1.2.4.bb @@ -4,3 +4,5 @@ DESCRIPTION = "X.Org X server -- Glint display driver" DEPENDS += " xf86dgaproto drm xf86driproto" +SRC_URI[archive.md5sum] = "960df34e129faa411e58c0d6b56d79a3" +SRC_URI[archive.sha256sum] = "5f8d6e3b02c261d235bae63d95510b940b6c9a775301146b3c229926ed99d76f" diff --git a/recipes/xorg-driver/xf86-video-i128_1.1.0.5.bb b/recipes/xorg-driver/xf86-video-i128_1.1.0.5.bb index acfc042123..bfb04d696d 100644 --- a/recipes/xorg-driver/xf86-video-i128_1.1.0.5.bb +++ b/recipes/xorg-driver/xf86-video-i128_1.1.0.5.bb @@ -3,3 +3,5 @@ require xorg-driver-video.inc DESCRIPTION = "Number Nine I128 for X11" PE = "1" +SRC_URI[archive.md5sum] = "6e0d3e09fc99d6f0a0e969613ddf58cc" +SRC_URI[archive.sha256sum] = "a99d2b04b829faa7542545380317c8f59f54ecbd5e0a7008580f3155742d0381" diff --git a/recipes/xorg-driver/xf86-video-i128_1.1.0.6.bb b/recipes/xorg-driver/xf86-video-i128_1.1.0.6.bb index 89cedc8b1a..0e0285e80e 100644 --- a/recipes/xorg-driver/xf86-video-i128_1.1.0.6.bb +++ b/recipes/xorg-driver/xf86-video-i128_1.1.0.6.bb @@ -4,3 +4,5 @@ PE = "1" DESCRIPTION = "Number Nine I128 for X11" #DEPENDS += " " +SRC_URI[archive.md5sum] = "c483efc90b1935025b17e4b9e9c2e4df" +SRC_URI[archive.sha256sum] = "b52183f5a7d0adee1d21b4b0a0908886b7bbc69dc4498f1e7a3edc4b1988c41c" diff --git a/recipes/xorg-driver/xf86-video-i128_1.2.1.bb b/recipes/xorg-driver/xf86-video-i128_1.2.1.bb index 78d5eda810..2bea9a358d 100644 --- a/recipes/xorg-driver/xf86-video-i128_1.2.1.bb +++ b/recipes/xorg-driver/xf86-video-i128_1.2.1.bb @@ -2,3 +2,5 @@ require xorg-driver-video.inc DESCRIPTION = "X.Org X server -- i128 display driver" PE = "1" +SRC_URI[archive.md5sum] = "d0080732eaa15059b0a953aa3522185a" +SRC_URI[archive.sha256sum] = "0d023cacf8134241cd8efcd5744eb156399406c92f59d3895392f2b5fd055eb1" diff --git a/recipes/xorg-driver/xf86-video-i128_1.3.0.bb b/recipes/xorg-driver/xf86-video-i128_1.3.0.bb index 78d5eda810..2a2679138e 100644 --- a/recipes/xorg-driver/xf86-video-i128_1.3.0.bb +++ b/recipes/xorg-driver/xf86-video-i128_1.3.0.bb @@ -2,3 +2,5 @@ require xorg-driver-video.inc DESCRIPTION = "X.Org X server -- i128 display driver" PE = "1" +SRC_URI[archive.md5sum] = "aff4922d2f02bad7e0d8649358edbcee" +SRC_URI[archive.sha256sum] = "62eadebd3417ffb3857f10f16597c59541ceb135ddbc30b2140f46d9eb7dddd7" diff --git a/recipes/xorg-driver/xf86-video-i128_1.3.1.bb b/recipes/xorg-driver/xf86-video-i128_1.3.1.bb index 78d5eda810..53ff1bc384 100644 --- a/recipes/xorg-driver/xf86-video-i128_1.3.1.bb +++ b/recipes/xorg-driver/xf86-video-i128_1.3.1.bb @@ -2,3 +2,5 @@ require xorg-driver-video.inc DESCRIPTION = "X.Org X server -- i128 display driver" PE = "1" +SRC_URI[archive.md5sum] = "3b170a6df5114420cd4021a057918a09" +SRC_URI[archive.sha256sum] = "49bb23625654ebcd74d0d23f534b074188f4b21c3cd443b06ac83b9485bf9a75" diff --git a/recipes/xorg-driver/xf86-video-i128_1.3.3.bb b/recipes/xorg-driver/xf86-video-i128_1.3.3.bb index 78d5eda810..ff20a41f17 100644 --- a/recipes/xorg-driver/xf86-video-i128_1.3.3.bb +++ b/recipes/xorg-driver/xf86-video-i128_1.3.3.bb @@ -2,3 +2,5 @@ require xorg-driver-video.inc DESCRIPTION = "X.Org X server -- i128 display driver" PE = "1" +SRC_URI[archive.md5sum] = "a597e8efeec6ab8bc6ba6d87fceb2dba" +SRC_URI[archive.sha256sum] = "4d0691ce8e3b54075d05cc34717350be42915174b3930b2c9b7f5e309b32b02e" diff --git a/recipes/xorg-driver/xf86-video-i740_1.1.0.bb b/recipes/xorg-driver/xf86-video-i740_1.1.0.bb index 4aca68edf6..74ce43b721 100644 --- a/recipes/xorg-driver/xf86-video-i740_1.1.0.bb +++ b/recipes/xorg-driver/xf86-video-i740_1.1.0.bb @@ -3,3 +3,5 @@ require xorg-driver-video.inc DESCRIPTION = "I740 for X11" PE = "1" +SRC_URI[archive.md5sum] = "57302e225060a7286ae1a970c87a589b" +SRC_URI[archive.sha256sum] = "b8f2144c987d8a14f8b477ee3aa43fc1c76d040a77e40938c3c97c8e34e2b7c5" diff --git a/recipes/xorg-driver/xf86-video-i740_1.2.0.bb b/recipes/xorg-driver/xf86-video-i740_1.2.0.bb index 6c2ea7438b..a9c7c6a6ba 100644 --- a/recipes/xorg-driver/xf86-video-i740_1.2.0.bb +++ b/recipes/xorg-driver/xf86-video-i740_1.2.0.bb @@ -3,3 +3,5 @@ require xorg-driver-video.inc DESCRIPTION = "X.Org X server -- i740 display driver" PE = "1" +SRC_URI[archive.md5sum] = "d0e5a805c546b29b1dd3b55a68d16dc4" +SRC_URI[archive.sha256sum] = "59c8f6ee465bef033c1c20bfff8121a318efda9656d5dc29f674bb655f18486f" diff --git a/recipes/xorg-driver/xf86-video-i740_1.3.2.bb b/recipes/xorg-driver/xf86-video-i740_1.3.2.bb index 6c2ea7438b..62d52f3553 100644 --- a/recipes/xorg-driver/xf86-video-i740_1.3.2.bb +++ b/recipes/xorg-driver/xf86-video-i740_1.3.2.bb @@ -3,3 +3,5 @@ require xorg-driver-video.inc DESCRIPTION = "X.Org X server -- i740 display driver" PE = "1" +SRC_URI[archive.md5sum] = "4ac1318788f62159965f15131c869e7a" +SRC_URI[archive.sha256sum] = "48549c6a3d8c0a0d417fc486e77f3f7c6815df7e8ede04bb4c539666be2bf943" diff --git a/recipes/xorg-driver/xf86-video-i810_1.6.5.bb b/recipes/xorg-driver/xf86-video-i810_1.6.5.bb index 198985f247..5119c2891d 100644 --- a/recipes/xorg-driver/xf86-video-i810_1.6.5.bb +++ b/recipes/xorg-driver/xf86-video-i810_1.6.5.bb @@ -5,3 +5,5 @@ DESCRIPTION = "I810 for X11" DEPENDS += " virtual/libx11 libxvmc drm xf86driproto" +SRC_URI[archive.md5sum] = "fc1e0da3430551bf25a7babf7ccfd3bf" +SRC_URI[archive.sha256sum] = "30d0cd555d8b8b5bb53d93eaae1ad2aecb5c94a760e2346d60b6e194c254e40f" diff --git a/recipes/xorg-driver/xf86-video-i810_1.7.4.bb b/recipes/xorg-driver/xf86-video-i810_1.7.4.bb index eed1fcb600..7dee900201 100644 --- a/recipes/xorg-driver/xf86-video-i810_1.7.4.bb +++ b/recipes/xorg-driver/xf86-video-i810_1.7.4.bb @@ -3,3 +3,5 @@ require xorg-driver-video.inc DESCRIPTION = "X.Org X server -- Intel i8xx, i9xx display driver" DEPENDS += " virtual/libx11 libxvmc drm xf86driproto" PE = "1" +SRC_URI[archive.md5sum] = "744a6ee1ebfe1c74e3b170b8d7ef8395" +SRC_URI[archive.sha256sum] = "ff8cd89c9ba39ce68dd6ac4dcb222280835d007a20b419819749298e8ec74259" diff --git a/recipes/xorg-driver/xf86-video-impact_0.2.0.bb b/recipes/xorg-driver/xf86-video-impact_0.2.0.bb index c2b6b7608a..b85b6c4dfd 100644 --- a/recipes/xorg-driver/xf86-video-impact_0.2.0.bb +++ b/recipes/xorg-driver/xf86-video-impact_0.2.0.bb @@ -1,2 +1,4 @@ require xorg-driver-video.inc PE = "1" +SRC_URI[archive.md5sum] = "07c9557f6529a88845b01924313e5763" +SRC_URI[archive.sha256sum] = "1528a123b41bf42506eb8e37c3506086395f062cca71f64cbc67929ff1010022" diff --git a/recipes/xorg-driver/xf86-video-imstt_1.1.0.bb b/recipes/xorg-driver/xf86-video-imstt_1.1.0.bb index c2b6b7608a..e2aa437832 100644 --- a/recipes/xorg-driver/xf86-video-imstt_1.1.0.bb +++ b/recipes/xorg-driver/xf86-video-imstt_1.1.0.bb @@ -1,2 +1,4 @@ require xorg-driver-video.inc PE = "1" +SRC_URI[archive.md5sum] = "94853ca217238ed1f568a10cbeebe057" +SRC_URI[archive.sha256sum] = "9238c2257f9437dd7ab37c049d7f20c010e2f5ff833a37d2d6243f223f10fb7d" diff --git a/recipes/xorg-driver/xf86-video-intel_2.10.0.bb b/recipes/xorg-driver/xf86-video-intel_2.10.0.bb index 70c224db8d..baac57b430 100644 --- a/recipes/xorg-driver/xf86-video-intel_2.10.0.bb +++ b/recipes/xorg-driver/xf86-video-intel_2.10.0.bb @@ -6,3 +6,5 @@ RDEPENDS += "xserver-xorg-extension-dri \ xserver-xorg-extension-dri2 \ xserver-xorg-extension-glx" PE = "1" +SRC_URI[archive.md5sum] = "78309d4f04dd8ae6585d120377042741" +SRC_URI[archive.sha256sum] = "e46dd691dc93db7cd6f5f22b84fea7e9f4bfd34f28026cfd680993b3ccfc48ab" diff --git a/recipes/xorg-driver/xf86-video-intel_2.2.1.bb b/recipes/xorg-driver/xf86-video-intel_2.2.1.bb index eed1fcb600..868675495d 100644 --- a/recipes/xorg-driver/xf86-video-intel_2.2.1.bb +++ b/recipes/xorg-driver/xf86-video-intel_2.2.1.bb @@ -3,3 +3,5 @@ require xorg-driver-video.inc DESCRIPTION = "X.Org X server -- Intel i8xx, i9xx display driver" DEPENDS += " virtual/libx11 libxvmc drm xf86driproto" PE = "1" +SRC_URI[archive.md5sum] = "3334dc5142871b78fc609fd1b3dac3f2" +SRC_URI[archive.sha256sum] = "d976c5f5e9c84f3817aba6ad22855446f1c2b9bfa0d53bd11c37c62cfdefa60a" diff --git a/recipes/xorg-driver/xf86-video-intel_2.4.2.bb b/recipes/xorg-driver/xf86-video-intel_2.4.2.bb index eed1fcb600..1ad5f06a81 100644 --- a/recipes/xorg-driver/xf86-video-intel_2.4.2.bb +++ b/recipes/xorg-driver/xf86-video-intel_2.4.2.bb @@ -3,3 +3,5 @@ require xorg-driver-video.inc DESCRIPTION = "X.Org X server -- Intel i8xx, i9xx display driver" DEPENDS += " virtual/libx11 libxvmc drm xf86driproto" PE = "1" +SRC_URI[archive.md5sum] = "5cd6b3ed57c7e78ab51e9d9266e73fb6" +SRC_URI[archive.sha256sum] = "5afdc91e93ffed09ea5258c6fde210c729ea2b44d83f98acfd92c3da7e99e64b" diff --git a/recipes/xorg-driver/xf86-video-intel_2.6.3.bb b/recipes/xorg-driver/xf86-video-intel_2.6.3.bb index eed1fcb600..60ef088418 100644 --- a/recipes/xorg-driver/xf86-video-intel_2.6.3.bb +++ b/recipes/xorg-driver/xf86-video-intel_2.6.3.bb @@ -3,3 +3,5 @@ require xorg-driver-video.inc DESCRIPTION = "X.Org X server -- Intel i8xx, i9xx display driver" DEPENDS += " virtual/libx11 libxvmc drm xf86driproto" PE = "1" +SRC_URI[archive.md5sum] = "440c014bbd3072b5d379fe1bdb861918" +SRC_URI[archive.sha256sum] = "b35a142aeba034ad06b8d9b477c243f82ce9f82ad65a0ee4408630f228e90258" diff --git a/recipes/xorg-driver/xf86-video-intel_2.9.1.bb b/recipes/xorg-driver/xf86-video-intel_2.9.1.bb index a8faf54643..df31aef361 100644 --- a/recipes/xorg-driver/xf86-video-intel_2.9.1.bb +++ b/recipes/xorg-driver/xf86-video-intel_2.9.1.bb @@ -5,3 +5,5 @@ DEPENDS += " virtual/libx11 libxvmc drm xf86driproto" PE = "1" SRC_URI += " file://nodolt.patch;patch=1 " +SRC_URI[archive.md5sum] = "8951d0366c16991badb7f9050556f4f3" +SRC_URI[archive.sha256sum] = "95347c88854c2b41c07ab3bcdfadd1b8d27fb181a20520f185892877eb8d9d76" diff --git a/recipes/xorg-driver/xf86-video-mach64_6.8.0.bb b/recipes/xorg-driver/xf86-video-mach64_6.8.0.bb index eed1fcb600..a5ad167d51 100644 --- a/recipes/xorg-driver/xf86-video-mach64_6.8.0.bb +++ b/recipes/xorg-driver/xf86-video-mach64_6.8.0.bb @@ -3,3 +3,5 @@ require xorg-driver-video.inc DESCRIPTION = "X.Org X server -- Intel i8xx, i9xx display driver" DEPENDS += " virtual/libx11 libxvmc drm xf86driproto" PE = "1" +SRC_URI[archive.md5sum] = "6081b8fa50c689d51f85c2fbaf93867e" +SRC_URI[archive.sha256sum] = "fba616f88d351759e00a90965e38a0d82608698ae36fc2a18df4036cd384e1a1" diff --git a/recipes/xorg-driver/xf86-video-mach64_6.8.2.bb b/recipes/xorg-driver/xf86-video-mach64_6.8.2.bb index eed1fcb600..53b0ba71c9 100644 --- a/recipes/xorg-driver/xf86-video-mach64_6.8.2.bb +++ b/recipes/xorg-driver/xf86-video-mach64_6.8.2.bb @@ -3,3 +3,5 @@ require xorg-driver-video.inc DESCRIPTION = "X.Org X server -- Intel i8xx, i9xx display driver" DEPENDS += " virtual/libx11 libxvmc drm xf86driproto" PE = "1" +SRC_URI[archive.md5sum] = "6c0522b2b72a0a47c48d718443616651" +SRC_URI[archive.sha256sum] = "b91194033023a41793a525a631789df1d229b228af0d44dcbe20b06ed66c671d" diff --git a/recipes/xorg-driver/xf86-video-mga_1.4.1.bb b/recipes/xorg-driver/xf86-video-mga_1.4.1.bb index c2b6b7608a..fdb5380437 100644 --- a/recipes/xorg-driver/xf86-video-mga_1.4.1.bb +++ b/recipes/xorg-driver/xf86-video-mga_1.4.1.bb @@ -1,2 +1,4 @@ require xorg-driver-video.inc PE = "1" +SRC_URI[archive.md5sum] = "ba373233a7d13084d14046a17b02e248" +SRC_URI[archive.sha256sum] = "5becb5f0caf0f99296db28b32be46eb95d0a88ac8e4829c47cb637fb52d06564" diff --git a/recipes/xorg-driver/xf86-video-mga_1.4.11.bb b/recipes/xorg-driver/xf86-video-mga_1.4.11.bb index 0ed0d28dfd..5e2d430265 100644 --- a/recipes/xorg-driver/xf86-video-mga_1.4.11.bb +++ b/recipes/xorg-driver/xf86-video-mga_1.4.11.bb @@ -2,3 +2,5 @@ require xorg-driver-video.inc DESCRIPTION = "X.Org X server -- MGA display driver" PE = "1" +SRC_URI[archive.md5sum] = "9d1ca965cedb0856296b47442f3c739d" +SRC_URI[archive.sha256sum] = "c91922316f486f74d41ddbda92ff94a7917cea151ad802cf25603ab6b90f97e6" diff --git a/recipes/xorg-driver/xf86-video-mga_1.4.9.bb b/recipes/xorg-driver/xf86-video-mga_1.4.9.bb index c2b6b7608a..bc75e79bcd 100644 --- a/recipes/xorg-driver/xf86-video-mga_1.4.9.bb +++ b/recipes/xorg-driver/xf86-video-mga_1.4.9.bb @@ -1,2 +1,4 @@ require xorg-driver-video.inc PE = "1" +SRC_URI[archive.md5sum] = "11066b84b949cd04300ec819c9c51532" +SRC_URI[archive.sha256sum] = "d57dd2323052f064092167a232fb7576f46e5d62e98bc9cc6a7f270cc8d0fdc0" diff --git a/recipes/xorg-driver/xf86-video-mga_1.9.100.bb b/recipes/xorg-driver/xf86-video-mga_1.9.100.bb index 0ed0d28dfd..2b18e20172 100644 --- a/recipes/xorg-driver/xf86-video-mga_1.9.100.bb +++ b/recipes/xorg-driver/xf86-video-mga_1.9.100.bb @@ -2,3 +2,5 @@ require xorg-driver-video.inc DESCRIPTION = "X.Org X server -- MGA display driver" PE = "1" +SRC_URI[archive.md5sum] = "3e80cfb84b62866d2f94774ecbf3e46c" +SRC_URI[archive.sha256sum] = "e8efee8d5269eb29f9bd499db3d47a6a4d3c320d4b0a24874cdf7b598ad77a5c" diff --git a/recipes/xorg-driver/xf86-video-mga_1.9.99.bb b/recipes/xorg-driver/xf86-video-mga_1.9.99.bb index 0ed0d28dfd..7a2a32f7fe 100644 --- a/recipes/xorg-driver/xf86-video-mga_1.9.99.bb +++ b/recipes/xorg-driver/xf86-video-mga_1.9.99.bb @@ -2,3 +2,5 @@ require xorg-driver-video.inc DESCRIPTION = "X.Org X server -- MGA display driver" PE = "1" +SRC_URI[archive.md5sum] = "29785ff1de2b0f7b7f1c48350449447c" +SRC_URI[archive.sha256sum] = "82a91e523d40625c9e042ee640276756d1169cca7eb305c691a3378805c4c81c" diff --git a/recipes/xorg-driver/xf86-video-neomagic_1.1.1.bb b/recipes/xorg-driver/xf86-video-neomagic_1.1.1.bb index b519e60e58..f8d5022ac8 100644 --- a/recipes/xorg-driver/xf86-video-neomagic_1.1.1.bb +++ b/recipes/xorg-driver/xf86-video-neomagic_1.1.1.bb @@ -6,3 +6,5 @@ DESCRIPTION = "X11 driver for NeoMagic 2200, 2160, 2097, 2093, 2090, 2070" DEPENDS += " xf86dgaproto" +SRC_URI[archive.md5sum] = "7a3d3d6e60b9686d955c45d9ebbd5c1b" +SRC_URI[archive.sha256sum] = "d6497080967b8285b663fedd7cafd4457578282ebd7da0b216b6fa214dd88a86" diff --git a/recipes/xorg-driver/xf86-video-neomagic_1.2.1.bb b/recipes/xorg-driver/xf86-video-neomagic_1.2.1.bb index b519e60e58..e97a9c0943 100644 --- a/recipes/xorg-driver/xf86-video-neomagic_1.2.1.bb +++ b/recipes/xorg-driver/xf86-video-neomagic_1.2.1.bb @@ -6,3 +6,5 @@ DESCRIPTION = "X11 driver for NeoMagic 2200, 2160, 2097, 2093, 2090, 2070" DEPENDS += " xf86dgaproto" +SRC_URI[archive.md5sum] = "a72f57fca4f4dff9a2c82eb1fe7456f4" +SRC_URI[archive.sha256sum] = "96e38d5378596174f76c735c4723ff2ac336f9069644502a9b706586b845e0a5" diff --git a/recipes/xorg-driver/xf86-video-neomagic_1.2.4.bb b/recipes/xorg-driver/xf86-video-neomagic_1.2.4.bb index b519e60e58..bd6ac7025e 100644 --- a/recipes/xorg-driver/xf86-video-neomagic_1.2.4.bb +++ b/recipes/xorg-driver/xf86-video-neomagic_1.2.4.bb @@ -6,3 +6,5 @@ DESCRIPTION = "X11 driver for NeoMagic 2200, 2160, 2097, 2093, 2090, 2070" DEPENDS += " xf86dgaproto" +SRC_URI[archive.md5sum] = "2d722ee9b9fe8da49109f280689c9c25" +SRC_URI[archive.sha256sum] = "434da2986d007243f4590a86d16a1632a9611b71de44d6e46f28bd3cdb898353" diff --git a/recipes/xorg-driver/xf86-video-newport_0.2.1.bb b/recipes/xorg-driver/xf86-video-newport_0.2.1.bb index b9f88fcc6f..361040dcbd 100644 --- a/recipes/xorg-driver/xf86-video-newport_0.2.1.bb +++ b/recipes/xorg-driver/xf86-video-newport_0.2.1.bb @@ -5,3 +5,5 @@ DESCRIPTION = "This is an unaccelerated driver for the SGI newport cards." #DEPENDS += " " +SRC_URI[archive.md5sum] = "2bd8e5b9ea68e0dcd80dfcaca0eff82c" +SRC_URI[archive.sha256sum] = "66ac855452690ef896400577806dc1dd86318940f8a62ce20039037318b1ce08" diff --git a/recipes/xorg-driver/xf86-video-newport_0.2.3.bb b/recipes/xorg-driver/xf86-video-newport_0.2.3.bb index b9f88fcc6f..6aa108161a 100644 --- a/recipes/xorg-driver/xf86-video-newport_0.2.3.bb +++ b/recipes/xorg-driver/xf86-video-newport_0.2.3.bb @@ -5,3 +5,5 @@ DESCRIPTION = "This is an unaccelerated driver for the SGI newport cards." #DEPENDS += " " +SRC_URI[archive.md5sum] = "923baa1ee0429f03ed19ec0be6a4f62b" +SRC_URI[archive.sha256sum] = "e6caeb4f95adfd9d2046d24f5f3688092ea4e3fb63aa3d0675f6c697c8cf0270" diff --git a/recipes/xorg-driver/xf86-video-nsc_2.8.2.bb b/recipes/xorg-driver/xf86-video-nsc_2.8.2.bb index d317223db3..5011204abe 100644 --- a/recipes/xorg-driver/xf86-video-nsc_2.8.2.bb +++ b/recipes/xorg-driver/xf86-video-nsc_2.8.2.bb @@ -6,3 +6,5 @@ DEPENDS += " xf86dgaproto" # This driver is broken because it's seldom updated. It compiles # but fails to communicate with the card without this deprecated define. EXTRA_OEMAKE += "CFLAGS+=-DXFree86Server" +SRC_URI[archive.md5sum] = "1fbdd5e9b5508b032c0102f72d1e555c" +SRC_URI[archive.sha256sum] = "060493a9dcad81e8912381d2a8d14a3e32a34414296a089756868f3442103c8c" diff --git a/recipes/xorg-driver/xf86-video-nsc_2.8.3.bb b/recipes/xorg-driver/xf86-video-nsc_2.8.3.bb index 96486d2e72..01cde83df5 100644 --- a/recipes/xorg-driver/xf86-video-nsc_2.8.3.bb +++ b/recipes/xorg-driver/xf86-video-nsc_2.8.3.bb @@ -7,3 +7,5 @@ PE = "1" # This driver is broken because it's seldom updated. It compiles # but fails to communicate with the card without this deprecated define. EXTRA_OEMAKE += "CFLAGS+=-DXFree86Server" +SRC_URI[archive.md5sum] = "f3ffacdc9f19e00b66bdff71b6df9b4e" +SRC_URI[archive.sha256sum] = "e5c5a2021877b8975bee39c06096316324e04f1eac5261bc882b96353a8b1839" diff --git a/recipes/xorg-driver/xf86-video-nv_1.2.2.1.bb b/recipes/xorg-driver/xf86-video-nv_1.2.2.1.bb index 843aa707b7..ab9e986bfa 100644 --- a/recipes/xorg-driver/xf86-video-nv_1.2.2.1.bb +++ b/recipes/xorg-driver/xf86-video-nv_1.2.2.1.bb @@ -4,3 +4,5 @@ PE = "1" #DESCRIPTION = "" #DEPENDS += " " +SRC_URI[archive.md5sum] = "e4dc415b1e45db0bbdacc203ed33024a" +SRC_URI[archive.sha256sum] = "97d47df7720d3cfcb56c4debca9218c3fc5352d34d82bc4880c8a620185f8c5e" diff --git a/recipes/xorg-driver/xf86-video-nv_2.1.12.bb b/recipes/xorg-driver/xf86-video-nv_2.1.12.bb index 0d4ee2ed19..cac04e6419 100644 --- a/recipes/xorg-driver/xf86-video-nv_2.1.12.bb +++ b/recipes/xorg-driver/xf86-video-nv_2.1.12.bb @@ -2,3 +2,5 @@ require xorg-driver-video.inc DESCRIPTION = "X.Org X server -- NV display driver" PE = "1" +SRC_URI[archive.md5sum] = "42f12a36d7afc26c817e8e8f5c8b7274" +SRC_URI[archive.sha256sum] = "f56d2bb42f6c4369dd3c6adc30988c53a229650f910b0db1bb3bf9376054011e" diff --git a/recipes/xorg-driver/xf86-video-nv_2.1.15.bb b/recipes/xorg-driver/xf86-video-nv_2.1.15.bb index 0d4ee2ed19..22c0212b48 100644 --- a/recipes/xorg-driver/xf86-video-nv_2.1.15.bb +++ b/recipes/xorg-driver/xf86-video-nv_2.1.15.bb @@ -2,3 +2,5 @@ require xorg-driver-video.inc DESCRIPTION = "X.Org X server -- NV display driver" PE = "1" +SRC_URI[archive.md5sum] = "1b22188bd9012a148206940708b52ea6" +SRC_URI[archive.sha256sum] = "c18ce0410437ced9c171d2d6328a8406b79b6edacf55b9526594b446ee5a3641" diff --git a/recipes/xorg-driver/xf86-video-nv_2.1.16.bb b/recipes/xorg-driver/xf86-video-nv_2.1.16.bb index 0d4ee2ed19..3a24b18738 100644 --- a/recipes/xorg-driver/xf86-video-nv_2.1.16.bb +++ b/recipes/xorg-driver/xf86-video-nv_2.1.16.bb @@ -2,3 +2,5 @@ require xorg-driver-video.inc DESCRIPTION = "X.Org X server -- NV display driver" PE = "1" +SRC_URI[archive.md5sum] = "fb02d5506e35054348d1c2b2c924530d" +SRC_URI[archive.sha256sum] = "4bf2f964b78d309769faa6a5d21c90a9907886623adf1f30ea890b4329bf578d" diff --git a/recipes/xorg-driver/xf86-video-nv_2.1.3.bb b/recipes/xorg-driver/xf86-video-nv_2.1.3.bb index 843aa707b7..7b0783d0d4 100644 --- a/recipes/xorg-driver/xf86-video-nv_2.1.3.bb +++ b/recipes/xorg-driver/xf86-video-nv_2.1.3.bb @@ -4,3 +4,5 @@ PE = "1" #DESCRIPTION = "" #DEPENDS += " " +SRC_URI[archive.md5sum] = "f9b38e24157c3aac6014119ac18d76da" +SRC_URI[archive.sha256sum] = "8d9b5ea137c31919f7821e7f3ecbd133158813c1059f4a8ed0a723535d969952" diff --git a/recipes/xorg-driver/xf86-video-nv_2.1.7.bb b/recipes/xorg-driver/xf86-video-nv_2.1.7.bb index 0d4ee2ed19..ec1bff298c 100644 --- a/recipes/xorg-driver/xf86-video-nv_2.1.7.bb +++ b/recipes/xorg-driver/xf86-video-nv_2.1.7.bb @@ -2,3 +2,5 @@ require xorg-driver-video.inc DESCRIPTION = "X.Org X server -- NV display driver" PE = "1" +SRC_URI[archive.md5sum] = "192414222f1a98e228832ee53f8178c0" +SRC_URI[archive.sha256sum] = "7c9135d80b519246b2a85ff0481d6ee0fddeb578d669ff490f236f85873e8c5a" diff --git a/recipes/xorg-driver/xf86-video-nv_2.1.8.bb b/recipes/xorg-driver/xf86-video-nv_2.1.8.bb index 0d4ee2ed19..636460819b 100644 --- a/recipes/xorg-driver/xf86-video-nv_2.1.8.bb +++ b/recipes/xorg-driver/xf86-video-nv_2.1.8.bb @@ -2,3 +2,5 @@ require xorg-driver-video.inc DESCRIPTION = "X.Org X server -- NV display driver" PE = "1" +SRC_URI[archive.md5sum] = "c3e8c98287dc98677bebfbe1ba51ab77" +SRC_URI[archive.sha256sum] = "825ffb97525517de9f0ff7155946c6e58c278dba11957573cc970dd3b094f94a" diff --git a/recipes/xorg-driver/xf86-video-nv_2.1.9.bb b/recipes/xorg-driver/xf86-video-nv_2.1.9.bb index 0d4ee2ed19..94c0a186b0 100644 --- a/recipes/xorg-driver/xf86-video-nv_2.1.9.bb +++ b/recipes/xorg-driver/xf86-video-nv_2.1.9.bb @@ -2,3 +2,5 @@ require xorg-driver-video.inc DESCRIPTION = "X.Org X server -- NV display driver" PE = "1" +SRC_URI[archive.md5sum] = "c6b7e52fa18455c22eb040b8d2575ce5" +SRC_URI[archive.sha256sum] = "20d92ff3ab4b9ecc150f4ed17a7012a48f56dbf3fb51b51dde769b28922976d9" diff --git a/recipes/xorg-driver/xf86-video-openchrome_0.2.903.bb b/recipes/xorg-driver/xf86-video-openchrome_0.2.903.bb index facae8950a..19a2ef3ec2 100644 --- a/recipes/xorg-driver/xf86-video-openchrome_0.2.903.bb +++ b/recipes/xorg-driver/xf86-video-openchrome_0.2.903.bb @@ -7,3 +7,5 @@ do_configure_prepend() { rm ${S}/acinclude.m4 || true } +SRC_URI[archive.md5sum] = "c0820787e89958c9114d359b6a3cd464" +SRC_URI[archive.sha256sum] = "b7e4858d6b5c6428fae2485a2c2097cdf6073268ef812aae2ccbc3d936db7410" diff --git a/recipes/xorg-driver/xf86-video-openchrome_0.2.904.bb b/recipes/xorg-driver/xf86-video-openchrome_0.2.904.bb index facae8950a..c1fc194d0c 100644 --- a/recipes/xorg-driver/xf86-video-openchrome_0.2.904.bb +++ b/recipes/xorg-driver/xf86-video-openchrome_0.2.904.bb @@ -7,3 +7,5 @@ do_configure_prepend() { rm ${S}/acinclude.m4 || true } +SRC_URI[archive.md5sum] = "f2481d98ef54febf5bffbb88a2a2426d" +SRC_URI[archive.sha256sum] = "c7bdf7c48365b1d077a4be7ccc652cf3f7a0f385fddeb2d4fe71b00b6c6b7aea" diff --git a/recipes/xorg-driver/xf86-video-r128_6.8.0.bb b/recipes/xorg-driver/xf86-video-r128_6.8.0.bb index 994ea24d8f..abaaf17b95 100644 --- a/recipes/xorg-driver/xf86-video-r128_6.8.0.bb +++ b/recipes/xorg-driver/xf86-video-r128_6.8.0.bb @@ -2,3 +2,5 @@ require xorg-driver-video.inc DESCRIPTION = "X.Org X server -- r128 display driver" PE = "1" +SRC_URI[archive.md5sum] = "007bec0c6b07d9d3aeca4da18e561efb" +SRC_URI[archive.sha256sum] = "5689ca714fee9c9272bee12883b07a0ef2c40358ffb19fa684e963027b56567b" diff --git a/recipes/xorg-driver/xf86-video-r128_6.8.1.bb b/recipes/xorg-driver/xf86-video-r128_6.8.1.bb index 994ea24d8f..bd52ad91be 100644 --- a/recipes/xorg-driver/xf86-video-r128_6.8.1.bb +++ b/recipes/xorg-driver/xf86-video-r128_6.8.1.bb @@ -2,3 +2,5 @@ require xorg-driver-video.inc DESCRIPTION = "X.Org X server -- r128 display driver" PE = "1" +SRC_URI[archive.md5sum] = "2b90854a62a4d45d652062f582dc8d13" +SRC_URI[archive.sha256sum] = "517e21cc83850b903549d698c9daeb633e8b9ba5b187fe298409cc51975a9eca" diff --git a/recipes/xorg-driver/xf86-video-radeonhd_1.2.0.bb b/recipes/xorg-driver/xf86-video-radeonhd_1.2.0.bb index ee92c364da..f0559cd59b 100644 --- a/recipes/xorg-driver/xf86-video-radeonhd_1.2.0.bb +++ b/recipes/xorg-driver/xf86-video-radeonhd_1.2.0.bb @@ -7,3 +7,5 @@ EXTRA_OECONF += " \ ac_cv_file___src_AtomBios_includes_atombios_h=yes \ ac_cv_file___src_AtomBios_includes_Decoder_h=yes \ " +SRC_URI[archive.md5sum] = "6a932ec17da9ce5a6d9000c1649c3a7e" +SRC_URI[archive.sha256sum] = "87c6353dd52bbe22d3a45f28fb39de1dd44f41568aaf8a9b0d45a7ed62313e27" diff --git a/recipes/xorg-driver/xf86-video-radeonhd_1.3.0.bb b/recipes/xorg-driver/xf86-video-radeonhd_1.3.0.bb index ee92c364da..0eac05f050 100644 --- a/recipes/xorg-driver/xf86-video-radeonhd_1.3.0.bb +++ b/recipes/xorg-driver/xf86-video-radeonhd_1.3.0.bb @@ -7,3 +7,5 @@ EXTRA_OECONF += " \ ac_cv_file___src_AtomBios_includes_atombios_h=yes \ ac_cv_file___src_AtomBios_includes_Decoder_h=yes \ " +SRC_URI[archive.md5sum] = "7b6641aa9d836f1621b9b220ad6771b8" +SRC_URI[archive.sha256sum] = "5adad675e60e973f2e3522a01457d9214157fbb5005090fe48092e6e5e698ad5" diff --git a/recipes/xorg-driver/xf86-video-rendition_4.1.3.bb b/recipes/xorg-driver/xf86-video-rendition_4.1.3.bb index e6c89a8c74..2f780ad19c 100644 --- a/recipes/xorg-driver/xf86-video-rendition_4.1.3.bb +++ b/recipes/xorg-driver/xf86-video-rendition_4.1.3.bb @@ -4,3 +4,5 @@ PE = "1" DESCRIPTION = "X11 driver supporting cards based on the V1000 or the V2x00." #DEPENDS += " " +SRC_URI[archive.md5sum] = "a8b97feccb32184820d5856fe78d34db" +SRC_URI[archive.sha256sum] = "37e7aef72f7466485f5a3bafd0d43190cb7439de16868bfba2c59bb4c9df4408" diff --git a/recipes/xorg-driver/xf86-video-rendition_4.2.0.bb b/recipes/xorg-driver/xf86-video-rendition_4.2.0.bb index e6c89a8c74..3da0278a78 100644 --- a/recipes/xorg-driver/xf86-video-rendition_4.2.0.bb +++ b/recipes/xorg-driver/xf86-video-rendition_4.2.0.bb @@ -4,3 +4,5 @@ PE = "1" DESCRIPTION = "X11 driver supporting cards based on the V1000 or the V2x00." #DEPENDS += " " +SRC_URI[archive.md5sum] = "7c03de3804d4c4f6ff59f74050d24b2b" +SRC_URI[archive.sha256sum] = "b57b62f707d87534a799170e31b33311449cfd7019a56e6b4fa85a4c7faaae15" diff --git a/recipes/xorg-driver/xf86-video-rendition_4.2.3.bb b/recipes/xorg-driver/xf86-video-rendition_4.2.3.bb index e6c89a8c74..a339cb8578 100644 --- a/recipes/xorg-driver/xf86-video-rendition_4.2.3.bb +++ b/recipes/xorg-driver/xf86-video-rendition_4.2.3.bb @@ -4,3 +4,5 @@ PE = "1" DESCRIPTION = "X11 driver supporting cards based on the V1000 or the V2x00." #DEPENDS += " " +SRC_URI[archive.md5sum] = "9a0a916fe1e7b5c81cd4c80a08e646cc" +SRC_URI[archive.sha256sum] = "9d5559fd3029feee5af2493ab8f558c58c426fc89776a1109dab97e3a4764d94" diff --git a/recipes/xorg-driver/xf86-video-s3_0.5.0.bb b/recipes/xorg-driver/xf86-video-s3_0.5.0.bb index 843aa707b7..f742317fc6 100644 --- a/recipes/xorg-driver/xf86-video-s3_0.5.0.bb +++ b/recipes/xorg-driver/xf86-video-s3_0.5.0.bb @@ -4,3 +4,5 @@ PE = "1" #DESCRIPTION = "" #DEPENDS += " " +SRC_URI[archive.md5sum] = "d95ab6445cab477f39adfbbc81006f67" +SRC_URI[archive.sha256sum] = "4a1206cb1a200aad8881216547d9913d0e24928138f3b1bb912a3336b9c05c97" diff --git a/recipes/xorg-driver/xf86-video-s3_0.6.0.bb b/recipes/xorg-driver/xf86-video-s3_0.6.0.bb index b5fef823b6..992e0fdfa7 100644 --- a/recipes/xorg-driver/xf86-video-s3_0.6.0.bb +++ b/recipes/xorg-driver/xf86-video-s3_0.6.0.bb @@ -2,3 +2,5 @@ require xorg-driver-video.inc PE = "1" DESCRIPTION = "X.Org X server -- legacy S3 display driver" +SRC_URI[archive.md5sum] = "d05e7c3cb044437eda8663e174ba913c" +SRC_URI[archive.sha256sum] = "ed07e4648b0f405fddd563783b49f971d649dd07cc8bc7737a93ff3d90f6c067" diff --git a/recipes/xorg-driver/xf86-video-s3_0.6.3.bb b/recipes/xorg-driver/xf86-video-s3_0.6.3.bb index b5fef823b6..7a4a70b9c2 100644 --- a/recipes/xorg-driver/xf86-video-s3_0.6.3.bb +++ b/recipes/xorg-driver/xf86-video-s3_0.6.3.bb @@ -2,3 +2,5 @@ require xorg-driver-video.inc PE = "1" DESCRIPTION = "X.Org X server -- legacy S3 display driver" +SRC_URI[archive.md5sum] = "5eb06d88533fb327d067928faeb20860" +SRC_URI[archive.sha256sum] = "ed9f65aa6eb1811d8c16cddfce00c5fc5880d6d46b907a83ef77700610085144" diff --git a/recipes/xorg-driver/xf86-video-s3virge_1.10.1.bb b/recipes/xorg-driver/xf86-video-s3virge_1.10.1.bb index 5f7dd350ce..7b51ca8e32 100644 --- a/recipes/xorg-driver/xf86-video-s3virge_1.10.1.bb +++ b/recipes/xorg-driver/xf86-video-s3virge_1.10.1.bb @@ -2,3 +2,5 @@ require xorg-driver-video.inc PE = "1" DESCRIPTION = "X.Org X server -- S3 ViRGE display driver" +SRC_URI[archive.md5sum] = "4a293047e988d4ea1e9e96d3b5793f43" +SRC_URI[archive.sha256sum] = "9094115621ef73c957cf887332717ec727c751959b1059e3d00fbfe0114a978a" diff --git a/recipes/xorg-driver/xf86-video-s3virge_1.10.4.bb b/recipes/xorg-driver/xf86-video-s3virge_1.10.4.bb index 5f7dd350ce..31baad30de 100644 --- a/recipes/xorg-driver/xf86-video-s3virge_1.10.4.bb +++ b/recipes/xorg-driver/xf86-video-s3virge_1.10.4.bb @@ -2,3 +2,5 @@ require xorg-driver-video.inc PE = "1" DESCRIPTION = "X.Org X server -- S3 ViRGE display driver" +SRC_URI[archive.md5sum] = "6517bbbf808c700502d51acdc44662f8" +SRC_URI[archive.sha256sum] = "1cd00d6e71fdbd70dafe3beb8911d22cbdc5ef7b32d2d81c454ac8a18c967fb8" diff --git a/recipes/xorg-driver/xf86-video-s3virge_1.9.1.bb b/recipes/xorg-driver/xf86-video-s3virge_1.9.1.bb index c2b6b7608a..e860d850f7 100644 --- a/recipes/xorg-driver/xf86-video-s3virge_1.9.1.bb +++ b/recipes/xorg-driver/xf86-video-s3virge_1.9.1.bb @@ -1,2 +1,4 @@ require xorg-driver-video.inc PE = "1" +SRC_URI[archive.md5sum] = "a91c73285ef67ee7cd9e2da28acb6cc4" +SRC_URI[archive.sha256sum] = "cef5702963f49e737fb8b1472dc0241f7a5da49f844ac77f2df3e693a84bc822" diff --git a/recipes/xorg-driver/xf86-video-savage_2.1.2.bb b/recipes/xorg-driver/xf86-video-savage_2.1.2.bb index 999b319b23..bceef9e9a5 100644 --- a/recipes/xorg-driver/xf86-video-savage_2.1.2.bb +++ b/recipes/xorg-driver/xf86-video-savage_2.1.2.bb @@ -4,3 +4,5 @@ PE = "1" #DESCRIPTION = "" DEPENDS += " drm xf86driproto" +SRC_URI[archive.md5sum] = "6367e921a98f6a7fec9d0a9bc5ff0a47" +SRC_URI[archive.sha256sum] = "1a9aa442152c139e3c54bc6c323bd13edf0bfff70a81c03969bcb1159317edb2" diff --git a/recipes/xorg-driver/xf86-video-savage_2.1.3.bb b/recipes/xorg-driver/xf86-video-savage_2.1.3.bb index 999b319b23..d2e1d2069b 100644 --- a/recipes/xorg-driver/xf86-video-savage_2.1.3.bb +++ b/recipes/xorg-driver/xf86-video-savage_2.1.3.bb @@ -4,3 +4,5 @@ PE = "1" #DESCRIPTION = "" DEPENDS += " drm xf86driproto" +SRC_URI[archive.md5sum] = "9c5e541613b07de6e7b2b2df3a2e35b1" +SRC_URI[archive.sha256sum] = "f5f154df377cb445935d1453d6b7095d63912d5776dcb44f8d3c2f10ab1a3cc5" diff --git a/recipes/xorg-driver/xf86-video-savage_2.2.1.bb b/recipes/xorg-driver/xf86-video-savage_2.2.1.bb index eafe3899e6..05460d2d07 100644 --- a/recipes/xorg-driver/xf86-video-savage_2.2.1.bb +++ b/recipes/xorg-driver/xf86-video-savage_2.2.1.bb @@ -10,3 +10,5 @@ EXTRA_OECONF += " \ ac_cv_file__usr_include_xorg_sarea_h=yes \ ac_cv_file__usr_include_xorg_dristruct_h=yes \ " +SRC_URI[archive.md5sum] = "62b8aba48b54eaefeae87df502bf219c" +SRC_URI[archive.sha256sum] = "adf95cae0fbaf72326c51c4c9e61486eef062bb1706f6ab46d942f2c36d8a37e" diff --git a/recipes/xorg-driver/xf86-video-savage_2.3.1.bb b/recipes/xorg-driver/xf86-video-savage_2.3.1.bb index eafe3899e6..f37453a7c8 100644 --- a/recipes/xorg-driver/xf86-video-savage_2.3.1.bb +++ b/recipes/xorg-driver/xf86-video-savage_2.3.1.bb @@ -10,3 +10,5 @@ EXTRA_OECONF += " \ ac_cv_file__usr_include_xorg_sarea_h=yes \ ac_cv_file__usr_include_xorg_dristruct_h=yes \ " +SRC_URI[archive.md5sum] = "66c319f610e3699c3de0f3ef630abb32" +SRC_URI[archive.sha256sum] = "2b4adcdd820a6f3acba6f3c0995f5899edc8f5e33fb4c4666c4c7a78090ddaab" diff --git a/recipes/xorg-driver/xf86-video-siliconmotion_1.5.1.bb b/recipes/xorg-driver/xf86-video-siliconmotion_1.5.1.bb index a6f3a5c2c4..d8eb272e9a 100644 --- a/recipes/xorg-driver/xf86-video-siliconmotion_1.5.1.bb +++ b/recipes/xorg-driver/xf86-video-siliconmotion_1.5.1.bb @@ -4,3 +4,5 @@ PE = "1" #DESCRIPTION = "" #DEPENDS += " " +SRC_URI[archive.md5sum] = "ee35d7714ce44a2b5ac7ad7b7b7dd75a" +SRC_URI[archive.sha256sum] = "54cf791695a53d4836d32f899b7d34b969edf5415f02e36956b6e72993e21cd7" diff --git a/recipes/xorg-driver/xf86-video-siliconmotion_1.6.0.bb b/recipes/xorg-driver/xf86-video-siliconmotion_1.6.0.bb index 5b9b4fc326..0d1a8a5506 100644 --- a/recipes/xorg-driver/xf86-video-siliconmotion_1.6.0.bb +++ b/recipes/xorg-driver/xf86-video-siliconmotion_1.6.0.bb @@ -2,3 +2,5 @@ require xorg-driver-video.inc PE = "1" DESCRIPTION = "X.Org X server -- SiliconMotion display driver" +SRC_URI[archive.md5sum] = "a8419a8ed17b02b2a6dd4d30d5e94b00" +SRC_URI[archive.sha256sum] = "cc5301b9c6adb9a0770509b8570d38730d43e9ffce6d6886cd9a090965017e53" diff --git a/recipes/xorg-driver/xf86-video-siliconmotion_1.7.3.bb b/recipes/xorg-driver/xf86-video-siliconmotion_1.7.3.bb index 5b9b4fc326..94a519e795 100644 --- a/recipes/xorg-driver/xf86-video-siliconmotion_1.7.3.bb +++ b/recipes/xorg-driver/xf86-video-siliconmotion_1.7.3.bb @@ -2,3 +2,5 @@ require xorg-driver-video.inc PE = "1" DESCRIPTION = "X.Org X server -- SiliconMotion display driver" +SRC_URI[archive.md5sum] = "29fb322cd3adab52cc7f1ac86f9315bb" +SRC_URI[archive.sha256sum] = "ebda468be42695c08ceaa4043da3cf5bcd5f9ab15d1482311fd6e826a8060b2b" diff --git a/recipes/xorg-driver/xf86-video-sis_0.10.0.bb b/recipes/xorg-driver/xf86-video-sis_0.10.0.bb index dc083b3e88..ab1264be05 100644 --- a/recipes/xorg-driver/xf86-video-sis_0.10.0.bb +++ b/recipes/xorg-driver/xf86-video-sis_0.10.0.bb @@ -9,3 +9,5 @@ EXTRA_OECONF += " \ ac_cv_file__usr_include_xorg_sarea_h=yes \ ac_cv_file__usr_include_xorg_dristruct_h=yes \ " +SRC_URI[archive.md5sum] = "331d432dccccca91ec7da39ff6bf1218" +SRC_URI[archive.sha256sum] = "bcc0dcde5d469cc2500676e0ad29dcd12b1370066289902387ead762260e4b40" diff --git a/recipes/xorg-driver/xf86-video-sis_0.10.1.bb b/recipes/xorg-driver/xf86-video-sis_0.10.1.bb index dc083b3e88..6b9d572bd0 100644 --- a/recipes/xorg-driver/xf86-video-sis_0.10.1.bb +++ b/recipes/xorg-driver/xf86-video-sis_0.10.1.bb @@ -9,3 +9,5 @@ EXTRA_OECONF += " \ ac_cv_file__usr_include_xorg_sarea_h=yes \ ac_cv_file__usr_include_xorg_dristruct_h=yes \ " +SRC_URI[archive.md5sum] = "9f57c2f5ccbd8340db32da1c74083771" +SRC_URI[archive.sha256sum] = "11529f094cbdcdaba505596488eda623e0f0bd3c51139359d587ea58b6527307" diff --git a/recipes/xorg-driver/xf86-video-sis_0.10.2.bb b/recipes/xorg-driver/xf86-video-sis_0.10.2.bb index dc083b3e88..ea1dfa03a1 100644 --- a/recipes/xorg-driver/xf86-video-sis_0.10.2.bb +++ b/recipes/xorg-driver/xf86-video-sis_0.10.2.bb @@ -9,3 +9,5 @@ EXTRA_OECONF += " \ ac_cv_file__usr_include_xorg_sarea_h=yes \ ac_cv_file__usr_include_xorg_dristruct_h=yes \ " +SRC_URI[archive.md5sum] = "f04baa307e49e9f0e5a5c3d2e89a5576" +SRC_URI[archive.sha256sum] = "3aad701799e355669b9027a9baedd623fe6b7ce93da9ac22b6902fd7e38128c2" diff --git a/recipes/xorg-driver/xf86-video-sis_0.9.3.bb b/recipes/xorg-driver/xf86-video-sis_0.9.3.bb index ab53a64646..8f7bbb87a4 100644 --- a/recipes/xorg-driver/xf86-video-sis_0.9.3.bb +++ b/recipes/xorg-driver/xf86-video-sis_0.9.3.bb @@ -5,3 +5,5 @@ PE = "1" DEPENDS += " xineramaproto xf86miscproto xf86dgaproto drm xf86driproto" +SRC_URI[archive.md5sum] = "e35d817fa4ee7beb6cd5aa744b9c0783" +SRC_URI[archive.sha256sum] = "898ee8fb16fff89ba8ac5c83b9f5a2371084719db0cf034140427229191436f6" diff --git a/recipes/xorg-driver/xf86-video-sis_0.9.4.bb b/recipes/xorg-driver/xf86-video-sis_0.9.4.bb index dd6e106e0d..41157444b9 100644 --- a/recipes/xorg-driver/xf86-video-sis_0.9.4.bb +++ b/recipes/xorg-driver/xf86-video-sis_0.9.4.bb @@ -3,3 +3,5 @@ require xorg-driver-video.inc DESCRIPTION = "X.Org X server -- SiS display driver" DEPENDS += " xineramaproto xf86miscproto xf86dgaproto drm xf86driproto" PE = "1" +SRC_URI[archive.md5sum] = "43f12cabf770b06170cdd1cdaafdc50f" +SRC_URI[archive.sha256sum] = "50856446841526fc393af6bae0fbc39c20bb07e60056a676d0bc620446b593ac" diff --git a/recipes/xorg-driver/xf86-video-sisusb_0.8.1.bb b/recipes/xorg-driver/xf86-video-sisusb_0.8.1.bb index 07af9eebcb..a0f4c3e083 100644 --- a/recipes/xorg-driver/xf86-video-sisusb_0.8.1.bb +++ b/recipes/xorg-driver/xf86-video-sisusb_0.8.1.bb @@ -4,3 +4,5 @@ PE = "1" DEPENDS += " xineramaproto xf86miscproto" +SRC_URI[archive.md5sum] = "cbd669507e4aa35e468905f09b546333" +SRC_URI[archive.sha256sum] = "1596b79ab3e33263bde2d456cc0376808abee80b4cde059605f176d98bdb45cb" diff --git a/recipes/xorg-driver/xf86-video-sisusb_0.9.0.bb b/recipes/xorg-driver/xf86-video-sisusb_0.9.0.bb index 8f6dfae1f6..62c2b7c686 100644 --- a/recipes/xorg-driver/xf86-video-sisusb_0.9.0.bb +++ b/recipes/xorg-driver/xf86-video-sisusb_0.9.0.bb @@ -4,3 +4,5 @@ PE = "1" DESCRIPTION = "X.Org X server -- SiS USB display driver" DEPENDS += " xineramaproto xf86miscproto" +SRC_URI[archive.md5sum] = "7b1f5465f423a859f306f4f1d6306a1b" +SRC_URI[archive.sha256sum] = "76b79c9b7d3b35b8e2e5354569bf0936c4afd39a9dcbdf66327714d75137930a" diff --git a/recipes/xorg-driver/xf86-video-sisusb_0.9.1.bb b/recipes/xorg-driver/xf86-video-sisusb_0.9.1.bb index 8f6dfae1f6..b3f99574f5 100644 --- a/recipes/xorg-driver/xf86-video-sisusb_0.9.1.bb +++ b/recipes/xorg-driver/xf86-video-sisusb_0.9.1.bb @@ -4,3 +4,5 @@ PE = "1" DESCRIPTION = "X.Org X server -- SiS USB display driver" DEPENDS += " xineramaproto xf86miscproto" +SRC_URI[archive.md5sum] = "42069e70578bf3fb353cdacad186f6c0" +SRC_URI[archive.sha256sum] = "b3ca934ce3e31f4a162bf263cad3913edccc46906d09132118b74a2095c157d9" diff --git a/recipes/xorg-driver/xf86-video-sisusb_0.9.3.bb b/recipes/xorg-driver/xf86-video-sisusb_0.9.3.bb index 8f6dfae1f6..784cd2a89a 100644 --- a/recipes/xorg-driver/xf86-video-sisusb_0.9.3.bb +++ b/recipes/xorg-driver/xf86-video-sisusb_0.9.3.bb @@ -4,3 +4,5 @@ PE = "1" DESCRIPTION = "X.Org X server -- SiS USB display driver" DEPENDS += " xineramaproto xf86miscproto" +SRC_URI[archive.md5sum] = "be59e9c2d9458cee0b5006549c14a95d" +SRC_URI[archive.sha256sum] = "1df9a90ecc31d5fb63de7c970555f166dab24c0f633b54aaac4ee82fa7b49bb2" diff --git a/recipes/xorg-driver/xf86-video-sunbw2_1.1.0.bb b/recipes/xorg-driver/xf86-video-sunbw2_1.1.0.bb index c2b6b7608a..1c69616730 100644 --- a/recipes/xorg-driver/xf86-video-sunbw2_1.1.0.bb +++ b/recipes/xorg-driver/xf86-video-sunbw2_1.1.0.bb @@ -1,2 +1,4 @@ require xorg-driver-video.inc PE = "1" +SRC_URI[archive.md5sum] = "559c95f044a31cfe7f71453e9b89c35b" +SRC_URI[archive.sha256sum] = "d71074e941ad8f71ac476651c2ca4142a5c2243e8fecdf216bc0ffbf18338136" diff --git a/recipes/xorg-driver/xf86-video-suncg14_1.1.0.bb b/recipes/xorg-driver/xf86-video-suncg14_1.1.0.bb index c2b6b7608a..cf6e89b6a2 100644 --- a/recipes/xorg-driver/xf86-video-suncg14_1.1.0.bb +++ b/recipes/xorg-driver/xf86-video-suncg14_1.1.0.bb @@ -1,2 +1,4 @@ require xorg-driver-video.inc PE = "1" +SRC_URI[archive.md5sum] = "9e25784e912cb2f0493b87431fd60773" +SRC_URI[archive.sha256sum] = "1eca2b0970e725db49f9e462a0c2e618b2616389647335b5aec9d6e495e40527" diff --git a/recipes/xorg-driver/xf86-video-suncg14_1.1.1.bb b/recipes/xorg-driver/xf86-video-suncg14_1.1.1.bb index c2b6b7608a..4c4d729f51 100644 --- a/recipes/xorg-driver/xf86-video-suncg14_1.1.1.bb +++ b/recipes/xorg-driver/xf86-video-suncg14_1.1.1.bb @@ -1,2 +1,4 @@ require xorg-driver-video.inc PE = "1" +SRC_URI[archive.md5sum] = "8e4bd0a6b155cb861356e7430d667aee" +SRC_URI[archive.sha256sum] = "cb43007920394b000be98ea0eac16a1cc16b4ca7ea8532b5d803a0c7574720d8" diff --git a/recipes/xorg-driver/xf86-video-suncg3_1.1.0.bb b/recipes/xorg-driver/xf86-video-suncg3_1.1.0.bb index c2b6b7608a..fcb4819777 100644 --- a/recipes/xorg-driver/xf86-video-suncg3_1.1.0.bb +++ b/recipes/xorg-driver/xf86-video-suncg3_1.1.0.bb @@ -1,2 +1,4 @@ require xorg-driver-video.inc PE = "1" +SRC_URI[archive.md5sum] = "b9cb8cfb6a4234bebc434f744af53208" +SRC_URI[archive.sha256sum] = "3564ebc8ccdfea872d46559166d881e93ac7c17e3ed46bb4087960f491c37df9" diff --git a/recipes/xorg-driver/xf86-video-suncg3_1.1.1.bb b/recipes/xorg-driver/xf86-video-suncg3_1.1.1.bb index c2b6b7608a..d434caa9c9 100644 --- a/recipes/xorg-driver/xf86-video-suncg3_1.1.1.bb +++ b/recipes/xorg-driver/xf86-video-suncg3_1.1.1.bb @@ -1,2 +1,4 @@ require xorg-driver-video.inc PE = "1" +SRC_URI[archive.md5sum] = "bb6c4def5cfb0959b72dccb661473d4a" +SRC_URI[archive.sha256sum] = "d56fe98c34f2af1b6424e3fcaa22a31402a4b59d63679f0e5fdfb1d2ea878419" diff --git a/recipes/xorg-driver/xf86-video-suncg6_1.1.0.bb b/recipes/xorg-driver/xf86-video-suncg6_1.1.0.bb index c2b6b7608a..3b3dfc6cdf 100644 --- a/recipes/xorg-driver/xf86-video-suncg6_1.1.0.bb +++ b/recipes/xorg-driver/xf86-video-suncg6_1.1.0.bb @@ -1,2 +1,4 @@ require xorg-driver-video.inc PE = "1" +SRC_URI[archive.md5sum] = "aa6b7836fe6ccc99994bf15ff2b74e86" +SRC_URI[archive.sha256sum] = "d6b1f3b79c57ef5281e0204b2847812cf9fa5df616478f01591445a36537194b" diff --git a/recipes/xorg-driver/xf86-video-suncg6_1.1.1.bb b/recipes/xorg-driver/xf86-video-suncg6_1.1.1.bb index c2b6b7608a..e7602c41a6 100644 --- a/recipes/xorg-driver/xf86-video-suncg6_1.1.1.bb +++ b/recipes/xorg-driver/xf86-video-suncg6_1.1.1.bb @@ -1,2 +1,4 @@ require xorg-driver-video.inc PE = "1" +SRC_URI[archive.md5sum] = "bc9904a9129aaf73408568ae1e2fa65f" +SRC_URI[archive.sha256sum] = "d1216c7c2be78d1dafad0cd46e464e9fa08f5e04544b76d9a0c547374c85801f" diff --git a/recipes/xorg-driver/xf86-video-sunffb_1.1.0.bb b/recipes/xorg-driver/xf86-video-sunffb_1.1.0.bb index 0251123fc8..0ba228e1ad 100644 --- a/recipes/xorg-driver/xf86-video-sunffb_1.1.0.bb +++ b/recipes/xorg-driver/xf86-video-sunffb_1.1.0.bb @@ -2,3 +2,5 @@ require xorg-driver-video.inc PE = "1" DEPENDS += " drm xf86driproto" +SRC_URI[archive.md5sum] = "dee23564c0d8069f52c7cd29c78be667" +SRC_URI[archive.sha256sum] = "f897a427e83cf6965fd82724e3298aea44eb3131ba62f904cb514dfd0a879029" diff --git a/recipes/xorg-driver/xf86-video-sunffb_1.2.0.bb b/recipes/xorg-driver/xf86-video-sunffb_1.2.0.bb index c2b6b7608a..295a9a4ed0 100644 --- a/recipes/xorg-driver/xf86-video-sunffb_1.2.0.bb +++ b/recipes/xorg-driver/xf86-video-sunffb_1.2.0.bb @@ -1,2 +1,4 @@ require xorg-driver-video.inc PE = "1" +SRC_URI[archive.md5sum] = "816842de26bce8a935f3c9c3cfedbc42" +SRC_URI[archive.sha256sum] = "59f2f8fc2399a4d6b0ce733481c58694e723a989f4712c00436d35e27c059292" diff --git a/recipes/xorg-driver/xf86-video-sunffb_1.2.1.bb b/recipes/xorg-driver/xf86-video-sunffb_1.2.1.bb index c2b6b7608a..91eaa13af6 100644 --- a/recipes/xorg-driver/xf86-video-sunffb_1.2.1.bb +++ b/recipes/xorg-driver/xf86-video-sunffb_1.2.1.bb @@ -1,2 +1,4 @@ require xorg-driver-video.inc PE = "1" +SRC_URI[archive.md5sum] = "1bb374fe5ab3ed780d353b2b12ba6255" +SRC_URI[archive.sha256sum] = "fd377af6e366e8e3a77c8ff825a009138c8343c0007bbf070ad605a649577e11" diff --git a/recipes/xorg-driver/xf86-video-sunleo_1.1.0.bb b/recipes/xorg-driver/xf86-video-sunleo_1.1.0.bb index c2b6b7608a..639765a899 100644 --- a/recipes/xorg-driver/xf86-video-sunleo_1.1.0.bb +++ b/recipes/xorg-driver/xf86-video-sunleo_1.1.0.bb @@ -1,2 +1,4 @@ require xorg-driver-video.inc PE = "1" +SRC_URI[archive.md5sum] = "0408d95795d754c92d12d6476b6932a1" +SRC_URI[archive.sha256sum] = "b504d50f261bea9bc9dcd2a9c9c3307b24dee97c18d13b5a6deb3eb393270da9" diff --git a/recipes/xorg-driver/xf86-video-sunleo_1.2.0.bb b/recipes/xorg-driver/xf86-video-sunleo_1.2.0.bb index c2b6b7608a..3d2e7502e0 100644 --- a/recipes/xorg-driver/xf86-video-sunleo_1.2.0.bb +++ b/recipes/xorg-driver/xf86-video-sunleo_1.2.0.bb @@ -1,2 +1,4 @@ require xorg-driver-video.inc PE = "1" +SRC_URI[archive.md5sum] = "14fe008620940a674981912fa02ae133" +SRC_URI[archive.sha256sum] = "b315be97197020ae352efe48e9bcd13a572c3a03b2a4d598e89157a897746e06" diff --git a/recipes/xorg-driver/xf86-video-suntcx_1.1.0.bb b/recipes/xorg-driver/xf86-video-suntcx_1.1.0.bb index c2b6b7608a..12362b1c10 100644 --- a/recipes/xorg-driver/xf86-video-suntcx_1.1.0.bb +++ b/recipes/xorg-driver/xf86-video-suntcx_1.1.0.bb @@ -1,2 +1,4 @@ require xorg-driver-video.inc PE = "1" +SRC_URI[archive.md5sum] = "779a31151e44d2fd2a5ee1794f836889" +SRC_URI[archive.sha256sum] = "72986a3981b746f60df1aba443d610db437fe8d5053e64630686f471c47b01cf" diff --git a/recipes/xorg-driver/xf86-video-suntcx_1.1.1.bb b/recipes/xorg-driver/xf86-video-suntcx_1.1.1.bb index c2b6b7608a..881fb79ec2 100644 --- a/recipes/xorg-driver/xf86-video-suntcx_1.1.1.bb +++ b/recipes/xorg-driver/xf86-video-suntcx_1.1.1.bb @@ -1,2 +1,4 @@ require xorg-driver-video.inc PE = "1" +SRC_URI[archive.md5sum] = "b064a8d2f3d481ec36ef9ac17e13a77d" +SRC_URI[archive.sha256sum] = "543115c4b3a8603dcc9d7a3030c9e7ce20baf6e3976d92ff951cfea80b54981e" diff --git a/recipes/xorg-driver/xf86-video-tdfx_1.3.0.bb b/recipes/xorg-driver/xf86-video-tdfx_1.3.0.bb index 999b319b23..79f4e9a52d 100644 --- a/recipes/xorg-driver/xf86-video-tdfx_1.3.0.bb +++ b/recipes/xorg-driver/xf86-video-tdfx_1.3.0.bb @@ -4,3 +4,5 @@ PE = "1" #DESCRIPTION = "" DEPENDS += " drm xf86driproto" +SRC_URI[archive.md5sum] = "04c49acb5c5dbde14eabd32d06df6e73" +SRC_URI[archive.sha256sum] = "6b1a00df5c9628817d08f07c6f18f578950744f3eb63b4397be8b0754e728624" diff --git a/recipes/xorg-driver/xf86-video-tdfx_1.4.0.bb b/recipes/xorg-driver/xf86-video-tdfx_1.4.0.bb index fe52f5eb19..96da320f92 100644 --- a/recipes/xorg-driver/xf86-video-tdfx_1.4.0.bb +++ b/recipes/xorg-driver/xf86-video-tdfx_1.4.0.bb @@ -10,3 +10,5 @@ EXTRA_OECONF += " \ ac_cv_file__usr_include_xorg_sarea_h=yes \ ac_cv_file__usr_include_xorg_dristruct_h=yes \ " +SRC_URI[archive.md5sum] = "b13132f24683ef759bfb0c1db5096496" +SRC_URI[archive.sha256sum] = "c3be06d324f2e49ece1f243b10d7180a32fbe65dbbb81e162279c8608800dead" diff --git a/recipes/xorg-driver/xf86-video-tdfx_1.4.3.bb b/recipes/xorg-driver/xf86-video-tdfx_1.4.3.bb index fe52f5eb19..e60469a072 100644 --- a/recipes/xorg-driver/xf86-video-tdfx_1.4.3.bb +++ b/recipes/xorg-driver/xf86-video-tdfx_1.4.3.bb @@ -10,3 +10,5 @@ EXTRA_OECONF += " \ ac_cv_file__usr_include_xorg_sarea_h=yes \ ac_cv_file__usr_include_xorg_dristruct_h=yes \ " +SRC_URI[archive.md5sum] = "8161bbf2b100c21b609163f0010766b3" +SRC_URI[archive.sha256sum] = "3ad935ca0aa306d10d1e6125a6bd485a3948c184dcfda01670961dc4740ebf33" diff --git a/recipes/xorg-driver/xf86-video-tga_1.1.0.bb b/recipes/xorg-driver/xf86-video-tga_1.1.0.bb index d3cf65f034..8b79f38af5 100644 --- a/recipes/xorg-driver/xf86-video-tga_1.1.0.bb +++ b/recipes/xorg-driver/xf86-video-tga_1.1.0.bb @@ -6,3 +6,5 @@ DESCRIPTION = "DEC 21030 X11 driver" DEPENDS += " xf86dgaproto" +SRC_URI[archive.md5sum] = "9eda4d4490706b2dd8f4ecdbaf779856" +SRC_URI[archive.sha256sum] = "50143dfdd259fd114dc2f41518a4898d5407bf55422251df75812b96a1fa6e9b" diff --git a/recipes/xorg-driver/xf86-video-tga_1.2.0.bb b/recipes/xorg-driver/xf86-video-tga_1.2.0.bb index d3cf65f034..b1c6d61af1 100644 --- a/recipes/xorg-driver/xf86-video-tga_1.2.0.bb +++ b/recipes/xorg-driver/xf86-video-tga_1.2.0.bb @@ -6,3 +6,5 @@ DESCRIPTION = "DEC 21030 X11 driver" DEPENDS += " xf86dgaproto" +SRC_URI[archive.md5sum] = "f3bddf0a64932ca9bd72041ccd3b5501" +SRC_URI[archive.sha256sum] = "a92f8cad0e21318be465719a9f30a50d5719b0b70bf8e15f3937e7850cf1aea6" diff --git a/recipes/xorg-driver/xf86-video-tga_1.2.1.bb b/recipes/xorg-driver/xf86-video-tga_1.2.1.bb index d3cf65f034..6e560d80f9 100644 --- a/recipes/xorg-driver/xf86-video-tga_1.2.1.bb +++ b/recipes/xorg-driver/xf86-video-tga_1.2.1.bb @@ -6,3 +6,5 @@ DESCRIPTION = "DEC 21030 X11 driver" DEPENDS += " xf86dgaproto" +SRC_URI[archive.md5sum] = "bcbceda78395de74544c83b46a7700cd" +SRC_URI[archive.sha256sum] = "70a4754ef6602cf48d910b9727d015cb3cae946c096ef260b56dfe2f80cdb855" diff --git a/recipes/xorg-driver/xf86-video-trident_1.2.3.bb b/recipes/xorg-driver/xf86-video-trident_1.2.3.bb index 065e64dfb1..bbc5a6d603 100644 --- a/recipes/xorg-driver/xf86-video-trident_1.2.3.bb +++ b/recipes/xorg-driver/xf86-video-trident_1.2.3.bb @@ -4,3 +4,5 @@ PE = "1" #DESCRIPTION = "" DEPENDS += " xf86dgaproto" +SRC_URI[archive.md5sum] = "c0e8b2f54942b6902b7dd4f30defe800" +SRC_URI[archive.sha256sum] = "d23eb8fa165d238ddf64da63dcd60c70a01cd761608a18402cfb95aed6722495" diff --git a/recipes/xorg-driver/xf86-video-trident_1.2.4.bb b/recipes/xorg-driver/xf86-video-trident_1.2.4.bb index fe37be5d0b..ca5c20b6a9 100644 --- a/recipes/xorg-driver/xf86-video-trident_1.2.4.bb +++ b/recipes/xorg-driver/xf86-video-trident_1.2.4.bb @@ -3,3 +3,5 @@ require xorg-driver-video.inc DESCRIPTION = "X.org X server -- Trident display driver" DEPENDS += " xf86dgaproto" PE = "1" +SRC_URI[archive.md5sum] = "7f628f7eb4abdc4c49bb252eefc4335a" +SRC_URI[archive.sha256sum] = "f942596e7427a089be9c9353c45c22002999580197c9715d9363d19ee170ba8d" diff --git a/recipes/xorg-driver/xf86-video-trident_1.3.0.bb b/recipes/xorg-driver/xf86-video-trident_1.3.0.bb index fe37be5d0b..426961bf44 100644 --- a/recipes/xorg-driver/xf86-video-trident_1.3.0.bb +++ b/recipes/xorg-driver/xf86-video-trident_1.3.0.bb @@ -3,3 +3,5 @@ require xorg-driver-video.inc DESCRIPTION = "X.org X server -- Trident display driver" DEPENDS += " xf86dgaproto" PE = "1" +SRC_URI[archive.md5sum] = "e89799579d0cf3858362bd751469e0bf" +SRC_URI[archive.sha256sum] = "a4f66c9f46f6e93c2c1f10e782a211ddc338b0ff9f0a2ccd2d660db031d3ddb5" diff --git a/recipes/xorg-driver/xf86-video-trident_1.3.3.bb b/recipes/xorg-driver/xf86-video-trident_1.3.3.bb index fe37be5d0b..332a07cda4 100644 --- a/recipes/xorg-driver/xf86-video-trident_1.3.3.bb +++ b/recipes/xorg-driver/xf86-video-trident_1.3.3.bb @@ -3,3 +3,5 @@ require xorg-driver-video.inc DESCRIPTION = "X.org X server -- Trident display driver" DEPENDS += " xf86dgaproto" PE = "1" +SRC_URI[archive.md5sum] = "47f3c5da1942017218355f178f02ef84" +SRC_URI[archive.sha256sum] = "6241eab6f3f0a075380be6b614e33ad72256242c865115bc8b696f83a75d11f5" diff --git a/recipes/xorg-driver/xf86-video-tseng_1.1.1.bb b/recipes/xorg-driver/xf86-video-tseng_1.1.1.bb index 843aa707b7..576c438925 100644 --- a/recipes/xorg-driver/xf86-video-tseng_1.1.1.bb +++ b/recipes/xorg-driver/xf86-video-tseng_1.1.1.bb @@ -4,3 +4,5 @@ PE = "1" #DESCRIPTION = "" #DEPENDS += " " +SRC_URI[archive.md5sum] = "488aa9c3ec7a95e6589afa4b50bec8b4" +SRC_URI[archive.sha256sum] = "c9c1f3318715b7268068bc733d00bcab93924e97eb38f94548e442fd6cdfd56e" diff --git a/recipes/xorg-driver/xf86-video-tseng_1.2.0.bb b/recipes/xorg-driver/xf86-video-tseng_1.2.0.bb index 843aa707b7..964e0d6d99 100644 --- a/recipes/xorg-driver/xf86-video-tseng_1.2.0.bb +++ b/recipes/xorg-driver/xf86-video-tseng_1.2.0.bb @@ -4,3 +4,5 @@ PE = "1" #DESCRIPTION = "" #DEPENDS += " " +SRC_URI[archive.md5sum] = "f98fc22142a009dc3a6cdf930c95203f" +SRC_URI[archive.sha256sum] = "1090d9100934329000ac330d0c66a0ac4f60d2ba83196ea15c2833a28a18b1e3" diff --git a/recipes/xorg-driver/xf86-video-tseng_1.2.3.bb b/recipes/xorg-driver/xf86-video-tseng_1.2.3.bb index 843aa707b7..a66b7539da 100644 --- a/recipes/xorg-driver/xf86-video-tseng_1.2.3.bb +++ b/recipes/xorg-driver/xf86-video-tseng_1.2.3.bb @@ -4,3 +4,5 @@ PE = "1" #DESCRIPTION = "" #DEPENDS += " " +SRC_URI[archive.md5sum] = "79f63999c88477801ae54dc486272ad6" +SRC_URI[archive.sha256sum] = "0556bb3e79da4be87e880f82e2b8504527e760e284680f9463a08f9572507187" diff --git a/recipes/xorg-driver/xf86-video-v4l_0.1.1.bb b/recipes/xorg-driver/xf86-video-v4l_0.1.1.bb index 9ebb9ad1f6..588bdd03c7 100644 --- a/recipes/xorg-driver/xf86-video-v4l_0.1.1.bb +++ b/recipes/xorg-driver/xf86-video-v4l_0.1.1.bb @@ -3,3 +3,5 @@ require xorg-driver-video.inc PE = "1" DESCRIPTION = "Video 4 Linux adaptor driver for X11" +SRC_URI[archive.md5sum] = "69339c38eba2cebc357d67e7a755d734" +SRC_URI[archive.sha256sum] = "33ad549ea3f6a8da7f58d9964f3f2d83aabc6d64c2ebc2ea0033ac8dacaec870" diff --git a/recipes/xorg-driver/xf86-video-v4l_0.2.0.bb b/recipes/xorg-driver/xf86-video-v4l_0.2.0.bb index 9ebb9ad1f6..a843d02739 100644 --- a/recipes/xorg-driver/xf86-video-v4l_0.2.0.bb +++ b/recipes/xorg-driver/xf86-video-v4l_0.2.0.bb @@ -3,3 +3,5 @@ require xorg-driver-video.inc PE = "1" DESCRIPTION = "Video 4 Linux adaptor driver for X11" +SRC_URI[archive.md5sum] = "2251ae2a0a905764941cd7b098e85ad1" +SRC_URI[archive.sha256sum] = "cbff9120fbad900cbdc7ac535d04984e7b491d69a8eb0b371e30ae07cb61925d" diff --git a/recipes/xorg-driver/xf86-video-vermilion_1.0.1.bb b/recipes/xorg-driver/xf86-video-vermilion_1.0.1.bb index c3054b9051..cf36ca4e1c 100644 --- a/recipes/xorg-driver/xf86-video-vermilion_1.0.1.bb +++ b/recipes/xorg-driver/xf86-video-vermilion_1.0.1.bb @@ -2,3 +2,5 @@ require xorg-driver-video.inc PE = "1" +SRC_URI[archive.md5sum] = "0f7c6be1bbdc5eb43d82b356fe0f5104" +SRC_URI[archive.sha256sum] = "4feb4cd8d239a1b5a944c82b253d106b7f7da083fc4d87a8aeeb822c2e980d8b" diff --git a/recipes/xorg-driver/xf86-video-vesa_1.3.0.bb b/recipes/xorg-driver/xf86-video-vesa_1.3.0.bb index 1e6760c3dc..7b1163560e 100644 --- a/recipes/xorg-driver/xf86-video-vesa_1.3.0.bb +++ b/recipes/xorg-driver/xf86-video-vesa_1.3.0.bb @@ -6,3 +6,5 @@ SRC_URI += "file://fix-includepath.patch;patch=1" #DESCRIPTION = "" #DEPENDS += " " +SRC_URI[archive.md5sum] = "4a307852f3b4850e436a41dab2a73676" +SRC_URI[archive.sha256sum] = "b96c80ae81f5123ecef344dac4c734b2e281143d3ab7a7e633d6bf04c893e203" diff --git a/recipes/xorg-driver/xf86-video-vesa_2.0.0.bb b/recipes/xorg-driver/xf86-video-vesa_2.0.0.bb index bd2f7cf7c1..641fc61b66 100644 --- a/recipes/xorg-driver/xf86-video-vesa_2.0.0.bb +++ b/recipes/xorg-driver/xf86-video-vesa_2.0.0.bb @@ -7,3 +7,5 @@ SRC_URI += "file://fix-includepath.patch;patch=1 \ #DESCRIPTION = "" #DEPENDS += " " +SRC_URI[archive.md5sum] = "433cf6f961eb4a2ab6fcb086def0b2b4" +SRC_URI[archive.sha256sum] = "f20b2e429657552eea207fb8bc4b47c8e293d99c229dcb4da11b7c5bfdc1e165" diff --git a/recipes/xorg-driver/xf86-video-vesa_2.2.0.bb b/recipes/xorg-driver/xf86-video-vesa_2.2.0.bb index 9fce612de4..ce89f5f608 100644 --- a/recipes/xorg-driver/xf86-video-vesa_2.2.0.bb +++ b/recipes/xorg-driver/xf86-video-vesa_2.2.0.bb @@ -8,3 +8,5 @@ SRC_URI += "file://fix-includepath.patch;patch=1 \ RDEPENDS += "xserver-xorg-module-libint10 " PR = "r2" +SRC_URI[archive.md5sum] = "9a86b683f73f3806f55d05cd804a6f4a" +SRC_URI[archive.sha256sum] = "8b3e077d2534722033d7b1c647aa7f31fc7fbb5014da096b7a53170005e80226" diff --git a/recipes/xorg-driver/xf86-video-vesa_2.2.1.bb b/recipes/xorg-driver/xf86-video-vesa_2.2.1.bb index bd2f7cf7c1..1e08bc484a 100644 --- a/recipes/xorg-driver/xf86-video-vesa_2.2.1.bb +++ b/recipes/xorg-driver/xf86-video-vesa_2.2.1.bb @@ -7,3 +7,5 @@ SRC_URI += "file://fix-includepath.patch;patch=1 \ #DESCRIPTION = "" #DEPENDS += " " +SRC_URI[archive.md5sum] = "61a1dc9a22991bd04d0ff98f800775c1" +SRC_URI[archive.sha256sum] = "a3657971232e9c7db3e7517a8aedd86d3ef4d159f7099ec974cdd03aafa41080" diff --git a/recipes/xorg-driver/xf86-video-vesa_2.3.0.bb b/recipes/xorg-driver/xf86-video-vesa_2.3.0.bb index c2b6b7608a..f3536d2f86 100644 --- a/recipes/xorg-driver/xf86-video-vesa_2.3.0.bb +++ b/recipes/xorg-driver/xf86-video-vesa_2.3.0.bb @@ -1,2 +1,4 @@ require xorg-driver-video.inc PE = "1" +SRC_URI[archive.md5sum] = "07fa32958aff9b463dd3af5481ef6626" +SRC_URI[archive.sha256sum] = "8ed85a0e94523539d81d5ae6639fa22ceb1c1e3baf89128915db65d4d2900d7a" diff --git a/recipes/xorg-driver/xf86-video-vga_4.1.0.bb b/recipes/xorg-driver/xf86-video-vga_4.1.0.bb index c2b6b7608a..cc973453a9 100644 --- a/recipes/xorg-driver/xf86-video-vga_4.1.0.bb +++ b/recipes/xorg-driver/xf86-video-vga_4.1.0.bb @@ -1,2 +1,4 @@ require xorg-driver-video.inc PE = "1" +SRC_URI[archive.md5sum] = "b93e5fe9757db779a75cd3ce97b9613d" +SRC_URI[archive.sha256sum] = "ca25f4c0f706688cbc2dcd03ffaf6a57a17290290257f0cc1b1f1bb261f95b41" diff --git a/recipes/xorg-driver/xf86-video-via_0.2.2.bb b/recipes/xorg-driver/xf86-video-via_0.2.2.bb index a3ce7324c3..42ac19ddcf 100644 --- a/recipes/xorg-driver/xf86-video-via_0.2.2.bb +++ b/recipes/xorg-driver/xf86-video-via_0.2.2.bb @@ -4,3 +4,5 @@ PE = "1" #DESCRIPTION = "" DEPENDS += " drm xf86driproto libxvmc" +SRC_URI[archive.md5sum] = "d5fe25d3cfa0a64cc77681f15f9c3159" +SRC_URI[archive.sha256sum] = "5026bdaf644178fee66a26190453b0dddb99558b8c97c4a592a482a2434dc862" diff --git a/recipes/xorg-driver/xf86-video-vmware_10.14.1.bb b/recipes/xorg-driver/xf86-video-vmware_10.14.1.bb index c8169407cb..9763df7d6d 100644 --- a/recipes/xorg-driver/xf86-video-vmware_10.14.1.bb +++ b/recipes/xorg-driver/xf86-video-vmware_10.14.1.bb @@ -4,3 +4,5 @@ PE = "1" DESCRIPTION = "X11 driver for VMware SVGA Device" #DEPENDS += " " +SRC_URI[archive.md5sum] = "eaf1ce9fa23363799140602afaa10f37" +SRC_URI[archive.sha256sum] = "1971fd356ba54204c3611edb9144c43c25c21167a5fa5ee725d3f2e3f9864fa9" diff --git a/recipes/xorg-driver/xf86-video-vmware_10.15.2.bb b/recipes/xorg-driver/xf86-video-vmware_10.15.2.bb index 994b8b6a3c..a5b01fd22d 100644 --- a/recipes/xorg-driver/xf86-video-vmware_10.15.2.bb +++ b/recipes/xorg-driver/xf86-video-vmware_10.15.2.bb @@ -4,3 +4,5 @@ PE = "1" #DESCRIPTION = "" DEPENDS += " xineramaproto xf86miscproto drm xf86driproto" +SRC_URI[archive.md5sum] = "99322cbcc9081ad44e9cba63e3df8f7e" +SRC_URI[archive.sha256sum] = "edae155c82d348b76dabe1373605bf6715b577cdd7a95f8b54ad534dc47c71ff" diff --git a/recipes/xorg-driver/xf86-video-vmware_10.16.1.bb b/recipes/xorg-driver/xf86-video-vmware_10.16.1.bb index 994b8b6a3c..fa3cd3526c 100644 --- a/recipes/xorg-driver/xf86-video-vmware_10.16.1.bb +++ b/recipes/xorg-driver/xf86-video-vmware_10.16.1.bb @@ -4,3 +4,5 @@ PE = "1" #DESCRIPTION = "" DEPENDS += " xineramaproto xf86miscproto drm xf86driproto" +SRC_URI[archive.md5sum] = "a5e1f2539b82206e411c3647f10c425f" +SRC_URI[archive.sha256sum] = "91ed99ae936be5df25d310d81e31e0a7efefc023e462d93a9289ac18ebdf4e89" diff --git a/recipes/xorg-driver/xf86-video-vmware_10.16.5.bb b/recipes/xorg-driver/xf86-video-vmware_10.16.5.bb index 994b8b6a3c..b9b33873f8 100644 --- a/recipes/xorg-driver/xf86-video-vmware_10.16.5.bb +++ b/recipes/xorg-driver/xf86-video-vmware_10.16.5.bb @@ -4,3 +4,5 @@ PE = "1" #DESCRIPTION = "" DEPENDS += " xineramaproto xf86miscproto drm xf86driproto" +SRC_URI[archive.md5sum] = "6d78c82ea7c2bb0fcb587d7bb4e8f60a" +SRC_URI[archive.sha256sum] = "3e4e9abfd806b36076083ef6cacc93b713bfa4ddefe7005edfc15c64f5174366" diff --git a/recipes/xorg-driver/xf86-video-vmware_10.16.8.bb b/recipes/xorg-driver/xf86-video-vmware_10.16.8.bb index 994b8b6a3c..a5983938b2 100644 --- a/recipes/xorg-driver/xf86-video-vmware_10.16.8.bb +++ b/recipes/xorg-driver/xf86-video-vmware_10.16.8.bb @@ -4,3 +4,5 @@ PE = "1" #DESCRIPTION = "" DEPENDS += " xineramaproto xf86miscproto drm xf86driproto" +SRC_URI[archive.md5sum] = "25287a202c986b33bd79fbe379c96a16" +SRC_URI[archive.sha256sum] = "956443948d94f7459b0056d8cb8ff2cd9fba4621d8b61f0257cb84469ea7da07" diff --git a/recipes/xorg-driver/xf86-video-vmware_10.16.9.bb b/recipes/xorg-driver/xf86-video-vmware_10.16.9.bb index 994b8b6a3c..0352fa7599 100644 --- a/recipes/xorg-driver/xf86-video-vmware_10.16.9.bb +++ b/recipes/xorg-driver/xf86-video-vmware_10.16.9.bb @@ -4,3 +4,5 @@ PE = "1" #DESCRIPTION = "" DEPENDS += " xineramaproto xf86miscproto drm xf86driproto" +SRC_URI[archive.md5sum] = "3b3d38abfa1f8be4b1e26dcd236bc94f" +SRC_URI[archive.sha256sum] = "835a5e45b54837cbbd963a48bd09db709717e097e931dd76e68e397a167e8bc1" diff --git a/recipes/xorg-driver/xf86-video-voodoo_1.1.1.bb b/recipes/xorg-driver/xf86-video-voodoo_1.1.1.bb index bfceb2995c..ffb97e9704 100644 --- a/recipes/xorg-driver/xf86-video-voodoo_1.1.1.bb +++ b/recipes/xorg-driver/xf86-video-voodoo_1.1.1.bb @@ -4,3 +4,5 @@ PE = "1" DESCRIPTION = "X11 driver for Voodoo/Voodoo2" DEPENDS += " xf86dgaproto" +SRC_URI[archive.md5sum] = "bc878e795688b49a595b355482d27174" +SRC_URI[archive.sha256sum] = "3975601baee674b2bad0dfe696586f17cc913f1dc7f1d5c4e184623e0461751c" diff --git a/recipes/xorg-driver/xf86-video-voodoo_1.2.0.bb b/recipes/xorg-driver/xf86-video-voodoo_1.2.0.bb index bfceb2995c..6c6c691840 100644 --- a/recipes/xorg-driver/xf86-video-voodoo_1.2.0.bb +++ b/recipes/xorg-driver/xf86-video-voodoo_1.2.0.bb @@ -4,3 +4,5 @@ PE = "1" DESCRIPTION = "X11 driver for Voodoo/Voodoo2" DEPENDS += " xf86dgaproto" +SRC_URI[archive.md5sum] = "7c681d9b57f5e1f798263fc1a9d99245" +SRC_URI[archive.sha256sum] = "b79ba6d5d4300570c00f8be37c536f47f2d78c18845f70f525da2a29e47c4b8c" diff --git a/recipes/xorg-driver/xf86-video-voodoo_1.2.3.bb b/recipes/xorg-driver/xf86-video-voodoo_1.2.3.bb index bfceb2995c..5e23995829 100644 --- a/recipes/xorg-driver/xf86-video-voodoo_1.2.3.bb +++ b/recipes/xorg-driver/xf86-video-voodoo_1.2.3.bb @@ -4,3 +4,5 @@ PE = "1" DESCRIPTION = "X11 driver for Voodoo/Voodoo2" DEPENDS += " xf86dgaproto" +SRC_URI[archive.md5sum] = "c164effcc839eca1fc1d43a42f4086db" +SRC_URI[archive.sha256sum] = "025d4d99ab19325b72417fadbb099c757412988f800c9511be3e2c3993ae29e9" diff --git a/recipes/xorg-driver/xf86-video-wsfb_0.2.1.bb b/recipes/xorg-driver/xf86-video-wsfb_0.2.1.bb index ea1c005e8c..6d73c8b14c 100644 --- a/recipes/xorg-driver/xf86-video-wsfb_0.2.1.bb +++ b/recipes/xorg-driver/xf86-video-wsfb_0.2.1.bb @@ -2,3 +2,5 @@ require xorg-driver-video.inc DESCRIPTION = "X.Org X server -- wsfb display driver" PE = "1" +SRC_URI[archive.md5sum] = "c159af867a9af3abc4da332189213a76" +SRC_URI[archive.sha256sum] = "39e358aa17d939f561a28c82b9e7beca202d7ebd7d40d401c88a9dff3d90d148" diff --git a/recipes/xorg-driver/xf86-video-wsfb_0.3.0.bb b/recipes/xorg-driver/xf86-video-wsfb_0.3.0.bb index ea1c005e8c..7f4c7edaa4 100644 --- a/recipes/xorg-driver/xf86-video-wsfb_0.3.0.bb +++ b/recipes/xorg-driver/xf86-video-wsfb_0.3.0.bb @@ -2,3 +2,5 @@ require xorg-driver-video.inc DESCRIPTION = "X.Org X server -- wsfb display driver" PE = "1" +SRC_URI[archive.md5sum] = "d6b5d25dfd61fa5113216d10a6dcbb50" +SRC_URI[archive.sha256sum] = "78bdb6d397869dbd8560ae1f0ee65473977d19ca5afc9fa7638c35057284989e" diff --git a/recipes/xorg-driver/xf86-video-xgi_1.5.0.bb b/recipes/xorg-driver/xf86-video-xgi_1.5.0.bb index 994b8b6a3c..abf0331254 100644 --- a/recipes/xorg-driver/xf86-video-xgi_1.5.0.bb +++ b/recipes/xorg-driver/xf86-video-xgi_1.5.0.bb @@ -4,3 +4,5 @@ PE = "1" #DESCRIPTION = "" DEPENDS += " xineramaproto xf86miscproto drm xf86driproto" +SRC_URI[archive.md5sum] = "08529fd015191be9244f598aa0894aa6" +SRC_URI[archive.sha256sum] = "5fb23432ee8940c04494744da8b5f58bebc6ef113e96a50a74f0aa7d98a69194" diff --git a/recipes/xorg-driver/xf86-video-xgi_1.5.1.bb b/recipes/xorg-driver/xf86-video-xgi_1.5.1.bb index 994b8b6a3c..8f3ac0e0f3 100644 --- a/recipes/xorg-driver/xf86-video-xgi_1.5.1.bb +++ b/recipes/xorg-driver/xf86-video-xgi_1.5.1.bb @@ -4,3 +4,5 @@ PE = "1" #DESCRIPTION = "" DEPENDS += " xineramaproto xf86miscproto drm xf86driproto" +SRC_URI[archive.md5sum] = "65a8d94d360b51690f8d4b2e7bfa036a" +SRC_URI[archive.sha256sum] = "cb19f5287f9d345fc4fe15ba7c9344a3be2d8395ebf19a139899d1566d7c9e18" diff --git a/recipes/xorg-driver/xf86-video-xgixp_1.7.99.3.bb b/recipes/xorg-driver/xf86-video-xgixp_1.7.99.3.bb index 994b8b6a3c..e40932f7ab 100644 --- a/recipes/xorg-driver/xf86-video-xgixp_1.7.99.3.bb +++ b/recipes/xorg-driver/xf86-video-xgixp_1.7.99.3.bb @@ -4,3 +4,5 @@ PE = "1" #DESCRIPTION = "" DEPENDS += " xineramaproto xf86miscproto drm xf86driproto" +SRC_URI[archive.md5sum] = "c541152aee693fad743ef7cbf75a7ffc" +SRC_URI[archive.sha256sum] = "13a1658ee3ead0ab8e8bf7a9c8f8f0e3e40e38138f45d8431e735cd7184fbbd8" diff --git a/recipes/xorg-driver/xf86-video-xgixp_1.7.99.4.bb b/recipes/xorg-driver/xf86-video-xgixp_1.7.99.4.bb index 994b8b6a3c..97d064a78a 100644 --- a/recipes/xorg-driver/xf86-video-xgixp_1.7.99.4.bb +++ b/recipes/xorg-driver/xf86-video-xgixp_1.7.99.4.bb @@ -4,3 +4,5 @@ PE = "1" #DESCRIPTION = "" DEPENDS += " xineramaproto xf86miscproto drm xf86driproto" +SRC_URI[archive.md5sum] = "0e7d0df07528c57304900da3acafc1a2" +SRC_URI[archive.sha256sum] = "ee0a178c89ff10d679e6f174d2a2e5cc7b89c7c7d5c115d48e9c75942f487395" -- cgit v1.2.3 From f4ab324b35a6ee6aa9e26d2de5bb0e3e5b8b9f90 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 18 Mar 2010 09:43:02 +0100 Subject: checksums.ini: remove entries for xorg-drivers (moved to recipes) Signed-off-by: Martin Jansa --- conf/checksums.ini | 1608 ---------------------------------------------------- 1 file changed, 1608 deletions(-) diff --git a/conf/checksums.ini b/conf/checksums.ini index b52ae5c4a2..ad0f9cc782 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -28682,1614 +28682,6 @@ sha256=996b9641fea06e2f0dde9cbf5fb31b5cd139376198057a88ca59820fdb94d507 md5=3ffafa7f222ea799bcd9fcd85c60ab98 sha256=e93bb322fe96ceabd0581bb70101aaa1001b0b8f894b3ae0e1fa2e4b38f41af2 -[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-acecad-1.1.0.tar.bz2] -md5=ce0b7bec500273ad935cbfa212b8ac8a -sha256=3e5feea79f1d48cd46a2a40661140042ac586f90311669f79d65fea6cfc112ad - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-acecad-1.2.1.tar.bz2] -md5=2c371317f2aae34c04db63c19759a44e -sha256=07d2f8a1153d34a6516b8f1129fc32a18f2862bbb58c9bad4637fb282d60385a - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-acecad-1.2.2.tar.bz2] -md5=2d6596b2b0cfa527b5ed4df2014684bf -sha256=953ebb7d7ed579ce648dd6f6a25307c37ad8230a0336ec6fc58247732835f26e - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-acecad-1.4.0.tar.bz2] -md5=51247dc0d73185e35bec326283bc49a5 -sha256=48341d8b6b0060228134b36543986c949ea828d6ce6d0484d29b3dde9ddbd556 - -[http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-input-acecad-X11R7.0-1.0.0.5.tar.bz2] -md5=b35b1756579ebe296801622bdf063ab1 -sha256=699ba1716f74db0aaa66aa510ebf195560ff09f88001f98bde9275d2826f30ea - -[http://xorg.freedesktop.org/releases/X11R7.1/src/driver/xf86-input-acecad-X11R7.1-1.1.0.tar.bz2] -md5=7ed47ca8feb1fbbe305f3a6732181550 -sha256=b2bcdb4ef8cb9645e476afcedeadbb9d1688f8e8f7bd010f6718a15f1673556b - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-aiptek-1.0.1.tar.bz2] -md5=951b2b1a270f67d28e2e89fd2b9f15ae -sha256=3db0e3259034d838c2ff7ae26718422db6d33d89cd1a2defa0efdddbbbfcc28a - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-aiptek-1.1.1.tar.bz2] -md5=2aa75313ea5652a8cf93581c65ee6493 -sha256=219116b0275b93333b8471fc94d97320a116d695c4249837fd97763f00a85d77 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-aiptek-1.3.0.tar.bz2] -md5=ae3ec07aff6c156cf5307f53feb6b293 -sha256=b37f35bb021dffc337c731bfbbb6ce7c0953dc69f7c660cbe48b0f84a07b5e5c - -[http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-input-aiptek-X11R7.0-1.0.0.5.tar.bz2] -md5=9ee5109ef33e281ce0784ad077f26cee -sha256=62d1dfdc2f902d016999861ec3fd58b4630341e8f4df45e65c7bee730b51fd8e - -[http://xorg.freedesktop.org/releases/X11R7.1/src/driver/xf86-input-aiptek-X11R7.1-1.0.1.tar.bz2] -md5=e4ede86a636263c02530005ba958b65b -sha256=1d0cd2377f61974dca5ed141304ec2b55814af6f9d084ce634694713cdb6da28 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-calcomp-1.1.0.tar.bz2] -md5=af13f9de2af4e1d03b2da0c037fd718a -sha256=ebc446e74eea72d391104b1ce3b2a5376bced098154ec089a944f4311d240904 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-calcomp-1.1.1.tar.bz2] -md5=689099e2ade8a8c9f68f82fdf569b3ad -sha256=8117b37da2e031eb983e1e98034710a1511299496fcf235f936caff252fa8957 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-calcomp-1.1.2.tar.bz2] -md5=ebc9a64dc72ae3015c16011bbd2d3557 -sha256=bf6edb9d78c90952a16c8bab9e69aebb3e1361e4423ec90e47df57e8c873254b - -[http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-input-calcomp-X11R7.0-1.0.0.5.tar.bz2] -md5=f4199b5df063701462d5a8c84aadd190 -sha256=f3f913f627e0871a65a4e18cc3df3b0188bfe0e73a755436921488756753f989 - -[http://xorg.freedesktop.org/releases/X11R7.1/src/driver/xf86-input-calcomp-X11R7.1-1.1.0.tar.bz2] -md5=40a557a54cc8ff58cbc4dc1abd37bb18 -sha256=89f23360b8eadd5bf602712d78d83147245b51424aa06d9b643265f840857610 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-citron-2.2.0.tar.bz2] -md5=1fe53cd055a69650f3c2e02377ec728c -sha256=26cfa755d3a383f80039fcd286c44ba5f7b353feb8c674f386bb08d741d2c3fe - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-citron-2.2.1.tar.bz2] -md5=4e254fcefb3bea55772e63c12570f6d9 -sha256=1480ba63b342c00a53292d513bd79a69e1ea7c01a0c77d1a368ffb22e37c1a83 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-citron-2.2.2.tar.bz2] -md5=8cad35da16ea4688ebb74533ccc7f190 -sha256=6d1908d1f1be1ce94fdc946f47d163c45b0a1fc4b9ffb05cc436bac865e1ecaf - -[http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-input-citron-X11R7.0-2.1.1.5.tar.bz2] -md5=62b5405d337bc055bc9345565cc0da8c -sha256=fbac5de06334b6757d91fcc2abc08e2c56c7a57dcba1abdb5c99133decf7f795 - -[http://xorg.freedesktop.org/releases/X11R7.1/src/driver/xf86-input-citron-X11R7.1-2.2.0.tar.bz2] -md5=9d33544dc2beb9643cf329f5f4ab295b -sha256=362d927749c899b18287afed4c3fff59480bc18cec63e9d104073b585fd3814a - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-digitaledge-1.1.0.tar.bz2] -md5=53461c34cc0712aacab92b820b9fcb84 -sha256=24001f19b46b5bc2fcf8212f04863e4efa90175fac797350525e14848ab98a38 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-digitaledge-1.1.1.tar.bz2] -md5=4c27e0f3c6447e76df39a837fd46a00f -sha256=ded010f82b1dbb57b1ee0ad6707902b31540e0592c94d6bbf3b43a7a35220775 - -[http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-input-digitaledge-X11R7.0-1.0.1.3.tar.bz2] -md5=8342f3a0dcdaa1120af01dd25dabf0d7 -sha256=964a13291f412a6da62d3ad98bb8afa21ad7c884eb6234f279a0d40d7f912b58 - -[http://xorg.freedesktop.org/releases/X11R7.1/src/driver/xf86-input-digitaledge-X11R7.1-1.1.0.tar.bz2] -md5=e98d51c032e9324ab961a1353f65b6b2 -sha256=a416d031dcf31c28f0b91866ddf11594d86d5e40437c3b4529f95cc8a2958254 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-dmc-1.1.0.tar.bz2] -md5=e1bcbdefcb839173de79aeb3cd038b77 -sha256=c5ca8fb2dfe0130767b2c10bd0661277a67e7d5b9171a7f5f6264ec48790473f - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-dmc-1.1.1.tar.bz2] -md5=f21f008220bc7687ce1c34ab557ec32f -sha256=f98c5a7010fa71cee88b4c2470e5cd804e42dfbc5292cf1c20eb75e9b1814002 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-dmc-1.1.2.tar.bz2] -md5=91021ea8f3593221c0d9ee9cc14deb48 -sha256=b6f4eb367ab1aa7da5ac5218953d7cdde409c9ddf59f6cb6b2e1aa2789b3f361 - -[http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-input-dmc-X11R7.0-1.0.0.5.tar.bz2] -md5=fdf127a2d419f7c2e02bec27273091d3 -sha256=6e03c373f3aa25b7305e927d76dd9fd233d83a3ec08bf517e8cbdd2b00d32be5 - -[http://xorg.freedesktop.org/releases/X11R7.1/src/driver/xf86-input-dmc-X11R7.1-1.1.0.tar.bz2] -md5=d26f4abbb4c14a64cb5d19676edc1a58 -sha256=8287cb7ca9af7996850eef6f32b4577f5747049ca635b6b5851fc56ff0b04bf3 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-dynapro-1.1.0.tar.bz2] -md5=1683178d09dfc604dde9ea2aab950a28 -sha256=fc2ad50b1aa027fe57da53cbb73db0b4b9d0de9032f00dd42e7cc0aae7c50d6a - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-dynapro-1.1.1.tar.bz2] -md5=d47be12a230c44a05d56d6b79ebcfc38 -sha256=ed0f1ba81febf8e7a20cfaf32b021fcaa102af37f3070d67d6a101eeb6964992 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-dynapro-1.1.2.tar.bz2] -md5=ceb5efbd3d62e24ab3a5f9f180777f7c -sha256=55b7b2e950331292ec05c81d566af6d1000ac3cf904068964c3b9d43cea4deec - -[http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-input-dynapro-X11R7.0-1.0.0.5.tar.bz2] -md5=89dbb839ab4c5fca3dbc3c2805a7efb9 -sha256=28a2707b4633b99fa9b5fc5106d5eff9445344e50bd6a05a41094178a508e11b - -[http://xorg.freedesktop.org/releases/X11R7.1/src/driver/xf86-input-dynapro-X11R7.1-1.1.0.tar.bz2] -md5=5121ef14108585c902753ae6e4b813f7 -sha256=fe0f5a9dac8a7fa2e2758bbc5a50190d99b39c5510422ce99efd95d96e13889f - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-elo2300-1.1.0.tar.bz2] -md5=43885769d6f741272dda162e82902b0d -sha256=9551f67e24c4573867a64d032d1ff6b63654caab8a85d3c6b2af7748daaa2134 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-elo2300-1.1.1.tar.bz2] -md5=4eef20f44954d49571a10b9134fdb663 -sha256=cc2cd97f49cce1795ea74034b1416ff7cd5107e1a69258b09a741d55a98ba005 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-elo2300-1.1.2.tar.bz2] -md5=611d0a77a80286bc926dd3c414e59555 -sha256=ce575f79a5a93f4129a4e63572911d54cdc6640abc303afeb3c74741bb3c9627 - -[http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-input-elo2300-X11R7.0-1.0.0.5.tar.bz2] -md5=6009a17f13a37bfde8b60c2fba5b0e5b -sha256=6a4dec968d92c7a73dc801367c2743062b3a09b37bb8ed7ba720f435f1f53703 - -[http://xorg.freedesktop.org/releases/X11R7.1/src/driver/xf86-input-elo2300-X11R7.1-1.1.0.tar.bz2] -md5=7eeb9f2018aef32299c37ad2b3744b8d -sha256=46d3d459821a321cf82252bd4130134b5ecab0984cc0ec5ce0f0f8b3b6e41908 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-elographics-1.1.0.tar.bz2] -md5=ecb2bf1f800d4f5f4c295f2a0e6b1de7 -sha256=1583e1dae6e3ecd34ba55deae7dfc052efede0378f852de6224308d7e7d5b2d8 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-elographics-1.2.2.tar.bz2] -md5=50a9c32af12ca4733afe23042f012f9c -sha256=76ded0e6977f7d562a8236bc810423cd050320531be9621d868a48309ebc4d63 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-elographics-1.2.3.tar.bz2] -md5=cc2923460c8eff9652b01889a063058d -sha256=67550c8f4a85a8029f08880adf487e2efd4585e7adbe8da357fbd49750b08d8f - -[http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-input-elographics-X11R7.0-1.0.0.5.tar.bz2] -md5=24c33f833bb2db72a07c3d28bfc0aae9 -sha256=f1b7f84175d33f4d18c83cd0d37bd3962acd668922fa074a8ae29e18517cdda7 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-elographics-X11R7.0-1.0.0.5.tar.bz2] -md5=24c33f833bb2db72a07c3d28bfc0aae9 -sha256=f1b7f84175d33f4d18c83cd0d37bd3962acd668922fa074a8ae29e18517cdda7 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-evdev-1.1.5.tar.bz2] -md5=01705ea9a4d1699d5eeb17e7f297a581 -sha256=52b7daab86dade2d189f0378ddf196c018cdc9dd47ade0b3b8fc7591cb4bbe9e - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-evdev-1.2.0.tar.bz2] -md5=0c7c41d3f1637bb559e80c2ad708f05d -sha256=b23b231d754cab717a4b145ee3a5f3e73db46d877d23502326e9794d92d976ba - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-evdev-1.99.4.tar.bz2] -md5=f56d98ab11ef77cfcbafb5d93c697791 -sha256=71e896168819bcf50044c175482d03873c31bc6eb355305a87e94772580789dd - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-evdev-2.0.4.tar.bz2] -md5=ac97e155ea4db87a8393297493f9c406 -sha256=825adcadaf4c90d4cb1d0bd21dcf67bf3b895f12f8e7bf186ed936445dc015ca - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-evdev-2.1.0.tar.bz2] -md5=a6070ead29b2d81b5b386a96df2661b8 -sha256=45c4b6df8d1dbc4db8aa580be4f3c693ebba4eba4908d82489948827d3bed0e5 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-evdev-2.2.2.tar.bz2] -md5=23341f098e7fe8ec13ef06ef784ac51a -sha256=63606119e86c27b47bd7ec4b2b6048b76515df6755fc5dd8bcfc98f5fe53d994 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-evdev-2.2.5.tar.bz2] -md5=e926692d74ee81ed459d0fe89439ff8b -sha256=433fd29043cd427ba486bcce471aae3ad1abca94c8682feff92da0c380b8dff3 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-evdev-2.2.6.tar.bz2] -md5=bc4b2356e1dbf2d21e1e95249b18f5f8 -sha256=dbf3799e207175e91f50492d51343e5cfdc706f637f6e9f14257b764e86bb3f9 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-evdev-2.3.0.tar.bz2] -md5=21dac6461379d67ee3b333c77f63e7bf -sha256=6d57420cce9201a14f2fb5c5f6bc8999ffdcc9520020d54290eb22db27c366c8 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-evdev-2.3.1.tar.bz2] -md5=e56ce4424b89b2409c6e73e007a85da7 -sha256=462f2ae2fd389a87e09fa764a236cd04dcbf85bcfcd8000aa9a3810055511d8f - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-evdev-2.3.2.tar.bz2] -md5=b2bfe368022eedf2671ee28daba31efc -sha256=029bf469bd013bcc3e384c1297a05a59e4b9b3ba90a26c022b32c0819d115e28 - -[http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-input-evdev-X11R7.0-1.0.0.5.tar.bz2] -md5=d982c6f185f4c75a4b65703ceed7be06 -sha256=ba53e8ce6bfa01da7fa86a31853542a71722b41b511041bdb58cf66c10f3edb4 - -[http://xorg.freedesktop.org/releases/X11R7.1/src/driver/xf86-input-evdev-X11R7.1-1.1.2.tar.bz2] -md5=6eba3b46ff77b99c44f93d2a08cc6935 -sha256=e1e2b2ffe37e1c70829eef55f700cf3cffd49b3b3e0e2d3bb47c2cdd5db5adf6 - -[http://www.conan.de/touchscreen/xf86-input-evtouch-0.8.8.tar.bz2] -md5=4d8e092356d8353002f60a4907046c13 -sha256=eafc4a09729a4b2b6120430c71e1954c5cac299ad6adf2f9a40aee8a7b51e476 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-fpit-1.1.0.tar.bz2] -md5=a31066a2076d18619ceaea67f6d89698 -sha256=8ee3b2df90516182460fbda025153aa7fb2c6ba343e4239d225963a287f694f8 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-fpit-1.2.0.tar.bz2] -md5=0f3e013d5ff58e0aba3d9e1d18830291 -sha256=87e3dd97d57ddb520cafa5e68fa7846cfc3d9d71cb054cdf0e1d650c7b1cff7e - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-fpit-1.3.0.tar.bz2] -md5=e5bfda480f25121e3c4222e5e1eb5880 -sha256=d1ced3b8c6d799c3af1c93e72dc571cb30d38083e1221b8ea0b2d4fc48a7eef8 - -[http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-input-fpit-X11R7.0-1.0.0.5.tar.bz2] -md5=fc0e11fefc322623914a2d819d5b6d51 -sha256=8f131c2b26b1e0e16e9dfacc73d457bb16cf6e455a1dbdc382f4a3e3b219c703 - -[http://xorg.freedesktop.org/releases/X11R7.1/src/driver/xf86-input-fpit-X11R7.1-1.1.0.tar.bz2] -md5=223ef71e07b18e140ef227feef965ef2 -sha256=a11dbb0bdb6bfc65fc2a8b096edd4797816767aabe49349517a51497e373ac0b - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-hyperpen-1.1.0.tar.bz2] -md5=1dfccb75069e61e0c6f990b47eb58c40 -sha256=d1c20a3340e06c5634759832dcf2edc6acb41476a4f637eba6880730e607f493 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-hyperpen-1.2.0.tar.bz2] -md5=175c1e1ad668ebbbe212c1e975dd14f9 -sha256=689d1c5c1f21eed00ae03a01c57482f7bbef36d7e07156556c99febe28c7d413 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-hyperpen-1.3.0.tar.bz2] -md5=c50d0da3206d18d9d94f720e3688eca5 -sha256=e7a13a7597fa32f05d595d05a66cf94c529ba8ce1d03249bb9da5be9512c4b7b - -[http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-input-hyperpen-X11R7.0-1.0.0.5.tar.bz2] -md5=0c4f2a6390e3045e4c48a48b47b6332c -sha256=708011ed8fdb6d321e7ca91787ff06c7bcb011cc4a3b5d6c0c02562222da7ef4 - -[http://xorg.freedesktop.org/releases/X11R7.1/src/driver/xf86-input-hyperpen-X11R7.1-1.1.0.tar.bz2] -md5=8f1d96c97e48c794a61d2e81dcc1d06a -sha256=798bc6be1385c2c39483553a9f20b022247d364a8acf7e31b3ee2c61e31183e3 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-jamstudio-1.1.0.tar.bz2] -md5=a32e36a24545791a3408cdc5563b6523 -sha256=ce41b360bd08ea31036b79cfc25a32c854147522e4580f5ca1a203233e657e1a - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-jamstudio-1.2.0.tar.bz2] -md5=8011f90d7dd801d26e8c3dd058633978 -sha256=c5bbade96f1849b45f665a54e08ac8f9d5a94d31a8a680edc4d3c9361d164ac0 - -[http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-input-jamstudio-X11R7.0-1.0.0.5.tar.bz2] -md5=49de35ca024be2cb785832ae37ec30d0 -sha256=ed5c17b702a43192710b7476f3a8540d04bc800554fd05e348be4f510f651dfa - -[http://xorg.freedesktop.org/releases/X11R7.1/src/driver/xf86-input-jamstudio-X11R7.1-1.1.0.tar.bz2] -md5=ca01cca63fa57600c1cf6b307bb9aa8c -sha256=cacc590ac4e57f3374e18b9898c6fa8992f31db6e1cf985391fe42c33a29fe15 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-joystick-1.1.0.tar.bz2] -md5=e0025215542c7a11c5a7f9548631dbd7 -sha256=11c3e8056e8f44b9a6f348b5366c7e725155563374770b82e339e913b9a60d16 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-joystick-1.3.1.tar.bz2] -md5=ff25ea697cfa1570cc28f4b9cf9c761f -sha256=1d33b9668e039ea9adc0680c1f2971785508cfd74b2215749db23af23ef8f9ce - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-joystick-1.3.2.tar.bz2] -md5=e48b99e55093525ebb7811a014391a0b -sha256=6cad238e0a54dec75c5224f9c0774b4fce2a03b06f1c61b404e9ea97d4941d4b - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-joystick-1.4.99.2.tar.bz2] -md5=29cce86738411c9f8de04375090bbbec -sha256=7224e93a8560362d454a104e8bb481213dcb559b41516c7b883c0881e25252bb - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-joystick-1.5.0.tar.bz2] -md5=79b20f86d1b2e625ae65e35c3457027f -sha256=718118c5d769529f604c1ff099fe637173442cf01fc40bdef7d45f4baea282a9 - -[http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-input-joystick-X11R7.0-1.0.0.5.tar.bz2] -md5=9e3ba60836f4c1d2e4cebc63a28321b4 -sha256=9b69192a4368bafeaf94432ec50025dd3f60340290ef2500f6032159870ed489 - -[http://xorg.freedesktop.org/releases/X11R7.1/src/driver/xf86-input-joystick-X11R7.1-1.1.0.tar.bz2] -md5=6c702a255a1753bb10a3f219a3ac227a -sha256=240abf3bc4068f9823dbe6e8ff9c63e5aee1442fd85c80122f2ee44c00fe101e - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-keyboard-1.1.1.tar.bz2] -md5=babf094e37bdfc08076d4adb4c69c1d9 -sha256=b7e7377d75f3a10cceb5df18019b8e4498fbed0100478edd4af75bf8cd45d6fd - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-keyboard-1.2.0.tar.bz2] -md5=06e14029e00b32ed085769775b398efd -sha256=8c45fc324ea01377f9932250824ee1769bdf1eab6e4b661c22a39deb0b01580a - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-keyboard-1.2.2.tar.bz2] -md5=ab3122921f6359c54e250879288ffd47 -sha256=c25b35524eaf00928d97bd0d8bf9e489d92993b133461b5f4d8d9655d37ec072 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-keyboard-1.3.1.tar.bz2] -md5=ebe5dcf8eed819103909f18321fc3b9d -sha256=7b514715dfb5a2512dea3355bc3f09eb879d7184440c5525f0a9d29ec9f3be42 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-keyboard-1.3.2.tar.bz2] -md5=d6fe929c4f6085d6dd67f197ae9c42f6 -sha256=33939ec65dbf56f49e1e7de854a1cf95446e40c533950431901567e67112aef2 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-keyboard-1.4.0.tar.bz2] -md5=fd17158ffeacecc8cc670604460cb98b -sha256=842d36cfca68ddab4f2c562c73bfd43ba76de2d490d60034f0c5dd524aa6d6a5 - -[http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-input-keyboard-X11R7.0-1.0.1.3.tar.bz2] -md5=8fb8a30fd9d7f152a1aef4eb8ef32b3f -sha256=e82d510157d13be37eed604cfb0d9355c054c4d3ac39bdef0c6ef320f2973d77 - -[http://xorg.freedesktop.org/releases/X11R7.1/src/driver/xf86-input-keyboard-X11R7.1-1.1.0.tar.bz2] -md5=d81490c79db78b0c182f0b2a37e02756 -sha256=33b2190541a96b601d22ce6f275b95b0869bad89af8629cf2d8035951f78c47e - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-magellan-1.1.0.tar.bz2] -md5=0d6a81aa864ac790d9a8b517ca7016ad -sha256=8eef54b50c428513a330ed7183ce37f269050252a4d1199d3b00ad6bf0a7833d - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-magellan-1.1.1.tar.bz2] -md5=8a966d3b74dc2a801ff09b895037090c -sha256=06da7d1b222ba47ba0c7fd561965d78f2c8e46f44c998cb768e98bdc3c0e1741 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-magellan-1.2.0.tar.bz2] -md5=9801ba10f15f8be2420dfb3f3b5d5d27 -sha256=c5285147a4df0b5b0fd5dcb7c0e5953bc982d3d6f2a2ed2e7767ead909a510e4 - -[http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-input-magellan-X11R7.0-1.0.0.5.tar.bz2] -md5=fd7367f467dc3302604274cee59a7c7b -sha256=e13fb01c5b86b9409d1e4024c06b55a18d5c2eba98370e73870caa19f8ef973b - -[http://xorg.freedesktop.org/releases/X11R7.1/src/driver/xf86-input-magellan-X11R7.1-1.1.0.tar.bz2] -md5=9e4bde8bbc56e99f43164bbe79343360 -sha256=80734e0406f6cd8263c22dd6c34b4cc387d75d27a1cee02c13fb7626df05ba53 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-magictouch-1.0.0.5.tar.bz2] -md5=d23f2791cd634ef85b7cc5e9da8f8407 -sha256=9cedc831e9d86889f473fbe3b8f1478afe5ed8c0dd71492aeb896cc681d7444c - -[http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-input-magictouch-X11R7.0-1.0.0.5.tar.bz2] -md5=a51d84792b8c0079d7c8d13eb17acf31 -sha256=1e384f8cf5f516c3b460b8e1a94ef98dba9681a3ca0a2f2fb3687a9df12d00d5 - -[http://xorg.freedesktop.org/releases/X11R7.1/src/driver/xf86-input-magictouch-X11R7.1-1.0.0.5.tar.bz2] -md5=b3ed11fd57bf99ca515d72a16875cf68 -sha256=ac0ff1cfa93d9512d0a2a5b47430f6ecbcb34bce2c3e76542e883e4731ea1f2b - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-microtouch-1.1.0.tar.bz2] -md5=7b3cc0330d70e7e4e07914fcb325b331 -sha256=7f92f5531495ecfbfd00744198fd4b2aa3b8f5c188b115e55e865e961bca2039 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-microtouch-1.1.1.tar.bz2] -md5=9843fbea6cc0c4129e96ce9a6c893cf6 -sha256=5f2f0b16705c6226081a452f9f876508c388b384fca69106d377cd134cfddfd3 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-microtouch-1.2.0.tar.bz2] -md5=1ad1aee7d8df84b9ea832d1e75963257 -sha256=b3034e0a768c4f646ea954d59dd414d00df3238e845848081221af6efe864f3b - -[http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-input-microtouch-X11R7.0-1.0.0.5.tar.bz2] -md5=0c25e0340b6483fb2a600b0e885724a2 -sha256=f113b6649719261da21137d4b18168862d37efc1a79db2dcd1e078f6dc9d8a3b - -[http://xorg.freedesktop.org/releases/X11R7.1/src/driver/xf86-input-microtouch-X11R7.1-1.1.0.tar.bz2] -md5=cc96f2553c3c94dc963c07bc45a8ebb9 -sha256=2776fe554835a2be94e69cc40af7b4d4f7048d9a36a844ebaf1a792ba0868dea - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-mouse-1.1.2.tar.bz2] -md5=d8bcd9fb1b4efb02acd251495f9a30c1 -sha256=7d4c2ecbe8f9327f7c8093c05401ab68b22f3343bcf04e4838cc40c21b7f8e0a - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-mouse-1.2.1.tar.bz2] -md5=72b07e65bbea6ab484d84c048f6835fb -sha256=82671998e2b02ad097e3d5cc7d964e11de0b3ca3dfec4876e8fa2a13af6aacc3 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-mouse-1.2.2.tar.bz2] -md5=c47c598e55e7080b8ea30f70781f7ca3 -sha256=80e9cb52b2036b71289b2140bcd3ac202cf46fd42830761c53120ddac38e7edf - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-mouse-1.2.3.tar.bz2] -md5=47da1fa52584933d045528109f094eff -sha256=a07cb2169f43018c90b7889781c0db30cda0da03811edccb8c4db533166357ab - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-mouse-1.3.0.tar.bz2] -md5=31a51b0e5ddc4fac19754f48a3adf881 -sha256=054b253f366795c2865714ce8bc545c79e59aa9ce1b7a9a4a05b9c674dff9dec - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-mouse-1.4.0.tar.bz2] -md5=e7dc0759c14a9bfd373917a49e5f7c7d -sha256=e6e1dbd64d41c826619a5881c5aeed46095bfdcb87c3e27d65292fc12a5bb7c7 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-mouse-1.5.0.tar.bz2] -md5=c58629fddf0782dad5c02da6aeb35521 -sha256=f303e20872ab2fb20e07a7f734d17723346d2b4b8687ea2086f7a7468d1ab397 - -[http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-input-mouse-X11R7.0-1.0.3.1.tar.bz2] -md5=12a908e5a97b1b03e8717abf167f4f27 -sha256=183c1cda6550c8821ef4b8d13e681a32813bcd32b6cf34a75d3870e399fa292d - -[http://xorg.freedesktop.org/releases/X11R7.1/src/driver/xf86-input-mouse-X11R7.1-1.1.0.tar.bz2] -md5=e427b9a1dfbed3d4c9de2bf01008fa60 -sha256=ffc07ecf8bdb4cc30d399f06ea950d8016f254614930e3d3fe476ab88748f3b3 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-mutouch-1.1.0.tar.bz2] -md5=98ae915c67cabf0e6d40a425dbdbe10b -sha256=cc67e0dd4f4fcc8d798f0bfe42b975132c5739bdd80809580a74182e4d1b62ea - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-mutouch-1.2.0.tar.bz2] -md5=50711d390d2867e3fa7e06b59b2d575b -sha256=214f0831f36ebfc081b9f31f91ae27972ced9371b9b2256650998596a097061d - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-mutouch-1.2.1.tar.bz2] -md5=f28998cdfae2a4c41589299a4ee1f459 -sha256=53bfe976042de69f87e28261ad581cf418c67b5cb69a09cfe1eea169021db35b - -[http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-input-mutouch-X11R7.0-1.0.0.5.tar.bz2] -md5=4758e667bfbba517df2a58d51270cfe2 -sha256=f46f328c9d8ef4dd6fe118121831ff4cd34ea9f06b198f548af4c703a1aab771 - -[http://xorg.freedesktop.org/releases/X11R7.1/src/driver/xf86-input-mutouch-X11R7.1-1.1.0.tar.bz2] -md5=1f15391dc1b24cd400ccb9c370f568d0 -sha256=751b2ea30696af593320b2cad3f0131b252851020fd3277ca5e1907a0ca29e4d - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-palmax-1.1.0.tar.bz2] -md5=0959dbf7972dfb95f56e4bd3f56447cf -sha256=5c00c85eed2950a575362bee2f21c2fa68eb8af81e7f1d451273a1302eac4145 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-palmax-1.2.0.tar.bz2] -md5=9655d2235569c5a6ac321c6fb89a6f3b -sha256=02177c339ba60fb6cc942d3bc93a322e94247f36a6fe90c7c1121694c929b05b - -[http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-input-palmax-X11R7.0-1.0.0.5.tar.bz2] -md5=d138024a20298304af883631d23c5338 -sha256=0756cb4d78cd896811f06675b986bdaa8d48ef2b3c53bf68001634fe1f7806c9 - -[http://xorg.freedesktop.org/releases/X11R7.1/src/driver/xf86-input-palmax-X11R7.1-1.1.0.tar.bz2] -md5=7a1404b2ca2d84856d1e43efef69ccfe -sha256=311ea26819f0ba66eede1fcc88026f6563b42807d0d4a239ea14574ccca26e26 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-penmount-1.2.0.tar.bz2] -md5=0589f2eaa84afb9bd49b226ce7dacdda -sha256=dea18a07cf8f59e7bc981cfa1f6ef476dd14f7d9bee3bb1a55a6cc49f766150e - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-penmount-1.2.1.tar.bz2] -md5=268af4dceda544d8c815b9b7e87d4536 -sha256=fab08de727da6f56b82d8ecee451a52e7129ff80522e711c5322f1bd2fa9970a - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-penmount-1.3.0.tar.bz2] -md5=24594c0222e631fedccc7c540c420b03 -sha256=9cb4e0e83dcefe1ece814d638bd186785b6bc1debe1aa2101ce2a4ea0376805a - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-penmount-1.4.0.tar.bz2] -md5=d5f1395b2dcefc7533ff5580e63f2066 -sha256=8cb15e9a30f3602d22eba6c7bcca2c1040889ed0851c7b575273671c2da1bff1 - -[http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-input-penmount-X11R7.0-1.0.0.5.tar.bz2] -md5=065b1cf862864741aebcfefcc7c09539 -sha256=314492cea0998182623f2a67461d64df00b910acd052c3a50f9349ead740151a - -[http://xorg.freedesktop.org/releases/X11R7.1/src/driver/xf86-input-penmount-X11R7.1-1.1.0.tar.bz2] -md5=6093b35d21ce93029b2b28d8b69a1444 -sha256=101bee132f27fe7f53d8242955aa195a174aede066921445bc1ceb3ef1a35f07 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-spaceorb-1.1.0.tar.bz2] -md5=294810ca9e93c4096458c6a0f2fb5679 -sha256=9cd53cb719bf401ff3f72233d3a88c59539b94eaf11e586e307c807a325f0815 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-spaceorb-1.1.1.tar.bz2] -md5=c7fb96281874733480ba86a5a0a3b5af -sha256=be8f052e7132d39094f42a08c0b7171a9e280e9fa1b162a62343d1dc0d2449cf - -[http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-input-spaceorb-X11R7.0-1.0.0.5.tar.bz2] -md5=193ca7b1e87c3995b86f15a01b63b297 -sha256=e5fa2e430b39ddfe443b6c433d975f02025b5fa90f31fa249942d8bf01452bc4 - -[http://xorg.freedesktop.org/releases/X11R7.1/src/driver/xf86-input-spaceorb-X11R7.1-1.1.0.tar.bz2] -md5=62c381b6c56d41a75858c16dccd06394 -sha256=06a4dff5bd575e65ef4984f5f6415e4ef11d2301b028bd3383d45117c125c737 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-summa-1.1.0.tar.bz2] -md5=b37a432fd87bb9f46d011622d6fce6b3 -sha256=f10f2cadd4120b40b3658000c87f910e3005f4d787441c7dd83b48ebbf2a11f2 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-summa-1.2.0.tar.bz2] -md5=7e17468c0d90dcbbb6202a8242efff4b -sha256=3e8bcd89b4b3f86677f338a4584f41acb2a3cca7fe492cbea32664aa6f4f8cd8 - -[http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-input-summa-X11R7.0-1.0.0.5.tar.bz2] -md5=61d780857e5dc139081718c075e74a01 -sha256=6456ddecc0e1b962b5f14b98b81d2e936cb48dcdacdd871dfa0e24c0d252498c - -[http://xorg.freedesktop.org/releases/X11R7.1/src/driver/xf86-input-summa-X11R7.1-1.1.0.tar.bz2] -md5=56765c5ee99f67802bca8a1134ad7fc1 -sha256=57460dfa0429c58d598f192aa65661300dd104953073d977ad4f4b15a596eda8 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-synaptics-0.15.0.tar.bz2] -md5=939f1c831c5cd3a6f027e982592dfc5b -sha256=e7d481c375a11df55eb8f12390c329c2bfda3258c689cec11cfec27cb5895c8b - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-synaptics-1.2.0.tar.bz2] -md5=2cf0a2b0b3006bcfcd85bb77d966244a -sha256=ddd5ad4c25ad2f2e46134272bf047522882deba8ac3ac04d5e11f8bd9718620c - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-synaptics-1.2.1.tar.bz2] -md5=29a6f9da5123149e4abc8ff83880ed5c -sha256=a63b48c5c8eb09416b941dea591a948e111d1b2e14d4620f25377cf47cf877e6 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-tek4957-1.1.0.tar.bz2] -md5=be8a4bd474ad6c85b93f66dd6fcfa6ee -sha256=09b9506d1bb1deaaf69872392bc56e1d75997bb8157e85a9121749bf5fe15727 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-tek4957-1.2.0.tar.bz2] -md5=8103db1ca5c55726e0b58148e4b1fc06 -sha256=b097a5b1acbd732d9ca5d28c13003a1f1c8a3465f4fa77c1578d36330f3358a2 - -[http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-input-tek4957-X11R7.0-1.0.0.5.tar.bz2] -md5=df633403c91a48c6a316c6a5f48e53e2 -sha256=1cc4a964e2b407d2b9ebbac0bf38787e572d9bd88759fc0b229f588ac90ed139 - -[http://xorg.freedesktop.org/releases/X11R7.1/src/driver/xf86-input-tek4957-X11R7.1-1.1.0.tar.bz2] -md5=4b6b9d67d2a7056a417d26115612ecc7 -sha256=064f75c31ac167e61b9b29c2cef86908ecf1e1a742019298b37799664d08d19d - -[http://www.pengutronix.de/software/xf86-input-tslib/download/xf86-input-tslib-0.0.5.tar.bz2] -md5=4231b517d216e9f80ba66f13a0f30afd -sha256=d70c64f3f4fe931e12d5af7f91ff04cd0d16dd7459061c50b3149f9e35de8091 - -[http://www.pengutronix.de/software/xf86-input-tslib/download/xf86-input-tslib-0.0.6.tar.bz2] -md5=b7a4d2f11637ee3fcf432e044b1d017f -sha256=5f46fdef095a6e44a69e0f0b57c7d665224b26d990d006611236d8332e85b105 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-ur98-1.1.0.tar.bz2] -md5=3cf8928411458baaa9e726e51772c550 -sha256=214bceb0fd52a932d448ce03d66539eed2e6660617e3d42977704cb7eec6472a - -[http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-input-ur98-X11R7.0-1.0.0.5.tar.bz2] -md5=9b1530b3dcbb77690ad0e61f60489899 -sha256=2cbcca2d5c62de8376bbc9e1fea6f4564ece32f6f6b5e926b199c2e60a3dae7d - -[http://xorg.freedesktop.org/releases/X11R7.1/src/driver/xf86-input-ur98-X11R7.1-1.1.0.tar.bz2] -md5=7e8288f4f75bcba1e3aaf6ef68664b38 -sha256=f06dea24204c6f3f42c29d1a89f51da801082094e393a716d592d638fa9ddb66 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-vmmouse-12.4.0.tar.bz2] -md5=313e403e56702f6c38d1a5c830b60dc2 -sha256=383e0973aad0e96812fc019cb579abaf016f97427fc07466b150fe15739ba63c - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-vmmouse-12.4.3.tar.bz2] -md5=44730af795616ed4d4a0cd9a3a07935d -sha256=d668c4cacd4be6d56608fbdf7779d60120f38f3315e6385a7cc87339124e77ab - -[http://xorg.freedesktop.org/releases/X11R7.1/src/driver/xf86-input-vmmouse-X11R7.1-12.4.0.tar.bz2] -md5=f253663de03e0fbb377ce085947412b1 -sha256=973a51a442d0c97eb3f76af3b148194de8a4187e74f4a68033b0480c6408db42 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-void-1.1.0.tar.bz2] -md5=ea72a92d43b95f413347df96d6a73933 -sha256=b43c5d920821bd06b6a1a131dd071ab838bf024c3cb092c6d1f10d57b648b0e4 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-void-1.1.1.tar.bz2] -md5=862c230f5f6e0c545f232b4c0fa9537a -sha256=dde062d6267a3fd9d51b0daee88fd84fceea52a6019de51dece46e92012dbc4f - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-void-1.3.0.tar.bz2] -md5=53bdac9ca56418f4675810ed8a78b3e8 -sha256=e2165ddf637703e21b3c45d83d56485c39b082b9440053d3885557c4d52b130f - -[http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-input-void-X11R7.0-1.0.0.5.tar.bz2] -md5=c7ae53dee1f3e95fa5ce9659b34d8446 -sha256=ca90a522b78114d72748164c7a99274634cd2b50953f9c52f91b31746c790b5e - -[http://xorg.freedesktop.org/releases/X11R7.1/src/driver/xf86-input-void-X11R7.1-1.1.0.tar.bz2] -md5=3683affae738de5ef130b6720bdfd6dd -sha256=4612a45a90fb1aec8cabd36abeaf04f202ecc45d2074427bfa9f368f95514e43 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-apm-1.1.1.tar.bz2] -md5=ac7e05f0dfc7e02cac0bf17b9eb89b11 -sha256=09d7e6cf30b94f141f8ebe2560b301a058f645e74108edc28c908e750865dcec - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-apm-1.2.0.tar.bz2] -md5=4f78650d79656dc803a720049d65682e -sha256=f0fe020f892e6e3a696a490c86312a1b32672bffb7dead153c24f103540a6185 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-apm-1.2.2.tar.bz2] -md5=48441a19aaf015570b267f2a8e67d8ab -sha256=678edd063e1d5e7c7f72ccdda2388c5857559847b3d313c94d659f9bd51c1752 - -[http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-apm-X11R7.0-1.0.1.5.tar.bz2] -md5=323911ab16a6147d3cabceff9336a3d2 -sha256=ceaf4a611b8ee8bc31bc784f1012b0d6be6380e8823f6bf03a9a1ee737264a78 - -[http://xorg.freedesktop.org/releases/X11R7.1/src/driver/xf86-video-apm-X11R7.1-1.1.1.tar.bz2] -md5=a5320411ba92e637ffb233e9cbb80d13 -sha256=1e43d482e570328abcb8a1e03c62f8c3e3fcaf3eb09dc885503a1add158be0a2 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-ark-0.6.0.tar.bz2] -md5=6921479baca8f7b156029489fd335854 -sha256=e5abc4f4ae643ce56d5773f052515196f05786235e4afd155a3232e20dbc84d7 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-ark-0.7.0.tar.bz2] -md5=6826c556ebe9a1248cbc7f7edd44f956 -sha256=8e65e73045fabe37c15f6d4895baa09346bdac2f7537607b523aacd7bcf57594 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-ark-0.7.2.tar.bz2] -md5=4745f5c722b030962cc56eb2443894a0 -sha256=db1ef3e15ebd382837f16c1143035dfd9fa6465a77ae2e850201f71508065741 - -[http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-ark-X11R7.0-0.5.0.5.tar.bz2] -md5=342937e275dbc92f437417a3186a8222 -sha256=47aa2ecf4129e72e049796571e3125ff3bc8dae7fe31e27d361470d4a3b8d548 - -[http://xorg.freedesktop.org/releases/X11R7.1/src/driver/xf86-video-ark-X11R7.1-0.6.0.tar.bz2] -md5=a5bed67815b9e650182806da301b488c -sha256=06c2462dfa65c32e31a972292531bf686c56c3f9cf21baf814ab0eda5cf26653 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-ast-0.81.0.tar.bz2] -md5=04bc08907da13612dbc4918fe54e63e3 -sha256=b95553aaf89bef28051c82914cee2b91102dbc2370d0d855404ba453902459b8 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-ast-0.85.0.tar.bz2] -md5=b415bf3259ad0acdaf62e3dde76e3289 -sha256=9018ff84e4866d895c037aad33fb31c79d5f47d3f54707600cc3fe6076485b28 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-ast-0.89.9.tar.bz2] -md5=619f6ff15db869be3800bb001d5b0468 -sha256=880f16d32a373a052515f4ae28a3f1a97543d0d73d2ea5d74baf23bdc3a6b401 - -[http://xorg.freedesktop.org/releases/X11R7.1/src/driver/xf86-video-ast-X11R7.1-0.81.0.tar.bz2] -md5=ac1595de8397efd740038994b1e9ef67 -sha256=f0020c88ca3f86b4826c556888b476f081b80010ba78239f95e5349835ad8811 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-ati-6.12.4.tar.bz2] -md5=e662348f6f957fcedf52818d668ab9f5 -sha256=cfde066a7087a19b624f79e95cb9a6c97a847b8802cf38d4ae6022758bf338f6 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-ati-6.6.193.tar.bz2] -md5=102b781f543213852401f3422b18ccc7 -sha256=9b0899694000cb91d5643e2482376af24bd495cb01b4c9dcdd6ee3545b0aefae - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-ati-6.6.3.tar.bz2] -md5=f6d559f9d20f61567d381916b376590f -sha256=d08a429e1fb1620ae81839181a4dc6cd579d52fc440d44d7bba36d19be355780 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-ati-6.7.196.tar.bz2] -md5=06db625391c75c8be86c4dd5a5d713e6 -sha256=8923a08232255ceacf770ef767d86bbfb195dffa9559baa1b1de90f9c947a6d9 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-ati-6.7.197.tar.bz2] -md5=7bd53945ce6d0b48b7fd558039e82aa2 -sha256=b6c67996cfdbbf9b3a191b9092f5d515dd7fae564544626792dd5ef404e29134 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-ati-6.8.0.tar.bz2] -md5=3c97c7925ebf4162eeb3463e23adc0e3 -sha256=3863851e3c85d25cc38941eec63e866656806821b028519ae32ab8b276664fba - -[http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-ati-X11R7.0-6.5.7.3.tar.bz2] -md5=92525195a7a36f5ffbffcb4e6a564e50 -sha256=094da5eae789e50d1ebc4d7823d4c8ac701e3bbe387c0ff63285e2ab32aad1f8 - -[http://xorg.freedesktop.org/releases/X11R7.1/src/driver/xf86-video-ati-X11R7.1-6.6.0.tar.bz2] -md5=c490366e7a663b4d05acb45713be45ee -sha256=4f471f90fcedd164c5e550afbe2dd3f7247b38c19e3d44b0b8941bbcdf0f1a10 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-chips-1.1.1.tar.bz2] -md5=3182d43439ca4cbf08ff9aa76990bba3 -sha256=16a81cdb6b311176936c3326d279c0d75530adbcf9a3489eea55992ac5bc7494 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-chips-1.2.0.tar.bz2] -md5=0fec6bee65383790485d917247a61629 -sha256=05f38c49b23be36afa68b738faf520b8dbf05b92c769107039426651801d4f99 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-chips-1.2.2.tar.bz2] -md5=a3969c28c3b36ab2caa852a9324e9b70 -sha256=ff6fef2cffc62feb3b23f3fee375e502ab7356d571517a89b4de67f0f6037f0e - -[http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-chips-X11R7.0-1.0.1.3.tar.bz2] -md5=90f23505faceac30d3f46ab94f7293e1 -sha256=2df2e34dc61907fb3c41b4590f51d39f951d2d74422d84f1f7d53ef6f5b25352 - -[http://xorg.freedesktop.org/releases/X11R7.1/src/driver/xf86-video-chips-X11R7.1-1.1.1.tar.bz2] -md5=cae9b1b131c1fc1b45ad1a9604fdeb66 -sha256=e851ff555f177ebe6b4d8f961e088a1e2f5947ba739e5b891eb5b3ff4cdd652b - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-cirrus-1.1.0.tar.bz2] -md5=66344e315def275605dafb314ce59851 -sha256=5988962199d5013274f6a6952939e4f405df658bb6616ebf9954c993b1179b1b - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-cirrus-1.2.1.tar.bz2] -md5=bc28fdedaee9059180e2534f9dbcd2f6 -sha256=e7c99ed66326df5fadf6e5d875859a430fec4369415a27cde72a91109f78bb9c - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-cirrus-1.3.2.tar.bz2] -md5=8195d03ed0be0975c03441e66a9f53b3 -sha256=529a98a42c94ba5e1b9269e6f7b32a9e76cfd2d4728df08aeba615df8b28ca1a - -[http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-cirrus-X11R7.0-1.0.0.5.tar.bz2] -md5=7708693ad9d73cd76d4caef7c644a46f -sha256=29e6fdd67e8ec51c534f6123f9935a165711255d935fb9cb28cd44f9db278b3e - -[http://xorg.freedesktop.org/releases/X11R7.1/src/driver/xf86-video-cirrus-X11R7.1-1.1.0.tar.bz2] -md5=0af3af1dc5686e1f487815b231b3dc0a -sha256=f1a07fb7b78604b2731d9e859d50d59f16ad839da3cb75b19a99fd0500006c0c - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-cyrix-1.1.0.tar.bz2] -md5=02ed7d5215610a3463a0307b30bb5425 -sha256=d6a66778e0f6ddd907cba5784386bd6bb526f773b5db9faa35875ba67c2ca6ad - -[http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-cyrix-X11R7.0-1.0.0.5.tar.bz2] -md5=14f868d16554b19fef4f30398a7b9cf1 -sha256=6eb51d5d4489083c8a1eeabc1fbd22baeafe6486a7940516d1e2b741564acd06 - -[http://xorg.freedesktop.org/releases/X11R7.1/src/driver/xf86-video-cyrix-X11R7.1-1.1.0.tar.bz2] -md5=adb1e6346efd8dfe5dcccd47d46869cb -sha256=25ba42dedc297ca2a7257fdb4e050e8d61cdd6710c8adabdb3925908b09f9d02 - -[http://projects.unbit.it/downloads/xf86-video-displaylink-0.1.tar.gz] -md5=4faccf8ec4e5830ad87285317162c041 -sha256=6a1bb0297a24ad8da0466088d23cf10340f2a729f2a985712f4620a9a2dde675 - -[http://projects.unbit.it/downloads/xf86-video-displaylink_and_udlfb.tar.gz] -md5=9a10f8884e711cb0239a60aec721a594 -sha256=aa8c9dc0a156f25adcaec1a8749665996036251bc31d7a2501dbf895211f0951 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-dummy-0.2.0.tar.bz2] -md5=22b7cc20a33443cbd218bd2521850cfe -sha256=46013885696f3c1a5e05c5d503abc69e691443319a97cf2c6a01ec031e06c910 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-dummy-0.3.0.tar.bz2] -md5=3d96297556846bee02a74166ffb5d052 -sha256=5a4bbde0b7f0334bb63b159e5ef6e164be3699e3424734c2bd9823f20a30a278 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-dummy-0.3.2.tar.bz2] -md5=2a6f1f07462fbe336865068cd69c8593 -sha256=9389cbc21b0b5f90920fdfaad4466f4ec07674bb1ddbbf63cbb8759ace5c45fa - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-dummy-0.3.3.tar.bz2] -md5=3ffe3a28f4452e66bf56180e7da9cbc5 -sha256=df3f55de7953dba6d7ce10cc5f355da1a6164f781ad9393a38dae502dba4955d - -[http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-dummy-X11R7.0-0.1.0.5.tar.bz2] -md5=462654f9be7e3022f97147e3390db97a -sha256=f50f6d3d7fd79c5ce40ea6039a2fb82f136b13c18afbc2b7e941d41d6568b698 - -[http://xorg.freedesktop.org/releases/X11R7.1/src/driver/xf86-video-dummy-X11R7.1-0.2.0.tar.bz2] -md5=d53836ac3d6f99920dc168fc22a09413 -sha256=73e08278ecfbcbf08e8fa0e55d347d2945aa4a5a7108cfc8b87fcf7cff6b9c00 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-fbdev-0.3.1.tar.bz2] -md5=9ae810c6c6c3c9713a67866fe794d4ff -sha256=309d1f618c77559ea494c05d45b09577790c44900685e17bc812e4e1b19df6e7 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-fbdev-0.4.0.tar.bz2] -md5=6572b39fec77b8e6de1c858a93992924 -sha256=bba725daeb2a313b83f2b92855a9ae8aa72c4cc8581f9f62f101ebdf00ac359d - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-fbdev-0.4.1.tar.bz2] -md5=79ce1eb9f9d2ed56de70d8e06cb767d9 -sha256=2bf857179523433a9cc6c6eea059298db4c865e649aa58dfc67c828f28b7288f - -[http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-fbdev-X11R7.0-0.1.0.5.tar.bz2] -md5=1cf374eeb9151ac16a7ec2cd38048737 -sha256=c6032ec1753a0f5975b5a7488ca3ca0d46f84bc5dd8fcb42eebd807c7faec765 - -[http://xorg.freedesktop.org/releases/X11R7.1/src/driver/xf86-video-fbdev-X11R7.1-0.3.0.tar.bz2] -md5=c209e54fa8dcd3cd3342e84d261b02db -sha256=d03eb7e5b47e2f1e1a665700f4e22d15651dc949196b0ec880f0d63cafb6814c - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-geode-2.11.0.tar.bz2] -md5=1dbede8f6393edfe6c1ecab2f754b3b2 -sha256=d70c198cde981c3a53b1c41b717dea4bbf1d397d82957f584c641bb5fd02c82d - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-geode-2.11.2.tar.bz2] -md5=4c652ecba772f705296b8e52d746857c -sha256=2d252847a410636b55bf80900d9432ca438775f70377ce81311282a2d12853b5 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-geode-2.11.4.1.tar.bz2] -md5=05f85d897ef41d13de354ac0252bf923 -sha256=d739f6762fe3aa7ef7ca74f87fbe4d6ec3bb13a735e5dfb82b6748eda2b31138 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-geode-2.8.0.tar.bz2] -md5=a2b9c70a32b0a6436d837d67fa7aae18 -sha256=f0b68171dd4256c927fbee91ecf84fa28c409b5b6b39cbf47eaa48fd73db305f - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-glide-1.0.1.tar.bz2] -md5=a825152b086564c1011bac9e48413189 -sha256=2b636894ecd8fc3472e05e548f0390ea802f5d9db7906ac302ec8cbd1e5f64b3 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-glint-1.1.1.tar.bz2] -md5=2cf49f701024a145bd25aff9da11d479 -sha256=d63e0dd3f5cecebaf1915193a68ac83e90c1e973e3276a71bd14651d67115e6d - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-glint-1.2.0.tar.bz2] -md5=1f5271ac01d4475efe73ab6f2c3646f4 -sha256=a0edd1109c03efdb0f6defc18745f89fb3c11142381e2657f94d492ddd1e7419 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-glint-1.2.1.tar.bz2] -md5=6d7afdac0a26cf201c3f3b417c31c5e1 -sha256=161780d2127d0548a2017ca461ce38e7a69afce5d921a08604e91478c6be1cda - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-glint-1.2.4.tar.bz2] -md5=960df34e129faa411e58c0d6b56d79a3 -sha256=5f8d6e3b02c261d235bae63d95510b940b6c9a775301146b3c229926ed99d76f - -[http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-glint-X11R7.0-1.0.1.3.tar.bz2] -md5=f14c2f1696c05760207adcaac856e5e5 -sha256=d5b4cb7b490edc3be57c40a00299002b60b8060396b3c902b2bf92090fcbd940 - -[http://xorg.freedesktop.org/releases/X11R7.1/src/driver/xf86-video-glint-X11R7.1-1.1.1.tar.bz2] -md5=99073dcfdfa24df68879c7b01324e91a -sha256=21b70d71593f123c470dae2b4e75bac7478fffa50503c85b02e8f2c1945417d2 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-i128-1.1.0.5.tar.bz2] -md5=6e0d3e09fc99d6f0a0e969613ddf58cc -sha256=a99d2b04b829faa7542545380317c8f59f54ecbd5e0a7008580f3155742d0381 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-i128-1.1.0.6.tar.bz2] -md5=c483efc90b1935025b17e4b9e9c2e4df -sha256=b52183f5a7d0adee1d21b4b0a0908886b7bbc69dc4498f1e7a3edc4b1988c41c - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-i128-1.2.1.tar.bz2] -md5=d0080732eaa15059b0a953aa3522185a -sha256=0d023cacf8134241cd8efcd5744eb156399406c92f59d3895392f2b5fd055eb1 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-i128-1.3.0.tar.bz2] -md5=aff4922d2f02bad7e0d8649358edbcee -sha256=62eadebd3417ffb3857f10f16597c59541ceb135ddbc30b2140f46d9eb7dddd7 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-i128-1.3.1.tar.bz2] -md5=3b170a6df5114420cd4021a057918a09 -sha256=49bb23625654ebcd74d0d23f534b074188f4b21c3cd443b06ac83b9485bf9a75 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-i128-1.3.3.tar.bz2] -md5=a597e8efeec6ab8bc6ba6d87fceb2dba -sha256=4d0691ce8e3b54075d05cc34717350be42915174b3930b2c9b7f5e309b32b02e - -[http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-i128-X11R7.0-1.1.0.5.tar.bz2] -md5=078eed8c3673488ee618dfc7a3ef101b -sha256=543d7b8bc0c9e7889c686a647f98641f0a9b052e58321a8a17518d680e6db95a - -[http://xorg.freedesktop.org/releases/X11R7.1/src/driver/xf86-video-i128-X11R7.1-1.1.0.5.tar.bz2] -md5=9252e33d14c8869d995bf67e445ffb4e -sha256=4973e6bd62eb307131e179ba313cfa6e79d15184eef5324bba985e2f781bb3d4 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-i740-1.1.0.tar.bz2] -md5=57302e225060a7286ae1a970c87a589b -sha256=b8f2144c987d8a14f8b477ee3aa43fc1c76d040a77e40938c3c97c8e34e2b7c5 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-i740-1.2.0.tar.bz2] -md5=d0e5a805c546b29b1dd3b55a68d16dc4 -sha256=59c8f6ee465bef033c1c20bfff8121a318efda9656d5dc29f674bb655f18486f - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-i740-1.3.2.tar.bz2] -md5=4ac1318788f62159965f15131c869e7a -sha256=48549c6a3d8c0a0d417fc486e77f3f7c6815df7e8ede04bb4c539666be2bf943 - -[http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-i740-X11R7.0-1.0.0.5.tar.bz2] -md5=625448b13ebe2a13b7defad1efec05c4 -sha256=b0f2f2dd17bd01018fa91d042214b596f9d2303a81a0b86de102400b00f87d09 - -[http://xorg.freedesktop.org/releases/X11R7.1/src/driver/xf86-video-i740-X11R7.1-1.1.0.tar.bz2] -md5=d20c7155266f67c588ecb5c4ada446d2 -sha256=51c5c1503c884459d8d4f699aa095d163c2de8c8c4d434f4309916efda4c89f6 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-i810-1.6.5.tar.bz2] -md5=fc1e0da3430551bf25a7babf7ccfd3bf -sha256=30d0cd555d8b8b5bb53d93eaae1ad2aecb5c94a760e2346d60b6e194c254e40f - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-i810-1.7.4.tar.bz2] -md5=744a6ee1ebfe1c74e3b170b8d7ef8395 -sha256=ff8cd89c9ba39ce68dd6ac4dcb222280835d007a20b419819749298e8ec74259 - -[http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-i810-X11R7.0-1.4.1.3.tar.bz2] -md5=fe6bec726fc1657b537508bbe8c2005b -sha256=1d9227ba301152738c6b498ec512ddfa67ce7c09e40b883fdbf43cd31e85b523 - -[http://xorg.freedesktop.org/releases/X11R7.1/src/driver/xf86-video-i810-X11R7.1-1.6.0.tar.bz2] -md5=fe6cc3eab247c7f0a1d152de0ee0fc80 -sha256=debd142a815e5e2611433f1af97d467e50361ad5b3baa0b54fb4b61b0280ef83 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-impact-0.2.0.tar.bz2] -md5=07c9557f6529a88845b01924313e5763 -sha256=1528a123b41bf42506eb8e37c3506086395f062cca71f64cbc67929ff1010022 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-imstt-1.1.0.tar.bz2] -md5=94853ca217238ed1f568a10cbeebe057 -sha256=9238c2257f9437dd7ab37c049d7f20c010e2f5ff833a37d2d6243f223f10fb7d - -[http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-imstt-X11R7.0-1.0.0.5.tar.bz2] -md5=cc949688918b78f830d78a9613e6896b -sha256=738463dbf1980b9d0f95936a2d951dc51bd776c7949215c2456580948660669e - -[http://xorg.freedesktop.org/releases/X11R7.1/src/driver/xf86-video-imstt-X11R7.1-1.1.0.tar.bz2] -md5=4d76953e97ee760efb7627e7ac721dbf -sha256=ea2b875a8bb8ab9d987192dbcb4fb595e511b382d06260baf23a936f7e61fa14 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-intel-2.10.0.tar.bz2] -md5=78309d4f04dd8ae6585d120377042741 -sha256=e46dd691dc93db7cd6f5f22b84fea7e9f4bfd34f28026cfd680993b3ccfc48ab - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-intel-2.2.1.tar.bz2] -md5=3334dc5142871b78fc609fd1b3dac3f2 -sha256=d976c5f5e9c84f3817aba6ad22855446f1c2b9bfa0d53bd11c37c62cfdefa60a - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-intel-2.4.2.tar.bz2] -md5=5cd6b3ed57c7e78ab51e9d9266e73fb6 -sha256=5afdc91e93ffed09ea5258c6fde210c729ea2b44d83f98acfd92c3da7e99e64b - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-intel-2.6.3.tar.bz2] -md5=440c014bbd3072b5d379fe1bdb861918 -sha256=b35a142aeba034ad06b8d9b477c243f82ce9f82ad65a0ee4408630f228e90258 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-intel-2.9.1.tar.bz2] -md5=8951d0366c16991badb7f9050556f4f3 -sha256=95347c88854c2b41c07ab3bcdfadd1b8d27fb181a20520f185892877eb8d9d76 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-mach64-6.8.0.tar.bz2] -md5=6081b8fa50c689d51f85c2fbaf93867e -sha256=fba616f88d351759e00a90965e38a0d82608698ae36fc2a18df4036cd384e1a1 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-mach64-6.8.2.tar.bz2] -md5=6c0522b2b72a0a47c48d718443616651 -sha256=b91194033023a41793a525a631789df1d229b228af0d44dcbe20b06ed66c671d - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-mga-1.4.1.tar.bz2] -md5=ba373233a7d13084d14046a17b02e248 -sha256=5becb5f0caf0f99296db28b32be46eb95d0a88ac8e4829c47cb637fb52d06564 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-mga-1.4.11.tar.bz2] -md5=9d1ca965cedb0856296b47442f3c739d -sha256=c91922316f486f74d41ddbda92ff94a7917cea151ad802cf25603ab6b90f97e6 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-mga-1.4.9.tar.bz2] -md5=11066b84b949cd04300ec819c9c51532 -sha256=d57dd2323052f064092167a232fb7576f46e5d62e98bc9cc6a7f270cc8d0fdc0 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-mga-1.9.100.tar.bz2] -md5=3e80cfb84b62866d2f94774ecbf3e46c -sha256=e8efee8d5269eb29f9bd499db3d47a6a4d3c320d4b0a24874cdf7b598ad77a5c - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-mga-1.9.99.tar.bz2] -md5=29785ff1de2b0f7b7f1c48350449447c -sha256=82a91e523d40625c9e042ee640276756d1169cca7eb305c691a3378805c4c81c - -[http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-mga-X11R7.0-1.2.1.3.tar.bz2] -md5=cb0409782020b5cc7edc273624ffdd17 -sha256=8f4ef9e7a82aa1f4624b2d87da8ff0472e3f5c2ccdc7998f4418c6906cadc915 - -[http://xorg.freedesktop.org/releases/X11R7.1/src/driver/xf86-video-mga-X11R7.1-1.4.1.tar.bz2] -md5=b42cab6a2742bf90a205a991c281f4e2 -sha256=d7e9fe8b79229cb76a2749eb9658dfa96ea580420de05170e5a7b402062a9592 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-neomagic-1.1.1.tar.bz2] -md5=7a3d3d6e60b9686d955c45d9ebbd5c1b -sha256=d6497080967b8285b663fedd7cafd4457578282ebd7da0b216b6fa214dd88a86 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-neomagic-1.2.1.tar.bz2] -md5=a72f57fca4f4dff9a2c82eb1fe7456f4 -sha256=96e38d5378596174f76c735c4723ff2ac336f9069644502a9b706586b845e0a5 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-neomagic-1.2.4.tar.bz2] -md5=2d722ee9b9fe8da49109f280689c9c25 -sha256=434da2986d007243f4590a86d16a1632a9611b71de44d6e46f28bd3cdb898353 - -[http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-neomagic-X11R7.0-1.0.0.5.tar.bz2] -md5=ffe9015678a41e97bdbd2825066bb47b -sha256=cfaa594be277cd2a1bf9d796bb398e07319e9b34cff306b408145a37925dc97f - -[http://xorg.freedesktop.org/releases/X11R7.1/src/driver/xf86-video-neomagic-X11R7.1-1.1.1.tar.bz2] -md5=7a0830940a0a8e99db1b5c1536b5d212 -sha256=2f3ba4a6775c66de2b269179a219bf1fcfee85c74db273c85784d80209e1ce81 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-newport-0.2.1.tar.bz2] -md5=2bd8e5b9ea68e0dcd80dfcaca0eff82c -sha256=66ac855452690ef896400577806dc1dd86318940f8a62ce20039037318b1ce08 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-newport-0.2.3.tar.bz2] -md5=923baa1ee0429f03ed19ec0be6a4f62b -sha256=e6caeb4f95adfd9d2046d24f5f3688092ea4e3fb63aa3d0675f6c697c8cf0270 - -[http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-newport-X11R7.0-0.1.4.1.tar.bz2] -md5=d74d9896d57c3caf224ba3472630d874 -sha256=88d4b58efd0dca626e926ce6dc531026c8a10e7126f2e6544e31a2fc00001c67 - -[http://xorg.freedesktop.org/releases/X11R7.1/src/driver/xf86-video-newport-X11R7.1-0.2.0.tar.bz2] -md5=6fa1d4b5f009999284374df1aba92b10 -sha256=7a17d709206ef881d1331c55c507f3d74f8d111060b6beae4152c92ee4b45dc5 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-nsc-2.8.2.tar.bz2] -md5=1fbdd5e9b5508b032c0102f72d1e555c -sha256=060493a9dcad81e8912381d2a8d14a3e32a34414296a089756868f3442103c8c - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-nsc-2.8.3.tar.bz2] -md5=f3ffacdc9f19e00b66bdff71b6df9b4e -sha256=e5c5a2021877b8975bee39c06096316324e04f1eac5261bc882b96353a8b1839 - -[http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-nsc-X11R7.0-2.7.6.5.tar.bz2] -md5=ab16611b3ec7d21503b16b0a31addae0 -sha256=1f88d5c79cfa34230ed8a9079e6b7df194fce219909b6f7cc232c6511000839a - -[http://xorg.freedesktop.org/releases/X11R7.1/src/driver/xf86-video-nsc-X11R7.1-2.8.1.tar.bz2] -md5=47a9691971e267073f99dbacf27f0ffc -sha256=41350b8e67713fd9dcb2662e2a481e19b7de5a9d5e6dd7a346ba6662d908209b - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-nv-1.2.2.1.tar.bz2] -md5=e4dc415b1e45db0bbdacc203ed33024a -sha256=97d47df7720d3cfcb56c4debca9218c3fc5352d34d82bc4880c8a620185f8c5e - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-nv-2.1.12.tar.bz2] -md5=42f12a36d7afc26c817e8e8f5c8b7274 -sha256=f56d2bb42f6c4369dd3c6adc30988c53a229650f910b0db1bb3bf9376054011e - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-nv-2.1.15.tar.bz2] -md5=1b22188bd9012a148206940708b52ea6 -sha256=c18ce0410437ced9c171d2d6328a8406b79b6edacf55b9526594b446ee5a3641 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-nv-2.1.16.tar.bz2] -md5=fb02d5506e35054348d1c2b2c924530d -sha256=4bf2f964b78d309769faa6a5d21c90a9907886623adf1f30ea890b4329bf578d - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-nv-2.1.3.tar.bz2] -md5=f9b38e24157c3aac6014119ac18d76da -sha256=8d9b5ea137c31919f7821e7f3ecbd133158813c1059f4a8ed0a723535d969952 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-nv-2.1.7.tar.bz2] -md5=192414222f1a98e228832ee53f8178c0 -sha256=7c9135d80b519246b2a85ff0481d6ee0fddeb578d669ff490f236f85873e8c5a - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-nv-2.1.8.tar.bz2] -md5=c3e8c98287dc98677bebfbe1ba51ab77 -sha256=825ffb97525517de9f0ff7155946c6e58c278dba11957573cc970dd3b094f94a - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-nv-2.1.9.tar.bz2] -md5=c6b7e52fa18455c22eb040b8d2575ce5 -sha256=20d92ff3ab4b9ecc150f4ed17a7012a48f56dbf3fb51b51dde769b28922976d9 - -[http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-nv-X11R7.0-1.0.1.5.tar.bz2] -md5=9a88547fe550e20edcc5a938d31e22b1 -sha256=0ce5ad1affc488f317fd297893a469ed20f451b8bd8b12bb36450ecc8c56e5d0 - -[http://xorg.freedesktop.org/releases/X11R7.1/src/driver/xf86-video-nv-X11R7.1-1.1.1.tar.bz2] -md5=b5c7144231652242ef8436ec8898138c -sha256=8fd91ce003998739677556bf13146e9a3560970ea5342bad5c44c11fc49410cb - -[http://www.openchrome.org/releases/xf86-video-openchrome-0.2.902.tar.gz] -md5=6e3ea28e0b0baf3dc1230da4e1a850ea -sha256=f645da4120b3ad5356b46269ae13ef8e2315bbb443a8c147e05c611f7fa21df7 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-openchrome-0.2.903.tar.bz2] -md5=c0820787e89958c9114d359b6a3cd464 -sha256=b7e4858d6b5c6428fae2485a2c2097cdf6073268ef812aae2ccbc3d936db7410 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-openchrome-0.2.904.tar.bz2] -md5=f2481d98ef54febf5bffbb88a2a2426d -sha256=c7bdf7c48365b1d077a4be7ccc652cf3f7a0f385fddeb2d4fe71b00b6c6b7aea - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-r128-6.8.0.tar.bz2] -md5=007bec0c6b07d9d3aeca4da18e561efb -sha256=5689ca714fee9c9272bee12883b07a0ef2c40358ffb19fa684e963027b56567b - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-r128-6.8.1.tar.bz2] -md5=2b90854a62a4d45d652062f582dc8d13 -sha256=517e21cc83850b903549d698c9daeb633e8b9ba5b187fe298409cc51975a9eca - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-radeonhd-1.2.0.tar.bz2] -md5=6a932ec17da9ce5a6d9000c1649c3a7e -sha256=87c6353dd52bbe22d3a45f28fb39de1dd44f41568aaf8a9b0d45a7ed62313e27 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-radeonhd-1.3.0.tar.bz2] -md5=7b6641aa9d836f1621b9b220ad6771b8 -sha256=5adad675e60e973f2e3522a01457d9214157fbb5005090fe48092e6e5e698ad5 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-rendition-4.1.3.tar.bz2] -md5=a8b97feccb32184820d5856fe78d34db -sha256=37e7aef72f7466485f5a3bafd0d43190cb7439de16868bfba2c59bb4c9df4408 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-rendition-4.2.0.tar.bz2] -md5=7c03de3804d4c4f6ff59f74050d24b2b -sha256=b57b62f707d87534a799170e31b33311449cfd7019a56e6b4fa85a4c7faaae15 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-rendition-4.2.3.tar.bz2] -md5=9a0a916fe1e7b5c81cd4c80a08e646cc -sha256=9d5559fd3029feee5af2493ab8f558c58c426fc89776a1109dab97e3a4764d94 - -[http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-rendition-X11R7.0-4.0.1.3.tar.bz2] -md5=f1a25db74a148dea45115e813027b932 -sha256=4ad42c65f60bc7f3f37f636eae5ae5a9049cdd4df5c546f93f201fdf16213f48 - -[http://xorg.freedesktop.org/releases/X11R7.1/src/driver/xf86-video-rendition-X11R7.1-4.1.0.tar.bz2] -md5=6db91a9a10042424830c094ca870fe65 -sha256=053a60acae48000dfd03b4518fe10c6901240a8858dbfa49e0506557075a3c79 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-s3-0.5.0.tar.bz2] -md5=d95ab6445cab477f39adfbbc81006f67 -sha256=4a1206cb1a200aad8881216547d9913d0e24928138f3b1bb912a3336b9c05c97 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-s3-0.6.0.tar.bz2] -md5=d05e7c3cb044437eda8663e174ba913c -sha256=ed07e4648b0f405fddd563783b49f971d649dd07cc8bc7737a93ff3d90f6c067 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-s3-0.6.3.tar.bz2] -md5=5eb06d88533fb327d067928faeb20860 -sha256=ed9f65aa6eb1811d8c16cddfce00c5fc5880d6d46b907a83ef77700610085144 - -[http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-s3-X11R7.0-0.3.5.5.tar.bz2] -md5=83b9e8a9b8fc1c49bda2811358e5007c -sha256=3e11f78c39eb03fe4b9e6a2b68347420297fa38cd36f42235ee4be9c87175103 - -[http://xorg.freedesktop.org/releases/X11R7.1/src/driver/xf86-video-s3-X11R7.1-0.4.1.tar.bz2] -md5=3083c03884d44468e395d26a8d990c53 -sha256=b9b9abdd80c00782ca2e1313016c3d3904dc10a1de1c94d29cd4efafeb1f52f3 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-s3virge-1.10.1.tar.bz2] -md5=4a293047e988d4ea1e9e96d3b5793f43 -sha256=9094115621ef73c957cf887332717ec727c751959b1059e3d00fbfe0114a978a - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-s3virge-1.10.4.tar.bz2] -md5=6517bbbf808c700502d51acdc44662f8 -sha256=1cd00d6e71fdbd70dafe3beb8911d22cbdc5ef7b32d2d81c454ac8a18c967fb8 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-s3virge-1.9.1.tar.bz2] -md5=a91c73285ef67ee7cd9e2da28acb6cc4 -sha256=cef5702963f49e737fb8b1472dc0241f7a5da49f844ac77f2df3e693a84bc822 - -[http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-s3virge-X11R7.0-1.8.6.5.tar.bz2] -md5=d0164c37749ab5f565db9813487e1900 -sha256=064293e33256c5baa8932b42f181ec0d2fc7c0ef5b72e655aefa72d58e2b91ff - -[http://xorg.freedesktop.org/releases/X11R7.1/src/driver/xf86-video-s3virge-X11R7.1-1.9.1.tar.bz2] -md5=a7c74570041b2dc9346bfdd6d2a1c582 -sha256=075fba99f38b900416858a39c7cd62f0f3f583ee48cb52d546b12e916fa13c32 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-savage-2.1.2.tar.bz2] -md5=6367e921a98f6a7fec9d0a9bc5ff0a47 -sha256=1a9aa442152c139e3c54bc6c323bd13edf0bfff70a81c03969bcb1159317edb2 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-savage-2.1.3.tar.bz2] -md5=9c5e541613b07de6e7b2b2df3a2e35b1 -sha256=f5f154df377cb445935d1453d6b7095d63912d5776dcb44f8d3c2f10ab1a3cc5 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-savage-2.2.1.tar.bz2] -md5=62b8aba48b54eaefeae87df502bf219c -sha256=adf95cae0fbaf72326c51c4c9e61486eef062bb1706f6ab46d942f2c36d8a37e - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-savage-2.3.1.tar.bz2] -md5=66c319f610e3699c3de0f3ef630abb32 -sha256=2b4adcdd820a6f3acba6f3c0995f5899edc8f5e33fb4c4666c4c7a78090ddaab - -[http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-savage-X11R7.0-2.0.2.3.tar.bz2] -md5=6b638dd500d10dba1822d3ea5061fc65 -sha256=e4ee3af5989cc9b0c8ff59082f64a564420dc22a2eb9fd53e41da24260a65e98 - -[http://xorg.freedesktop.org/releases/X11R7.1/src/driver/xf86-video-savage-X11R7.1-2.1.1.tar.bz2] -md5=7df6bc61424a566325e48e5eb89a21e2 -sha256=efc0b44d7146c0d0f966dd1f0bdf6098e086fec7a33f5b480f99fa17e2bc7cc4 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-siliconmotion-1.5.1.tar.bz2] -md5=ee35d7714ce44a2b5ac7ad7b7b7dd75a -sha256=54cf791695a53d4836d32f899b7d34b969edf5415f02e36956b6e72993e21cd7 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-siliconmotion-1.6.0.tar.bz2] -md5=a8419a8ed17b02b2a6dd4d30d5e94b00 -sha256=cc5301b9c6adb9a0770509b8570d38730d43e9ffce6d6886cd9a090965017e53 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-siliconmotion-1.7.3.tar.bz2] -md5=29fb322cd3adab52cc7f1ac86f9315bb -sha256=ebda468be42695c08ceaa4043da3cf5bcd5f9ab15d1482311fd6e826a8060b2b - -[http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-siliconmotion-X11R7.0-1.3.1.5.tar.bz2] -md5=957de4e2a3c687dbb2e9e18582397804 -sha256=6723b5b7e9ea5b3aebcbbaeaca59790e6a9ab6a7d5324c671454e426854aef3f - -[http://xorg.freedesktop.org/releases/X11R7.1/src/driver/xf86-video-siliconmotion-X11R7.1-1.4.1.tar.bz2] -md5=559b7eeeb598b38afeb1542db6b48a0a -sha256=eab737423bfd3ecf38ee4a8d4bed86c363bb023ece283a7d515afaa1a11a394a - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-sis-0.10.0.tar.bz2] -md5=331d432dccccca91ec7da39ff6bf1218 -sha256=bcc0dcde5d469cc2500676e0ad29dcd12b1370066289902387ead762260e4b40 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-sis-0.10.1.tar.bz2] -md5=9f57c2f5ccbd8340db32da1c74083771 -sha256=11529f094cbdcdaba505596488eda623e0f0bd3c51139359d587ea58b6527307 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-sis-0.10.2.tar.bz2] -md5=f04baa307e49e9f0e5a5c3d2e89a5576 -sha256=3aad701799e355669b9027a9baedd623fe6b7ce93da9ac22b6902fd7e38128c2 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-sis-0.9.3.tar.bz2] -md5=e35d817fa4ee7beb6cd5aa744b9c0783 -sha256=898ee8fb16fff89ba8ac5c83b9f5a2371084719db0cf034140427229191436f6 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-sis-0.9.4.tar.bz2] -md5=43f12cabf770b06170cdd1cdaafdc50f -sha256=50856446841526fc393af6bae0fbc39c20bb07e60056a676d0bc620446b593ac - -[http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-sis-X11R7.0-0.8.1.3.tar.bz2] -md5=e3bac5a208b8bacfbec236b5a5b0ef40 -sha256=c578fec74f7028ee28a46a62ab2b22fdcbd6de8cefa7a185e73c68b1d8a12e8b - -[http://xorg.freedesktop.org/releases/X11R7.1/src/driver/xf86-video-sis-X11R7.1-0.9.1.tar.bz2] -md5=f3ed22290e677381dd6236ef3bbfc7ac -sha256=6c4c821941c571b39c950acd57ed4a646a6474070a68a0caa09eb7c3b2715e03 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-sisusb-0.8.1.tar.bz2] -md5=cbd669507e4aa35e468905f09b546333 -sha256=1596b79ab3e33263bde2d456cc0376808abee80b4cde059605f176d98bdb45cb - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-sisusb-0.9.0.tar.bz2] -md5=7b1f5465f423a859f306f4f1d6306a1b -sha256=76b79c9b7d3b35b8e2e5354569bf0936c4afd39a9dcbdf66327714d75137930a - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-sisusb-0.9.1.tar.bz2] -md5=42069e70578bf3fb353cdacad186f6c0 -sha256=b3ca934ce3e31f4a162bf263cad3913edccc46906d09132118b74a2095c157d9 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-sisusb-0.9.3.tar.bz2] -md5=be59e9c2d9458cee0b5006549c14a95d -sha256=1df9a90ecc31d5fb63de7c970555f166dab24c0f633b54aaac4ee82fa7b49bb2 - -[http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-sisusb-X11R7.0-0.7.1.3.tar.bz2] -md5=781d726a0ca54b65521e383ab99043c8 -sha256=6f972b126774d3d051b2f683e82661c07a1b4787b8ce04847eae80b283c5feb3 - -[http://xorg.freedesktop.org/releases/X11R7.1/src/driver/xf86-video-sisusb-X11R7.1-0.8.1.tar.bz2] -md5=11d580e2cc795b902b6f1a326962190b -sha256=bfdde9894930ffddb93343647a377a1456a830687d3de6fba2010ffe31c7b04d - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-sunbw2-1.1.0.tar.bz2] -md5=559c95f044a31cfe7f71453e9b89c35b -sha256=d71074e941ad8f71ac476651c2ca4142a5c2243e8fecdf216bc0ffbf18338136 - -[http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-sunbw2-X11R7.0-1.0.0.5.tar.bz2] -md5=0cdda1ab939ea1190c142aa8aabfaf83 -sha256=13ab882849164dd677228523b91081fa7bda6955daae128f0b8754759e2f7278 - -[http://xorg.freedesktop.org/releases/X11R7.1/src/driver/xf86-video-sunbw2-X11R7.1-1.1.0.tar.bz2] -md5=cae0b4709a2cc489182392094fe0bba3 -sha256=aa656c99ff6ba9c1013b6060c92bbcda2c30ceff72ecc49139c65eb935844f43 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-suncg14-1.1.0.tar.bz2] -md5=9e25784e912cb2f0493b87431fd60773 -sha256=1eca2b0970e725db49f9e462a0c2e618b2616389647335b5aec9d6e495e40527 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-suncg14-1.1.1.tar.bz2] -md5=8e4bd0a6b155cb861356e7430d667aee -sha256=cb43007920394b000be98ea0eac16a1cc16b4ca7ea8532b5d803a0c7574720d8 - -[http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-suncg14-X11R7.0-1.0.0.5.tar.bz2] -md5=8f3a734d02ae716415f9c6344fa661bd -sha256=809a8d57a49c07991d350d4bff955656256afa2c99978050d2aa320d071ef52d - -[http://xorg.freedesktop.org/releases/X11R7.1/src/driver/xf86-video-suncg14-X11R7.1-1.1.0.tar.bz2] -md5=3d95d9bf985bcf13c0d040a5136334a1 -sha256=f9a1ee987c554607c6fed4ae27adbf75c825d628fe522802a717429a85327487 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-suncg3-1.1.0.tar.bz2] -md5=b9cb8cfb6a4234bebc434f744af53208 -sha256=3564ebc8ccdfea872d46559166d881e93ac7c17e3ed46bb4087960f491c37df9 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-suncg3-1.1.1.tar.bz2] -md5=bb6c4def5cfb0959b72dccb661473d4a -sha256=d56fe98c34f2af1b6424e3fcaa22a31402a4b59d63679f0e5fdfb1d2ea878419 - -[http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-suncg3-X11R7.0-1.0.0.5.tar.bz2] -md5=799a54cef1f4435e00fa94a1d97d056f -sha256=31831c2f44e7d28c928d816c2c5074cc0ec1f0cc83994bf28e46c7f840ab8866 - -[http://xorg.freedesktop.org/releases/X11R7.1/src/driver/xf86-video-suncg3-X11R7.1-1.1.0.tar.bz2] -md5=b719d82950a39e33903882c7b878415e -sha256=9be5402d4f8f32154c01065f7b01a99e61c2deff959715eb8656259c63195adb - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-suncg6-1.1.0.tar.bz2] -md5=aa6b7836fe6ccc99994bf15ff2b74e86 -sha256=d6b1f3b79c57ef5281e0204b2847812cf9fa5df616478f01591445a36537194b - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-suncg6-1.1.1.tar.bz2] -md5=bc9904a9129aaf73408568ae1e2fa65f -sha256=d1216c7c2be78d1dafad0cd46e464e9fa08f5e04544b76d9a0c547374c85801f - -[http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-suncg6-X11R7.0-1.0.0.5.tar.bz2] -md5=2227f3fb86b02148f347e002662e53c8 -sha256=f6ddac6bc0b0a446ff9401467e4219340151498824d98c9274ed38a959330aea - -[http://xorg.freedesktop.org/releases/X11R7.1/src/driver/xf86-video-suncg6-X11R7.1-1.1.0.tar.bz2] -md5=de3773fe837b633cd7841546358a90b0 -sha256=5b5e22e501b0cf03704fe4737abc49c6c2a2f08a1af28067634f4b69c838e621 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-sunffb-1.1.0.tar.bz2] -md5=dee23564c0d8069f52c7cd29c78be667 -sha256=f897a427e83cf6965fd82724e3298aea44eb3131ba62f904cb514dfd0a879029 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-sunffb-1.2.0.tar.bz2] -md5=816842de26bce8a935f3c9c3cfedbc42 -sha256=59f2f8fc2399a4d6b0ce733481c58694e723a989f4712c00436d35e27c059292 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-sunffb-1.2.1.tar.bz2] -md5=1bb374fe5ab3ed780d353b2b12ba6255 -sha256=fd377af6e366e8e3a77c8ff825a009138c8343c0007bbf070ad605a649577e11 - -[http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-sunffb-X11R7.0-1.0.1.3.tar.bz2] -md5=bb5182e3b74b3baa6fee245ac8bbf09a -sha256=318bd61c8da6e938d5c707a0c70ba3ada1c053ff3172a918f821a1a015b7b6ce - -[http://xorg.freedesktop.org/releases/X11R7.1/src/driver/xf86-video-sunffb-X11R7.1-1.1.0.tar.bz2] -md5=5bcb5b90c679a046d604d4f98d804d0d -sha256=38406fc4e7aa1367587517b4a872fe88dd0be9751aa057b84dc62a7238ccffcc - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-sunleo-1.1.0.tar.bz2] -md5=0408d95795d754c92d12d6476b6932a1 -sha256=b504d50f261bea9bc9dcd2a9c9c3307b24dee97c18d13b5a6deb3eb393270da9 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-sunleo-1.2.0.tar.bz2] -md5=14fe008620940a674981912fa02ae133 -sha256=b315be97197020ae352efe48e9bcd13a572c3a03b2a4d598e89157a897746e06 - -[http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-sunleo-X11R7.0-1.0.0.5.tar.bz2] -md5=deb17a74ba68ee9593ac774206bd3612 -sha256=025e3636fb59dae9285dab63de9181fc8337d1d8438b7ee8f93095d6731deb0f - -[http://xorg.freedesktop.org/releases/X11R7.1/src/driver/xf86-video-sunleo-X11R7.1-1.1.0.tar.bz2] -md5=821ddc77ada3cd3efb0a2a7bc70bf825 -sha256=6c7339466d5b3cfc3c6ea3ca4ec4bad2f16666f1c472efc4f3048c1f711c67d4 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-suntcx-1.1.0.tar.bz2] -md5=779a31151e44d2fd2a5ee1794f836889 -sha256=72986a3981b746f60df1aba443d610db437fe8d5053e64630686f471c47b01cf - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-suntcx-1.1.1.tar.bz2] -md5=b064a8d2f3d481ec36ef9ac17e13a77d -sha256=543115c4b3a8603dcc9d7a3030c9e7ce20baf6e3976d92ff951cfea80b54981e - -[http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-suntcx-X11R7.0-1.0.0.5.tar.bz2] -md5=74d6ba5e55afdfebff84db08b6589e26 -sha256=38eb95f2991fab51c3442022bcef258de508ebfa0c631024edbdf55a1c4f24fd - -[http://xorg.freedesktop.org/releases/X11R7.1/src/driver/xf86-video-suntcx-X11R7.1-1.1.0.tar.bz2] -md5=fff6932624c93d8e208422913521bb4a -sha256=275a6082d3d11614dbc737bab505b9dd72bcbfae44af6ccbe115db66bb2ad2f1 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-tdfx-1.3.0.tar.bz2] -md5=04c49acb5c5dbde14eabd32d06df6e73 -sha256=6b1a00df5c9628817d08f07c6f18f578950744f3eb63b4397be8b0754e728624 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-tdfx-1.4.0.tar.bz2] -md5=b13132f24683ef759bfb0c1db5096496 -sha256=c3be06d324f2e49ece1f243b10d7180a32fbe65dbbb81e162279c8608800dead - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-tdfx-1.4.3.tar.bz2] -md5=8161bbf2b100c21b609163f0010766b3 -sha256=3ad935ca0aa306d10d1e6125a6bd485a3948c184dcfda01670961dc4740ebf33 - -[http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-tdfx-X11R7.0-1.1.1.3.tar.bz2] -md5=0201415230bf0454384c3bad099520d2 -sha256=65e95c95bc4fa5fdb766b7edf8f39253cf8496fca66bc4bc06f260ab9e9ce504 - -[http://xorg.freedesktop.org/releases/X11R7.1/src/driver/xf86-video-tdfx-X11R7.1-1.2.1.tar.bz2] -md5=21500d264bccecde3122835bc39c7793 -sha256=018d27561286d39ea4fea5967f2433c6748da51472bd63db0c74bc32f18417e1 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-tga-1.1.0.tar.bz2] -md5=9eda4d4490706b2dd8f4ecdbaf779856 -sha256=50143dfdd259fd114dc2f41518a4898d5407bf55422251df75812b96a1fa6e9b - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-tga-1.2.0.tar.bz2] -md5=f3bddf0a64932ca9bd72041ccd3b5501 -sha256=a92f8cad0e21318be465719a9f30a50d5719b0b70bf8e15f3937e7850cf1aea6 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-tga-1.2.1.tar.bz2] -md5=bcbceda78395de74544c83b46a7700cd -sha256=70a4754ef6602cf48d910b9727d015cb3cae946c096ef260b56dfe2f80cdb855 - -[http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-tga-X11R7.0-1.0.0.5.tar.bz2] -md5=fa67bf34454888d38e15708395cfed87 -sha256=96b071b4e12dcfd027402621b897c6d73818aada4d66f77a8802cc46b9efe206 - -[http://xorg.freedesktop.org/releases/X11R7.1/src/driver/xf86-video-tga-X11R7.1-1.1.0.tar.bz2] -md5=0a9356394373e42b96e9500b51f6c45c -sha256=250ed70d94070f6f8b14540b6509e6ea25f38616b0e0c443f232cc4028765db7 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-trident-1.2.3.tar.bz2] -md5=c0e8b2f54942b6902b7dd4f30defe800 -sha256=d23eb8fa165d238ddf64da63dcd60c70a01cd761608a18402cfb95aed6722495 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-trident-1.2.4.tar.bz2] -md5=7f628f7eb4abdc4c49bb252eefc4335a -sha256=f942596e7427a089be9c9353c45c22002999580197c9715d9363d19ee170ba8d - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-trident-1.3.0.tar.bz2] -md5=e89799579d0cf3858362bd751469e0bf -sha256=a4f66c9f46f6e93c2c1f10e782a211ddc338b0ff9f0a2ccd2d660db031d3ddb5 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-trident-1.3.3.tar.bz2] -md5=47f3c5da1942017218355f178f02ef84 -sha256=6241eab6f3f0a075380be6b614e33ad72256242c865115bc8b696f83a75d11f5 - -[http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-trident-X11R7.0-1.0.1.2.tar.bz2] -md5=69f28afc7b585d01bb06b1e2f872f8ea -sha256=b7958afb0204bb1d3c8a33e7a56b94a6d4f09426dbcd141ef327e28f523d42eb - -[http://xorg.freedesktop.org/releases/X11R7.1/src/driver/xf86-video-trident-X11R7.1-1.2.1.tar.bz2] -md5=d08a761111bbfef8d60131d0dc46d784 -sha256=69eda434078afe442c228195593108b860f9d297f7bd29c19c57eedeb59304ad - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-tseng-1.1.1.tar.bz2] -md5=488aa9c3ec7a95e6589afa4b50bec8b4 -sha256=c9c1f3318715b7268068bc733d00bcab93924e97eb38f94548e442fd6cdfd56e - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-tseng-1.2.0.tar.bz2] -md5=f98fc22142a009dc3a6cdf930c95203f -sha256=1090d9100934329000ac330d0c66a0ac4f60d2ba83196ea15c2833a28a18b1e3 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-tseng-1.2.3.tar.bz2] -md5=79f63999c88477801ae54dc486272ad6 -sha256=0556bb3e79da4be87e880f82e2b8504527e760e284680f9463a08f9572507187 - -[http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-tseng-X11R7.0-1.0.0.5.tar.bz2] -md5=981f46914c1e54742418f0444ea2e092 -sha256=5e67a6893375585be731b0fd822e9c3407a0930f7addbc8cf01fffad57f9d0b6 - -[http://xorg.freedesktop.org/releases/X11R7.1/src/driver/xf86-video-tseng-X11R7.1-1.1.0.tar.bz2] -md5=62d58d822fdd32e67658bb86ab4e4390 -sha256=cd41d3b58a6ce65ebe4313735a2111880b27b910e5c2e09ea91720ad230f9006 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-v4l-0.1.1.tar.bz2] -md5=69339c38eba2cebc357d67e7a755d734 -sha256=33ad549ea3f6a8da7f58d9964f3f2d83aabc6d64c2ebc2ea0033ac8dacaec870 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-v4l-0.2.0.tar.bz2] -md5=2251ae2a0a905764941cd7b098e85ad1 -sha256=cbff9120fbad900cbdc7ac535d04984e7b491d69a8eb0b371e30ae07cb61925d - -[http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-v4l-X11R7.0-0.0.1.5.tar.bz2] -md5=e422c63bc83717ecd0686aef2036802b -sha256=54094ee8388e4d067e111f64bf765b677536bc11c71d39c05c83ab6ea336e0f8 - -[http://xorg.freedesktop.org/releases/X11R7.1/src/driver/xf86-video-v4l-X11R7.1-0.1.1.tar.bz2] -md5=fac76ca4a56380f0765d884e1b20a487 -sha256=97b5ada6716fd6a2821224fd952fc064cbe721c7446547136794587a2e393114 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-vermilion-1.0.1.tar.bz2] -md5=0f7c6be1bbdc5eb43d82b356fe0f5104 -sha256=4feb4cd8d239a1b5a944c82b253d106b7f7da083fc4d87a8aeeb822c2e980d8b - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-vesa-1.3.0.tar.bz2] -md5=4a307852f3b4850e436a41dab2a73676 -sha256=b96c80ae81f5123ecef344dac4c734b2e281143d3ab7a7e633d6bf04c893e203 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-vesa-2.0.0.tar.bz2] -md5=433cf6f961eb4a2ab6fcb086def0b2b4 -sha256=f20b2e429657552eea207fb8bc4b47c8e293d99c229dcb4da11b7c5bfdc1e165 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-vesa-2.2.0.tar.bz2] -md5=9a86b683f73f3806f55d05cd804a6f4a -sha256=8b3e077d2534722033d7b1c647aa7f31fc7fbb5014da096b7a53170005e80226 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-vesa-2.2.1.tar.bz2] -md5=61a1dc9a22991bd04d0ff98f800775c1 -sha256=a3657971232e9c7db3e7517a8aedd86d3ef4d159f7099ec974cdd03aafa41080 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-vesa-2.3.0.tar.bz2] -md5=07fa32958aff9b463dd3af5481ef6626 -sha256=8ed85a0e94523539d81d5ae6639fa22ceb1c1e3baf89128915db65d4d2900d7a - -[http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-vesa-X11R7.0-1.0.1.3.tar.bz2] -md5=049ada4df1abb5aa2b6633ba90353e78 -sha256=c6601cd278ebc30a0d20b49b6284bc21b4910f8ef5d24d1c62daa1591a251452 - -[http://xorg.freedesktop.org/releases/X11R7.1/src/driver/xf86-video-vesa-X11R7.1-1.2.0.tar.bz2] -md5=16a20d6bf7ba858d511e96daaf43700c -sha256=54241149f54d8355c54035a6ddf2af8a51ede1a4b72a404ff43b1bba54e465fb - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-vga-4.1.0.tar.bz2] -md5=b93e5fe9757db779a75cd3ce97b9613d -sha256=ca25f4c0f706688cbc2dcd03ffaf6a57a17290290257f0cc1b1f1bb261f95b41 - -[http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-vga-X11R7.0-4.0.0.5.tar.bz2] -md5=24437857707acc337cab331cc56f64e2 -sha256=325a11679316f3ccd83e4c0712e45301285bda62ff716df232446211fb19cb34 - -[http://xorg.freedesktop.org/releases/X11R7.1/src/driver/xf86-video-vga-X11R7.1-4.1.0.tar.bz2] -md5=b08b488f1b98d9152f5416091bc85055 -sha256=f0885fc3f865005c06c11e383aa6924ecdff3bf5f306b2b63e2366201d6974e7 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-via-0.2.2.tar.bz2] -md5=d5fe25d3cfa0a64cc77681f15f9c3159 -sha256=5026bdaf644178fee66a26190453b0dddb99558b8c97c4a592a482a2434dc862 - -[http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-via-X11R7.0-0.1.33.2.tar.bz2] -md5=4d3268d226a40f580ab105796bfed1f5 -sha256=75b73af76c2b0499180d670da94e3fde8e4c8796b2e17ec7bcb8473074cb4987 - -[http://xorg.freedesktop.org/releases/X11R7.1/src/driver/xf86-video-via-X11R7.1-0.2.1.tar.bz2] -md5=f3ee13a05c62dd5298bd773dd0e5e951 -sha256=6444f1b61a53b9ea89551d95d32bcf98d4d018d0d3ff9c34626c5c24d1b60507 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-vmware-10.14.1.tar.bz2] -md5=eaf1ce9fa23363799140602afaa10f37 -sha256=1971fd356ba54204c3611edb9144c43c25c21167a5fa5ee725d3f2e3f9864fa9 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-vmware-10.15.2.tar.bz2] -md5=99322cbcc9081ad44e9cba63e3df8f7e -sha256=edae155c82d348b76dabe1373605bf6715b577cdd7a95f8b54ad534dc47c71ff - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-vmware-10.16.1.tar.bz2] -md5=a5e1f2539b82206e411c3647f10c425f -sha256=91ed99ae936be5df25d310d81e31e0a7efefc023e462d93a9289ac18ebdf4e89 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-vmware-10.16.5.tar.bz2] -md5=6d78c82ea7c2bb0fcb587d7bb4e8f60a -sha256=3e4e9abfd806b36076083ef6cacc93b713bfa4ddefe7005edfc15c64f5174366 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-vmware-10.16.8.tar.bz2] -md5=25287a202c986b33bd79fbe379c96a16 -sha256=956443948d94f7459b0056d8cb8ff2cd9fba4621d8b61f0257cb84469ea7da07 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-vmware-10.16.9.tar.bz2] -md5=3b3d38abfa1f8be4b1e26dcd236bc94f -sha256=835a5e45b54837cbbd963a48bd09db709717e097e931dd76e68e397a167e8bc1 - -[http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-vmware-X11R7.0-10.11.1.3.tar.bz2] -md5=4df79349e26add4c23f6be8bec347ad4 -sha256=79b0bf59d866d3760fa8a55b4a19d56ae7fa6a962d629a9de5c188cec5c98c9a - -[http://xorg.freedesktop.org/releases/X11R7.1/src/driver/xf86-video-vmware-X11R7.1-10.13.0.tar.bz2] -md5=ee3c0f3130a68c6833084db5deb441ca -sha256=a260f9456db466fef3036aff01570f3a12fd275e35bf4c8c4c0ea0f63bf91281 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-voodoo-1.1.1.tar.bz2] -md5=bc878e795688b49a595b355482d27174 -sha256=3975601baee674b2bad0dfe696586f17cc913f1dc7f1d5c4e184623e0461751c - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-voodoo-1.2.0.tar.bz2] -md5=7c681d9b57f5e1f798263fc1a9d99245 -sha256=b79ba6d5d4300570c00f8be37c536f47f2d78c18845f70f525da2a29e47c4b8c - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-voodoo-1.2.3.tar.bz2] -md5=c164effcc839eca1fc1d43a42f4086db -sha256=025d4d99ab19325b72417fadbb099c757412988f800c9511be3e2c3993ae29e9 - -[http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-voodoo-X11R7.0-1.0.0.5.tar.bz2] -md5=e00cc814ebdb3f3067e075bc93b26199 -sha256=2241fd7e5ae8de43f109f712f5125afa6ec5156068c941d7b65981ac7ce7548a - -[http://xorg.freedesktop.org/releases/X11R7.1/src/driver/xf86-video-voodoo-X11R7.1-1.1.0.tar.bz2] -md5=0c96fac2d303dd5981de78e704d3a067 -sha256=35409b42f843ac3b352e344253f3075b2d9c8ae2ac5af02962fd67575427e066 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-wsfb-0.2.1.tar.bz2] -md5=c159af867a9af3abc4da332189213a76 -sha256=39e358aa17d939f561a28c82b9e7beca202d7ebd7d40d401c88a9dff3d90d148 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-wsfb-0.3.0.tar.bz2] -md5=d6b5d25dfd61fa5113216d10a6dcbb50 -sha256=78bdb6d397869dbd8560ae1f0ee65473977d19ca5afc9fa7638c35057284989e - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-xgi-1.5.0.tar.bz2] -md5=08529fd015191be9244f598aa0894aa6 -sha256=5fb23432ee8940c04494744da8b5f58bebc6ef113e96a50a74f0aa7d98a69194 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-xgi-1.5.1.tar.bz2] -md5=65a8d94d360b51690f8d4b2e7bfa036a -sha256=cb19f5287f9d345fc4fe15ba7c9344a3be2d8395ebf19a139899d1566d7c9e18 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-xgixp-1.7.99.3.tar.bz2] -md5=c541152aee693fad743ef7cbf75a7ffc -sha256=13a1658ee3ead0ab8e8bf7a9c8f8f0e3e40e38138f45d8431e735cd7184fbbd8 - -[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-xgixp-1.7.99.4.tar.bz2] -md5=0e7d0df07528c57304900da3acafc1a2 -sha256=ee0a178c89ff10d679e6f174d2a2e5cc7b89c7c7d5c115d48e9c75942f487395 - [http://xorg.freedesktop.org/releases/individual/proto/xf86bigfontproto-1.1.2.tar.bz2] md5=a318c1e86123832d7b0c95fc7d47ef35 sha256=01b475b5b27709a738db6f94ce2ded37f5db0792e8d9318069ecf1690a15f124 -- cgit v1.2.3 From 4b7cc047cdbda5a7fbccc4ae4815da8d30386bdf Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 18 Mar 2010 10:58:01 +0100 Subject: xf86-input-penmount, xf86-video-nv, xf86-video-vmware: newer versions Signed-off-by: Martin Jansa --- recipes/xorg-driver/xf86-input-penmount_1.4.1.bb | 6 ++++++ recipes/xorg-driver/xf86-video-nv_2.1.17.bb | 6 ++++++ recipes/xorg-driver/xf86-video-vmware_11.0.0.bb | 8 ++++++++ 3 files changed, 20 insertions(+) create mode 100644 recipes/xorg-driver/xf86-input-penmount_1.4.1.bb create mode 100644 recipes/xorg-driver/xf86-video-nv_2.1.17.bb create mode 100644 recipes/xorg-driver/xf86-video-vmware_11.0.0.bb diff --git a/recipes/xorg-driver/xf86-input-penmount_1.4.1.bb b/recipes/xorg-driver/xf86-input-penmount_1.4.1.bb new file mode 100644 index 0000000000..ce629f3c8c --- /dev/null +++ b/recipes/xorg-driver/xf86-input-penmount_1.4.1.bb @@ -0,0 +1,6 @@ +require xorg-driver-input.inc + +DESCRIPTION = "X.Org X server -- Penmount input driver" +PE = "1" +SRC_URI[archive.md5sum] = "e5984e43ce31d45659eb6ee91c02aba5" +SRC_URI[archive.sha256sum] = "6f281a7bce9db34772bcf762eb0ed57b8121a204a6f15d5405fe870a0af57182" diff --git a/recipes/xorg-driver/xf86-video-nv_2.1.17.bb b/recipes/xorg-driver/xf86-video-nv_2.1.17.bb new file mode 100644 index 0000000000..f3b793ed2a --- /dev/null +++ b/recipes/xorg-driver/xf86-video-nv_2.1.17.bb @@ -0,0 +1,6 @@ +require xorg-driver-video.inc + +DESCRIPTION = "X.Org X server -- NV display driver" +PE = "1" +SRC_URI[archive.md5sum] = "4401c7b956e60a6d7de68ca6a8ec05d0" +SRC_URI[archive.sha256sum] = "4286f8994d80a30c7b6b4fc9df6ea5d587f648adc23cb3f523f571738c6900f4" diff --git a/recipes/xorg-driver/xf86-video-vmware_11.0.0.bb b/recipes/xorg-driver/xf86-video-vmware_11.0.0.bb new file mode 100644 index 0000000000..d53b77e0e3 --- /dev/null +++ b/recipes/xorg-driver/xf86-video-vmware_11.0.0.bb @@ -0,0 +1,8 @@ +require xorg-driver-video.inc +PE = "1" + +#DESCRIPTION = "" + +DEPENDS += " xineramaproto xf86miscproto drm xf86driproto" +SRC_URI[archive.md5sum] = "2895deafa373b0f87b8a7feaf0ca2373" +SRC_URI[archive.sha256sum] = "bb538ebb9f000767bcc389562c8deb4cda74aa3e608190f6c3ee1e93d394fb2d" -- cgit v1.2.3 From 2f48ef98570605e84b83d57665cb966bba1a52f2 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 18 Mar 2010 11:47:46 +0100 Subject: xinit, xinput, libxt: add newer versions Signed-off-by: Martin Jansa --- recipes/xorg-app/xinit_1.2.1.bb | 11 +++++++++++ recipes/xorg-app/xinput_1.5.1.bb | 6 ++++++ recipes/xorg-lib/libxt-native_1.0.8.bb | 8 ++++++++ recipes/xorg-lib/libxt_1.0.8.bb | 20 ++++++++++++++++++++ 4 files changed, 45 insertions(+) create mode 100644 recipes/xorg-app/xinit_1.2.1.bb create mode 100644 recipes/xorg-app/xinput_1.5.1.bb create mode 100644 recipes/xorg-lib/libxt-native_1.0.8.bb create mode 100644 recipes/xorg-lib/libxt_1.0.8.bb diff --git a/recipes/xorg-app/xinit_1.2.1.bb b/recipes/xorg-app/xinit_1.2.1.bb new file mode 100644 index 0000000000..9fe144ffeb --- /dev/null +++ b/recipes/xorg-app/xinit_1.2.1.bb @@ -0,0 +1,11 @@ +require xorg-app-common.inc + +DESCRIPTION = "X Window System initializer" +PE = "1" +PR = "r1" + +DEPENDS += "util-linux-ng" + +FILES_${PN} += "${libdir}X11/xinit" +SRC_URI[archive.md5sum] = "56f2d202b3dc10fcd21931a67bb270f7" +SRC_URI[archive.sha256sum] = "16bcc73ae81b6d80fd1a9419ea757f38870d1043d440b6d56fcaa79d4c6c9b07" diff --git a/recipes/xorg-app/xinput_1.5.1.bb b/recipes/xorg-app/xinput_1.5.1.bb new file mode 100644 index 0000000000..407301689a --- /dev/null +++ b/recipes/xorg-app/xinput_1.5.1.bb @@ -0,0 +1,6 @@ +require xorg-app-common.inc + +DESCRIPTION = "a utility to configure and test XInput devices" +DEPENDS += " libxi" +SRC_URI[archive.md5sum] = "82400f0ba63217df9b00d825532cea7d" +SRC_URI[archive.sha256sum] = "e33c8361c2b6cb13db9a7157753d417c168c8203c8b7027e9dda2fbeef00fd33" diff --git a/recipes/xorg-lib/libxt-native_1.0.8.bb b/recipes/xorg-lib/libxt-native_1.0.8.bb new file mode 100644 index 0000000000..9745f6530d --- /dev/null +++ b/recipes/xorg-lib/libxt-native_1.0.8.bb @@ -0,0 +1,8 @@ +require libxt_${PV}.bb + +DEPENDS = "libx11-native libsm-native kbproto-native" +PROVIDES = "xt-native" + +inherit native + +XORG_PN = "libXt" diff --git a/recipes/xorg-lib/libxt_1.0.8.bb b/recipes/xorg-lib/libxt_1.0.8.bb new file mode 100644 index 0000000000..7a5447ce26 --- /dev/null +++ b/recipes/xorg-lib/libxt_1.0.8.bb @@ -0,0 +1,20 @@ +require xorg-lib-common.inc + +DESCRIPTION = "X11 toolkit intrinsics library" +DEPENDS += "libsm virtual/libx11 kbproto" +PROVIDES = "xt" +PE = "1" + +XORG_PN = "libXt" + +EXTRA_OECONF += "--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 -I${STAGING_INCDIR_NATIVE} ${BUILD_CFLAGS}' 'LDFLAGS=${BUILD_LDFLAGS}' 'CXXFLAGS=${BUILD_CXXFLAGS}' 'CPPFLAGS=${BUILD_CPPFLAGS}' makestrs + ) || exit 1 + oe_runmake +} +SRC_URI[archive.md5sum] = "fb7d2aa5b24cd5fe9b238a26d88030e7" +SRC_URI[archive.sha256sum] = "70f52c81258661811c8eae86a7a6dc910d0bf84cd48aeeed85ba430ad6b2037c" -- cgit v1.2.3 From 03811cf06e0e8b02072f75005d708d5244082bef Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 17 Mar 2010 14:05:54 +0100 Subject: xorg: update preferred-xorg-versions-live Signed-off-by: Martin Jansa --- .../include/preferred-xorg-versions-live.inc | 23 +++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/conf/distro/include/preferred-xorg-versions-live.inc b/conf/distro/include/preferred-xorg-versions-live.inc index 8c04925f65..2196eb3999 100644 --- a/conf/distro/include/preferred-xorg-versions-live.inc +++ b/conf/distro/include/preferred-xorg-versions-live.inc @@ -1,4 +1,4 @@ -#Thu Feb 25 10:36:35 CET 2010 +#Wed Mar 17 13:04:15 CET 2010 #app PREFERRED_VERSION_appres ?= "1.0.2" PREFERRED_VERSION_bdftopcf ?= "1.0.2" @@ -63,8 +63,8 @@ PREFERRED_VERSION_xfwp ?= "1.0.1" PREFERRED_VERSION_xgamma ?= "1.0.3" PREFERRED_VERSION_xgc ?= "1.0.2" PREFERRED_VERSION_xhost ?= "1.0.3" -PREFERRED_VERSION_xinit ?= "1.2.0" -PREFERRED_VERSION_xinput ?= "1.5.0" +PREFERRED_VERSION_xinit ?= "1.2.1" +PREFERRED_VERSION_xinput ?= "1.5.1" PREFERRED_VERSION_xkbcomp ?= "1.1.1" PREFERRED_VERSION_xkbcomp-native ?= "1.1.1" PREFERRED_VERSION_xkbevd ?= "1.1.0" @@ -132,7 +132,7 @@ PREFERRED_VERSION_xf86-input-microtouch ?= "1.2.0" PREFERRED_VERSION_xf86-input-mouse ?= "1.5.0" PREFERRED_VERSION_xf86-input-mutouch ?= "1.2.1" PREFERRED_VERSION_xf86-input-palmax ?= "1.2.0" -PREFERRED_VERSION_xf86-input-penmount ?= "1.4.0" +PREFERRED_VERSION_xf86-input-penmount ?= "1.4.1" PREFERRED_VERSION_xf86-input-spaceorb ?= "1.1.1" PREFERRED_VERSION_xf86-input-summa ?= "1.2.0" PREFERRED_VERSION_xf86-input-synaptics ?= "1.2.1" @@ -162,7 +162,7 @@ PREFERRED_VERSION_xf86-video-mga ?= "1.9.100" PREFERRED_VERSION_xf86-video-neomagic ?= "1.2.4" PREFERRED_VERSION_xf86-video-newport ?= "0.2.3" PREFERRED_VERSION_xf86-video-nsc ?= "2.8.3" -PREFERRED_VERSION_xf86-video-nv ?= "2.1.16" +PREFERRED_VERSION_xf86-video-nv ?= "2.1.17" PREFERRED_VERSION_xf86-video-openchrome ?= "0.2.904" PREFERRED_VERSION_xf86-video-r128 ?= "6.8.1" PREFERRED_VERSION_xf86-video-radeonhd ?= "1.3.0" @@ -189,7 +189,7 @@ PREFERRED_VERSION_xf86-video-vermilion ?= "1.0.1" PREFERRED_VERSION_xf86-video-vesa ?= "2.3.0" PREFERRED_VERSION_xf86-video-vga ?= "4.1.0" PREFERRED_VERSION_xf86-video-via ?= "0.2.2" -PREFERRED_VERSION_xf86-video-vmware ?= "10.16.9" +PREFERRED_VERSION_xf86-video-vmware ?= "11.0.0" PREFERRED_VERSION_xf86-video-voodoo ?= "1.2.3" PREFERRED_VERSION_xf86-video-wsfb ?= "0.3.0" PREFERRED_VERSION_xf86-video-xgi ?= "1.5.1" @@ -275,8 +275,8 @@ PREFERRED_VERSION_libxrandr ?= "1.3.0" PREFERRED_VERSION_libxrender ?= "0.9.5" PREFERRED_VERSION_libxrender-native ?= "0.9.5" PREFERRED_VERSION_libxres ?= "1.0.4" -PREFERRED_VERSION_libxt ?= "1.0.7" -PREFERRED_VERSION_libxt-native ?= "1.0.7" +PREFERRED_VERSION_libxt ?= "1.0.8" +PREFERRED_VERSION_libxt-native ?= "1.0.8" PREFERRED_VERSION_libxtst ?= "1.1.0" PREFERRED_VERSION_libxv ?= "1.0.5" PREFERRED_VERSION_libxvmc ?= "1.0.5" @@ -292,7 +292,8 @@ PREFERRED_VERSION_libpciaccess ?= "0.11.0" PREFERRED_VERSION_libxkbfile ?= "1.0.6" PREFERRED_VERSION_libxkbfile-native ?= "1.0.6" PREFERRED_VERSION_libxkbui ?= "1.0.2" -PREFERRED_VERSION_pixman ?= "0.17.8" +PREFERRED_VERSION_pixman ?= "0.17.12" +PREFERRED_VERSION_pixman-native ?= "0.17.12" PREFERRED_VERSION_xtrans ?= "1.2.5" PREFERRED_VERSION_xtrans-native ?= "1.2.5" #proto @@ -346,8 +347,8 @@ PREFERRED_VERSION_imake ?= "1.0.2" PREFERRED_VERSION_lndir ?= "1.0.1" PREFERRED_VERSION_makedepend ?= "1.0.2" PREFERRED_VERSION_makedepend-native ?= "1.0.2" -PREFERRED_VERSION_util-macros ?= "1.6.0" -PREFERRED_VERSION_util-macros-native ?= "1.6.0" +PREFERRED_VERSION_util-macros ?= "1.6.1" +PREFERRED_VERSION_util-macros-native ?= "1.6.1" PREFERRED_VERSION_xorg-cf-files ?= "1.0.3" #xserver PREFERRED_VERSION_xserver-xorg ?= "1.7.999" -- cgit v1.2.3 From 23799e1ae809ff2aafaeaf5986470365679181e5 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 18 Mar 2010 12:16:32 +0100 Subject: frameworkd: bump SRCREV for opimd fixes Signed-off-by: Martin Jansa --- conf/distro/include/sane-srcrevs-fso.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/distro/include/sane-srcrevs-fso.inc b/conf/distro/include/sane-srcrevs-fso.inc index 38a5ecfe05..9b10f5772c 100644 --- a/conf/distro/include/sane-srcrevs-fso.inc +++ b/conf/distro/include/sane-srcrevs-fso.inc @@ -24,7 +24,7 @@ SRCREV_pn-mterm2 ?= "${FSO_CORNUCOPIA_SRCREV}" # FSO Projects -- Misc SRCREV_pn-dbus-hlid ?= "5df7f49fe8881804aaab544a569fd164c3e93afb" -SRCREV_pn-frameworkd ?= "0039f8cd21ce007ac20de8f4525ad7c6e96804c0" +SRCREV_pn-frameworkd ?= "dc122306e2be410ce10330fb3d215c4c2732e5c3" SRCREV_pn-frameworkd-config-shr_FSO_REV ?= ${SRCREV_pn-frameworkd} SRCREV_pn-fso-gpsd ?= "39e810899110a9bb302cf2064e1c0f73541fb4e6" SRCREV_pn-fso-gsm0710muxd ?= "1d69fb5b666ac2a9e54e46978c7afa8fe5dfc3c9" -- cgit v1.2.3 From 4b21753640bedc4ee2fa0a7d9559ef7216e8f61b Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 18 Mar 2010 13:12:54 +0100 Subject: vala: add checksum for 0.7.10.5 Signed-off-by: Martin Jansa --- recipes/vala/vala.inc | 2 +- recipes/vala/vala_0.7.10.5.bb | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/recipes/vala/vala.inc b/recipes/vala/vala.inc index 1e0b1dcdb4..5815866e71 100644 --- a/recipes/vala/vala.inc +++ b/recipes/vala/vala.inc @@ -6,7 +6,7 @@ HOMEPAGE = "http://vala-project.org" LICENSE = "LGPL" INC_PR = "r0" -SRC_URI = "http://downloads.freesmartphone.org/sources/vala-${PV}.tar.bz2" +SRC_URI = "http://downloads.freesmartphone.org/sources/vala-${PV}.tar.bz2;name=archive" inherit autotools_stage diff --git a/recipes/vala/vala_0.7.10.5.bb b/recipes/vala/vala_0.7.10.5.bb index a5b1958f2c..9a16a1c3a3 100644 --- a/recipes/vala/vala_0.7.10.5.bb +++ b/recipes/vala/vala_0.7.10.5.bb @@ -1,2 +1,4 @@ require vala.inc PR = "${INC_PR}.0" +SRC_URI[archive.md5sum] = "5ee5b86460181e9bb0de9cb2e8f35077" +SRC_URI[archive.sha256sum] = "1c4830973dbca36f8826e490ec8477df6ced0c8675bd724e24494ca0f1616926" -- cgit v1.2.3 From 4848b502027d5ec89b9f411e5580e85382eed43a Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 18 Mar 2010 14:07:01 +0100 Subject: om-gta01: fix jffs2 building params, xorg.conf (Thanks to Michael) Signed-off-by: Martin Jansa --- conf/machine/om-gta01.conf | 10 +--------- recipes/xorg-xserver/xserver-xorg-conf/om-gta01/xorg.conf | 5 +++-- recipes/xorg-xserver/xserver-xorg-conf_0.1.bb | 2 +- 3 files changed, 5 insertions(+), 12 deletions(-) diff --git a/conf/machine/om-gta01.conf b/conf/machine/om-gta01.conf index 1495949e70..ede2a2009e 100644 --- a/conf/machine/om-gta01.conf +++ b/conf/machine/om-gta01.conf @@ -58,15 +58,7 @@ ROOT_FLASH_SIZE = "60" IMAGE_FSTYPES += "tar.gz jffs2 ubi" # extra jffs2 tweaks -EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 --pagesize=0x800 \ - --no-cleanmarkers --pad -n ; sumtool --eraseblock=0x20000 --no-cleanmarkers \ - --littleendian --pad \ - -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \ - -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2.summary ; \ - mv ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \ - ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2.nosummary ; \ - mv ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2.summary \ - ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2" +EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x4000 --pad -n" # do ubiattach /dev/ubi_ctrl -m 4 # From dmesg: diff --git a/recipes/xorg-xserver/xserver-xorg-conf/om-gta01/xorg.conf b/recipes/xorg-xserver/xserver-xorg-conf/om-gta01/xorg.conf index b77b5527b5..83eaa0cb2e 100644 --- a/recipes/xorg-xserver/xserver-xorg-conf/om-gta01/xorg.conf +++ b/recipes/xorg-xserver/xserver-xorg-conf/om-gta01/xorg.conf @@ -19,14 +19,14 @@ EndSection Section "InputDevice" Identifier "Power Button" Driver "evdev" - Option "Device" "/dev/input/event0" + Option "Device" "/dev/input/event2" EndSection Section "InputDevice" Identifier "AUX Button" Driver "evdev" - Option "Device" "/dev/input/event4" + Option "Device" "/dev/input/event0" EndSection @@ -34,6 +34,7 @@ Section "InputDevice" Identifier "Touchscreen" Driver "evdev" Option "Device" "/dev/input/event1" + Option "SwapAxes" "True" EndSection diff --git a/recipes/xorg-xserver/xserver-xorg-conf_0.1.bb b/recipes/xorg-xserver/xserver-xorg-conf_0.1.bb index 1be87b16f4..92cd17302d 100644 --- a/recipes/xorg-xserver/xserver-xorg-conf_0.1.bb +++ b/recipes/xorg-xserver/xserver-xorg-conf_0.1.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Machine specific xorg.conf files" -PR = "r21" +PR = "r22" SRC_URI = "file://xorg.conf" -- cgit v1.2.3 From 0ca3942e51a1178bd8bfec9c141a0e4c0d85046f Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 18 Mar 2010 14:04:03 +0100 Subject: xserver-kdrive-common: simplify cmdline generation for GTA0(1|2), use DPI=280 also for Xglamo Signed-off-by: Martin Jansa --- .../xserver-kdrive-common/Xserver | 25 +++------------------- .../xserver-kdrive-common_0.1.bb | 2 +- 2 files changed, 4 insertions(+), 23 deletions(-) diff --git a/recipes/xserver-kdrive-common/xserver-kdrive-common/Xserver b/recipes/xserver-kdrive-common/xserver-kdrive-common/Xserver index 13173137da..386d285af9 100644 --- a/recipes/xserver-kdrive-common/xserver-kdrive-common/Xserver +++ b/recipes/xserver-kdrive-common/xserver-kdrive-common/Xserver @@ -110,44 +110,25 @@ case `module_id` in "Compulab CM-x270") modprobe mbxfb ARGS="$ARGS -fb /dev/fb1" ;; - "GTA01") + "GTA01" | "GTA02") if [ `screen_width` -gt 330 ] ; then if [ -f "/usr/share/pixmaps/xsplash-vga.ppm" ]; then PPM="-root-ppm /usr/share/pixmaps/xsplash-vga.ppm" fi - DPI=285 + DPI=280 else if [ -f "/usr/share/pixmaps/xsplash-qvga.ppm" ]; then PPM="-root-ppm /usr/share/pixmaps/xsplash-qvga.ppm" fi DPI=142 fi - ARGS="$ARGS -dpi ${DPI} vt1" - ;; - "GTA02") - if [ `screen_width` -gt 330 ] ; then - if [ -f "/usr/share/pixmaps/xsplash-vga.ppm" ]; then - PPM="-root-ppm /usr/share/pixmaps/xsplash-vga.ppm" - fi - DPI=285 - else - if [ -f "/usr/share/pixmaps/xsplash-qvga.ppm" ]; then - PPM="-root-ppm /usr/share/pixmaps/xsplash-qvga.ppm" - fi - DPI=142 - fi - if [ "$XSERVER" = "/usr/bin/Xorg" ]; then - if [ "$DPI" = "285" ]; then - # Fix for only 3 columns of icons in illume desktop - DPI=280 - fi if [ -z "${USB_MOUSE}" ]; then # Fix for segfault while typing on illume keyboard ARGS="$ARGS -nocursor" fi ARGS="$ARGS -dpi ${DPI} vt1" - else + elif [ `module_id` == "GTA02" ] ; then ARGS="$ARGS -dpi ${DPI} -screen ${SCREEN_SIZE} -mouse tslib -hide-cursor ${PPM} vt1" XSERVER=/usr/bin/Xglamo fi diff --git a/recipes/xserver-kdrive-common/xserver-kdrive-common_0.1.bb b/recipes/xserver-kdrive-common/xserver-kdrive-common_0.1.bb index 8e27c01b31..3812d2f4a5 100644 --- a/recipes/xserver-kdrive-common/xserver-kdrive-common_0.1.bb +++ b/recipes/xserver-kdrive-common/xserver-kdrive-common_0.1.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Common X11 scripts" LICENSE = "GPL" SECTION = "x11" -PR = "r43" +PR = "r44" SRC_URI = "\ file://Xdefaults \ -- cgit v1.2.3 From 780b100bd0c6ae69fa4f9f1fff0768a6b9f494aa Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 18 Mar 2010 14:40:24 +0100 Subject: gnuchess: add launcher and icon, thanks to Graziano Sorbaioli Signed-off-by: Martin Jansa --- recipes/gnuchess/files/gnuchess.desktop | 12 ++++++++++++ recipes/gnuchess/files/gnuchess.png | Bin 0 -> 2623 bytes recipes/gnuchess/files/gnuchess.sh | 3 +++ recipes/gnuchess/gnuchess_5.021.bb | 14 +++++++++++++- 4 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 recipes/gnuchess/files/gnuchess.desktop create mode 100644 recipes/gnuchess/files/gnuchess.png create mode 100644 recipes/gnuchess/files/gnuchess.sh diff --git a/recipes/gnuchess/files/gnuchess.desktop b/recipes/gnuchess/files/gnuchess.desktop new file mode 100644 index 0000000000..5b2eb4002d --- /dev/null +++ b/recipes/gnuchess/files/gnuchess.desktop @@ -0,0 +1,12 @@ +[Desktop Entry] +Name=GNU Chess +Comment=Chess game of the GNU Project +Encoding=UTF-8 +Version=4.2.7 +Type=Application +Exec=/usr/bin/gnuchess.sh +Terminal=false +Categories=Game; +X-MB-SingleInstance=true +Icon=gnuchess + diff --git a/recipes/gnuchess/files/gnuchess.png b/recipes/gnuchess/files/gnuchess.png new file mode 100644 index 0000000000..a0d2e5fa62 Binary files /dev/null and b/recipes/gnuchess/files/gnuchess.png differ diff --git a/recipes/gnuchess/files/gnuchess.sh b/recipes/gnuchess/files/gnuchess.sh new file mode 100644 index 0000000000..2da70498d1 --- /dev/null +++ b/recipes/gnuchess/files/gnuchess.sh @@ -0,0 +1,3 @@ +#!/bin/sh +xboard -size Average -font 6x13 -coordFont 6x13 -clockFont 6x13 -fcp "/usr/bin/gnuchess -b- -e 100 -l- -f 1 -p-" + diff --git a/recipes/gnuchess/gnuchess_5.021.bb b/recipes/gnuchess/gnuchess_5.021.bb index 18c94bdab0..8d1afea1bf 100644 --- a/recipes/gnuchess/gnuchess_5.021.bb +++ b/recipes/gnuchess/gnuchess_5.021.bb @@ -3,11 +3,23 @@ SECTION = "console" PRIORITY = "optional" MAINTAINER = "Andreas Holzer " LICENSE = "GPL" -SRC_URI = "http://members.cheese.at/woody/fltk-chess/gnuchess_5.02.tar.gz" +PR = "r1" +RSUGGESTS_${PN} = "xboard" +SRC_URI = "http://members.cheese.at/woody/fltk-chess/gnuchess_5.02.tar.gz \ + file://gnuchess.desktop \ + file://gnuchess.png \ + file://gnuchess.sh \ +" S = "${WORKDIR}/chess-5.02/src" inherit autotools do_install() { + install -d ${D}${bindir} + install -d ${D}${datadir}/pixmaps/ + install -d ${D}${datadir}/applications/ + install -m 0755 ${WORKDIR}/gnuchess.sh ${D}${bindir} + install -m 0644 ${WORKDIR}/gnuchess.png ${D}${datadir}/pixmaps/ + install -m 0644 ${WORKDIR}/gnuchess.desktop ${D}${datadir}/applications/ install -D ${S}/gnuchess ${D}${bindir}/gnuchess } -- cgit v1.2.3 From dbf204545410b5ee1943675e789940569174f510 Mon Sep 17 00:00:00 2001 From: Michael 'Mickey' Lauer Date: Thu, 18 Mar 2010 15:43:22 +0100 Subject: fso2-demo-image: new image recipe; FSO-compliant image w/ zhone2 as smartphone application --- recipes/images/fso2-demo-image.bb | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 recipes/images/fso2-demo-image.bb diff --git a/recipes/images/fso2-demo-image.bb b/recipes/images/fso2-demo-image.bb new file mode 100644 index 0000000000..3e2f93c66b --- /dev/null +++ b/recipes/images/fso2-demo-image.bb @@ -0,0 +1,17 @@ +#------------------------------------------------------ +# FSO-compliant Console Image Recipe +#------------------------------------------------------ + +require fso-image.inc + +PV = "1.0" +PR = "r0" + +IMAGE_INSTALL = "\ + task-base \ + task-fso2-compliance \ + task-cli-tools \ + task-cli-tools-python \ + \ + zhone2 \ +" -- cgit v1.2.3 From dbbe0cae855f2057583c013cdf7a6d0166a46218 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 18 Mar 2010 14:36:00 +0100 Subject: feed-browser: add unstable configs for beagle and hawk --- contrib/feed-browser/includes/config.inc | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/contrib/feed-browser/includes/config.inc b/contrib/feed-browser/includes/config.inc index 2bc34f7d63..341ba87c36 100644 --- a/contrib/feed-browser/includes/config.inc +++ b/contrib/feed-browser/includes/config.inc @@ -155,6 +155,14 @@ $feeds = array( 'url'=>'ppc603e/gstreamer', ), + array( + 'name'=>'Beagleboard machine feed', + 'url'=>'armv7a/machine/beagleboard', + ), + array( + 'name'=>'Hawkoard machine feed', + 'url'=>'armv5te/machine/hawkboard', + ), array( 'name'=>'Motorola A780', 'url'=>'armv5te/machine/a780', -- cgit v1.2.3 From b2acb9dfb88c0b375b4e1938da13b1178e94db9f Mon Sep 17 00:00:00 2001 From: Enrico Scholz Date: Wed, 17 Mar 2010 07:38:56 +0000 Subject: ffmpeg: moved to native staging Old .inc file listed every single header which was to be staged. This causes problems when upgrading to recent 0.5.1 version or when using older versions because headers might not exist there resp. new ones need to be installed. This patch converts the .inc file to new native staging method and which calls two new functions: * ffmpeg_create_compat_links: - this creates symlinks to all installed headers into the ffmpeg/ directory. E.g. adler32.h -> ../libavutil/adler32.h - it should be probably checked whether these links are really needed (they are not provided by ffmpeg and other programs might get confused when they see new and old headers). For now; I kept them. * ffmpeg_stage_cleanup: - this removes data and plugin files Signed-off-by: Enrico Scholz Signed-off-by: Koen Kooi --- recipes/ffmpeg/ffmpeg.inc | 57 ++++++++++++++++------------------------------- 1 file changed, 19 insertions(+), 38 deletions(-) diff --git a/recipes/ffmpeg/ffmpeg.inc b/recipes/ffmpeg/ffmpeg.inc index 857dad5f90..c855877e8d 100644 --- a/recipes/ffmpeg/ffmpeg.inc +++ b/recipes/ffmpeg/ffmpeg.inc @@ -10,7 +10,7 @@ ARM_INSTRUCTION_SET = "arm" DEPENDS = "zlib libogg libvorbis libtheora faac faad2 ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'lame liba52', d)}" RSUGGESTS = "mplayer" -INC_PR = "r12" +INC_PR = "r13" inherit autotools pkgconfig @@ -30,45 +30,26 @@ EXTRA_OECONF = "\ \ " -do_stage() { - for lib in libavcodec libavdevice libavformat \ - libavutil libpostproc libswscale - do - oe_libinstall -a -so -C $lib $lib ${STAGING_LIBDIR} || true - install -d ${STAGING_INCDIR}/$lib - done - - install -d ${STAGING_INCDIR}/ffmpeg - - install -m 0644 ${S}/libavcodec/avcodec.h ${STAGING_INCDIR}/ffmpeg/avcodec.h - install -m 0644 ${S}/libavcodec/opt.h ${STAGING_INCDIR}/ffmpeg/opt.h - install -m 0644 ${S}/libavcodec/avcodec.h ${STAGING_INCDIR}/libavcodec/avcodec.h - install -m 0644 ${S}/libavcodec/opt.h ${STAGING_INCDIR}/libavcodec/opt.h - - install -m 0644 ${S}/libavdevice/avdevice.h ${STAGING_INCDIR}/ffmpeg/avdevice.h - - for h in avformat.h avio.h rtp.h rtsp.h rtspcodes.h - do - install -m 0644 ${S}/libavformat/$h ${STAGING_INCDIR}/ffmpeg/$h - install -m 0644 ${S}/libavformat/$h ${STAGING_INCDIR}/libavformat/$h - done - - for h in adler32.h aes.h attributes.h avstring.h avutil.h base64.h bswap.h common.h crc_data.h crc.h des.h error.h fifo.h integer.h internal.h intfloat_readwrite.h intmath.h intreadwrite.h lfg.h libm.h lls.h log.h lzo.h mathematics.h md5.h mem.h pca.h pixdesc.h pixfmt.h random_seed.h rational.h rc4.h sha1.h sha.h softfloat.h timer.h tree.h x86_cpu.h - do - install -m 0644 ${S}/libavutil/$h ${STAGING_INCDIR}/ffmpeg/$h - install -m 0644 ${S}/libavutil/$h ${STAGING_INCDIR}/libavutil/$h - done - install -m 0644 ${B}/libavutil/avconfig.h ${STAGING_INCDIR}/ffmpeg/ - install -m 0644 ${B}/libavutil/avconfig.h ${STAGING_INCDIR}/libavutil/ +FFMPEG_LIBS = "libavcodec libavdevice libavformat \ + libavutil libpostproc libswscale" + +SYSROOT_PREPROCESS_FUNCS = " \ + ffmpeg_stage_cleanup \ + ffmpeg_create_compat_links" + +ffmpeg_create_compat_links() { + rm -rf ${SYSROOT_DESTDIR}${STAGING_INCDIR}/ffmpeg + mkdir -m 0755 ${SYSROOT_DESTDIR}${STAGING_INCDIR}/ffmpeg + cd ${SYSROOT_DESTDIR}${STAGING_INCDIR}/ffmpeg - install -d ${STAGING_INCDIR}/libswscale/ - install -m 0644 ${S}/libswscale/*.h ${STAGING_INCDIR}/ffmpeg/ - install -m 0644 ${S}/libswscale/*.h ${STAGING_INCDIR}/libswscale/ + for lib in ${FFMPEG_LIBS}; do + ln -s ../$lib/*.h '.' + done +} - install -d ${STAGING_INCDIR}/libpostproc - install -d ${STAGING_INCDIR}/postproc - install -m 0644 ${S}/libpostproc/postprocess.h ${STAGING_INCDIR}/libpostproc/postprocess.h - install -m 0644 ${S}/libpostproc/postprocess.h ${STAGING_INCDIR}/postproc/postprocess.h +ffmpeg_stage_cleanup() { + rm -rf ${SYSROOT_DESTDIR}${STAGING_LIBDIR}/vhook \ + ${SYSROOT_DESTDIR}${STAGING_DATADIR} } -- cgit v1.2.3 From 4de0798959a82227c32b845e1a7129aeda6f79c2 Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Thu, 18 Mar 2010 16:37:13 +0000 Subject: alsa-state.bb : add default state file with onboard speakers enabled for zoom2 --- recipes/alsa/alsa-state.bb | 2 +- recipes/alsa/alsa-state/omapzoom2/asound.state | 722 +++++++++++++++++++++++++ 2 files changed, 723 insertions(+), 1 deletion(-) create mode 100644 recipes/alsa/alsa-state/omapzoom2/asound.state diff --git a/recipes/alsa/alsa-state.bb b/recipes/alsa/alsa-state.bb index b6b494e353..120514035a 100644 --- a/recipes/alsa/alsa-state.bb +++ b/recipes/alsa/alsa-state.bb @@ -7,7 +7,7 @@ DESCRIPTION = "Alsa Scenario Files" LICENSE = "MIT" PV = "0.2.0" -PR = "r12" +PR = "r13" SRC_URI = "\ file://asound.conf \ diff --git a/recipes/alsa/alsa-state/omapzoom2/asound.state b/recipes/alsa/alsa-state/omapzoom2/asound.state new file mode 100644 index 0000000000..265020c66b --- /dev/null +++ b/recipes/alsa/alsa-state/omapzoom2/asound.state @@ -0,0 +1,722 @@ +state.Zoom2 { + control.1 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 1 + comment.item.0 'Option 2 (voice/audio)' + comment.item.1 'Option 1 (audio)' + iface MIXER + name 'Codec Operation Mode' + value 'Option 1 (audio)' + } + control.2 { + comment.access 'read write' + comment.type INTEGER + comment.count 2 + comment.range '0 - 63' + comment.dbmin -6300 + comment.dbmax 0 + iface MIXER + name 'DAC1 Digital Fine Playback Volume' + value.0 0 + value.1 0 + } + control.3 { + comment.access 'read write' + comment.type INTEGER + comment.count 2 + comment.range '0 - 63' + comment.dbmin -6300 + comment.dbmax 0 + iface MIXER + name 'DAC2 Digital Fine Playback Volume' + value.0 54 + value.1 54 + } + control.4 { + comment.access 'read write' + comment.type INTEGER + comment.count 2 + comment.range '0 - 2' + comment.dbmin 0 + comment.dbmax 1200 + iface MIXER + name 'DAC1 Digital Coarse Playback Volume' + value.0 0 + value.1 0 + } + control.5 { + comment.access 'read write' + comment.type INTEGER + comment.count 2 + comment.range '0 - 2' + comment.dbmin 0 + comment.dbmax 1200 + iface MIXER + name 'DAC2 Digital Coarse Playback Volume' + value.0 1 + value.1 1 + } + control.6 { + comment.access 'read write' + comment.type INTEGER + comment.count 2 + comment.range '0 - 18' + comment.dbmin -2400 + comment.dbmax 1200 + iface MIXER + name 'DAC1 Analog Playback Volume' + value.0 0 + value.1 0 + } + control.7 { + comment.access 'read write' + comment.type INTEGER + comment.count 2 + comment.range '0 - 18' + comment.dbmin -2400 + comment.dbmax 1200 + iface MIXER + name 'DAC2 Analog Playback Volume' + value.0 14 + value.1 14 + } + control.8 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 2 + iface MIXER + name 'DAC1 Analog Playback Switch' + value.0 false + value.1 false + } + control.9 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 2 + iface MIXER + name 'DAC2 Analog Playback Switch' + value.0 true + value.1 true + } + control.10 { + comment.access 'read write' + comment.type INTEGER + comment.count 1 + comment.range '0 - 49' + comment.dbmin -3700 + comment.dbmax 1200 + iface MIXER + name 'DAC Voice Digital Downlink Volume' + value 0 + } + control.11 { + comment.access 'read write' + comment.type INTEGER + comment.count 1 + comment.range '0 - 18' + comment.dbmin -2400 + comment.dbmax 1200 + iface MIXER + name 'DAC Voice Analog Downlink Volume' + value 0 + } + control.12 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'DAC Voice Analog Downlink Switch' + value false + } + control.13 { + comment.access 'read write' + comment.type INTEGER + comment.count 2 + comment.range '0 - 3' + comment.dbmin -1200 + comment.dbmax 600 + iface MIXER + name 'PreDriv Playback Volume' + value.0 0 + value.1 0 + } + control.14 { + comment.access 'read write' + comment.type INTEGER + comment.count 2 + comment.range '0 - 3' + comment.dbmin -1200 + comment.dbmax 600 + iface MIXER + name 'Headset Playback Volume' + value.0 0 + value.1 0 + } + control.15 { + comment.access 'read write' + comment.type INTEGER + comment.count 2 + comment.range '0 - 3' + comment.dbmin -1200 + comment.dbmax 600 + iface MIXER + name 'Carkit Playback Volume' + value.0 0 + value.1 0 + } + control.16 { + comment.access 'read write' + comment.type INTEGER + comment.count 1 + comment.range '0 - 3' + comment.dbmin -600 + comment.dbmax 1200 + iface MIXER + name 'Earpiece Playback Volume' + value 0 + } + control.17 { + comment.access 'read write' + comment.type INTEGER + comment.count 2 + comment.range '0 - 31' + comment.dbmin 0 + comment.dbmax 3100 + iface MIXER + name 'TX1 Digital Capture Volume' + value.0 12 + value.1 12 + } + control.18 { + comment.access 'read write' + comment.type INTEGER + comment.count 2 + comment.range '0 - 31' + comment.dbmin 0 + comment.dbmax 3100 + iface MIXER + name 'TX2 Digital Capture Volume' + value.0 0 + value.1 0 + } + control.19 { + comment.access 'read write' + comment.type INTEGER + comment.count 2 + comment.range '0 - 5' + comment.dbmin 0 + comment.dbmax 3000 + iface MIXER + name 'Analog Capture Volume' + value.0 0 + value.1 0 + } + control.20 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 1 + comment.item.0 'Voice high priority' + comment.item.1 'HiFi high priority' + iface MIXER + name 'AVADC Clock Priority' + value 'Voice high priority' + } + control.21 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 1 + comment.item.0 '27/20/14 ms' + comment.item.1 '55/40/27 ms' + comment.item.2 '109/81/55 ms' + comment.item.3 '218/161/109 ms' + comment.item.4 '437/323/218 ms' + comment.item.5 '874/645/437 ms' + comment.item.6 '1748/1291/874 ms' + comment.item.7 '3495/2581/1748 ms' + iface MIXER + name 'HS ramp delay' + value '109/81/55 ms' + } + control.22 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 1 + comment.item.0 'Vibra H-bridge direction' + comment.item.1 'Audio data MSB' + iface MIXER + name 'Vibra H-bridge mode' + value 'Vibra H-bridge direction' + } + control.23 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 1 + comment.item.0 'Positive polarity' + comment.item.1 'Negative polarity' + iface MIXER + name 'Vibra H-bridge direction' + value 'Positive polarity' + } + control.24 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 1 + comment.item.0 Off + comment.item.1 On + iface MIXER + name 'HIFI Playback Control' + value On + } + control.25 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 1 + comment.item.0 Off + comment.item.1 On + iface MIXER + name 'Voice Control' + value Off + } + control.26 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 1 + comment.item.0 Off + comment.item.1 On + iface MIXER + name 'Capture Control' + value Off + } + control.27 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 1 + comment.item.0 '8000' + comment.item.1 '11025' + comment.item.2 '12000' + comment.item.3 '16000' + comment.item.4 '22050' + comment.item.5 '24000' + comment.item.6 '32000' + comment.item.7 '44100' + comment.item.8 '48000' + comment.item.9 '96000' + iface MIXER + name 'Audio Sample Rate' + value '44100' + } + control.28 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 1 + comment.item.0 '8000' + comment.item.1 '16000' + iface MIXER + name 'Voice Sample Rate' + value '8000' + } + control.29 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name '256FS CLK Control Switch' + value true + } + control.30 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Analog Right Sub Mic Capture Switch' + value false + } + control.31 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Analog Right AUXR Capture Switch' + value false + } + control.32 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Analog Left Main Mic Capture Switch' + value false + } + control.33 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Analog Left Headset Mic Capture Switch' + value false + } + control.34 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Analog Left AUXL Capture Switch' + value false + } + control.35 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Analog Left Carkit Mic Capture Switch' + value false + } + control.36 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 1 + comment.item.0 Analog + comment.item.1 Digimic1 + iface MIXER + name 'TX2 Capture Route' + value Analog + } + control.37 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 1 + comment.item.0 Analog + comment.item.1 Digimic0 + iface MIXER + name 'TX1 Capture Route' + value Analog + } + control.38 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 1 + comment.item.0 'Local vibrator' + comment.item.1 Audio + iface MIXER + name 'Vibra Route' + value 'Local vibrator' + } + control.39 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 1 + comment.item.0 AudioL1 + comment.item.1 AudioR1 + comment.item.2 AudioL2 + comment.item.3 AudioR2 + iface MIXER + name 'Vibra Mux' + value AudioL1 + } + control.40 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'HandsfreeR Switch' + value true + } + control.41 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 1 + comment.item.0 Voice + comment.item.1 AudioR1 + comment.item.2 AudioR2 + comment.item.3 AudioL2 + iface MIXER + name 'HandsfreeR Mux' + value AudioR2 + } + control.42 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'HandsfreeL Switch' + value true + } + control.43 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 1 + comment.item.0 Voice + comment.item.1 AudioL1 + comment.item.2 AudioL2 + comment.item.3 AudioR2 + iface MIXER + name 'HandsfreeL Mux' + value AudioL2 + } + control.44 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'CarkitR Mixer Voice' + value false + } + control.45 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'CarkitR Mixer AudioR1' + value false + } + control.46 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'CarkitR Mixer AudioR2' + value false + } + control.47 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'CarkitL Mixer Voice' + value false + } + control.48 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'CarkitL Mixer AudioL1' + value false + } + control.49 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'CarkitL Mixer AudioL2' + value false + } + control.50 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'HeadsetR Mixer Voice' + value false + } + control.51 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'HeadsetR Mixer AudioR1' + value false + } + control.52 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'HeadsetR Mixer AudioR2' + value true + } + control.53 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'HeadsetL Mixer Voice' + value false + } + control.54 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'HeadsetL Mixer AudioL1' + value false + } + control.55 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'HeadsetL Mixer AudioL2' + value true + } + control.56 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'PredriveR Mixer Voice' + value false + } + control.57 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'PredriveR Mixer AudioR1' + value false + } + control.58 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'PredriveR Mixer AudioR2' + value false + } + control.59 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'PredriveR Mixer AudioL2' + value false + } + control.60 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'PredriveL Mixer Voice' + value false + } + control.61 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'PredriveL Mixer AudioL1' + value false + } + control.62 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'PredriveL Mixer AudioL2' + value false + } + control.63 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'PredriveL Mixer AudioR2' + value false + } + control.64 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Earpiece Mixer Voice' + value false + } + control.65 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Earpiece Mixer AudioL1' + value false + } + control.66 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Earpiece Mixer AudioL2' + value false + } + control.67 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Earpiece Mixer AudioR1' + value false + } + control.68 { + comment.access 'read write' + comment.type INTEGER + comment.count 1 + comment.range '0 - 41' + comment.dbmin -5100 + comment.dbmax -1000 + iface MIXER + name 'Voice Digital Loopback Volume' + value 0 + } + control.69 { + comment.access 'read write' + comment.type INTEGER + comment.count 1 + comment.range '0 - 7' + comment.dbmin -2400 + comment.dbmax 0 + iface MIXER + name 'Right Digital Loopback Volume' + value 0 + } + control.70 { + comment.access 'read write' + comment.type INTEGER + comment.count 1 + comment.range '0 - 7' + comment.dbmin -2400 + comment.dbmax 0 + iface MIXER + name 'Left Digital Loopback Volume' + value 0 + } + control.71 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Voice Analog Loopback Switch' + value false + } + control.72 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Left2 Analog Loopback Switch' + value false + } + control.73 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Right2 Analog Loopback Switch' + value false + } + control.74 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Left1 Analog Loopback Switch' + value false + } + control.75 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Right1 Analog Loopback Switch' + value false + } +} -- cgit v1.2.3 From a9387736cf9397160fb36d5b541cd0bdc7d285f5 Mon Sep 17 00:00:00 2001 From: Antonio Ospite Date: Thu, 18 Mar 2010 17:41:56 +0100 Subject: vala-dbus-binding-tool: fix HOMEPAGE and SRC_URI --- recipes/vala-dbus-binding-tool/vala-dbus-binding-tool.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipes/vala-dbus-binding-tool/vala-dbus-binding-tool.inc b/recipes/vala-dbus-binding-tool/vala-dbus-binding-tool.inc index 96c2836b25..b28079cb5d 100644 --- a/recipes/vala-dbus-binding-tool/vala-dbus-binding-tool.inc +++ b/recipes/vala-dbus-binding-tool/vala-dbus-binding-tool.inc @@ -1,11 +1,11 @@ DESCRIPTION = "Vala DBus Binding Tool" SECTION = "devel" DEPENDS = "vala libgee libxml2 intltool-native" -HOMEPAGE = "http://www.freesmartphone.org/index.php/Implementations/vala-dbus-binding-tool" +HOMEPAGE = "http://wiki.freesmartphone.org/index.php/Implementations/vala-dbus-binding-tool" LICENSE = "GPLv2" -INC_PR = "r2" +INC_PR = "r3" -SRC_URI = "http://www.freesmartphone.org/sources/vala-dbus-binding-tool-${PV}.tar.bz2;name=archive" +SRC_URI = "http://downloads.freesmartphone.org/sources/vala-dbus-binding-tool-${PV}.tar.bz2;name=archive" inherit autotools_stage -- cgit v1.2.3 From d7274489fb0dcb262a0aad4cf94eebdc217d8dc8 Mon Sep 17 00:00:00 2001 From: Steffen Sledz Date: Wed, 17 Mar 2010 21:18:08 +0100 Subject: libunwind: new recipe a portable and efficient C programming interface (API) to determine the call-chain of a program Signed-off-by: Steffen Sledz --- recipes/libunwind/libunwind.inc | 13 +++++++++++++ recipes/libunwind/libunwind_0.99.bb | 5 +++++ 2 files changed, 18 insertions(+) create mode 100644 recipes/libunwind/libunwind.inc create mode 100644 recipes/libunwind/libunwind_0.99.bb diff --git a/recipes/libunwind/libunwind.inc b/recipes/libunwind/libunwind.inc new file mode 100644 index 0000000000..4cd41b7d9e --- /dev/null +++ b/recipes/libunwind/libunwind.inc @@ -0,0 +1,13 @@ +DESCRIPTION = "a portable and efficient C programming interface (API) to determine the call-chain of a program" +DEPENDS = "" +HOMEPAGE = "http://www.nongnu.org/libunwind" +LICENSE = "MIT" +INC_PR = "r0" + +SRC_URI = "http://download.savannah.nongnu.org/releases/libunwind/${PN}-${PV}.tar.gz;name=archive" + +S = "${WORKDIR}/${PN}-${PV}" + +inherit autotools + +BBCLASSEXTEND = "native" diff --git a/recipes/libunwind/libunwind_0.99.bb b/recipes/libunwind/libunwind_0.99.bb new file mode 100644 index 0000000000..b7d0612007 --- /dev/null +++ b/recipes/libunwind/libunwind_0.99.bb @@ -0,0 +1,5 @@ +require libunwind.inc +PR = "${INC_PR}.0" + +SRC_URI[archive.md5sum] = "3e9ca08118e22165a7f07d01d61a2d0d" +SRC_URI[archive.sha256sum] = "56083aae17eab3ccb7a36b95f0430f5a5f258755bf193bb5ca4fd4b918356164" -- cgit v1.2.3 From 101beae9251e0fd4bc26a5fd70c72c67a96f5cab Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 18 Mar 2010 19:05:59 +0100 Subject: elmdentica: use SRC_URI from enlightenment repo instead googlecode, bump version Signed-off-by: Martin Jansa --- conf/distro/include/sane-srcrevs.inc | 2 ++ recipes/e17/elmdentica_svn.bb | 14 ++++---------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index b07d8d011c..4ebc95f21c 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -275,6 +275,7 @@ SRCREV_pn-edje-player ?= "${EFL_SRCREV}" SRCREV_pn-edje-viewer ?= "${EFL_SRCREV}" SRCREV_pn-elementary-alarm ?= "${EFL_SRCREV}" SRCREV_pn-elementary-sms ?= "${EFL_SRCREV}" +SRCREV_pn-elmdentica ?= "${EFL_SRCREV}" SRCREV_pn-emphasis ?= "${EFL_SRCREV}" SRCREV_pn-ephoto ?= "${EFL_SRCREV}" SRCREV_pn-eve ?= "${EFL_SRCREV}" @@ -301,4 +302,5 @@ SRCREV_pn-illume-keyboard-default ?= "${EFL_SRCREV}" SRCREV_pn-exalt ?= "${EFL_SRCREV}" SRCREV_pn-exalt-client ?= "${EFL_SRCREV}" + require conf/distro/include/sane-srcrevs-fso.inc diff --git a/recipes/e17/elmdentica_svn.bb b/recipes/e17/elmdentica_svn.bb index d5d441b629..c0cf56a7e1 100644 --- a/recipes/e17/elmdentica_svn.bb +++ b/recipes/e17/elmdentica_svn.bb @@ -4,13 +4,7 @@ LICENSE = "GPLv3+" SECTION = "e/apps" HOMEPAGE = "http://elmdentica.googlecode.com" AUTHOR = "seabra" -SRCREV = "215" -PV = "0.7.0+svnr${SRCPV}" -PR = "r1" - - -SRC_URI = "svn://elmdentica.googlecode.com/svn;module=trunk;proto=http" - -S = "${WORKDIR}/trunk" - -inherit autotools pkgconfig + +inherit e + +PV = "0.9.0+svnr${SRCPV}" -- cgit v1.2.3 From 022ec40a3ab28de09ed9908531fd168d30c8eaa9 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 18 Mar 2010 14:37:43 +0100 Subject: gst-plugins-base_0.10.28: add updated ivorbis-thumb patch from gst-plugins-bad for build fix with thumb enabled Signed-off-by: Martin Jansa --- recipes/gstreamer/gst-plugins-base/ivorbis-thumb.patch | 12 ++++++++++++ recipes/gstreamer/gst-plugins-base_0.10.28.bb | 3 ++- 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 recipes/gstreamer/gst-plugins-base/ivorbis-thumb.patch diff --git a/recipes/gstreamer/gst-plugins-base/ivorbis-thumb.patch b/recipes/gstreamer/gst-plugins-base/ivorbis-thumb.patch new file mode 100644 index 0000000000..83b13e279b --- /dev/null +++ b/recipes/gstreamer/gst-plugins-base/ivorbis-thumb.patch @@ -0,0 +1,12 @@ +diff -uNr base/ext/vorbis.orig//gstvorbisdeclib.c base/ext/vorbis/gstvorbisdeclib.c +--- base/ext/vorbis.orig//gstvorbisdeclib.c 2010-02-15 13:03:13.000000000 +0100 ++++ base/ext/vorbis/gstvorbisdeclib.c 2010-03-18 18:48:10.000000000 +0100 +@@ -56,7 +56,7 @@ + #else + + /* Taken from Tremor, misc.h */ +-#ifdef _ARM_ASSEM_ ++#if defined(_ARM_ASSEM_) && !defined(__thumb__) + static inline ogg_int32_t + CLIP_TO_15 (ogg_int32_t x) + { diff --git a/recipes/gstreamer/gst-plugins-base_0.10.28.bb b/recipes/gstreamer/gst-plugins-base_0.10.28.bb index 621a8918fe..058f6a6c0f 100644 --- a/recipes/gstreamer/gst-plugins-base_0.10.28.bb +++ b/recipes/gstreamer/gst-plugins-base_0.10.28.bb @@ -2,12 +2,13 @@ require gst-plugins.inc SRC_URI += " \ file://gst-plugins-base_rowstride.patch;patch=1 \ + file://ivorbis-thumb.patch;patch=1 \ " SRC_URI[archive.md5sum] = "0107cf985ac90544bae70288220f5bab" SRC_URI[archive.sha256sum] = "132b6fd7749fcbfa9ad88c854aada44b6870c4175bda21cdb01a52b59a98e14f" -PR = "${INC_PR}.0" +PR = "${INC_PR}.1" PROVIDES += "gst-plugins" -- cgit v1.2.3 From c0dd1bf0f5eddfce8bf8f81ffb6e6df22e45bd47 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 18 Mar 2010 19:24:00 +0100 Subject: librsvg-native: PR bump after libexpat soname change Signed-off-by: Martin Jansa --- recipes/librsvg/librsvg-native_2.26.0.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes/librsvg/librsvg-native_2.26.0.bb b/recipes/librsvg/librsvg-native_2.26.0.bb index 0a0a274469..5ec1b285f1 100644 --- a/recipes/librsvg/librsvg-native_2.26.0.bb +++ b/recipes/librsvg/librsvg-native_2.26.0.bb @@ -2,6 +2,7 @@ DESCRIPTION = "Library for rendering SVG files" SECTION = "x11/utils" DEPENDS = "cairo-native pango-native gdk-pixbuf-csource-native" LICENSE = "LGPL" +PR = "r1" inherit native autotools_stage -- cgit v1.2.3 From 8471bbd175bc8571e1207febdca20858af12b54e Mon Sep 17 00:00:00 2001 From: Michael Lippautz Date: Thu, 18 Mar 2010 19:37:12 +0100 Subject: lighttpd: Convert to new staging. Recipe cleanup. Signed-off-by: Michael Lippautz --- recipes/lighttpd/lighttpd.inc | 58 ++++++++++++++++++++----------------------- 1 file changed, 27 insertions(+), 31 deletions(-) diff --git a/recipes/lighttpd/lighttpd.inc b/recipes/lighttpd/lighttpd.inc index 20e85a8dad..e9f8640d66 100644 --- a/recipes/lighttpd/lighttpd.inc +++ b/recipes/lighttpd/lighttpd.inc @@ -3,32 +3,32 @@ SECTION = "net" LICENSE = "BSD" DEPENDS = "libpcre" RDEPENDS_${PN} += " \ - lighttpd-module-access \ - lighttpd-module-accesslog \ - lighttpd-module-indexfile \ - lighttpd-module-dirlisting \ - lighttpd-module-staticfile \ - " + lighttpd-module-access \ + lighttpd-module-accesslog \ + lighttpd-module-indexfile \ + lighttpd-module-dirlisting \ + lighttpd-module-staticfile \ +" -INC_PR = "r7" +INC_PR = "r8" SRC_URI = "http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${PV}.tar.gz;name=src \ - file://index.html \ - file://lighttpd.conf \ - file://lighttpd \ - " - -EXTRA_OECONF=" \ - --without-bzip2 \ - --without-ldap \ - --without-lua \ - --without-memcache \ - --with-pcre \ - --without-webdav-props \ - --without-webdav-locks \ - --without-openssl \ - --disable-static \ - " + file://index.html \ + file://lighttpd.conf \ + file://lighttpd \ +" + +EXTRA_OECONF = " \ + --without-bzip2 \ + --without-ldap \ + --without-lua \ + --without-memcache \ + --with-pcre \ + --without-webdav-props \ + --without-webdav-locks \ + --without-openssl \ + --disable-static \ +" inherit autotools pkgconfig update-rc.d gettext @@ -36,14 +36,10 @@ INITSCRIPT_NAME = "lighttpd" INITSCRIPT_PARAMS = "defaults 70" do_install_append() { - install -d ${D}${sysconfdir}/init.d ${D}/www/logs ${D}/www/pages/dav ${D}/www/var - install -m 0755 ${WORKDIR}/lighttpd ${D}${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/lighttpd.conf ${D}${sysconfdir} - install -m 0644 ${WORKDIR}/index.html ${D}/www/pages/ -} - -do_stage() { - autotools_stage_all + install -d ${D}${sysconfdir}/init.d ${D}/www/logs ${D}/www/pages/dav ${D}/www/var + install -m 0755 ${WORKDIR}/lighttpd ${D}${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/lighttpd.conf ${D}${sysconfdir} + install -m 0644 ${WORKDIR}/index.html ${D}/www/pages/ } FILES_${PN} += "${sysconfdir} /www" -- cgit v1.2.3 From 3d701ecb179745aa311f373b4beb13b2f1e2cec6 Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Mon, 15 Mar 2010 15:41:09 +0000 Subject: autoconf_2.65.bb : add newest version of autoconf. .64 and .65 are starting to get required by some configure.in scripts --- recipes/autoconf/autoconf-2.65/autoconf-x.patch | 36 ++ .../autoconf259-update-configscripts.patch | 393 +++++++++++++++++++++ .../autoheader-nonfatal-warnings.patch | 13 + .../autoconf-2.65/autoreconf-exclude.patch | 123 +++++++ .../autoconf-2.65/autoreconf-foreign.patch | 11 + .../autoconf-2.65/autoreconf-gnuconfigize.patch | 30 ++ recipes/autoconf/autoconf-2.65/config-site.patch | 11 + recipes/autoconf/autoconf-2.65/fix_path_xtra.patch | 119 +++++++ .../autoconf/autoconf-2.65/program_prefix.patch | 19 + recipes/autoconf/autoconf-2.65/sizeof_types.patch | 87 +++++ recipes/autoconf/autoconf_2.65.bb | 17 + 11 files changed, 859 insertions(+) create mode 100644 recipes/autoconf/autoconf-2.65/autoconf-x.patch create mode 100644 recipes/autoconf/autoconf-2.65/autoconf259-update-configscripts.patch create mode 100644 recipes/autoconf/autoconf-2.65/autoheader-nonfatal-warnings.patch create mode 100644 recipes/autoconf/autoconf-2.65/autoreconf-exclude.patch create mode 100644 recipes/autoconf/autoconf-2.65/autoreconf-foreign.patch create mode 100644 recipes/autoconf/autoconf-2.65/autoreconf-gnuconfigize.patch create mode 100644 recipes/autoconf/autoconf-2.65/config-site.patch create mode 100644 recipes/autoconf/autoconf-2.65/fix_path_xtra.patch create mode 100644 recipes/autoconf/autoconf-2.65/program_prefix.patch create mode 100644 recipes/autoconf/autoconf-2.65/sizeof_types.patch create mode 100644 recipes/autoconf/autoconf_2.65.bb diff --git a/recipes/autoconf/autoconf-2.65/autoconf-x.patch b/recipes/autoconf/autoconf-2.65/autoconf-x.patch new file mode 100644 index 0000000000..596535b7d6 --- /dev/null +++ b/recipes/autoconf/autoconf-2.65/autoconf-x.patch @@ -0,0 +1,36 @@ +Index: lib/autoconf/libs.m4 +=================================================================== +RCS file: /cvsroot/autoconf/autoconf/lib/autoconf/libs.m4,v +retrieving revision 1.13 +diff -p -u -r1.13 libs.m4 +--- autoconf-2.59/lib/autoconf/libs.m4 6 Sep 2005 15:34:06 -0000 1.13 ++++ autoconf-2.59/lib/autoconf/libs.m4 18 Sep 2005 17:09:58 -0000 +@@ -265,13 +265,13 @@ ac_x_header_dirs=' + /usr/openwin/share/include' + + if test "$ac_x_includes" = no; then +- # Guess where to find include files, by looking for Intrinsic.h. ++ # Guess where to find include files, by looking for Xlib.h. + # First, try using that file with no special directory specified. +- AC_PREPROC_IFELSE([AC_LANG_SOURCE([@%:@include ])], ++ AC_PREPROC_IFELSE([AC_LANG_SOURCE([@%:@include ])], + [# We can compile using X headers with no special include directory. + ac_x_includes=], + [for ac_dir in $ac_x_header_dirs; do +- if test -r "$ac_dir/X11/Intrinsic.h"; then ++ if test -r "$ac_dir/X11/Xlib.h"; then + ac_x_includes=$ac_dir + break + fi +@@ -284,9 +284,9 @@ if test "$ac_x_libraries" = no; then + # Don't add to $LIBS permanently. + ac_save_LIBS=$LIBS +- LIBS="-lXt $LIBS" +- AC_LINK_IFELSE([AC_LANG_PROGRAM([@%:@include ], +- [XtMalloc (0)])], ++ LIBS="-lX11 $LIBS" ++ AC_LINK_IFELSE([AC_LANG_PROGRAM([@%:@include ], ++ [XrmInitialize ()])], + [LIBS=$ac_save_LIBS + # We can link X programs with no special library path. + ac_x_libraries=], diff --git a/recipes/autoconf/autoconf-2.65/autoconf259-update-configscripts.patch b/recipes/autoconf/autoconf-2.65/autoconf259-update-configscripts.patch new file mode 100644 index 0000000000..2adda7403d --- /dev/null +++ b/recipes/autoconf/autoconf-2.65/autoconf259-update-configscripts.patch @@ -0,0 +1,393 @@ +--- autoconf-2.59/build-aux/config.guess.old 2003-10-23 10:28:51.000000000 -0400 ++++ autoconf-2.59/build-aux/config.guess 2004-04-24 22:36:28.000000000 -0400 +@@ -3,7 +3,7 @@ + # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, + # 2000, 2001, 2002, 2003 Free Software Foundation, Inc. + +-timestamp='2003-10-03' ++timestamp='2004-03-12' + + # This file is free software; you can redistribute it and/or modify it + # under the terms of the GNU General Public License as published by +@@ -197,12 +197,18 @@ + # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. + echo "${machine}-${os}${release}" + exit 0 ;; ++ amd64:OpenBSD:*:*) ++ echo x86_64-unknown-openbsd${UNAME_RELEASE} ++ exit 0 ;; + amiga:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + arc:OpenBSD:*:*) + echo mipsel-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; ++ cats:OpenBSD:*:*) ++ echo arm-unknown-openbsd${UNAME_RELEASE} ++ exit 0 ;; + hp300:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; +@@ -221,6 +227,9 @@ + mvmeppc:OpenBSD:*:*) + echo powerpc-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; ++ pegasos:OpenBSD:*:*) ++ echo powerpc-unknown-openbsd${UNAME_RELEASE} ++ exit 0 ;; + pmax:OpenBSD:*:*) + echo mipsel-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; +@@ -236,10 +245,24 @@ + *:OpenBSD:*:*) + echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; ++ *:ekkoBSD:*:*) ++ echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} ++ exit 0 ;; ++ macppc:MirBSD:*:*) ++ echo powerppc-unknown-mirbsd${UNAME_RELEASE} ++ exit 0 ;; ++ *:MirBSD:*:*) ++ echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} ++ exit 0 ;; + alpha:OSF1:*:*) +- if test $UNAME_RELEASE = "V4.0"; then ++ case $UNAME_RELEASE in ++ *4.0) + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` +- fi ++ ;; ++ *5.*) ++ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` ++ ;; ++ esac + # According to Compaq, /usr/sbin/psrinfo has been available on + # OSF/1 and Tru64 systems produced since 1995. I hope that + # covers most systems running today. This code pipes the CPU +@@ -277,11 +300,12 @@ + "EV7.9 (21364A)") + UNAME_MACHINE="alphaev79" ;; + esac ++ # A Pn.n version is a patched version. + # A Vn.n version is a released version. + # A Tn.n version is a released field test version. + # A Xn.n version is an unreleased experimental baselevel. + # 1.2 uses "1.2" for uname -r. +- echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` ++ echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` + exit 0 ;; + Alpha*:OpenVMS:*:*) + echo alpha-hp-vms +@@ -307,6 +331,9 @@ + *:OS/390:*:*) + echo i370-ibm-openedition + exit 0 ;; ++ *:OS400:*:*) ++ echo powerpc-ibm-os400 ++ exit 0 ;; + arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) + echo arm-acorn-riscix${UNAME_RELEASE} + exit 0;; +@@ -399,6 +426,9 @@ + *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) + echo m68k-unknown-mint${UNAME_RELEASE} + exit 0 ;; ++ m68k:machten:*:*) ++ echo m68k-apple-machten${UNAME_RELEASE} ++ exit 0 ;; + powerpc:machten:*:*) + echo powerpc-apple-machten${UNAME_RELEASE} + exit 0 ;; +@@ -742,6 +772,11 @@ + FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` + echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit 0 ;; ++ 5000:UNIX_System_V:4.*:*) ++ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` ++ FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` ++ echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" ++ exit 0 ;; + i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) + echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} + exit 0 ;; +@@ -751,7 +786,7 @@ + *:BSD/OS:*:*) + echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} + exit 0 ;; +- *:FreeBSD:*:*|*:GNU/FreeBSD:*:*) ++ *:FreeBSD:*:*) + # Determine whether the default compiler uses glibc. + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c +@@ -763,7 +798,7 @@ + #endif + EOF + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` +- # GNU/FreeBSD systems have a "k" prefix to indicate we are using ++ # GNU/KFreeBSD systems have a "k" prefix to indicate we are using + # FreeBSD's kernel, but not the complete OS. + case ${LIBC} in gnu) kernel_only='k' ;; esac + echo ${UNAME_MACHINE}-unknown-${kernel_only}freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC} +@@ -799,8 +834,13 @@ + echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit 0 ;; + *:GNU:*:*) ++ # the GNU system + echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` + exit 0 ;; ++ *:GNU/*:*:*) ++ # other systems with GNU libc and userland ++ echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu ++ exit 0 ;; + i*86:Minix:*:*) + echo ${UNAME_MACHINE}-pc-minix + exit 0 ;; +@@ -813,6 +853,9 @@ + ia64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit 0 ;; ++ m32r*:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit 0 ;; + m68*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit 0 ;; +@@ -981,6 +1024,9 @@ + i*86:atheos:*:*) + echo ${UNAME_MACHINE}-unknown-atheos + exit 0 ;; ++ i*86:syllable:*:*) ++ echo ${UNAME_MACHINE}-pc-syllable ++ exit 0 ;; + i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) + echo i386-unknown-lynxos${UNAME_RELEASE} + exit 0 ;; +@@ -1052,7 +1098,7 @@ + exit 0 ;; + M68*:*:R3V[567]*:*) + test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; +- 3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0) ++ 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0) + OS_REL='' + test -r /etc/.relid \ + && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` +@@ -1167,7 +1213,7 @@ + *:QNX:*:4*) + echo i386-pc-qnx + exit 0 ;; +- NSR-[DGKLNPTVWY]:NONSTOP_KERNEL:*:*) ++ NSR-?:NONSTOP_KERNEL:*:*) + echo nsr-tandem-nsk${UNAME_RELEASE} + exit 0 ;; + *:NonStop-UX:*:*) +@@ -1211,6 +1257,9 @@ + SEI:*:*:SEIUX) + echo mips-sei-seiux${UNAME_RELEASE} + exit 0 ;; ++ *:DragonFly:*:*) ++ echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ++ exit 0 ;; + esac + + #echo '(No uname command or uname output not recognized.)' 1>&2 +--- autoconf-2.59/build-aux/config.sub.old 2003-10-23 10:28:51.000000000 -0400 ++++ autoconf-2.59/build-aux/config.sub 2004-04-24 22:36:28.000000000 -0400 +@@ -3,7 +3,7 @@ + # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, + # 2000, 2001, 2002, 2003 Free Software Foundation, Inc. + +-timestamp='2003-08-18' ++timestamp='2004-03-12' + + # This file is (in principle) common to ALL GNU software. + # The presence of a machine in this file suggests that SOME GNU software +@@ -118,7 +118,8 @@ + # Here we must recognize all the valid KERNEL-OS combinations. + maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` + case $maybe_os in +- nto-qnx* | linux-gnu* | linux-dietlibc | kfreebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*) ++ nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \ ++ kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*) + os=-$maybe_os + basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` + ;; +@@ -236,7 +237,7 @@ + | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ + | i370 | i860 | i960 | ia64 \ + | ip2k | iq2000 \ +- | m32r | m68000 | m68k | m88k | mcore \ ++ | m32r | m32rle | m68000 | m68k | m88k | mcore \ + | mips | mipsbe | mipseb | mipsel | mipsle \ + | mips16 \ + | mips64 | mips64el \ +@@ -261,7 +262,7 @@ + | pyramid \ + | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ + | sh64 | sh64le \ +- | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \ ++ | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 | sparcv9b \ + | strongarm \ + | tahoe | thumb | tic4x | tic80 | tron \ + | v850 | v850e \ +@@ -307,7 +308,7 @@ + | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ + | i*86-* | i860-* | i960-* | ia64-* \ + | ip2k-* | iq2000-* \ +- | m32r-* \ ++ | m32r-* | m32rle-* \ + | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ + | m88110-* | m88k-* | mcore-* \ + | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ +@@ -335,7 +336,7 @@ + | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \ + | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ + | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \ +- | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ ++ | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ + | tahoe-* | thumb-* \ + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ + | tron-* \ +@@ -362,6 +363,9 @@ + basic_machine=a29k-amd + os=-udi + ;; ++ abacus) ++ basic_machine=abacus-unknown ++ ;; + adobe68k) + basic_machine=m68010-adobe + os=-scout +@@ -379,6 +383,9 @@ + amd64) + basic_machine=x86_64-pc + ;; ++ amd64-*) ++ basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; + amdahl) + basic_machine=580-amdahl + os=-sysv +@@ -438,12 +445,20 @@ + basic_machine=j90-cray + os=-unicos + ;; ++ cr16c) ++ basic_machine=cr16c-unknown ++ os=-elf ++ ;; + crds | unos) + basic_machine=m68k-crds + ;; + cris | cris-* | etrax*) + basic_machine=cris-axis + ;; ++ crx) ++ basic_machine=crx-unknown ++ os=-elf ++ ;; + da30 | da30-*) + basic_machine=m68k-da30 + ;; +@@ -743,6 +758,10 @@ + basic_machine=or32-unknown + os=-coff + ;; ++ os400) ++ basic_machine=powerpc-ibm ++ os=-os400 ++ ;; + OSE68000 | ose68000) + basic_machine=m68000-ericsson + os=-ose +@@ -963,6 +982,10 @@ + tower | tower-32) + basic_machine=m68k-ncr + ;; ++ tpf) ++ basic_machine=s390x-ibm ++ os=-tpf ++ ;; + udi29k) + basic_machine=a29k-amd + os=-udi +@@ -1058,7 +1081,7 @@ + sh64) + basic_machine=sh64-unknown + ;; +- sparc | sparcv9 | sparcv9b) ++ sparc | sparcv8 | sparcv9 | sparcv9b) + basic_machine=sparc-sun + ;; + cydra) +@@ -1131,19 +1154,20 @@ + | -aos* \ + | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ + | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ +- | -hiux* | -386bsd* | -netbsd* | -openbsd* | -kfreebsd* | -freebsd* | -riscix* \ +- | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ ++ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \ ++ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ ++ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ + | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ + | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ + | -chorusos* | -chorusrdb* \ + | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ +- | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \ ++ | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \ + | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ + | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ + | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ + | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ + | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ +- | -powermax* | -dnix* | -nx6 | -nx7 | -sei*) ++ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*) + # Remember, each alternative MUST END IN *, to match a version number. + ;; + -qnx*) +@@ -1182,6 +1206,9 @@ + -opened*) + os=-openedition + ;; ++ -os400*) ++ os=-os400 ++ ;; + -wince*) + os=-wince + ;; +@@ -1203,6 +1230,9 @@ + -atheos*) + os=-atheos + ;; ++ -syllable*) ++ os=-syllable ++ ;; + -386bsd) + os=-bsd + ;; +@@ -1225,6 +1255,9 @@ + -sinix*) + os=-sysv4 + ;; ++ -tpf*) ++ os=-tpf ++ ;; + -triton*) + os=-sysv3 + ;; +@@ -1473,9 +1506,15 @@ + -mvs* | -opened*) + vendor=ibm + ;; ++ -os400*) ++ vendor=ibm ++ ;; + -ptx*) + vendor=sequent + ;; ++ -tpf*) ++ vendor=ibm ++ ;; + -vxsim* | -vxworks* | -windiss*) + vendor=wrs + ;; diff --git a/recipes/autoconf/autoconf-2.65/autoheader-nonfatal-warnings.patch b/recipes/autoconf/autoconf-2.65/autoheader-nonfatal-warnings.patch new file mode 100644 index 0000000000..1f18e04bba --- /dev/null +++ b/recipes/autoconf/autoconf-2.65/autoheader-nonfatal-warnings.patch @@ -0,0 +1,13 @@ +--- autoconf-2.59/bin/autoheader.in~ 2003-10-10 14:52:56.000000000 +0100 ++++ autoconf-2.59/bin/autoheader.in 2004-05-03 01:36:45.000000000 +0100 +@@ -272,8 +272,8 @@ + } + + } +- exit 1 +- if keys %symbol; ++# exit 1 ++# if keys %symbol; + } + + update_file ("$tmp/config.hin", "$config_h_in"); diff --git a/recipes/autoconf/autoconf-2.65/autoreconf-exclude.patch b/recipes/autoconf/autoconf-2.65/autoreconf-exclude.patch new file mode 100644 index 0000000000..2eaf8d9016 --- /dev/null +++ b/recipes/autoconf/autoconf-2.65/autoreconf-exclude.patch @@ -0,0 +1,123 @@ +--- /tmp/autoreconf.in 2009-06-02 11:59:05.000000000 +0200 ++++ autoconf-2.63/bin/autoreconf.in 2009-06-02 12:09:03.000000000 +0200 +@@ -76,6 +76,7 @@ + -i, --install copy missing auxiliary files + --no-recursive don't rebuild sub-packages + -s, --symlink with -i, install symbolic links instead of copies ++ -x, --exclude=STEPS steps we should not run + -m, --make when applicable, re-run ./configure && make + -W, --warnings=CATEGORY report the warnings falling in CATEGORY [syntax] + +@@ -136,6 +137,13 @@ + # Recurse into subpackages + my $recursive = 1; + ++# Steps to exclude ++my @exclude; ++my @ex; ++ ++my $uses_gettext; ++my $configure_ac; ++ + ## ---------- ## + ## Routines. ## + ## ---------- ## +@@ -153,6 +161,7 @@ + 'B|prepend-include=s' => \@prepend_include, + 'i|install' => \$install, + 's|symlink' => \$symlink, ++ 'x|exclude=s' => \@exclude, + 'm|make' => \$run_make, + 'recursive!' => \$recursive); + +@@ -162,6 +171,8 @@ + parse_WARNINGS; + parse_warnings '--warnings', @warning; + ++ @exclude = map { split /,/ } @exclude; ++ + # Even if the user specified a configure.ac, trim to get the + # directory, and look for configure.ac again. Because (i) the code + # is simpler, and (ii) we are still able to diagnose simultaneous +@@ -190,6 +201,7 @@ + $autoconf .= join (' --prepend-include=', '', map { shell_quote ($_) } @prepend_include); + $autoheader .= join (' --include=', '', map { shell_quote ($_) } @include); + $autoheader .= join (' --prepend-include=', '', map { shell_quote ($_) } @prepend_include); ++ $aclocal .= join (' -I ', '', @include); + + # --install and --symlink; + if ($install) +@@ -254,6 +266,11 @@ + { + my ($aclocal, $flags) = @_; + ++ @ex = grep (/^aclocal$/, @exclude); ++ if ($#ex != -1) { ++ return; ++ } ++ + # aclocal 1.8+ does all this for free. It can be recognized by its + # --force support. + if ($aclocal_supports_force) +@@ -367,8 +384,11 @@ + } + else + { +- xsystem_hint ("autopoint is needed because this package uses Gettext", "$autopoint"); +- } ++ @ex = grep (/^autopoint$/, @exclude); ++ if ($#ex == -1) { ++ xsystem_hint ("autopoint is needed because this package uses Gettext", "$autopoint"); ++ } ++ } + + + # ----------------- # +@@ -531,7 +551,10 @@ + { + $libtoolize .= " --ltdl"; + } +- xsystem_hint ("libtoolize is needed because this package uses Libtool", $libtoolize); ++ @ex = grep (/^libtoolize$/, @exclude); ++ if ($#ex == -1) { ++ xsystem_hint ("libtoolize is needed because this package uses Libtool", $libtoolize); ++ } + $rerun_aclocal = 1; + } + else +@@ -592,7 +615,10 @@ + } + else + { +- xsystem ($autoheader); ++ @ex = grep (/^autoheader$/, @exclude); ++ if ($#ex == -1) { ++ xsystem ("$autoheader"); ++ } + } + + +@@ -609,7 +635,10 @@ + # We should always run automake, and let it decide whether it shall + # update the file or not. In fact, the effect of `$force' is already + # included in `$automake' via `--no-force'. +- xsystem ($automake); ++ @ex = grep (/^automake$/, @exclude); ++ if ($#ex == -1) { ++ xsystem ("$automake"); ++ } + } + + +@@ -633,7 +662,10 @@ + } + else + { +- xsystem ("$make"); ++ @ex = grep (/^make$/, @exclude); ++ if ($#ex == -1) { ++ xsystem ("make"); ++ } + } + } + } diff --git a/recipes/autoconf/autoconf-2.65/autoreconf-foreign.patch b/recipes/autoconf/autoconf-2.65/autoreconf-foreign.patch new file mode 100644 index 0000000000..587a823826 --- /dev/null +++ b/recipes/autoconf/autoconf-2.65/autoreconf-foreign.patch @@ -0,0 +1,11 @@ +--- autoconf-2.59/bin/autoreconf.in~autoreconf-foreign 2004-05-09 20:55:06.000000000 -0400 ++++ autoconf-2.59/bin/autoreconf.in 2004-05-09 20:55:55.000000000 -0400 +@@ -184,6 +184,8 @@ + + $aclocal_supports_force = `$aclocal --help` =~ /--force/; + ++ $automake .= ' --foreign'; ++ + # Dispatch autoreconf's option to the tools. + # --include; + $autoconf .= join (' --include=', '', @include); diff --git a/recipes/autoconf/autoconf-2.65/autoreconf-gnuconfigize.patch b/recipes/autoconf/autoconf-2.65/autoreconf-gnuconfigize.patch new file mode 100644 index 0000000000..beeb4c70c0 --- /dev/null +++ b/recipes/autoconf/autoconf-2.65/autoreconf-gnuconfigize.patch @@ -0,0 +1,30 @@ +--- /tmp/autoreconf.in 2009-06-02 13:10:42.000000000 +0200 ++++ autoconf-2.63/bin/autoreconf.in 2009-06-02 13:12:28.000000000 +0200 +@@ -58,7 +58,7 @@ + $help = "Usage: $0 [OPTION]... [DIRECTORY]... + + Run `autoconf' (and `autoheader', `aclocal', `automake', `autopoint' +-(formerly `gettextize'), and `libtoolize' where appropriate) ++(formerly `gettextize'), `libtoolize', and `gnu-configize' where appropriate) + repeatedly to remake the GNU Build System files in specified + DIRECTORIES and their subdirectories (defaulting to `.'). + +@@ -115,6 +115,7 @@ + my $libtoolize = $ENV{'LIBTOOLIZE'} || 'libtoolize'; + my $autopoint = $ENV{'AUTOPOINT'} || 'autopoint'; + my $make = $ENV{'MAKE'} || 'make'; ++my $gnuconfigize = $ENV{'GNUCONFIGIZE'} || 'gnu-configize'; + + # --install -- as --add-missing in other tools. + my $install = 0; +@@ -643,6 +644,10 @@ + } + } + ++ @ex = grep (/^gnu-configize$/, @exclude); ++ if ($#ex == -1) { ++ xsystem ("$gnuconfigize"); ++ } + + # -------------- # + # Running make. # diff --git a/recipes/autoconf/autoconf-2.65/config-site.patch b/recipes/autoconf/autoconf-2.65/config-site.patch new file mode 100644 index 0000000000..0c66fe31b8 --- /dev/null +++ b/recipes/autoconf/autoconf-2.65/config-site.patch @@ -0,0 +1,11 @@ +--- /tmp/general.m4 2009-06-02 15:14:15.000000000 +0200 ++++ autoconf-2.63/lib/autoconf/general.m4 2009-06-02 15:14:42.000000000 +0200 +@@ -1848,7 +1848,7 @@ + ac_site_file1=$ac_default_prefix/share/config.site + ac_site_file2=$ac_default_prefix/etc/config.site + fi +-for ac_site_file in "$ac_site_file1" "$ac_site_file2" ++for ac_site_file in $ac_site_file1 "$ac_site_file2" + do + test "x$ac_site_file" = xNONE && continue + if test -r "$ac_site_file"; then diff --git a/recipes/autoconf/autoconf-2.65/fix_path_xtra.patch b/recipes/autoconf/autoconf-2.65/fix_path_xtra.patch new file mode 100644 index 0000000000..e74ca808a2 --- /dev/null +++ b/recipes/autoconf/autoconf-2.65/fix_path_xtra.patch @@ -0,0 +1,119 @@ +We don't build xmkmf so any values returned from it are going to be wrong. +Using any paths in /usr/ for x headers/libs is a bad idea when cross compiling. +This patch removes them to stop any confusion. + +RP - 20071115 + +Index: autoconf-2.65/lib/autoconf/libs.m4 +=================================================================== +--- autoconf-2.65.orig/lib/autoconf/libs.m4 ++++ autoconf-2.65/lib/autoconf/libs.m4 +@@ -158,54 +158,6 @@ m4_popdef([AC_Lib_Name])dnl + # Checks for X window. # + # --------------------- # + +- +-# _AC_PATH_X_XMKMF +-# ---------------- +-# Internal subroutine of _AC_PATH_X. +-# Set ac_x_includes and/or ac_x_libraries. +-m4_define([_AC_PATH_X_XMKMF], +-[AC_ARG_VAR(XMKMF, [Path to xmkmf, Makefile generator for X Window System])dnl +-rm -f -r conftest.dir +-if mkdir conftest.dir; then +- cd conftest.dir +- cat >Imakefile <<'_ACEOF' +-incroot: +- @echo incroot='${INCROOT}' +-usrlibdir: +- @echo usrlibdir='${USRLIBDIR}' +-libdir: +- @echo libdir='${LIBDIR}' +-_ACEOF +- if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; then +- # GNU make sometimes prints "make[1]: Entering...", which would confuse us. +- for ac_var in incroot usrlibdir libdir; do +- eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`" +- done +- # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR. +- for ac_extension in a so sl dylib la dll; do +- if test ! -f "$ac_im_usrlibdir/libX11.$ac_extension" && +- test -f "$ac_im_libdir/libX11.$ac_extension"; then +- ac_im_usrlibdir=$ac_im_libdir; break +- fi +- done +- # Screen out bogus values from the imake configuration. They are +- # bogus both because they are the default anyway, and because +- # using them would break gcc on systems where it needs fixed includes. +- case $ac_im_incroot in +- /usr/include) ac_x_includes= ;; +- *) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;; +- esac +- case $ac_im_usrlibdir in +- /usr/lib | /usr/lib64 | /lib | /lib64) ;; +- *) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;; +- esac +- fi +- cd .. +- rm -f -r conftest.dir +-fi +-])# _AC_PATH_X_XMKMF +- +- + # _AC_PATH_X_DIRECT + # ----------------- + # Internal subroutine of _AC_PATH_X. +@@ -213,44 +165,7 @@ fi + m4_define([_AC_PATH_X_DIRECT], + [# Standard set of common directories for X headers. + # Check X11 before X11Rn because it is often a symlink to the current release. +-ac_x_header_dirs=' +-/usr/X11/include +-/usr/X11R7/include +-/usr/X11R6/include +-/usr/X11R5/include +-/usr/X11R4/include +- +-/usr/include/X11 +-/usr/include/X11R7 +-/usr/include/X11R6 +-/usr/include/X11R5 +-/usr/include/X11R4 +- +-/usr/local/X11/include +-/usr/local/X11R7/include +-/usr/local/X11R6/include +-/usr/local/X11R5/include +-/usr/local/X11R4/include +- +-/usr/local/include/X11 +-/usr/local/include/X11R7 +-/usr/local/include/X11R6 +-/usr/local/include/X11R5 +-/usr/local/include/X11R4 +- +-/usr/X386/include +-/usr/x386/include +-/usr/XFree86/include/X11 +- +-/usr/include +-/usr/local/include +-/usr/unsupported/include +-/usr/athena/include +-/usr/local/x11r5/include +-/usr/lpp/Xamples/include +- +-/usr/openwin/include +-/usr/openwin/share/include' ++ac_x_header_dirs='' + + if test "$ac_x_includes" = no; then + # Guess where to find include files, by looking for Xlib.h. +@@ -299,7 +214,6 @@ AC_DEFUN([_AC_PATH_X], + [AC_CACHE_VAL(ac_cv_have_x, + [# One or both of the vars are not set, and there is no cached value. + ac_x_includes=no ac_x_libraries=no +-_AC_PATH_X_XMKMF + _AC_PATH_X_DIRECT + case $ac_x_includes,$ac_x_libraries in #( + no,* | *,no | *\'*) diff --git a/recipes/autoconf/autoconf-2.65/program_prefix.patch b/recipes/autoconf/autoconf-2.65/program_prefix.patch new file mode 100644 index 0000000000..e6f4096a97 --- /dev/null +++ b/recipes/autoconf/autoconf-2.65/program_prefix.patch @@ -0,0 +1,19 @@ + +# +# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher +# + +--- autoconf-2.57/lib/autoconf/general.m4~program_prefix ++++ autoconf-2.57/lib/autoconf/general.m4 +@@ -1676,8 +1676,9 @@ + # The aliases save the names the user supplied, while $host etc. + # will get canonicalized. + test -n "$target_alias" && +- test "$program_prefix$program_suffix$program_transform_name" = \ +- NONENONEs,x,x, && ++ test "$target_alias" != "$host_alias" && ++ test "$program_prefix$program_suffix$program_transform_name" = \ ++ NONENONEs,x,x, && + program_prefix=${target_alias}-[]dnl + ])# AC_CANONICAL_TARGET + diff --git a/recipes/autoconf/autoconf-2.65/sizeof_types.patch b/recipes/autoconf/autoconf-2.65/sizeof_types.patch new file mode 100644 index 0000000000..30fd5c1926 --- /dev/null +++ b/recipes/autoconf/autoconf-2.65/sizeof_types.patch @@ -0,0 +1,87 @@ + +# +# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher +# + +Index: autoconf-2.59/lib/autoconf/types.m4 +=================================================================== +--- autoconf-2.59.orig/lib/autoconf/types.m4 2003-05-22 14:05:14.000000000 +0200 ++++ autoconf-2.59/lib/autoconf/types.m4 2006-08-06 02:05:02.000000000 +0200 +@@ -380,26 +380,66 @@ + # Generic checks. # + # ---------------- # + ++# Backport of AC_CHECK_TARGET_TOOL from autoconf 2.60 ++# AC_CHECK_TARGET_TOOL(VARIABLE, PROG-TO-CHECK-FOR, [VALUE-IF-NOT-FOUND], [PATH ) ++# ------------------------------------------------------------------------ ++# (Use different variables $1 and ac_ct_$1 so that cache vars don't conflict.) ++AC_DEFUN([AC_CHECK_TARGET_TOOL], ++[AC_BEFORE([$0], [AC_CANONICAL_TARGET])dnl ++AC_CHECK_PROG([$1], [$target_alias-$2], [$target_alias-$2], , [$4]) ++if test -z "$ac_cv_prog_$1"; then ++ if test "$build" = "$target"; then ++ ac_ct_$1=$$1 ++ AC_CHECK_PROG([ac_ct_$1], [$2], [$2], [$3], [$4]) ++ $1=ac_ct_$1 ++ else ++ $1="$3" ++ fi ++else ++ $1="$ac_cv_prog_$1" ++fi ++])# AC_CHECK_TARGET_TOOL ++ ++ ++AC_DEFUN([AC_PROG_SIZE], ++[ ++ AC_CHECK_TARGET_TOOL([SIZE], [size], [size], [$PATH]) ++]) + + # AC_CHECK_SIZEOF(TYPE, [IGNORED], [INCLUDES = DEFAULT-INCLUDES]) + # --------------------------------------------------------------- + AC_DEFUN([AC_CHECK_SIZEOF], +-[AS_LITERAL_IF([$1], [], ++[AC_REQUIRE([AC_PROG_SIZE]) ++AC_REQUIRE([AC_PROG_AWK]) ++ AS_LITERAL_IF([$1], [], + [AC_FATAL([$0: requires literal arguments])])dnl + AC_CHECK_TYPE([$1], [], [], [$3]) + AC_CACHE_CHECK([size of $1], AS_TR_SH([ac_cv_sizeof_$1]), +-[if test "$AS_TR_SH([ac_cv_type_$1])" = yes; then +- # The cast to unsigned long works around a bug in the HP C Compiler +- # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +- # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. +- # This bug is HP SR number 8606223364. +- _AC_COMPUTE_INT([(long) (sizeof ($1))], +- [AS_TR_SH([ac_cv_sizeof_$1])], +- [AC_INCLUDES_DEFAULT([$3])], +- [AC_MSG_FAILURE([cannot compute sizeof ($1), 77])]) ++[ ++if test "$AS_TR_SH([ac_cv_type_$1])" = yes; then ++ if test "$cross_compiling" = yes; then ++ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT([$3])], ++ [extern void dummy($1); static const $1 x[[256]]; dummy(x);])], ++ [ ++ AS_TR_SH([ac_cv_sizeof_$1])=`$SIZE conftest.$ac_objext | tail -n 1 | $AWK '{print [$]3/256}'` ++ ], ++ [ ++ AS_TR_SH([ac_cv_sizeof_$1])=0 ++ ]) ++ else ++ # The cast to unsigned long works around a bug in the HP C Compiler ++ # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects ++ # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. ++ # This bug is HP SR number 8606223364. ++ _AC_COMPUTE_INT([(long) (sizeof ($1))], ++ [AS_TR_SH([ac_cv_sizeof_$1])], ++ [AC_INCLUDES_DEFAULT([$3])], ++ [AC_MSG_FAILURE([cannot compute sizeof ($1), 77])]) ++ fi + else + AS_TR_SH([ac_cv_sizeof_$1])=0 +-fi])dnl ++fi ++])dnl + AC_DEFINE_UNQUOTED(AS_TR_CPP(sizeof_$1), $AS_TR_SH([ac_cv_sizeof_$1]), + [The size of a `$1', as computed by sizeof.]) + ])# AC_CHECK_SIZEOF diff --git a/recipes/autoconf/autoconf_2.65.bb b/recipes/autoconf/autoconf_2.65.bb new file mode 100644 index 0000000000..0093c4b4de --- /dev/null +++ b/recipes/autoconf/autoconf_2.65.bb @@ -0,0 +1,17 @@ +require autoconf.inc + +PR = "${INC_PR}.0" + +DEFAULT_PREFERENCE = "-1" + +SRC_URI += "file://autoreconf-exclude.patch;patch=1 \ + file://autoreconf-foreign.patch;patch=1 \ + file://autoheader-nonfatal-warnings.patch;patch=1 \ + file://autoreconf-gnuconfigize.patch;patch=1 \ + file://config-site.patch;patch=1" + +SRC_URI_append_virtclass-native = " file://fix_path_xtra.patch;patch=1" + +SRC_URI[autoconf.md5sum] = "a6de1cc6434cd64038b0a0ae4e252b33" +SRC_URI[autoconf.sha256sum] = "db11944057f3faf229ff5d6ce3fcd819f565455c152b72cec17ebc1cbb80136b" + -- cgit v1.2.3 From 5f911bdab63fa06ad74764c4cfd707660fc2af4d Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Mon, 15 Mar 2010 15:41:53 +0000 Subject: libpcap_1.0.0.bb : apply patch to fix autoconf 2.64+ problems. Patch was extracted from libpcap git and refreshed. Have to copy aclocal to acinclude to not lose the new macros when OE overwrites. --- ...oblems-that-show-up-in-autoconf-2.64-and-.patch | 140 +++++++++++++++++++++ recipes/libpcap/libpcap_1.0.0.bb | 5 + 2 files changed, 145 insertions(+) create mode 100644 recipes/libpcap/libpcap-1.0.0/0001-Fix-some-problems-that-show-up-in-autoconf-2.64-and-.patch diff --git a/recipes/libpcap/libpcap-1.0.0/0001-Fix-some-problems-that-show-up-in-autoconf-2.64-and-.patch b/recipes/libpcap/libpcap-1.0.0/0001-Fix-some-problems-that-show-up-in-autoconf-2.64-and-.patch new file mode 100644 index 0000000000..bd5f725d36 --- /dev/null +++ b/recipes/libpcap/libpcap-1.0.0/0001-Fix-some-problems-that-show-up-in-autoconf-2.64-and-.patch @@ -0,0 +1,140 @@ +From d1a3a92fab103210ab5f61780a731bce9a8909b5 Mon Sep 17 00:00:00 2001 +From: Guy Harris +Date: Sat, 2 Jan 2010 14:15:46 -0800 +Subject: [PATCH] Fix some problems that show up in autoconf 2.64 and later. + +--- + aclocal.m4 | 60 ++++++++++++++++++++++++++++++++++++--------------------- + configure | 9 ++++--- + configure.in | 2 + + 3 files changed, 45 insertions(+), 26 deletions(-) + +Index: libpcap-1.0.0/aclocal.m4 +=================================================================== +--- libpcap-1.0.0.orig/aclocal.m4 ++++ libpcap-1.0.0/aclocal.m4 +@@ -23,30 +23,21 @@ dnl LBL autoconf macros + dnl + + dnl +-dnl Determine which compiler we're using (cc or gcc) +-dnl If using gcc, determine the version number +-dnl If using cc, require that it support ansi prototypes +-dnl If using gcc, use -O2 (otherwise use -O) +-dnl If using cc, explicitly specify /usr/local/include +-dnl +-dnl usage: +-dnl +-dnl AC_LBL_C_INIT(copt, incls) +-dnl +-dnl results: ++dnl Do whatever AC_LBL_C_INIT work is necessary before using AC_PROG_CC. + dnl +-dnl $1 (copt set) +-dnl $2 (incls set) +-dnl CC +-dnl LDFLAGS +-dnl ac_cv_lbl_gcc_vers +-dnl LBL_CFLAGS ++dnl It appears that newer versions of autoconf (2.64 and later) will, ++dnl if you use AC_TRY_COMPILE in a macro, stick AC_PROG_CC at the ++dnl beginning of the macro, even if the macro itself calls AC_PROG_CC. ++dnl See section 20.8 "Expanded Before Required" in the Autoconf ++dnl documentation. ++dnl ++dnl This causes a steaming heap of fail in our case, as we were, in ++dnl AC_LBL_C_INIT, doing the tests we now do in AC_LBL_C_PREPARE, ++dnl calling AC_PROG_CC, and then doing the tests we now do in ++dnl AC_LBL_C_INIT. + dnl +-AC_DEFUN([AC_LBL_C_INIT], +- [AC_PREREQ(2.12) +- AC_BEFORE([$0], [AC_PROG_CC]) +- AC_BEFORE([$0], [AC_LBL_FIXINCLUDES]) +- AC_BEFORE([$0], [AC_LBL_DEVEL]) ++AC_DEFUN(AC_LBL_C_INIT_BEFORE_CC, ++[ + AC_ARG_WITH(gcc, [ --without-gcc don't use gcc]) + $1="-O" + $2="" +@@ -72,7 +63,32 @@ AC_DEFUN([AC_LBL_C_INIT], + CC=cc + export CC + fi +- AC_PROG_CC ++]) ++ ++dnl ++dnl Determine which compiler we're using (cc or gcc) ++dnl If using gcc, determine the version number ++dnl If using cc, require that it support ansi prototypes ++dnl If using gcc, use -O2 (otherwise use -O) ++dnl If using cc, explicitly specify /usr/local/include ++dnl ++dnl usage: ++dnl ++dnl AC_LBL_C_INIT(copt, incls) ++dnl ++dnl results: ++dnl ++dnl $1 (copt set) ++dnl $2 (incls set) ++dnl CC ++dnl LDFLAGS ++dnl ac_cv_lbl_gcc_vers ++dnl LBL_CFLAGS ++dnl ++AC_DEFUN(AC_LBL_C_INIT, ++ [AC_PREREQ(2.50) ++ AC_BEFORE([$0], [AC_LBL_FIXINCLUDES]) ++ AC_BEFORE([$0], [AC_LBL_DEVEL]) + if test "$GCC" = yes ; then + if test "$SHLICC2" = yes ; then + ac_cv_lbl_gcc_vers=2 +Index: libpcap-1.0.0/configure +=================================================================== +--- libpcap-1.0.0.orig/configure ++++ libpcap-1.0.0/configure +@@ -1893,9 +1893,6 @@ test -n "$target_alias" && + + + +- +- +- + # Check whether --with-gcc was given. + if test "${with_gcc+set}" = set; then + withval=$with_gcc; +@@ -1962,7 +1959,8 @@ fi + CC=cc + export CC + fi +- ac_ext=c ++ ++ac_ext=c + ac_cpp='$CPP $CPPFLAGS' + ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' + ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +@@ -2881,6 +2879,9 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS con + ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_c_compiler_gnu + ++ ++ ++ + if test "$GCC" = yes ; then + if test "$SHLICC2" = yes ; then + ac_cv_lbl_gcc_vers=2 +Index: libpcap-1.0.0/configure.in +=================================================================== +--- libpcap-1.0.0.orig/configure.in ++++ libpcap-1.0.0/configure.in +@@ -12,6 +12,8 @@ AC_INIT(pcap.c) + + AC_CANONICAL_SYSTEM + ++AC_LBL_C_INIT_BEFORE_CC(V_CCOPT, V_INCLS) ++AC_PROG_CC + AC_LBL_C_INIT(V_CCOPT, V_INCLS, V_LIBS) + AC_LBL_C_INLINE + AC_C___ATTRIBUTE__ diff --git a/recipes/libpcap/libpcap_1.0.0.bb b/recipes/libpcap/libpcap_1.0.0.bb index 6dfc056930..2ce1bc44cc 100644 --- a/recipes/libpcap/libpcap_1.0.0.bb +++ b/recipes/libpcap/libpcap_1.0.0.bb @@ -5,6 +5,11 @@ SRC_URI = "http://www.tcpdump.org/release/libpcap-${PV}.tar.gz" SRC_URI += "file://aclocal.patch;patch=1" SRC_URI += "file://ieee80215-arphrd.patch;patch=1" SRC_URI += "file://ldflags.patch;patch=1" +SRC_URI += "file://0001-Fix-some-problems-that-show-up-in-autoconf-2.64-and-.patch;patch=1" + +do_configure_prepend() { + cat ${S}/aclocal.m4 >>${S}/acinclude.m4 +} do_compile () { oe_runmake -- cgit v1.2.3 From fdbe9e5b69b94191b5e5de2e2bcd6eef8619d8ec Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Mon, 15 Mar 2010 15:42:51 +0000 Subject: angstrom-2008-preferred-versions.inc : update angstrom to autoconf 2.65 Signed-off-by: Graeme Gregory Acked-by: Koen Kooi --- conf/distro/include/angstrom-2008-preferred-versions.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc index 168eb1634c..c41c3f84a2 100644 --- a/conf/distro/include/angstrom-2008-preferred-versions.inc +++ b/conf/distro/include/angstrom-2008-preferred-versions.inc @@ -1,7 +1,7 @@ ANGSTROM_QT_VERSION ?= "4.6.2" -PREFERRED_VERSION_autoconf = "2.63" -PREFERRED_VERSION_autoconf-native = "2.63" +PREFERRED_VERSION_autoconf = "2.65" +PREFERRED_VERSION_autoconf-native = "2.65" PREFERRED_VERSION_automake-native = "1.10.2" PREFERRED_VERSION_busybox = "1.13.2" PREFERRED_VERSION_cairo = "1.8.10" -- cgit v1.2.3 From 19c27b7d168d8121ae85d321f68775e8c9076c21 Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Mon, 15 Mar 2010 23:47:36 +0000 Subject: php* : fix for autoconf 2.64+ problems Patch was taked from pld linux. As part of the debug happened to update php-native to 5.3.2 so this is added as well. --- recipes/php/php-5.2.13/php-m4-divert.patch | 83 +++++++++++++++++++++++ recipes/php/php-5.2.6/php-m4-divert.patch | 83 +++++++++++++++++++++++ recipes/php/php-5.3.0/php-m4-divert.patch | 83 +++++++++++++++++++++++ recipes/php/php-5.3.2/acinclude-xml2-config.patch | 18 +++++ recipes/php/php-5.3.2/pear-makefile.patch | 11 +++ recipes/php/php-5.3.2/php-m4-divert.patch | 83 +++++++++++++++++++++++ recipes/php/php-native_5.3.2.bb | 7 ++ recipes/php/php.inc | 5 +- recipes/php/php_5.2.13.bb | 2 +- 9 files changed, 372 insertions(+), 3 deletions(-) create mode 100644 recipes/php/php-5.2.13/php-m4-divert.patch create mode 100644 recipes/php/php-5.2.6/php-m4-divert.patch create mode 100644 recipes/php/php-5.3.0/php-m4-divert.patch create mode 100644 recipes/php/php-5.3.2/acinclude-xml2-config.patch create mode 100644 recipes/php/php-5.3.2/pear-makefile.patch create mode 100644 recipes/php/php-5.3.2/php-m4-divert.patch create mode 100644 recipes/php/php-native_5.3.2.bb diff --git a/recipes/php/php-5.2.13/php-m4-divert.patch b/recipes/php/php-5.2.13/php-m4-divert.patch new file mode 100644 index 0000000000..dfc7b643e2 --- /dev/null +++ b/recipes/php/php-5.2.13/php-m4-divert.patch @@ -0,0 +1,83 @@ +Patch taken from + +http://cvs.pld-linux.org/cgi-bin/cvsweb/packages/php/php-m4-divert.patch?rev=1.1 + +diff -ur php-5.2.10.org/configure.in php-5.2.10/configure.in +--- php-5.2.10.org/configure.in 2009-06-17 14:22:41.000000000 +0200 ++++ php-5.2.10/configure.in 2009-08-18 12:16:25.317640253 +0200 +@@ -1,7 +1,7 @@ + ## $Id: configure.in,v 1.579.2.52.2.139 2009/06/17 12:22:41 iliaa Exp $ -*- autoconf -*- + dnl ## Process this file with autoconf to produce a configure script. + +-divert(1) ++divert(1001) + + dnl ## Diversion 1 is the autoconf + automake setup phase. We also + dnl ## set the PHP version, deal with platform-specific compile +@@ -263,7 +263,7 @@ + sinclude(TSRM/tsrm.m4) + + +-divert(2) ++divert(1002) + + dnl ## Diversion 2 is where we set PHP-specific options and come up + dnl ## with reasonable default values for them. We check for pthreads here +@@ -302,7 +302,7 @@ + PTHREADS_FLAGS + fi + +-divert(3) ++divert(1003) + + dnl ## In diversion 3 we check for compile-time options to the PHP + dnl ## core and how to deal with different system dependencies. +@@ -661,7 +661,7 @@ + PHP_CRYPT_R_STYLE + fi + +-divert(4) ++divert(1004) + + dnl ## In diversion 4 we check user-configurable general settings. + +@@ -902,7 +902,7 @@ + AC_MSG_RESULT([using system default]) + fi + +-divert(5) ++divert(1005) + + dnl ## In diversion 5 we check which extensions should be compiled. + dnl ## All of these are normally in the extension directories. +diff -ur php-5.2.10.org/ext/standard/config.m4 php-5.2.10/ext/standard/config.m4 +--- php-5.2.10.org/ext/standard/config.m4 2007-07-11 13:56:03.000000000 +0200 ++++ php-5.2.10/ext/standard/config.m4 2009-08-18 12:16:25.317640253 +0200 +@@ -1,6 +1,6 @@ + dnl $Id: config.m4,v 1.80.2.3.2.3 2007/07/11 11:56:03 jani Exp $ -*- autoconf -*- + +-divert(3)dnl ++divert(1003)dnl + + dnl + dnl Check if flush should be called explicitly after buffered io +@@ -205,7 +205,7 @@ + AC_CHECK_FUNCS(getcwd getwd asinh acosh atanh log1p hypot glob strfmon nice fpclass isinf isnan) + AC_FUNC_FNMATCH + +-divert(5)dnl ++divert(1005)dnl + + dnl + dnl Check for regex library type +diff -ur php-5.2.10.org/scripts/phpize.m4 php-5.2.10/scripts/phpize.m4 +--- php-5.2.10.org/scripts/phpize.m4 2009-06-02 21:54:22.000000000 +0200 ++++ php-5.2.10/scripts/phpize.m4 2009-08-18 12:16:25.317640253 +0200 +@@ -1,6 +1,6 @@ + dnl This file becomes configure.in for self-contained extensions. + +-divert(1) ++divert(1001) + + AC_PREREQ(2.13) + AC_INIT(config.m4) diff --git a/recipes/php/php-5.2.6/php-m4-divert.patch b/recipes/php/php-5.2.6/php-m4-divert.patch new file mode 100644 index 0000000000..dfc7b643e2 --- /dev/null +++ b/recipes/php/php-5.2.6/php-m4-divert.patch @@ -0,0 +1,83 @@ +Patch taken from + +http://cvs.pld-linux.org/cgi-bin/cvsweb/packages/php/php-m4-divert.patch?rev=1.1 + +diff -ur php-5.2.10.org/configure.in php-5.2.10/configure.in +--- php-5.2.10.org/configure.in 2009-06-17 14:22:41.000000000 +0200 ++++ php-5.2.10/configure.in 2009-08-18 12:16:25.317640253 +0200 +@@ -1,7 +1,7 @@ + ## $Id: configure.in,v 1.579.2.52.2.139 2009/06/17 12:22:41 iliaa Exp $ -*- autoconf -*- + dnl ## Process this file with autoconf to produce a configure script. + +-divert(1) ++divert(1001) + + dnl ## Diversion 1 is the autoconf + automake setup phase. We also + dnl ## set the PHP version, deal with platform-specific compile +@@ -263,7 +263,7 @@ + sinclude(TSRM/tsrm.m4) + + +-divert(2) ++divert(1002) + + dnl ## Diversion 2 is where we set PHP-specific options and come up + dnl ## with reasonable default values for them. We check for pthreads here +@@ -302,7 +302,7 @@ + PTHREADS_FLAGS + fi + +-divert(3) ++divert(1003) + + dnl ## In diversion 3 we check for compile-time options to the PHP + dnl ## core and how to deal with different system dependencies. +@@ -661,7 +661,7 @@ + PHP_CRYPT_R_STYLE + fi + +-divert(4) ++divert(1004) + + dnl ## In diversion 4 we check user-configurable general settings. + +@@ -902,7 +902,7 @@ + AC_MSG_RESULT([using system default]) + fi + +-divert(5) ++divert(1005) + + dnl ## In diversion 5 we check which extensions should be compiled. + dnl ## All of these are normally in the extension directories. +diff -ur php-5.2.10.org/ext/standard/config.m4 php-5.2.10/ext/standard/config.m4 +--- php-5.2.10.org/ext/standard/config.m4 2007-07-11 13:56:03.000000000 +0200 ++++ php-5.2.10/ext/standard/config.m4 2009-08-18 12:16:25.317640253 +0200 +@@ -1,6 +1,6 @@ + dnl $Id: config.m4,v 1.80.2.3.2.3 2007/07/11 11:56:03 jani Exp $ -*- autoconf -*- + +-divert(3)dnl ++divert(1003)dnl + + dnl + dnl Check if flush should be called explicitly after buffered io +@@ -205,7 +205,7 @@ + AC_CHECK_FUNCS(getcwd getwd asinh acosh atanh log1p hypot glob strfmon nice fpclass isinf isnan) + AC_FUNC_FNMATCH + +-divert(5)dnl ++divert(1005)dnl + + dnl + dnl Check for regex library type +diff -ur php-5.2.10.org/scripts/phpize.m4 php-5.2.10/scripts/phpize.m4 +--- php-5.2.10.org/scripts/phpize.m4 2009-06-02 21:54:22.000000000 +0200 ++++ php-5.2.10/scripts/phpize.m4 2009-08-18 12:16:25.317640253 +0200 +@@ -1,6 +1,6 @@ + dnl This file becomes configure.in for self-contained extensions. + +-divert(1) ++divert(1001) + + AC_PREREQ(2.13) + AC_INIT(config.m4) diff --git a/recipes/php/php-5.3.0/php-m4-divert.patch b/recipes/php/php-5.3.0/php-m4-divert.patch new file mode 100644 index 0000000000..dfc7b643e2 --- /dev/null +++ b/recipes/php/php-5.3.0/php-m4-divert.patch @@ -0,0 +1,83 @@ +Patch taken from + +http://cvs.pld-linux.org/cgi-bin/cvsweb/packages/php/php-m4-divert.patch?rev=1.1 + +diff -ur php-5.2.10.org/configure.in php-5.2.10/configure.in +--- php-5.2.10.org/configure.in 2009-06-17 14:22:41.000000000 +0200 ++++ php-5.2.10/configure.in 2009-08-18 12:16:25.317640253 +0200 +@@ -1,7 +1,7 @@ + ## $Id: configure.in,v 1.579.2.52.2.139 2009/06/17 12:22:41 iliaa Exp $ -*- autoconf -*- + dnl ## Process this file with autoconf to produce a configure script. + +-divert(1) ++divert(1001) + + dnl ## Diversion 1 is the autoconf + automake setup phase. We also + dnl ## set the PHP version, deal with platform-specific compile +@@ -263,7 +263,7 @@ + sinclude(TSRM/tsrm.m4) + + +-divert(2) ++divert(1002) + + dnl ## Diversion 2 is where we set PHP-specific options and come up + dnl ## with reasonable default values for them. We check for pthreads here +@@ -302,7 +302,7 @@ + PTHREADS_FLAGS + fi + +-divert(3) ++divert(1003) + + dnl ## In diversion 3 we check for compile-time options to the PHP + dnl ## core and how to deal with different system dependencies. +@@ -661,7 +661,7 @@ + PHP_CRYPT_R_STYLE + fi + +-divert(4) ++divert(1004) + + dnl ## In diversion 4 we check user-configurable general settings. + +@@ -902,7 +902,7 @@ + AC_MSG_RESULT([using system default]) + fi + +-divert(5) ++divert(1005) + + dnl ## In diversion 5 we check which extensions should be compiled. + dnl ## All of these are normally in the extension directories. +diff -ur php-5.2.10.org/ext/standard/config.m4 php-5.2.10/ext/standard/config.m4 +--- php-5.2.10.org/ext/standard/config.m4 2007-07-11 13:56:03.000000000 +0200 ++++ php-5.2.10/ext/standard/config.m4 2009-08-18 12:16:25.317640253 +0200 +@@ -1,6 +1,6 @@ + dnl $Id: config.m4,v 1.80.2.3.2.3 2007/07/11 11:56:03 jani Exp $ -*- autoconf -*- + +-divert(3)dnl ++divert(1003)dnl + + dnl + dnl Check if flush should be called explicitly after buffered io +@@ -205,7 +205,7 @@ + AC_CHECK_FUNCS(getcwd getwd asinh acosh atanh log1p hypot glob strfmon nice fpclass isinf isnan) + AC_FUNC_FNMATCH + +-divert(5)dnl ++divert(1005)dnl + + dnl + dnl Check for regex library type +diff -ur php-5.2.10.org/scripts/phpize.m4 php-5.2.10/scripts/phpize.m4 +--- php-5.2.10.org/scripts/phpize.m4 2009-06-02 21:54:22.000000000 +0200 ++++ php-5.2.10/scripts/phpize.m4 2009-08-18 12:16:25.317640253 +0200 +@@ -1,6 +1,6 @@ + dnl This file becomes configure.in for self-contained extensions. + +-divert(1) ++divert(1001) + + AC_PREREQ(2.13) + AC_INIT(config.m4) diff --git a/recipes/php/php-5.3.2/acinclude-xml2-config.patch b/recipes/php/php-5.3.2/acinclude-xml2-config.patch new file mode 100644 index 0000000000..bf519d2934 --- /dev/null +++ b/recipes/php/php-5.3.2/acinclude-xml2-config.patch @@ -0,0 +1,18 @@ +--- /orig-acinclude.m4 2007-02-20 15:03:25.000000000 +0200 ++++ /acinclude.m4 2007-02-20 15:03:24.000000000 +0200 +@@ -2359,12 +2359,9 @@ + AC_DEFUN([PHP_SETUP_LIBXML], [ + AC_CACHE_CHECK([for xml2-config path], ac_cv_php_xml2_config_path, + [ +- for i in $PHP_LIBXML_DIR /usr/local /usr; do +- if test -x "$i/bin/xml2-config"; then +- ac_cv_php_xml2_config_path="$i/bin/xml2-config" +- break +- fi +- done ++ ++ ac_cv_php_xml2_config_path="$PHP_LIBXML_DIR/xml2-config" ++ + ]) + + if test -x "$ac_cv_php_xml2_config_path"; then diff --git a/recipes/php/php-5.3.2/pear-makefile.patch b/recipes/php/php-5.3.2/pear-makefile.patch new file mode 100644 index 0000000000..26de98a48f --- /dev/null +++ b/recipes/php/php-5.3.2/pear-makefile.patch @@ -0,0 +1,11 @@ +--- /pear/orig-Makefile.frag 2007-03-16 12:18:33.000000000 +0200 ++++ /pear/Makefile.frag 2007-03-16 12:35:48.000000000 +0200 +@@ -6,7 +6,7 @@ + PEAR_INSTALL_FLAGS = -n -dshort_open_tag=0 -dsafe_mode=0 -dopen_basedir= -derror_reporting=E_ALL -dmemory_limit=-1 -ddetect_unicode=0 + + install-pear-installer: $(SAPI_CLI_PATH) +- @$(top_builddir)/sapi/cli/php $(PEAR_INSTALL_FLAGS) $(builddir)/install-pear-nozlib.phar -d "$(peardir)" -b "$(bindir)" ++ @$(PHP_NATIVE_DIR)/php $(PEAR_INSTALL_FLAGS) $(builddir)/install-pear-nozlib.phar -d "$(peardir)" -b "$(bindir)" + + install-pear: + @echo "Installing PEAR environment: $(INSTALL_ROOT)$(peardir)/" diff --git a/recipes/php/php-5.3.2/php-m4-divert.patch b/recipes/php/php-5.3.2/php-m4-divert.patch new file mode 100644 index 0000000000..dfc7b643e2 --- /dev/null +++ b/recipes/php/php-5.3.2/php-m4-divert.patch @@ -0,0 +1,83 @@ +Patch taken from + +http://cvs.pld-linux.org/cgi-bin/cvsweb/packages/php/php-m4-divert.patch?rev=1.1 + +diff -ur php-5.2.10.org/configure.in php-5.2.10/configure.in +--- php-5.2.10.org/configure.in 2009-06-17 14:22:41.000000000 +0200 ++++ php-5.2.10/configure.in 2009-08-18 12:16:25.317640253 +0200 +@@ -1,7 +1,7 @@ + ## $Id: configure.in,v 1.579.2.52.2.139 2009/06/17 12:22:41 iliaa Exp $ -*- autoconf -*- + dnl ## Process this file with autoconf to produce a configure script. + +-divert(1) ++divert(1001) + + dnl ## Diversion 1 is the autoconf + automake setup phase. We also + dnl ## set the PHP version, deal with platform-specific compile +@@ -263,7 +263,7 @@ + sinclude(TSRM/tsrm.m4) + + +-divert(2) ++divert(1002) + + dnl ## Diversion 2 is where we set PHP-specific options and come up + dnl ## with reasonable default values for them. We check for pthreads here +@@ -302,7 +302,7 @@ + PTHREADS_FLAGS + fi + +-divert(3) ++divert(1003) + + dnl ## In diversion 3 we check for compile-time options to the PHP + dnl ## core and how to deal with different system dependencies. +@@ -661,7 +661,7 @@ + PHP_CRYPT_R_STYLE + fi + +-divert(4) ++divert(1004) + + dnl ## In diversion 4 we check user-configurable general settings. + +@@ -902,7 +902,7 @@ + AC_MSG_RESULT([using system default]) + fi + +-divert(5) ++divert(1005) + + dnl ## In diversion 5 we check which extensions should be compiled. + dnl ## All of these are normally in the extension directories. +diff -ur php-5.2.10.org/ext/standard/config.m4 php-5.2.10/ext/standard/config.m4 +--- php-5.2.10.org/ext/standard/config.m4 2007-07-11 13:56:03.000000000 +0200 ++++ php-5.2.10/ext/standard/config.m4 2009-08-18 12:16:25.317640253 +0200 +@@ -1,6 +1,6 @@ + dnl $Id: config.m4,v 1.80.2.3.2.3 2007/07/11 11:56:03 jani Exp $ -*- autoconf -*- + +-divert(3)dnl ++divert(1003)dnl + + dnl + dnl Check if flush should be called explicitly after buffered io +@@ -205,7 +205,7 @@ + AC_CHECK_FUNCS(getcwd getwd asinh acosh atanh log1p hypot glob strfmon nice fpclass isinf isnan) + AC_FUNC_FNMATCH + +-divert(5)dnl ++divert(1005)dnl + + dnl + dnl Check for regex library type +diff -ur php-5.2.10.org/scripts/phpize.m4 php-5.2.10/scripts/phpize.m4 +--- php-5.2.10.org/scripts/phpize.m4 2009-06-02 21:54:22.000000000 +0200 ++++ php-5.2.10/scripts/phpize.m4 2009-08-18 12:16:25.317640253 +0200 +@@ -1,6 +1,6 @@ + dnl This file becomes configure.in for self-contained extensions. + +-divert(1) ++divert(1001) + + AC_PREREQ(2.13) + AC_INIT(config.m4) diff --git a/recipes/php/php-native_5.3.2.bb b/recipes/php/php-native_5.3.2.bb new file mode 100644 index 0000000000..10c308ad62 --- /dev/null +++ b/recipes/php/php-native_5.3.2.bb @@ -0,0 +1,7 @@ +require php-native.inc + +PR = "r0" + +SRC_URI[src.md5sum] = "46f500816125202c48a458d0133254a4" +SRC_URI[src.sha256sum] = "9a380a574adcb3a9abe3226e7c3a9bae619e8a1b90842ec2a7edf0ad92afdeda" + diff --git a/recipes/php/php.inc b/recipes/php/php.inc index 6f30690440..cbec13d72d 100644 --- a/recipes/php/php.inc +++ b/recipes/php/php.inc @@ -3,8 +3,9 @@ HOMEPAGE = "http://www.php.net" SECTION = "console/network" LICENSE = "PHP" -SRC_URI = "http://us2.php.net/distributions/php-${PV}.tar.bz2;name=src\ - file://acinclude-xml2-config.patch;patch=1" +SRC_URI = "http://us2.php.net/distributions/php-${PV}.tar.bz2;name=src \ + file://acinclude-xml2-config.patch;patch=1 \ + file://php-m4-divert.patch;patch=1" S = "${WORKDIR}/php-${PV}" diff --git a/recipes/php/php_5.2.13.bb b/recipes/php/php_5.2.13.bb index 97b68baf6e..5f446d4f12 100644 --- a/recipes/php/php_5.2.13.bb +++ b/recipes/php/php_5.2.13.bb @@ -3,7 +3,7 @@ require php.inc DEPENDS = "zlib libxml2 virtual/libiconv php-native lemon-native mysql5 \ libc-client openssl" -PR = "r4" +PR = "r5" SRC_URI += "file://pear-makefile.patch;patch=1 \ file://imap-fix-autofoo.patch;patch=1 \ -- cgit v1.2.3 From 50c0b6a8d9f759b94a95caf59e8225db6881e0b6 Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Wed, 17 Mar 2010 15:00:18 +0000 Subject: libffi_3.0.8.bb : add fix for autoconf 2.64+ --- recipes/libffi/libffi/autoconf-2.64.patch | 24 ++++++++++++++++++++++++ recipes/libffi/libffi_3.0.8.bb | 3 ++- 2 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 recipes/libffi/libffi/autoconf-2.64.patch diff --git a/recipes/libffi/libffi/autoconf-2.64.patch b/recipes/libffi/libffi/autoconf-2.64.patch new file mode 100644 index 0000000000..7e5a41e141 --- /dev/null +++ b/recipes/libffi/libffi/autoconf-2.64.patch @@ -0,0 +1,24 @@ +From cc8c1160a690a1eafc35e745da5f24e258436bda Mon Sep 17 00:00:00 2001 +From: Mike Lundy +Date: Fri, 2 Oct 2009 12:28:13 -0700 +Subject: [PATCH] fix libffi for autoconf-2.64 + +--- + libffi-3.0.8/configure.ac | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +diff --git libffi-3.0.8/configure.ac libffi-3.0.8/configure.ac +index 6a7e7fb..4c3f190 100644 +--- libffi-3.0.8/configure.ac ++++ libffi-3.0.8/configure.ac +@@ -20,6 +20,7 @@ AM_INIT_AUTOMAKE + m4_rename([_AC_ARG_VAR_PRECIOUS],[real_PRECIOUS]) + m4_define([_AC_ARG_VAR_PRECIOUS],[]) + AC_PROG_CC ++m4_undefine([_AC_ARG_VAR_PRECIOUS]) + m4_rename([real_PRECIOUS],[_AC_ARG_VAR_PRECIOUS]) + + AC_SUBST(CFLAGS) +-- +1.6.4 + diff --git a/recipes/libffi/libffi_3.0.8.bb b/recipes/libffi/libffi_3.0.8.bb index d24e9715d4..adde932bbe 100644 --- a/recipes/libffi/libffi_3.0.8.bb +++ b/recipes/libffi/libffi_3.0.8.bb @@ -24,7 +24,8 @@ FILES_${PN}-dev = "${includedir}/${TARGET_SYS}/ffi* \ ${libdir}/pkgconfig \ " -SRC_URI = "ftp://sourceware.org/pub/libffi/${P}.tar.gz" +SRC_URI = "ftp://sourceware.org/pub/libffi/${P}.tar.gz \ + file://autoconf-2.64.patch;patch=1" EXTRA_OECONF = "--with-gnu-ld \ --enable-shared \ -- cgit v1.2.3 From a533840b92a2747989bcf11deff66586be480a01 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 18 Mar 2010 21:00:12 +0100 Subject: preferred-shr-versions.inc: update SHR to autoconf 2.65 Signed-off-by: Martin Jansa --- conf/distro/include/preferred-shr-versions.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/distro/include/preferred-shr-versions.inc b/conf/distro/include/preferred-shr-versions.inc index 2bf63445eb..dd3026ab36 100644 --- a/conf/distro/include/preferred-shr-versions.inc +++ b/conf/distro/include/preferred-shr-versions.inc @@ -2,8 +2,8 @@ # use newer version then preferred by default PREFERRED_VERSION_boost = "1.40.0" PREFERRED_VERSION_dbus = "1.3.0" -PREFERRED_VERSION_autoconf = "2.63" -PREFERRED_VERSION_autoconf-native = "2.63" +PREFERRED_VERSION_autoconf = "2.65" +PREFERRED_VERSION_autoconf-native = "2.65" PREFERRED_VERSION_libmikmod = "3.2.0-beta2" PREFERRED_VERSION_mtd-utils-native = "1.2.0+git" PREFERRED_VERSION_strace = "4.5.15" -- cgit v1.2.3 From 971efeefff1520607b704cdded86deed43c459fb Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 18 Mar 2010 21:16:24 +0100 Subject: qt4: make .pc files work with sysroot support --- recipes/qt4/qt4.inc | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/recipes/qt4/qt4.inc b/recipes/qt4/qt4.inc index b6d575d67a..14b0a960df 100644 --- a/recipes/qt4/qt4.inc +++ b/recipes/qt4/qt4.inc @@ -260,6 +260,13 @@ do_install() { sed -i -e /Requires/s#"${name}"#"${name}${QT_LIBINFIX}"#g ${D}${libdir}/pkgconfig/*.pc done + # QT abuses $includedir to point to its headers, which breaks pkgconfig sysroot, so manually fix it up here: + for pc in ${D}${libdir}/pkgconfig/*.pc ; do + sed -i -e "s:prefix}include/${QT_BASE_NAME}/$(basename $pc .pc):includedir}:" \ + -e "s,Cflags: ,Cflags: -IP{includedir}/${QT_BASE_NAME}/$(basename $pc .pc) ," \ + -e 's:IP{:I${:g' $pc + done + install -d ${D}/${libdir}/fonts touch ${D}/${libdir}/fonts/fontdir } -- cgit v1.2.3 From 1f4479554dbe426d0ffe6453ba80e67708e971d7 Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Thu, 18 Mar 2010 20:55:18 +0000 Subject: automake_1.10.3.bb : add latest version of 1.10.X branch. This fixes CVE-2009-4029 --- recipes/automake/automake.inc | 2 +- recipes/automake/automake_1.10.3.bb | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 recipes/automake/automake_1.10.3.bb diff --git a/recipes/automake/automake.inc b/recipes/automake/automake.inc index 662f9f8722..e378c048dc 100644 --- a/recipes/automake/automake.inc +++ b/recipes/automake/automake.inc @@ -28,7 +28,7 @@ RDEPENDS_automake += "\ perl-module-strict \ perl-module-text-parsewords \ perl-module-vars " -SRC_URI = "${GNU_MIRROR}/automake/automake-${PV}.tar.bz2" +SRC_URI = "${GNU_MIRROR}/automake/automake-${PV}.tar.bz2;name=automake" INC_PR = "r3" AUTOMAKE_API = "${@".".join(bb.data.getVar("PV",d,1).split(".")[0:2])}" diff --git a/recipes/automake/automake_1.10.3.bb b/recipes/automake/automake_1.10.3.bb new file mode 100644 index 0000000000..663333a51f --- /dev/null +++ b/recipes/automake/automake_1.10.3.bb @@ -0,0 +1,6 @@ +require automake.inc +PR = "${INC_PR}.0" + +SRC_URI[automake.md5sum] = "b8e67fb458da396bc35555af7ef2b49f" +SRC_URI[automake.sha256sum] = "e98ab43bb839c31696a4202e5b6ff388b391659ef2387cf9365019fad17e1adc" + -- cgit v1.2.3 From 8086a8a5cdf0e9b97687b425d8d0d5c45500ad80 Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Thu, 18 Mar 2010 20:56:18 +0000 Subject: angstrom-2008-preferred-versions.inc : move angstrom to the latest 1.10.3 am --- conf/distro/include/angstrom-2008-preferred-versions.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc index c41c3f84a2..b525d2afbb 100644 --- a/conf/distro/include/angstrom-2008-preferred-versions.inc +++ b/conf/distro/include/angstrom-2008-preferred-versions.inc @@ -2,7 +2,7 @@ ANGSTROM_QT_VERSION ?= "4.6.2" PREFERRED_VERSION_autoconf = "2.65" PREFERRED_VERSION_autoconf-native = "2.65" -PREFERRED_VERSION_automake-native = "1.10.2" +PREFERRED_VERSION_automake-native = "1.10.3" PREFERRED_VERSION_busybox = "1.13.2" PREFERRED_VERSION_cairo = "1.8.10" PREFERRED_VERSION_dbus = "1.2.22" -- cgit v1.2.3 From 0378972559744ff7f2cbfb3292a40371e5b67bb4 Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Thu, 18 Mar 2010 21:58:37 +0000 Subject: linux-omap-zoomsync_2.6.32.bb : update defconfig to enable power management Also turned off the pm debug messages that were drowning dmesg. Signed-off-by: Graeme Gregory --- .../linux-omap-zoomsync-2.6.32/omapzoom2/defconfig | 36 ++++++++++++---------- recipes/linux/linux-omap-zoomsync_2.6.32.bb | 2 +- 2 files changed, 20 insertions(+), 18 deletions(-) diff --git a/recipes/linux/linux-omap-zoomsync-2.6.32/omapzoom2/defconfig b/recipes/linux/linux-omap-zoomsync-2.6.32/omapzoom2/defconfig index 28403aa4b5..2560965609 100644 --- a/recipes/linux/linux-omap-zoomsync-2.6.32/omapzoom2/defconfig +++ b/recipes/linux/linux-omap-zoomsync-2.6.32/omapzoom2/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.32.7 -# Wed Mar 17 15:53:51 2010 +# Thu Mar 18 21:35:16 2010 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -29,6 +29,7 @@ CONFIG_CONSTRUCTORS=y # CONFIG_EXPERIMENTAL=y CONFIG_BROKEN_ON_SMP=y +CONFIG_LOCK_KERNEL=y CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_LOCALVERSION="" # CONFIG_LOCALVERSION_AUTO is not set @@ -144,27 +145,27 @@ CONFIG_DEFAULT_IOSCHED="cfq" # CONFIG_INLINE_SPIN_LOCK_BH is not set # CONFIG_INLINE_SPIN_LOCK_IRQ is not set # CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set -CONFIG_INLINE_SPIN_UNLOCK=y +# CONFIG_INLINE_SPIN_UNLOCK is not set # CONFIG_INLINE_SPIN_UNLOCK_BH is not set -CONFIG_INLINE_SPIN_UNLOCK_IRQ=y +# CONFIG_INLINE_SPIN_UNLOCK_IRQ is not set # CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set # CONFIG_INLINE_READ_TRYLOCK is not set # CONFIG_INLINE_READ_LOCK is not set # CONFIG_INLINE_READ_LOCK_BH is not set # CONFIG_INLINE_READ_LOCK_IRQ is not set # CONFIG_INLINE_READ_LOCK_IRQSAVE is not set -CONFIG_INLINE_READ_UNLOCK=y +# CONFIG_INLINE_READ_UNLOCK is not set # CONFIG_INLINE_READ_UNLOCK_BH is not set -CONFIG_INLINE_READ_UNLOCK_IRQ=y +# CONFIG_INLINE_READ_UNLOCK_IRQ is not set # CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set # CONFIG_INLINE_WRITE_TRYLOCK is not set # CONFIG_INLINE_WRITE_LOCK is not set # CONFIG_INLINE_WRITE_LOCK_BH is not set # CONFIG_INLINE_WRITE_LOCK_IRQ is not set # CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set -CONFIG_INLINE_WRITE_UNLOCK=y +# CONFIG_INLINE_WRITE_UNLOCK is not set # CONFIG_INLINE_WRITE_UNLOCK_BH is not set -CONFIG_INLINE_WRITE_UNLOCK_IRQ=y +# CONFIG_INLINE_WRITE_UNLOCK_IRQ is not set # CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set # CONFIG_MUTEX_SPIN_ON_OWNER is not set CONFIG_FREEZER=y @@ -334,9 +335,9 @@ CONFIG_VMSPLIT_3G=y # CONFIG_VMSPLIT_2G is not set # CONFIG_VMSPLIT_1G is not set CONFIG_PAGE_OFFSET=0xC0000000 -CONFIG_PREEMPT_NONE=y +# CONFIG_PREEMPT_NONE is not set # CONFIG_PREEMPT_VOLUNTARY is not set -# CONFIG_PREEMPT is not set +CONFIG_PREEMPT=y CONFIG_HZ=128 # CONFIG_THUMB2_KERNEL is not set CONFIG_AEABI=y @@ -415,15 +416,12 @@ CONFIG_BINFMT_MISC=y # Power management options # CONFIG_PM=y -CONFIG_PM_DEBUG=y -CONFIG_PM_VERBOSE=y -CONFIG_CAN_PM_TRACE=y +# CONFIG_PM_DEBUG is not set CONFIG_PM_SLEEP=y CONFIG_SUSPEND=y -# CONFIG_PM_TEST_SUSPEND is not set CONFIG_SUSPEND_FREEZER=y -# CONFIG_APM_EMULATION is not set -# CONFIG_PM_RUNTIME is not set +CONFIG_APM_EMULATION=y +CONFIG_PM_RUNTIME=y CONFIG_ARCH_SUSPEND_POSSIBLE=y CONFIG_NET=y @@ -869,6 +867,7 @@ CONFIG_INPUT=y # CONFIG_INPUT_JOYDEV is not set CONFIG_INPUT_EVDEV=y # CONFIG_INPUT_EVBUG is not set +# CONFIG_INPUT_APMPOWER is not set # # Input Device Drivers @@ -1084,7 +1083,8 @@ CONFIG_W1_CON=y # CONFIG_W1_SLAVE_BQ27000 is not set CONFIG_POWER_SUPPLY=y # CONFIG_POWER_SUPPLY_DEBUG is not set -# CONFIG_PDA_POWER is not set +CONFIG_PDA_POWER=y +CONFIG_APM_POWER=y # CONFIG_BATTERY_DS2760 is not set # CONFIG_BATTERY_DS2782 is not set # CONFIG_BATTERY_BQ27x00 is not set @@ -1122,7 +1122,7 @@ CONFIG_MFD_CORE=y # CONFIG_HTC_PASIC3 is not set # CONFIG_TPS65010 is not set CONFIG_TWL4030_CORE=y -# CONFIG_TWL4030_POWER is not set +CONFIG_TWL4030_POWER=y CONFIG_TWL4030_CODEC=y # CONFIG_MFD_TMIO is not set # CONFIG_MFD_T7L66XB is not set @@ -2100,6 +2100,7 @@ CONFIG_TIMER_STATS=y # CONFIG_DEBUG_OBJECTS is not set # CONFIG_DEBUG_SLAB is not set # CONFIG_DEBUG_KMEMLEAK is not set +CONFIG_DEBUG_PREEMPT=y # CONFIG_DEBUG_RT_MUTEXES is not set # CONFIG_RT_MUTEX_TESTER is not set # CONFIG_DEBUG_SPINLOCK is not set @@ -2134,6 +2135,7 @@ CONFIG_TRACING_SUPPORT=y CONFIG_FTRACE=y # CONFIG_FUNCTION_TRACER is not set # CONFIG_IRQSOFF_TRACER is not set +# CONFIG_PREEMPT_TRACER is not set # CONFIG_SCHED_TRACER is not set # CONFIG_ENABLE_DEFAULT_TRACERS is not set # CONFIG_BOOT_TRACER is not set diff --git a/recipes/linux/linux-omap-zoomsync_2.6.32.bb b/recipes/linux/linux-omap-zoomsync_2.6.32.bb index 61a2e0c817..a309cafd38 100644 --- a/recipes/linux/linux-omap-zoomsync_2.6.32.bb +++ b/recipes/linux/linux-omap-zoomsync_2.6.32.bb @@ -11,7 +11,7 @@ DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_omapzoom2 = "1" SRCREV = "015cbaf1035cd9a61d33a27de2a22902555db3c5" -OEV = "oe4" +OEV = "oe5" PE = "1" # The main PR is now using MACHINE_KERNEL_PR, for omap3 see conf/machine/include/omap3.inc -- cgit v1.2.3