From 8364b075ed456c160c1354f8a7c9dccfe48ad57d Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 20 Jan 2010 13:50:56 -0800 Subject: gdb: Add RRECOMMENDS for uclibc-thread-db when using uclibc for system C library. * Fix PR 3273 Signed-off-by: Khem Raj --- recipes/gdb/gdb.inc | 6 ++++-- recipes/gdb/gdbserver.inc | 6 +++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/recipes/gdb/gdb.inc b/recipes/gdb/gdb.inc index 77a9ca6a3e..a63fb6159b 100644 --- a/recipes/gdb/gdb.inc +++ b/recipes/gdb/gdb.inc @@ -10,6 +10,10 @@ FILES_gdbserver = "${bindir}/gdbserver" RRECOMMENDS_gdb_append_linux = " glibc-thread-db " RRECOMMENDS_gdb_append_linux-gnueabi = " glibc-thread-db " +RRECOMMENDS_gdb_append_linux-uclibc = " uclibc-thread-db " +RRECOMMENDS_gdb_append_linux-uclibceabi = " uclibc-thread-db " +RRECOMMENDS_gdb_append_linux-spe = " uclibc-thread-db " + inherit gettext SRC_URI += "file://kill_arm_map_symbols.patch;patch=1 \ @@ -43,5 +47,3 @@ do_install () { install -d ${D}${bindir} install -m 0755 gdb/gdbserver/gdbserver ${D}${bindir} } - - diff --git a/recipes/gdb/gdbserver.inc b/recipes/gdb/gdbserver.inc index b98058fe5d..f477c3aa9c 100644 --- a/recipes/gdb/gdbserver.inc +++ b/recipes/gdb/gdbserver.inc @@ -1,6 +1,6 @@ require gdb-common.inc -INC_PR = "r1" +INC_PR = "r2" DEFAULT_PREFERENCE_avr32 = "-99" @@ -9,6 +9,10 @@ FILES_gdbserver = "${bindir}/gdbserver" RRECOMMENDS_gdb_append_linux = " glibc-thread-db " RRECOMMENDS_gdb_append_linux-gnueabi = " glibc-thread-db " +RRECOMMENDS_gdb_append_linux-uclibc = " uclibc-thread-db " +RRECOMMENDS_gdb_append_linux-uclibceabi = " uclibc-thread-db " +RRECOMMENDS_gdb_append_linux-spe = " uclibc-thread-db " + inherit gettext FILESPATHPKG =. "gdb-${PV}:" -- cgit v1.2.3 From 2f6df5f0713355be81814f65df25143aba5ea4fb Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Wed, 20 Jan 2010 16:14:08 -0700 Subject: rpm-native: kill unnecessary varprefix/localstatedir manipulation Signed-off-by: Chris Larson --- recipes/rpm/rpm-native_4.4.2.3.bb | 3 --- 1 file changed, 3 deletions(-) diff --git a/recipes/rpm/rpm-native_4.4.2.3.bb b/recipes/rpm/rpm-native_4.4.2.3.bb index 62cef86a72..ec98cb8817 100644 --- a/recipes/rpm/rpm-native_4.4.2.3.bb +++ b/recipes/rpm/rpm-native_4.4.2.3.bb @@ -4,6 +4,3 @@ require rpm-${PV}.inc DEPENDS = "beecrypt-native gettext-native zlib-native file-native popt-native python-native" PACKAGES = "" - -export localstatedir = "${layout_localstatedir}" -export varprefix = "${layout_localstatedir}" -- cgit v1.2.3 From 0b76c230a456f09e7d3704955cc22ebf875eea16 Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Wed, 20 Jan 2010 16:19:52 -0700 Subject: konq-e 20060404: don't override the exec_prefix var Signed-off-by: Chris Larson --- recipes/konqueror/konqueror-embedded_20060404.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/konqueror/konqueror-embedded_20060404.bb b/recipes/konqueror/konqueror-embedded_20060404.bb index a84f47d471..9f6ed35aeb 100644 --- a/recipes/konqueror/konqueror-embedded_20060404.bb +++ b/recipes/konqueror/konqueror-embedded_20060404.bb @@ -21,7 +21,7 @@ S = "${WORKDIR}/kdenox" export QMAKE = "${STAGING_BINDIR_NATIVE}/qmake" export MOC = "${STAGING_BINDIR_NATIVE}/moc" export UIC = "${STAGING_BINDIR_NATIVE}/uic" -export exec_prefix = "${palmtopdir}" +#export exec_prefix = "${palmtopdir}" export CXXFLAGS = "-fexceptions -frtti -DKJS_VERBOSE=1 -DQT_THREAD_SUPPORT -DQ_OS_UNIX -DQT_NO_DOM -DENABLE_BOOKMARKS" export PCRE_CONFIG = "invalid" # uncomment this for a static build -- cgit v1.2.3 From d99a0541bf481893373198f74ce67a6017c5f978 Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Thu, 21 Jan 2010 00:08:23 +0000 Subject: checksums.ini : alternative URLs for Thunar and xfce4-dev-tools --- conf/checksums.ini | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/conf/checksums.ini b/conf/checksums.ini index d78264d553..ff278f4555 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -1362,6 +1362,10 @@ sha256=0b654cd39126333a0dab7fdd2fd0c5023f6eb45e72d1d8bf9fb3cab175002bc7 md5=0fc5008858661c0abd0399acbe30ef28 sha256=26c833b0bdf3281c61e03f1fb985feced88cf4a5cebce7bd055f05e025460037 +[http://www.us.xfce.org/archive/xfce-4.6.1/src/Thunar-1.0.1.tar.bz2] +md5=218373aa45d74b6ba8c69c4d5af3bb19 +sha256=7a2b6b493463756bbc9c54144fab2f2163bc84f0896b4c06fd225d11025a210d + [http://www.us.xfce.org/archive/xfce/4.6.1/src/Thunar-1.0.1.tar.bz2] md5=218373aa45d74b6ba8c69c4d5af3bb19 sha256=7a2b6b493463756bbc9c54144fab2f2163bc84f0896b4c06fd225d11025a210d @@ -30498,6 +30502,10 @@ sha256=5eab9a3ba822a1163c07efd917c3425eaf149c01c09df375ac38a0cb7ddf20a4 md5=7d09d161efc7ef86b3b48791d98c8ae8 sha256=1e7a506f08c8a4f368dd18648006ba3934a94eb96fd4545f5303d46aeae9cc3e +[http://www.us.xfce.org/archive/xfce-4.6.0/src/xfce4-dev-tools-4.6.0.tar.bz2] +md5=c9587fa78e877eee858a33391d0afd62 +sha256=4763a891ac7030c109c7ca03b1b0b834859c2aac4f8e359774ee01a6875694ac + [http://www.us.xfce.org/archive/xfce/4.6.0/src/xfce4-dev-tools-4.6.0.tar.bz2] md5=c9587fa78e877eee858a33391d0afd62 sha256=4763a891ac7030c109c7ca03b1b0b834859c2aac4f8e359774ee01a6875694ac -- cgit v1.2.3 From 2154e8eb1a513d0944da59a780f962bacd0bcb8f Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Thu, 21 Jan 2010 00:09:17 +0000 Subject: at-spi_1.28.0.bb : fix compile on systems without host installen gnome devel The configure script was generation paths in /usr/* when looking for orbit-2-idl and bonobo idl files so feed our staging paths in instead. --- recipes/gnome/at-spi_1.28.0.bb | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/recipes/gnome/at-spi_1.28.0.bb b/recipes/gnome/at-spi_1.28.0.bb index 3639407eb6..79b48b3f1b 100644 --- a/recipes/gnome/at-spi_1.28.0.bb +++ b/recipes/gnome/at-spi_1.28.0.bb @@ -6,8 +6,16 @@ LICENSE = "LGPL" DEPENDS = "gtk+ atk libbonobo orbit2 orbit2-native" RDEPENDS_${PN} = "libgail-gnome gtk-module-gail" +PR = "r1" + inherit gnome +do_configure_prepend () { + sed -i "s|ORBIT_IDL=.*|ORBIT_IDL=${STAGING_BINDIR_NATIVE}/orbit-idl-2|" ${S}/configure.in + sed -i "s|BONOBO_ACTIVATION_IDL_DIR=.*|BONOBO_ACTIVATION_IDL_DIR=${STAGING_DATADIR}/idl/bonobo-activation-2.0|" ${S}/configure.in + sed -i "s|LIBBONOBO_IDL_DIR=.*|LIBBONOBO_IDL_DIR=${STAGING_DATADIR}/idl//bonobo-2.0|" ${S}/configure.in +} + do_stage () { autotools_stage_all } -- cgit v1.2.3 From bc8ce0794cb2a7d8fc4c54fe0d3e58c2f504fb70 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Thu, 3 Dec 2009 14:15:34 -0200 Subject: parted: depends on util-linux-ng to provide libuuid Signed-off-by: Otavio Salvador --- recipes/parted/parted_1.8.8.bb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/recipes/parted/parted_1.8.8.bb b/recipes/parted/parted_1.8.8.bb index e93dbc8dfc..4ab4aa62f9 100644 --- a/recipes/parted/parted_1.8.8.bb +++ b/recipes/parted/parted_1.8.8.bb @@ -2,9 +2,8 @@ DESCRIPTION = "parted, the GNU partition resizing program" HOMEPAGE = "http://www.gnu.org/software/parted/parted.html" LICENSE = "GPLv3" SECTION = "console/tools" -DEPENDS = "readline e2fsprogs-libs" - -PR = "r2" +DEPENDS = "readline util-linux-ng" +PR = "r3" SRC_URI = "${GNU_MIRROR}/parted/parted-${PV}.tar.gz \ file://use_llseek_syscall.patch;patch=1 \ -- cgit v1.2.3 From 0f3c7c020d85e9dc479d520789ec1280d833dd24 Mon Sep 17 00:00:00 2001 From: Mario Domenech Goulart Date: Wed, 20 Jan 2010 22:28:08 -0200 Subject: firefox: added sqlite3 as dependency for firefox >= 3.5 Signed-off-by: Mario Domenech Goulart --- recipes/mozilla/firefox_3.5.2.bb | 4 ++-- recipes/mozilla/firefox_3.5.4.bb | 4 ++-- recipes/mozilla/firefox_3.5.5.bb | 4 ++-- recipes/mozilla/firefox_3.5b4.bb | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/recipes/mozilla/firefox_3.5.2.bb b/recipes/mozilla/firefox_3.5.2.bb index f126f13763..3d940d7af5 100644 --- a/recipes/mozilla/firefox_3.5.2.bb +++ b/recipes/mozilla/firefox_3.5.2.bb @@ -1,5 +1,5 @@ -DEPENDS += "cairo" -PR = "r2" +DEPENDS += "cairo sqlite3" +PR = "r3" SRC_URI = "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/firefox-${PV}-source.tar.bz2 \ file://jsautocfg.h \ diff --git a/recipes/mozilla/firefox_3.5.4.bb b/recipes/mozilla/firefox_3.5.4.bb index 37be0fb858..8ba6ba15db 100644 --- a/recipes/mozilla/firefox_3.5.4.bb +++ b/recipes/mozilla/firefox_3.5.4.bb @@ -1,6 +1,6 @@ -DEPENDS += "cairo" +DEPENDS += "cairo sqlite3" -PR = "r1" +PR = "r2" SRC_URI = "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/firefox-${PV}.source.tar.bz2 \ file://jsautocfg.h \ diff --git a/recipes/mozilla/firefox_3.5.5.bb b/recipes/mozilla/firefox_3.5.5.bb index a440382d14..da54872046 100644 --- a/recipes/mozilla/firefox_3.5.5.bb +++ b/recipes/mozilla/firefox_3.5.5.bb @@ -1,6 +1,6 @@ -DEPENDS += "cairo" +DEPENDS += "cairo sqlite3" -PR = "r2" +PR = "r3" SRC_URI = "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/firefox-${PV}.source.tar.bz2 \ file://jsautocfg.h \ diff --git a/recipes/mozilla/firefox_3.5b4.bb b/recipes/mozilla/firefox_3.5b4.bb index 149ee3cbdf..4a12329231 100644 --- a/recipes/mozilla/firefox_3.5b4.bb +++ b/recipes/mozilla/firefox_3.5b4.bb @@ -1,8 +1,8 @@ -DEPENDS += "cairo" +DEPENDS += "cairo sqlite" PV = "3.0.1+3.5b4" MOZPV = "3.5b4" -PR = "r1" +PR = "r2" SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/${MOZPV}-candidates/build1/source/firefox-${MOZPV}-source.tar.bz2 \ file://jsautocfg.h \ -- cgit v1.2.3 From c85f3b395770fb5b78f604eec4af0845e9e57a71 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 20 Jan 2010 12:35:05 +0100 Subject: cairo-native: depend on pixman-native instead libpixman-native Signed-off-by: Martin Jansa --- recipes/cairo/cairo-native_1.8.0.bb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/recipes/cairo/cairo-native_1.8.0.bb b/recipes/cairo/cairo-native_1.8.0.bb index c575cdcce1..d58e16b61d 100644 --- a/recipes/cairo/cairo-native_1.8.0.bb +++ b/recipes/cairo/cairo-native_1.8.0.bb @@ -3,8 +3,7 @@ require cairo_1.8.0.bb inherit native -DEPENDS += "glib-2.0-native libpng-native libpixman-native libx11-native fontconfig-native" +DEPENDS += "glib-2.0-native libpng-native pixman-native libx11-native fontconfig-native" PROVIDES = "cairo-native" -PR = "r0" - +PR = "r1" -- cgit v1.2.3 From 51b1288c488626955c6ad514e3ba1845b2157f3b Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 20 Jan 2010 12:35:46 +0100 Subject: libpixman: move all to obsolete directory (replaced with pixman recipes) Signed-off-by: Martin Jansa --- recipes/libpixman/libpixman-native_0.12.0.bb | 6 ------ recipes/libpixman/libpixman_0.1.5.bb | 12 ------------ recipes/libpixman/libpixman_0.1.6.bb | 12 ------------ recipes/libpixman/libpixman_0.10.0.bb | 13 ------------- recipes/libpixman/libpixman_0.9.6.bb | 13 ------------- recipes/libpixman/libpixman_cvs.bb | 16 ---------------- recipes/obsolete/libpixman/libpixman-native_0.12.0.bb | 6 ++++++ recipes/obsolete/libpixman/libpixman_0.1.5.bb | 12 ++++++++++++ recipes/obsolete/libpixman/libpixman_0.1.6.bb | 12 ++++++++++++ recipes/obsolete/libpixman/libpixman_0.10.0.bb | 13 +++++++++++++ recipes/obsolete/libpixman/libpixman_0.9.6.bb | 13 +++++++++++++ recipes/obsolete/libpixman/libpixman_cvs.bb | 16 ++++++++++++++++ 12 files changed, 72 insertions(+), 72 deletions(-) delete mode 100644 recipes/libpixman/libpixman-native_0.12.0.bb delete mode 100644 recipes/libpixman/libpixman_0.1.5.bb delete mode 100644 recipes/libpixman/libpixman_0.1.6.bb delete mode 100644 recipes/libpixman/libpixman_0.10.0.bb delete mode 100644 recipes/libpixman/libpixman_0.9.6.bb delete mode 100644 recipes/libpixman/libpixman_cvs.bb create mode 100644 recipes/obsolete/libpixman/libpixman-native_0.12.0.bb create mode 100644 recipes/obsolete/libpixman/libpixman_0.1.5.bb create mode 100644 recipes/obsolete/libpixman/libpixman_0.1.6.bb create mode 100644 recipes/obsolete/libpixman/libpixman_0.10.0.bb create mode 100644 recipes/obsolete/libpixman/libpixman_0.9.6.bb create mode 100644 recipes/obsolete/libpixman/libpixman_cvs.bb diff --git a/recipes/libpixman/libpixman-native_0.12.0.bb b/recipes/libpixman/libpixman-native_0.12.0.bb deleted file mode 100644 index 808cc86d1a..0000000000 --- a/recipes/libpixman/libpixman-native_0.12.0.bb +++ /dev/null @@ -1,6 +0,0 @@ -require libpixman_0.10.0.bb - -inherit native - -PROVIDES = "libpixman-native" - diff --git a/recipes/libpixman/libpixman_0.1.5.bb b/recipes/libpixman/libpixman_0.1.5.bb deleted file mode 100644 index bf23947fc1..0000000000 --- a/recipes/libpixman/libpixman_0.1.5.bb +++ /dev/null @@ -1,12 +0,0 @@ -SECTION = "libs" -PRIORITY = "optional" -DEPENDS = "virtual/libx11" -DESCRIPTION = "Cairo support library" -LICENSE = "X11" -SRC_URI = "http://cairographics.org/snapshots/libpixman-${PV}.tar.gz" - -inherit autotools pkgconfig - -do_stage () { - autotools_stage_all -} diff --git a/recipes/libpixman/libpixman_0.1.6.bb b/recipes/libpixman/libpixman_0.1.6.bb deleted file mode 100644 index bf23947fc1..0000000000 --- a/recipes/libpixman/libpixman_0.1.6.bb +++ /dev/null @@ -1,12 +0,0 @@ -SECTION = "libs" -PRIORITY = "optional" -DEPENDS = "virtual/libx11" -DESCRIPTION = "Cairo support library" -LICENSE = "X11" -SRC_URI = "http://cairographics.org/snapshots/libpixman-${PV}.tar.gz" - -inherit autotools pkgconfig - -do_stage () { - autotools_stage_all -} diff --git a/recipes/libpixman/libpixman_0.10.0.bb b/recipes/libpixman/libpixman_0.10.0.bb deleted file mode 100644 index fba7dc9152..0000000000 --- a/recipes/libpixman/libpixman_0.10.0.bb +++ /dev/null @@ -1,13 +0,0 @@ -SECTION = "libs" -PRIORITY = "optional" -DESCRIPTION = "Low-level pixel manipulation library." -LICENSE = "X11" -SRC_URI = "http://cairographics.org/releases/pixman-${PV}.tar.gz" -S = "${WORKDIR}/pixman-${PV}" - -inherit autotools pkgconfig - -do_stage () { - autotools_stage_all -} - diff --git a/recipes/libpixman/libpixman_0.9.6.bb b/recipes/libpixman/libpixman_0.9.6.bb deleted file mode 100644 index fba7dc9152..0000000000 --- a/recipes/libpixman/libpixman_0.9.6.bb +++ /dev/null @@ -1,13 +0,0 @@ -SECTION = "libs" -PRIORITY = "optional" -DESCRIPTION = "Low-level pixel manipulation library." -LICENSE = "X11" -SRC_URI = "http://cairographics.org/releases/pixman-${PV}.tar.gz" -S = "${WORKDIR}/pixman-${PV}" - -inherit autotools pkgconfig - -do_stage () { - autotools_stage_all -} - diff --git a/recipes/libpixman/libpixman_cvs.bb b/recipes/libpixman/libpixman_cvs.bb deleted file mode 100644 index a75a284bca..0000000000 --- a/recipes/libpixman/libpixman_cvs.bb +++ /dev/null @@ -1,16 +0,0 @@ -PV = "0.0+cvs${SRCDATE}" -SECTION = "libs" -PRIORITY = "optional" -DEPENDS = "virtual/libx11" -DESCRIPTION = "Cairo support library" -LICENSE = "X11" -SRC_URI = "cvs://anoncvs:anoncvs@cvs.cairographics.org/cvs/cairo;module=libpixman" -S = "${WORKDIR}/libpixman" - -DEFAULT_PREFERENCE = "-1" - -inherit autotools pkgconfig - -do_stage () { - autotools_stage_all -} diff --git a/recipes/obsolete/libpixman/libpixman-native_0.12.0.bb b/recipes/obsolete/libpixman/libpixman-native_0.12.0.bb new file mode 100644 index 0000000000..808cc86d1a --- /dev/null +++ b/recipes/obsolete/libpixman/libpixman-native_0.12.0.bb @@ -0,0 +1,6 @@ +require libpixman_0.10.0.bb + +inherit native + +PROVIDES = "libpixman-native" + diff --git a/recipes/obsolete/libpixman/libpixman_0.1.5.bb b/recipes/obsolete/libpixman/libpixman_0.1.5.bb new file mode 100644 index 0000000000..bf23947fc1 --- /dev/null +++ b/recipes/obsolete/libpixman/libpixman_0.1.5.bb @@ -0,0 +1,12 @@ +SECTION = "libs" +PRIORITY = "optional" +DEPENDS = "virtual/libx11" +DESCRIPTION = "Cairo support library" +LICENSE = "X11" +SRC_URI = "http://cairographics.org/snapshots/libpixman-${PV}.tar.gz" + +inherit autotools pkgconfig + +do_stage () { + autotools_stage_all +} diff --git a/recipes/obsolete/libpixman/libpixman_0.1.6.bb b/recipes/obsolete/libpixman/libpixman_0.1.6.bb new file mode 100644 index 0000000000..bf23947fc1 --- /dev/null +++ b/recipes/obsolete/libpixman/libpixman_0.1.6.bb @@ -0,0 +1,12 @@ +SECTION = "libs" +PRIORITY = "optional" +DEPENDS = "virtual/libx11" +DESCRIPTION = "Cairo support library" +LICENSE = "X11" +SRC_URI = "http://cairographics.org/snapshots/libpixman-${PV}.tar.gz" + +inherit autotools pkgconfig + +do_stage () { + autotools_stage_all +} diff --git a/recipes/obsolete/libpixman/libpixman_0.10.0.bb b/recipes/obsolete/libpixman/libpixman_0.10.0.bb new file mode 100644 index 0000000000..fba7dc9152 --- /dev/null +++ b/recipes/obsolete/libpixman/libpixman_0.10.0.bb @@ -0,0 +1,13 @@ +SECTION = "libs" +PRIORITY = "optional" +DESCRIPTION = "Low-level pixel manipulation library." +LICENSE = "X11" +SRC_URI = "http://cairographics.org/releases/pixman-${PV}.tar.gz" +S = "${WORKDIR}/pixman-${PV}" + +inherit autotools pkgconfig + +do_stage () { + autotools_stage_all +} + diff --git a/recipes/obsolete/libpixman/libpixman_0.9.6.bb b/recipes/obsolete/libpixman/libpixman_0.9.6.bb new file mode 100644 index 0000000000..fba7dc9152 --- /dev/null +++ b/recipes/obsolete/libpixman/libpixman_0.9.6.bb @@ -0,0 +1,13 @@ +SECTION = "libs" +PRIORITY = "optional" +DESCRIPTION = "Low-level pixel manipulation library." +LICENSE = "X11" +SRC_URI = "http://cairographics.org/releases/pixman-${PV}.tar.gz" +S = "${WORKDIR}/pixman-${PV}" + +inherit autotools pkgconfig + +do_stage () { + autotools_stage_all +} + diff --git a/recipes/obsolete/libpixman/libpixman_cvs.bb b/recipes/obsolete/libpixman/libpixman_cvs.bb new file mode 100644 index 0000000000..a75a284bca --- /dev/null +++ b/recipes/obsolete/libpixman/libpixman_cvs.bb @@ -0,0 +1,16 @@ +PV = "0.0+cvs${SRCDATE}" +SECTION = "libs" +PRIORITY = "optional" +DEPENDS = "virtual/libx11" +DESCRIPTION = "Cairo support library" +LICENSE = "X11" +SRC_URI = "cvs://anoncvs:anoncvs@cvs.cairographics.org/cvs/cairo;module=libpixman" +S = "${WORKDIR}/libpixman" + +DEFAULT_PREFERENCE = "-1" + +inherit autotools pkgconfig + +do_stage () { + autotools_stage_all +} -- cgit v1.2.3 From e725b1c5300ad08d4495df716ad8274bc903d475 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 20 Jan 2010 12:37:38 +0100 Subject: pixman_0.16.2: drop DEFAULT_PREFERENCE = -1 and add BBCLASSEXTEND=native (pixman-native used in cairo-native) Signed-off-by: Martin Jansa --- recipes/xorg-lib/pixman_0.16.2.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/recipes/xorg-lib/pixman_0.16.2.bb b/recipes/xorg-lib/pixman_0.16.2.bb index 2517f8f354..1a15ac4a96 100644 --- a/recipes/xorg-lib/pixman_0.16.2.bb +++ b/recipes/xorg-lib/pixman_0.16.2.bb @@ -3,7 +3,9 @@ PRIORITY = "optional" DESCRIPTION = "Low-level pixel manipulation library." LICENSE = "X11" -DEFAULT_PREFERENCE = "-1" +PR = "r1" + +BBCLASSEXTEND="native" SRC_URI = "http://cairographics.org/releases/pixman-${PV}.tar.gz \ " -- cgit v1.2.3 From 77471137035131175f16164084882696b5ac48f7 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 20 Jan 2010 12:38:35 +0100 Subject: pixman_git: add BBCLASSEXTEND=native (pixman-native used in cairo-native) Signed-off-by: Martin Jansa --- recipes/xorg-lib/pixman_git.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/recipes/xorg-lib/pixman_git.bb b/recipes/xorg-lib/pixman_git.bb index 1b5ca6388f..0c3008de99 100644 --- a/recipes/xorg-lib/pixman_git.bb +++ b/recipes/xorg-lib/pixman_git.bb @@ -4,9 +4,11 @@ DESCRIPTION = "Low-level pixel manipulation library." LICENSE = "X11" PV = "0.17.3" -PR = "r4" +PR = "r5" PR_append = "+gitr${SRCREV}" +BBCLASSEXTEND="native" + SRCREV = "c97b1e803fc214e9880eaeff98410c8fa37f9ddc" DEFAULT_PREFERENCE = "-1" -- cgit v1.2.3 From 5a390f90eca8514aa7106e62acd79c18c4d10138 Mon Sep 17 00:00:00 2001 From: Michael Pilgermann Date: Wed, 13 Jan 2010 20:02:09 +0000 Subject: rtmom: elementary based gui for RTM (Remember the milk) Signed-off-by: Martin Jansa --- conf/checksums.ini | 4 ++++ recipes/openmoko-3rdparty/rtmom_0.1.3.bb | 31 +++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+) create mode 100644 recipes/openmoko-3rdparty/rtmom_0.1.3.bb diff --git a/conf/checksums.ini b/conf/checksums.ini index 8a43421943..d1098b169f 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -24262,6 +24262,10 @@ sha256=91619748c4dba733c60eb8a40805c972f407b2463dc6de856ac40336d66bc16c md5=5b60500bc9605d2409b71124e48aa929 sha256=59cc003bab753335b3ce14a908e663ea782514b3531dc7030379ff753ef1a78c +[http://cloud.github.com/downloads/kichkasch/rtmom/rtmom-src-0.1.3.tar.gz] +md5=c4a1012fc0e00d2b64d8d794166bf893 +sha256=9227e503a90054dd643364272d48b3eae8dae3a9c6c4a42a2859395a8786398f + [http://libtorrent.rakshasa.no/downloads/rtorrent-0.8.0.tar.gz] md5=6216be7ce5e3ead9dc115eaeea863694 sha256=597cefac4535d7f3b752253e5997b3c851c261b26b966a39beb032dcf1d5baa7 diff --git a/recipes/openmoko-3rdparty/rtmom_0.1.3.bb b/recipes/openmoko-3rdparty/rtmom_0.1.3.bb new file mode 100644 index 0000000000..10ab501916 --- /dev/null +++ b/recipes/openmoko-3rdparty/rtmom_0.1.3.bb @@ -0,0 +1,31 @@ +DESCRIPTION = "Elementary based client for Remember the Milk written in Python. " +AUTHOR = "Michael Pilgermann" +PRIORITY = "optional" +LICENSE = "GPL" +HOMEPAGE = "http://freshmeat.net/projects/rtmom" +SRCNAME = "rtmom" +DEPENDS = "python python-elementary" +RDEPENDS = "python-core pyrtm" +RSUGGESTS_${PN} = "python-simplejson" + +PACKAGE_ARCH = "all" + +PR = "r0" + +SRC_URI = "http://cloud.github.com/downloads/kichkasch/rtmom/rtmom-src-${PV}.tar.gz" + +FILES_${PN} += "/opt/rtmom \ + ${datadir}/pixmaps \ + ${datadir}/applications \ + ${datadir}/doc/rtmom" +CONFFILES_${PN} += "/usr/share/doc/${PN}/rtmom.conf.example" + +do_compile() { + ${STAGING_BINDIR_NATIVE}/python ${S}/setup.py build ${D} +} + +do_install() { + ${STAGING_BINDIR_NATIVE}/python ${S}/setup.py install ${D} + rm -rf ${D}/opt/rtmom/build/ + rm -rf ${D}/opt/rtmom/patches/ +} -- cgit v1.2.3 From 86dacb28c2b274691b24483a22a2b1d05102f006 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Mon, 18 Jan 2010 14:13:36 +0100 Subject: xorg: update recipes to latest releases 2010-01-18 Signed-off-by: Martin Jansa --- .../include/preferred-xorg-versions-live.inc | 29 +++++++++---------- recipes/dri/libdrm_2.4.17.bb | 16 +++++++++++ recipes/xorg-app/xvidtune_1.0.2.bb | 6 ++++ recipes/xorg-driver/xf86-video-intel_2.10.0.bb | 5 ++++ recipes/xorg-driver/xf86-video-vesa_2.3.0.bb | 2 ++ recipes/xorg-driver/xf86-video-vmware_10.16.9.bb | 6 ++++ .../libx11-1.3.3/x11_disable_makekeys.patch | 23 +++++++++++++++ recipes/xorg-lib/libx11-native_1.3.3.bb | 10 +++++++ recipes/xorg-lib/libx11_1.3.3.bb | 33 ++++++++++++++++++++++ recipes/xorg-proto/dri2proto_2.2.bb | 3 ++ recipes/xorg-proto/glproto_1.4.11.bb | 4 +++ recipes/xorg-util/util-macros-native_1.5.0.bb | 7 +++++ recipes/xorg-util/util-macros_1.5.0.bb | 6 ++++ ...ack-assume-pixman-supports-overlapped-blt.patch | 14 +++++++++ recipes/xorg-xserver/xserver-xorg_1.7.4.bb | 26 +++++++++++++++++ 15 files changed, 174 insertions(+), 16 deletions(-) create mode 100644 recipes/dri/libdrm_2.4.17.bb create mode 100644 recipes/xorg-app/xvidtune_1.0.2.bb create mode 100644 recipes/xorg-driver/xf86-video-intel_2.10.0.bb create mode 100644 recipes/xorg-driver/xf86-video-vesa_2.3.0.bb create mode 100644 recipes/xorg-driver/xf86-video-vmware_10.16.9.bb create mode 100644 recipes/xorg-lib/libx11-1.3.3/x11_disable_makekeys.patch create mode 100644 recipes/xorg-lib/libx11-native_1.3.3.bb create mode 100644 recipes/xorg-lib/libx11_1.3.3.bb create mode 100644 recipes/xorg-proto/dri2proto_2.2.bb create mode 100644 recipes/xorg-proto/glproto_1.4.11.bb create mode 100644 recipes/xorg-util/util-macros-native_1.5.0.bb create mode 100644 recipes/xorg-util/util-macros_1.5.0.bb create mode 100644 recipes/xorg-xserver/xserver-xorg-1.7.4/hack-assume-pixman-supports-overlapped-blt.patch create mode 100644 recipes/xorg-xserver/xserver-xorg_1.7.4.bb diff --git a/conf/distro/include/preferred-xorg-versions-live.inc b/conf/distro/include/preferred-xorg-versions-live.inc index bea2b4105c..65e94fac5c 100644 --- a/conf/distro/include/preferred-xorg-versions-live.inc +++ b/conf/distro/include/preferred-xorg-versions-live.inc @@ -1,4 +1,4 @@ -#Thu Dec 31 14:54:51 CET 2009 +#Mon Jan 18 14:00:56 CET 2010 #app PREFERRED_VERSION_appres ?= "1.0.2" PREFERRED_VERSION_bdftopcf ?= "1.0.2" @@ -98,7 +98,7 @@ PREFERRED_VERSION_xsetroot ?= "1.0.3" PREFERRED_VERSION_xsm ?= "1.0.1" PREFERRED_VERSION_xstdcmap ?= "1.0.1" PREFERRED_VERSION_xtrap ?= "1.0.2" -PREFERRED_VERSION_xvidtune ?= "1.0.1" +PREFERRED_VERSION_xvidtune ?= "1.0.2" PREFERRED_VERSION_xvinfo ?= "1.1.0" PREFERRED_VERSION_xwd ?= "1.0.3" PREFERRED_VERSION_xwininfo ?= "1.0.5" @@ -156,8 +156,7 @@ PREFERRED_VERSION_xf86-video-i740 ?= "1.3.2" PREFERRED_VERSION_xf86-video-i810 ?= "1.7.4" PREFERRED_VERSION_xf86-video-impact ?= "0.2.0" PREFERRED_VERSION_xf86-video-imstt ?= "1.1.0" -#PREFERRED_VERSION_xf86-video-intel ?= "2.9.99.902" -PREFERRED_VERSION_xf86-video-intel ?= "2.9.1" +PREFERRED_VERSION_xf86-video-intel ?= "2.10.0" PREFERRED_VERSION_xf86-video-mach64 ?= "6.8.2" PREFERRED_VERSION_xf86-video-mga ?= "1.9.100" PREFERRED_VERSION_xf86-video-neomagic ?= "1.2.4" @@ -187,11 +186,10 @@ PREFERRED_VERSION_xf86-video-trident ?= "1.3.3" PREFERRED_VERSION_xf86-video-tseng ?= "1.2.3" PREFERRED_VERSION_xf86-video-v4l ?= "0.2.0" PREFERRED_VERSION_xf86-video-vermilion ?= "1.0.1" -PREFERRED_VERSION_xf86-video-vesa ?= "2.2.1" +PREFERRED_VERSION_xf86-video-vesa ?= "2.3.0" PREFERRED_VERSION_xf86-video-vga ?= "4.1.0" PREFERRED_VERSION_xf86-video-via ?= "0.2.2" -#PREFERRED_VERSION_xf86-video-vmware ?= "10.16.9" -PREFERRED_VERSION_xf86-video-vmware ?= "10.16.8" +PREFERRED_VERSION_xf86-video-vmware ?= "10.16.9" PREFERRED_VERSION_xf86-video-voodoo ?= "1.2.3" PREFERRED_VERSION_xf86-video-wsfb ?= "0.3.0" PREFERRED_VERSION_xf86-video-xgi ?= "1.5.1" @@ -244,8 +242,8 @@ PREFERRED_VERSION_libice-native ?= "1.0.6" PREFERRED_VERSION_libsm ?= "1.1.1" PREFERRED_VERSION_libsm-native ?= "1.1.1" PREFERRED_VERSION_libwindowswm ?= "1.0.1" -PREFERRED_VERSION_libx11 ?= "1.3.2" -PREFERRED_VERSION_libx11-native ?= "1.3.2" +PREFERRED_VERSION_libx11 ?= "1.3.3" +PREFERRED_VERSION_libx11-native ?= "1.3.3" PREFERRED_VERSION_libxscrnsaver ?= "1.2.0" PREFERRED_VERSION_libxtrap ?= "1.0.0" PREFERRED_VERSION_libxau ?= "1.0.5" @@ -294,8 +292,7 @@ PREFERRED_VERSION_libpciaccess ?= "0.11.0" PREFERRED_VERSION_libxkbfile ?= "1.0.6" PREFERRED_VERSION_libxkbfile-native ?= "1.0.6" PREFERRED_VERSION_libxkbui ?= "1.0.2" -#PREFERRED_VERSION_pixman ?= "0.17.2" -PREFERRED_VERSION_pixman ?= "0.16.2" +PREFERRED_VERSION_pixman ?= "0.17.4" PREFERRED_VERSION_xtrans ?= "1.2.5" PREFERRED_VERSION_xtrans-native ?= "1.2.5" #proto @@ -305,7 +302,7 @@ PREFERRED_VERSION_bigreqsproto-native ?= "1.1.0" PREFERRED_VERSION_compositeproto ?= "0.4.1" PREFERRED_VERSION_damageproto ?= "1.2.0" PREFERRED_VERSION_dmxproto ?= "2.3" -PREFERRED_VERSION_dri2proto ?= "2.1" +PREFERRED_VERSION_dri2proto ?= "2.2" PREFERRED_VERSION_evieext ?= "1.1.0" PREFERRED_VERSION_fixesproto ?= "4.1.1" PREFERRED_VERSION_fixesproto-native ?= "4.1.1" @@ -313,7 +310,7 @@ PREFERRED_VERSION_fontcacheproto ?= "0.1.3" PREFERRED_VERSION_fontcacheproto-native ?= "0.1.3" PREFERRED_VERSION_fontsproto ?= "2.1.0" PREFERRED_VERSION_fontsproto-native ?= "2.1.0" -PREFERRED_VERSION_glproto ?= "1.4.10" +PREFERRED_VERSION_glproto ?= "1.4.11" PREFERRED_VERSION_inputproto ?= "2.0" PREFERRED_VERSION_inputproto-native ?= "2.0" PREFERRED_VERSION_kbproto ?= "1.0.4" @@ -349,9 +346,9 @@ PREFERRED_VERSION_imake ?= "1.0.2" PREFERRED_VERSION_lndir ?= "1.0.1" PREFERRED_VERSION_makedepend ?= "1.0.2" PREFERRED_VERSION_makedepend-native ?= "1.0.2" -PREFERRED_VERSION_util-macros ?= "1.4.1" -PREFERRED_VERSION_util-macros-native ?= "1.4.1" +PREFERRED_VERSION_util-macros ?= "1.5.0" +PREFERRED_VERSION_util-macros-native ?= "1.5.0" PREFERRED_VERSION_xorg-cf-files ?= "1.0.3" #xserver #PREFERRED_VERSION_xserver-xorg ?= "1.7.99.2" -PREFERRED_VERSION_xserver-xorg ?= "1.7.3" +PREFERRED_VERSION_xserver-xorg ?= "1.7.4" diff --git a/recipes/dri/libdrm_2.4.17.bb b/recipes/dri/libdrm_2.4.17.bb new file mode 100644 index 0000000000..4f2af1ed73 --- /dev/null +++ b/recipes/dri/libdrm_2.4.17.bb @@ -0,0 +1,16 @@ +SECTION = "x11/base" +DEPENDS = "libpthread-stubs" +LICENSE = "MIT" +SRC_URI = "http://dri.freedesktop.org/libdrm/libdrm-${PV}.tar.bz2" +PROVIDES = "drm" +PR = "r1" + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} + +PACKAGES =+ "${PN}-intel" + +FILES_${PN}-intel = "${libdir}/libdrm_intel.so.*" diff --git a/recipes/xorg-app/xvidtune_1.0.2.bb b/recipes/xorg-app/xvidtune_1.0.2.bb new file mode 100644 index 0000000000..bfab14a67a --- /dev/null +++ b/recipes/xorg-app/xvidtune_1.0.2.bb @@ -0,0 +1,6 @@ +require xorg-app-common.inc +PE = "1" + +DEPENDS += " libxaw libxxf86vm libxt" + +FILES_${PN} += " ${datadir}/X11/app-defaults/Xvidtune " diff --git a/recipes/xorg-driver/xf86-video-intel_2.10.0.bb b/recipes/xorg-driver/xf86-video-intel_2.10.0.bb new file mode 100644 index 0000000000..eed1fcb600 --- /dev/null +++ b/recipes/xorg-driver/xf86-video-intel_2.10.0.bb @@ -0,0 +1,5 @@ +require xorg-driver-video.inc + +DESCRIPTION = "X.Org X server -- Intel i8xx, i9xx display driver" +DEPENDS += " virtual/libx11 libxvmc drm xf86driproto" +PE = "1" diff --git a/recipes/xorg-driver/xf86-video-vesa_2.3.0.bb b/recipes/xorg-driver/xf86-video-vesa_2.3.0.bb new file mode 100644 index 0000000000..c2b6b7608a --- /dev/null +++ b/recipes/xorg-driver/xf86-video-vesa_2.3.0.bb @@ -0,0 +1,2 @@ +require xorg-driver-video.inc +PE = "1" diff --git a/recipes/xorg-driver/xf86-video-vmware_10.16.9.bb b/recipes/xorg-driver/xf86-video-vmware_10.16.9.bb new file mode 100644 index 0000000000..994b8b6a3c --- /dev/null +++ b/recipes/xorg-driver/xf86-video-vmware_10.16.9.bb @@ -0,0 +1,6 @@ +require xorg-driver-video.inc +PE = "1" + +#DESCRIPTION = "" + +DEPENDS += " xineramaproto xf86miscproto drm xf86driproto" diff --git a/recipes/xorg-lib/libx11-1.3.3/x11_disable_makekeys.patch b/recipes/xorg-lib/libx11-1.3.3/x11_disable_makekeys.patch new file mode 100644 index 0000000000..5d0a24ca2d --- /dev/null +++ b/recipes/xorg-lib/libx11-1.3.3/x11_disable_makekeys.patch @@ -0,0 +1,23 @@ +diff -uNr libX11-1.3.3.orig/src/util/Makefile.am libX11-1.3.3/src/util/Makefile.am +--- libX11-1.3.3.orig/src/util/Makefile.am 2010-01-15 02:11:36.000000000 +0100 ++++ libX11-1.3.3/src/util/Makefile.am 2010-01-18 14:48:27.000000000 +0100 +@@ -1,19 +1 @@ +- +-noinst_PROGRAMS=makekeys +- +-makekeys_CFLAGS=$(X11_CFLAGS) +- +-CC = @CC_FOR_BUILD@ +- + EXTRA_DIST = mkks.sh +- +-if LINT +-# Check source code with tools like lint & sparse +- +-ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ +- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) +- +-lint: +- $(LINT) $(ALL_LINT_FLAGS) makekeys.c +- +-endif LINT diff --git a/recipes/xorg-lib/libx11-native_1.3.3.bb b/recipes/xorg-lib/libx11-native_1.3.3.bb new file mode 100644 index 0000000000..98fe79f5c3 --- /dev/null +++ b/recipes/xorg-lib/libx11-native_1.3.3.bb @@ -0,0 +1,10 @@ +require libx11_${PV}.bb + +SRC_URI += "file://dolt-fix.patch;patch=1" + +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11" + +DEPENDS = "xproto-native xextproto-native libxau-native xtrans-native libxdmcp-native xcmiscproto-native xf86bigfontproto-native kbproto-native inputproto-native bigreqsproto-native util-macros-native" +PROVIDES = "" + +inherit native diff --git a/recipes/xorg-lib/libx11_1.3.3.bb b/recipes/xorg-lib/libx11_1.3.3.bb new file mode 100644 index 0000000000..8858a09721 --- /dev/null +++ b/recipes/xorg-lib/libx11_1.3.3.bb @@ -0,0 +1,33 @@ +require xorg-lib-common.inc + +DESCRIPTION = "Base X libs." +DEPENDS += "bigreqsproto xproto xextproto xtrans libxau xcmiscproto \ + libxdmcp xf86bigfontproto kbproto inputproto xproto-native" +PROVIDES = "virtual/libx11" +PE = "1" +PR = "r3" + +XORG_PN = "libX11" + +SRC_URI += "file://x11_disable_makekeys.patch;patch=1 \ +# file://dolt-fix.patch;patch=1 \ +# file://keysymdef_include.patch;patch=1 \ +" + +EXTRA_OECONF += "--without-xcb --with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h" + +do_compile() { + ( + unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS + cd src/util; + mv makekeys.c.orig makekeys.c || true + touch makekeys-makekeys.o ; ${BUILD_CC} ${BUILD_CFLAGS} -I${STAGING_INCDIR_NATIVE} makekeys.c -o makekeys + # mv to stop it getting rebuilt + mv makekeys.c makekeys.c.orig + cd ../../ + ) || exit 1 + oe_runmake +} + +FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${libdir}/X11/Xcms.txt" +FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale" diff --git a/recipes/xorg-proto/dri2proto_2.2.bb b/recipes/xorg-proto/dri2proto_2.2.bb new file mode 100644 index 0000000000..a0e1fd3989 --- /dev/null +++ b/recipes/xorg-proto/dri2proto_2.2.bb @@ -0,0 +1,3 @@ +DESCRIPTION = "DRI2 extension headers" + +require xorg-proto-common.inc diff --git a/recipes/xorg-proto/glproto_1.4.11.bb b/recipes/xorg-proto/glproto_1.4.11.bb new file mode 100644 index 0000000000..9f09fff7b7 --- /dev/null +++ b/recipes/xorg-proto/glproto_1.4.11.bb @@ -0,0 +1,4 @@ +require xorg-proto-common.inc + +PR = "r1" +PE = "1" diff --git a/recipes/xorg-util/util-macros-native_1.5.0.bb b/recipes/xorg-util/util-macros-native_1.5.0.bb new file mode 100644 index 0000000000..618e78f116 --- /dev/null +++ b/recipes/xorg-util/util-macros-native_1.5.0.bb @@ -0,0 +1,7 @@ +require util-macros_${PV}.bb + +inherit native + +XORG_PN = "util-macros" + +S = "${WORKDIR}/util-macros-${PV}" diff --git a/recipes/xorg-util/util-macros_1.5.0.bb b/recipes/xorg-util/util-macros_1.5.0.bb new file mode 100644 index 0000000000..4775fc6901 --- /dev/null +++ b/recipes/xorg-util/util-macros_1.5.0.bb @@ -0,0 +1,6 @@ +require xorg-util-common.inc + +DESCRIPTION = "X autotools macros" +PE = "1" + +ALLOW_EMPTY = "1" diff --git a/recipes/xorg-xserver/xserver-xorg-1.7.4/hack-assume-pixman-supports-overlapped-blt.patch b/recipes/xorg-xserver/xserver-xorg-1.7.4/hack-assume-pixman-supports-overlapped-blt.patch new file mode 100644 index 0000000000..a947582f15 --- /dev/null +++ b/recipes/xorg-xserver/xserver-xorg-1.7.4/hack-assume-pixman-supports-overlapped-blt.patch @@ -0,0 +1,14 @@ +diff --git a/fb/fbcopy.c b/fb/fbcopy.c +index 07eb663..ba394b7 100644 +--- a/fb/fbcopy.c ++++ b/fb/fbcopy.c +@@ -91,8 +91,7 @@ fbCopyNtoN (DrawablePtr pSrcDrawable, + while (nbox--) + { + #ifndef FB_ACCESS_WRAPPER /* pixman_blt() doesn't support accessors yet */ +- if (pm == FB_ALLONES && alu == GXcopy && !reverse && +- !upsidedown) ++ if (pm == FB_ALLONES && alu == GXcopy) + { + if (!pixman_blt ((uint32_t *)src, (uint32_t *)dst, srcStride, dstStride, srcBpp, dstBpp, + (pbox->x1 + dx + srcXoff), diff --git a/recipes/xorg-xserver/xserver-xorg_1.7.4.bb b/recipes/xorg-xserver/xserver-xorg_1.7.4.bb new file mode 100644 index 0000000000..bd2e6f82a8 --- /dev/null +++ b/recipes/xorg-xserver/xserver-xorg_1.7.4.bb @@ -0,0 +1,26 @@ +require xorg-xserver-common.inc + +DESCRIPTION = "the X.Org X server" +DEPENDS += "pixman libpciaccess openssl dri2proto glproto xorg-minimal-fonts" +PE = "2" + +SRC_URI += "file://sysroot_fix.patch;patch=1 \ + file://dolt-fix-1.7.0.patch;patch=1 \ + file://randr-support-1.7.0.patch;patch=1 \ + file://hack-fbdev-ignore-return-mode.patch;patch=1 \ + " + +SRC_URI_append_angstrom = " file://hack-assume-pixman-supports-overlapped-blt.patch;patch=1" +SRC_URI_append_shr = " file://hack-assume-pixman-supports-overlapped-blt.patch;patch=1" + +do_install_prepend() { + mkdir -p ${D}/${libdir}/X11/fonts +} + +# The NVidia driver requires Xinerama support in the X server. Ion uses it. +XINERAMA = "${@['--disable-xinerama','--enable-xinerama'][bb.data.getVar('MACHINE',d) in ['ion']]}" + +EXTRA_OECONF += " --enable-config-hal ${XINERAMA} --disable-kdrive --disable-xephyr --disable-xsdl --disable-xfake --disable-xfbdev --disable-dmx" +EXTRA_OECONF += " --disable-glx-tls --enable-dri2 --disable-unit-tests " + +export LDFLAGS += " -ldl " -- cgit v1.2.3 From 52391e0ef85604fbdc5fffd691d8fba3b635da3b Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 21 Jan 2010 07:49:36 +0100 Subject: task-shr-feed: add stopwatch and rtmom Signed-off-by: Martin Jansa --- recipes/tasks/task-shr-feed.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipes/tasks/task-shr-feed.bb b/recipes/tasks/task-shr-feed.bb index aedeb3bb1b..7b5d1a2067 100644 --- a/recipes/tasks/task-shr-feed.bb +++ b/recipes/tasks/task-shr-feed.bb @@ -266,4 +266,6 @@ RDEPENDS_${PN} += "\ qi-ubi \ wpa-gui \ gabriel \ + stopwatch \ + rtmom \ " -- cgit v1.2.3 From e0f660d44b8b8914b45f9988c25bf65b2a687d6c Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 21 Jan 2010 10:54:44 +0100 Subject: mokomaze: bump PR after libsdl-ttf update --- recipes/mokomaze/mokomaze_0.5.5.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/mokomaze/mokomaze_0.5.5.bb b/recipes/mokomaze/mokomaze_0.5.5.bb index 6fbe415d2e..f15ca0ff53 100644 --- a/recipes/mokomaze/mokomaze_0.5.5.bb +++ b/recipes/mokomaze/mokomaze_0.5.5.bb @@ -8,7 +8,7 @@ RDEPENDS="ttf-liberation-mono libpng" RDEPENDS_shr += "fsoraw" -PR="r1" +PR="r2" PV="0.5.5+git8" -- cgit v1.2.3 From 3d1fd2e7f1cce283e536b350880418d18a9fe2b4 Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Thu, 21 Jan 2010 10:06:47 +0000 Subject: libgdata_0.5.1.bb : add newer libgdata The only 0.4.0 version wasnt buildable for me. --- conf/checksums.ini | 4 ++++ recipes/gnome/libgdata_0.5.1.bb | 18 ++++++++++++++++++ 2 files changed, 22 insertions(+) create mode 100644 recipes/gnome/libgdata_0.5.1.bb diff --git a/conf/checksums.ini b/conf/checksums.ini index d1098b169f..ea05753c73 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -15222,6 +15222,10 @@ sha256=7562042a6210947363bd6a9bbcdd03f8d02470c0347970b507f689d25a907844 md5=06b14f1cd96432b0717ed03fe013ca4d sha256=55c616b0761faaa9fb028434de97b02d5145dfc52b1db632671ebc6cc6905575 +[http://ftp.gnome.org/pub/GNOME/sources/libgdata/0.5/libgdata-0.5.1.tar.bz2] +md5=fc9be11d2f823bb16d6e03e2a0dda85d +sha256=2b90f206063405ae6cf579ed3a090b0130e849e1ead02b2ad2ed4fc6d7f585a0 + [http://geda.seul.org/release/v1.4/1.4.1/libgeda-1.4.1.tar.gz] md5=16f2e3176eb489838bad57c8728c7388 sha256=c0598428fc25e79b7ac1da35d44133e3fc50763b32fcdfffd5e6654f2f94682d diff --git a/recipes/gnome/libgdata_0.5.1.bb b/recipes/gnome/libgdata_0.5.1.bb new file mode 100644 index 0000000000..7c510d0b5f --- /dev/null +++ b/recipes/gnome/libgdata_0.5.1.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "libgdata is a GLib-based library for accessing online service APIs" +LICENSE = "LGPL" +DEPENDS = "libxml2 glib-2.0 libsoup-2.4" + +inherit gnome lib_package autotools_stage + +SRC_URI += " \ + file://gtk-doc.make \ +" + +do_configure_prepend() { + cp ${WORKDIR}/gtk-doc.make ${S}/ + sed -i -e s:docs::g ${S}/Makefile.am + echo "EXTRA_DIST = version.xml" > gnome-doc-utils.make +} + + + -- cgit v1.2.3 From 7adc0d685578afa047fefd708db15151fd1dfaad Mon Sep 17 00:00:00 2001 From: Liam Girdwood Date: Thu, 21 Jan 2010 12:19:19 +0000 Subject: MAINTAINERS: update my email and add interests + recipies. Signed-off-by: Liam Girdwood --- MAINTAINERS | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index ae0519b2ca..83b2835c23 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -180,10 +180,13 @@ Interests: Small read-only Linux based firmware, deterministic builds. Recipes: lighttpd, fastcgi, squashfs-tools, rt-tests, linux-rt, linux Machines: mpc8313e-rdb, mpc8315e-rdb, canyonlands, calamari, openrd-base -Person: Liam Girdwoord -Mail: liam.girdwood@wolfsonmicro.com +Person: Liam Girdwood +Mail: lrg@slimlogic.co.uk +Website: http://www.slimlogic.co.uk +Interests: Mobile and embedded Linux within commercial environments. +Interests: Kernel development, userspace development, audio, power management. Machines: mx31ads -Recipes: mx31ads-kernel* +Recipes: mx31ads-kernel*, glibc-2.10.1, some pulseaudio versions Person: Lynn Lin Mail: Lin_Lynn@emc.com -- cgit v1.2.3 From 3713a0765324a5e54996f6f5ca045b85a998271b Mon Sep 17 00:00:00 2001 From: Guo Hongruan Date: Sun, 17 Jan 2010 21:10:18 +0800 Subject: Set preferred glibc to 2.10.1 in conf/distro/micro.conf * the preferred version of binutils of conf/distro/micro.conf is 2.19.51 * the preferred version of glibc is 2.6.1 which is defined in sane-toolchain.inc * the ld produced by binutils-2.19.51 reports that it can not find the __begin symbol when linking with glibc-2.6.1 Signed-off-by: Guo Hongruan --- conf/distro/micro.conf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/conf/distro/micro.conf b/conf/distro/micro.conf index d9fc595303..9885425979 100644 --- a/conf/distro/micro.conf +++ b/conf/distro/micro.conf @@ -62,6 +62,8 @@ MACHINE_KERNEL_VERSION = "2.6" ############################################################################# LIBC ?= "eglibc" PREFERRED_BINUTILS = "2.19.51" +PREFERRED_VERSION_glibc ?= "2.10.1" +PREFERRED_VERSION_glibc-initial ?= "2.10.1" PREFERRED_ARM_INSTRUCTION_SET ?= "thumb" require conf/distro/include/sane-toolchain.inc -- cgit v1.2.3 From 4dfad05b9977338b12169fa31b6077db8b224e71 Mon Sep 17 00:00:00 2001 From: Marco Cavallini Date: Thu, 21 Jan 2010 17:29:46 +0100 Subject: xinput-calibrator-0.5.0/0002-gui_x11.cpp-Load-font-fixed-when-9x15-fails-in-GuiCa.patch: Load font fixed when 9x15 fails in GuiCalibratorX11 --- ...-Load-font-fixed-when-9x15-fails-in-GuiCa.patch | 32 ++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 recipes/xinput-calibrator/xinput-calibrator-0.5.0/0002-gui_x11.cpp-Load-font-fixed-when-9x15-fails-in-GuiCa.patch diff --git a/recipes/xinput-calibrator/xinput-calibrator-0.5.0/0002-gui_x11.cpp-Load-font-fixed-when-9x15-fails-in-GuiCa.patch b/recipes/xinput-calibrator/xinput-calibrator-0.5.0/0002-gui_x11.cpp-Load-font-fixed-when-9x15-fails-in-GuiCa.patch new file mode 100644 index 0000000000..08f430999b --- /dev/null +++ b/recipes/xinput-calibrator/xinput-calibrator-0.5.0/0002-gui_x11.cpp-Load-font-fixed-when-9x15-fails-in-GuiCa.patch @@ -0,0 +1,32 @@ +From aaf549ecacc05bd5ddd29bb345cae471ce3ab48c Mon Sep 17 00:00:00 2001 +From: Marco Cavallini +Date: Thu, 21 Jan 2010 16:46:18 +0100 +Subject: [PATCH] gui_x11.cpp: Load font fixed when 9x15 fails in GuiCalibratorX11 + + +Signed-off-by: Marco Cavallini +--- + gui_x11.cpp | 7 +++++-- + 1 files changed, 5 insertions(+), 2 deletions(-) + +diff --git a/gui_x11.cpp b/gui_x11.cpp +index bc483cd..02ddc73 100644 +--- a/gui_x11.cpp ++++ b/gui_x11.cpp +@@ -112,8 +112,11 @@ GuiCalibratorX11::GuiCalibratorX11(Calibrator* calibrator0) + // Load font and get font information structure + font_info = XLoadQueryFont(display, "9x15"); + if (font_info == NULL) { +- XCloseDisplay(display); +- throw std::runtime_error("Unable to open 9x15 font"); ++ font_info = XLoadQueryFont(display, "fixed"); ++ if (font_info == NULL) { ++ XCloseDisplay(display); ++ throw std::runtime_error("Unable to open 9x15 neither fixed font"); ++ } + } + + // Compute absolute circle centers +-- +1.6.3.3 + -- cgit v1.2.3 From 21b699c06496cb374dbf05def5c57ff10720392e Mon Sep 17 00:00:00 2001 From: Marco Cavallini Date: Thu, 21 Jan 2010 17:30:06 +0100 Subject: xinput-calibrator_0.5.0.bb: added line for new patch to original package --- recipes/xinput-calibrator/xinput-calibrator_0.5.0.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/recipes/xinput-calibrator/xinput-calibrator_0.5.0.bb b/recipes/xinput-calibrator/xinput-calibrator_0.5.0.bb index 2d6924711d..b01d4fd4a9 100644 --- a/recipes/xinput-calibrator/xinput-calibrator_0.5.0.bb +++ b/recipes/xinput-calibrator/xinput-calibrator_0.5.0.bb @@ -2,7 +2,8 @@ DEPENDS = "virtual/libx11 libxi" SRCREV = "6af268f1b435f7bdd83335092ddc684054df2110" SRC_URI = "git://github.com/tias/xinput_calibrator.git;protocol=git \ - file://0001-switch-to-autotools-based-build-system.patch;patch=1" + file://0001-switch-to-autotools-based-build-system.patch;patch=1 \ + file://0002-gui_x11.cpp-Load-font-fixed-when-9x15-fails-in-GuiCa.patch;patch=1" PR = "r1" inherit autotools -- cgit v1.2.3 From 9de70ca57a893837ba7165cd2c449bcf0886e5a4 Mon Sep 17 00:00:00 2001 From: Michael Lippautz Date: Thu, 21 Jan 2010 19:51:26 +0100 Subject: libxml-namespacesupport-perl_1.10.bb: create recipe --- recipes/perl/libxml-namespacesupport-perl_1.10.bb | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 recipes/perl/libxml-namespacesupport-perl_1.10.bb diff --git a/recipes/perl/libxml-namespacesupport-perl_1.10.bb b/recipes/perl/libxml-namespacesupport-perl_1.10.bb new file mode 100644 index 0000000000..3b49cef480 --- /dev/null +++ b/recipes/perl/libxml-namespacesupport-perl_1.10.bb @@ -0,0 +1,16 @@ +DESCRIPTION = "XML-NamespaceSupport" +SECTION = "libs" +LICENSE = "" +PR = "r0" + +SRC_URI = "http://search.cpan.org/CPAN/authors/id/P/PE/PERIGRIN/XML-NamespaceSupport-${PV}.tar.gz;name=namespacesupport" + +SRC_URI[namespacesupport.md5sum] = "0a760067d4b517672f064e911679c509" +SRC_URI[namespacesupport.sha256sum] = "a57357ac22959a5093a19177a0d541a478595d538afef659c19ae1e75849833e" + +S = "${WORKDIR}/XML-NamespaceSupport-${PV}" + +inherit cpan + +BBCLASSEXTEND="native" + -- cgit v1.2.3 From 6cd92d1545ccf5d4f1459f70faa81be68adb0794 Mon Sep 17 00:00:00 2001 From: Michael Lippautz Date: Thu, 21 Jan 2010 19:53:24 +0100 Subject: libxml-sax-perl_0.96.bb: new recipe --- recipes/perl/libxml-sax-perl_0.96.bb | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 recipes/perl/libxml-sax-perl_0.96.bb diff --git a/recipes/perl/libxml-sax-perl_0.96.bb b/recipes/perl/libxml-sax-perl_0.96.bb new file mode 100644 index 0000000000..260a98f809 --- /dev/null +++ b/recipes/perl/libxml-sax-perl_0.96.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "XML-SAX" +SECTION = "libs" +LICENSE = "" +DEPENDS += "libxml-namespacesupport-perl-native" +PR = "r0" + +SRC_URI = "http://search.cpan.org/CPAN/authors/id/G/GR/GRANTM/XML-SAX-${PV}.tar.gz;name=sax" +SRC_URI[sax.md5sum] = "bdcd4119a62505184e211e9dfaef0ab1" +SRC_URI[sax.sha256sum] = "9bbef613afa42c46df008d537decc5a61df7e92d65463f3c900769f39e5c8e08" + +S = "${WORKDIR}/XML-SAX-${PV}" + +inherit cpan + +BBCLASSEXTEND = "native" -- cgit v1.2.3 From 728ce9aa3d63d9086ab302ac8ba447b3709912d8 Mon Sep 17 00:00:00 2001 From: Dallas Foley Date: Thu, 21 Jan 2010 08:49:43 +0000 Subject: libdrm_2.4.17: disable intel for non-x86 * older version 2.4.11 builds OK on arm, but not 2.4.17 * someone with x86 and intel, please test Signed-off-by: Martin Jansa --- recipes/dri/libdrm_2.4.17.bb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/recipes/dri/libdrm_2.4.17.bb b/recipes/dri/libdrm_2.4.17.bb index 4f2af1ed73..fd1ab3a5e4 100644 --- a/recipes/dri/libdrm_2.4.17.bb +++ b/recipes/dri/libdrm_2.4.17.bb @@ -3,14 +3,16 @@ DEPENDS = "libpthread-stubs" LICENSE = "MIT" SRC_URI = "http://dri.freedesktop.org/libdrm/libdrm-${PV}.tar.bz2" PROVIDES = "drm" -PR = "r1" +PR = "r2" inherit autotools pkgconfig +EXTRA_OECONF_append = " ${@base_contains('MACHINE_FEATURES', 'x86', '', '--disable-intel',d)}" + do_stage() { autotools_stage_all } -PACKAGES =+ "${PN}-intel" +PACKAGES =+ "${@base_contains('MACHINE_FEATURES', 'x86', '${PN}-intel', '',d)}" FILES_${PN}-intel = "${libdir}/libdrm_intel.so.*" -- cgit v1.2.3 From eaf451fc3ef576c3332edfa9ee64bc5cba8d3f72 Mon Sep 17 00:00:00 2001 From: Aleksey Makarov Date: Mon, 18 Jan 2010 11:06:23 +0000 Subject: kernel.bbclass: fix kernel build, version >= 2.6.33-rc1, arch x86 * Apply the same change as c0a3e91845fad1cdda723bdcf962de8bc01f8a2d for x86 path * A check was missed in the x86 path of the stage method. Signed-off-by: Martin Jansa --- classes/kernel.bbclass | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass index 83530b5a5e..53ea252b0e 100644 --- a/classes/kernel.bbclass +++ b/classes/kernel.bbclass @@ -112,7 +112,9 @@ kernel_do_stage() { # Check for arch/x86 on i386 elif [ -d arch/x86/include/asm/ ]; then - cp -fR arch/x86/include/asm/* ${STAGING_KERNEL_DIR}/include/asm-x86/ + if [ -e include/asm ] ; then + cp -fR arch/x86/include/asm/* ${STAGING_KERNEL_DIR}/include/asm-x86/ + fi install -d ${STAGING_KERNEL_DIR}/arch/x86/include cp -fR arch/x86/* ${STAGING_KERNEL_DIR}/arch/x86/ fi -- cgit v1.2.3 From 3192d261f811201248410fd2117e3c9ebc9f3f64 Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Thu, 21 Jan 2010 12:20:16 -0700 Subject: konq-e 20030705: kill the exec_prefix var hack Signed-off-by: Chris Larson --- recipes/konqueror/konqueror-embedded_20030705.bb | 1 - 1 file changed, 1 deletion(-) diff --git a/recipes/konqueror/konqueror-embedded_20030705.bb b/recipes/konqueror/konqueror-embedded_20030705.bb index 979c1ce305..fba9d31ac3 100644 --- a/recipes/konqueror/konqueror-embedded_20030705.bb +++ b/recipes/konqueror/konqueror-embedded_20030705.bb @@ -31,7 +31,6 @@ FILES_${PN} = "${palmtopdir}" export QMAKE = "${STAGING_BINDIR_NATIVE}/qmake" export MOC = "${STAGING_BINDIR_NATIVE}/moc" export UIC = "${STAGING_BINDIR_NATIVE}/uic" -export exec_prefix = "${STAGING_LIBDIR}/.." EXTRA_OECONF = '--prefix=${palmtopdir} --exec-prefix=${palmtopdir} \ --enable-static --disable-shared --disable-debug \ -- cgit v1.2.3 From 0854ce6638b824e5012a100fac8be5c6d04c37b9 Mon Sep 17 00:00:00 2001 From: Simon Busch Date: Thu, 21 Jan 2010 20:26:00 +0100 Subject: preboot: remove defconfig requirement --- recipes/preboot/linux-preboot.inc | 2 -- 1 file changed, 2 deletions(-) diff --git a/recipes/preboot/linux-preboot.inc b/recipes/preboot/linux-preboot.inc index 4f99b71773..56a90a9723 100644 --- a/recipes/preboot/linux-preboot.inc +++ b/recipes/preboot/linux-preboot.inc @@ -1,8 +1,6 @@ # We set PR here, since a change in the kexecboot recipe will need to get picked up by *all* the kernels: PR = "r15" -SRC_URI = "file://defconfig" - LOGO_SIZE = '${@base_conditional("GUI_MACHINE_CLASS", "bigscreen", "vga", "qvga", d)}' require ../linux/linux.inc -- cgit v1.2.3 From b6f9a84fd99c89ac074aaed90cdd3d064c534492 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 21 Jan 2010 21:41:43 +0100 Subject: task-shr-minimal: add xinput-calibrator --- recipes/tasks/task-shr-minimal.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/recipes/tasks/task-shr-minimal.bb b/recipes/tasks/task-shr-minimal.bb index c30539c607..8538391df3 100644 --- a/recipes/tasks/task-shr-minimal.bb +++ b/recipes/tasks/task-shr-minimal.bb @@ -1,5 +1,5 @@ DESCRIPTION = "SHR Lite Image Feed" -PR = "r19" +PR = "r20" PV = "2.0" LICENSE = "GPL" @@ -122,6 +122,7 @@ RDEPENDS_${PN}-x = "\ libx11-locale \ libmokoui2 \ xcursor-transparent-theme \ + xinput-calibrator \ " RDEPENDS_${PN}-apps = "\ -- cgit v1.2.3 From b84a8334ffab66e74abf751532afd693f17f98fe Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Sat, 16 Jan 2010 14:41:03 +0100 Subject: libcap: Append `-fPIC` to `CFLAGS` to fix compilation on newer binutils/ld. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Doing `bitbake libcap` with PREFERRED_VERSION_binutils = "2.20" PREFERRED_VERSION_binutils-cross = "2.20" PREFERRED_VERSION_binutils-cross-sdk = "2.20" PREFERRED_VERSION_gcc = "4.4.2" PREFERRED_VERSION_gcc-cross = "4.4.2" PREFERRED_VERSION_gcc-cross-sdk = "4.4.2" PREFERRED_VERSION_gcc-cross-initial = "4.4.2" PREFERRED_VERSION_gcc-cross-intermediate = "4.4.2" in `local.conf` made `do_compile` error out with the following message [1]. arm-angstrom-linux-gnueabi-ld -soname libcap.so.1 -x -shared -o libcap.so.1.10 cap_alloc.o cap_proc.o cap_extint.o cap_flag.o cap_text.o cap_sys.o arm-angstrom-linux-gnueabi-ld: cap_text.o: relocation R_ARM_MOVW_ABS_NC against `a local symbol' can not be used when making a shared object; recompile with -fPIC Khem Raj explained it the following way [2]. Am Mittwoch, den 13.01.2010, 02:27 -0800 schrieb Khem Raj: > > I also get the same error which I did not get before with GCC 4.1.1. > > Older versions of binutils/ld can not detect MOVT/MOVW relocations which > are absolute and cant be used in PIC code. > hence even if the error was there it remained latent. Therefore just append `-fPIC` to the CFLAGS and bump the PR variable. The strange thing is still, that other distributions seem to have patched libcap to build with `-fPIC` long ago [3–5]. [1] http://lists.linuxtogo.org/pipermail/openembedded-devel/2010-January/016142.html [2] http://lists.linuxtogo.org/pipermail/openembedded-devel/2010-January/016211.html [3] http://www.linuxfromscratch.org/patches/downloads/libcap/libcap-1.10-fedora_fixes-1.patch [4] http://frugalware.org/pipermail/frugalware-darcs/2005-May/000824.html [5] http://cvs.fedoraproject.org/viewvc/rpms/libcap/F-7/libcap-1.10-fPIC.patch?revision=1.1&view=markup Signed-off-by: Paul Menzel --- recipes/libcap/libcap_1.10.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/libcap/libcap_1.10.bb b/recipes/libcap/libcap_1.10.bb index 172acaca6e..241529e865 100644 --- a/recipes/libcap/libcap_1.10.bb +++ b/recipes/libcap/libcap_1.10.bb @@ -3,9 +3,9 @@ PRIORITY = "optional" SECTION = "libs" LICENSE = "GPL" DEPENDS = "bison-native flex-native" -PR = "r1" +PR = "r2" -CFLAGS_append = " -I${S}/libcap/include" +CFLAGS_append = " -I${S}/libcap/include -fPIC" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/libs/security/linux-privs/kernel-2.4/${PN}-${PV}.tar.bz2 \ file://makenames.patch;patch=1 \ -- cgit v1.2.3 From a92eb1effa3af60a4abb47f0850c52e5e2c1a33a Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 21 Jan 2010 14:21:43 -0800 Subject: uclibc-nptl: Fix Global dynmaic TLS loads. * Update to latest tip of branch. * Delete the patches which are now upstream. * Hide __libc_errno and __libc_h_errno and __libc_res. Signed-off-by: Khem Raj --- .../mips-nptl-fix-dynamic-global-tls.patch | 249 +++++++++++++++++++++ .../uclibc_fix_mips_tls_relocation_and_crt.patch | 127 ----------- recipes/uclibc/uclibc_nptl.bb | 4 +- 3 files changed, 251 insertions(+), 129 deletions(-) create mode 100644 recipes/uclibc/uclibc-nptl/mips-nptl-fix-dynamic-global-tls.patch delete mode 100644 recipes/uclibc/uclibc-nptl/uclibc_fix_mips_tls_relocation_and_crt.patch diff --git a/recipes/uclibc/uclibc-nptl/mips-nptl-fix-dynamic-global-tls.patch b/recipes/uclibc/uclibc-nptl/mips-nptl-fix-dynamic-global-tls.patch new file mode 100644 index 0000000000..67d49060fb --- /dev/null +++ b/recipes/uclibc/uclibc-nptl/mips-nptl-fix-dynamic-global-tls.patch @@ -0,0 +1,249 @@ +Index: git/ldso/ldso/mips/dl-sysdep.h +=================================================================== +--- git.orig/ldso/ldso/mips/dl-sysdep.h 2010-01-21 13:33:18.000000000 -0800 ++++ git/ldso/ldso/mips/dl-sysdep.h 2010-01-21 13:39:02.389689911 -0800 +@@ -8,6 +8,7 @@ + /* Define this if the system uses RELOCA. */ + #undef ELF_USES_RELOCA + #include ++#include + + #ifdef __mips64 /* from glibc sysdeps/mips/elf/ldsodefs.h 1.4 */ + /* The 64-bit MIPS ELF ABI uses an unusual reloc format. Each +@@ -163,9 +164,25 @@ void _dl_perform_mips_global_got_relocat + #define OFFS_ALIGN (0x10000000000UL-0x1000) + #endif /* O32 || N32 */ + +-#define elf_machine_type_class(type) \ +- ((((type) == R_MIPS_JUMP_SLOT) * ELF_RTYPE_CLASS_PLT) \ ++#if defined USE_TLS ++# if _MIPS_SIM == _MIPS_SIM_ABI64 ++# define elf_machine_type_class(type) \ ++ ((((type) == R_MIPS_JUMP_SLOT || (type) == R_MIPS_TLS_DTPMOD64 \ ++ || (type) == R_MIPS_TLS_DTPREL64 || (type) == R_MIPS_TLS_TPREL64) \ ++ * ELF_RTYPE_CLASS_PLT) \ + | (((type) == R_MIPS_COPY) * ELF_RTYPE_CLASS_COPY)) ++# else ++# define elf_machine_type_class(type) \ ++ ((((type) == R_MIPS_JUMP_SLOT || (type) == R_MIPS_TLS_DTPMOD32 \ ++ || (type) == R_MIPS_TLS_DTPREL32 || (type) == R_MIPS_TLS_TPREL32) \ ++ * ELF_RTYPE_CLASS_PLT) \ ++ | (((type) == R_MIPS_COPY) * ELF_RTYPE_CLASS_COPY)) ++# endif /* _MIPS_SIM == _MIPS_SIM_ABI64 */ ++#else ++#define elf_machine_type_class(type) \ ++ ((((type) == R_MIPS_JUMP_SLOT) * ELF_RTYPE_CLASS_PLT) \ ++ | (((type) == R_MIPS_COPY) * ELF_RTYPE_CLASS_COPY)) ++#endif /* USE_TLS */ + + #define OFFSET_GP_GOT 0x7ff0 + +Index: git/ldso/ldso/mips/elfinterp.c +=================================================================== +--- git.orig/ldso/ldso/mips/elfinterp.c 2010-01-21 13:33:18.000000000 -0800 ++++ git/ldso/ldso/mips/elfinterp.c 2010-01-21 13:39:02.389689911 -0800 +@@ -156,6 +156,7 @@ int _dl_parse_relocation_information(str + unsigned long symbol_addr; + int reloc_type, symtab_index; + struct elf_resolve *tpnt = xpnt->dyn; ++ char *symname = NULL; + #if defined (__SUPPORT_LD_DEBUG__) + unsigned long old_val=0; + #endif +@@ -169,7 +170,6 @@ int _dl_parse_relocation_information(str + got = (unsigned long *) tpnt->dynamic_info[DT_PLTGOT]; + + for (i = 0; i < rel_size; i++, rpnt++) { +- char *symname = NULL; + reloc_addr = (unsigned long *) (tpnt->loadaddr + + (unsigned long) rpnt->r_offset); + reloc_type = ELF32_R_TYPE(rpnt->r_info); +@@ -178,13 +178,13 @@ int _dl_parse_relocation_information(str + + debug_sym(symtab,strtab,symtab_index); + debug_reloc(symtab,strtab,rpnt); ++ symname = strtab + symtab[symtab_index].st_name; + #if defined (__SUPPORT_LD_DEBUG__) + if (reloc_addr) + old_val = *reloc_addr; + #endif + + if (reloc_type == R_MIPS_JUMP_SLOT || reloc_type == R_MIPS_COPY) { +- symname = strtab + symtab[symtab_index].st_name; + symbol_addr = (unsigned long)_dl_find_hash(symname, + tpnt->symbol_scope, + tpnt, +@@ -192,6 +192,13 @@ int _dl_parse_relocation_information(str + if (unlikely(!symbol_addr && ELF32_ST_BIND(symtab[symtab_index].st_info) != STB_WEAK)) + return 1; + } ++ if (!symtab_index) { ++ /* Relocs against STN_UNDEF are usually treated as using a ++ * symbol value of zero, and using the module containing the ++ * reloc itself. ++ */ ++ symbol_addr = symtab[symtab_index].st_value; ++ } + + switch (reloc_type) { + #if USE_TLS +@@ -205,21 +212,17 @@ int _dl_parse_relocation_information(str + case R_MIPS_TLS_TPREL32: + # endif + { +- ElfW(Sym) *sym_tls = &symtab[symtab_index]; + struct elf_resolve *tpnt_tls = NULL; + + if (ELF32_ST_BIND(symtab[symtab_index].st_info) != STB_LOCAL) { +- _dl_find_hash((strtab + symtab[symtab_index].st_name), +- _dl_symbol_tables, tpnt, +- elf_machine_type_class(reloc_type), &tpnt_tls); ++ symbol_addr = (unsigned long) _dl_find_hash(symname, tpnt->symbol_scope, ++ tpnt, elf_machine_type_class(reloc_type), &tpnt_tls); + } +-#if USE_TLS + /* In case of a TLS reloc, tpnt_tls NULL means we have an 'anonymous' + symbol. This is the case for a static tls variable, so the lookup + module is just that one is referencing the tls variable. */ + if (!tpnt_tls) + tpnt_tls = tpnt; +-#endif + + switch (reloc_type) { + case R_MIPS_TLS_DTPMOD64: +@@ -228,17 +231,17 @@ int _dl_parse_relocation_information(str + *(ElfW(Word) *)reloc_addr = tpnt_tls->l_tls_modid; + #ifdef __SUPPORT_LD_DEBUG__ + _dl_dprintf(2, "TLS_DTPMOD : %s, %d, %d\n", +- (strtab + symtab[symtab_index].st_name), old_val, *((unsigned int *)reloc_addr)); ++ symname, old_val, *((unsigned int *)reloc_addr)); + #endif + break; + + case R_MIPS_TLS_DTPREL64: + case R_MIPS_TLS_DTPREL32: + *(ElfW(Word) *)reloc_addr += +- TLS_DTPREL_VALUE (sym_tls); ++ TLS_DTPREL_VALUE (symbol_addr); + #ifdef __SUPPORT_LD_DEBUG__ + _dl_dprintf(2, "TLS_DTPREL : %s, %x, %x\n", +- (strtab + symtab[symtab_index].st_name), old_val, *((unsigned int *)reloc_addr)); ++ symname, old_val, *((unsigned int *)reloc_addr)); + #endif + break; + +@@ -246,10 +249,10 @@ int _dl_parse_relocation_information(str + case R_MIPS_TLS_TPREL64: + CHECK_STATIC_TLS((struct link_map *)tpnt_tls); + *(ElfW(Word) *)reloc_addr += +- TLS_TPREL_VALUE (tpnt_tls, sym_tls); ++ TLS_TPREL_VALUE (tpnt_tls, symbol_addr); + #ifdef __SUPPORT_LD_DEBUG__ + _dl_dprintf(2, "TLS_TPREL : %s, %x, %x\n", +- (strtab + symtab[symtab_index].st_name), old_val, *((unsigned int *)reloc_addr)); ++ symname, old_val, *((unsigned int *)reloc_addr)); + #endif + break; + } +@@ -301,7 +304,7 @@ int _dl_parse_relocation_information(str + _dl_dprintf(2, "\n%s: ",_dl_progname); + + if (symtab_index) +- _dl_dprintf(2, "symbol '%s': ", strtab + symtab[symtab_index].st_name); ++ _dl_dprintf(2, "symbol '%s': ", symname); + + #if defined (__SUPPORT_LD_DEBUG__) + _dl_dprintf(2, "can't handle reloc type '%s' in lib '%s'\n", _dl_reltypes(reloc_type), tpnt->libname); +Index: git/ldso/libdl/libdl.c +=================================================================== +--- git.orig/ldso/libdl/libdl.c 2010-01-21 13:33:18.000000000 -0800 ++++ git/ldso/libdl/libdl.c 2010-01-21 13:39:02.393687926 -0800 +@@ -37,6 +37,7 @@ + + #ifdef __UCLIBC_HAS_TLS__ + #include ++#include + #endif + + #if defined(USE_TLS) && USE_TLS +Index: git/libc/inet/resolv.c +=================================================================== +--- git.orig/libc/inet/resolv.c 2010-01-21 13:33:18.000000000 -0800 ++++ git/libc/inet/resolv.c 2010-01-21 13:39:02.393687926 -0800 +@@ -3016,7 +3016,7 @@ __thread struct __res_state *__resp = &_ + * relocations. + */ + extern __thread struct __res_state *__libc_resp +- __attribute__ ((alias ("__resp"))); ++ __attribute__ ((alias ("__resp"))) attribute_hidden; + # else + # undef __resp + struct __res_state *__resp = &_res; +Index: git/libc/misc/internals/errno.c +=================================================================== +--- git.orig/libc/misc/internals/errno.c 2010-01-21 13:33:18.000000000 -0800 ++++ git/libc/misc/internals/errno.c 2010-01-21 13:39:02.393687926 -0800 +@@ -4,15 +4,14 @@ + __thread int errno; + __thread int h_errno; + +-extern __thread int __libc_errno __attribute__ ((alias ("errno"))); +-extern __thread int __libc_h_errno __attribute__ ((alias ("h_errno"))); ++extern __thread int __libc_errno __attribute__ ((alias ("errno"))) attribute_hidden; ++extern __thread int __libc_h_errno __attribute__ ((alias ("h_errno"))) attribute_hidden; + #define h_errno __libc_h_errno + + #else + #include "internal_errno.h" + int errno = 0; + int h_errno = 0; +- + #ifdef __UCLIBC_HAS_THREADS__ + libc_hidden_def(errno) + weak_alias(errno, _errno) +Index: git/libpthread/nptl/sysdeps/mips/dl-tls.h +==========================================