diff options
| author | Koen Kooi <koen@openembedded.org> | 2006-03-14 12:41:15 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-03-14 12:41:15 +0000 |
| commit | 086ed8d6c503e03524d821e4b3ee5dabff65a0a4 (patch) | |
| tree | 32b2ee48a8e0beb4f487fc6ba3c3345df1f5405f | |
| parent | e0747dcd6864ff96bfc9b276f8ce52913281ad6d (diff) | |
| parent | b10dd1e36d190186eb87bbe608e505cd20ce596f (diff) | |
merge of 29372ce60254772158ba48179cc6d86e4146ee5d
and f7770d0cea5def0448bd8751b10e1d0ad0835c19
157 files changed, 3928 insertions, 171 deletions
diff --git a/classes/tinderclient.bbclass b/classes/tinderclient.bbclass index 1be7bf8c33..e98edb4777 100644 --- a/classes/tinderclient.bbclass +++ b/classes/tinderclient.bbclass @@ -1,9 +1,6 @@ def tinder_form_data(bound, dict, log): - """ - Create the boundary for the HTTP Post - """ output = [] - + #br # for each key in the dictionary for name in dict: output.append( "--" + bound ) @@ -257,7 +254,7 @@ def tinder_do_tinder_report(event): name = getName(event) log = "" status = 1 - + #print asd # Check what we need to do Build* shows we start or are done if name == "BuildStarted": tinder_build_start(event.data) @@ -295,8 +292,18 @@ def tinder_do_tinder_report(event): log += "<--- TINDERBOX Package %s failed (FAILURE)\n" % data.getVar('P', event.data, True) status = 200 elif name == "BuildCompleted": - log += "Build Completed\n" + log += "Build Completed\n" status = 100 + elif name == "MultipleProviders": + log += "<--- TINDERBOX Multiple Providers\n" + log += "multiple providers are available (%s);\n" % ", ".join(event.getCandidates()) + log += "consider defining PREFERRED_PROVIDER_%s\n" % event.getItem() + log += "is runtime: %d" % event.isRuntime() + log += "---> TINDERBOX Multiple Providers\n" + elif name == "NoProvider": + log += "Error: No Provider for: %s\n" % event.getItem() + log += "Error:Was Runtime: %d\n" % event.isRuntime() + status = 200 # now post the log if len(log) == 0: @@ -312,7 +319,6 @@ addhandler tinderclient_eventhandler python tinderclient_eventhandler() { from bb import note, error, data from bb.event import NotHandled - do_tinder_report = data.getVar('TINDER_REPORT', e.data, True) if do_tinder_report and do_tinder_report == "1": tinder_do_tinder_report(e) diff --git a/conf/bitbake.conf b/conf/bitbake.conf index 36d4c331b9..a2ba5e6382 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -72,7 +72,7 @@ DATETIME = "${DATE}${TIME}" # python-native should be here but python relies on building # its own in staging -ASSUME_PROVIDED = "cvs-native svn-native bzip2-native diffstat-native patch-native python-native-runtime perl-native-runtime" +ASSUME_PROVIDED = "cvs-native svn-native bzip2-native diffstat-native patch-native python-native-runtime perl-native-runtime texinfo-native" ################################################################## # Package default variables. @@ -306,6 +306,7 @@ FREEBSD_MIRROR = "ftp://ftp.freebsd.org/pub/FreeBSD/" HANDHELDS_CVS = "cvs://anoncvs:anoncvs@anoncvs.handhelds.org/cvs" FREEDESKTOP_CVS = "cvs://anoncvs:anoncvs@anoncvs.freedesktop.org/cvs" GENTOO_MIRROR = "http://distro.ibiblio.org/pub/linux/distributions/gentoo/distfiles" +APACHE_MIRROR = "http://www.apache.org/dist" # You can use the mirror of your country to get faster downloads by putting # export DEBIAN_MIRROR = "ftp://ftp.de.debian.org/debian/pool" diff --git a/conf/distro/angstrom-2006.9.conf b/conf/distro/angstrom-2006.9.conf index ccaee57d6d..be0f5e93fe 100644 --- a/conf/distro/angstrom-2006.9.conf +++ b/conf/distro/angstrom-2006.9.conf @@ -52,13 +52,13 @@ PREFERRED_VERSION_gcc-cross-initial ?= "4.0.2" #use EABI toolchain -#PREFERRED_VERSION_gcc ?= "3.4.4+csl-arm-20051214" -#PREFERRED_VERSION_gcc-cross ?= "3.4.4+csl-arm-20051214" -#PREFERRED_VERSION_gcc-cross-initial ?= "3.4.4+csl-arm-20051214" -#PREFERRED_VERSION_binutils ?= "2.16.91.0.4" -#PREFERRED_VERSION_binutils-cross ?= "2.16.91.0.4" -#PREFERRED_VERSION_glibc ?= "2.3.5+cvs20051214" -#PREFERRED_VERSION_glibc-intermediate ?= "2.3.5+cvs20051214" +#PREFERRED_VERSION_gcc ?= "4.1.0" +#PREFERRED_VERSION_gcc-cross ?= "4.1.0" +#PREFERRED_VERSION_gcc-cross-initial ?= "4.1.0" +#PREFERRED_VERSION_binutils ?= "2.16.91.0.6" +#PREFERRED_VERSION_binutils-cross ?= "2.16.91.0.6" +#PREFERRED_VERSION_glibc ?= "2.3.6+cvs20060314" +#PREFERRED_VERSION_glibc-intermediate ?= "2.3.6+cvs20060314" PREFERRED_VERSION_orinoco-modules_h3600 = "0.13e" diff --git a/conf/distro/preferred-x-versions-pre-X11R7.inc b/conf/distro/preferred-x-versions-pre-X11R7.inc new file mode 100644 index 0000000000..b8cd34a3fb --- /dev/null +++ b/conf/distro/preferred-x-versions-pre-X11R7.inc @@ -0,0 +1,44 @@ +# +# Specify to build old/old CVS versions of X libraries and apps +# + +PREFERRED_VERSION_xproto = "0.0+cvs${SRCDATE}" + +PREFERRED_VERSION_diet-x11 = "6.2.1+cvs${SRCDATE}" +PREFERRED_VERSION_libice = "6.3.3" +PREFERRED_VERSION_libsm = "6.0.3" +PREFERRED_VERSION_libx11 = "6.2.1+cvs${SRCDATE}" +PREFERRED_VERSION_libxau = "1.0.1" +PREFERRED_VERSION_libxaw = "7.0.2" +PREFERRED_VERSION_libxcomposite = "1.0.1" +PREFERRED_VERSION_libxcursor = "1.1.2" +PREFERRED_VERSION_libxdamage = "1.0.1" +PREFERRED_VERSION_libxdmcp = "0.1.3" +PREFERRED_VERSION_libxext = "0.0+cvs${SRCDATE}" +PREFERRED_VERSION_libxfixes = "2.0.1" +PREFERRED_VERSION_libxfont = "1.4.2" +PREFERRED_VERSION_libxft = "2.1.6" +PREFERRED_VERSION_libxi = "6.0.1" +PREFERRED_VERSION_libxinerama = "1.0.2+cvs20050505" +PREFERRED_VERSION_libxkbfile = "0.0+cvs${SRCDATE}" +PREFERRED_VERSION_libxmu = "0.0+cvs${SRCDATE}" +PREFERRED_VERSION_libxp = "0.0+cvs${SRCDATE}" +PREFERRED_VERSION_libxpm = "3.5.1" +PREFERRED_VERSION_libxrandr = "1.0.2" +PREFERRED_VERSION_libxrender = "0.8.4" +PREFERRED_VERSION_libxres = "1.0.1" +PREFERRED_VERSION_libxss = "0.0+cvs${SRCDATE}" +PREFERRED_VERSION_libxt = "0.1.5" +PREFERRED_VERSION_libxtst = "0.0+cvs${SRCDATE}" +PREFERRED_VERSION_libxv = "2.2.2+cvs20040918" +PREFERRED_VERSION_libxxf86dga = "0.0+cvs${SRCDATE}" +PREFERRED_VERSION_libxxf86vm = "0.0+cvs${SRCDATE}" + +PREFERRED_VERSION_xcalibrate = "0.0+cvs20060312" +PREFERRED_VERSION_xserver-kdrive = "0.0+cvs20050207" + +PREFERRED_VERSION_xdpyinfo = "0.0+cvs${SRCDATE}" +PREFERRED_VERSION_xev = "0.0+cvs${SRCDATE}" +PREFERRED_VERSION_xhost = "0.0+cvs20040413" +PREFERRED_VERSION_xmodmap = "0.0+cvs${SRCDATE}" +PREFERRED_VERSION_xrandr = "0.0+cvs${SRCDATE}" diff --git a/conf/documentation.conf b/conf/documentation.conf index 630b679599..e0868eefe4 100644 --- a/conf/documentation.conf +++ b/conf/documentation.conf @@ -20,6 +20,7 @@ HOST_VENDOR[doc] = "The name of the vendor. Normally same as the TARGET_VENDOR @ HOST_SYS[doc] = "FIXME" HOST_PREFIX[doc] = "Normally same as the TARGET_PREFIX @see TARGET_PREFIX @group base" HOST_CC_ARCH[doc] = "Normally same as the TARGET_CC_ARCH @see TARGET_CC_ARCH @group base" +HOST_NONSYSV[doc] = "Setable flag in local.conf to override SysV specific compiles when needed. 1 or 0 are usable values. See fakeroot-native for example." TARGET_ARCH[doc] = "Build for which architecture. Examples are arm, i686, sh3, mips, powerpc" TARGET_OS[doc] = "Build for which Operating System. Currently possible values are \ diff --git a/conf/local.conf.sample b/conf/local.conf.sample index cbe829c2a1..9ea8897bff 100644 --- a/conf/local.conf.sample +++ b/conf/local.conf.sample @@ -78,6 +78,16 @@ PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross" # Stay away from unversioned distros unless you really know what you are doing # DISTRO = "familiar-unstable" +# So far, angstrom.conf and familiar.conf set ENABLE_BINARY_LOCALE_GENERATION +# to generate binary locale packages at build time using qemu-native and +# thereby guarantee i18n support on all devices. If your build breaks on +# qemu-native consider disabling ENABLE_BINARY_LOCALE_GENERATION (note that +# this breaks i18n on devices with less than 128MB RAM) or installing +# a working third-party qemu (e.g. provided by your distribution) and +# adding qemu-native to ASSUME_PROVIDED +# ENABLE_BINARY_LOCALE_GENERATION = "0" +# ASSUME_PROVIDED += "qemu-native" + # Uncomment this to select a particular kernel version if supported by # your MACHINE setting. Currently only supported on Zaurus Clamshells. # KERNEL_VERSION = "2.6" diff --git a/conf/machine/include/handheld-common.conf b/conf/machine/include/handheld-common.conf index 57afe89ce7..fbecc6e25c 100644 --- a/conf/machine/include/handheld-common.conf +++ b/conf/machine/include/handheld-common.conf @@ -20,6 +20,6 @@ PCMCIA_MANAGER ?= "pcmcia-cs" # Configuration bits for "generic handheld" BOOTSTRAP_EXTRA_RDEPENDS += "${PCMCIA_MANAGER} apm apmd network-suspend-scripts" -BOOTSTRAP_EXTRA_RRECOMMENDS += "ppp wireless-tools irda-utils openswan wpa-supplicant lrzsz ppp-dialin ${@linux_module_packages('${HANDHELD_MODULES}', d)}" +BOOTSTRAP_EXTRA_RRECOMMENDS += "ppp wireless-tools irda-utils openswan wpa-supplicant-nossl lrzsz ppp-dialin ${@linux_module_packages('${HANDHELD_MODULES}', d)}" INHERIT += "linux_modules" diff --git a/conf/machine/include/zaurus-clamshell-2.4.conf b/conf/machine/include/zaurus-clamshell-2.4.conf index c8be696358..184258c8b6 100644 --- a/conf/machine/include/zaurus-clamshell-2.4.conf +++ b/conf/machine/include/zaurus-clamshell-2.4.conf @@ -11,7 +11,7 @@ PREFERRED_VERSION_orinoco-modules = "0.13e" BOOTSTRAP_EXTRA_RDEPENDS += "kernel hostap-modules-cs orinoco-modules-cs sharp-sdmmc-support \ pcmcia-cs apmd apm wireless-tools console-tools irda-utils hostap-utils prism3-firmware prism3-support \ -wpa-supplicant ppp ppp-dialin openswan" +wpa-supplicant-nossl ppp ppp-dialin openswan" # Misc Modules BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-net-fd kernel-module-registers" diff --git a/conf/machine/include/zaurus-clamshell-2.6.conf b/conf/machine/include/zaurus-clamshell-2.6.conf index aa840586a6..d3882b7f65 100644 --- a/conf/machine/include/zaurus-clamshell-2.6.conf +++ b/conf/machine/include/zaurus-clamshell-2.6.conf @@ -2,10 +2,11 @@ # Don't forget to include zaurus-clamshell.conf as well PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus" +PREFERRED_VERSION_wpa_supplicant = "0.4.7" BOOTSTRAP_EXTRA_RDEPENDS += "kernel udev sysfsutils spectrum-fw \ pcmcia-cs apm wireless-tools irda-utils udev-utils console-tools hostap-utils prism3-firmware prism3-support \ -ppp ppp-dialin openswan wpa-supplicant alsa-utils-alsactl alsa-utils-alsamixer module-init-tools alsa-conf" +ppp ppp-dialin openswan wpa-supplicant-nossl alsa-utils-alsactl alsa-utils-alsamixer module-init-tools alsa-conf" # Ethernet modules BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-pcnet-cs" diff --git a/conf/machine/qemuarm.conf b/conf/machine/qemuarm.conf index 6c857b6bb9..2238f6673e 100644 --- a/conf/machine/qemuarm.conf +++ b/conf/machine/qemuarm.conf @@ -19,7 +19,7 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus" BOOTSTRAP_EXTRA_RDEPENDS += "kernel udev sysfsutils spectrum-fw \ pcmciautils apm wireless-tools irda-utils udev-utils console-tools hostap-utils prism3-firmware prism3-support \ -ppp ppp-dialin openswan wpa-supplicant alsa-utils-alsactl alsa-utils-alsamixer module-init-tools alsa-conf" +ppp ppp-dialin openswan wpa-supplicant-nossl alsa-utils-alsactl alsa-utils-alsamixer module-init-tools alsa-conf" # Ethernet modules #BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-pcnet-cs" diff --git a/packages/apr/apr-util_1.1.2.bb b/packages/apr/apr-util_0.9.7.bb index 1140ce2cf4..597c0ee93d 100644 --- a/packages/apr/apr-util_1.1.2.bb +++ b/packages/apr/apr-util_0.9.7.bb @@ -7,17 +7,19 @@ HOMEPAGE = "http://apr.apache.org" PR = "r0" -# apache mirrors? -SRC_URI = "http://mirror.switch.ch/mirror/apache/dist/apr/${P}.tar.gz" +SRC_URI = "${APACHE_MIRROR}/apr/${P}.tar.gz \ + file://gen_uri_delims.patch;patch=1 \ + file://uri_delims.h" EXTRA_OECONF = "--with-apr=${STAGING_BINDIR} --with-dbm=gdbm --with-gdbm=${STAGING_DIR}/${HOST_SYS} --with-expat=${STAGING_DIR}/${HOST_SYS}" inherit autotools lib_package binconfig do_configure() { + cp ${S}/../uri_delims.h ${S}/uri/. oe_runconf } do_stage() { - oe_libinstall -a -so -C .libs libaprutil-1 ${STAGING_LIBDIR} + oe_libinstall -a -so -C .libs libaprutil-0 ${STAGING_LIBDIR} } diff --git a/packages/apr/apr_1.1.1.bb b/packages/apr/apr_0.9.7.bb index ac5d378842..4c236109bb 100644 --- a/packages/apr/apr_1.1.1.bb +++ b/packages/apr/apr_0.9.7.bb @@ -6,8 +6,7 @@ HOMEPAGE = "http://apr.apache.org" PR = "r0" -# apache mirrors? -SRC_URI = "http://mirror.switch.ch/mirror/apache/dist/apr/${P}.tar.bz2" +SRC_URI = "${APACHE_MIRROR}/apr/${P}.tar.bz2" inherit autotools lib_package binconfig @@ -16,5 +15,5 @@ do_configure() { } do_stage() { - oe_libinstall -a -so -C .libs libapr-1 ${STAGING_LIBDIR} + oe_libinstall -a -so -C .libs libapr-0 ${STAGING_LIBDIR} } diff --git a/packages/apr/files/.mtn2git_empty b/packages/apr/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/apr/files/.mtn2git_empty diff --git a/packages/apr/files/gen_uri_delims.patch b/packages/apr/files/gen_uri_delims.patch new file mode 100644 index 0000000000..57bc15a305 --- /dev/null +++ b/packages/apr/files/gen_uri_delims.patch @@ -0,0 +1,7 @@ +--- apr-util-0.9.7/uri/Makefile.in.old 2006-03-11 23:01:09.000000000 +0100 ++++ apr-util-0.9.7/uri/Makefile.in 2006-03-11 23:01:28.000000000 +0100 +@@ -15,4 +15,3 @@ + apr_uri.lo: uri_delims.h apr_uri.c + + uri_delims.h: gen_uri_delims +- ./gen_uri_delims > uri_delims.h diff --git a/packages/apr/files/uri_delims.h b/packages/apr/files/uri_delims.h new file mode 100644 index 0000000000..0c855bf726 --- /dev/null +++ b/packages/apr/files/uri_delims.h @@ -0,0 +1,16 @@ +/* this file is automatically generated by gen_uri_delims, do not edit */ +static const unsigned char uri_delims[256] = { + T_NUL,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,T_HASH,0,0,0,0, + 0,0,0,0,0,0,0,T_SLASH,0,0,0,0,0,0,0,0,0,0,T_COLON,0, + 0,0,0,T_QUESTION,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +}; diff --git a/packages/cpio/cpio_2.5.bb b/packages/cpio/cpio_2.5.bb index e7ee85e001..a625dd7fd5 100644 --- a/packages/cpio/cpio_2.5.bb +++ b/packages/cpio/cpio_2.5.bb @@ -5,6 +5,8 @@ LICENSE = "GPL" MAINTAINER = "Chris Larson <kergoth@handhelds.org>" PR = "r3" +DEPENDS += " texinfo-native " + SRC_URI = "${GNU_MIRROR}/cpio/cpio-${PV}.tar.gz \ file://install.patch;patch=1" S = "${WORKDIR}/cpio-${PV}" diff --git a/packages/dropbear/dropbear.inc b/packages/dropbear/dropbear.inc index 4dd40b2157..301ac24cb2 100644 --- a/packages/dropbear/dropbear.inc +++ b/packages/dropbear/dropbear.inc @@ -18,7 +18,7 @@ inherit autotools update-rc.d INITSCRIPT_NAME = "dropbear" INITSCRIPT_PARAMS = "defaults 10" -CFLAGS_prepend = "-D_GNU_SOURCE -I. " +CFLAGS_prepend = " -I. " LD = "${CC}" SBINCOMMANDS = "dropbear dropbearkey dropbearconvert" diff --git a/packages/dropbear/dropbear_0.45.bb b/packages/dropbear/dropbear_0.45.bb index 68c6e87e75..8daf54aac3 100644 --- a/packages/dropbear/dropbear_0.45.bb +++ b/packages/dropbear/dropbear_0.45.bb @@ -1,4 +1,4 @@ -require dropbear.inc +include dropbear.inc PR = "r4" diff --git a/packages/dropbear/dropbear_0.46.bb b/packages/dropbear/dropbear_0.46.bb index d34787fa64..9aed2dc976 100644 --- a/packages/dropbear/dropbear_0.46.bb +++ b/packages/dropbear/dropbear_0.46.bb @@ -1,4 +1,4 @@ -require dropbear.inc +include dropbear.inc PR = "r6" diff --git a/packages/dropbear/dropbear_0.47.bb b/packages/dropbear/dropbear_0.47.bb index b8467e1e7c..5990260b87 100644 --- a/packages/dropbear/dropbear_0.47.bb +++ b/packages/dropbear/dropbear_0.47.bb @@ -1,3 +1,3 @@ -require dropbear.inc +include dropbear.inc PR = "r2" diff --git a/packages/dropbear/dropbear_0.48.1.bb b/packages/dropbear/dropbear_0.48.1.bb new file mode 100644 index 0000000000..d039209764 --- /dev/null +++ b/packages/dropbear/dropbear_0.48.1.bb @@ -0,0 +1 @@ +include dropbear.inc diff --git a/packages/dropbear/dropbear_0.48.bb b/packages/dropbear/dropbear_0.48.bb deleted file mode 100644 index f98c0ac8f6..0000000000 --- a/packages/dropbear/dropbear_0.48.bb +++ /dev/null @@ -1 +0,0 @@ -require dropbear.inc diff --git a/packages/fakeroot/fakeroot-native_1.2.13.bb b/packages/fakeroot/fakeroot-native_1.2.13.bb index 4df6eeb5c5..cc3dfd2231 100644 --- a/packages/fakeroot/fakeroot-native_1.2.13.bb +++ b/packages/fakeroot/fakeroot-native_1.2.13.bb @@ -6,7 +6,13 @@ inherit native SRC_URI += "file://fix-prefix.patch;patch=1" S = "${WORKDIR}/fakeroot-${PV}" -EXTRA_OECONF = "--program-prefix=" +EXTRA_OECONF = " --program-prefix=" + +# Compatability for the rare systems not using or having SYSV +python () { + if bb.data.getVar('HOST_NONSYSV', d, True) and bb.data.getVar('HOST_NONSYSV', d, True) != '0': + bb.data.setVar('EXTRA_OECONF', ' --with-ipc=tcp --program-prefix= ', d) +} do_stage_append () { oe_libinstall -so libfakeroot ${STAGING_LIBDIR}/libfakeroot/ diff --git a/packages/gcc/gcc-4.1.0/.mtn2git_empty b/packages/gcc/gcc-4.1.0/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/gcc/gcc-4.1.0/.mtn2git_empty diff --git a/packages/gcc/gcc-4.1.0/arm-nolibfloat.patch b/packages/gcc/gcc-4.1.0/arm-nolibfloat.patch new file mode 100644 index 0000000000..c4897c0330 --- /dev/null +++ b/packages/gcc/gcc-4.1.0/arm-nolibfloat.patch @@ -0,0 +1,24 @@ +# Dimitry Andric <dimitry@andric.com>, 2004-05-01 +# +# * Removed the extra -lfloat option from LIBGCC_SPEC, since it isn't needed +# anymore. (The required functions are now in libgcc.) +# +# Fixes errors like +# arm-softfloat-linux-gnu/3.4.0/../../../../arm-softfloat-linux-gnu/bin/ld: cannot find -lfloat +# collect2: ld returned 1 exit status +# make[2]: *** [arm-softfloat-linux-gnu/gcc-3.4.0-glibc-2.3.2/build-glibc/iconvdata/ISO8859-1.so] Error 1 +# when building glibc-2.3.3 with gcc-3.4.0 for arm-softfloat + +Index: gcc-4.0.2/gcc/config/arm/linux-elf.h +=================================================================== +--- gcc-4.0.2.orig/gcc/config/arm/linux-elf.h 2005-03-04 16:14:01.000000000 +0000 ++++ gcc-4.0.2/gcc/config/arm/linux-elf.h 2005-11-11 18:02:54.000000000 +0000 +@@ -56,7 +56,7 @@ + %{shared:-lc} \ + %{!shared:%{profile:-lc_p}%{!profile:-lc}}" + +-#define LIBGCC_SPEC "%{msoft-float:-lfloat} %{mfloat-abi=soft*:-lfloat} -lgcc" ++#define LIBGCC_SPEC "-lgcc" + + /* Provide a STARTFILE_SPEC appropriate for GNU/Linux. Here we add + the GNU/Linux magical crtbegin.o file (see crtstuff.c) which diff --git a/packages/gcc/gcc-4.1.0/arm-softfloat.patch b/packages/gcc/gcc-4.1.0/arm-softfloat.patch new file mode 100644 index 0000000000..c86c83ed15 --- /dev/null +++ b/packages/gcc/gcc-4.1.0/arm-softfloat.patch @@ -0,0 +1,16 @@ +Index: gcc-4.0.2/gcc/config/arm/t-linux +=================================================================== +--- gcc-4.0.2.orig/gcc/config/arm/t-linux 2004-05-15 12:41:35.000000000 +0000 ++++ gcc-4.0.2/gcc/config/arm/t-linux 2005-11-11 16:07:53.000000000 +0000 +@@ -4,7 +4,10 @@ + LIBGCC2_DEBUG_CFLAGS = -g0 + + LIB1ASMSRC = arm/lib1funcs.asm +-LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_lnx ++LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_lnx \ ++ _negdf2 _addsubdf3 _muldivdf3 _cmpdf2 _unorddf2 _fixdfsi _fixunsdfsi \ ++ _truncdfsf2 _negsf2 _addsubsf3 _muldivsf3 _cmpsf2 _unordsf2 \ ++ _fixsfsi _fixunssfsi _floatdidf _floatdisf + + # MULTILIB_OPTIONS = mhard-float/msoft-float + # MULTILIB_DIRNAMES = hard-float soft-float diff --git a/packages/gcc/gcc-4.1.0/ldflags.patch b/packages/gcc/gcc-4.1.0/ldflags.patch new file mode 100644 index 0000000000..9576f60778 --- /dev/null +++ b/packages/gcc/gcc-4.1.0/ldflags.patch @@ -0,0 +1,22 @@ +--- /tmp/Makefile.in 2006-02-23 20:56:01.399758728 +0100 ++++ gcc-4.1-20060217/Makefile.in 2006-02-23 20:56:16.874406224 +0100 +@@ -334,7 +334,7 @@ + CXXFLAGS_FOR_TARGET = $(CXXFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) + LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET) + LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates +-LDFLAGS_FOR_TARGET = ++LDFLAGS_FOR_TARGET = @LDFLAGS@ + PICFLAG_FOR_TARGET = + + # ------------------------------------ +--- /tmp/Makefile.tpl 2006-02-23 20:50:34.077519272 +0100 ++++ gcc-4.1-20060217/Makefile.tpl 2006-02-23 21:04:31.092273688 +0100 +@@ -337,7 +337,7 @@ + CXXFLAGS_FOR_TARGET = $(CXXFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) + LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET) + LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates +-LDFLAGS_FOR_TARGET = ++LDFLAGS_FOR_TARGET = @LDFLAGS@ + PICFLAG_FOR_TARGET = + + # ------------------------------------ diff --git a/packages/gcc/gcc-cross-initial_4.1.0.bb b/packages/gcc/gcc-cross-initial_4.1.0.bb new file mode 100644 index 0000000000..63308c2cfe --- /dev/null +++ b/packages/gcc/gcc-cross-initial_4.1.0.bb @@ -0,0 +1,30 @@ +include gcc-cross_${PV}.bb + +DEPENDS = "virtual/${TARGET_PREFIX}binutils" +DEPENDS += "${@['virtual/${TARGET_PREFIX}libc-initial',''][bb.data.getVar('TARGET_ARCH', d, 1) in ['arm', 'armeb', 'mips', 'mipsel']]}" +PROVIDES = "virtual/${TARGET_PREFIX}gcc-initial" +PACKAGES = "" + +# This is intended to be a -very- basic config +EXTRA_OECONF = "--with-local-prefix=${CROSS_DIR}/${TARGET_SYS} \ + --with-newlib \ + --disable-shared \ + --disable-threads \ + --disable-multilib \ + --disable-__cxa_atexit \ + --disable-libmudflap \ + --disable-libssp \ + --enable-languages=c \ + --enable-target-optspace \ + --program-prefix=${TARGET_PREFIX} \ + ${@get_gcc_fpu_setting(bb, d)}" + +do_stage_prepend () { + mkdir -p ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV} + ln -sf libgcc.a ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}/libgcc_eh.a +} + +# Override the method from gcc-cross so we don't try to install libgcc +do_install () { + oe_runmake 'DESTDIR=${D}' install +} diff --git a/packages/gcc/gcc-cross_4.1.0.bb b/packages/gcc/gcc-cross_4.1.0.bb new file mode 100644 index 0000000000..6e299e8299 --- /dev/null +++ b/packages/gcc/gcc-cross_4.1.0.bb @@ -0,0 +1,16 @@ +include gcc_${PV}.bb +# path mangling, needed by the cross packaging +include gcc-paths-cross.inc +inherit cross +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}" +# NOTE: split PR. If the main .oe changes something that affects its *build* +# remember to increment this one too. +PR = "r1" + +DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc gmp-native mpfr-native" +PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++" + +# cross build +include gcc3-build-cross.inc +# cross packaging +include gcc-package-cross.inc diff --git a/packages/gcc/gcc_4.1.0.bb b/packages/gcc/gcc_4.1.0.bb new file mode 100644 index 0000000000..8bd3640fd8 --- /dev/null +++ b/packages/gcc/gcc_4.1.0.bb @@ -0,0 +1,17 @@ +PR = "r0" +DESCRIPTION = "The GNU cc and gcc C compilers." +HOMEPAGE = "http://www.gnu.org/software/gcc/" +SECTION = "devel" +LICENSE = "GPL" +DEFAULT_PREFERENCE = "-1" + +inherit autotools gettext + +include gcc-package.inc + +SRC_URI = "http://ftp.gnu.org/pub/gnu/gcc/gcc-4.1.0/gcc-4.1.0.tar.bz2 \ + file://arm-nolibfloat.patch;patch=1 \ + file://arm-softfloat.patch;patch=1 \ + file://ldflags.patch;patch=1" + +include gcc4-build.inc diff --git a/packages/glibc/glibc-2.4/.mtn2git_empty b/packages/glibc/glibc-2.4/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/glibc/glibc-2.4/.mtn2git_empty diff --git a/packages/glibc/glibc-2.4/arm-longlong.patch b/packages/glibc/glibc-2.4/arm-longlong.patch new file mode 100644 index 0000000000..320a55524c --- /dev/null +++ b/packages/glibc/glibc-2.4/arm-longlong.patch @@ -0,0 +1,58 @@ +--- glibc-2.4/stdlib/longlong.h.ark 2006-03-11 22:49:27.000000000 +0100 ++++ glibc-2.4/stdlib/longlong.h 2006-03-11 22:55:12.000000000 +0100 +@@ -206,6 +206,14 @@ + "rI" ((USItype) (bh)), \ + "r" ((USItype) (al)), \ + "rI" ((USItype) (bl)) __CLOBBER_CC) ++/* v3m and all higher arches have long multiply support. */ ++#if !defined(__ARM_ARCH_2__) && !defined(__ARM_ARCH_3__) ++#define umul_ppmm(xh, xl, a, b) \ ++ __asm__ ("umull %0,%1,%2,%3" : "=&r" (xl), "=&r" (xh) : "r" (a), "r" (b)) ++#define UMUL_TIME 5 ++#define smul_ppmm(xh, xl, a, b) \ ++ __asm__ ("smull %0,%1,%2,%3" : "=&r" (xl), "=&r" (xh) : "r" (a), "r" (b)) ++#else + #define umul_ppmm(xh, xl, a, b) \ + {register USItype __t0, __t1, __t2; \ + __asm__ ("%@ Inlined umul_ppmm\n" \ +@@ -227,7 +235,13 @@ + : "r" ((USItype) (a)), \ + "r" ((USItype) (b)) __CLOBBER_CC );} + #define UMUL_TIME 20 ++#endif + #define UDIV_TIME 100 ++#if defined(__ARM_ARCH_5__) || defined(__ARM_ARCH_5T__) || defined(__ARM_ARCH_5TE__) ++#define count_leading_zeros(COUNT,X) ((COUNT) = __builtin_clz (X)) ++#define COUNT_LEADING_ZEROS_0 32 ++#endif ++ + #endif /* __arm__ */ + + #if defined (__hppa) && W_TYPE_SIZE == 32 +--- glibc-2.4/ports/sysdeps/arm/mp_clz_tab.c.ark 2006-03-11 22:56:43.000000000 +0100 ++++ glibc-2.4/ports/sysdeps/arm/mp_clz_tab.c 2006-03-11 22:58:19.000000000 +0100 +@@ -0,0 +1,24 @@ ++/* __clz_tab -- support for longlong.h ++ Copyright (C) 2004 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, write to the Free ++ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA ++ 02111-1307 USA. */ ++ ++#if defined(__ARM_ARCH_5__) || defined(__ARM_ARCH_5T__) || defined(__ARM_ARCH_5TE__) ++/* Nothing required. */ ++#else ++#include <sysdeps/generic/mp_clz_tab.c> ++#endif diff --git a/packages/glibc/glibc-2.4/arm-memcpy.patch b/packages/glibc/glibc-2.4/arm-memcpy.patch new file mode 100644 index 0000000000..bc2b3dab84 --- /dev/null +++ b/packages/glibc/glibc-2.4/arm-memcpy.patch @@ -0,0 +1,758 @@ +--- /dev/null 2004-02-02 20:32:13.000000000 +0000 ++++ sysdeps/arm/memmove.S 2004-03-20 18:37:23.000000000 +0000 +@@ -0,0 +1,251 @@ ++/* ++ * Optimized memmove implementation for ARM processors ++ * ++ * Author: Nicolas Pitre ++ * Created: Dec 23, 2003 ++ * Copyright: (C) MontaVista Software, Inc. ++ * ++ * This file is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2.1 of the License, or (at your option) any later version. ++ * ++ * This file is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Lesser General Public License for more details. ++ */ ++ ++#include <sysdep.h> ++ ++ ++/* ++ * Endian independent macros for shifting bytes within registers. ++ */ ++#ifndef __ARMEB__ ++#define pull lsr ++#define push lsl ++#else ++#define pull lsl ++#define push lsr ++#endif ++ ++/* ++ * Enable data preload for architectures that support it (ARMv5 and above) ++ */ ++#if defined(__ARM_ARCH_5__) || \ ++ defined(__ARM_ARCH_5T__) || \ ++ defined(__ARM_ARCH_5TE__) ++#define PLD(code...) code ++#else ++#define PLD(code...) ++#endif ++ ++ ++/* char * memmove (char *dst, const char *src) */ ++ENTRY(memmove) ++ subs ip, r0, r1 ++ cmphi r2, ip ++ bls memcpy(PLT) ++ ++ stmfd sp!, {r0, r4, lr} ++ add r1, r1, r2 ++ add r0, r0, r2 ++ subs r2, r2, #4 ++ blt 25f ++ ands ip, r0, #3 ++ PLD( pld [r1, #-4] ) ++ bne 26f ++ ands ip, r1, #3 ++ bne 27f ++ ++19: subs r2, r2, #4 ++ blt 24f ++ subs r2, r2, #8 ++ blt 23f ++ subs r2, r2, #16 ++ blt 22f ++ ++ PLD( pld [r1, #-32] ) ++ PLD( subs r2, r2, #96 ) ++ stmfd sp!, {r5 - r8} ++ PLD( blt 21f ) ++ ++ PLD( @ cache alignment ) ++ PLD( ands ip, r1, #31 ) ++ PLD( pld [r1, #-64] ) ++ PLD( beq 20f ) ++ PLD( cmp r2, ip ) ++ PLD( pld [r1, #-96] ) ++ PLD( blt 20f ) ++ PLD( cmp ip, #16 ) ++ PLD( sub r2, r2, ip ) ++ PLD( ldmgedb r1!, {r3 - r6} ) ++ PLD( stmgedb r0!, {r3 - r6} ) ++ PLD( beq 20f ) ++ PLD( and ip, ip, #15 ) ++ PLD( cmp ip, #8 ) ++ PLD( ldr r3, [r1, #-4]! ) ++ PLD( ldrge r4, [r1, #-4]! ) ++ PLD( ldrgt r5, [r1, #-4]! ) ++ PLD( str r3, [r0, #-4]! ) ++ PLD( strge r4, [r0, #-4]! ) ++ PLD( strgt r5, [r0, #-4]! ) ++ ++20: PLD( pld [r1, #-96] ) ++ PLD( pld [r1, #-128] ) ++21: ldmdb r1!, {r3, r4, ip, lr} ++ subs r2, r2, #32 ++ stmdb r0!, {r3, r4, ip, lr} ++ ldmdb r1!, {r3, r4, ip, lr} ++ stmgedb r0!, {r3, r4, ip, lr} ++ ldmgedb r1!, {r3, r4, ip, lr} ++ stmgedb r0!, {r3, r4, ip, lr} ++ ldmgedb r1!, {r3, r4, ip, lr} ++ subges r2, r2, #32 ++ stmdb r0!, {r3, r4, ip, lr} ++ bge 20b ++ PLD( cmn r2, #96 ) ++ PLD( bge 21b ) ++ PLD( add r2, r2, #96 ) ++ tst r2, #31 ++ ldmfd sp!, {r5 - r8} ++ ldmeqfd sp!, {r0, r4, pc} ++ ++ tst r2, #16 ++22: ldmnedb r1!, {r3, r4, ip, lr} ++ stmnedb r0!, {r3, r4, ip, lr} ++ ++ tst r2, #8 ++23: ldmnedb r1!, {r3, r4} ++ stmnedb r0!, {r3, r4} ++ ++ tst r2, #4 ++24: ldrne r3, [r1, #-4]! ++ strne r3, [r0, #-4]! ++ ++25: ands r2, r2, #3 ++ ldmeqfd sp!, {r0, r4, pc} ++ ++ cmp r2, #2 ++ ldrb r3, [r1, #-1] ++ ldrgeb r4, [r1, #-2] ++ ldrgtb ip, [r1, #-3] ++ strb r3, [r0, #-1] ++ strgeb r4, [r0, #-2] ++ strgtb ip, [r0, #-3] ++ ldmfd sp!, {r0, r4, pc} ++ ++26: cmp ip, #2 ++ ldrb r3, [r1, #-1]! ++ ldrgeb r4, [r1, #-1]! ++ ldrgtb lr, [r1, #-1]! ++ strb r3, [r0, #-1]! ++ strgeb r4, [r0, #-1]! ++ strgtb lr, [r0, #-1]! ++ subs r2, r2, ip ++ blt 25b ++ ands ip, r1, #3 ++ beq 19b ++ ++27: bic r1, r1, #3 ++ cmp ip, #2 ++ ldr r3, [r1] ++ beq 35f ++ blt 36f ++ ++ ++ .macro backward_copy_shift push pull ++ ++ cmp r2, #12 ++ PLD( pld [r1, #-4] ) ++ blt 33f ++ subs r2, r2, #28 ++ stmfd sp!, {r5 - r9} ++ blt 31f ++ ++ PLD( subs r2, r2, #96 ) ++ PLD( pld [r1, #-32] ) ++ PLD( blt 30f ) ++ PLD( pld [r1, #-64] ) ++ ++ PLD( @ cache alignment ) ++ PLD( ands ip, r1, #31 ) ++ PLD( pld [r1, #-96] ) ++ PLD( beq 29f ) ++ PLD( cmp r2, ip ) ++ PLD( pld [r1, #-128] ) ++ PLD( blt 29f ) ++ PLD( sub r2, r2, ip ) ++28: PLD( mov r4, r3, push #\push ) ++ PLD( ldr r3, [r1, #-4]! ) ++ PLD( subs ip, ip, #4 ) ++ PLD( orr r4, r4, r3, pull #\pull ) ++ PLD( str r4, [r0, #-4]! ) ++ PLD( bgt 28b ) ++ ++29: PLD( pld [r1, #-128] ) ++30: mov lr, r3, push #\push ++ ldmdb r1!, {r3 - r9, ip} ++ subs r2, r2, #32 ++ orr lr, lr, ip, pull #\pull ++ mov ip, ip, push #\push ++ orr ip, ip, r9, pull #\pull ++ mov r9, r9, push #\push ++ orr r9, r9, r8, pull #\pull ++ mov r8, r8, push #\push ++ orr r8, r8, r7, pull #\pull ++ mov r7, r7, push #\push ++ orr r7, r7, r6, pull #\pull ++ mov r6, r6, push #\push ++ orr r6, r6, r5, pull #\pull ++ mov r5, r5, push #\push ++ orr r5, r5, r4, pull #\pull ++ mov r4, r4, push #\push ++ orr r4, r4, r3, pull #\pull ++ stmdb r0!, {r4 - r9, ip, lr} ++ bge 29b ++ PLD( cmn r2, #96 ) ++ PLD( bge 30b ) ++ PLD( add r2, r2, #96 ) ++ cmn r2, #16 ++ blt 32f ++31: mov r7, r3, push #\push ++ ldmdb r1!, {r3 - r6} ++ sub r2, r2, #16 ++ orr r7, r7, r6, pull #\pull ++ mov r6, r6, push #\push ++ orr r6, r6, r5, pull #\pull ++ mov r5, r5, push #\push ++ orr r5, r5, r4, pull #\pull ++ mov r4, r4, push #\push ++ orr r4, r4, r3, pull #\pull ++ stmdb r0!, {r4 - r7} ++32: adds r2, r2, #28 ++ ldmfd sp!, {r5 - r9} ++ blt 34f ++33: mov r4, r3, push #\push ++ ldr r3, [r1, #-4]! ++ subs r2, r2, #4 ++ orr r4, r4, r3, pull #\pull ++ str r4, [r0, #-4]! ++ bge 33b ++34: ++ .endm ++ ++ ++ backward_copy_shift push=8 pull=24 ++ add r1, r1, #3 ++ b 25b ++ ++35: backward_copy_shift push=16 pull=16 ++ add r1, r1, #2 ++ b 25b ++ ++36: backward_copy_shift push=24 pull=8 ++ add r1, r1, #1 ++ b 25b ++ ++ .size memmove, . - memmove ++END(memmove) ++libc_hidden_builtin_def (memmove) +--- /dev/null 2004-02-02 20:32:13.000000000 +0000 ++++ sysdeps/arm/bcopy.S 2004-03-20 18:37:48.000000000 +0000 +@@ -0,0 +1,255 @@ ++/* ++ * Optimized memmove implementation for ARM processors ++ * ++ * Author: Nicolas Pitre ++ * Created: Dec 23, 2003 ++ * Copyright: (C) MontaVista Software, Inc. ++ * ++ * This file is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2.1 of the License, or (at your option) any later version. ++ * ++ * This file is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Lesser General Public License for more details. ++ */ ++ ++#include <sysdep.h> ++ ++ ++/* ++ * Endian independent macros for shifting bytes within registers. ++ */ ++#ifndef __ARMEB__ ++#define pull lsr ++#define push lsl ++#else ++#define pull lsl ++#define push lsr ++#endif ++ ++/* ++ * Enable data preload for architectures that support it (ARMv5 and above) ++ */ ++#if defined(__ARM_ARCH_5__) || \ ++ defined(__ARM_ARCH_5T__) || \ ++ defined(__ARM_ARCH_5TE__) ++#define PLD(code...) code ++#else ++#define PLD(code...) ++#endif ++ ++dst .req r1 ++src .req r0 ++ ++/* void *bcopy (const char *src, char *dst, size_t size) */ ++ENTRY(bcopy) ++ subs ip, dst, src ++ cmphi r2, ip ++ movls r3, r0 ++ movls r0, r1 ++ movls r1, r3 ++ bls memcpy(PLT) ++ ++ stmfd sp!, {r4, lr} ++ add src, src, r2 ++ add dst, dst, r2 ++ subs r2, r2, #4 ++ blt 25f ++ ands ip, dst, #3 ++ PLD( pld [src, #-4] ) ++ bne 26f ++ ands ip, src, #3 ++ bne 27f ++ ++19: subs r2, r2, #4 ++ blt 24f ++ subs r2, r2, #8 ++ blt 23f ++ subs r2, r2, #16 ++ blt 22f ++ ++ PLD( pld [src, #-32] ) ++ PLD( subs r2, r2, #96 ) ++ stmfd sp!, {r5 - r8} ++ PLD( blt 21f ) ++ ++ PLD( @ cache alignment ) ++ PLD( ands ip, src, #31 ) ++ PLD( pld [src, #-64] ) ++ PLD( beq 20f ) ++ PLD( cmp r2, ip ) ++ PLD( pld [src, #-96] ) ++ PLD( blt 20f ) ++ PLD( cmp ip, #16 ) ++ PLD( sub r2, r2, ip ) ++ PLD( ldmgedb src!, {r3 - r6} ) ++ PLD( stmgedb dst!, {r3 - r6} ) ++ PLD( beq 20f ) ++ PLD( and ip, ip, #15 ) ++ PLD( cmp ip, #8 ) ++ PLD( ldr r3, [src, #-4]! ) ++ PLD( ldrge r4, [src, #-4]! ) ++ PLD( ldrgt r5, [src, #-4]! ) ++ PLD( str r3, [dst, #-4]! ) ++ PLD( strge r4, [dst, #-4]! ) ++ PLD( strgt r5, [dst, #-4]! ) ++ ++20: PLD( pld [src, #-96] ) ++ PLD( pld [src, #-128] ) ++21: ldmdb src!, {r3, r4, ip, lr} ++ subs r2, r2, #32 ++ stmdb dst!, {r3, r4, ip, lr} ++ ldmdb src!, {r3, r4, ip, lr} ++ stmgedb dst!, {r3, r4, ip, lr} ++ ldmgedb src!, {r3, r4, ip, lr} ++ stmgedb dst!, {r3, r4, ip, lr} ++ ldmgedb src!, {r3, r4, ip, lr} ++ subges r2, r2, #32 ++ stmdb dst!, {r3, r4, ip, lr} ++ bge 20b ++ PLD( cmn r2, #96 ) ++ PLD( bge 21b ) ++ PLD( add r2, r2, #96 ) ++ tst r2, #31 ++ ldmfd sp!, {r5 - r8} ++ ldmeqfd sp!, {r4, pc} ++ ++ tst r2, #16 ++22: ldmnedb src!, {r3, r4, ip, lr} ++ stmnedb dst!, {r3, r4, ip, lr} ++ ++ tst r2, #8 ++23: ldmnedb src!, {r3, r4} ++ stmnedb dst!, {r3, r4} ++ ++ tst r2, #4 ++24: ldrne r3, [src, #-4]! ++ strne r3, [dst, #-4]! ++ ++25: ands r2, r2, #3 ++ ldmeqfd sp!, {dst, r4, pc} ++ ++ cmp r2, #2 ++ ldrb r3, [src, #-1] ++ ldrgeb r4, [src, #-2] ++ ldrgtb ip, [src, #-3] ++ strb r3, [dst, #-1] ++ strgeb r4, [dst, #-2] ++ strgtb ip, [dst, #-3] ++ ldmfd sp!, {dst, r4, pc} ++ ++26: cmp ip, #2 ++ ldrb r3, [src, #-1]! ++ ldrgeb r4, [src, #-1]! ++ ldrgtb lr, [src, #-1]! ++ strb r3, [dst, #-1]! ++ strgeb r4, [dst, #-1]! ++ strgtb lr, [dst, #-1]! ++ subs r2, r2, ip ++ blt 25b ++ ands ip, src, #3 ++ beq 19b ++ ++27: bic src, src, #3 ++ cmp ip, #2 ++ ldr r3, [src] ++ beq 35f ++ blt 36f ++ ++ ++ .macro backward_copy_shift push pull ++ ++ cmp r2, #12 ++ PLD( pld [src, #-4] ) ++ blt 33f ++ subs r2, r2, #28 ++ stmfd sp!, {r5 - r9} ++ blt 31f ++ ++ PLD( subs r2, r2, #96 ) ++ PLD( pld [src, #-32] ) ++ PLD( blt 30f ) ++ PLD( pld [src, #-64] ) ++ ++ PLD( @ cache alignment ) ++ PLD( ands ip, src, #31 ) ++ PLD( pld [src, #-96] ) ++ PLD( beq 29f ) ++ PLD( cmp r2, ip ) ++ PLD( pld [src, #-128] ) ++ PLD( blt 29f ) ++ PLD( sub r2, r2, ip ) ++28: PLD( mov r4, r3, push #\push ) ++ PLD( ldr r3, [src, #-4]! ) ++ PLD( subs ip, ip, #4 ) ++ PLD( orr r4, r4, r3, pull #\pull ) ++ PLD( str r4, [dst, #-4]! ) ++ PLD( bgt 28b ) ++ ++29: PLD( pld [src, #-128] ) ++30: mov lr, r3, push #\push ++ ldmdb src!, {r3 - r9, ip} ++ subs r2, r2, #32 ++ orr lr, lr, ip, pull #\pull ++ mov ip, ip, push #\push ++ orr ip, ip, r9, pull #\pull ++ mov r9, r9, push #\push ++ orr r9, r9, r8, pull #\pull ++ mov r8, r8, push #\push ++ orr r8, r8, r7, pull #\pull ++ mov r7, r7, push #\push ++ orr r7, r7, r6, pull #\pull ++ mov r6, r6, push #\push ++ orr r6, r6, r5, pull #\pull ++ mov r5, r5, push #\push ++ orr r5, r5, r4, pull #\pull ++ mov r4, r4, push #\push ++ orr r4, r4, r3, pull #\pull ++ stmdb dst!, {r4 - r9, ip, lr} ++ bge 29b ++ PLD( cmn r2, #96 ) ++ PLD( bge 30b ) ++ PLD( add r2, r2, #96 ) ++ cmn r2, #16 ++ blt 32f ++31: mov r7, r3, push #\push ++ ldmdb src!, {r3 - r6} ++ sub r2, r2, #16 ++ orr r7, r7, r6, pull #\pull ++ mov r6, r6, push #\push ++ orr r6, r6, r5, pull #\pull ++ mov r5, r5, push #\push ++ orr r5, r5, r4, pull #\pull ++ mov r4, r4, push #\push ++ orr r4, r4, r3, pull #\pull ++ stmdb dst!, {r4 - r7} ++32: adds r2, r2, #28 ++ ldmfd sp!, {r5 - r9} ++ blt 34f ++33: mov r4, r3, push #\push ++ ldr r3, [src, #-4]! ++ subs r2, r2, #4 ++ orr r4, r4, r3, pull #\pull ++ str r4, [dst, #-4]! ++ bge 33b ++34: ++ .endm ++ ++ ++ backward_copy_shift push=8 pull=24 ++ add src, src, #3 ++ b 25b ++ ++35: backward_copy_shift push=16 pull=16 ++ add src, src, #2 ++ b 25b ++ ++36: backward_copy_shift push=24 pull=8 ++ add src, src, #1 ++ b 25b ++ ++ .size bcopy, . - bcopy ++END(bcopy) + +--- /dev/null 2004-02-02 20:32:13.000000000 +0000 ++++ sysdeps/arm/memcpy.S 2004-05-02 14:33:22.000000000 +0100 +@@ -0,0 +1,242 @@ ++/* ++ * Optimized memcpy implementation for ARM processors ++ * ++ * Author: Nicolas Pitre ++ * Created: Dec 23, 2003 ++ * Copyright: (C) MontaVista Software, Inc. ++ * ++ * This file is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2.1 of the License, or (at your option) any later version. ++ * ++ * This file is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Lesser General Public License for more details. ++ */ ++ ++#include <sysdep.h> ++ ++ ++/* ++ * Endian independent macros for shifting bytes within registers. ++ */ ++#ifndef __ARMEB__ ++#define pull lsr ++#define push lsl ++#else ++#define pull lsl ++#define push lsr ++#endif ++ ++/* ++ * Enable data preload for architectures that support it (ARMv5 and above) ++ */ ++#if defined(__ARM_ARCH_5__) || \ ++ defined(__ARM_ARCH_5T__) || \ ++ defined(__ARM_ARCH_5TE__) ++#define PLD(code...) code ++#else ++#define PLD(code...) ++#endif ++ ++ ++/* char * memcpy (char *dst, const char *src) */ ++ ++ENTRY(memcpy) ++ subs r2, r2, #4 ++ stmfd sp!, {r0, r4, lr} ++ blt 7f ++ ands ip, r0, #3 ++ PLD( pld [r1, #0] ) ++ bne 8f ++ ands ip, r1, #3 ++ bne 9f ++ ++1: subs r2, r2, #4 ++ blt 6f ++ subs r2, r2, #8 ++ blt 5f ++ subs r2, r2, #16 ++ blt 4f ++ ++ PLD( subs r2, r2, #65 ) ++ stmfd sp!, {r5 - r8} ++ PLD( blt 3f ) ++ PLD( pld [r1, #32] ) ++ ++ PLD( @ cache alignment ) ++ PLD( ands ip, r1, #31 ) ++ PLD( pld [r1, #64] ) ++ PLD( beq 2f ) ++ PLD( rsb ip, ip, #32 ) ++ PLD( cmp r2, ip ) ++ PLD( pld [r1, #96] ) ++ PLD( blt 2f ) ++ PLD( cmp ip, #16 ) ++ PLD( sub r2, r2, ip ) ++ PLD( ldmgeia r1!, {r3 - r6} ) ++ PLD( stmgeia r0!, {r3 - r6} ) ++ PLD( beq 2f ) ++ PLD( and ip, ip, #15 ) ++ PLD( cmp ip, #8 ) ++ PLD( ldr r3, [r1], #4 ) ++ PLD( ldrge r4, [r1], #4 ) ++ PLD( ldrgt r5, [r1], #4 ) ++ PLD( str r3, [r0], #4 ) ++ PLD( strge r4, [r0], #4 ) ++ PLD( strgt r5, [r0], #4 ) ++ ++2: PLD( pld [r1, #96] ) ++3: ldmia r1!, {r3 - r8, ip, lr} ++ subs r2, r2, #32 ++ stmia r0!, {r3 - r8, ip, lr} ++ bge 2b ++ PLD( cmn r2, #65 ) ++ PLD( bge 3b ) ++ PLD( add r2, r2, #65 ) ++ tst r2, #31 ++ ldmfd sp!, {r5 - r8} ++ ldmeqfd sp!, {r0, r4, pc} ++ ++ tst r2, #16 ++4: ldmneia r1!, {r3, r4, ip, lr} ++ stmneia r0!, {r3, r4, ip, lr} ++ ++ tst r2, #8 ++5: ldmneia r1!, {r3, r4} ++ stmneia r0!, {r3, r4} ++ ++ tst r2, #4 ++6: ldrne r3, [r1], #4 ++ strne r3, [r0], #4 ++ ++7: ands r2, r2, #3 ++ ldmeqfd sp!, {r0, r4, pc} ++ ++ cmp r2, #2 ++ ldrb r3, [r1], #1 ++ ldrgeb r4, [r1], #1 ++ ldrgtb ip, [r1] ++ strb r3, [r0], #1 ++ strgeb r4, [r0], #1 ++ strgtb ip, [r0] ++ ldmfd sp!, {r0, r4, pc} ++ ++8: rsb ip, ip, #4 ++ cmp ip, #2 ++ ldrb r3, [r1], #1 ++ ldrgeb r4, [r1], #1 ++ ldrgtb lr, [r1], #1 ++ strb r3, [r0], #1 ++ strgeb r4, [r0], #1 ++ strgtb lr, [r0], #1 ++ subs r2, r2, ip ++ blt 7b ++ ands ip, r1, #3 ++ beq 1b ++ ++9: bic r1, r1, #3 ++ cmp ip, #2 ++ ldr lr, [r1], #4 ++ beq 17f ++ bgt 18f ++ ++ ++ .macro forward_copy_shift pull push ++ ++ cmp r2, #12 ++ PLD( pld [r1, #0] ) ++ blt 15f ++ subs r2, r2, #28 ++ stmfd sp!, {r5 - r9} ++ blt 13f ++ ++ PLD( subs r2, r2, #97 ) ++ PLD( blt 12f ) ++ PLD( pld [r1, #32] ) ++ ++ PLD( @ cache alignment ) ++ PLD( rsb ip, r1, #36 ) ++ PLD( pld [r1, #64] ) ++ PLD( ands ip, ip, #31 ) ++ PLD( pld [r1, #96] ) ++ PLD( beq 11f ) ++ PLD( cmp r2, ip ) ++ PLD( pld [r1, #128] ) ++ PLD( blt 11f ) ++ PLD( sub r2, r2, ip ) ++10: PLD( mov r3, lr, pull #\pull ) ++ PLD( ldr lr, [r1], #4 ) ++ PLD( subs ip, ip, #4 ) ++ PLD( orr r3, r3, lr, push #\push ) ++ PLD( str r3, [r0], #4 ) ++ PLD( bgt 10b ) ++ ++11: PLD( pld [r1, #128] ) ++12: mov r3, lr, pull #\pull ++ ldmia r1!, {r4 - r9, ip, lr} ++ subs r2, r2, #32 ++ orr r3, r3, r4, push #\push ++ mov r4, r4, pull #\pull ++ orr r4, r4, r5, push #\push ++ mov r5, r5, pull #\pull ++ orr r5, r5, r6, push #\push ++ mov r6, r6, pull #\pull ++ orr r6, r6, r7, push #\push ++ mov r7, r7, pull #\pull ++ orr r7, r7, r8, push #\push ++ mov r8, r8, pull #\pull ++ orr r8, r8, r9, push #\push ++ mov r9, r9, pull #\pull ++ orr r9, r9, ip, push #\push ++ mov ip, ip, pull #\pull ++ orr ip, ip, lr, push #\push ++ stmia r0!, {r3 - r9, ip} ++ bge 11b ++ PLD( cmn r2, #97 ) ++ PLD( bge 12b ) ++ PLD( add r2, r2, #97 ) ++ cmn r2, #16 ++ blt 14f ++13: mov r3, lr, pull #\pull ++ ldmia r1!, {r4 - r6, lr} ++ sub r2, r2, #16 ++ orr r3, r3, r4, push #\push ++ mov r4, r4, pull #\pull ++ orr r4, r4, r5, push #\push ++ mov r5, r5, pull #\pull ++ orr r5, r5, r6, push #\push ++ mov r6, r6, pull #\pull ++ orr r6, r6, lr, push #\push ++ stmia r0!, {r3 - r6} ++14: adds r2, r2, #28 ++ ldmfd sp!, {r5 - r9} ++ blt 16f ++15: mov r3, lr, pull #\pull ++ ldr lr, [r1], #4 ++ subs r2, r2, #4 ++ orr r3, r3, lr, push #\push ++ str r3, [r0], #4 ++ bge 15b ++16: ++ .endm ++ ++ ++ forward_copy_shift pull=8 push=24 ++ sub r1, r1, #3 ++ b 7b ++ ++17: forward_copy_shift pull=16 push=16 ++ sub r1, r1, #2 ++ b 7b ++ ++18: forward_copy_shift pull=24 push=8 ++ sub r1, r1, #1 ++ b 7b ++ ++ .size memcpy, . - memcpy ++END(memcpy) ++libc_hidden_builtin_def (memcpy) ++ diff --git a/packages/glibc/glibc-2.4/dl-cache-libcmp.patch b/packages/glibc/glibc-2.4/dl-cache-libcmp.patch new file mode 100644 index 0000000000..2fedfa6db0 --- /dev/null +++ b/packages/glibc/glibc-2.4/dl-cache-libcmp.patch @@ -0,0 +1,10 @@ +--- glibc-2.4/elf/Versions.ark 2006-03-11 23:30:09.000000000 +0100 ++++ glibc-2.4/elf/Versions 2006-03-11 23:31:44.000000000 +0100 +@@ -63,5 +63,7 @@ + _dl_debug_state; + # Pointer protection. + __pointer_chk_guard; ++ # for ldconfig ++ _dl_cache_libcmp; + } + } diff --git a/packages/glibc/glibc-2.4/dyn-ldconfig-20041128.patch b/packages/glibc/glibc-2.4/dyn-ldconfig-20041128.patch new file mode 100644 index 0000000000..451b6d4afc --- /dev/null +++ b/packages/glibc/glibc-2.4/dyn-ldconfig-20041128.patch @@ -0,0 +1,22 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- libc/elf/Makefile~dyn-ldconfig-20041128 ++++ libc/elf/Makefile +@@ -118,12 +118,13 @@ + + ifeq (yes,$(use-ldconfig)) + ifeq (yes,$(build-shared)) +-others-static += ldconfig ++#others-static += ldconfig + others += ldconfig + install-rootsbin += ldconfig + + ldconfig-modules := cache readlib xmalloc xstrdup chroot_canon + extra-objs += $(ldconfig-modules:=.o) ++CPPFLAGS-readlib.c = -DNOT_IN_libc=1 + + # To find xmalloc.c and xstrdup.c + vpath %.c ../locale/programs diff --git a/packages/glibc/glibc-2.4/dyn-ldconfig.patch b/packages/glibc/glibc-2.4/dyn-ldconfig.patch new file mode 100644 index 0000000000..1041965d05 --- /dev/null +++ b/packages/glibc/glibc-2.4/dyn-ldconfig.patch @@ -0,0 +1,62 @@ +--- elf/Makefile 13 Mar 2003 21:50:57 -0000 1.258 ++++ elf/Makefile 27 Mar 2003 20:36:07 -0000 +@@ -109,12 +109,13 @@ + + ifeq (yes,$(use-ldconfig)) + ifeq (yes,$(build-shared)) +-others-static += ldconfig ++#others-static += ldconfig + others += ldconfig + install-rootsbin += ldconfig + + ldconfig-modules := cache readlib xmalloc xstrdup chroot_canon + extra-objs += $(ldconfig-modules:=.o) ++CPPFLAGS-readlib.c = -DNOT_IN_libc=1 + + # To find xmalloc.c and xstrdup.c + vpath %.c ../locale/programs +--- elf/ldconfig.c 13 Jan 2003 08:53:14 -0000 1.31 ++++ elf/ldconfig.c 27 Mar 2003 20:36:09 -0000 +@@ -149,6 +149,9 @@ + static int + is_hwcap_platform (const char *name) + { ++#if 1 ++ return 0; ++#else + int hwcap_idx = _dl_string_hwcap (name); + + if (hwcap_idx != -1 && ((1 << hwcap_idx) & hwcap_mask)) +@@ -164,6 +167,7 @@ + #endif + + return 0; ++#endif + } + + /* Get hwcap (including platform) encoding of path. */ +@@ -175,6 +179,7 @@ + uint64_t hwcap = 0; + uint64_t h; + ++#if 0 + size_t len; + + len = strlen (str); +@@ -210,6 +215,7 @@ + *ptr = '\0'; + } + ++#endif + free (str); + return hwcap; + } +--- elf/Versions.old 2004-06-26 13:18:35.000000000 +0100 ++++ elf/Versions 2004-06-26 14:41:09.000000000 +0100 +@@ -54,5 +54,6 @@ + _dl_get_tls_static_info; _dl_allocate_tls_init; + _dl_tls_setup; _dl_rtld_di_serinfo; + _dl_make_stack_executable; ++ _dl_cache_libcmp; + } + } diff --git a/packages/glibc/glibc-2.4/etc/.mtn2git_empty b/packages/glibc/glibc-2.4/etc/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/glibc/glibc-2.4/etc/.mtn2git_empty diff --git a/packages/glibc/glibc-2.4/etc/ld.so.conf b/packages/glibc/glibc-2.4/etc/ld.so.conf new file mode 100644 index 0000000000..3f9b41aabb --- /dev/null +++ b/packages/glibc/glibc-2.4/etc/ld.so.conf @@ -0,0 +1,3 @@ +/usr/local/lib +/opt/QtPalmtop/lib + diff --git a/packages/glibc/glibc-2.4/generic-bits_select.h b/packages/glibc/glibc-2.4/generic-bits_select.h new file mode 100644 index 0000000000..47e7dedc30 --- /dev/null +++ b/packages/glibc/glibc-2.4/generic-bits_select.h @@ -0,0 +1,35 @@ +/* Copyright (C) 1997, 1998, 2001 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, write to the Free + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. */ + +#ifndef _SYS_SELECT_H +# error "Never use <bits/select.h> directly; include <sys/select.h> instead." +#endif + + +/* We don't use `memset' because this would require a prototype and + the array isn't too big. */ +#define __FD_ZERO(s) \ + do { \ + unsigned int __i; \ + fd_set *__arr = (s); \ + for (__i = 0; __i < sizeof (fd_set) / sizeof (__fd_mask); ++__i) \ + __FDS_BITS (__arr)[__i] = 0; \ + } while (0) +#define __FD_SET(d, s) (__FDS_BITS (s)[__FDELT(d)] |= __FDMASK(d)) +#define __FD_CLR(d, s) (__FDS_BITS (s)[__FDELT(d)] &= ~__FDMASK(d)) +#define __FD_ISSET(d, s) ((__FDS_BITS (s)[__FDELT(d)] & __FDMASK(d)) != 0) diff --git a/packages/glibc/glibc-2.4/generic-bits_time.h b/packages/glibc/glibc-2.4/generic-bits_time.h new file mode 100644 index 0000000000..b3184d1de9 --- /dev/null +++ b/packages/glibc/glibc-2.4/generic-bits_time.h @@ -0,0 +1,75 @@ +/* System-dependent timing definitions. Generic version. + Copyright (C) 1996,1997,1999-2002,2003 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, write to the Free + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. */ + +/* + * Never include this file directly; use <time.h> instead. + */ + +#ifndef __need_timeval +# ifndef _BITS_TIME_H +# define _BITS_TIME_H 1 + +/* ISO/IEC 9899:1990 7.12.1: <time.h> + The macro `CLOCKS_PER_SEC' is the number per second of the value + returned by the `clock' function. */ +/* CAE XSH, Issue 4, Version 2: <time.h> + The value of CLOCKS_PER_SEC is required to be 1 million on all + XSI-conformant systems. */ +# define CLOCKS_PER_SEC 1000000l + +# if !defined __STRICT_ANSI__ && !defined __USE_XOPEN2K +/* Even though CLOCKS_PER_SEC has such a strange value CLK_TCK + presents the real value for clock ticks per second for the system. */ +# include <bits/types.h> +extern long int __sysconf (int); +# define CLK_TCK ((__clock_t) __sysconf (2)) /* 2 is _SC_CLK_TCK */ +# endif + +# ifdef __USE_POSIX199309 +/* Identifier for system-wide realtime clock. */ +# define CLOCK_REALTIME 0 +/* Monotonic system-wide clock. */ +# define CLOCK_MONOTONIC 1 +/* High-resolution timer from the CPU. */ +# define CLOCK_PROCESS_CPUTIME_ID 2 +/* Thread-specific CPU-time clock. */ +# define CLOCK_THREAD_CPUTIME_ID 3 + +/* Flag to indicate time is absolute. */ +# define TIMER_ABSTIME 1 +# endif + +# endif /* bits/time.h */ +#endif + +#ifdef __need_timeval +# undef __need_timeval +# ifndef _STRUCT_TIMEVAL +# define _STRUCT_TIMEVAL 1 +# include <bits/types.h> + +/* A time value that is accurate to the nearest + microsecond but also has a range of years. */ +struct timeval + { + __time_t tv_sec; /* Seconds. */ + __suseconds_t tv_usec; /* Microseconds. */ + }; +# endif /* struct timeval */ +#endif /* need timeval */ diff --git a/packages/glibc/glibc-2.4/generic-bits_types.h b/packages/glibc/glibc-2.4/generic-bits_types.h new file mode 100644 index 0000000000..65c8a9fe90 --- /dev/null +++ b/packages/glibc/glibc-2.4/generic-bits_types.h @@ -0,0 +1,200 @@ +/* bits/types.h -- definitions of __*_t types underlying *_t types. + Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, write to the Free + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. */ + +/* + * Never include this file directly; use <sys/types.h> instead. + */ + +#ifndef _BITS_TYPES_H +#define _BITS_TYPES_H 1 + +#include <features.h> +#include <bits/wordsize.h> + +#define __need_size_t +#include <stddef.h> + +/* Convenience types. */ +typedef unsigned char __u_char; +typedef unsigned short int __u_short; +typedef unsigned int __u_int; +typedef unsigned long int __u_long; + +/* Fixed-size types, underlying types depend on word size and compiler. */ +typedef signed char __int8_t; +typedef unsigned char __uint8_t; +typedef signed short int __int16_t; +typedef unsigned short int __uint16_t; +typedef signed int __int32_t; +typedef unsigned int __uint32_t; +#if __WORDSIZE == 64 +typedef signed long int __int64_t; +typedef unsigned long int __uint64_t; +#elif defined __GLIBC_HAVE_LONG_LONG +__extension__ typedef signed long long int __int64_t; +__extension__ typedef unsigned long long int __uint64_t; +#endif + +/* quad_t is also 64 bits. */ +#if __WORDSIZE == 64 +typedef long int __quad_t; +typedef unsigned long int __u_quad_t; +#elif defined __GLIBC_HAVE_LONG_LONG +__extension__ typedef long long int __quad_t; +__extension__ typedef unsigned long long int __u_quad_t; +#else +typedef struct +{ + long __val[2]; +} __quad_t; +typedef struct +{ + __u_long __val[2]; +} __u_quad_t; +#endif + + +/* The machine-dependent file <bits/typesizes.h> defines __*_T_TYPE + macros for each of the OS types we define below. The definitions + of those macros must use the following macros for underlying types. + We define __S<SIZE>_TYPE and __U<SIZE>_TYPE for the signed and unsigned + variants of each of the following integer types on this machine. + + 16 -- "natural" 16-bit type (always short) + 32 -- "natural" 32-bit type (always int) + 64 -- "natural" 64-bit type (long or long long) + LONG32 -- 32-bit type, traditionally long + QUAD -- 64-bit type, always long long + WORD -- natural type of __WORDSIZE bits (int or long) + LONGWORD -- type of __WORDSIZE bits, traditionally long + + We distinguish WORD/LONGWORD, 32/LONG32, and 64/QUAD so that the + conventional uses of `long' or `long long' type modifiers match the + types we define, even when a less-adorned type would be the same size. + This matters for (somewhat) portably writing printf/scanf formats for + these types, where using the appropriate l or ll format modifiers can + make the typedefs and the formats match up across all GNU platforms. If + we used `long' when it's 64 bits where `long long' is expected, then the + compiler would warn about the formats not matching the argument types, + and the programmer changing them to shut up the compiler would break the + program's portability. + + Here we assume what is presently the case in all the GCC configurations + we support: long long is always 64 bits, long is always word/address size, + and int is always 32 bits. */ + +#define __S16_TYPE short int +#define __U16_TYPE unsigned short int +#define __S32_TYPE int +#define __U32_TYPE unsigned int +#define __SLONGWORD_TYPE long int +#define __ULONGWORD_TYPE unsigned long int +#if __WORDSIZE == 32 +# define __SQUAD_TYPE __quad_t +# define __UQUAD_TYPE __u_quad_t +# define __SWORD_TYPE int +# define __UWORD_TYPE unsigned int +# define __SLONG32_TYPE long int +# define __ULONG32_TYPE unsigned long int +# define __S64_TYPE __quad_t +# define __U64_TYPE __u_quad_t +/* We want __extension__ before typedef's that use nonstandard base types + such as `long long' in C89 mode. */ +# define __STD_TYPE __extension__ typedef +#elif __WORDSIZE == 64 +# define __SQUAD_TYPE long int +# define __UQUAD_TYPE unsigned long int +# define __SWORD_TYPE long int +# define __UWORD_TYPE unsigned long int +# define __SLONG32_TYPE int +# define __ULONG32_TYPE unsigned int +# define __S64_TYPE long int +# define __U64_TYPE unsigned long int +/* No need to mark the typedef with __extension__. */ +# define __STD_TYPE typedef +#else +# error +#endif +#include <bits/typesizes.h> /* Defines __*_T_TYPE macros. */ + + +__STD_TYPE __DEV_T_TYPE __dev_t; /* Type of device numbers. */ +__STD_TYPE __UID_T_TYPE __uid_t; /* Type of user identifications. */ +__STD_TYPE __GID_T_TYPE __gid_t; /* Type of group identifications. */ +__STD_TYPE __INO_T_TYPE __ino_t; /* Type of file serial numbers. */ +__STD_TYPE __INO64_T_TYPE __ino64_t; /* Type of file serial numbers (LFS).*/ +__STD_TYPE __MODE_T_TYPE __mode_t; /* Type of file attribute bitmasks. */ +__STD_TYPE __NLINK_T_TYPE __nlink_t; /* Type of file link counts. */ +__STD_TYPE __OFF_T_TYPE __off_t; /* Type of file sizes and offsets. */ +__STD_TYPE __OFF64_T_TYPE __off64_t; /* Type of file sizes and offsets (LFS). */ +__STD_TYPE __PID_T_TYPE __pid_t; /* Type of process identifications. */ +__STD_TYPE __FSID_T_TYPE __fsid_t; /* Type of file system IDs. */ +__STD_TYPE __CLOCK_T_TYPE __clock_t; /* Type of CPU usage counts. */ +__STD_TYPE __RLIM_T_TYPE __rlim_t; /* Type for resource measurement. */ +__STD_TYPE __RLIM64_T_TYPE __rlim64_t; /* Type for resource measurement (LFS). */ +__STD_TYPE __ID_T_TYPE __id_t; /* General type for IDs. */ +__STD_TYPE __TIME_T_TYPE __time_t; /* Seconds since the Epoch. */ +__STD_TYPE __USECONDS_T_TYPE __useconds_t; /* Count of microseconds. */ +__STD_TYPE __SUSECONDS_T_TYPE __suseconds_t; /* Signed count of microseconds. */ + +__STD_TYPE __DADDR_T_TYPE __daddr_t; /* The type of a disk address. */ +__STD_TYPE __SWBLK_T_TYPE __swblk_t; /* Type of a swap block maybe? */ +__STD_TYPE __KEY_T_TYPE __key_t; /* Type of an IPC key. */ + +/* Clock ID used in clock and timer functions. */ +__STD_TYPE __CLOCKID_T_TYPE __clockid_t; + +/* Timer ID returned by `timer_create'. */ +__STD_TYPE __TIMER_T_TYPE __timer_t; + +/* Type to represent block size. */ +__STD_TYPE __BLKSIZE_T_TYPE __blksize_t; + +/* Types from the Large File Support interface. */ + +/* Type to count number of disk blocks. */ +__STD_TYPE __BLKCNT_T_TYPE __blkcnt_t; +__STD_TYPE __BLKCNT64_T_TYPE __blkcnt64_t; + +/* Type to count file system blocks. */ +__STD_TYPE __FSBLKCNT_T_TYPE __fsblkcnt_t; +__STD_TYPE __FSBLKCNT64_T_TYPE __fsblkcnt64_t; + +/* Type to count file system nodes. */ +__STD_TYPE __FSFILCNT_T_TYPE __fsfilcnt_t; +__STD_TYPE __FSFILCNT64_T_TYPE __fsfilcnt64_t; + +__STD_TYPE __SSIZE_T_TYPE __ssize_t; /* Type of a byte count, or error. */ + +/* These few don't really vary by system, they always correspond + to one of the other defined types. */ +typedef __off64_t __loff_t; /* Type of file sizes and offsets (LFS). */ +typedef __quad_t *__qaddr_t; +typedef char *__caddr_t; + +/* Duplicates info from stdint.h but this is used in unistd.h. */ +__STD_TYPE __SWORD_TYPE __intptr_t; + +/* Duplicate info from sys/socket.h. */ +__STD_TYPE __U32_TYPE __socklen_t; + + +#undef __STD_TYPE + +#endif /* bits/types.h */ diff --git a/packages/glibc/glibc-2.4/generic-bits_typesizes.h b/packages/glibc/glibc-2.4/generic-bits_typesizes.h new file mode 100644 index 0000000000..e9226c4174 --- /dev/null +++ b/packages/glibc/glibc-2.4/generic-bits_typesizes.h @@ -0,0 +1,66 @@ +/* bits/typesizes.h -- underlying types for *_t. Generic version. + Copyright (C) 2002, 2003 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, write to the Free + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. */ + +#ifndef _BITS_TYPES_H +# error "Never include <bits/typesizes.h> directly; use <sys/types.h> instead." +#endif + +#ifndef _BITS_TYPESIZES_H +#define _BITS_TYPESIZES_H 1 + +/* See <bits/types.h> for the meaning of these macros. This file exists so + that <bits/types.h> need not vary across different GNU platforms. */ + +#define __DEV_T_TYPE __UQUAD_TYPE +#define __UID_T_TYPE __U32_TYPE +#define __GID_T_TYPE __U32_TYPE +#define __INO_T_TYPE __ULONGWORD_TYPE +#define __INO64_T_TYPE __UQUAD_TYPE +#define __MODE_T_TYPE __U32_TYPE +#define __NLINK_T_TYPE __UWORD_TYPE +#define __OFF_T_TYPE __SLONGWORD_TYPE +#define __OFF64_T_TYPE __SQUAD_TYPE +#define __PID_T_TYPE __S32_TYPE +#define __RLIM_T_TYPE __ULONGWORD_TYPE +#define __RLIM64_T_TYPE __UQUAD_TYPE +#define __BLKCNT_T_TYPE __SLONGWORD_TYPE +#define __BLKCNT64_T_TYPE __SQUAD_TYPE +#define __FSBLKCNT_T_TYPE __ULONGWORD_TYPE +#define __FSBLKCNT64_T_TYPE __UQUAD_TYPE +#define __FSFILCNT_T_TYPE __ULONGWORD_TYPE +#define __FSFILCNT64_T_TYPE __UQUAD_TYPE +#define __ID_T_TYPE __U32_TYPE +#define __CLOCK_T_TYPE __SLONGWORD_TYPE +#define __TIME_T_TYPE __SLONGWORD_TYPE +#define __USECONDS_T_TYPE __U32_TYPE +#define __SUSECONDS_T_TYPE __SLONGWORD_TYPE +#define __DADDR_T_TYPE __S32_TYPE +#define __SWBLK_T_TYPE __SLONGWORD_TYPE +#define __KEY_T_TYPE __S32_TYPE +#define __CLOCKID_T_TYPE __S32_TYPE +#define __TIMER_T_TYPE void * +#define __BLKSIZE_T_TYPE __SLONGWORD_TYPE +#define __FSID_T_TYPE struct { int __val[2]; } +#define __SSIZE_T_TYPE __SWORD_TYPE + +/* Number of descriptors that can fit in an `fd_set'. */ +#define __FD_SETSIZE 1024 + + +#endif /* bits/typesizes.h */ diff --git a/packages/glibc/glibc-2.4/glibc-2.4-compile.patch b/packages/glibc/glibc-2.4/glibc-2.4-compile.patch new file mode 100644 index 0000000000..ea9f55ae7f --- /dev/null +++ b/packages/glibc/glibc-2.4/glibc-2.4-compile.patch @@ -0,0 +1,29 @@ +--- glibc-2.4/csu/libc-start.c.ark 2006-03-13 03:07:15.000000000 +0100 ++++ glibc-2.4/csu/libc-start.c 2006-03-13 03:08:51.000000000 +0100 +@@ -59,6 +59,11 @@ + # define LIBC_START_MAIN BP_SYM (__libc_start_main) + #endif + ++#ifdef SHARED ++#include <pthread-functions.h> ++extern struct pthread_functions __libc_pthread_functions; ++#endif ++ + #ifdef MAIN_AUXVEC_ARG + /* main gets passed a pointer to the auxiliary. */ + # define MAIN_AUXVEC_DECL , void * +--- glibc-2.4/nscd/Makefile.ark 2006-03-13 14:05:47.000000000 +0100 ++++ glibc-2.4/nscd/Makefile 2006-03-13 14:06:12.000000000 +0100 +@@ -67,8 +67,10 @@ + # contains only the basic kernel interface headers, not something like + # libselinux. So the simplest thing is to presume that the standard + # system headers will be ok for this file. +-$(objpfx)nscd_stat.o: sysincludes = # nothing +-$(objpfx)selinux.o: sysincludes = # nothing ++# Except, of course, this breaks crosscompiling with kernel headers in ++# a nonstandard location... ++#$(objpfx)nscd_stat.o: sysincludes = # nothing ++#$(objpfx)selinux.o: sysincludes = # nothing + + distribute := nscd.h nscd-client.h dbg_log.h \ + $(addsuffix .c, $(filter-out xmalloc,$(all-nscd-modules))) \ diff --git a/packages/glibc/glibc-2.4/ldsocache-varrun.patch b/packages/glibc/glibc-2.4/ldsocache-varrun.patch new file mode 100644 index 0000000000..9994d4f879 --- /dev/null +++ b/packages/glibc/glibc-2.4/ldsocache-varrun.patch @@ -0,0 +1,18 @@ +This patch moves ld.so.cache from /etc to /var/run. This is for devices +where /etc is JFFS2 or CRAMFS but /var is a ramdisk. + +# +# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher +# + +--- libc/sysdeps/generic/dl-cache.h~ldsocache-varrun ++++ libc/sysdeps/generic/dl-cache.h +@@ -29,7 +29,7 @@ + #endif + + #ifndef LD_SO_CACHE +-# define LD_SO_CACHE SYSCONFDIR "/ld.so.cache" ++# define LD_SO_CACHE "/var/run/ld.so.cache" + #endif + + #ifndef add_system_dir diff --git a/packages/glibc/glibc-2.4/nptl-crosscompile.patch b/packages/glibc/glibc-2.4/nptl-crosscompile.patch new file mode 100644 index 0000000000..18a46ad4f1 --- /dev/null +++ b/packages/glibc/glibc-2.4/nptl-crosscompile.patch @@ -0,0 +1,26 @@ +--- glibc-2.4/nptl/sysdeps/pthread/configure.in.ark 2006-03-12 00:41:40.000000000 +0100 ++++ glibc-2.4/nptl/sysdeps/pthread/configure.in 2006-03-12 00:44:08.000000000 +0100 +@@ -45,5 +45,6 @@ + AC_MSG_ERROR([the compiler must support C cleanup handling]) + fi + else +- AC_MSG_ERROR(forced unwind support is required) ++ AC_MSG_WARN([forced unwind support is required, can't be verified while crosscompiling]) ++ AC_DEFINE(HAVE_FORCED_UNWIND) + fi +--- glibc-2.4/nptl/sysdeps/pthread/configure.ark 2006-03-12 00:42:47.000000000 +0100 ++++ glibc-2.4/nptl/sysdeps/pthread/configure 2006-03-12 00:44:08.000000000 +0100 +@@ -153,7 +153,10 @@ + { (exit 1); exit 1; }; } + fi + else +- { { echo "$as_me:$LINENO: error: forced unwind support is required" >&5 +-echo "$as_me: error: forced unwind support is required" >&2;} +- { (exit 1); exit 1; }; } ++ { echo "$as_me:$LINENO: WARNING: forced unwind support is required, can't be verified while crosscompiling" >&5 ++echo "$as_me: WARNING: forced unwind support is required, can't be verified while crosscompiling" >&2;} ++ cat >>confdefs.h <<\_ACEOF ++#define HAVE_FORCED_UNWIND 1 ++_ACEOF ++ + fi diff --git a/packages/glibc/glibc-initial_2.4.bb b/packages/glibc/glibc-initial_2.4.bb new file mode 100644 index 0000000000..422e8b7110 --- /dev/null +++ b/packages/glibc/glibc-initial_2.4.bb @@ -0,0 +1,46 @@ +SECTION = "libs" +include glibc_${PV}.bb + +DEPENDS = "linux-libc-headers" +PROVIDES = "virtual/${TARGET_PREFIX}libc-initial" +FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/glibc-cvs', '${FILE_DIRNAME}/glibc', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" + +PACKAGES = "" + +do_configure () { + sed -ie 's,{ (exit 1); exit 1; }; },{ (exit 0); }; },g' ${S}/configure + chmod +x ${S}/configure + CC="${BUILD_CC}" CPP="${BUILD_CPP}" LD="${BUILD_LD}" ${S}/configure --host=${TARGET_SYS} --build=${BUILD_SYS} \ + --without-cvs --disable-sanity-checks \ + --with-headers=${CROSS_DIR}/${TARGET_SYS}/include \ + --enable-hacker-mode + if grep -q GLIBC_2.3 ${S}/ChangeLog; then + # glibc-2.3.x passes cross options to $(CC) when generating errlist-compat.c, which fails without a real cross-compiler. + # Fortunately, we don't need errlist-compat.c, since we just need .h files, + # so work around this by creating a fake errlist-compat.c and satisfying its dependencies. + # Another workaround might be to tell configure to not use any cross options to $(CC). + # The real fix would be to get install-headers to not generate errlist-compat.c. + make sysdeps/gnu/errlist.c + mkdir -p stdio-common + touch stdio-common/errlist-compat.c + fi +} + +do_compile () { + : +} + +do_stage () { + oe_runmake cross-compiling=yes install_root=${CROSS_DIR}/${TARGET_SYS} prefix="" install-headers + + # Two headers -- stubs.h and features.h -- aren't installed by install-headers, + # so do them by hand. We can tolerate an empty stubs.h for the moment. + # See e.g. http://gcc.gnu.org/ml/gcc/2002-01/msg00900.html + mkdir -p ${CROSS_DIR}/${TARGET_SYS}/include/gnu + touch ${CROSS_DIR}/${TARGET_SYS}/include/gnu/stubs.h + cp ${S}/include/features.h ${CROSS_DIR}/${TARGET_SYS}/include/features.h +} + +do_install () { + : +} diff --git a/packages/glibc/glibc-intermediate_2.4.bb b/packages/glibc/glibc-intermediate_2.4.bb new file mode 100644 index 0000000000..ce3d20b2fd --- /dev/null +++ b/packages/glibc/glibc-intermediate_2.4.bb @@ -0,0 +1,14 @@ +SECTION = "libs" +include glibc_${PV}.bb + +DEFAULT_PREFERENCE = "-1" + +do_install () { + : +} + +PACKAGES = "" +PROVIDES = "virtual/${TARGET_PREFIX}libc-for-gcc" +DEPENDS = "virtual/${TARGET_PREFIX}gcc-initial" +GLIBC_ADDONS = "nptl,ports" +GLIBC_EXTRA_OECONF = "" diff --git a/packages/glibc/glibc_2.4.bb b/packages/glibc/glibc_2.4.bb new file mode 100644 index 0000000000..0b870678e7 --- /dev/null +++ b/packages/glibc/glibc_2.4.bb @@ -0,0 +1,204 @@ +DESCRIPTION = "GNU C Library" +HOMEPAGE = "http://www.gnu.org/software/libc/libc.html" +LICENSE = "LGPL" +SECTION = "libs" +PRIORITY = "required" +MAINTAINER = "Phil Blundell <pb@handhelds.org>" +DEFAULT_PREFERENCE = "-1" + +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-2.4" + +GLIBC_ADDONS ?= "ports,nptl,libidn" +GLIBC_EXTRA_OECONF ?= "" + +GLIBC_BROKEN_LOCALES = "sid_ET tr_TR mn_MN" + +# +# For now, we will skip building of a gcc package if it is a uclibc one +# and our build is not a uclibc one, and we skip a glibc one if our build +# is a uclibc build. +# +# See the note in gcc/gcc_3.4.0.oe +# + +python __anonymous () { + import bb, re + uc_os = (re.match('.*uclibc$', bb.data.getVar('TARGET_OS', d, 1)) != None) + if uc_os: + raise bb.parse.SkipPackage("incompatible with target %s" % + bb.data.getVar('TARGET_OS', d, 1)) +} + +# nptl needs unwind support in gcc, which can't be built without glibc. +PROVIDES = "virtual/libc ${@['virtual/${TARGET_PREFIX}libc-for-gcc', '']['nptl' in '${GLIBC_ADDONS}']}" +PROVIDES += "virtual/libintl virtual/libiconv" +DEPENDS = "${@['virtual/${TARGET_PREFIX}gcc-initial', 'virtual/${TARGET_PREFIX}gcc']['nptl' in '${GLIBC_ADDONS}']} linux-libc-headers" +RDEPENDS_${PN}-dev = "linux-libc-headers-dev" +INHIBIT_DEFAULT_DEPS = "1" + +# file://noinfo.patch;patch=1 +# file://ldconfig.patch;patch=1;pnum=0 +# file://arm-machine-gmon.patch;patch=1;pnum=0 \ +# \ +# file://arm-ioperm.patch;patch=1;pnum=0 \ +# file://ldd.patch;patch=1;pnum=0 \ +SRC_URI = "ftp://ftp.gnu.org/pub/gnu/glibc/glibc-2.4.tar.bz2 \ + ftp://ftp.gnu.org/pub/gnu/glibc/glibc-ports-2.4.tar.bz2 \ + ftp://ftp.gnu.org/pub/gnu/glibc/glibc-libidn-2.4.tar.bz2 \ + http://ep09.pld-linux.org/~mmazur/linux-libc-headers/linux-libc-headers-2.6.12.0.tar.bz2 \ + file://arm-memcpy.patch;patch=1 \ + file://arm-longlong.patch;patch=1 \ + file://fhs-linux-paths.patch;patch=1 \ + file://dl-cache-libcmp.patch;patch=1 \ + file://ldsocache-varrun.patch;patch=1 \ + file://nptl-crosscompile.patch;patch=1 \ + file://glibc-2.4-compile.patch;patch=1 \ + file://generic-bits_select.h \ + file://generic-bits_types.h \ + file://generic-bits_typesizes.h \ + file://generic-bits_time.h \ + file://etc/ld.so.conf \ + file://generate-supported.mk" + +S = "${WORKDIR}/glibc-2.4" +B = "${WORKDIR}/build-${TARGET_SYS}" + +inherit autotools + +EXTRA_OECONF = "--enable-kernel=${OLDEST_KERNEL} \ + --without-cvs --disable-profile --disable-debug --without-gd \ + --enable-clocale=gnu \ + --enable-add-ons=${GLIBC_ADDONS} \ + --with-headers=${WORKDIR}/linux-libc-headers-2.6.12.0/include \ + --without-selinux \ + ${GLIBC_EXTRA_OECONF}" + +EXTRA_OECONF += "${@get_glibc_fpu_setting(bb, d)}" + +def get_glibc_fpu_setting(bb, d): + if bb.data.getVar('TARGET_FPU', d, 1) in [ 'soft' ]: + return "--without-fp" + return "" + +do_munge() { + # Integrate ports and libidn into tree + mv ${WORKDIR}/glibc-ports-${PV} ${S}/ports + mv ${WORKDIR}/glibc-libidn-${PV} ${S}/libidn + + # Ports isn't really working... Fix it + # Some of this is rather dirty, but it seems to be the only + # quick way to get this cruft to compile + rm -rf ${S}/ports/sysdeps/unix/sysv/linux/arm/linuxthreads + ln -s nptl ${S}/ports/sysdeps/unix/sysv/linux/arm/linuxthreads + cp ${S}/sysdeps/unix/sysv/linux/i386/bits/wchar.h ${S}/ports/sysdeps/unix/sysv/linux/arm/bits/ + cp ${S}/sysdeps/wordsize-32/bits/wordsize.h ${S}/ports/sysdeps/unix/sysv/linux/arm/bits/ + cp ${WORKDIR}/generic-bits_select.h ${S}/ports/sysdeps/unix/sysv/linux/arm/bits/select.h + cp ${WORKDIR}/generic-bits_types.h ${S}/ports/sysdeps/unix/sysv/linux/arm/bits/types.h + cp ${WORKDIR}/generic-bits_typesizes.h ${S}/ports/sysdeps/unix/sysv/linux/arm/bits/typesizes.h + cp ${WORKDIR}/generic-bits_time.h ${S}/ports/sysdeps/unix/sysv/linux/arm/bits/time.h + # Copy in generic stuff for not yet implemented headers + for i in ${S}/bits/*.h; do + F=`basename $i` + [ "$F" = "local_lim.h" ] && continue + [ "$F" = "errno.h" ] && continue + test -e ${S}/ports/sysdeps/unix/sysv/linux/arm/bits/$F || test -e ${S}/ports/sysdeps/arm/bits/$F || test -e ${S}/sysdeps/unix/sysv/linux/bits/$F || test -e ${S}/sysdeps/ieee754/bits/$F || cp $i ${S}/ports/sysdeps/unix/sysv/linux/arm/bits/ + done + # This is harmful; we need to get the one from nptl/sysdeps/pthreads + rm -f ${S}/ports/sysdeps/unix/sysv/linux/arm/bits/libc-lock.h + # Obsoleted by sysdeps/arm/{fpu,eabi}/bits/fenv.h + rm -f ${S}/ports/sysdeps/unix/sysv/linux/arm/bits/fenv.h + # Obsoleted by sysdeps/gnu/bits/utmp.h + rm -f ${S}/ports/sysdeps/unix/sysv/linux/arm/bits/utmp.h + + # Create kernel headers symlink + ln -s asm-${TARGET_ARCH} ${WORKDIR}/linux-libc-headers-2.6.12.0/include/asm + + # http://www.handhelds.org/hypermail/oe/51/5135.html + # Some files were moved around between directories on + # 2005-12-21, which means that any attempt to check out + # from CVS using a datestamp older than that will be doomed. + # + # This is a workaround for that problem. + rm -rf ${S}/bits +} + +addtask munge before do_patch after do_unpack + +do_configure () { +# override this function to avoid the autoconf/automake/aclocal/autoheader +# calls for now +# don't pass CPPFLAGS into configure, since it upsets the kernel-headers +# version check and doesn't really help with anything + if [ -z "`which rpcgen`" ]; then + echo "rpcgen not found. Install glibc-devel." + exit 1 + fi + (cd ${S} && gnu-configize) || die "failure in running gnu-configize" + CPPFLAGS="" oe_runconf +} + +rpcsvc = "bootparam_prot.x nlm_prot.x rstat.x \ + yppasswd.x klm_prot.x rex.x sm_inter.x mount.x \ + rusers.x spray.x nfs_prot.x rquota.x key_prot.x" + +do_compile () { + # -Wl,-rpath-link <staging>/lib in LDFLAGS can cause breakage if another glibc is in staging + unset LDFLAGS + base_do_compile + ( + cd ${S}/sunrpc/rpcsvc + for r in ${rpcsvc}; do + h=`echo $r|sed -e's,\.x$,.h,'` + rpcgen -h $r -o $h || oewarn "unable to generate header for $r" + done + ) +} + +do_stage() { + rm -f ${STAGING_LIBDIR}/libc.so.6 + oe_runmake 'install_root=${STAGING_DIR}/${HOST_SYS}' \ + 'includedir=/include' 'libdir=/lib' 'slibdir=/lib' \ + '${STAGING_LIBDIR}/libc.so.6' \ + install-headers install-lib + + install -d ${STAGING_INCDIR}/gnu \ + ${STAGING_INCDIR}/bits \ + ${STAGING_INCDIR}/rpcsvc + install -m 0644 ${S}/include/gnu/stubs.h ${STAGING_INCDIR}/gnu/ + install -m 0644 ${B}/bits/stdio_lim.h ${STAGING_INCDIR}/bits/ + install -m 0644 misc/syscall-list.h ${STAGING_INCDIR}/bits/syscall.h + for r in ${rpcsvc}; do + h=`echo $r|sed -e's,\.x$,.h,'` + install -m 0644 ${S}/sunrpc/rpcsvc/$h ${STAGING_INCDIR}/rpcsvc/ + done + for i in libc.a libc_pic.a libc_nonshared.a; do + install -m 0644 ${B}/$i ${STAGING_LIBDIR}/ || die "failed to install $i" + done + echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${STAGING_LIBDIR}/libpthread.so + echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${STAGING_LIBDIR}/libc.so + + rm -f ${CROSS_DIR}/${TARGET_SYS}/lib/libc.so.6 + oe_runmake 'install_root=${CROSS_DIR}/${TARGET_SYS}' \ + 'includedir=/include' 'libdir=/lib' 'slibdir=/lib' \ + '${CROSS_DIR}/${TARGET_SYS}/lib/libc.so.6' \ + install-headers install-lib + + install -d ${CROSS_DIR}/${TARGET_SYS}/include/gnu \ + ${CROSS_DIR}/${TARGET_SYS}/include/bits \ + ${CROSS_DIR}/${TARGET_SYS}/include/rpcsvc + install -m 0644 ${S}/include/gnu/stubs.h ${CROSS_DIR}/${TARGET_SYS}/include/gnu/ + install -m 0644 ${B}/bits/stdio_lim.h ${CROSS_DIR}/${TARGET_SYS}/include/bits/ + install -m 0644 misc/syscall-list.h ${CROSS_DIR}/${TARGET_SYS}/include/bits/syscall.h + for r in ${rpcsvc}; do + h=`echo $r|sed -e's,\.x$,.h,'` + install -m 0644 ${S}/sunrpc/rpcsvc/$h ${CROSS_DIR}/${TARGET_SYS}/include/rpcsvc/ + done + + for i in libc.a libc_pic.a libc_nonshared.a; do + install -m 0644 ${B}/$i ${CROSS_DIR}/${TARGET_SYS}/lib/ || die "failed to install $i" + done + echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${CROSS_DIR}/${TARGET_SYS}/lib/libpthread.so + echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${CROSS_DIR}/${TARGET_SYS}/lib/libc.so +} + +include glibc-package.bbclass diff --git a/packages/gnutls/gnutls_1.2.10.bb b/packages/gnutls/gnutls_1.2.10.bb deleted file mode 100644 index 7227dfdcae..0000000000 --- a/packages/gnutls/gnutls_1.2.10.bb +++ /dev/null @@ -1,27 +0,0 @@ -DESCRIPTION = "GNU Transport Layer Security Library" -DEPENDS = "zlib libgcrypt lzo" - -LICENSE = "LGPL" - -SRC_URI = "ftp://ftp.gnutls.org/pub/gnutls/gnutls-${PV}.tar.bz2" - -inherit autotools -inherit binconfig - -PACKAGES =+ "${PN}-openssl ${PN}-extra ${PN}-bin" -FILES_${PN}-openssl = "${libdir}/libgnutls-openssl.so.*" -FILES_${PN}-extra = "${libdir}/libgnutls-extra.so.*" -FILES_${PN} = "${libdir}/libgnutls.so.*" -FILES_${PN}-bin = "${bindir}/gnutls-serv ${bindir}/gnutls-cli \ - ${bindir}/srptool ${bindir}/certtool ${bindir}/gnutls-srpcrypt" -FILES_${PN}-dev += "${bindir}/*-config ${bindir}/gnutls-cli-debug" - -EXTRA_OECONF="--with-included-opencdk --with-included-libtasn1" - -do_stage() { - oe_libinstall -C lib/.libs -so -a libgnutls ${STAGING_LIBDIR} - oe_libinstall -C libextra/.libs -so -a libgnutls-extra ${STAGING_LIBDIR} - oe_libinstall -C libextra/.libs -so -a libgnutls-openssl ${STAGING_LIBDIR} - autotools_stage_includes -} - diff --git a/packages/gnutls/gnutls_1.3.4.bb b/packages/gnutls/gnutls_1.3.5.bb index 0c02f4bd0f..3455ff9779 100644 --- a/packages/gnutls/gnutls_1.3.4.bb +++ b/packages/gnutls/gnutls_1.3.5.bb @@ -1,5 +1,6 @@ DESCRIPTION = "GNU Transport Layer Security Library" DEPENDS = "zlib libgcrypt lzo" +MAINTAINER = "Eric Shattow <lucent@gmail.com>" LICENSE = "LGPL" diff --git a/packages/gpe-todo/gpe-todo.inc b/packages/gpe-todo/gpe-todo.inc index ab59d565bc..1009f61c44 100644 --- a/packages/gpe-todo/gpe-todo.inc +++ b/packages/gpe-todo/gpe-todo.inc @@ -7,5 +7,5 @@ MAINTAINER = "Phil Blundell <pb@handhelds.org>" SECTION = "gpe" PRIORITY = "optional" -SRC_URI="http://ftp.handhelds.org/pub/projects/gpe/source/${PN}-${PV}.tar.bz2" +SRC_URI="${GPE_MIRROR}/${PN}-${PV}.tar.bz2" diff --git a/packages/gpe-todo/gpe-todo_0.53.bb b/packages/gpe-todo/gpe-todo_0.53.bb index 3eb0c9d786..c977c69c8d 100644 --- a/packages/gpe-todo/gpe-todo_0.53.bb +++ b/packages/gpe-todo/gpe-todo_0.53.bb @@ -7,5 +7,5 @@ MAINTAINER = "Phil Blundell <pb@handhelds.org>" SECTION = "gpe" PRIORITY = "optional" -SRC_URI="http://ftp.handhelds.org/pub/projects/gpe/source/${PN}-${PV}.tar.bz2" +SRC_URI="${GPE_MIRROR}/${PN}-${PV}.tar.bz2" diff --git a/packages/keylaunch/keylaunch_2.0.8.bb b/packages/keylaunch/keylaunch_2.0.8.bb new file mode 100644 index 0000000000..b509e450ee --- /dev/null +++ b/packages/keylaunch/keylaunch_2.0.8.bb @@ -0,0 +1,20 @@ +inherit gpe + +DEPENDS = "virtual/xserver libxtst libxau libxpm libgpelaunch" +SECTION = "gpe" +LICENSE = "GPL" +DESCRIPTION = "A small utility for binding commands to a hot key.\ + Keylaunch is a minimal utility for associating commands with hot keys. This\ + GPE version is intended for use with the special keys found on most handheld\ + computers. You can connect each key to a program of your choice; if the\ + program is already running, keylaunch can bring its window to the front\ + rather than just running another copy." +PR = "r0" + +SRC_URI += " file://keylaunchrc" + +do_install_prepend () { + install ${WORKDIR}/keylaunchrc ${S}/keylaunchrc +} + +export CVSBUILD="no" diff --git a/packages/libgcrypt/libgcrypt_1.2.2.bb b/packages/libgcrypt/libgcrypt_1.2.2.bb index e797ee75c7..cd49d0b8fa 100644 --- a/packages/libgcrypt/libgcrypt_1.2.2.bb +++ b/packages/libgcrypt/libgcrypt_1.2.2.bb @@ -3,6 +3,7 @@ SECTION = "libs" PRIORITY = "optional" LICENSE = "GPL LGPL FDL" DEPENDS = "libgpg-error" +MAINTAINER = "Eric Shattow <lucent@gmail.com>" # move libgcrypt-config into -dev package FILES_${PN} = "${libdir}/lib*.so.*" diff --git a/packages/libtododb/libtododb_0.09.bb b/packages/libtododb/libtododb_0.09.bb index 36b260f57b..56a9f2cbc3 100644 --- a/packages/libtododb/libtododb_0.09.bb +++ b/packages/libtododb/libtododb_0.09.bb @@ -8,7 +8,7 @@ DEPENDS = "libgpewidget libgpepimc sqlite" inherit pkgconfig gpe autotools -SRC_URI="http://ftp.handhelds.org/pub/projects/gpe/source/${PN}-${PV}.tar.bz2" +SRC_URI="${GPE_MIRROR}/${PN}-${PV}.tar.bz2" headers = "todo-db.h" do_stage () { diff --git a/packages/linux/ep93xx-kernel/defconfig b/packages/linux/ep93xx-kernel/defconfig index b655e9fd41..e946973747 100644 --- a/packages/linux/ep93xx-kernel/defconfig +++ b/packages/linux/ep93xx-kernel/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.16-rc5 -# Sat Mar 11 13:24:46 2006 +# Sun Mar 12 14:25:46 2006 # CONFIG_ARM=y CONFIG_MMU=y @@ -13,6 +13,7 @@ CONFIG_GENERIC_CALIBRATE_DELAY=y # CONFIG_EXPERIMENTAL=y CONFIG_BROKEN_ON_SMP=y +CONFIG_LOCK_KERNEL=y CONFIG_INIT_ENV_ARG_LIMIT=32 # @@ -20,7 +21,7 @@ CONFIG_INIT_ENV_ARG_LIMIT=32 # CONFIG_LOCALVERSION="" CONFIG_LOCALVERSION_AUTO=y -# CONFIG_SWAP is not set +CONFIG_SWAP=y CONFIG_SYSVIPC=y # CONFIG_POSIX_MQUEUE is not set # CONFIG_BSD_PROCESS_ACCT is not set @@ -112,6 +113,7 @@ CONFIG_ARCH_EP93XX=y # # Cirrus EP93xx Implementation Options # +CONFIG_CRUNCH=y # # EP93xx Platforms @@ -153,7 +155,7 @@ CONFIG_ARM_AMBA=y # # Kernel Features # -# CONFIG_PREEMPT is not set +CONFIG_PREEMPT=y # CONFIG_NO_IDLE_HZ is not set # CONFIG_AEABI is not set # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set @@ -235,7 +237,13 @@ CONFIG_INET_DIAG=y CONFIG_INET_TCP_DIAG=y # CONFIG_TCP_CONG_ADVANCED is not set CONFIG_TCP_CONG_BIC=y -# CONFIG_IPV6 is not set +CONFIG_IPV6=y +# CONFIG_IPV6_PRIVACY is not set +# CONFIG_INET6_AH is not set +# CONFIG_INET6_ESP is not set +# CONFIG_INET6_IPCOMP is not set +# CONFIG_INET6_TUNNEL is not set +# CONFIG_IPV6_TUNNEL is not set # CONFIG_NETFILTER is not set # @@ -288,7 +296,7 @@ CONFIG_TCP_CONG_BIC=y # CONFIG_STANDALONE=y CONFIG_PREVENT_FIRMWARE_BUILD=y -# CONFIG_FW_LOADER is not set +CONFIG_FW_LOADER=m # CONFIG_DEBUG_DRIVER is not set # @@ -402,11 +410,13 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=2 # Block devices # # CONFIG_BLK_DEV_COW_COMMON is not set -# CONFIG_BLK_DEV_LOOP is not set +CONFIG_BLK_DEV_LOOP=m +# CONFIG_BLK_DEV_CRYPTOLOOP is not set # CONFIG_BLK_DEV_NBD is not set # CONFIG_BLK_DEV_UB is not set -# CONFIG_BLK_DEV_RAM is not set +CONFIG_BLK_DEV_RAM=m CONFIG_BLK_DEV_RAM_COUNT=16 +CONFIG_BLK_DEV_RAM_SIZE=4096 # CONFIG_CDROM_PKTCDVD is not set # CONFIG_ATA_OVER_ETH is not set @@ -430,7 +440,7 @@ CONFIG_BLK_DEV_SD=y # # Some SCSI devices (e.g. CD jukebox) support multiple LUNs # -# CONFIG_SCSI_MULTI_LUN is not set +CONFIG_SCSI_MULTI_LUN=y # CONFIG_SCSI_CONSTANTS is not set # CONFIG_SCSI_LOGGING is not set @@ -745,11 +755,12 @@ CONFIG_USB_LIBUSUAL=y # # USB Input Devices # -# CONFIG_USB_HID is not set +CONFIG_USB_HID=y # -# USB HID Boot Protocol drivers +# Input core support is needed for USB HID input layer or HIDBP support # +CONFIG_USB_HIDDEV=y # # USB Imaging devices @@ -898,7 +909,11 @@ CONFIG_JBD=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_XFS_FS=m +# CONFIG_XFS_QUOTA is not set +# CONFIG_XFS_SECURITY is not set +# CONFIG_XFS_POSIX_ACL is not set +# CONFIG_XFS_RT is not set # CONFIG_OCFS2_FS is not set # CONFIG_MINIX_FS is not set # CONFIG_ROMFS_FS is not set @@ -1068,6 +1083,7 @@ CONFIG_LOG_BUF_SHIFT=14 CONFIG_DETECT_SOFTLOCKUP=y # CONFIG_SCHEDSTATS is not set CONFIG_DEBUG_SLAB=y +CONFIG_DEBUG_PREEMPT=y CONFIG_DEBUG_MUTEXES=y CONFIG_DEBUG_SPINLOCK=y # CONFIG_DEBUG_SPINLOCK_SLEEP is not set diff --git a/packages/linux/ep93xx-kernel_2.6.15+2.6.16-rc5.bb b/packages/linux/ep93xx-kernel_2.6.15+2.6.16-rc5.bb index 78630ccb9e..6515a3a2de 100644 --- a/packages/linux/ep93xx-kernel_2.6.15+2.6.16-rc5.bb +++ b/packages/linux/ep93xx-kernel_2.6.15+2.6.16-rc5.bb @@ -1,11 +1,11 @@ DESCRIPTION = "Linux Kernel for Cirrus Logic ep39xx compatible machines" SECTION = "kernel" LICENSE = "GPL" -PR = "r12" +PR = "r13" SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.15.tar.bz2 \ http://www.kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.16-rc5.bz2;patch=1 \ - http://www.wantstofly.org/~buytenh/ep93xx/derevo15.diff;patch=1 \ + http://www.wantstofly.org/~buytenh/ep93xx/derevo16.diff;patch=1 \ file://defconfig \ " diff --git a/packages/neon/neon_0.24.7.bb b/packages/neon/neon_0.24.7.bb index 534b4d099d..2fba9ea0ed 100644 --- a/packages/neon/neon_0.24.7.bb +++ b/packages/neon/neon_0.24.7.bb @@ -5,12 +5,12 @@ DEPENDS = "zlib libxml2 expat time" PR = "r2" -SRC_URI = "http://www.webdav.org/neon/neon-0.24.7.tar.gz \ +SRC_URI = "http://www.webdav.org/${PN}/${P}.tar.gz \ file://no-func-checks.patch;patch=1" inherit autotools binconfig lib_package -EXTRA_OECONF = " --without-ssl --with-libxml2 --with-expat --enable-shared" +EXTRA_OECONF = "--without-ssl --with-libxml2 --with-expat --enable-shared" do_stage () { autotools_stage_includes diff --git a/packages/neon/neon_0.26.0.bb b/packages/neon/neon_0.26.0.bb new file mode 100644 index 0000000000..4a16a3cfad --- /dev/null +++ b/packages/neon/neon_0.26.0.bb @@ -0,0 +1,19 @@ +DESCRIPTION = "neon is an HTTP and WebDAV client library, with a C interface." +SECTION = "base" +LICENSE = "LGPL" +DEPENDS = "zlib libxml2 expat time gnutls" + +PR = "r0" + +DEFAULT_PREFERENCE = "-1" + +SRC_URI = "http://www.webdav.org/${PN}/${P}.tar.gz" + +inherit autotools binconfig lib_package + +EXTRA_OECONF = "--with-ssl=gnutls --with-libxml2 --with-expat --enable-shared" + +do_stage () { + autotools_stage_includes + oe_libinstall -C src -so -a libneon ${STAGING_LIBDIR}/ +} diff --git a/packages/python/python-2.4.2-manifest.inc b/packages/python/python-2.4.2-manifest.inc index 67f10cfff9..da7fc6d28b 100644 --- a/packages/python/python-2.4.2-manifest.inc +++ b/packages/python/python-2.4.2-manifest.inc @@ -1,5 +1,5 @@ ######################################################################################################################## -### AUTO-GENERATED by './generate-oe.py' [(C) 2002-2005 Michael 'Mickey' Lauer <mickey@Vanille.de>] on Thu Feb 23 14:35:29 2006 +### AUTO-GENERATED by './generate-oe.py' [(C) 2002-2005 Michael 'Mickey' Lauer <mickey@Vanille.de>] on Sun Mar 12 18:58:32 2006 ### ### Visit THE Python for Embedded Systems Site => http://www.Vanille.de/projects/python.spy ### @@ -11,14 +11,14 @@ PACKAGES="python-threading python-distutils python-textutils python-codecs python-pickle python-datetime python-core python-io python-compiler python-compression python-re python-xmlrpc python-terminal python-email python-image python-resource python-devel python-math python-hotshot python-unixadmin python-tkinter python-gdbm python-fcntl python-netclient python-pprint python-netserver python-curses python-syslog python-html python-readline python-pydoc python-logging python-mailbox python-xml python-mime python-tests python-unittest python-stringold python-lib-old-and-deprecated python-compile python-shell python-bsddb python-mmap python-zlib python-db python-crypt python-idle python-lang python-audio " DESCRIPTION_python-threading="Python Threading & Synchronization Support" -PR_python-threading="ml1" +PR_python-threading="ml2" RDEPENDS_python-threading="python-core python-lang" -FILES_python-threading="${libdir}/python2.4/bisect.* ${libdir}/python2.4/threading.* ${libdir}/python2.4/Queue.* " +FILES_python-threading="${libdir}/python2.4/_threading_local.* ${libdir}/python2.4/bisect.* ${libdir}/python2.4/dummy_thread.* ${libdir}/python2.4/dummy_threading.* ${libdir}/python2.4/mutex.* ${libdir}/python2.4/threading.* ${libdir}/python2.4/Queue.* " -DESCRIPTION_python-distutils="Python Distribution Utility" -PR_python-distutils="ml1" +DESCRIPTION_python-distutils="Python Distribution Utilities" +PR_python-distutils="ml2" RDEPENDS_python-distutils="python-core" -FILES_python-distutils="${libdir}/python2.4/distutils " +FILES_python-distutils="${libdir}/python2.4/config ${libdir}/python2.4/distutils " DESCRIPTION_python-textutils="Python Option Parsing, Text Wrapping and Comma-Separated-Value Support" PR_python-textutils="ml1" @@ -26,9 +26,9 @@ RDEPENDS_python-textutils="python-core python-io python-re python-stringold" FILES_python-textutils="${libdir}/python2.4/lib-dynload/_csv.so ${libdir}/python2.4/csv.* ${libdir}/python2.4/optparse.* ${libdir}/python2.4/textwrap.* " DESCRIPTION_python-codecs="Python Codecs, Encodings & i18n Support" -PR_python-codecs="ml1" +PR_python-codecs="ml2" RDEPENDS_python-codecs="python-core" -FILES_python-codecs="${libdir}/python2.4/codecs.* ${libdir}/python2.4/encodings ${libdir}/python2.4/locale.* ${libdir}/python2.4/lib-dynload/_locale.so ${libdir}/python2.4/lib-dynload/unicodedata.so ${libdir}/python2.4/gettext.* ${libdir}/python2.4/xdrlib.* " +FILES_python-codecs="${libdir}/python2.4/codecs.* ${libdir}/python2.4/encodings ${libdir}/python2.4/gettext.* ${libdir}/python2.4/locale.* ${libdir}/python2.4/lib-dynload/_locale.so ${libdir}/python2.4/lib-dynload/unicodedata.so ${libdir}/python2.4/stringprep.* ${libdir}/python2.4/xdrlib.* " DESCRIPTION_python-pickle="Python Persistence Support" PR_python-pickle="ml1" @@ -41,9 +41,9 @@ RDEPENDS_python-datetime="python-core python-codecs" FILES_python-datetime="${libdir}/python2.4/_strptime.* ${libdir}/python2.4/calendar.* ${libdir}/python2.4/lib-dynload/datetime.so " DESCRIPTION_python-core="Python Interpreter and core modules (needed!)" -PR_python-core="ml1" +PR_python-core="ml2" RDEPENDS_python-core="" -FILES_python-core="/usr/lib/python2.4/__future__.* /usr/lib/python2.4/copy.* /usr/lib/python2.4/copy_reg.* /usr/lib/python2.4/ConfigParser.py /usr/lib/python2.4/getopt.* /usr/lib/python2.4/new.* /usr/lib/python2.4/os.* /usr/lib/python2.4/posixpath.* /usr/lib/python2.4/warnings.* /usr/lib/python2.4/site.* /usr/lib/python2.4/stat.* /usr/lib/python2.4/UserDict.* /usr/lib/python2.4/lib-dynload/binascii.so /usr/lib/python2.4/lib-dynload/struct.so /usr/lib/python2.4/lib-dynload/time.so /usr/lib/python2.4/lib-dynload/xreadlines.so /usr/lib/python2.4/types.* /usr/bin/python " +FILES_python-core="/usr/lib/python2.4/__future__.* /usr/lib/python2.4/copy.* /usr/lib/python2.4/copy_reg.* /usr/lib/python2.4/ConfigParser.py /usr/lib/python2.4/getopt.* /usr/lib/python2.4/linecache.* /usr/lib/python2.4/new.* /usr/lib/python2.4/os.* /usr/lib/python2.4/posixpath.* /usr/lib/python2.4/warnings.* /usr/lib/python2.4/site.* /usr/lib/python2.4/stat.* /usr/lib/python2.4/UserDict.* /usr/lib/python2.4/lib-dynload/binascii.so /usr/lib/python2.4/lib-dynload/struct.so /usr/lib/python2.4/lib-dynload/time.so /usr/lib/python2.4/lib-dynload/xreadlines.so /usr/lib/python2.4/types.* /usr/bin/python " DESCRIPTION_python-io="Python Low-Level I/O" PR_python-io="ml2" @@ -126,9 +126,9 @@ RDEPENDS_python-fcntl="python-core" FILES_python-fcntl="${libdir}/python2.4/lib-dynload/fcntl.so " DESCRIPTION_python-netclient="Python Internet Protocol Clients" -PR_python-netclient="ml1" -RDEPENDS_python-netclient="python-core python-datetime python-io python-logging python-mime" -FILES_python-netclient="${libdir}/python2.4/base64.* ${libdir}/python2.4/cookielib.* ${libdir}/python2.4/ftplib.* ${libdir}/python2.4/gopherlib.* ${libdir}/python2.4/hmac.* ${libdir}/python2.4/httplib.* ${libdir}/python2.4/mimetypes.* ${libdir}/python2.4/nntplib.* ${libdir}/python2.4/poplib.* ${libdir}/python2.4/smtplib.* ${libdir}/python2.4/telnetlib.* ${libdir}/python2.4/urllib.* ${libdir}/python2.4/urllib2.* ${libdir}/python2.4/urlparse.* " +PR_python-netclient="ml2" +RDEPENDS_python-netclient="python-core python-datetime python-io python-lang python-logging python-mime" +FILES_python-netclient="${libdir}/python2.4/_LWPCookieJar.* ${libdir}/python2.4/_MozillaCookieJar.* ${libdir}/python2.4/base64.* ${libdir}/python2.4/cookielib.* ${libdir}/python2.4/ftplib.* ${libdir}/python2.4/gopherlib.* ${libdir}/python2.4/hmac.* ${libdir}/python2.4/httplib.* ${libdir}/python2.4/mimetypes.* ${libdir}/python2.4/nntplib.* ${libdir}/python2.4/poplib.* ${libdir}/python2.4/smtplib.* ${libdir}/python2.4/telnetlib.* ${libdir}/python2.4/urllib.* ${libdir}/python2.4/urllib2.* ${libdir}/python2.4/urlparse.* " DESCRIPTION_python-pprint="Python Pretty-Print Support" PR_python-pprint="ml1" diff --git a/packages/python/python_2.4.2.bb b/packages/python/python_2.4.2.bb index f065b68112..9424589c7d 100644 --- a/packages/python/python_2.4.2.bb +++ b/packages/python/python_2.4.2.bb @@ -5,7 +5,7 @@ SECTION = "devel/python" PRIORITY = "optional" MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" DEPENDS = "python-native readline zlib gdbm openssl tcl tk" -PR = "ml4" +PR = "ml5" PYTHON_MAJMIN = "2.4" diff --git a/packages/qpe-vexed/qpe-vexed-levels_2.1Beta1.bb b/packages/qpe-vexed/qpe-vexed-levels_2.1Beta1.bb index f38c29f096..57475a3d53 100644 --- a/packages/qpe-vexed/qpe-vexed-levels_2.1Beta1.bb +++ b/packages/qpe-vexed/qpe-vexed-levels_2.1Beta1.bb @@ -6,9 +6,9 @@ LICENSE = "GPL" AUTHOR = "The Vexed Development Team" HOMEPAGE = "http://vexed.sourceforge.net/" PACKAGE_ARCH = "all" -PR = "r1" +PR = "r2" -SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/vexed/;module=vexed/levelpacks" +SRC_URI = "http://ewi546.ewi.utwente.nl/mirror/hrw-oe-sources/vexed-levelpacks-20060109.tar.gz" S = "${WORKDIR}" diff --git a/packages/subversion/subversion_1.2.0.bb b/packages/subversion/subversion_1.2.0.bb index 7a9cfb1755..01dec71be1 100644 --- a/packages/subversion/subversion_1.2.0.bb +++ b/packages/subversion/subversion_1.2.0.bb @@ -1,16 +1,16 @@ DESCRIPTION = "The Subversion (svn) client" SECTION = "console/network" -DEPENDS = "apr-util" +DEPENDS = "apr-util (0.9.7) neon (0.24.7)" MAINTAINER = "Mustafa Yuecel <yuecelm@ee.ethz.ch>" LICENSE = "Apache/BSD" HOMEPAGE = "http://subversion.tigris.org" -PR = "r0" +PR = "r1" SRC_URI = "http://subversion.tigris.org/downloads/${P}.tar.bz2 \ file://disable-revision-install.patch;patch=1" -EXTRA_OECONF = "--without-neon --without-berkeley-db --without-apxs --without-apache --without-swig --with-apr=${STAGING_BINDIR} --with-apr-util=${STAGING_BINDIR}" +EXTRA_OECONF = "--with-neon=${STAGING_DIR}/${BUILD_SYS} --without-berkeley-db --without-apxs --without-apache --without-swig --with-apr=${STAGING_BINDIR} --with-apr-util=${STAGING_BINDIR}" inherit autotools diff --git a/packages/sylpheed/sylpheed_2.2.3.bb b/packages/sylpheed/sylpheed_2.2.3.bb new file mode 100644 index 0000000000..bc63f0d71b --- /dev/null +++ b/packages/sylpheed/sylpheed_2.2.3.bb @@ -0,0 +1,32 @@ +SECTION = "x11/network" +DESCRIPTION = "Mail user agent" +DEPENDS = "gtk+ gpgme gnutls" +MAINTAINER = "Patrick Steiner <patrick.steiner@a1.net>" +LICENSE = "GPL" +PR = "r3" + +SRC_URI = "http://sylpheed.good-day.net/sylpheed/v2.2/sylpheed-${PV}.tar.bz2 \ + file://sylpheed-2.2.2-libsylph-Makefile-am.patch;patch=1 \ + file://sylpheed-2.2.2-src-Makefile-am.patch;patch=1" + + +FILES_${PN} = "${bindir} ${datadir}/pixmaps ${datadir}/applications" +FILES_${PN}-doc += "${datadir}" + +EXTRA_OECONF = "--enable-gnutls" + +CFLAGS += "-D_GNU_SOURCE" + +do_configure_prepend() { + mkdir -p m4 +} + +inherit autotools + +do_install_append() { + install -d ${D}${datadir}/applications + install -m 0644 sylpheed.desktop ${D}${datadir}/applications/ + install -d ${D}${datadir}/pixmaps + install -m 0644 sylpheed.png ${D}${datadir}/pixmaps/ +} + diff --git a/packages/wpa-supplicant/files/defaults-gnutls b/packages/wpa-supplicant/files/defaults-sane index 67c4cbddf8..67c4cbddf8 100644 --- a/packages/wpa-supplicant/files/defaults-gnutls +++ b/packages/wpa-supplicant/files/defaults-sane diff --git a/packages/wpa-supplicant/files/defconfig-gnutls b/packages/wpa-supplicant/files/defconfig-gnutls index 2df5e51df8..c165343399 100644 --- a/packages/wpa-supplicant/files/defconfig-gnutls +++ b/packages/wpa-supplicant/files/defconfig-gnutls @@ -8,16 +8,49 @@ # to override previous values of the variables. CFLAGS = $(TARGET_CFLAGS) -I../hostapd -I../utils -I../driver/modules -Wall -MMD + +# for wpa_supplicant, wpa_cli LIBS = $(TARGET_LDFLAGS) +# for wpa_passphrase: +LIBS_p = $(TARGET_LDFLAGS) + + +# Uncomment following two lines and fix the paths if you have installed openssl +# in non-default location +#CFLAGS += -I/usr/local/openssl/include +#LIBS += -L/usr/local/openssl/lib + +# Example configuration for various cross-compilation platforms + +#### sveasoft (e.g., for Linksys WRT54G) ###################################### +#CC=mipsel-uclibc-gcc +#CC=/opt/brcm/hndtools-mipsel-uclibc/bin/mipsel-uclibc-gcc +#CFLAGS += -Os +#CPPFLAGS += -I../src/include -I../../src/router/openssl/include +#LIBS += -L/opt/brcm/hndtools-mipsel-uclibc-0.9.19/lib -lssl +############################################################################### + +#### openwrt (e.g., for Linksys WRT54G) ####################################### +#CC=mipsel-uclibc-gcc +#CC=/opt/brcm/hndtools-mipsel-uclibc/bin/mipsel-uclibc-gcc +#CFLAGS += -Os +#CPPFLAGS=-I../src/include -I../openssl-0.9.7d/include \ +# -I../WRT54GS/release/src/include +#LIBS = -lssl +############################################################################### + + # Driver interface for Host AP driver CONFIG_DRIVER_HOSTAP=y # Driver interface for Agere driver -#CONFIG_DRIVER_HERMES=n +CONFIG_DRIVER_HERMES=y # Driver interface for madwifi driver #CONFIG_DRIVER_MADWIFI=y +# Change include directories to match with the local setup +#CFLAGS += -I../madwifi/wpa # Driver interface for Prism54 driver #CONFIG_DRIVER_PRISM54=y @@ -30,6 +63,8 @@ CONFIG_DRIVER_HOSTAP=y # Driver interface for Broadcom driver #CONFIG_DRIVER_BROADCOM=y +# Example path for wlioctl.h; change to match your configuration +#CFLAGS += -I/opt/WRT54GS/release/src/include # Driver interface for Intel ipw2100 driver #CONFIG_DRIVER_IPW2100=y @@ -42,12 +77,20 @@ CONFIG_DRIVER_WEXT=y #CFLAGS += -I/usr/local/include #LIBS += -L/usr/local/lib +# Driver interface for Windows NDIS +#CONFIG_DRIVER_NDIS=y +#CFLAGS += -I/usr/include/w32api/ddk +#LIBS += -L/usr/local/lib +# For native build using mingw +#CONFIG_NATIVE_WINDOWS=y +# Additional directories for cross-compilation on Linux host for mingw target +#CFLAGS += -I/opt/mingw/mingw32/include/ddk +#LIBS += -L/opt/mingw/mingw32/lib +#CC=mingw32-gcc + # Driver interface for development testing #CONFIG_DRIVER_TEST=y -# Driver interface for wired Ethernet drivers -CONFIG_DRIVER_WIRED=y - # Enable IEEE 802.1X Supplicant (automatically included if any EAP method is # included) CONFIG_IEEE8021X_EAPOL=y @@ -79,9 +122,6 @@ CONFIG_EAP_OTP=y # EAP-PSK (experimental; this is _not_ needed for WPA-PSK) #CONFIG_EAP_PSK=y -# EAP-PAX -#CONFIG_EAP_PAX=y - # LEAP CONFIG_EAP_LEAP=y @@ -92,10 +132,6 @@ CONFIG_EAP_LEAP=y # a file that usually has extension .p12 or .pfx) CONFIG_PKCS12=y -# Smartcard support (i.e., private key on a smartcard), e.g., with openssl -# engine. -CONFIG_SMARTCARD=y - # PC/SC interface for smartcards (USIM, GSM SIM) # Enable this if EAP-SIM or EAP-AKA is included #CONFIG_PCSC=y @@ -110,67 +146,12 @@ CONFIG_SMARTCARD=y # Include control interface for external programs, e.g, wpa_cli CONFIG_CTRL_IFACE=y +# Include interface for using external supplicant (Xsupplicant) for EAP +# authentication +#CONFIG_XSUPPLICANT_IFACE=y + # Include support for GNU Readline and History Libraries in wpa_cli. # When building a wpa_cli binary for distribution, please note that these # libraries are licensed under GPL and as such, BSD license may not apply for # the resulting binary. #CONFIG_READLINE=y - -# Remove debugging code that is printing out debug message to stdout. -# This can be used to reduce the size of the wpa_supplicant considerably -# if debugging code is not needed. The size reduction can be around 35% -# (e.g., 90 kB). -#CONFIG_NO_STDOUT_DEBUG=y - -# Remove WPA support, e.g., for wired-only IEEE 802.1X supplicant, to save -# 35-50 kB in code size. -#CONFIG_NO_WPA=y - -# Select configuration backend: -# file = text file (e.g., wpa_supplicant.conf) -# winreg = Windows registry (see win_example.reg for an example) -CONFIG_BACKEND=file - -# Select program entry point implementation: -# main = UNIX/POSIX like main() function (default) -# main_winsvc = Windows service (read parameters from registry) -# main_none = Very basic example (development use only) -#CONFIG_MAIN=main - -# Select wrapper for operatins system and C library specific functions -# unix = UNIX/POSIX like systems (default) -# win32 = Windows systems -# none = Empty template -#CONFIG_OS=unix - -# Select event loop implementation -# eloop = select() loop (default) -# eloop_win = Windows events and WaitForMultipleObject() loop -# eloop_none = Empty template -#CONFIG_ELOOP=eloop - -# Select layer 2 packet implementation -# linux = Linux packet socket (default) -# pcap = libpcap/libdnet/WinPcap -# freebsd = FreeBSD libpcap -# winpcap = WinPcap with receive thread -# none = Empty template -#CONFIG_L2_PACKET=linux - -# IEEE 802.11i/IEEE 802.11e STAKey negotiation for direct link connection -#CONFIG_STAKEY=y - -# Select TLS implementation -# openssl = OpenSSL (default) -# gnutls = GnuTLS (needed for TLS/IA, see also CONFIG_GNUTLS_EXTRA) -# none = Empty template -CONFIG_TLS=gnutls - -# Whether to enable TLS/IA support, which is required for EAP-TTLSv1. -# You need CONFIG_TLS=gnutls for this to have any effect. Please note that -# even though the core GnuTLS library is released under LGPL, this extra -# library uses GPL and as such, the terms of GPL apply to the combination -# of wpa_supplicant and GnuTLS if this option is enabled. BSD license may not -# apply for distribution of the resulting binary. -CONFIG_GNUTLS_EXTRA=y - diff --git a/packages/wpa-supplicant/files/wpa_supplicant.conf-gnutls b/packages/wpa-supplicant/files/wpa_supplicant.conf-sane index c91ffe0c84..c91ffe0c84 100644 --- a/packages/wpa-supplicant/files/wpa_supplicant.conf-gnutls +++ b/packages/wpa-supplicant/files/wpa_supplicant.conf-sane diff --git a/packages/wpa-supplicant/wpa-supplicant_0.5.1.bb b/packages/wpa-supplicant/wpa-supplicant_0.5.1.bb index 67e5c421ca..ead598598c 100644 --- a/packages/wpa-supplicant/wpa-supplicant_0.5.1.bb +++ b/packages/wpa-supplicant/wpa-supplicant_0.5.1.bb @@ -2,15 +2,17 @@ DESCRIPTION = "A Client for Wi-Fi Protected Access (WPA)." SECTION = "network" LICENSE = "GPL" MAINTAINER = "Holger Schurig" +MAINTAINER = "Eric Shattow <lucent@gmail.com>" HOMEPAGE = "http://hostap.epitest.fi/wpa_supplicant/" DEPENDS = "gnutls" PR = "r1" +DEFAULT_PREFERENCE = "-1" SRC_URI = "http://hostap.epitest.fi/releases/wpa_supplicant-${PV}.tar.gz \ file://defconfig-gnutls \ file://init.sh \ - file://defaults-gnutls \ - file://wpa_supplicant.conf-gnutls" + file://defaults-sane \ + file://wpa_supplicant.conf-sane" S = "${WORKDIR}/wpa_supplicant-${PV}" @@ -47,6 +49,6 @@ do_install () { install -m700 ${WORKDIR}/init.sh ${D}${sysconfdir}/init.d/wpa install -d ${D}${sysconfdir}/default - install -m600 ${WORKDIR}/defaults-gnutls ${D}${sysconfdir}/default/wpa - install -m600 ${WORKDIR}/wpa_supplicant.conf-gnutls ${D}${sysconfdir}/wpa_supplicant.conf + install -m600 ${WORKDIR}/defaults-sane ${D}${sysconfdir}/default/wpa + install -m600 ${WORKDIR}/wpa_supplicant.conf-sane ${D}${sysconfdir}/wpa_supplicant.conf } diff --git a/packages/xcalibrate/xcalibrate/.mtn2git_empty b/packages/xcalibrate/xcalibrate/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/xcalibrate/xcalibrate/.mtn2git_empty diff --git a/packages/xcalibrate/xcalibrate/xextproto.patch b/packages/xcalibrate/xcalibrate/xextproto.patch new file mode 100644 index 0000000000..cb190c073b --- /dev/null +++ b/packages/xcalibrate/xcalibrate/xextproto.patch @@ -0,0 +1,11 @@ +--- XCalibrate/configure.ac.orig 2006-03-08 14:57:07.000000000 +0100 ++++ XCalibrate/configure.ac 2006-03-08 14:57:14.000000000 +0100 +@@ -7,7 +7,7 @@ + AC_PROG_LIBTOOL + + # Check for X +-PKG_CHECK_MODULES(XCALIBRATE, x11 xextensions xcalibrateext) ++PKG_CHECK_MODULES(XCALIBRATE, x11 xextproto xcalibrateext) + + AC_OUTPUT([Makefile + xcalibrate.pc]) diff --git a/packages/xcalibrate/xcalibrate_20060312.bb b/packages/xcalibrate/xcalibrate_20060312.bb new file mode 100644 index 0000000000..16e9642765 --- /dev/null +++ b/packages/xcalibrate/xcalibrate_20060312.bb @@ -0,0 +1,17 @@ +PV = "0.0+cvs${FIXEDSRCDATE}" +FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}" +LICENSE = "BSD-X" +SECTION = "x11/libs" +PRIORITY = "optional" +DEPENDS = "libx11 xcalibrateext libxext" +DESCRIPTION = "XCalibrate client-side library" + +SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=XCalibrate \ + file://xextproto.patch;patch=1" +S = "${WORKDIR}/XCalibrate" + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} diff --git a/packages/xcalibrate/xcalibrate_cvs.bb b/packages/xcalibrate/xcalibrate_cvs.bb index ab2b076079..ea69ec6f2d 100644 --- a/packages/xcalibrate/xcalibrate_cvs.bb +++ b/packages/xcalibrate/xcalibrate_cvs.bb @@ -5,7 +5,8 @@ PRIORITY = "optional" DEPENDS = "libx11 xcalibrateext libxext" DESCRIPTION = "XCalibrate client-side library" -SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=XCalibrate" +SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=XCalibrate \ + file://xextproto.patch;patch=1" S = "${WORKDIR}/XCalibrate" inherit autotools pkgconfig diff --git a/packages/xdpyinfo/xdpyinfo/.mtn2git_empty b/packages/xdpyinfo/xdpyinfo/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/xdpyinfo/xdpyinfo/.mtn2git_empty diff --git a/packages/xdpyinfo/xdpyinfo/disable-xkb.patch b/packages/xdpyinfo/xdpyinfo/disable-xkb.patch new file mode 100644 index 0000000000..24af21f4fc --- /dev/null +++ b/packages/xdpyinfo/xdpyinfo/disable-xkb.patch @@ -0,0 +1,18 @@ +--- xdpyinfo-1.0.1/configure.ac.orig 2006-03-08 16:33:05.000000000 +0100 ++++ xdpyinfo-1.0.1/configure.ac 2006-03-08 16:41:59.000000000 +0100 +@@ -45,11 +45,15 @@ + AC_CHECK_HEADERS([X11/extensions/multibuf.h X11/extensions/XShm.h],,,[#include <X11/Xlib.h>]) + CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"]) + ++AC_ARG_ENABLE(xkb, AC_HELP_STRING([--disable-xkb], [Disable XKB support]), ++ XKB="$enableval", XKB="yes") ++if test "x$XKB" = "xyes" ; then + PKG_CHECK_MODULES(DPY_XKB, x11, + [SAVE_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $DPY_XKB_CFLAGS $DPY_X11_CFLAGS" + AC_CHECK_HEADERS([X11/extensions/XKB.h X11/XKBlib.h],,,[#include <X11/Xlib.h>]) + CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"]) ++fi + + PKG_CHECK_MODULES(DPY_XF86VIDMODE, xxf86vm, + [SAVE_CPPFLAGS="$CPPFLAGS" diff --git a/packages/xdpyinfo/xdpyinfo_1.0.1.bb b/packages/xdpyinfo/xdpyinfo_1.0.1.bb new file mode 100644 index 0000000000..41d9807551 --- /dev/null +++ b/packages/xdpyinfo/xdpyinfo_1.0.1.bb @@ -0,0 +1,11 @@ +LICENSE = "MIT" +DEPENDS = "libx11 libxext libxtst" +DESCRIPTION = "X display information utility" +SECTION = "x11/base" + +SRC_URI = "${XORG_MIRROR}/X11R7.0/src/app/xdpyinfo-1.0.1.tar.bz2 \ + file://disable-xkb.patch;patch=1" + +EXTRA_OECONF = "--disable-xkb" + +inherit autotools pkgconfig diff --git a/packages/xev/xev_1.0.1.bb b/packages/xev/xev_1.0.1.bb new file mode 100644 index 0000000000..4f00093a37 --- /dev/null +++ b/packages/xev/xev_1.0.1.bb @@ -0,0 +1,11 @@ +DESCRIPTION = "X Event Viewer" +HOMEPAGE = "http://freedesktop.org/wiki/Software_2fxapps" +LICENSE = "MIT" +MAINTAINER = "Justin Patrin <papercrane@reversefold.com>" +SECTION = "x11/base" +DEPENDS = "libx11 libxau" + +SRC_URI = "${XORG_MIRROR}/X11R7.0/src/app/${PN}-${PV}.tar.bz2 \ + file://diet-x11.patch;patch=1" + +inherit autotools diff --git a/packages/xhost/xhost_1.0.0.bb b/packages/xhost/xhost_1.0.0.bb new file mode 100644 index 0000000000..baacf25564 --- /dev/null +++ b/packages/xhost/xhost_1.0.0.bb @@ -0,0 +1,9 @@ +LICENSE = "MIT" +DEPENDS = "libx11 libxext libxmu" +DESCRIPTION = "server access control program for X" +MAINTAINER = "Rene Wagner <rw@handhelds.org>" +SECTION = "x11/base" + +SRC_URI = "${XORG_MIRROR}/X11R7.0/src/app/${PN}-${PV}.tar.bz2" + +inherit autotools pkgconfig diff --git a/packages/xlibs/diet-x11/.mtn2git_empty b/packages/xlibs/diet-x11/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/xlibs/diet-x11/.mtn2git_empty diff --git a/packages/xlibs/diet-x11/X18NCMSstubs.diff b/packages/xlibs/diet-x11/X18NCMSstubs.diff new file mode 100644 index 0000000000..54b1727a95 --- /dev/null +++ b/packages/xlibs/diet-x11/X18NCMSstubs.diff @@ -0,0 +1,528 @@ +--- libX11-X11R7.0-1.0.0/src/imConv.c.orig 2006-03-08 09:46:03.000000000 +0100 ++++ libX11-X11R7.0-1.0.0/src/imConv.c 2006-03-08 10:50:10.000000000 +0100 +@@ -83,6 +83,7 @@ + * from UCS char to specified charset char. + * This converter is needed for _XimGetCharCode subroutine. + */ ++#ifdef XLOCALE + XPointer + _XimGetLocaleCode ( + _Xconst char* encoding_name) +@@ -96,6 +97,7 @@ + } + return cvt; + } ++#endif + + /* + * Returns the locale dependent representation of a keysym. +@@ -107,6 +109,7 @@ + * locale + */ + /*ARGSUSED*/ ++#ifdef XLOCALE + int + _XimGetCharCode ( + XPointer ucs_conv, +@@ -135,6 +138,7 @@ + buf[count]= '\0'; + return count; + } ++#endif + + #ifdef XKB + static int lookup_string( +--- libX11-X11R7.0-1.0.0/src/X18NCMSstubs.c.orig 2006-03-08 08:43:19.000000000 +0100 ++++ libX11-X11R7.0-1.0.0/src/X18NCMSstubs.c 2006-03-08 11:41:28.000000000 +0100 +@@ -0,0 +1,428 @@ ++/* ++ * X18NCMSstubs.c ++ * - Provides stubs and dummy funcs needed when Xcms and XLocale stuff removed ++ * ++ * Copyright © 2003 Matthew Allum ++ * ++ * Permission to use, copy, modify, distribute, and sell this software and its ++ * documentation for any purpose is hereby granted without fee, provided that ++ * the above copyright notice appear in all copies and that both that ++ * copyright notice and this permission notice appear in supporting ++ * documentation, and that the name of Matthew Allum not be used in ++ * advertising or publicity pertaining to distribution of the software without ++ * specific, written prior permission. Keith Packard and Compaq makes no ++ * representations about the suitability of this software for any purpose. It ++ * is provided "as is" without express or implied warranty. ++ * ++ * MATTHEW ALLUM DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS ++ * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, ++ * IN NO EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR ++ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, ++ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER ++ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ++ * PERFORMANCE OF THIS SOFTWARE. ++ */ ++ ++#include <stdlib.h> ++#include "Xlibint.h" ++#include "Xlcint.h" ++#include <X11/Xlocale.h> ++#include <X11/Xos.h> ++#ifdef WIN32 ++#undef close ++#endif ++#include <X11/Xutil.h> ++#include "XlcPubI.h" ++ ++#include "Xcmsint.h" /* for XcmsCCC type */ ++#include "XlcPubI.h" /* for XLCd type */ ++#include "config.h" ++ ++#if ! XLOCALE ++ ++Bool ++XSupportsLocale() ++{ ++ return False; ++} ++ ++char * ++XSetLocaleModifiers( ++ const char *modifiers) ++{ ++ return NULL; ++} ++ ++XLCd ++_XOpenLC( ++ char *name) ++{ ++ return NULL; ++} ++ ++XLCd ++_XlcCurrentLC() ++{ ++ return NULL; ++} ++ ++void ++_XlcVaToArgList( ++ va_list var, ++ int count, ++ XlcArgList *args_ret) ++{ ++ return; ++} ++ ++void ++_XlcCountVaList( ++ va_list var, ++ int *count_ret) ++{ ++ return; ++} ++ ++void ++_XCloseLC( ++ XLCd lcd) ++{ ++ return; ++} ++ ++int ++_XlcConvert( ++ XlcConv conv, ++ XPointer *from, ++ int *from_left, ++ XPointer *to, ++ int *to_left, ++ XPointer *args, ++ int num_args) ++{ ++ return 0; ++} ++ ++/* XIM Stubs */ ++ ++XPointer ++_XimGetLocaleCode ( _Xconst char* encoding_name ) ++{ ++ return NULL; ++} ++ ++int ++_XimGetCharCode ( ++ XPointer ucs_conv, ++ KeySym keysym, ++ unsigned char* buf, ++ int nbytes) ++{ ++ return 0; ++} ++ ++/* Xrm Stubs */ ++ ++XrmMethods ++_XrmInitParseInfo( ++ XPointer *state) ++{ ++ return (XrmMethods) NULL; ++} ++ ++/* Xwc Stubs */ ++ ++int ++XwcTextExtents( ++ XFontSet font_set, ++ _Xconst wchar_t *text, ++ int text_len, ++ XRectangle *overall_ink_extents, ++ XRectangle *overall_logical_extents) ++{ ++ return 0; ++} ++ ++void ++XwcDrawString(Display *display, ++ Drawable d, ++ XFontSet font_set, ++ GC gc, ++ int x, int y, ++ _Xconst wchar_t *string, ++ int num_wchars) ++{ ++ ; ++} ++ ++void ++XwcDrawText( ++ Display *dpy, ++ Drawable d, ++ GC gc, ++ int x, ++ int y, ++ XwcTextItem *text_items, ++ int nitems) ++{ ++ ; ++} ++ ++void ++XwcDrawImageString( ++ Display *dpy, ++ Drawable d, ++ XFontSet font_set, ++ GC gc, ++ int x, ++ int y, ++ _Xconst wchar_t *text, ++ int text_len) ++{ ++ ; ++} ++ ++int ++XwcTextEscapement( ++ XFontSet font_set, ++ _Xconst wchar_t *text, ++ int text_len) ++{ ++ return 0; ++} ++ ++Status ++XwcTextPerCharExtents( ++ XFontSet font_set, ++ _Xconst wchar_t *text, ++ int text_len, ++ XRectangle *ink_extents_buffer, ++ XRectangle *logical_extents_buffer, ++ int buffer_size, ++ int *num_chars, ++ XRectangle *max_ink_extents, ++ XRectangle *max_logical_extents) ++{ ++ ; ++} ++ ++int ++XwcTextPropertyToTextList( ++ Display *dpy, ++ const XTextProperty *text_prop, ++ wchar_t ***list_ret, ++ int *count_ret) ++{ ++ return 0; ++} ++ ++int ++XwcTextListToTextProperty( ++ Display *dpy, ++ wchar_t **list, ++ int count, ++ XICCEncodingStyle style, ++ XTextProperty *text_prop) ++{ ++ return 0; ++} ++ ++void ++XwcFreeStringList(wchar_t **list) ++{ ++ return; ++} ++ ++ ++void XmbSetWMProperties ( /* Actually from mbWMProps.c */ ++ Display *dpy, ++ Window w, ++ _Xconst char *windowName, ++ _Xconst char *iconName, ++ char **argv, ++ int argc, ++ XSizeHints *sizeHints, ++ XWMHints *wmHints, ++ XClassHint *classHints) ++{ ++ return; ++} ++ ++int ++XmbTextPropertyToTextList( ++ Display *dpy, ++ const XTextProperty *text_prop, ++ char ***list_ret, ++ int *count_ret) ++{ ++ return XLocaleNotSupported; ++} ++ ++int ++XmbTextListToTextProperty( ++ Display *dpy, ++ char **list, ++ int count, ++ XICCEncodingStyle style, ++ XTextProperty *text_prop) ++{ ++ return XLocaleNotSupported; ++} ++ ++int ++XmbTextExtents( ++ XFontSet font_set, ++ _Xconst char *text, ++ int text_len, ++ XRectangle *overall_ink_extents, ++ XRectangle *overall_logical_extents) ++{ ++ return 0; ++} ++ ++void ++XmbDrawText( ++ Display *dpy, ++ Drawable d, ++ GC gc, ++ int x, ++ int y, ++ XmbTextItem *text_items, ++ int nitems) ++{ ++ ; ++} ++ ++void ++XmbDrawString( ++ Display *dpy, ++ Drawable d, ++ XFontSet font_set, ++ GC gc, ++ int x, ++ int y, ++ _Xconst char *text, ++ int text_len) ++{ ++ ; ++} ++ ++void ++XmbDrawImageString( ++ Display *dpy, ++ Drawable d, ++ XFontSet font_set, ++ GC gc, ++ int x, ++ int y, ++ _Xconst char *text, ++ int text_len) ++{ ++ ; ++} ++ ++int ++XmbTextEscapement( ++ XFontSet font_set, ++ _Xconst char *text, ++ int text_len) ++{ ++ return 0; ++} ++ ++Status ++XmbTextPerCharExtents( ++ XFontSet font_set, ++ _Xconst char *text, ++ int text_len, ++ XRectangle *ink_extents_buffer, ++ XRectangle *logical_extents_buffer, ++ int buffer_size, ++ int *num_chars, ++ XRectangle *max_ink_extents, ++ XRectangle *max_logical_extents) ++{ ++ return 0; ++} ++ ++unsigned int ++KeySymToUcs4(KeySym keysym) ++{ ++ return 0; ++} ++ ++#endif ++ ++#if ! XCMS ++ ++XcmsCCC ++XcmsCCCOfColormap(dpy, cmap) ++ Display *dpy; ++ Colormap cmap; ++{ ++ return NULL; ++} ++ ++Status ++_XcmsResolveColorString ( ++ XcmsCCC ccc, ++ const char **color_string, ++ XcmsColor *pColor_exact_return, ++ XcmsColorFormat result_format) ++{ ++ return(XcmsFailure); ++} ++ ++void ++_XcmsUnresolveColor( ++ XcmsCCC ccc, ++ XcmsColor *pColor) ++{ ++ return; ++} ++ ++void ++_XUnresolveColor( ++ XcmsCCC ccc, ++ XColor *pXColor) ++{ ++ return; ++} ++ ++XcmsCmapRec * ++_XcmsAddCmapRec(dpy, cmap, windowID, visual) ++ Display *dpy; ++ Colormap cmap; ++ Window windowID; ++ Visual *visual; ++{ ++ return NULL; ++} ++ ++void ++_XcmsRGB_to_XColor( ++ XcmsColor *pColors, ++ XColor *pXColors, ++ unsigned int nColors) ++{ ++ return; ++} ++ ++XcmsCmapRec * ++_XcmsCopyCmapRecAndFree( ++ Display *dpy, ++ Colormap src_cmap, ++ Colormap copy_cmap) ++{ ++ return NULL; ++} ++ ++void ++_XcmsDeleteCmapRec( ++ Display *dpy, ++ Colormap cmap) ++{ ++ return; ++} ++ ++#endif +--- libX11-X11R7.0-1.0.0/src/Makefile.am.orig 2006-03-08 08:31:09.000000000 +0100 ++++ libX11-X11R7.0-1.0.0/src/Makefile.am 2006-03-08 09:36:23.000000000 +0100 +@@ -331,6 +331,8 @@ + libX11_la_SOURCES+=UIThrStubs.c + endif + ++libX11_la_SOURCES+=X18NCMSstubs.c ++ + x11datadir = @X11_DATADIR@ + x11data_DATA = XKeysymDB XErrorDB + +@@ -338,7 +340,8 @@ + $(x11data_DATA) \ + os2Stubs.c \ + udcInf.c \ +- UIThrStubs.c ++ UIThrStubs.c \ ++ X18NCMSstubs.c + + # + # Figure out which sub-libraries to link into Xlib +--- libX11-X11R7.0-1.0.0/src/locking.c.orig 2006-03-08 11:05:56.000000000 +0100 ++++ libX11-X11R7.0-1.0.0/src/locking.c 2006-03-08 11:06:37.000000000 +0100 +@@ -55,7 +55,9 @@ + #define NUM_FREE_CVLS 4 + + /* in lcWrap.c */ ++#ifdef XLOCALE + extern LockInfoPtr _Xi18n_lock; ++#endif + + #ifdef WIN32 + static DWORD _X_TlsIndex = (DWORD)-1; +@@ -625,9 +627,11 @@ + _Xglobal_lock = &global_lock; + xmutex_init(_Xglobal_lock->lock); + xmutex_set_name(_Xglobal_lock->lock, "Xlib global"); ++#ifdef XLOCALE + _Xi18n_lock = &i18n_lock; + xmutex_init(_Xi18n_lock->lock); + xmutex_set_name(_Xi18n_lock->lock, "Xlib i18n"); ++#endif + _XLockMutex_fn = _XLockMutex; + _XUnlockMutex_fn = _XUnlockMutex; + _XCreateMutex_fn = _XCreateMutex; +--- libX11-X11R7.0-1.0.0/configure.ac.orig 2006-03-08 10:03:57.000000000 +0100 ++++ libX11-X11R7.0-1.0.0/configure.ac 2006-03-08 10:06:01.000000000 +0100 +@@ -215,7 +215,14 @@ + esac + AC_SUBST(KEYSYMDEF) + +-AM_CONDITIONAL(UDC, test xfalse = xtrue) ++AC_ARG_ENABLE(udc, ++ AC_HELP_STRING([--disable-udc], ++ [Disable Xlib support for UDC *EXPERIMENTAL*]), ++ [UDC=$enableval],[UDC=yes]) ++AM_CONDITIONAL(UDC, [test x$UDC = xyes ]) ++if test x"$UDC" = "xyes"; then ++ AC_DEFINE(UDC,1,[Include support for UDC]) ++fi + + AC_ARG_ENABLE(xcms, + AC_HELP_STRING([--disable-xcms], diff --git a/packages/xlibs/diet-x11/fix-disable-xlocale.diff b/packages/xlibs/diet-x11/fix-disable-xlocale.diff new file mode 100644 index 0000000000..9dbf6dac68 --- /dev/null +++ b/packages/xlibs/diet-x11/fix-disable-xlocale.diff @@ -0,0 +1,14 @@ +--- libX11-X11R7.0-1.0.0/src/Font.c.orig 2006-03-12 18:35:42.000000000 +0100 ++++ libX11-X11R7.0-1.0.0/src/Font.c 2006-03-12 18:40:27.000000000 +0100 +@@ -701,7 +701,11 @@ + } + if (l - 2 - (p - charset) < 0) + return 0; ++#ifdef XLOCALE + if (_XlcNCompareISOLatin1(name + l - 2 - (p - charset), charset, p - charset)) ++#else ++ if (strncasecmp(name + l - 2 - (p - charset), charset, p - charset)) ++#endif + return 0; + if (strlen(p + 1) + l - 1 >= sizeof(buf) - 1) + return 0; diff --git a/packages/xlibs/diet-x11_X11R7.0-1.0.0.bb b/packages/xlibs/diet-x11_X11R7.0-1.0.0.bb new file mode 100644 index 0000000000..9f3322c893 --- /dev/null +++ b/packages/xlibs/diet-x11_X11R7.0-1.0.0.bb @@ -0,0 +1,14 @@ +SECTION = "x11/base" +include libx11_${PV}.bb + +PROVIDES += "libx11" + +EXTRA_OECONF += "--disable-udc --disable-xcms --disable-xlocale --disable-xkb" +CFLAGS += "-D_GNU_SOURCE" + +SRC_URI += "file://X18NCMSstubs.diff;patch=1 \ + file://fix-disable-xlocale.diff;patch=1" + +#do_stage_append () { +# rm -f ${STAGING_INCDIR}/X11/XKBlib.h +#} diff --git a/packages/xlibs/libfontenc_1.0.1.bb b/packages/xlibs/libfontenc_1.0.1.bb new file mode 100644 index 0000000000..3d56bca223 --- /dev/null +++ b/packages/xlibs/libfontenc_1.0.1.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "X fontenc library (used by libxfont)." +SECTION = "x11/libs" +PRIORITY = "optional" +#MAINTAINER = "" +LICENSE = "BSD-X" + +DEPENDS = "zlib xproto" + +SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/${PN}-${PV}.tar.bz2" + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} diff --git a/packages/xlibs/libice_X11R7.0-1.0.0.bb b/packages/xlibs/libice_X11R7.0-1.0.0.bb new file mode 100644 index 0000000000..251188b1c2 --- /dev/null +++ b/packages/xlibs/libice_X11R7.0-1.0.0.bb @@ -0,0 +1,17 @@ +DESCRIPTION = "X11 ICE library" +SECTION = "libs" +PRIORITY = "optional" +#MAINTAINER = "" +LICENSE= "MIT" + +DEPENDS = "libx11 util-macros" +PROVIDES = "ice" + +SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libICE-${PV}.tar.bz2" +S = "${WORKDIR}/libICE-${PV}" + +inherit autotools pkgconfig + +do_stage () { + autotools_stage_all +} diff --git a/packages/xlibs/libsm_X11R7.0-1.0.0.bb b/packages/xlibs/libsm_X11R7.0-1.0.0.bb new file mode 100644 index 0000000000..14ec6ffac0 --- /dev/null +++ b/packages/xlibs/libsm_X11R7.0-1.0.0.bb @@ -0,0 +1,17 @@ +DESCRIPTION = "Session management library" +SECTION = "libs" +PRIORITY = "optional" +#MAINTAINER = "" +LICENSE = "MIT-X" +#PV="1:1.0.0" + +DEPENDS = "libx11 libice util-macros" + +SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libSM-1.0.0.tar.bz2" +S = "${WORKDIR}/libSM-1.0.0" + +inherit autotools pkgconfig + +do_stage () { + autotools_stage_all +} diff --git a/packages/xlibs/libx11_X11R7.0-1.0.0.bb b/packages/xlibs/libx11_X11R7.0-1.0.0.bb new file mode 100644 index 0000000000..d5be287341 --- /dev/null +++ b/packages/xlibs/libx11_X11R7.0-1.0.0.bb @@ -0,0 +1,30 @@ +DESCRIPTION = "Base X libs." +SECTION = "x11/libs" +PRIORITY = "optional" +LICENSE = "XFree86" + +DEPENDS = "xproto xextproto libxau xtrans libxdmcp xcmiscproto xf86bigfontproto kbproto inputproto bigreqsproto util-macros" +PROVIDES = "x11" + +FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB" +FILES_${PN}-locale += "${datadir}/X11/locale" + +SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libX11-${PV}.tar.bz2" +S = "${WORKDIR}/libX11-${PV}" + +inherit autotools pkgconfig + +EXTRA_OECONF="--enable-malloc0returnsnull" + +do_compile() { + ( + unset CC LD CXX CCLD + oe_runmake -C src/util 'CC=${BUILD_CC}' 'LD=${BUILD_LD}' 'CXX=${BUILD_CXX}' 'CCLD=${BUILD_CCLD}' 'CFLAGS=-D_GNU_SOURCE ${BUILD_CFLAGS}' 'LDFLAGS=${BUILD_LDFLAGS}' 'CXXFLAGS=${BUILD_CXXFLAGS}' 'CPPFLAGS=${BUILD_CPPFLAGS}' makekeys + ) + rm -f ${STAGING_INCDIR}/X11/Xlib.h + oe_runmake +} + +do_stage() { + autotools_stage_all +} diff --git a/packages/xlibs/libxau_1.0.0.bb b/packages/xlibs/libxau_1.0.0.bb new file mode 100644 index 0000000000..828d4ebd3d --- /dev/null +++ b/packages/xlibs/libxau_1.0.0.bb @@ -0,0 +1,17 @@ +DESCRIPTION = "Authorization Protocol for X." +SECTION = "x11/libs" +PRIORITY = "optional" +#MAINTAINER = "" +LICENSE= "MIT" + +DEPENDS = "xproto util-macros" +PROVIDES = "xau" + +SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXau-${PV}.tar.bz2" +S = "${WORKDIR}/libXau-${PV}" + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} diff --git a/packages/xlibs/libxaw_X11R7.0-1.0.1.bb b/packages/xlibs/libxaw_X11R7.0-1.0.1.bb new file mode 100644 index 0000000000..4d3c6acdbd --- /dev/null +++ b/packages/xlibs/libxaw_X11R7.0-1.0.1.bb @@ -0,0 +1,20 @@ +DESCRIPTION = "X Athena Widgets library" +SECTION = "x11/libs" +PRIORITY = "optional" +#MAINTAINER = "" +LICENSE = "MIT" + +DEPENDS = "xproto libx11 libxt libxmu libxpm" +PROVIDES = "xaw" + +SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXaw-${PV}.tar.bz2" +S = "${WORKDIR}/libXaw-${PV}" + +inherit autotools pkgconfig + +# FIXME: libXaw needs a full x11, not diet +BROKEN = "1" + +do_stage () { + autotools_stage_all +} diff --git a/packages/xlibs/libxcomposite/.mtn2git_empty b/packages/xlibs/libxcomposite/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/xlibs/libxcomposite/.mtn2git_empty diff --git a/packages/xlibs/libxcomposite/change-include-order.patch b/packages/xlibs/libxcomposite/change-include-order.patch new file mode 100644 index 0000000000..630b8818fc --- /dev/null +++ b/packages/xlibs/libxcomposite/change-include-order.patch @@ -0,0 +1,14 @@ +This patch makes the build use its own Xcomposite.h over rather than an +older Xcomposite.h that might already be installed in the staging dir. + +--- libXcomposite-X11R7.0-0.2.2.2/src/Makefile.am.orig 2006-03-12 20:10:17.000000000 +0100 ++++ libXcomposite-X11R7.0-0.2.2.2/src/Makefile.am 2006-03-12 20:10:35.000000000 +0100 +@@ -21,7 +21,7 @@ + # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + # PERFORMANCE OF THIS SOFTWARE. + +-AM_CFLAGS = $(XCOMPOSITE_CFLAGS) $(XCOMPOSITE_CFLAGS) $(X_CFLAGS) -I$(top_srcdir)/include ++AM_CFLAGS = -I$(top_srcdir)/include $(XCOMPOSITE_CFLAGS) $(XCOMPOSITE_CFLAGS) $(X_CFLAGS) + + lib_LTLIBRARIES = libXcomposite.la + diff --git a/packages/xlibs/libxcomposite_X11R7.0-0.2.2.2.bb b/packages/xlibs/libxcomposite_X11R7.0-0.2.2.2.bb new file mode 100644 index 0000000000..57eef74aa3 --- /dev/null +++ b/packages/xlibs/libxcomposite_X11R7.0-0.2.2.2.bb @@ -0,0 +1,17 @@ +DESCRIPTION = "X Composite extension library." +SECTION = "x11/libs" +#MAINTAINER = "" +LICENSE= "BSD-X" + +DEPENDS = "libx11 compositeproto xextproto libxfixes" +PROVIDES = "xcomposite" + +SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXcomposite-${PV}.tar.bz2 \ + file://change-include-order.patch;patch=1" +S = "${WORKDIR}/libXcomposite-${PV}" + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} diff --git a/packages/xlibs/libxcursor_1.1.5.2.bb b/packages/xlibs/libxcursor_1.1.5.2.bb new file mode 100644 index 0000000000..d20b52d0f0 --- /dev/null +++ b/packages/xlibs/libxcursor_1.1.5.2.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "X Cursor library" +SECTION = "x11/libs" +PRIORITY = "optional" +#MAINTAINER = "" +LICENSE= "BSD-X" + +DEPENDS = "libxfixes" + +SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXcursor-${PV}.tar.bz2" +S = "${WORKDIR}/libXcursor-${PV}" + +FILES_${PN} += "${libdir}/libXcursor.so" + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} diff --git a/packages/xlibs/libxdamage_1.0.2.2.bb b/packages/xlibs/libxdamage_1.0.2.2.bb new file mode 100644 index 0000000000..572df1d190 --- /dev/null +++ b/packages/xlibs/libxdamage_1.0.2.2.bb @@ -0,0 +1,16 @@ +DESCRIPTION = "X Damage extension library." +SECTION = "x11/libs" +#MAINTAINER = "" +LICENSE= "BSD-X" + +DEPENDS = "libx11 damageproto libxfixes xproto" +PROVIDES = "xdamage" + +SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXdamage-${PV}.tar.bz2" +S = "${WORKDIR}/libXdamage-${PV}" + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} diff --git a/packages/xlibs/libxdmcp_1.0.0.bb b/packages/xlibs/libxdmcp_1.0.0.bb new file mode 100644 index 0000000000..4ba746369f --- /dev/null +++ b/packages/xlibs/libxdmcp_1.0.0.bb @@ -0,0 +1,17 @@ +DESCRIPTION = "X Display Manager Control Protocol library." +SECTION = "x11/libs" +PRIORITY = "optional" +#MAINTAINER = "" +LICENSE= "MIT" + +DEPENDS = "xproto util-macros" +PROVIDES = "xdmcp" + +SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXdmcp-${PV}.tar.bz2" +S = "${WORKDIR}/libXdmcp-${PV}" + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} diff --git a/packages/xlibs/libxext-native_cvs.bb b/packages/xlibs/libxext-native_cvs.bb index dfc439a9f6..296a741ebf 100644 --- a/packages/xlibs/libxext-native_cvs.bb +++ b/packages/xlibs/libxext-native_cvs.bb @@ -2,3 +2,4 @@ SECTION = "unknown" include libxext_${PV}.bb inherit native DEPENDS = "x11-native xextensions-native" +PROVIDES = "" diff --git a/packages/xlibs/libxext_1.0.0.bb b/packages/xlibs/libxext_1.0.0.bb new file mode 100644 index 0000000000..1c15f819b6 --- /dev/null +++ b/packages/xlibs/libxext_1.0.0.bb @@ -0,0 +1,19 @@ +DESCRIPTION = "X Server Extension library" +SECTION = "x11/libs" +PRIORITY = "optional" +#MAINTAINER = "" +LICENSE= "MIT" + +DEPENDS = "xproto libx11 xextproto util-macros" +PROVIDES = "xext" + +SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXext-${PV}.tar.bz2" +S = "${WORKDIR}/libXext-${PV}" + +inherit autotools pkgconfig + +EXTRA_OECONF="--enable-malloc0returnsnull" + +do_stage() { + autotools_stage_all +} diff --git a/packages/xlibs/libxfixes_3.0.1.2.bb b/packages/xlibs/libxfixes_3.0.1.2.bb new file mode 100644 index 0000000000..ea898d723b --- /dev/null +++ b/packages/xlibs/libxfixes_3.0.1.2.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "X Fixes extension library." +SECTION = "x11/libs" +#MAINTAINER = "" +LICENSE= "BSD-X" + +DEPENDS = "libx11 fixesproto" + +SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXfixes-${PV}.tar.bz2" +S = "${WORKDIR}/libXfixes-${PV}" + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} diff --git a/packages/xlibs/libxfont_X11R7.0-1.0.0.bb b/packages/xlibs/libxfont_X11R7.0-1.0.0.bb new file mode 100644 index 0000000000..c4614e8d78 --- /dev/null +++ b/packages/xlibs/libxfont_X11R7.0-1.0.0.bb @@ -0,0 +1,17 @@ +DESCRIPTION = "X font library (used by the X server)." +SECTION = "x11/libs" +PRIORITY = "optional" +#MAINTAINER = "" +LICENSE = "BSD-X" + +DEPENDS = "xproto xtrans zlib fontcacheproto fontsproto libfontenc freetype" +PROVIDES = "xfont" + +SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXfont-${PV}.tar.bz2" +S = "${WORKDIR}/libXfont-${PV}" + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} diff --git a/packages/xlibs/libxft_2.1.8.2.bb b/packages/xlibs/libxft_2.1.8.2.bb new file mode 100644 index 0000000000..d97049d935 --- /dev/null +++ b/packages/xlibs/libxft_2.1.8.2.bb @@ -0,0 +1,26 @@ +DESCRIPTION = "X FreeType library. Client-side fonts with FreeType." +LICENSE = "MIT-X" +SECTION = "x11/libs" + +DEPENDS = "libx11 xproto libxrender freetype fontconfig" +PROVIDES = "xft" + +SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXft-${PV}.tar.bz2" +S = "${WORKDIR}/libXft-${PV}" + +FILES_${PN} = ${libdir}/lib*.so.* +FILES_${PN}-dev = ${includedir} ${libdir}/lib*.so ${libdir}/*.la \ + ${libdir}/*.a ${libdir}/pkgconfig \ + ${datadir}/aclocal ${bindir} ${sbindir} + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} + +python do_package() { + if bb.data.getVar('DEBIAN_NAMES', d, 1): + bb.data.setVar('PKG_${PN}', 'libxft2', d) + bb.build.exec_func('package_do_package', d) +} diff --git a/packages/xlibs/libxi_X11R7.0-1.0.0.bb b/packages/xlibs/libxi_X11R7.0-1.0.0.bb new file mode 100644 index 0000000000..e771e60cda --- /dev/null +++ b/packages/xlibs/libxi_X11R7.0-1.0.0.bb @@ -0,0 +1,17 @@ +DESCRIPTION = "X Input extension library." +SECTION = "x11/libs" +#MAINTAINER = "" +LICENSE = "MIT-X" + +DEPENDS = "xproto libx11 xextproto" + +SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXi-${PV}.tar.bz2" +S = "${WORKDIR}/libXi-${PV}" + +inherit autotools pkgconfig + +EXTRA_OECONF="--enable-malloc0returnsnull" + +do_stage() { + autotools_stage_all +} diff --git a/packages/xlibs/libxinerama_X11R7.0-1.0.1.bb b/packages/xlibs/libxinerama_X11R7.0-1.0.1.bb new file mode 100644 index 0000000000..26b746d465 --- /dev/null +++ b/packages/xlibs/libxinerama_X11R7.0-1.0.1.bb @@ -0,0 +1,19 @@ +DESCRIPTION = "Xinerama library" +SECTION = "x11/libs" +PRIORITY = "optional" +#MAINTAINER = "" +LICENSE = "MIT" + +DEPENDS = "xineramaproto xproto libx11 libxext" +PROVIDES = "xinerama" + +SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXinerama-${PV}.tar.bz2" +S = "${WORKDIR}/libXinerama-${PV}" + +inherit autotools pkgconfig + +EXTRA_OECONF="--enable-malloc0returnsnull" + +do_stage() { + autotools_stage_all +} diff --git a/packages/xlibs/libxkbfile_1.0.1.bb b/packages/xlibs/libxkbfile_1.0.1.bb new file mode 100644 index 0000000000..deae8278c5 --- /dev/null +++ b/packages/xlibs/libxkbfile_1.0.1.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "X11 keyboard library" +SECTION = "libs" +PRIORITY = "optional" +#MAINTAINER = "" +LICENSE = "GPL" + +DEPENDS = "libx11" + +SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/${PN}-${PV}.tar.bz2" + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} diff --git a/packages/xlibs/libxmu_1.0.0.bb b/packages/xlibs/libxmu_1.0.0.bb new file mode 100644 index 0000000000..e404ff527d --- /dev/null +++ b/packages/xlibs/libxmu_1.0.0.bb @@ -0,0 +1,24 @@ +DESCRIPTION = "X Window System miscellaneous utility library" +SECTION = "x11/libs" +PRIORITY = "optional" +#MAINTAINER = "" +LICENSE = "MIT" + +DEPENDS = "libxt libxext util-macros" +PROVIDES = "xmu" + +SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXmu-${PV}.tar.bz2" +S = "${WORKDIR}/libXmu-${PV}" + +PACKAGES =+ "libxmuu libxmuu-dev" + +FILES_libxmuu = "${libdir}/libXmuu.so.*" +FILES_libxmuu-dev = "${libdir}/libXmuu.so" + +LEAD_SONAME = "libXmu" + +inherit autotools pkgconfig + +do_stage () { + autotools_stage_all +} diff --git a/packages/xlibs/libxp_1.0.0.bb b/packages/xlibs/libxp_1.0.0.bb new file mode 100644 index 0000000000..c8547cf783 --- /dev/null +++ b/packages/xlibs/libxp_1.0.0.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "X print extension library." +SECTION = "libs" +#MAINTAINER = "" +LICENSE = "MIT" + +DEPENDS = "libx11 libxext xextproto libxau printproto" + +SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXp-${PV}.tar.bz2" +S = "${WORKDIR}/libXp-${PV}" + +inherit autotools pkgconfig + +CFLAGS_append += " -I ${S}/include/X11/XprintUtil -I ${S}/include/X11/extensions" +EXTRA_OECONF="--enable-malloc0returnsnull" + +do_stage() { + autotools_stage_all +} diff --git a/packages/xlibs/libxpm_3.5.4.2.bb b/packages/xlibs/libxpm_3.5.4.2.bb new file mode 100644 index 0000000000..0f2b8a94a1 --- /dev/null +++ b/packages/xlibs/libxpm_3.5.4.2.bb @@ -0,0 +1,22 @@ +DESCRIPTION = "X Pixmap library." +SECTION = "x11/libs" +PRIORITY = "optional" +#MAINTAINER = "" +LICENSE = "X-BSD" +PR = "r1" + +DEPENDS = "xproto libx11 util-macros" + +SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXpm-${PV}.tar.bz2" +S = "${WORKDIR}/libXpm-${PV}" + +inherit autotools pkgconfig + +do_stage () { + install -m 0644 ${S}/include/X11/xpm.h ${STAGING_INCDIR}/X11/xpm.h + oe_libinstall -a -so libXpm ${STAGING_LIBDIR} +} + +PACKAGES =+ "sxpm cxpm" +FILES_cxpm = "${bindir}/cxpm" +FILES_sxpm = "${bindir}/sxpm" diff --git a/packages/xlibs/libxrandr_1.1.0.2.bb b/packages/xlibs/libxrandr_1.1.0.2.bb new file mode 100644 index 0000000000..81787ad871 --- /dev/null +++ b/packages/xlibs/libxrandr_1.1.0.2.bb @@ -0,0 +1,17 @@ +DESCRIPTION = "X Resize and Rotate extension library." +SECTION = "x11/libs" +#MAINTAINER = "" +LICENSE = "BSD-X" + +DEPENDS = "randrproto libx11 libxrender libxext" + +SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXrandr-${PV}.tar.bz2" +S = "${WORKDIR}/libXrandr-${PV}" + +inherit autotools pkgconfig + +EXTRA_OECONF="--enable-malloc0returnsnull" + +do_stage() { + autotools_stage_all +} diff --git a/packages/xlibs/libxrender_0.9.0.2.bb b/packages/xlibs/libxrender_0.9.0.2.bb new file mode 100644 index 0000000000..fdaa9f4eb9 --- /dev/null +++ b/packages/xlibs/libxrender_0.9.0.2.bb @@ -0,0 +1,17 @@ +DESCRIPTION = "X Render extension library." +SECTION = "libs" +#MAINTAINER = "" +LICENSE = "BSD" + +DEPENDS = "renderproto libx11" + +SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXrender-${PV}.tar.bz2" +S = "${WORKDIR}/libXrender-${PV}" + +inherit autotools pkgconfig + +EXTRA_OECONF="--enable-malloc0returnsnull" + +do_stage() { + autotools_stage_all +} diff --git a/packages/xlibs/libxres_X11R7.0-1.0.0.bb b/packages/xlibs/libxres_X11R7.0-1.0.0.bb new file mode 100644 index 0000000000..69f20fc8f4 --- /dev/null +++ b/packages/xlibs/libxres_X11R7.0-1.0.0.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "X Resource usage library." +SECTION = "x11/libs" +#MAINTAINER = "" +LICENSE = "X-MIT" + +DEPENDS = "libx11 xextproto libxext resourceproto" +PROVIDES = "xres" + +SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXres-${PV}.tar.bz2" +S = "${WORKDIR}/libXres-${PV}" + +inherit autotools pkgconfig + +EXTRA_OECONF="--enable-malloc0returnsnull" + +do_stage() { + autotools_stage_all +} diff --git a/packages/xlibs/libxss_1.0.1.bb b/packages/xlibs/libxss_1.0.1.bb new file mode 100644 index 0000000000..54abc86a23 --- /dev/null +++ b/packages/xlibs/libxss_1.0.1.bb @@ -0,0 +1,20 @@ +DESCRIPTION = "X screen saver extension library." +SECTION = "libs" +#MAINTAINER = "" +LICENSE = "GPL" + +DEPENDS = "libx11 libxext xextproto scrnsaverproto" +PROVIDES = "libxss" +RREPLACES = "libxss" + +SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXScrnSaver-${PV}.tar.bz2" +S = "${WORKDIR}/libXScrnSaver-${PV}" + +inherit autotools pkgconfig + +#CFLAGS_append += " -I ${S}/include/X11/XprintUtil -I ${S}/include/X11/extensions" +EXTRA_OECONF="--enable-malloc0returnsnull" + +do_stage() { + autotools_stage_all +} diff --git a/packages/xlibs/libxt_1.0.0.bb b/packages/xlibs/libxt_1.0.0.bb new file mode 100644 index 0000000000..0f9fbf1860 --- /dev/null +++ b/packages/xlibs/libxt_1.0.0.bb @@ -0,0 +1,27 @@ +DESCRIPTION = "X Toolkit Intrinsics" +SECTION = "x11/libs" +PRIORITY = "optional" +#MAINTAINER = "" +LICENSE = "X-MIT" + +DEPENDS = "libx11 libsm util-macros" +PROVIDES = "xt" + +SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXt-${PV}.tar.bz2" +S = "${WORKDIR}/libXt-${PV}" + +inherit autotools pkgconfig + +EXTRA_OECONF="--enable-malloc0returnsnull --disable-install-makestrs --disable-xkb" + +do_compile() { + ( + unset CC LD CXX CCLD + oe_runmake -C util 'CC=${BUILD_CC}' 'LD=${BUILD_LD}' 'CXX=${BUILD_CXX}' 'CCLD=${BUILD_CCLD}' 'CFLAGS=-D_GNU_SOURCE ${BUILD_CFLAGS}' 'LDFLAGS=${BUILD_LDFLAGS}' 'CXXFLAGS=${BUILD_CXXFLAGS}' 'CPPFLAGS=${BUILD_CPPFLAGS}' makestrs + ) + oe_runmake +} + +do_stage () { + autotools_stage_all +} diff --git a/packages/xlibs/libxtst_1.0.1.bb b/packages/xlibs/libxtst_1.0.1.bb new file mode 100644 index 0000000000..89c7b6607a --- /dev/null +++ b/packages/xlibs/libxtst_1.0.1.bb @@ -0,0 +1,17 @@ +DESCRIPTION = "X Test Extension: client side library" +SECTION = "x11/libs" +PRIORITY = "optional" +#MAINTAINER = "" +LICENSE = "GPL" + +DEPENDS = "libx11 libxext recordproto xextproto inputproto" +PROVIDES = "xtst" + +SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXtst-${PV}.tar.bz2" +S = "${WORKDIR}/libXtst-${PV}" + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} diff --git a/packages/xlibs/libxv_X11R7.0-1.0.1.bb b/packages/xlibs/libxv_X11R7.0-1.0.1.bb new file mode 100644 index 0000000000..12b480dedc --- /dev/null +++ b/packages/xlibs/libxv_X11R7.0-1.0.1.bb @@ -0,0 +1,17 @@ +DESCRIPTION = "X Video extension library." +SECTION = "x11/libs" +#MAINTAINER = "" +LICENSE = "GPL" + +DEPENDS = "libx11 libxext xextproto videoproto" + +SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXv-${PV}.tar.bz2" +S = "${WORKDIR}/libXv-${PV}" + +inherit autotools pkgconfig + +EXTRA_OECONF="--enable-malloc0returnsnull" + +do_stage() { + autotools_stage_all +} diff --git a/packages/xlibs/libxxf86dga_1.0.0.bb b/packages/xlibs/libxxf86dga_1.0.0.bb new file mode 100644 index 0000000000..9a4824c153 --- /dev/null +++ b/packages/xlibs/libxxf86dga_1.0.0.bb @@ -0,0 +1,16 @@ +DESCRIPTION = "Xxf86dga extension library." +SECTION = "x11/libs" +LICENSE = "XFree86" + +DEPENDS = "libx11 libxext xxf86dgaproto" + +SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXxf86dga-${PV}.tar.bz2" +S = "${WORKDIR}/libXxf86dga-${PV}" + +inherit autotools pkgconfig + +EXTRA_OECONF="--enable-malloc0returnsnull" + +do_stage() { + oe_libinstall -so -a libXxf86dga ${STAGING_LIBDIR} +} diff --git a/packages/xlibs/libxxf86vm_1.0.0.bb b/packages/xlibs/libxxf86vm_1.0.0.bb new file mode 100644 index 0000000000..fe67e123d9 --- /dev/null +++ b/packages/xlibs/libxxf86vm_1.0.0.bb @@ -0,0 +1,16 @@ +DESCRIPTION = "Xxf86vm extension library." +SECTION = "x11/libs" +LICENSE = "MIT" + +DEPENDS = "libx11 libxext xxf86vidmodeproto" + +SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXxf86vm-${PV}.tar.bz2" +S = "${WORKDIR}/libXxf86vm-${PV}" + +inherit autotools pkgconfig + +EXTRA_OECONF="--enable-malloc0returnsnull" + +do_stage() { + autotools_stage_all +} diff --git a/packages/xlibs/util-macros_1.0.1.bb b/packages/xlibs/util-macros_1.0.1.bb new file mode 100644 index 0000000000..87e2ecfa62 --- /dev/null +++ b/packages/xlibs/util-macros_1.0.1.bb @@ -0,0 +1,12 @@ +DESCRIPTION = "X autotools macros" +SECTION = "x11/libs" +LICENSE= "Xorg" +#MAINTAINER = "" + +SRC_URI = "${XORG_MIRROR}/X11R7.0/src/util/${PN}-${PV}.tar.bz2" + +inherit autotools pkgconfig + +do_stage () { + autotools_stage_all +} diff --git a/packages/xlibs/xtrans_1.0.0.bb b/packages/xlibs/xtrans_1.0.0.bb new file mode 100644 index 0000000000..79503126f2 --- /dev/null +++ b/packages/xlibs/xtrans_1.0.0.bb @@ -0,0 +1,13 @@ +LICENSE = "MIT" +SECTION = "x11/libs" +DESCRIPTION = "network API translation layer to \ +insulate X applications and libraries from OS \ +network vageries." + +SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/${PN}-${PV}.tar.bz2" + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} diff --git a/packages/xmodmap/xmodmap_1.0.0.bb b/packages/xmodmap/xmodmap_1.0.0.bb new file mode 100644 index 0000000000..57140361b4 --- /dev/null +++ b/packages/xmodmap/xmodmap_1.0.0.bb @@ -0,0 +1,10 @@ +LICENSE = "MIT" +DESCRIPTION = "utility for modifying keymaps and pointer button mappings in X" +MAINTAINER = "Rene Wagner <rw@handhelds.org>" +SECTION = "x11/base" + +DEPENDS = "libx11" + +SRC_URI = "${XORG_MIRROR}/X11R7.0/src/app/xmodmap-1.0.0.tar.bz2" + +inherit autotools pkgconfig diff --git a/packages/xproto/applewmproto_1.0.3.bb b/packages/xproto/applewmproto_1.0.3.bb new file mode 100644 index 0000000000..66419fe87f --- /dev/null +++ b/packages/xproto/applewmproto_1.0.3.bb @@ -0,0 +1 @@ +include proto-common.inc diff --git a/packages/xproto/bigreqsproto_1.0.2.bb b/packages/xproto/bigreqsproto_1.0.2.bb new file mode 100644 index 0000000000..66419fe87f --- /dev/null +++ b/packages/xproto/bigreqsproto_1.0.2.bb @@ -0,0 +1 @@ +include proto-common.inc diff --git a/packages/xproto/compositeproto_0.2.2.bb b/packages/xproto/compositeproto_0.2.2.bb new file mode 100644 index 0000000000..0989abb63c --- /dev/null +++ b/packages/xproto/compositeproto_0.2.2.bb @@ -0,0 +1,3 @@ +include proto-common.inc + +CONFLICTS = "compositeext" diff --git a/packages/xproto/damageproto_1.0.3.bb b/packages/xproto/damageproto_1.0.3.bb new file mode 100644 index 0000000000..cde80f0ffa --- /dev/null +++ b/packages/xproto/damageproto_1.0.3.bb @@ -0,0 +1,3 @@ +include proto-common.inc + +CONFLICTS = "damageext" diff --git a/packages/xproto/dmxproto_2.2.2.bb b/packages/xproto/dmxproto_2.2.2.bb new file mode 100644 index 0000000000..66419fe87f --- /dev/null +++ b/packages/xproto/dmxproto_2.2.2.bb @@ -0,0 +1 @@ +include proto-common.inc diff --git a/packages/xproto/evieext_1.0.2.bb b/packages/xproto/evieext_1.0.2.bb new file mode 100644 index 0000000000..66419fe87f --- /dev/null +++ b/packages/xproto/evieext_1.0.2.bb @@ -0,0 +1 @@ +include proto-common.inc diff --git a/packages/xproto/fixesproto_3.0.2.bb b/packages/xproto/fixesproto_3.0.2.bb new file mode 100644 index 0000000000..2be69994a8 --- /dev/null +++ b/packages/xproto/fixesproto_3.0.2.bb @@ -0,0 +1,3 @@ +include proto-common.inc + +CONFLICTS = "fixesext" diff --git a/packages/xproto/fontcacheproto_0.1.2.bb b/packages/xproto/fontcacheproto_0.1.2.bb new file mode 100644 index 0000000000..66419fe87f --- /dev/null +++ b/packages/xproto/fontcacheproto_0.1.2.bb @@ -0,0 +1 @@ +include proto-common.inc diff --git a/packages/xproto/fontsproto_2.0.2.bb b/packages/xproto/fontsproto_2.0.2.bb new file mode 100644 index 0000000000..66419fe87f --- /dev/null +++ b/packages/xproto/fontsproto_2.0.2.bb @@ -0,0 +1 @@ +include proto-common.inc diff --git a/packages/xproto/glproto_1.4.3.bb b/packages/xproto/glproto_1.4.3.bb new file mode 100644 index 0000000000..66419fe87f --- /dev/null +++ b/packages/xproto/glproto_1.4.3.bb @@ -0,0 +1 @@ +include proto-common.inc diff --git a/packages/xproto/inputproto_1.3.2.bb b/packages/xproto/inputproto_1.3.2.bb new file mode 100644 index 0000000000..66419fe87f --- /dev/null +++ b/packages/xproto/inputproto_1.3.2.bb @@ -0,0 +1 @@ +include proto-common.inc diff --git a/packages/xproto/kbproto_1.0.2.bb b/packages/xproto/kbproto_1.0.2.bb new file mode 100644 index 0000000000..66419fe87f --- /dev/null +++ b/packages/xproto/kbproto_1.0.2.bb @@ -0,0 +1 @@ +include proto-common.inc diff --git a/packages/xproto/printproto_1.0.3.bb b/packages/xproto/printproto_1.0.3.bb new file mode 100644 index 0000000000..66419fe87f --- /dev/null +++ b/packages/xproto/printproto_1.0.3.bb @@ -0,0 +1 @@ +include proto-common.inc diff --git a/packages/xproto/proto-common.inc b/packages/xproto/proto-common.inc new file mode 100644 index 0000000000..4a712a810a --- /dev/null +++ b/packages/xproto/proto-common.inc @@ -0,0 +1,12 @@ +DESCRIPTION = "X protocol headers" +SECTION = "x11/libs" +LICENSE= "MIT-X" +#MAINTAINER = "" + +SRC_URI = "${XORG_MIRROR}/X11R7.0/src/proto/${PN}-${PV}.tar.bz2" + +inherit autotools pkgconfig + +do_stage () { + autotools_stage_all +} diff --git a/packages/xproto/randrproto_1.1.2.bb b/packages/xproto/randrproto_1.1.2.bb new file mode 100644 index 0000000000..fafe3d3bef --- /dev/null +++ b/packages/xproto/randrproto_1.1.2.bb @@ -0,0 +1,3 @@ +include proto-common.inc + +CONFLICTS = "randrext" diff --git a/packages/xproto/recordproto_1.13.2.bb b/packages/xproto/recordproto_1.13.2.bb new file mode 100644 index 0000000000..9e2cafceb8 --- /dev/null +++ b/packages/xproto/recordproto_1.13.2.bb @@ -0,0 +1,3 @@ +include proto-common.inc + +CONFLICTS = "recordext" diff --git a/packages/xproto/renderproto_0.9.2.bb b/packages/xproto/renderproto_0.9.2.bb new file mode 100644 index 0000000000..7f9febd8fa --- /dev/null +++ b/packages/xproto/renderproto_0.9.2.bb @@ -0,0 +1,3 @@ +include proto-common.inc + +CONFLICTS = "renderext" diff --git a/packages/xproto/resourceproto_1.0.2.bb b/packages/xproto/resourceproto_1.0.2.bb new file mode 100644 index 0000000000..e210b894ee --- /dev/null +++ b/packages/xproto/resourceproto_1.0.2.bb @@ -0,0 +1,3 @@ +include proto-common.inc + +CONFLICTS = "resourceext" diff --git a/packages/xproto/scrnsaverproto_1.0.2.bb b/packages/xproto/scrnsaverproto_1.0.2.bb new file mode 100644 index 0000000000..66419fe87f --- /dev/null +++ b/packages/xproto/scrnsaverproto_1.0.2.bb @@ -0,0 +1 @@ +include proto-common.inc diff --git a/packages/xproto/trapproto_3.4.3.bb b/packages/xproto/trapproto_3.4.3.bb new file mode 100644 index 0000000000..66419fe87f --- /dev/null +++ b/packages/xproto/trapproto_3.4.3.bb @@ -0,0 +1 @@ +include proto-common.inc diff --git a/packages/xproto/videoproto_2.2.2.bb b/packages/xproto/videoproto_2.2.2.bb new file mode 100644 index 0000000000..66419fe87f --- /dev/null +++ b/packages/xproto/videoproto_2.2.2.bb @@ -0,0 +1 @@ +include proto-common.inc diff --git a/packages/xproto/windowswmproto_1.0.3.bb b/packages/xproto/windowswmproto_1.0.3.bb new file mode 100644 index 0000000000..66419fe87f --- /dev/null +++ b/packages/xproto/windowswmproto_1.0.3.bb @@ -0,0 +1 @@ +include proto-common.inc diff --git a/packages/xproto/xcmiscproto_1.1.2.bb b/packages/xproto/xcmiscproto_1.1.2.bb new file mode 100644 index 0000000000..66419fe87f --- /dev/null +++ b/packages/xproto/xcmiscproto_1.1.2.bb @@ -0,0 +1 @@ +include proto-common.inc diff --git a/packages/xproto/xextproto_7.0.2.bb b/packages/xproto/xextproto_7.0.2.bb new file mode 100644 index 0000000000..1ae2522d5f --- /dev/null +++ b/packages/xproto/xextproto_7.0.2.bb @@ -0,0 +1,3 @@ +include proto-common.inc + +PROVIDES = "xextensions" diff --git a/packages/xproto/xf86bigfontproto_1.1.2.bb b/packages/xproto/xf86bigfontproto_1.1.2.bb new file mode 100644 index 0000000000..66419fe87f --- /dev/null +++ b/packages/xproto/xf86bigfontproto_1.1.2.bb @@ -0,0 +1 @@ +include proto-common.inc diff --git a/packages/xproto/xf86dgaproto_2.0.2.bb b/packages/xproto/xf86dgaproto_2.0.2.bb new file mode 100644 index 0000000000..3d7166c741 --- /dev/null +++ b/packages/xproto/xf86dgaproto_2.0.2.bb @@ -0,0 +1,3 @@ +include proto-common.inc + +CONFLICTS = "xxf86dgaext" diff --git a/packages/xproto/xf86driproto_2.0.3.bb b/packages/xproto/xf86driproto_2.0.3.bb new file mode 100644 index 0000000000..66419fe87f --- /dev/null +++ b/packages/xproto/xf86driproto_2.0.3.bb @@ -0,0 +1 @@ +include proto-common.inc diff --git a/packages/xproto/xf86miscproto_0.9.2.bb b/packages/xproto/xf86miscproto_0.9.2.bb new file mode 100644 index 0000000000..66419fe87f --- /dev/null +++ b/packages/xproto/xf86miscproto_0.9.2.bb @@ -0,0 +1 @@ +include proto-common.inc diff --git a/packages/xproto/xf86rushproto_1.1.2.bb b/packages/xproto/xf86rushproto_1.1.2.bb new file mode 100644 index 0000000000..66419fe87f --- /dev/null +++ b/packages/xproto/xf86rushproto_1.1.2.bb @@ -0,0 +1 @@ +include proto-common.inc diff --git a/packages/xproto/xf86vidmodeproto_2.2.2.bb b/packages/xproto/xf86vidmodeproto_2.2.2.bb new file mode 100644 index 0000000000..9ce9a207b8 --- /dev/null +++ b/packages/xproto/xf86vidmodeproto_2.2.2.bb @@ -0,0 +1,3 @@ +include proto-common.inc + +CONFLICTS = "xxf86vmext" diff --git a/packages/xproto/xineramaproto_1.1.2.bb b/packages/xproto/xineramaproto_1.1.2.bb new file mode 100644 index 0000000000..66419fe87f --- /dev/null +++ b/packages/xproto/xineramaproto_1.1.2.bb @@ -0,0 +1 @@ +include proto-common.inc diff --git a/packages/xproto/xproto_7.0.4.bb b/packages/xproto/xproto_7.0.4.bb new file mode 100644 index 0000000000..66419fe87f --- /dev/null +++ b/packages/xproto/xproto_7.0.4.bb @@ -0,0 +1 @@ +include proto-common.inc diff --git a/packages/xproto/xproxymanagementprotocol_1.0.2.bb b/packages/xproto/xproxymanagementprotocol_1.0.2.bb new file mode 100644 index 0000000000..66419fe87f --- /dev/null +++ b/packages/xproto/xproxymanagementprotocol_1.0.2.bb @@ -0,0 +1 @@ +include proto-common.inc diff --git a/packages/xrandr/xrandr_1.0.1.bb b/packages/xrandr/xrandr_1.0.1.bb new file mode 100644 index 0000000000..51f8f1c196 --- /dev/null +++ b/packages/xrandr/xrandr_1.0.1.bb @@ -0,0 +1,9 @@ +LICENSE= "BSD-X" +DEPENDS = "libxrandr libx11 libxext" +DESCRIPTION = "X Resize and Rotate extension command." +SECTION = "x11/base" + +SRC_URI = "${XORG_MIRROR}/X11R7.0/src/app/xrandr-1.0.1.tar.bz2" +S = "${WORKDIR}/${PN}-${PV}" + +inherit autotools pkgconfig diff --git a/packages/xrdb/xrdb_1.0.1.bb b/packages/xrdb/xrdb_1.0.1.bb new file mode 100644 index 0000000000..7d6b588dd1 --- /dev/null +++ b/packages/xrdb/xrdb_1.0.1.bb @@ -0,0 +1,11 @@ +DEPENDS = "libx11 libxmu libxext" +DESCRIPTION = "X server resource database utility" +MAINTAINER = "Rene Wagner <rw@handhelds.org>" +SECTION = "x11/base" +LICENSE = "xrdb" +PR = "r0" + +SRC_URI = "${XORG_MIRROR}/X11R7.0/src/app/xrdb-1.0.1.tar.bz2" +S = "${WORKDIR}/${PN}-${PV}" + +inherit autotools pkgconfig diff --git a/packages/xserver/xserver-kdrive/build-20050207-against-X11R7.diff b/packages/xserver/xserver-kdrive/build-20050207-against-X11R7.diff new file mode 100644 index 0000000000..596e498b80 --- /dev/null +++ b/packages/xserver/xserver-kdrive/build-20050207-against-X11R7.diff @@ -0,0 +1,464 @@ +--- xserver.orig/configure.ac 2006-03-11 16:27:42.000000000 +0100 ++++ xserver/configure.ac 2006-03-11 16:46:51.000000000 +0100 +@@ -79,7 +79,7 @@ + # tslib touchscreen driver + AC_CHECK_HEADERS([tslib.h]) + +-REQUIRED_MODULES="randr render fixesext damageext xextensions xfont xproto xtrans xau" ++REQUIRED_MODULES="randrproto renderproto fixesproto damageproto xextproto xfont xproto xtrans xau" + + DEFAULT_FONT_PATH="/usr/lib/X11/fonts/misc,/usr/lib/X11/fonts/100dpi,/usr/lib/X11/fonts/75dpi" + DEFAULT_VENDOR_STRING="freedesktop.org" +--- xserver.orig/dix/dispatch.c 2006-03-11 16:27:42.000000000 +0100 ++++ xserver/dix/dispatch.c 2006-03-11 16:30:59.000000000 +0100 +@@ -79,7 +79,6 @@ + #endif + + #include "windowstr.h" +-#include "fontstruct.h" + #include "dixfontstr.h" + #include "gcstruct.h" + #include "selection.h" +--- xserver.orig/dix/glyphcurs.c 2006-03-11 16:27:42.000000000 +0100 ++++ xserver/dix/glyphcurs.c 2006-03-11 16:31:57.000000000 +0100 +@@ -51,7 +51,6 @@ + #include <config.h> + #endif + #include "misc.h" +-#include "fontstruct.h" + #include "dixfontstr.h" + #include "scrnintstr.h" + #include "gcstruct.h" +--- xserver.orig/dix/main.c 2006-03-11 16:27:42.000000000 +0100 ++++ xserver/dix/main.c 2006-03-11 16:32:05.000000000 +0100 +@@ -89,7 +89,6 @@ + #include "colormap.h" + #include "colormapst.h" + #include "cursorstr.h" +-#include "font.h" + #include "opaque.h" + #include "servermd.h" + #include "site.h" +--- xserver.orig/dix/swaprep.c 2006-03-11 16:27:42.000000000 +0100 ++++ xserver/dix/swaprep.c 2006-03-11 16:32:24.000000000 +0100 +@@ -57,7 +57,7 @@ + #include <X11/Xproto.h> + #include "misc.h" + #include "dixstruct.h" +-#include "fontstruct.h" ++#include "dixfont.h" + #include "scrnintstr.h" + #include "swaprep.h" + #include "globals.h" +--- xserver.orig/dix/xpstubs.c 2006-03-11 16:27:42.000000000 +0100 ++++ xserver/dix/xpstubs.c 2006-03-11 16:32:34.000000000 +0100 +@@ -31,7 +31,7 @@ + #include <config.h> + #endif + #include "misc.h" +-#include "font.h" ++#include "dixfont.h" + + Bool + XpClientIsBitmapClient(ClientPtr client) +--- xserver.orig/fb/fbglyph.c 2006-03-11 16:27:42.000000000 +0100 ++++ xserver/fb/fbglyph.c 2006-03-11 16:52:01.000000000 +0100 +@@ -26,7 +26,6 @@ + #include <config.h> + #endif + #include "fb.h" +-#include "fontstruct.h" + #include "dixfontstr.h" + + Bool +--- xserver.orig/hw/kdrive/epson/epson13806draw.c 2006-03-11 16:27:42.000000000 +0100 ++++ xserver/hw/kdrive/epson/epson13806draw.c 2006-03-11 16:34:56.000000000 +0100 +@@ -38,7 +38,6 @@ + #include "pixmapstr.h" + #include "regionstr.h" + #include "mistruct.h" +-#include "fontstruct.h" + #include "dixfontstr.h" + #include "fb.h" + #include "migc.h" +--- xserver.orig/hw/kdrive/i810/i810draw.c 2006-03-11 16:27:42.000000000 +0100 ++++ xserver/hw/kdrive/i810/i810draw.c 2006-03-11 16:34:41.000000000 +0100 +@@ -51,7 +51,6 @@ + #include "pixmapstr.h" + #include "regionstr.h" + #include "mistruct.h" +-#include "fontstruct.h" + #include "dixfontstr.h" + #include "fb.h" + #include "migc.h" +--- xserver.orig/hw/kdrive/src/kaa.c 2006-03-11 16:27:42.000000000 +0100 ++++ xserver/hw/kdrive/src/kaa.c 2006-03-11 16:35:39.000000000 +0100 +@@ -29,7 +29,6 @@ + #endif + #include "kdrive.h" + #include "kaa.h" +-#include "fontstruct.h" + #include "dixfontstr.h" + + #define DEBUG_MIGRATE 0 +--- xserver.orig/include/dixfont.h 2006-03-11 16:27:42.000000000 +0100 ++++ xserver/include/dixfont.h 2006-03-11 16:43:25.000000000 +0100 +@@ -27,10 +27,10 @@ + #define DIXFONT_H 1 + + #include "dix.h" +-#include "font.h" +-#include "fontconf.h" ++#include <X11/fonts/font.h> ++#include <X11/fonts/fontconf.h> + #include "closure.h" +-#include "fontstruct.h" ++#include <X11/fonts/fontstruct.h> + + #define NullDIXFontProp ((DIXFontPropPtr)0) + +--- xserver.orig/include/dixfontstr.h 2006-03-11 16:27:42.000000000 +0100 ++++ xserver/include/dixfontstr.h 2006-03-11 16:43:31.000000000 +0100 +@@ -27,7 +27,6 @@ + + #include "servermd.h" + #include "dixfont.h" +-#include "fontstruct.h" + #include "closure.h" + #define NEED_REPLIES + #include "X11/Xproto.h" /* for xQueryFontReply */ +--- xserver.orig/mi/mibstore.c 2006-03-11 16:27:42.000000000 +0100 ++++ xserver/mi/mibstore.c 2006-03-11 16:36:26.000000000 +0100 +@@ -57,7 +57,6 @@ + #include "gcstruct.h" + #include "windowstr.h" + #include "pixmapstr.h" +-#include "fontstruct.h" + #include "dixfontstr.h" + #include "dixstruct.h" /* For requestingClient */ + #include "mi.h" +--- xserver.orig/mi/miglblt.c 2006-03-11 16:27:42.000000000 +0100 ++++ xserver/mi/miglblt.c 2006-03-11 16:53:52.000000000 +0100 +@@ -55,7 +55,6 @@ + #include <X11/Xmd.h> + #include <X11/Xproto.h> + #include "misc.h" +-#include "fontstruct.h" + #include "dixfontstr.h" + #include "gcstruct.h" + #include "windowstr.h" +--- xserver.orig/mi/mi.h 2006-03-11 16:27:42.000000000 +0100 ++++ xserver/mi/mi.h 2006-03-11 16:36:16.000000000 +0100 +@@ -54,7 +54,7 @@ + #include "validate.h" + #include "window.h" + #include "gc.h" +-#include "font.h" ++#include "dixfont.h" + #include "input.h" + #include "cursor.h" + +--- xserver.orig/mi/miinitext.c 2006-03-11 16:27:42.000000000 +0100 ++++ xserver/mi/miinitext.c 2006-03-11 16:36:41.000000000 +0100 +@@ -54,6 +54,8 @@ + #include "extension.h" + #include "micmap.h" + #include "xext.h" ++#include "pixmap.h" ++#include "gc.h" + + #ifdef NOPEXEXT /* sleaze for Solaris cpp building XsunMono */ + #undef PEXEXT +--- xserver.orig/mi/mipolytext.c 2006-03-11 16:27:42.000000000 +0100 ++++ xserver/mi/mipolytext.c 2006-03-11 16:36:48.000000000 +0100 +@@ -63,7 +63,6 @@ + #include <X11/Xproto.h> + #include "misc.h" + #include "gcstruct.h" +-#include "fontstruct.h" + #include "dixfontstr.h" + #include "mi.h" + +--- xserver.orig/mi/misprite.c 2006-03-11 16:27:42.000000000 +0100 ++++ xserver/mi/misprite.c 2006-03-11 16:37:00.000000000 +0100 +@@ -42,7 +42,6 @@ + # include "input.h" + # include "mi.h" + # include "cursorstr.h" +-# include "font.h" + # include "scrnintstr.h" + # include "colormapst.h" + # include "windowstr.h" +@@ -50,7 +49,6 @@ + # include "mipointer.h" + # include "mispritest.h" + # include "dixfontstr.h" +-# include "fontstruct.h" + #ifdef RENDER + # include "mipict.h" + #endif +--- xserver.orig/miext/damage/damage.c 2006-03-11 16:27:42.000000000 +0100 ++++ xserver/miext/damage/damage.c 2006-03-11 16:37:17.000000000 +0100 +@@ -28,9 +28,7 @@ + #include <X11/X.h> + #include "scrnintstr.h" + #include "windowstr.h" +-#include "font.h" + #include "dixfontstr.h" +-#include "fontstruct.h" + #include "mi.h" + #include "regionstr.h" + #include "globals.h" +--- xserver.orig/miext/shadow/shadow.c 2006-03-11 16:27:42.000000000 +0100 ++++ xserver/miext/shadow/shadow.c 2006-03-11 16:38:13.000000000 +0100 +@@ -29,9 +29,7 @@ + #include <X11/X.h> + #include "scrnintstr.h" + #include "windowstr.h" +-#include "font.h" + #include "dixfontstr.h" +-#include "fontstruct.h" + #include "mi.h" + #include "regionstr.h" + #include "globals.h" +--- xserver.orig/miext/shadow/shalloc.c 2006-03-11 16:27:42.000000000 +0100 ++++ xserver/miext/shadow/shalloc.c 2006-03-11 16:38:25.000000000 +0100 +@@ -29,9 +29,7 @@ + #include <X11/X.h> + #include "scrnintstr.h" + #include "windowstr.h" +-#include "font.h" + #include "dixfontstr.h" +-#include "fontstruct.h" + #include "mi.h" + #include "regionstr.h" + #include "globals.h" +--- xserver.orig/miext/shadow/shpacked.c 2006-03-11 16:27:42.000000000 +0100 ++++ xserver/miext/shadow/shpacked.c 2006-03-11 16:38:33.000000000 +0100 +@@ -28,9 +28,7 @@ + #include <X11/X.h> + #include "scrnintstr.h" + #include "windowstr.h" +-#include "font.h" + #include "dixfontstr.h" +-#include "fontstruct.h" + #include "mi.h" + #include "regionstr.h" + #include "globals.h" +--- xserver.orig/miext/shadow/shplanar8.c 2006-03-11 16:27:42.000000000 +0100 ++++ xserver/miext/shadow/shplanar8.c 2006-03-11 16:38:44.000000000 +0100 +@@ -28,9 +28,7 @@ + #include <X11/X.h> + #include "scrnintstr.h" + #include "windowstr.h" +-#include "font.h" + #include "dixfontstr.h" +-#include "fontstruct.h" + #include "mi.h" + #include "regionstr.h" + #include "globals.h" +--- xserver.orig/miext/shadow/shplanar.c 2006-03-11 16:27:42.000000000 +0100 ++++ xserver/miext/shadow/shplanar.c 2006-03-11 16:38:39.000000000 +0100 +@@ -28,9 +28,7 @@ + #include <X11/X.h> + #include "scrnintstr.h" + #include "windowstr.h" +-#include "font.h" + #include "dixfontstr.h" +-#include "fontstruct.h" + #include "mi.h" + #include "regionstr.h" + #include "globals.h" +--- xserver.orig/miext/shadow/shrotate.c 2006-03-11 16:27:42.000000000 +0100 ++++ xserver/miext/shadow/shrotate.c 2006-03-11 16:38:56.000000000 +0100 +@@ -28,9 +28,7 @@ + #include <X11/X.h> + #include "scrnintstr.h" + #include "windowstr.h" +-#include "font.h" + #include "dixfontstr.h" +-#include "fontstruct.h" + #include "mi.h" + #include "regionstr.h" + #include "globals.h" +--- xserver.orig/miext/shadow/shrotpack.h 2006-03-11 16:27:42.000000000 +0100 ++++ xserver/miext/shadow/shrotpack.h 2006-03-11 16:39:02.000000000 +0100 +@@ -30,9 +30,7 @@ + #include <X11/X.h> + #include "scrnintstr.h" + #include "windowstr.h" +-#include "font.h" + #include "dixfontstr.h" +-#include "fontstruct.h" + #include "mi.h" + #include "regionstr.h" + #include "globals.h" +--- xserver.orig/miext/shadow/shrotpackYX.h 2006-03-11 16:27:42.000000000 +0100 ++++ xserver/miext/shadow/shrotpackYX.h 2006-03-11 16:39:08.000000000 +0100 +@@ -25,9 +25,7 @@ + #include <X11/X.h> + #include "scrnintstr.h" + #include "windowstr.h" +-#include "font.h" + #include "dixfontstr.h" +-#include "fontstruct.h" + #include "mi.h" + #include "regionstr.h" + #include "globals.h" +--- xserver.orig/os/xstrans.c 2006-03-11 16:27:42.000000000 +0100 ++++ xserver/os/xstrans.c 2006-03-11 16:39:31.000000000 +0100 +@@ -27,4 +27,4 @@ + + #include "config.h" + +-#include <transport.c> ++#include <X11/Xtrans/transport.c> +--- xserver.orig/os/xstrans.h 2006-03-11 16:27:42.000000000 +0100 ++++ xserver/os/xstrans.h 2006-03-11 16:39:37.000000000 +0100 +@@ -25,4 +25,4 @@ + #define XSERV_t + #define TRANS_SERVER + +-#include <Xtrans.h> ++#include <X11/Xtrans/Xtrans.h> +--- xserver.orig/Xext/shmint.h 2006-03-11 16:27:42.000000000 +0100 ++++ xserver/Xext/shmint.h 2006-03-11 16:29:24.000000000 +0100 +@@ -32,27 +32,6 @@ + #include "pixmap.h" + #include "gc.h" + +-typedef struct _ShmFuncs { +- PixmapPtr (* CreatePixmap)(ScreenPtr pScreen, +- int width, +- int height, +- int depth, +- char *addr); +- void (* PutImage)(DrawablePtr dst, +- GCPtr pGC, +- int depth, +- unsigned int format, +- int w, +- int h, +- int sx, +- int sy, +- int sw, +- int sh, +- int dx, +- int dy, +- char *data); +-} ShmFuncs, *ShmFuncsPtr; +- + void + ShmRegisterFuncs(ScreenPtr pScreen, ShmFuncsPtr funcs); + +--- xserver.orig/Xext/syncint.h 2006-03-11 16:27:42.000000000 +0100 ++++ xserver/Xext/syncint.h 2006-03-11 16:30:16.000000000 +0100 +@@ -48,7 +48,7 @@ + PERFORMANCE OF THIS SOFTWARE. + + ******************************************************************/ +-/* $Id: syncint.h,v 3.1 2003-11-02 19:56:10 keithp Exp $ */ ++/* $Id: syncint.h,v 3.2 2005-04-20 18:42:31 clee Exp $ */ + + #ifndef _SYNCINT_H_ + #define _SYNCINT_H_ +@@ -57,26 +57,10 @@ + + #define CARD64 XSyncValue /* XXX temporary! need real 64 bit values for Alpha */ + +-typedef struct _SyncCounter { +- ClientPtr client; /* Owning client. 0 for system counters */ +- XSyncCounter id; /* resource ID */ +- CARD64 value; /* counter value */ +- struct _SyncTriggerList *pTriglist; /* list of triggers */ +- Bool beingDestroyed; /* in process of going away */ +- struct _SysCounterInfo *pSysCounterInfo; /* NULL if not a system counter */ +-} SyncCounter; +- + /* + * The System Counter interface + */ + +-typedef enum { +- XSyncCounterNeverChanges, +- XSyncCounterNeverIncreases, +- XSyncCounterNeverDecreases, +- XSyncCounterUnrestricted +-} SyncCounterType; +- + typedef void + (*SyncQueryValueProcPtr) (pointer pCounter, + CARD64 *freshvalue); +@@ -86,16 +70,6 @@ + CARD64 *lessthan, + CARD64 *greaterthan); + +-typedef struct _SysCounterInfo { +- char *name; +- CARD64 resolution; +- CARD64 bracket_greater; +- CARD64 bracket_less; +- SyncCounterType counterType; /* how can this counter change */ +- SyncQueryValueProcPtr QueryValue; +- SyncBracketValuesProcPtr BracketValues; +-} SysCounterInfo; +- + struct _SyncTrigger; + + typedef Bool +@@ -108,55 +82,6 @@ + typedef void + (*SyncCounterDestroyedProcPtr) (struct _SyncTrigger *pTrigger); + +-typedef struct _SyncTrigger { +- SyncCounter *pCounter; +- CARD64 wait_value; /* wait value */ +- unsigned int value_type; /* Absolute or Relative */ +- unsigned int test_type; /* transition or Comparision type */ +- CARD64 test_value; /* trigger event threshold value */ +- SyncCheckTriggerProcPtr CheckTrigger; +- SyncTriggerFiredProcPtr TriggerFired; +- SyncCounterDestroyedProcPtr CounterDestroyed; +-} SyncTrigger; +- +-typedef struct _SyncTriggerList { +- SyncTrigger *pTrigger; +- struct _SyncTriggerList *next; +-} SyncTriggerList; +- +-typedef struct _SyncAlarmClientList { +- ClientPtr client; +- XID delete_id; +- struct _SyncAlarmClientList *next; +-} SyncAlarmClientList; +- +-typedef struct _SyncAlarm { +- SyncTrigger trigger; +- ClientPtr client; +- XSyncAlarm alarm_id; +- CARD64 delta; +- int events; +- int state; +- SyncAlarmClientList *pEventClients; +-} SyncAlarm; +- +-typedef struct { +- ClientPtr client; +- CARD32 delete_id; +- int num_waitconditions; +-} SyncAwaitHeader; +- +-typedef struct { +- SyncTrigger trigger; +- CARD64 event_threshold; +- SyncAwaitHeader *pHeader; +-} SyncAwait; +- +-typedef union { +- SyncAwaitHeader header; +- SyncAwait await; +-} SyncAwaitUnion; +- + pointer + SyncCreateSystemCounter(char *name, + CARD64 inital_value, diff --git a/packages/xserver/xserver-kdrive_20050207.bb b/packages/xserver/xserver-kdrive_20050207.bb index e0db6be3e7..73d57e93e1 100644 --- a/packages/xserver/xserver-kdrive_20050207.bb +++ b/packages/xserver/xserver-kdrive_20050207.bb @@ -4,6 +4,11 @@ DEFAULT_PREFERENCE = "1" LICENSE = "MIT" DEPENDS = "tslib xproto libxdmcp xextensions-1.0.1 xtrans libxau libx11 libxext libxrandr fixesext damageext libxfont resourceext compositeext xcalibrateext recordext" + +# Uncomment the following DEPENDS line and the commented line in SRC_URI +# to make this snapshot build against X11R7.0 xlibs. +#DEPENDS = "tslib xproto libxdmcp xextproto xtrans libxau libx11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto xcalibrateext recordproto" + PROVIDES = "virtual/xserver" RPROVIDES = "virtual/xserver" PACKAGES = "xserver-kdrive-mach64 xserver-kdrive-fbdev xserver-kdrive-vesa xserver-kdrive-mga xserver-kdrive-via xserver-kdrive-ati xserver-kdrive-fake xserver-kdrive-i810 xserver-kdrive-xephyr xserver-kdrive-epson ${PN}-doc ${PN}-dev ${PN}-locale" @@ -34,6 +39,7 @@ FILES_xserver-kdrive-epson = "${bindir}/Xepson" FILES_xserver-kdrive-xephyr = "${bindir}/Xephyr" SRC_URI = "${FREEDESKTOP_CVS}/xserver;module=xserver;date=${FIXEDSRCDATE} \ +# file://build-20050207-against-X11R7.diff;patch=1 \ file://kmode.patch;patch=1 \ file://disable-apm.patch;patch=1 \ file://fbdev-not-fix.patch;patch=1 " diff --git a/packages/xserver/xserver-kdrive_20060312.bb b/packages/xserver/xserver-kdrive_20060312.bb new file mode 100644 index 0000000000..e5101a3579 --- /dev/null +++ b/packages/xserver/xserver-kdrive_20060312.bb @@ -0,0 +1,52 @@ +PV = "0.0+cvs${FIXEDSRCDATE}" +FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}" +DEFAULT_PREFERENCE = "1" + +LICENSE = "MIT" +DEPENDS = "tslib xproto libxdmcp xextproto xtrans libxau libx11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto xcalibrateext recordproto videoproto scrnsaverproto" +PROVIDES = "virtual/xserver" +RPROVIDES = "virtual/xserver" +PACKAGES = "xserver-kdrive-mach64 xserver-kdrive-fbdev xserver-kdrive-vesa xserver-kdrive-mga xserver-kdrive-via xserver-kdrive-ati xserver-kdrive-fake xserver-kdrive-i810 xserver-kdrive-xephyr xserver-kdrive-epson ${PN}-doc ${PN}-dev ${PN}-locale" +SECTION = "x11/base" +DESCRIPTION = "X server from freedesktop.org" +DESCRIPTION_xserver-kdrive-i810 = "X server from freedesktop.org, supporting i810 devices" +DESCRIPTION_xserver-kdrive-ati = "X server from freedesktop.org, supporting ATI devices" +DESCRIPTION_xserver-kdrive-mga = "X server from freedesktop.org, supporting MGA devices" +DESCRIPTION_xserver-kdrive-vesa = "X server from freedesktop.org, supporting generic VESA devices" +DESCRIPTION_xserver-kdrive-mach64 = "X server from freedesktop.org, supporting Mach64 devices" +DESCRIPTION_xserver-kdrive-via = "X server from freedesktop.org, supporting VIA CLE266 devices" +DESCRIPTION_xserver-kdrive-fbdev = "X server from freedesktop.org, supporting generic framebuffer devices" +DESCRIPTION_xserver-kdrive-epson = "X server from freedesktop.org, supporting Epson S1D13806 devices" +DESCRIPTION_xserver-kdrive-fake = "Fake X server" +DESCRIPTION_xserver-kdrive-xephyr = "X server in an X window" + +PR = "r11" + +FILES_xserver-kdrive-fbdev = "${bindir}/Xfbdev" +FILES_xserver-kdrive-ati = "${bindir}/Xati" +FILES_xserver-kdrive-vesa = "${bindir}/Xvesa" +FILES_xserver-kdrive-via = "${bindir}/Xvia" +FILES_xserver-kdrive-mga = "${bindir}/Xmga" +FILES_xserver-kdrive-mach64 = "${bindir}/Xmach64" +FILES_xserver-kdrive-fake = "${bindir}/Xfake" +FILES_xserver-kdrive-i810 = "${bindir}/Xi810" +FILES_xserver-kdrive-epson = "${bindir}/Xepson" +FILES_xserver-kdrive-xephyr = "${bindir}/Xephyr" + +SRC_URI = "${FREEDESKTOP_CVS}/xserver;module=xserver \ + file://kmode.patch;patch=1 \ + file://disable-apm.patch;patch=1 \ + file://no-serial-probing.patch;patch=1 \ + file://kdrive-evdev.patch;patch=1 \ + file://kdrive-use-evdev.patch;patch=1 \ + file://fbdev-not-fix.patch;patch=1" + +SRC_URI_append_mnci = " file://onlyfb.patch;patch=1" +SRC_URI_append_poodle = " file://xserver-kdrive-poodle.patch;patch=1" +PACKAGE_ARCH_poodle = "poodle" + +S = "${WORKDIR}/xserver" + +inherit autotools pkgconfig + +EXTRA_OECONF = "--enable-composite --disable-xinerama" diff --git a/packages/xserver/xserver-kdrive_cvs.bb b/packages/xserver/xserver-kdrive_cvs.bb index b891bca467..1c841cabf7 100644 --- a/packages/xserver/xserver-kdrive_cvs.bb +++ b/packages/xserver/xserver-kdrive_cvs.bb @@ -2,7 +2,7 @@ PV = "0.0+cvs${SRCDATE}" DEFAULT_PREFERENCE = "-2" LICENSE = "MIT" -DEPENDS = "tslib xproto xdmcp xextensions xtrans libxau libx11 libxext libxrandr fixesext damageext libxfont resourceext compositeext xcalibrateext recordext" +DEPENDS = "tslib xproto libxdmcp xextproto xtrans libxau libx11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto xcalibrateext recordproto videoproto scrnsaverproto" PROVIDES = "virtual/xserver" RPROVIDES = "virtual/xserver" PACKAGES = "xserver-kdrive-mach64 xserver-kdrive-fbdev xserver-kdrive-vesa xserver-kdrive-mga xserver-kdrive-via xserver-kdrive-ati xserver-kdrive-fake xserver-kdrive-i810 xserver-kdrive-xephyr xserver-kdrive-epson ${PN}-doc ${PN}-dev ${PN}-locale" @@ -34,6 +34,7 @@ FILES_xserver-kdrive-xephyr = "${bindir}/Xephyr" SRC_URI = "${FREEDESKTOP_CVS}/xserver;module=xserver \ file://kmode.patch;patch=1 \ + file://disable-apm.patch;patch=1 \ file://no-serial-probing.patch;patch=1 \ file://kdrive-evdev.patch;patch=1 \ file://kdrive-use-evdev.patch;patch=1 \ diff --git a/packages/xset/xset/disable-xkb.patch b/packages/xset/xset/disable-xkb.patch new file mode 100644 index 0000000000..6060fbb995 --- /dev/null +++ b/packages/xset/xset/disable-xkb.patch @@ -0,0 +1,18 @@ +--- xset-1.0.1/configure.ac.orig 2006-03-08 19:46:59.000000000 +0100 ++++ xset-1.0.1/configure.ac 2006-03-08 19:47:40.000000000 +0100 +@@ -42,11 +42,15 @@ + AC_CHECK_HEADERS([X11/extensions/dpms.h X11/extensions/MITMisc.h],,,[#include <X11/Xlib.h>]) + CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"]) + ++AC_ARG_ENABLE(xkb, AC_HELP_STRING([--disable-xkb], [Disable XKB support]), ++ XKB="$enableval", XKB="yes") ++if test "x$XKB" = "xyes" ; then + PKG_CHECK_MODULES(SET_XKB, x11, + [SAVE_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $SET_XKB_CFLAGS $SET_X11_CFLAGS" + AC_CHECK_HEADERS([X11/XKBlib.h],,,[#include <X11/Xlib.h>]) + CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"]) ++fi + + PKG_CHECK_MODULES(SET_XF86MISC, xxf86misc, + [SAVE_CPPFLAGS="$CPPFLAGS" diff --git a/packages/xset/xset_1.0.1.bb b/packages/xset/xset_1.0.1.bb new file mode 100644 index 0000000000..793e6d420b --- /dev/null +++ b/packages/xset/xset_1.0.1.bb @@ -0,0 +1,16 @@ +DESCRIPTION = "user preference utility for X" +LICENSE = "MIT" +MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>" + +DEPENDS = "libx11 libxext xextproto libxmu" + +CFLAGS += "-D_GNU_SOURCE" + +SECTION = "x11/base" + +SRC_URI = "${XORG_MIRROR}/X11R7.0/src/app/${PN}-${PV}.tar.bz2 \ + file://disable-xkb.patch;patch=1" + +EXTRA_OECONF = "--disable-xkb" + +inherit autotools pkgconfig |