* [meta-oe][meta-efl][PATCH 01/15] glib-2.0: upgrade from 2.29.3+git to 2.30.0 release
2011-09-30 12:56 [meta-oe][meta-efl][PATCH 00/15] Pull request #23 Martin Jansa
@ 2011-09-30 12:56 ` Martin Jansa
2011-09-30 15:51 ` Martin Jansa
2011-09-30 12:56 ` [meta-oe][meta-efl][PATCH 02/15] xorg-driver: use renamed .inc from oe-core Martin Jansa
` (14 subsequent siblings)
15 siblings, 1 reply; 46+ messages in thread
From: Martin Jansa @ 2011-09-30 12:56 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
...003-gatomic-proper-pointer-get-cast.patch.patch | 28 -------
.../0005-glib-mkenums-interpreter.patch.patch | 25 -------
.../60_wait-longer-for-threads-to-die.patch | 24 +++---
.../glib-2.0/remove.test.for.qsort_r.patch | 77 ++++++++++----------
.../{glib-2.0_git.bb => glib-2.0_2.30.0.bb} | 21 ++++--
5 files changed, 65 insertions(+), 110 deletions(-)
delete mode 100644 meta-oe/recipes-core/glib-2.0/glib-2.0/0003-gatomic-proper-pointer-get-cast.patch.patch
delete mode 100644 meta-oe/recipes-core/glib-2.0/glib-2.0/0005-glib-mkenums-interpreter.patch.patch
rename meta-oe/recipes-core/glib-2.0/{glib-2.0_git.bb => glib-2.0_2.30.0.bb} (61%)
diff --git a/meta-oe/recipes-core/glib-2.0/glib-2.0/0003-gatomic-proper-pointer-get-cast.patch.patch b/meta-oe/recipes-core/glib-2.0/glib-2.0/0003-gatomic-proper-pointer-get-cast.patch.patch
deleted file mode 100644
index ad1ca12..0000000
--- a/meta-oe/recipes-core/glib-2.0/glib-2.0/0003-gatomic-proper-pointer-get-cast.patch.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 3d371334d5668bcd02a38ff99884bd343c244d68 Mon Sep 17 00:00:00 2001
-From: Koen Kooi <koen@dominion.thruhere.net>
-Date: Sat, 18 Jun 2011 23:51:35 +0200
-Subject: [PATCH 3/7] gatomic-proper-pointer-get-cast.patch
-
-Upstream-Status: Unknown
-
-Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
----
- glib/gatomic.h | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/glib/gatomic.h b/glib/gatomic.h
-index ddd39b8..b758142 100644
---- a/glib/gatomic.h
-+++ b/glib/gatomic.h
-@@ -70,7 +70,7 @@ void g_atomic_pointer_set (volatile gpointer G_GNUC_MAY_ALI
- (g_atomic_int_set) ((volatile gint G_GNUC_MAY_ALIAS *) (volatile void *) (atomic), (newval)))
- # define g_atomic_pointer_get(atomic) \
- ((void) sizeof (gchar [sizeof (*(atomic)) == sizeof (gpointer) ? 1 : -1]), \
-- (g_atomic_pointer_get) ((volatile gpointer G_GNUC_MAY_ALIAS *) (volatile void *) (atomic)))
-+ (g_atomic_pointer_get) ((volatile gpointer G_GNUC_MAY_ALIAS *) (volatile void G_GNUC_MAY_ALIAS *) (atomic)))
- # define g_atomic_pointer_set(atomic, newval) \
- ((void) sizeof (gchar [sizeof (*(atomic)) == sizeof (gpointer) ? 1 : -1]), \
- (g_atomic_pointer_set) ((volatile gpointer G_GNUC_MAY_ALIAS *) (volatile void *) (atomic), (newval)))
---
-1.6.6.1
-
diff --git a/meta-oe/recipes-core/glib-2.0/glib-2.0/0005-glib-mkenums-interpreter.patch.patch b/meta-oe/recipes-core/glib-2.0/glib-2.0/0005-glib-mkenums-interpreter.patch.patch
deleted file mode 100644
index 6780330..0000000
--- a/meta-oe/recipes-core/glib-2.0/glib-2.0/0005-glib-mkenums-interpreter.patch.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From a8e5c4a808e7f8572bd5023645a6cb4386b9aff8 Mon Sep 17 00:00:00 2001
-From: Koen Kooi <koen@dominion.thruhere.net>
-Date: Sat, 18 Jun 2011 23:52:17 +0200
-Subject: [PATCH 5/7] don't leak buildpaths into perl hashbang
-
-Upstream-Status: Unknown
-
-Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
----
- gobject/glib-mkenums.in | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/gobject/glib-mkenums.in b/gobject/glib-mkenums.in
-index 6372245..b486fe9 100755
---- a/gobject/glib-mkenums.in
-+++ b/gobject/glib-mkenums.in
-@@ -1,4 +1,4 @@
--#! @PERL_PATH@
-+#! /usr/bin/env perl
-
- use warnings;
- use File::Basename;
---
-1.6.6.1
-
diff --git a/meta-oe/recipes-core/glib-2.0/glib-2.0/60_wait-longer-for-threads-to-die.patch b/meta-oe/recipes-core/glib-2.0/glib-2.0/60_wait-longer-for-threads-to-die.patch
index b65a474..4ff7b80 100644
--- a/meta-oe/recipes-core/glib-2.0/glib-2.0/60_wait-longer-for-threads-to-die.patch
+++ b/meta-oe/recipes-core/glib-2.0/glib-2.0/60_wait-longer-for-threads-to-die.patch
@@ -4,9 +4,9 @@ Rebased for glib-2.27.3 by Dongxiao Xu <dongxiao.xu@intel.com>, 11/16/2010
Upstream-Status: Inappropriate [patches for test code]
-diff -ruN glib-2.27.3-orig/tests/threadpool-test.c glib-2.27.3/tests/threadpool-test.c
---- glib-2.27.3-orig/tests/threadpool-test.c 2009-04-01 07:04:21.000000000 +0800
-+++ glib-2.27.3/tests/threadpool-test.c 2010-11-16 12:28:09.002172678 +0800
+diff -ruN glib-2.30.0-orig/tests/threadpool-test.c glib-2.30.0/tests/threadpool-test.c
+--- glib-2.30.0-orig/tests/threadpool-test.c 2009-04-01 07:04:21.000000000 +0800
++++ glib-2.30.0/tests/threadpool-test.c 2010-11-16 12:28:09.002172678 +0800
@@ -5,8 +5,8 @@
#include <glib.h>
@@ -18,16 +18,16 @@ diff -ruN glib-2.27.3-orig/tests/threadpool-test.c glib-2.27.3/tests/threadpool-
#define WAIT 5 /* seconds */
#define MAX_THREADS 10
-@@ -124,10 +124,10 @@
- DEBUG_MSG (("[unused] stopping unused threads"));
- g_thread_pool_stop_unused_threads ();
+@@ -130,10 +130,10 @@
+ test_count_threads () == 0)
+ break;
-- DEBUG_MSG (("[unused] waiting ONE second for threads to die"));
-+ DEBUG_MSG (("[unused] waiting FIVE second for threads to die"));
+- DEBUG_MSG (("[unused] waiting ONE second for threads to die"));
++ DEBUG_MSG (("[unused] waiting FIVE second for threads to die"));
- /* Some time for threads to die. */
-- g_usleep (G_USEC_PER_SEC);
-+ g_usleep (5 * G_USEC_PER_SEC);
+ /* Some time for threads to die. */
+- g_usleep (G_USEC_PER_SEC);
++ g_usleep (5 * G_USEC_PER_SEC);
+ }
DEBUG_MSG (("[unused] stopped idle threads, %d remain, %d threads still exist",
- g_thread_pool_get_num_unused_threads (),
diff --git a/meta-oe/recipes-core/glib-2.0/glib-2.0/remove.test.for.qsort_r.patch b/meta-oe/recipes-core/glib-2.0/glib-2.0/remove.test.for.qsort_r.patch
index 3300eb0..05805d0 100644
--- a/meta-oe/recipes-core/glib-2.0/glib-2.0/remove.test.for.qsort_r.patch
+++ b/meta-oe/recipes-core/glib-2.0/glib-2.0/remove.test.for.qsort_r.patch
@@ -1,52 +1,49 @@
while cross compiling we cannot execute run tests
-diff --git a/configure.ac b/configure.ac
-index 378b082..3f2a8d3 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -580,46 +580,7 @@ AC_FUNC_VPRINTF
- AC_FUNC_ALLOCA
- AC_CHECK_FUNCS(mmap posix_memalign memalign valloc fsync pipe2)
- AC_CHECK_FUNCS(atexit on_exit timegm gmtime_r)
+--- glib-2.30.0.orig/configure.ac 2011-09-29 16:57:35.000000000 +0200
++++ glib-2.30.0/configure.ac 2011-09-29 17:00:19.931493488 +0200
+@@ -586,45 +586,7 @@
+ dnl until we have checked this function is actually usable
+ AC_CHECK_FUNC([qsort_r])
+
-# BSD has a qsort_r with wrong argument order
--AC_CACHE_CHECK([for qsort_r], glib_cv_have_qsort_r, [
--AC_RUN_IFELSE([AC_LANG_SOURCE([[
--#define _GNU_SOURCE
--#include <stdlib.h>
+-if test x$ac_cv_func_qsort_r = xyes ; then
+- AC_CACHE_CHECK([if qsort_r uses glibc compatible argument order], glib_cv_have_qsort_r, [
+- AC_RUN_IFELSE([AC_LANG_SOURCE([[
+- #define _GNU_SOURCE
+- #include <stdlib.h>
-
--static int
--cmp (const void *a, const void *b, void *c)
--{
-- const int *ia = a;
-- const int *ib = b;
+- static int
+- cmp (const void *a, const void *b, void *c)
+- {
+- const int *ia = a;
+- const int *ib = b;
-
-- if (*ia < *ib)
-- return -1;
-- else if (*ia > *ib)
-- return 1;
-- else
-- return 0;
--}
+- if (*ia < *ib)
+- return -1;
+- else if (*ia > *ib)
+- return 1;
+- else
+- return 0;
+- }
-
--int
--main (int argc, char **argv)
--{
-- int arr[3] = { 1, 2, 0 };
-- int d = 3;
+- int
+- main (int argc, char **argv)
+- {
+- int arr[3] = { 1, 2, 0 };
+- int d = 3;
-
-- qsort_r (arr, 3, sizeof (int), cmp, &d);
+- qsort_r (arr, 3, sizeof (int), cmp, &d);
-
-- if (arr[0] == 0 && arr[1] == 1 && arr[2] == 2)
-- return 0;
-- else
-- return 1;
--}]])],[glib_cv_have_qsort_r=yes],[glib_cv_have_qsort_r=no])])
+- if (arr[0] == 0 && arr[1] == 1 && arr[2] == 2)
+- return 0;
+- else
+- return 1;
+- }]])],[glib_cv_have_qsort_r=yes],[glib_cv_have_qsort_r=no])])
+-fi
-
--if test $glib_cv_have_qsort_r = yes ; then
-- AC_MSG_RESULT([yes])
-- AC_DEFINE(HAVE_QSORT_R, 1, [Define to 1 if you have the 'qsort_r' function])
--else
-- AC_MSG_RESULT([no])
+-if test x$glib_cv_have_qsort_r = xyes ; then
+- AC_DEFINE(HAVE_QSORT_R, 1, [Define to 1 if you have the 'qsort_r' function])
-fi
+AC_DEFINE(HAVE_QSORT_R, 1, [Define to 1 if you have the 'qsort_r' function])
diff --git a/meta-oe/recipes-core/glib-2.0/glib-2.0_git.bb b/meta-oe/recipes-core/glib-2.0/glib-2.0_2.30.0.bb
similarity index 61%
rename from meta-oe/recipes-core/glib-2.0/glib-2.0_git.bb
rename to meta-oe/recipes-core/glib-2.0/glib-2.0_2.30.0.bb
index 34fcaf6..b4305b8 100644
--- a/meta-oe/recipes-core/glib-2.0/glib-2.0_git.bb
+++ b/meta-oe/recipes-core/glib-2.0/glib-2.0_2.30.0.bb
@@ -1,22 +1,22 @@
require glib.inc
PE = "1"
-PR = "r1"
DEFAULT_PREFERENCE = "-1"
DEPENDS += "libffi python-argparse-native"
DEPENDS_virtclass-native += "libffi-native python-argparse-native"
-SRC_URI = "git://git.gnome.org/glib;protocol=git;branch=master \
+SHRT_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}"
+
+SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.bz2 \
file://configure-libtool.patch \
file://60_wait-longer-for-threads-to-die.patch \
file://g_once_init_enter.patch \
file://remove.test.for.qsort_r.patch \
"
-SRCREV = "d97cbc6731deab137770bc0fe9c69b06f689f5b4"
-PV = "2.29.3+gitr${SRCPV}"
-S = "${WORKDIR}/git"
+SRC_URI[md5sum] = "fee101d9d7daa8ddfbae00325f307f3b"
+SRC_URI[sha256sum] = "ca9c731017ab370859e847f8b70079bc6dcf389dc0ccb0d0419925aff81b9687"
# Only apply this patch for target recipe on uclibc
SRC_URI_append_libc-uclibc = " ${@['', 'file://no-iconv.patch']['${PN}' == '${BPN}']}"
@@ -30,3 +30,14 @@ do_configure_prepend() {
sed -i 's/SUBDIRS = . m4macros glib gmodule gthread gobject gio tests po docs/SUBDIRS = . m4macros glib gmodule gthread gobject gio tests po/g' ${S}/Makefile.am
sed -i -e "s:TEST_PROGS += gdbus-serialization::g" ${S}/gio/tests/Makefile.am
}
+
+do_install_append() {
+ # remove some unpackaged files
+ rm -f ${D}${datadir}/glib-2.0/gettext/mkinstalldirs
+ rm -f ${D}${datadir}/glib-2.0/gettext/po/Makefile.in.in
+ rm -f ${D}${libdir}/gdbus-2.0/codegen/*.pyc
+ rm -f ${D}${libdir}/gdbus-2.0/codegen/*.pyo
+}
+
+PACKAGES += "${PN}-codegen"
+FILES_${PN}-codegen = "${libdir}/gdbus-2.0/codegen/*.py"
--
1.7.6.1
^ permalink raw reply related [flat|nested] 46+ messages in thread
* [meta-oe][meta-efl][PATCH 02/15] xorg-driver: use renamed .inc from oe-core
2011-09-30 12:56 [meta-oe][meta-efl][PATCH 00/15] Pull request #23 Martin Jansa
2011-09-30 12:56 ` [meta-oe][meta-efl][PATCH 01/15] glib-2.0: upgrade from 2.29.3+git to 2.30.0 release Martin Jansa
@ 2011-09-30 12:56 ` Martin Jansa
2011-09-30 12:56 ` [meta-oe][meta-efl][PATCH 03/15] libxft, libxrender, renderproto: move native BBCLASSEXTENDs to oe-core Martin Jansa
` (13 subsequent siblings)
15 siblings, 0 replies; 46+ messages in thread
From: Martin Jansa @ 2011-09-30 12:56 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
.../xorg-driver/xf86-input-tslib_0.0.6.bb | 2 +-
.../xorg-driver/xf86-input-void_1.4.0.bb | 2 +-
.../xorg-driver/xf86-video-fbdev_0.4.2.bb | 2 +-
.../xorg-driver/xf86-video-geode_2.11.12.bb | 2 +-
.../xorg-driver/xf86-video-glamo_git.bb | 2 +-
.../xorg-driver/xf86-video-omapfb_git.bb | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib_0.0.6.bb b/meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib_0.0.6.bb
index fa59036..ea12955 100644
--- a/meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib_0.0.6.bb
+++ b/meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib_0.0.6.bb
@@ -1,4 +1,4 @@
-require recipes-graphics/xorg-driver/xf86-input-common.inc
+require recipes-graphics/xorg-driver/xorg-driver-input.inc
DESCRIPTION = "X.Org X server -- tslib input driver"
DEPENDS += "tslib"
RRECOMMENDS_${PN} += "tslib-calibrate"
diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-input-void_1.4.0.bb b/meta-oe/recipes-graphics/xorg-driver/xf86-input-void_1.4.0.bb
index 71b7cbc..fa15645 100644
--- a/meta-oe/recipes-graphics/xorg-driver/xf86-input-void_1.4.0.bb
+++ b/meta-oe/recipes-graphics/xorg-driver/xf86-input-void_1.4.0.bb
@@ -1,4 +1,4 @@
-require recipes-graphics/xorg-driver/xf86-input-common.inc
+require recipes-graphics/xorg-driver/xorg-driver-input.inc
DESCRIPTION = "X.Org X server -- void input driver"
PR = "r16"
diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-video-fbdev_0.4.2.bb b/meta-oe/recipes-graphics/xorg-driver/xf86-video-fbdev_0.4.2.bb
index 4c85704..eec92a1 100644
--- a/meta-oe/recipes-graphics/xorg-driver/xf86-video-fbdev_0.4.2.bb
+++ b/meta-oe/recipes-graphics/xorg-driver/xf86-video-fbdev_0.4.2.bb
@@ -1,4 +1,4 @@
-require recipes-graphics/xorg-driver/xf86-video-common.inc
+require recipes-graphics/xorg-driver/xorg-driver-video.inc
LIC_FILES_CHKSUM = "file://COPYING;md5=d8cbd99fff773f92e844948f74ef0df8"
DESCRIPTION = "X.Org X server -- fbdev display driver"
diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-video-geode_2.11.12.bb b/meta-oe/recipes-graphics/xorg-driver/xf86-video-geode_2.11.12.bb
index e44cf49..0041c53 100644
--- a/meta-oe/recipes-graphics/xorg-driver/xf86-video-geode_2.11.12.bb
+++ b/meta-oe/recipes-graphics/xorg-driver/xf86-video-geode_2.11.12.bb
@@ -1,4 +1,4 @@
-require recipes-graphics/xorg-driver/xf86-video-common.inc
+require recipes-graphics/xorg-driver/xorg-driver-video.inc
LIC_FILES_CHKSUM = "file://COPYING;md5=f8ad89d9d9a024f19d7dcc5acb044a42"
DESCRIPTION = "X.org server -- Geode GX2/LX display driver"
diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo_git.bb b/meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo_git.bb
index 3608fb2..51397da 100644
--- a/meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo_git.bb
+++ b/meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo_git.bb
@@ -1,4 +1,4 @@
-require recipes-graphics/xorg-driver/xf86-video-common.inc
+require recipes-graphics/xorg-driver/xorg-driver-video.inc
DESCRIPTION = "X.Org X server -- Glamo display driver with KMS support"
DEPENDS += "libdrm"
diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb b/meta-oe/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb
index e30972c..a73b5e6 100644
--- a/meta-oe/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb
+++ b/meta-oe/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb
@@ -1,4 +1,4 @@
-require recipes-graphics/xorg-driver/xf86-driver-common.inc
+require recipes-graphics/xorg-driver/xorg-driver-common.inc
DESCRIPTION = "X.Org X server -- OMAP display driver"
PV = "0.1.1+${PR}+gitr${SRCREV}"
--
1.7.6.1
^ permalink raw reply related [flat|nested] 46+ messages in thread
* [meta-oe][meta-efl][PATCH 00/15] Pull request #23
@ 2011-09-30 12:56 Martin Jansa
2011-09-30 12:56 ` [meta-oe][meta-efl][PATCH 01/15] glib-2.0: upgrade from 2.29.3+git to 2.30.0 release Martin Jansa
` (15 more replies)
0 siblings, 16 replies; 46+ messages in thread
From: Martin Jansa @ 2011-09-30 12:56 UTC (permalink / raw)
To: openembedded-devel
Hi,
this patchset depends on oe-core changes from:
http://lists.linuxtogo.org/pipermail/openembedded-core/2011-September/010393.html
but first few patches from that patchset are already in master-next and we need to
be ready to adapt.
Patch 2 will be needed as soon as
http://lists.linuxtogo.org/pipermail/openembedded-core/2011-September/010401.html
is applied
and patches 9-15 depends on xserver-xf86, libx11 and mesa patches in oe-core
The following changes since commit 6786f3118988e625b7ad8d7758c94e302789693f:
tcp-wrappers: Use the recipe from oe-core (2011-09-27 17:40:02 -0700)
are available in the git repository at:
git://git.openembedded.org/meta-openembedded-contrib jansa/pull
http://cgit.openembedded.org/cgit.cgi/meta-openembedded-contrib/log/?h=jansa/pull
Martin Jansa (15):
glib-2.0: upgrade from 2.29.3+git to 2.30.0 release
xorg-driver: use renamed .inc from oe-core
libxft, libxrender, renderproto: move native BBCLASSEXTENDs to
oe-core
xf86-video-omapfb: merged to oe-core
recipes: use allarch instead of PACKAGE_ARCH = all
e-base: bump EFL_SRCREV
e-wm: include /usr/lib/enlightenment/modules/wizard/favorites/.order
in FILES+${PN}
e-wm-theme-illume-efenniht, exquisite-theme-illume,
elementary-theme-efenniht: add LIC_FILES_CHKSUM
xserver-xorg: drop 1.10.2 and use xserver-xf86-lite-1.11.0 from
oe-core instead
libx11: drop here, 1.4.4 should be in oe-core
task-x11: use xserver-xf86-lite as default XSERVER
xf86-video-glamo: change RDEPENDS for xserver-xf86-dri-lite
mesa: drop, there should be mesa-7.11 in oe-core
talloc: drop from meta-oe, no longer needed by mesa
glx-use-tls: moved to oe-core with mesa recipes
meta-efl/classes/e-base.bbclass | 2 +-
.../e17/e-wm-theme-illume-efenniht/LICENSE | 25 +
.../e17/e-wm-theme-illume-efenniht_svn.bb | 11 +-
meta-efl/recipes-efl/e17/e-wm_svn.bb | 23 +-
meta-efl/recipes-efl/e17/exquisite-theme-illume.bb | 12 +-
.../recipes-efl/e17/exquisite-theme-illume/LICENSE | 25 +
.../efl/elementary-theme-efenniht/LICENSE | 25 +
.../efl/elementary-theme-efenniht_svn.bb | 9 +-
.../hicolor-icon-theme/hicolor-icon-theme_0.12.bb | 6 +-
.../recipes-gnome/themes/gnome-themes_2.32.1.bb | 5 +-
meta-oe/classes/glx-use-tls.bbclass | 7 -
...003-gatomic-proper-pointer-get-cast.patch.patch | 28 -
.../0005-glib-mkenums-interpreter.patch.patch | 25 -
.../60_wait-longer-for-threads-to-die.patch | 24 +-
.../glib-2.0/remove.test.for.qsort_r.patch | 77 +-
.../{glib-2.0_git.bb => glib-2.0_2.30.0.bb} | 21 +-
meta-oe/recipes-core/tasks/task-x11.bb | 4 +-
meta-oe/recipes-core/udev/udev-extra-rules.bb | 6 +-
meta-oe/recipes-graphics/mesa/README | 12 -
meta-oe/recipes-graphics/mesa/mesa-7.10.2.inc | 19 -
.../recipes-graphics/mesa/mesa-7.10.2/glamo.patch | 2425 --------------------
.../recipes-graphics/mesa/mesa-7.10.2/uclibc.patch | 26 -
meta-oe/recipes-graphics/mesa/mesa-common.inc | 49 -
meta-oe/recipes-graphics/mesa/mesa-dri.inc | 27 -
meta-oe/recipes-graphics/mesa/mesa-dri_7.10.2.bb | 4 -
meta-oe/recipes-graphics/mesa/mesa-xlib.inc | 5 -
meta-oe/recipes-graphics/mesa/mesa-xlib_7.10.2.bb | 4 -
meta-oe/recipes-graphics/mesa/mesa_7.10.2.bb | 6 -
.../xorg-driver/xf86-input-tslib_0.0.6.bb | 2 +-
.../xorg-driver/xf86-input-void_1.4.0.bb | 2 +-
.../xorg-driver/xf86-video-fbdev_0.4.2.bb | 2 +-
.../xorg-driver/xf86-video-geode_2.11.12.bb | 2 +-
.../xorg-driver/xf86-video-glamo_git.bb | 4 +-
.../xf86-video-omapfb/0001-blacklist-tv-out.patch | 28 -
...virtual-size-when-configuring-framebuffer.patch | 26 -
.../xf86-video-omapfb/0003-force-plain-mode.patch | 26 -
.../0004-Attempt-to-fix-VRFB.patch | 320 ---
.../xorg-driver/xf86-video-omapfb_git.bb | 27 -
.../xorg-lib/libx11-1.4.3/keysymdef_include.patch | 19 -
.../libx11-1.4.3/x11_disable_makekeys.patch | 29 -
meta-oe/recipes-graphics/xorg-lib/libx11.inc | 52 -
meta-oe/recipes-graphics/xorg-lib/libx11_1.4.3.bb | 11 -
.../xorg-lib/libxft_2.2.0.bbappend | 1 -
.../xorg-lib/libxrender_0.9.6.bbappend | 1 -
.../xorg-proto/renderproto_0.11.1.bbappend | 1 -
.../xorg-xserver/xorg-xserver-common.inc | 126 -
.../50b9d3142ff90af2f7fa35b7b1bf9e5a07723dbd.patch | 61 -
...ack-assume-pixman-supports-overlapped-blt.patch | 14 -
.../hack-fbdev-ignore-return-mode.patch | 39 -
.../xserver-xorg-1.10.2/randr-support.patch | 102 -
.../replace-pkgconfig-sdkdir-poking.patch | 33 -
.../xorg-xserver/xserver-xorg_1.10.2.bb | 33 -
.../recipes-navigation/navit/navit-icons_svn.bb | 7 +-
meta-oe/recipes-support/iso-codes/iso-codes_1.4.bb | 7 +-
meta-oe/recipes-support/talloc/talloc_2.0.1.bb | 27 -
55 files changed, 182 insertions(+), 3732 deletions(-)
create mode 100644 meta-efl/recipes-efl/e17/e-wm-theme-illume-efenniht/LICENSE
create mode 100644 meta-efl/recipes-efl/e17/exquisite-theme-illume/LICENSE
create mode 100644 meta-efl/recipes-efl/efl/elementary-theme-efenniht/LICENSE
delete mode 100644 meta-oe/classes/glx-use-tls.bbclass
delete mode 100644 meta-oe/recipes-core/glib-2.0/glib-2.0/0003-gatomic-proper-pointer-get-cast.patch.patch
delete mode 100644 meta-oe/recipes-core/glib-2.0/glib-2.0/0005-glib-mkenums-interpreter.patch.patch
rename meta-oe/recipes-core/glib-2.0/{glib-2.0_git.bb => glib-2.0_2.30.0.bb} (61%)
delete mode 100644 meta-oe/recipes-graphics/mesa/README
delete mode 100644 meta-oe/recipes-graphics/mesa/mesa-7.10.2.inc
delete mode 100644 meta-oe/recipes-graphics/mesa/mesa-7.10.2/glamo.patch
delete mode 100644 meta-oe/recipes-graphics/mesa/mesa-7.10.2/uclibc.patch
delete mode 100644 meta-oe/recipes-graphics/mesa/mesa-common.inc
delete mode 100644 meta-oe/recipes-graphics/mesa/mesa-dri.inc
delete mode 100644 meta-oe/recipes-graphics/mesa/mesa-dri_7.10.2.bb
delete mode 100644 meta-oe/recipes-graphics/mesa/mesa-xlib.inc
delete mode 100644 meta-oe/recipes-graphics/mesa/mesa-xlib_7.10.2.bb
delete mode 100644 meta-oe/recipes-graphics/mesa/mesa_7.10.2.bb
delete mode 100644 meta-oe/recipes-graphics/xorg-driver/xf86-video-omapfb/0001-blacklist-tv-out.patch
delete mode 100644 meta-oe/recipes-graphics/xorg-driver/xf86-video-omapfb/0002-Revert-Set-virtual-size-when-configuring-framebuffer.patch
delete mode 100644 meta-oe/recipes-graphics/xorg-driver/xf86-video-omapfb/0003-force-plain-mode.patch
delete mode 100644 meta-oe/recipes-graphics/xorg-driver/xf86-video-omapfb/0004-Attempt-to-fix-VRFB.patch
delete mode 100644 meta-oe/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb
delete mode 100644 meta-oe/recipes-graphics/xorg-lib/libx11-1.4.3/keysymdef_include.patch
delete mode 100644 meta-oe/recipes-graphics/xorg-lib/libx11-1.4.3/x11_disable_makekeys.patch
delete mode 100644 meta-oe/recipes-graphics/xorg-lib/libx11.inc
delete mode 100644 meta-oe/recipes-graphics/xorg-lib/libx11_1.4.3.bb
delete mode 100644 meta-oe/recipes-graphics/xorg-lib/libxft_2.2.0.bbappend
delete mode 100644 meta-oe/recipes-graphics/xorg-lib/libxrender_0.9.6.bbappend
delete mode 100644 meta-oe/recipes-graphics/xorg-proto/renderproto_0.11.1.bbappend
delete mode 100644 meta-oe/recipes-graphics/xorg-xserver/xorg-xserver-common.inc
delete mode 100644 meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.10.2/50b9d3142ff90af2f7fa35b7b1bf9e5a07723dbd.patch
delete mode 100644 meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.10.2/hack-assume-pixman-supports-overlapped-blt.patch
delete mode 100644 meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.10.2/hack-fbdev-ignore-return-mode.patch
delete mode 100644 meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.10.2/randr-support.patch
delete mode 100644 meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.10.2/replace-pkgconfig-sdkdir-poking.patch
delete mode 100644 meta-oe/recipes-graphics/xorg-xserver/xserver-xorg_1.10.2.bb
delete mode 100644 meta-oe/recipes-support/talloc/talloc_2.0.1.bb
--
1.7.6.1
^ permalink raw reply [flat|nested] 46+ messages in thread
* [meta-oe][meta-efl][PATCH 03/15] libxft, libxrender, renderproto: move native BBCLASSEXTENDs to oe-core
2011-09-30 12:56 [meta-oe][meta-efl][PATCH 00/15] Pull request #23 Martin Jansa
2011-09-30 12:56 ` [meta-oe][meta-efl][PATCH 01/15] glib-2.0: upgrade from 2.29.3+git to 2.30.0 release Martin Jansa
2011-09-30 12:56 ` [meta-oe][meta-efl][PATCH 02/15] xorg-driver: use renamed .inc from oe-core Martin Jansa
@ 2011-09-30 12:56 ` Martin Jansa
2011-09-30 12:56 ` [meta-oe][meta-efl][PATCH 04/15] xf86-video-omapfb: merged " Martin Jansa
` (12 subsequent siblings)
15 siblings, 0 replies; 46+ messages in thread
From: Martin Jansa @ 2011-09-30 12:56 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
.../xorg-lib/libxft_2.2.0.bbappend | 1 -
.../xorg-lib/libxrender_0.9.6.bbappend | 1 -
.../xorg-proto/renderproto_0.11.1.bbappend | 1 -
3 files changed, 0 insertions(+), 3 deletions(-)
delete mode 100644 meta-oe/recipes-graphics/xorg-lib/libxft_2.2.0.bbappend
delete mode 100644 meta-oe/recipes-graphics/xorg-lib/libxrender_0.9.6.bbappend
delete mode 100644 meta-oe/recipes-graphics/xorg-proto/renderproto_0.11.1.bbappend
diff --git a/meta-oe/recipes-graphics/xorg-lib/libxft_2.2.0.bbappend b/meta-oe/recipes-graphics/xorg-lib/libxft_2.2.0.bbappend
deleted file mode 100644
index 608377e..0000000
--- a/meta-oe/recipes-graphics/xorg-lib/libxft_2.2.0.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-oe/recipes-graphics/xorg-lib/libxrender_0.9.6.bbappend b/meta-oe/recipes-graphics/xorg-lib/libxrender_0.9.6.bbappend
deleted file mode 100644
index 608377e..0000000
--- a/meta-oe/recipes-graphics/xorg-lib/libxrender_0.9.6.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-oe/recipes-graphics/xorg-proto/renderproto_0.11.1.bbappend b/meta-oe/recipes-graphics/xorg-proto/renderproto_0.11.1.bbappend
deleted file mode 100644
index 608377e..0000000
--- a/meta-oe/recipes-graphics/xorg-proto/renderproto_0.11.1.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-BBCLASSEXTEND = "native nativesdk"
--
1.7.6.1
^ permalink raw reply related [flat|nested] 46+ messages in thread
* [meta-oe][meta-efl][PATCH 04/15] xf86-video-omapfb: merged to oe-core
2011-09-30 12:56 [meta-oe][meta-efl][PATCH 00/15] Pull request #23 Martin Jansa
` (2 preceding siblings ...)
2011-09-30 12:56 ` [meta-oe][meta-efl][PATCH 03/15] libxft, libxrender, renderproto: move native BBCLASSEXTENDs to oe-core Martin Jansa
@ 2011-09-30 12:56 ` Martin Jansa
2011-09-30 12:56 ` [meta-oe][meta-efl][PATCH 05/15] recipes: use allarch instead of PACKAGE_ARCH = all Martin Jansa
` (11 subsequent siblings)
15 siblings, 0 replies; 46+ messages in thread
From: Martin Jansa @ 2011-09-30 12:56 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
.../xf86-video-omapfb/0001-blacklist-tv-out.patch | 28 --
...virtual-size-when-configuring-framebuffer.patch | 26 --
.../xf86-video-omapfb/0003-force-plain-mode.patch | 26 --
.../0004-Attempt-to-fix-VRFB.patch | 320 --------------------
.../xorg-driver/xf86-video-omapfb_git.bb | 27 --
5 files changed, 0 insertions(+), 427 deletions(-)
delete mode 100644 meta-oe/recipes-graphics/xorg-driver/xf86-video-omapfb/0001-blacklist-tv-out.patch
delete mode 100644 meta-oe/recipes-graphics/xorg-driver/xf86-video-omapfb/0002-Revert-Set-virtual-size-when-configuring-framebuffer.patch
delete mode 100644 meta-oe/recipes-graphics/xorg-driver/xf86-video-omapfb/0003-force-plain-mode.patch
delete mode 100644 meta-oe/recipes-graphics/xorg-driver/xf86-video-omapfb/0004-Attempt-to-fix-VRFB.patch
delete mode 100644 meta-oe/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb
diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-video-omapfb/0001-blacklist-tv-out.patch b/meta-oe/recipes-graphics/xorg-driver/xf86-video-omapfb/0001-blacklist-tv-out.patch
deleted file mode 100644
index 5ac3b7a..0000000
--- a/meta-oe/recipes-graphics/xorg-driver/xf86-video-omapfb/0001-blacklist-tv-out.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 05efb061f1945425d214ff6b6050883e6d8633bf Mon Sep 17 00:00:00 2001
-From: Koen Kooi <koen@dominion.thruhere.net>
-Date: Wed, 26 Jan 2011 13:21:12 +0100
-Subject: [PATCH 1/3] blacklist tv out
-
-Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
----
- src/omapfb-output-dss.c | 4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
-
-diff --git a/src/omapfb-output-dss.c b/src/omapfb-output-dss.c
-index 6cc52de..83cb711 100644
---- a/src/omapfb-output-dss.c
-+++ b/src/omapfb-output-dss.c
-@@ -205,6 +205,10 @@ OMAPFBDSSOutputDetect (xf86OutputPtr output)
- if(ofb->timings[idx][0] == '\0')
- return XF86OutputStatusDisconnected;
-
-+ // Hack to disable the tv out
-+ if (strncmp(output->name, "tv", 2) == 0)
-+ return XF86OutputStatusDisconnected;
-+
- return XF86OutputStatusConnected;
- }
-
---
-1.6.6.1
-
diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-video-omapfb/0002-Revert-Set-virtual-size-when-configuring-framebuffer.patch b/meta-oe/recipes-graphics/xorg-driver/xf86-video-omapfb/0002-Revert-Set-virtual-size-when-configuring-framebuffer.patch
deleted file mode 100644
index 41d5f13..0000000
--- a/meta-oe/recipes-graphics/xorg-driver/xf86-video-omapfb/0002-Revert-Set-virtual-size-when-configuring-framebuffer.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 316f31253902eb3567ef62faf52b3f0a5d6b0c93 Mon Sep 17 00:00:00 2001
-From: Koen Kooi <koen@dominion.thruhere.net>
-Date: Wed, 26 Jan 2011 13:27:20 +0100
-Subject: [PATCH 2/3] Revert "Set virtual size when configuring framebuffer"
-
-This reverts commit 2653ef07883fbd1a5e7025f9300cf89b79ba429a.
----
- src/omapfb-crtc.c | 2 --
- 1 files changed, 0 insertions(+), 2 deletions(-)
-
-diff --git a/src/omapfb-crtc.c b/src/omapfb-crtc.c
-index 9aaa52f..d321a5a 100644
---- a/src/omapfb-crtc.c
-+++ b/src/omapfb-crtc.c
-@@ -98,8 +98,6 @@ OMAPFBCrtcCommitChangeMode (xf86CrtcPtr crtc)
- v = ofb->state_info;
- v.xres = mode->HDisplay;
- v.yres = mode->VDisplay;
-- v.xres_virtual = crtc->scrn->virtualX;
-- v.yres_virtual = crtc->scrn->virtualY;
- v.activate = FB_ACTIVATE_NOW;
- v.pixclock = KHZ2PICOS(mode->Clock ? mode->Clock : 56000);
- v.left_margin = mode->HTotal - mode->HSyncEnd;
---
-1.6.6.1
-
diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-video-omapfb/0003-force-plain-mode.patch b/meta-oe/recipes-graphics/xorg-driver/xf86-video-omapfb/0003-force-plain-mode.patch
deleted file mode 100644
index 06eeca9..0000000
--- a/meta-oe/recipes-graphics/xorg-driver/xf86-video-omapfb/0003-force-plain-mode.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From b7acfade1ac15332ebfd24d4bf02b466858c8cf8 Mon Sep 17 00:00:00 2001
-From: Koen Kooi <koen@dominion.thruhere.net>
-Date: Wed, 26 Jan 2011 13:20:20 +0100
-Subject: [PATCH 3/3] force 'plain' mode
-
-Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
----
- src/omapfb-driver.c | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/src/omapfb-driver.c b/src/omapfb-driver.c
-index 018e040..48aa09c 100644
---- a/src/omapfb-driver.c
-+++ b/src/omapfb-driver.c
-@@ -326,7 +326,7 @@ OMAPFBPreInit(ScrnInfoPtr pScrn, int flags)
- OMAPFBProbeController(ofb->ctrl_name);
-
- /* Do we have the DSS kernel API? */
-- if (stat(SYSFS_DSS_DIR, &st) == 0) {
-+ if (0) { //stat(SYSFS_DSS_DIR, &st) == 0) {
- ofb->dss = TRUE;
- } else {
- ofb->dss = FALSE;
---
-1.6.6.1
-
diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-video-omapfb/0004-Attempt-to-fix-VRFB.patch b/meta-oe/recipes-graphics/xorg-driver/xf86-video-omapfb/0004-Attempt-to-fix-VRFB.patch
deleted file mode 100644
index 4d2ecd3..0000000
--- a/meta-oe/recipes-graphics/xorg-driver/xf86-video-omapfb/0004-Attempt-to-fix-VRFB.patch
+++ /dev/null
@@ -1,320 +0,0 @@
-From 9f034f7a83751e4d1bbff6dd742d54bd96d38230 Mon Sep 17 00:00:00 2001
-From: Eino-Ville Talvala <talvala@stanford.edu>
-Date: Tue, 23 Aug 2011 18:37:01 +0200
-Subject: [PATCH] Attempt to fix VRFB Signed-off-by: Sebastian Krzyszkowiak
- <dos@dosowisko.net>
-
----
- src/image-format-conversions.c | 4 +-
- src/image-format-conversions.h | 2 +-
- src/omapfb-driver.c | 28 +++++++++++++--
- src/omapfb-xv-blizzard.c | 1 +
- src/omapfb-xv-generic.c | 72 +++++++++++++++++++++++++++++++--------
- src/omapfb-xv.c | 3 ++
- 6 files changed, 88 insertions(+), 22 deletions(-)
-
-diff --git a/src/image-format-conversions.c b/src/image-format-conversions.c
-index dcefa9b..d43427d 100644
---- a/src/image-format-conversions.c
-+++ b/src/image-format-conversions.c
-@@ -38,13 +38,13 @@
- #include "image-format-conversions.h"
-
- /* Basic line-based copy for packed formats */
--void packed_line_copy(int w, int h, int stride, uint8_t *src, uint8_t *dest)
-+void packed_line_copy(int w, int h, int src_stride, int dst_stride, uint8_t *src, uint8_t *dest)
- {
- int i;
- int len = w * 2;
- for (i = 0; i < h; i++)
- {
-- memcpy(dest + i * len, src + i * stride, len);
-+ memcpy(dest + i * dst_stride, src + i * src_stride, len);
- }
- }
-
-diff --git a/src/image-format-conversions.h b/src/image-format-conversions.h
-index 584896a..ba7caf2 100644
---- a/src/image-format-conversions.h
-+++ b/src/image-format-conversions.h
-@@ -27,7 +27,7 @@
- #include <stdint.h>
-
- /* Basic line-based copy for packed formats */
--void packed_line_copy(int w, int h, int stride, uint8_t *src, uint8_t *dest);
-+void packed_line_copy(int w, int h, int src_stride, int dst_stride, uint8_t *src, uint8_t *dest);
-
- /* Basic C implementation of YV12/I420 to UYVY conversion */
- void uv12_to_uyvy(int w, int h, int y_pitch, int uv_pitch, uint8_t *y_p, uint8_t *u_p, uint8_t *v_p, uint8_t *dest);
-diff --git a/src/omapfb-driver.c b/src/omapfb-driver.c
-index 48aa09c..07989f5 100644
---- a/src/omapfb-driver.c
-+++ b/src/omapfb-driver.c
-@@ -66,6 +66,7 @@
- #define OMAPFB_VERSION 1000
- #define OMAPFB_DRIVER_NAME "OMAPFB"
- #define OMAPFB_NAME "omapfb"
-+#define ENFORCE_MODES
-
- static Bool OMAPFBProbe(DriverPtr drv, int flags);
- static Bool OMAPFBPreInit(ScrnInfoPtr pScrn, int flags);
-@@ -105,11 +106,13 @@ static SymTabRec OMAPFBChipsets[] = {
- typedef enum {
- OPTION_ACCELMETHOD,
- OPTION_FB,
-+ OPTION_ROTATE,
- } FBDevOpts;
-
- static const OptionInfoRec OMAPFBOptions[] = {
- { OPTION_ACCELMETHOD, "AccelMethod", OPTV_STRING, {0}, FALSE },
- { OPTION_FB, "fb", OPTV_STRING, {0}, FALSE },
-+ { OPTION_ROTATE, "rotation", OPTV_STRING, {0}, FALSE },
- { -1, NULL, OPTV_NONE, {0}, FALSE }
- };
-
-@@ -286,6 +289,7 @@ OMAPFBPreInit(ScrnInfoPtr pScrn, int flags)
- {
- OMAPFBPtr ofb;
- EntityInfoPtr pEnt;
-+ char *rotate;
- rgb zeros = { 0, 0, 0 };
- struct stat st;
-
-@@ -379,6 +383,8 @@ OMAPFBPreInit(ScrnInfoPtr pScrn, int flags)
- pScrn->progClock = TRUE;
- pScrn->chipset = "omapfb";
-
-+ xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Rotate test version 0.02\n");
-+
- /* Start with configured virtual size */
- pScrn->virtualX = pScrn->display->virtualX;
- pScrn->virtualY = pScrn->display->virtualY;
-@@ -496,12 +502,21 @@ OMAPFBScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
- ofb->CloseScreen = pScreen->CloseScreen;
- pScreen->CloseScreen = OMAPFBCloseScreen;
-
-+ /* Enforce the default mode (this is silly I guess) */
-+#ifdef ENFORCE_MODES
-+ //xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Enforcing modes\n");
-+ //set_mode(ofb, &ofb->default_mode);
-+ //pScrn->displayWidth = ofb->fixed_info.line_length /
-+ // (ofb->state_info.bits_per_pixel>>3); //ofb->state_info.xres;
-+#endif
-+
- /* Map our framebuffer memory */
-+ ofb->mem_info.size = ofb->fixed_info.line_length * ofb->state_info.yres;
- ofb->fb = mmap (NULL, ofb->mem_info.size,
- PROT_READ | PROT_WRITE, MAP_SHARED,
- ofb->fd, 0);
-- if (ofb->fb == NULL) {
-- xf86DrvMsg(scrnIndex, X_ERROR, "Mapping framebuffer memory failed\n");
-+ if (ofb->fb == MAP_FAILED) {
-+ xf86DrvMsg(scrnIndex, X_ERROR, "Mapping framebuffer memory failed, wanted %d bytes.\n", ofb->mem_info.size);
- return FALSE;
- }
-
-@@ -578,8 +593,13 @@ OMAPFBScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
- } else if (!ofb->dss) {
-
- ofb->plane_info.enabled = 1;
-- ofb->plane_info.out_width = ofb->state_info.xres;
-- ofb->plane_info.out_height = ofb->state_info.yres;
-+ if (ofb->state_info.rotate == 0 || ofb->state_info.rotate == 2) {
-+ ofb->plane_info.out_width = ofb->state_info.xres;
-+ ofb->plane_info.out_height = ofb->state_info.yres;
-+ } else {
-+ ofb->plane_info.out_width = ofb->state_info.yres;
-+ ofb->plane_info.out_height = ofb->state_info.xres;
-+ }
-
- if (ioctl (ofb->fd, OMAPFB_SETUP_PLANE, &ofb->plane_info)) {
- xf86DrvMsg(scrnIndex, X_ERROR,
-diff --git a/src/omapfb-xv-blizzard.c b/src/omapfb-xv-blizzard.c
-index 406ffc6..b71d2aa 100644
---- a/src/omapfb-xv-blizzard.c
-+++ b/src/omapfb-xv-blizzard.c
-@@ -220,6 +220,7 @@ int OMAPFBXVPutImageBlizzard (ScrnInfoPtr pScrn,
- packed_line_copy(src_w & ~3,
- src_h & ~3,
- ((src_w + 1) & ~1) * 2,
-+ ofb->port->fixed_info.line_length,
- (uint8_t*)buf,
- (uint8_t*)ofb->port->fb);
- break;
-diff --git a/src/omapfb-xv-generic.c b/src/omapfb-xv-generic.c
-index e6f89fe..b33f344 100644
---- a/src/omapfb-xv-generic.c
-+++ b/src/omapfb-xv-generic.c
-@@ -62,7 +62,7 @@ int OMAPXVAllocPlane(ScrnInfoPtr pScrn)
- {
- OMAPFBPtr ofb = OMAPFB(pScrn);
-
-- /* The memory size is already set in OMAPFBXVQueryImageAttributes */
-+ /* The memory size is already set before we get here */
- if (ioctl(ofb->port->fd, OMAPFB_SETUP_MEM, &ofb->port->mem_info) != 0) {
- xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
- "Failed to allocate video plane memory\n");
-@@ -73,19 +73,20 @@ int OMAPXVAllocPlane(ScrnInfoPtr pScrn)
- ofb->port->fb = mmap (NULL, ofb->port->mem_info.size,
- PROT_READ | PROT_WRITE, MAP_SHARED,
- ofb->port->fd, 0);
-- if (ofb->port->fb == NULL) {
-+ if (ofb->port->fb == MAP_FAILED) {
- xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
- "Mapping video memory failed\n");
- return XvBadAlloc;
- }
-
- /* Update the state info */
-+ /* Let's not - it's bad
- if (ioctl (ofb->port->fd, FBIOGET_VSCREENINFO, &ofb->port->state_info))
- {
- xf86Msg(X_ERROR, "%s: Reading state info failed\n", __FUNCTION__);
- return XvBadAlloc;
- }
--
-+ */
- return Success;
- }
-
-@@ -93,6 +94,7 @@ int OMAPXVAllocPlane(ScrnInfoPtr pScrn)
- int OMAPXVSetupVideoPlane(ScrnInfoPtr pScrn)
- {
- OMAPFBPtr ofb = OMAPFB(pScrn);
-+ int ret;
-
- if (ioctl (ofb->port->fd, FBIOPUT_VSCREENINFO, &ofb->port->state_info))
- {
-@@ -104,6 +106,31 @@ int OMAPXVSetupVideoPlane(ScrnInfoPtr pScrn)
- xf86Msg(X_ERROR, "%s: Reading state info failed\n", __FUNCTION__);
- return XvBadAlloc;
- }
-+ /* Changing rotation/nonstd flags can change the fixed info! */
-+ if (ioctl (ofb->port->fd, FBIOGET_FSCREENINFO, &ofb->port->fixed_info))
-+ {
-+ xf86Msg(X_ERROR, "%s: Reading state info failed\n", __FUNCTION__);
-+ return XvBadAlloc;
-+ }
-+ /* Correct fixed info requires recalculation of needed memory */
-+ ofb->port->mem_info.size = ofb->port->fixed_info.line_length * ofb->port->state_info.yres;
-+
-+ /* Allocate buffer memory */
-+ ret = OMAPXVAllocPlane(pScrn);
-+ if (ret != Success)
-+ return ret;
-+
-+ /* Workaround for reset of mode after memory allo */
-+ if (ioctl (ofb->port->fd, FBIOPUT_VSCREENINFO, &ofb->port->state_info))
-+ {
-+ xf86Msg(X_ERROR, "%s: setting state info failed\n", __FUNCTION__);
-+ return XvBadAlloc;
-+ }
-+ if (ioctl (ofb->port->fd, FBIOGET_VSCREENINFO, &ofb->port->state_info))
-+ {
-+ xf86Msg(X_ERROR, "%s: Reading state info failed\n", __FUNCTION__);
-+ return XvBadAlloc;
-+ }
-
- if(ioctl(ofb->port->fd, OMAPFB_SETUP_PLANE,
- &ofb->port->plane_info) != 0) {
-@@ -124,6 +151,8 @@ int OMAPFBXVPutImageGeneric (ScrnInfoPtr pScrn,
- DrawablePtr pDraw)
- {
- OMAPFBPtr ofb = OMAPFB(pScrn);
-+ short drw_temp;
-+ short rot_xres, rot_yres;
-
- if (!ofb->port->plane_info.enabled
- || ofb->port->update_window.x != src_x
-@@ -163,13 +192,6 @@ int OMAPFBXVPutImageGeneric (ScrnInfoPtr pScrn,
- return Success;
- }
-
-- /* If we don't have the plane running, enable it */
-- if (!ofb->port->plane_info.enabled) {
-- ret = OMAPXVAllocPlane(pScrn);
-- if (ret != Success)
-- return ret;
-- }
--
- /* Set up the state info, xres and yres will be used for
- * scaling to the values in the plane info struct
- */
-@@ -179,12 +201,31 @@ int OMAPFBXVPutImageGeneric (ScrnInfoPtr pScrn,
- ofb->port->state_info.yres_virtual = 0;
- ofb->port->state_info.xoffset = 0;
- ofb->port->state_info.yoffset = 0;
-- ofb->port->state_info.rotate = 0;
-+ //ofb->port->state_info.rotate = 0;
- ofb->port->state_info.grayscale = 0;
- ofb->port->state_info.activate = FB_ACTIVATE_NOW;
- ofb->port->state_info.bits_per_pixel = 0;
- ofb->port->state_info.nonstd = xv_to_omapfb_format(image);
-
-+ /* Plane info does not rotate with state_info */
-+ if (ofb->port->state_info.rotate == 1 ||
-+ ofb->port->state_info.rotate == 3) {
-+ drw_temp = drw_x;
-+ drw_x = drw_y;
-+ drw_y = drw_temp;
-+
-+ drw_temp = drw_w;
-+ drw_w = drw_h;
-+ drw_h = drw_temp;
-+
-+ rot_xres = ofb->port->state_info.yres;
-+ rot_yres = ofb->port->state_info.xres;
-+ } else {
-+ rot_xres = ofb->port->state_info.xres;
-+ rot_yres = ofb->port->state_info.yres;
-+ }
-+
-+
- /* Set up the video plane info */
- ofb->port->plane_info.enabled = 1;
- ofb->port->plane_info.pos_x = drw_x;
-@@ -193,13 +234,13 @@ int OMAPFBXVPutImageGeneric (ScrnInfoPtr pScrn,
- ofb->port->plane_info.out_height = drw_h & ~15;
-
- /* Cap output to screen size */
-- if (ofb->port->plane_info.out_width > ofb->state_info.xres) {
-+ if (ofb->port->plane_info.out_width > rot_xres) {
- ofb->port->plane_info.pos_x = 0;
-- ofb->port->plane_info.out_width = ofb->state_info.xres;
-+ ofb->port->plane_info.out_width = rot_xres;
- }
-- if (ofb->port->plane_info.out_height > ofb->state_info.yres) {
-+ if (ofb->port->plane_info.out_height > rot_yres) {
- ofb->port->plane_info.pos_y = 0;
-- ofb->port->plane_info.out_height = ofb->state_info.yres;
-+ ofb->port->plane_info.out_height = rot_yres;
- }
-
- ret = OMAPXVSetupVideoPlane(pScrn);
-@@ -223,6 +264,7 @@ int OMAPFBXVPutImageGeneric (ScrnInfoPtr pScrn,
- packed_line_copy(src_w & ~15,
- src_h & ~15,
- ((src_w + 1) & ~1) * 2,
-+ ofb->port->fixed_info.line_length,
- (uint8_t*)buf,
- (uint8_t*)ofb->port->fb);
- break;
-diff --git a/src/omapfb-xv.c b/src/omapfb-xv.c
-index 1df651e..0fee2c6 100644
---- a/src/omapfb-xv.c
-+++ b/src/omapfb-xv.c
-@@ -169,8 +169,11 @@ static int OMAPFBXVQueryImageAttributes (ScrnInfoPtr pScrn,
- h = *height;
-
- w = (w + 1) & ~1;
-+
-+ /* Can't calculate these here - don't know line length
- ofb->port->mem_info.size = w << 1;
- ofb->port->mem_info.size *= h;
-+ */
-
- return size;
- }
---
-1.7.5.4
-
diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb b/meta-oe/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb
deleted file mode 100644
index a73b5e6..0000000
--- a/meta-oe/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb
+++ /dev/null
@@ -1,27 +0,0 @@
-require recipes-graphics/xorg-driver/xorg-driver-common.inc
-
-DESCRIPTION = "X.Org X server -- OMAP display driver"
-PV = "0.1.1+${PR}+gitr${SRCREV}"
-PR = "r16"
-
-LICENSE = "MIT-X"
-LIC_FILES_CHKSUM = "file://src/omapfb-driver.c;beginline=1;endline=30;md5=a44c2a37e04d1c2c5f0313afb493f833"
-
-SRC_URI = "git://git.pingu.fi/xf86-video-omapfb;protocol=http \
- file://0001-blacklist-tv-out.patch \
- file://0002-Revert-Set-virtual-size-when-configuring-framebuffer.patch \
- file://0003-force-plain-mode.patch \
- file://0004-Attempt-to-fix-VRFB.patch \
- "
-
-SRCREV_pn-${PN} = "28c006c94e57ea71df11ec4fff79d7ffcfc4860f"
-S = "${WORKDIR}/git"
-
-EXTRA_OECONF_armv7a = " --enable-neon "
-
-# Use overlay 2 on omap3 to enable other apps to use overlay 1 (e.g. dmai or omapfbplay)
-do_compile_prepend_armv7a () {
- sed -i -e s:fb1:fb2:g ${S}/src/omapfb-xv.c
-}
-
-CFLAGS += " -I${STAGING_INCDIR}/xorg "
--
1.7.6.1
^ permalink raw reply related [flat|nested] 46+ messages in thread
* [meta-oe][meta-efl][PATCH 05/15] recipes: use allarch instead of PACKAGE_ARCH = all
2011-09-30 12:56 [meta-oe][meta-efl][PATCH 00/15] Pull request #23 Martin Jansa
` (3 preceding siblings ...)
2011-09-30 12:56 ` [meta-oe][meta-efl][PATCH 04/15] xf86-video-omapfb: merged " Martin Jansa
@ 2011-09-30 12:56 ` Martin Jansa
2011-09-30 12:56 ` [meta-oe][meta-efl][PATCH 06/15] e-base: bump EFL_SRCREV Martin Jansa
` (10 subsequent siblings)
15 siblings, 0 replies; 46+ messages in thread
From: Martin Jansa @ 2011-09-30 12:56 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
.../e17/e-wm-theme-illume-efenniht_svn.bb | 4 +-
meta-efl/recipes-efl/e17/e-wm_svn.bb | 22 +-------------------
meta-efl/recipes-efl/e17/exquisite-theme-illume.bb | 5 +--
.../efl/elementary-theme-efenniht_svn.bb | 5 +--
.../hicolor-icon-theme/hicolor-icon-theme_0.12.bb | 6 +---
.../recipes-gnome/themes/gnome-themes_2.32.1.bb | 5 +--
| 6 ++--
.../recipes-navigation/navit/navit-icons_svn.bb | 7 +----
meta-oe/recipes-support/iso-codes/iso-codes_1.4.bb | 7 ++---
9 files changed, 19 insertions(+), 48 deletions(-)
diff --git a/meta-efl/recipes-efl/e17/e-wm-theme-illume-efenniht_svn.bb b/meta-efl/recipes-efl/e17/e-wm-theme-illume-efenniht_svn.bb
index 804f670..aaa2e14 100644
--- a/meta-efl/recipes-efl/e17/e-wm-theme-illume-efenniht_svn.bb
+++ b/meta-efl/recipes-efl/e17/e-wm-theme-illume-efenniht_svn.bb
@@ -4,13 +4,13 @@ HOMEPAGE = "http://trac.enlightenment.org/e/wiki/Themes#Efenniht"
DEPENDS = "edje-native"
RDEPENDS_${PN} = "e-wm"
RSUGGESTS_${PN} = "elementary-theme-efenniht"
-PACKAGE_ARCH = "all"
LICENSE = "MIT/BSD"
SRCREV = "${EFL_SRCREV}"
PV = "0.0+svnr${SRCPV}"
+PR = "r1"
-inherit e-base
+inherit e-base allarch
SRCNAME = "efenniht"
SRC_URI = "${E_SVN}/trunk/THEMES;module=${SRCNAME};proto=http"
diff --git a/meta-efl/recipes-efl/e17/e-wm_svn.bb b/meta-efl/recipes-efl/e17/e-wm_svn.bb
index 2d0f44d..55c9874 100644
--- a/meta-efl/recipes-efl/e17/e-wm_svn.bb
+++ b/meta-efl/recipes-efl/e17/e-wm_svn.bb
@@ -4,7 +4,7 @@ LICENSE = "MIT BSD"
LIC_FILES_CHKSUM = "file://COPYING;md5=2667a0f4120372ea91f7467cdff4095f"
SRCNAME = "e"
PV = "0.16.999.060+svnr${SRCPV}"
-PR = "r19"
+PR = "r20"
SRCREV = "${EFL_SRCREV}"
inherit e update-alternatives gettext
@@ -95,26 +95,6 @@ RRECOMMENDS_${PN} = "\
${ESYSACTIONS} \
"
-PACKAGE_ARCH_${PN}-config-default = "all"
-PACKAGE_ARCH_${PN}-config-illume2 = "all"
-PACKAGE_ARCH_${PN}-config-minimalist = "all"
-PACKAGE_ARCH_${PN}-config-netbook = "all"
-PACKAGE_ARCH_${PN}-config-scaleable = "all"
-PACKAGE_ARCH_${PN}-config-standard = "all"
-PACKAGE_ARCH_${PN}-theme-default = "all"
-PACKAGE_ARCH_${PN}-background-dark-gradient = "all"
-PACKAGE_ARCH_${PN}-background-light-gradient = "all"
-PACKAGE_ARCH_${PN}-images = "all"
-PACKAGE_ARCH_${PN}-icons = "all"
-PACKAGE_ARCH_${PN}-other = "all"
-PACKAGE_ARCH_${PN}-input-methods = "all"
-PACKAGE_ARCH_${PN}-sysactions = "all"
-PACKAGE_ARCH_${PN}-menu = "all"
-PACKAGE_ARCH_efm-desktop-icon = "all"
-PACKAGE_ARCH_illume-keyboard-default-alpha = "all"
-PACKAGE_ARCH_illume-keyboard-default-numeric = "all"
-PACKAGE_ARCH_illume-keyboard-default-terminal = "all"
-
FILES_${PN} = "\
${bindir}/* \
${libdir}/enlightenment/utils/* \
diff --git a/meta-efl/recipes-efl/e17/exquisite-theme-illume.bb b/meta-efl/recipes-efl/e17/exquisite-theme-illume.bb
index ba16190..fa394f7 100644
--- a/meta-efl/recipes-efl/e17/exquisite-theme-illume.bb
+++ b/meta-efl/recipes-efl/e17/exquisite-theme-illume.bb
@@ -3,10 +3,10 @@ LICENSE = "MIT/BSD"
SECTION = "x11"
DEPENDS = "edje-native"
PV = "1.0+svnr${SRCPV}"
-PR = "r6"
+PR = "r7"
SRCREV = "${EFL_SRCREV}"
-inherit e-base update-alternatives
+inherit e-base update-alternatives allarch
ALTERNATIVE_NAME = "exquisite-config"
ALTERNATIVE_LINK = "${sysconfdir}/exquisite/config"
@@ -29,6 +29,5 @@ do_install() {
echo 'THEME="-t illume"' > ${D}${sysconfdir}/exquisite/config-illume
}
-PACKAGE_ARCH = "all"
CONFFILES_${PN} = "${sysconfdir}/exquisite/config-illume"
FILES_${PN} = "${sysconfdir}/exquisite ${datadir}/exquisite/data/themes"
diff --git a/meta-efl/recipes-efl/efl/elementary-theme-efenniht_svn.bb b/meta-efl/recipes-efl/efl/elementary-theme-efenniht_svn.bb
index 68d9ee3..1cf7bd5 100644
--- a/meta-efl/recipes-efl/efl/elementary-theme-efenniht_svn.bb
+++ b/meta-efl/recipes-efl/efl/elementary-theme-efenniht_svn.bb
@@ -3,7 +3,6 @@ SECTION = "e/utils"
HOMEPAGE = "http://trac.enlightenment.org/e/wiki/Themes#Efenniht"
DEPENDS = "edje-native"
RSUGGESTS_${PN} = "e-wm-theme-illume-efenniht"
-PACKAGE_ARCH = "all"
LICENSE = "MIT/BSD"
SRCREV_THM_REV ?= "${EFL_SRCREV}"
@@ -11,9 +10,9 @@ SRCREV_ELM_REV ?= "${EFL_SRCREV}"
SRCREV_FORMAT = "THM_REV"
PV = "0.0+svnr${SRCPV}"
-PACKAGE_ARCH = "all"
+PR = "r1"
-inherit e-base
+inherit e-base allarch
SRCNAME = "efenniht"
SRC_URI = "${E_SVN}/trunk/THEMES;module=${SRCNAME};proto=http;name=THM_REV"
diff --git a/meta-gnome/recipes-gnome/hicolor-icon-theme/hicolor-icon-theme_0.12.bb b/meta-gnome/recipes-gnome/hicolor-icon-theme/hicolor-icon-theme_0.12.bb
index 1934cdb..db43267 100644
--- a/meta-gnome/recipes-gnome/hicolor-icon-theme/hicolor-icon-theme_0.12.bb
+++ b/meta-gnome/recipes-gnome/hicolor-icon-theme/hicolor-icon-theme_0.12.bb
@@ -6,15 +6,13 @@ LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=f08a446809913fc9b3c718f0eaea0426"
SECTION = "unknown"
-inherit gnome
+inherit gnome allarch
-PR = "r0"
+PR = "r1"
SRC_URI = "http://icon-theme.freedesktop.org/releases/${BPN}-${PV}.tar.gz \
file://index.theme"
-PACKAGE_ARCH = "all"
-
FILES_${PN} += "${datadir}/icons"
do_install_append () {
diff --git a/meta-gnome/recipes-gnome/themes/gnome-themes_2.32.1.bb b/meta-gnome/recipes-gnome/themes/gnome-themes_2.32.1.bb
index d0bc699..f40d355 100644
--- a/meta-gnome/recipes-gnome/themes/gnome-themes_2.32.1.bb
+++ b/meta-gnome/recipes-gnome/themes/gnome-themes_2.32.1.bb
@@ -2,6 +2,8 @@ DESCRIPTION = "GNOME themes"
LICENSE = "LGPLv2.1"
LIC_FILES_CHKSUM = "file://COPYING;md5=2b543dc97eb7594d026af39d9b54204b"
+PR = "r1"
+
SECTION = "x11/gnome"
DEPENDS = "gtk-engines icon-naming-utils icon-naming-utils-native glib-2.0 intltool-native"
RDEPENDS_${PN} = "gnome-icon-theme"
@@ -14,9 +16,6 @@ do_configure_prepend() {
sed -i -e 's:`$PKG_CONFIG --variable=program_path icon-naming-utils`:${STAGING_DIR_NATIVE}${libexecdir}:g' configure.in
}
-# allarch doesn't work, it tests the compiler
-PACKAGE_ARCH = "all"
-
PACKAGES =+ " gnome-theme-crux gnome-theme-highcontrast gnome-theme-highcontrastinverse gnome-theme-highcontrastlargeprint gnome-theme-highcontrastlargeprintinverse gnome-theme-largeprint gnome-theme-mist"
FILES_gnome-theme-crux = "${datadir}/themes/Crux ${datadir}/icons/Crux"
FILES_gnome-theme-highcontrast = "${datadir}/themes/HighContrast ${datadir}/icons/HighContrast"
--git a/meta-oe/recipes-core/udev/udev-extra-rules.bb b/meta-oe/recipes-core/udev/udev-extra-rules.bb
index dfd4080..ec3f017 100644
--- a/meta-oe/recipes-core/udev/udev-extra-rules.bb
+++ b/meta-oe/recipes-core/udev/udev-extra-rules.bb
@@ -2,7 +2,9 @@ DESCRIPTION = "Extra udev rules"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58"
-PR = "r2"
+inherit allarch
+
+PR = "r3"
SRC_URI = " \
file://automount.rules \
@@ -31,5 +33,3 @@ do_install() {
FILES_${PN} = "${sysconfdir}/udev"
RDEPENDS_${PN} = "udev"
-PACKAGE_ARCH = "all"
-
diff --git a/meta-oe/recipes-navigation/navit/navit-icons_svn.bb b/meta-oe/recipes-navigation/navit/navit-icons_svn.bb
index 116ff43..8688d0c 100644
--- a/meta-oe/recipes-navigation/navit/navit-icons_svn.bb
+++ b/meta-oe/recipes-navigation/navit/navit-icons_svn.bb
@@ -5,17 +5,14 @@ LIC_FILES_CHKSUM = "file://${WORKDIR}/GPL-2;md5=751419260aa954499f7abaabaa882bbe
SECTION = "x11/applications"
DEPENDS = "glib-2.0 gtk+ imagemagick-native librsvg-native"
-#only icons present in the package
-PACKAGE_ARCH = "all"
-
PV = "0.1.0+svnr${SRCPV}"
-PR = "r2"
+PR = "r3"
EXTRA_OECONF = "--disable-binding-python --disable-gui-sdl --disable-samplemap --enable-avoid-float --enable-avoid-unaligned --enable-svg2png-scaling-flag=32 --disable-speech-speech-dispatcher"
S = "${WORKDIR}/xpm"
-inherit autotools
+inherit autotools allarch
FILES_${PN} = " /usr/share/navit/xpm/"
diff --git a/meta-oe/recipes-support/iso-codes/iso-codes_1.4.bb b/meta-oe/recipes-support/iso-codes/iso-codes_1.4.bb
index de1893d..c9b9113 100644
--- a/meta-oe/recipes-support/iso-codes/iso-codes_1.4.bb
+++ b/meta-oe/recipes-support/iso-codes/iso-codes_1.4.bb
@@ -1,13 +1,12 @@
LICENSE = "LGPLv2.1"
LIC_FILES_CHKSUM = "file://LGPL-2.1;md5=fbc093901857fcd118f065f900982c24"
-PACKAGE_ARCH = "all"
+PR = "r1"
+
SRC_URI = "ftp://pkg-isocodes.alioth.debian.org/pub/pkg-isocodes/iso-codes-${PV}.tar.bz2"
SRC_URI[md5sum] = "4073466e57df23d39721513219e4f7ae"
SRC_URI[sha256sum] = "0a7cf177c25b3f0d77c60a5f1149aab9e03ba70f69bac70138a867efe19a1d97"
-inherit autotools
+inherit autotools allarch
FILES_${PN} += "${datadir}/xml/"
-PACKAGE_ARCH = "all"
-
--
1.7.6.1
^ permalink raw reply related [flat|nested] 46+ messages in thread
* [meta-oe][meta-efl][PATCH 06/15] e-base: bump EFL_SRCREV
2011-09-30 12:56 [meta-oe][meta-efl][PATCH 00/15] Pull request #23 Martin Jansa
` (4 preceding siblings ...)
2011-09-30 12:56 ` [meta-oe][meta-efl][PATCH 05/15] recipes: use allarch instead of PACKAGE_ARCH = all Martin Jansa
@ 2011-09-30 12:56 ` Martin Jansa
2011-09-30 12:56 ` [meta-oe][meta-efl][PATCH 07/15] e-wm: include /usr/lib/enlightenment/modules/wizard/favorites/.order in FILES+${PN} Martin Jansa
` (9 subsequent siblings)
15 siblings, 0 replies; 46+ messages in thread
From: Martin Jansa @ 2011-09-30 12:56 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta-efl/classes/e-base.bbclass | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta-efl/classes/e-base.bbclass b/meta-efl/classes/e-base.bbclass
index 0ffabdd..8eaabd8 100644
--- a/meta-efl/classes/e-base.bbclass
+++ b/meta-efl/classes/e-base.bbclass
@@ -2,7 +2,7 @@ HOMEPAGE = "http://www.enlightenment.org"
SRCNAME ?= "${BPN}"
# usually tracks svn trunk HEAD
-EFL_SRCREV ?= "63195"
+EFL_SRCREV ?= "63721"
# revision when 1.0.0 was released, for recipes which don't need rebuild so often
EFL_SRCREV_1.0.0 ?= "56356"
--
1.7.6.1
^ permalink raw reply related [flat|nested] 46+ messages in thread
* [meta-oe][meta-efl][PATCH 07/15] e-wm: include /usr/lib/enlightenment/modules/wizard/favorites/.order in FILES+${PN}
2011-09-30 12:56 [meta-oe][meta-efl][PATCH 00/15] Pull request #23 Martin Jansa
` (5 preceding siblings ...)
2011-09-30 12:56 ` [meta-oe][meta-efl][PATCH 06/15] e-base: bump EFL_SRCREV Martin Jansa
@ 2011-09-30 12:56 ` Martin Jansa
2011-09-30 12:56 ` [meta-oe][meta-efl][PATCH 08/15] e-wm-theme-illume-efenniht, exquisite-theme-illume, elementary-theme-efenniht: add LIC_FILES_CHKSUM Martin Jansa
` (8 subsequent siblings)
15 siblings, 0 replies; 46+ messages in thread
From: Martin Jansa @ 2011-09-30 12:56 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta-efl/recipes-efl/e17/e-wm_svn.bb | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/meta-efl/recipes-efl/e17/e-wm_svn.bb b/meta-efl/recipes-efl/e17/e-wm_svn.bb
index 55c9874..a4fb5b4 100644
--- a/meta-efl/recipes-efl/e17/e-wm_svn.bb
+++ b/meta-efl/recipes-efl/e17/e-wm_svn.bb
@@ -100,6 +100,7 @@ FILES_${PN} = "\
${libdir}/enlightenment/utils/* \
${libdir}/enlightenment/modules/*/*.* \
${libdir}/enlightenment/modules/*/*/* \
+ ${libdir}/enlightenment/modules/*/*/.order \
${libdir}/enlightenment/*plugins/*/*/* \
${libdir}/enlightenment/preload/e_precache.so \
${datadir}/enlightenment/data/icons \
--
1.7.6.1
^ permalink raw reply related [flat|nested] 46+ messages in thread
* [meta-oe][meta-efl][PATCH 08/15] e-wm-theme-illume-efenniht, exquisite-theme-illume, elementary-theme-efenniht: add LIC_FILES_CHKSUM
2011-09-30 12:56 [meta-oe][meta-efl][PATCH 00/15] Pull request #23 Martin Jansa
` (6 preceding siblings ...)
2011-09-30 12:56 ` [meta-oe][meta-efl][PATCH 07/15] e-wm: include /usr/lib/enlightenment/modules/wizard/favorites/.order in FILES+${PN} Martin Jansa
@ 2011-09-30 12:56 ` Martin Jansa
2011-09-30 12:56 ` [meta-oe][meta-efl][PATCH 09/15] xserver-xorg: drop 1.10.2 and use xserver-xf86-lite-1.11.0 from oe-core instead Martin Jansa
` (7 subsequent siblings)
15 siblings, 0 replies; 46+ messages in thread
From: Martin Jansa @ 2011-09-30 12:56 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
.../e17/e-wm-theme-illume-efenniht/LICENSE | 25 ++++++++++++++++++++
.../e17/e-wm-theme-illume-efenniht_svn.bb | 7 ++++-
meta-efl/recipes-efl/e17/exquisite-theme-illume.bb | 7 ++++-
.../recipes-efl/e17/exquisite-theme-illume/LICENSE | 25 ++++++++++++++++++++
.../efl/elementary-theme-efenniht/LICENSE | 25 ++++++++++++++++++++
.../efl/elementary-theme-efenniht_svn.bb | 4 ++-
6 files changed, 88 insertions(+), 5 deletions(-)
create mode 100644 meta-efl/recipes-efl/e17/e-wm-theme-illume-efenniht/LICENSE
create mode 100644 meta-efl/recipes-efl/e17/exquisite-theme-illume/LICENSE
create mode 100644 meta-efl/recipes-efl/efl/elementary-theme-efenniht/LICENSE
diff --git a/meta-efl/recipes-efl/e17/e-wm-theme-illume-efenniht/LICENSE b/meta-efl/recipes-efl/e17/e-wm-theme-illume-efenniht/LICENSE
new file mode 100644
index 0000000..61bb2f6
--- /dev/null
+++ b/meta-efl/recipes-efl/e17/e-wm-theme-illume-efenniht/LICENSE
@@ -0,0 +1,25 @@
+Copyright notice for Enlightenment:
+
+Copyright (C) 2000-2010 Carsten Haitzler and various contributors (see AUTHORS)
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/meta-efl/recipes-efl/e17/e-wm-theme-illume-efenniht_svn.bb b/meta-efl/recipes-efl/e17/e-wm-theme-illume-efenniht_svn.bb
index aaa2e14..5dfc7c9 100644
--- a/meta-efl/recipes-efl/e17/e-wm-theme-illume-efenniht_svn.bb
+++ b/meta-efl/recipes-efl/e17/e-wm-theme-illume-efenniht_svn.bb
@@ -4,7 +4,8 @@ HOMEPAGE = "http://trac.enlightenment.org/e/wiki/Themes#Efenniht"
DEPENDS = "edje-native"
RDEPENDS_${PN} = "e-wm"
RSUGGESTS_${PN} = "elementary-theme-efenniht"
-LICENSE = "MIT/BSD"
+LICENSE = "MIT BSD"
+LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE;md5=f523ab5986cc79b52a90d2ac3d5454a2"
SRCREV = "${EFL_SRCREV}"
PV = "0.0+svnr${SRCPV}"
@@ -13,7 +14,9 @@ PR = "r1"
inherit e-base allarch
SRCNAME = "efenniht"
-SRC_URI = "${E_SVN}/trunk/THEMES;module=${SRCNAME};proto=http"
+SRC_URI = "${E_SVN}/trunk/THEMES;module=${SRCNAME};proto=http \
+ file://LICENSE \
+"
S = "${WORKDIR}/${SRCNAME}"
do_compile() {
diff --git a/meta-efl/recipes-efl/e17/exquisite-theme-illume.bb b/meta-efl/recipes-efl/e17/exquisite-theme-illume.bb
index fa394f7..5dabea2 100644
--- a/meta-efl/recipes-efl/e17/exquisite-theme-illume.bb
+++ b/meta-efl/recipes-efl/e17/exquisite-theme-illume.bb
@@ -1,5 +1,6 @@
DDESCRIPTION = "A theme for exquisite"
-LICENSE = "MIT/BSD"
+LICENSE = "MIT BSD"
+LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE;md5=f523ab5986cc79b52a90d2ac3d5454a2"
SECTION = "x11"
DEPENDS = "edje-native"
PV = "1.0+svnr${SRCPV}"
@@ -15,7 +16,9 @@ ALTERNATIVE_PRIORITY = "10"
SRCNAME = "b_and_w"
-SRC_URI = "${E_SVN}/trunk/THEMES;module=${SRCNAME};proto=http"
+SRC_URI = "${E_SVN}/trunk/THEMES;module=${SRCNAME};proto=http \
+ file://LICENSE \
+"
S = "${WORKDIR}/${SRCNAME}"
do_compile() {
diff --git a/meta-efl/recipes-efl/e17/exquisite-theme-illume/LICENSE b/meta-efl/recipes-efl/e17/exquisite-theme-illume/LICENSE
new file mode 100644
index 0000000..61bb2f6
--- /dev/null
+++ b/meta-efl/recipes-efl/e17/exquisite-theme-illume/LICENSE
@@ -0,0 +1,25 @@
+Copyright notice for Enlightenment:
+
+Copyright (C) 2000-2010 Carsten Haitzler and various contributors (see AUTHORS)
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/meta-efl/recipes-efl/efl/elementary-theme-efenniht/LICENSE b/meta-efl/recipes-efl/efl/elementary-theme-efenniht/LICENSE
new file mode 100644
index 0000000..61bb2f6
--- /dev/null
+++ b/meta-efl/recipes-efl/efl/elementary-theme-efenniht/LICENSE
@@ -0,0 +1,25 @@
+Copyright notice for Enlightenment:
+
+Copyright (C) 2000-2010 Carsten Haitzler and various contributors (see AUTHORS)
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/meta-efl/recipes-efl/efl/elementary-theme-efenniht_svn.bb b/meta-efl/recipes-efl/efl/elementary-theme-efenniht_svn.bb
index 1cf7bd5..5655490 100644
--- a/meta-efl/recipes-efl/efl/elementary-theme-efenniht_svn.bb
+++ b/meta-efl/recipes-efl/efl/elementary-theme-efenniht_svn.bb
@@ -3,7 +3,8 @@ SECTION = "e/utils"
HOMEPAGE = "http://trac.enlightenment.org/e/wiki/Themes#Efenniht"
DEPENDS = "edje-native"
RSUGGESTS_${PN} = "e-wm-theme-illume-efenniht"
-LICENSE = "MIT/BSD"
+LICENSE = "MIT BSD"
+LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE;md5=f523ab5986cc79b52a90d2ac3d5454a2"
SRCREV_THM_REV ?= "${EFL_SRCREV}"
SRCREV_ELM_REV ?= "${EFL_SRCREV}"
@@ -17,6 +18,7 @@ inherit e-base allarch
SRCNAME = "efenniht"
SRC_URI = "${E_SVN}/trunk/THEMES;module=${SRCNAME};proto=http;name=THM_REV"
SRC_URI += "${E_SVN}/trunk/elementary/data;module=themes;proto=http;name=ELM_REV"
+SRC_URI += "file://LICENSE"
S = "${WORKDIR}/${SRCNAME}"
do_compile() {
--
1.7.6.1
^ permalink raw reply related [flat|nested] 46+ messages in thread
* [meta-oe][meta-efl][PATCH 09/15] xserver-xorg: drop 1.10.2 and use xserver-xf86-lite-1.11.0 from oe-core instead
2011-09-30 12:56 [meta-oe][meta-efl][PATCH 00/15] Pull request #23 Martin Jansa
` (7 preceding siblings ...)
2011-09-30 12:56 ` [meta-oe][meta-efl][PATCH 08/15] e-wm-theme-illume-efenniht, exquisite-theme-illume, elementary-theme-efenniht: add LIC_FILES_CHKSUM Martin Jansa
@ 2011-09-30 12:56 ` Martin Jansa
2011-09-30 12:56 ` [meta-oe][meta-efl][PATCH 10/15] libx11: drop here, 1.4.4 should be in oe-core Martin Jansa
` (6 subsequent siblings)
15 siblings, 0 replies; 46+ messages in thread
From: Martin Jansa @ 2011-09-30 12:56 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
.../xorg-xserver/xorg-xserver-common.inc | 126 --------------------
.../50b9d3142ff90af2f7fa35b7b1bf9e5a07723dbd.patch | 61 ----------
...ack-assume-pixman-supports-overlapped-blt.patch | 14 --
.../hack-fbdev-ignore-return-mode.patch | 39 ------
.../xserver-xorg-1.10.2/randr-support.patch | 102 ----------------
.../replace-pkgconfig-sdkdir-poking.patch | 33 -----
.../xorg-xserver/xserver-xorg_1.10.2.bb | 33 -----
7 files changed, 0 insertions(+), 408 deletions(-)
delete mode 100644 meta-oe/recipes-graphics/xorg-xserver/xorg-xserver-common.inc
delete mode 100644 meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.10.2/50b9d3142ff90af2f7fa35b7b1bf9e5a07723dbd.patch
delete mode 100644 meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.10.2/hack-assume-pixman-supports-overlapped-blt.patch
delete mode 100644 meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.10.2/hack-fbdev-ignore-return-mode.patch
delete mode 100644 meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.10.2/randr-support.patch
delete mode 100644 meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.10.2/replace-pkgconfig-sdkdir-poking.patch
delete mode 100644 meta-oe/recipes-graphics/xorg-xserver/xserver-xorg_1.10.2.bb
diff --git a/meta-oe/recipes-graphics/xorg-xserver/xorg-xserver-common.inc b/meta-oe/recipes-graphics/xorg-xserver/xorg-xserver-common.inc
deleted file mode 100644
index 0b4a854..0000000
--- a/meta-oe/recipes-graphics/xorg-xserver/xorg-xserver-common.inc
+++ /dev/null
@@ -1,126 +0,0 @@
-HOMEPAGE = "http://www.x.org"
-SECTION = "x11/base"
-LICENSE = "MIT-X"
-LIC_FILES_CHKSUM = "file://COPYING;md5=3dd2bbe3563837f80ed8926b06c1c353"
-
-INC_PR = "r21"
-
-# xf86-*-* packages depend on an X server built with the xfree86 DDX
-# so we have a virtual to represent that:
-PROVIDES = "virtual/xserver-xf86"
-
-# Other packages tend to just care that there is *an* X server:
-PROVIDES += "virtual/xserver"
-
-# Config manager for xserver, options are: hal, udev, empty (for configuration in xorg.conf)
-DISTRO_XORG_CONFIG_MANAGER ?= "udev"
-
-# default none, enabled by DISTRO_XORG_CONFIG_MANAGER setting
-CONFIG_MANAGER_OPTION += "${@['--disable-config-hal','--enable-config-hal',''][bb.data.getVar('DISTRO_XORG_CONFIG_MANAGER',d) in ['hal']]}"
-CONFIG_MANAGER_OPTION += "${@['--disable-config-udev','--enable-config-udev',''][bb.data.getVar('DISTRO_XORG_CONFIG_MANAGER',d) in ['udev']]}"
-
-DEPENDS = "fontconfig freetype flex-native liblbxutil kbproto \
-xf86driproto drm glproto randrproto renderproto fixesproto damageproto \
-xcmiscproto xextproto xproto xf86miscproto xf86vidmodeproto xf86bigfontproto \
-scrnsaverproto bigreqsproto resourceproto fontsproto inputproto \
-xf86dgaproto videoproto compositeproto trapproto recordproto dmxproto \
-resourceproto xineramaproto xtrans evieext libxkbfile libxfont libxau \
-libfontenc libxdmcp libxxf86vm libxaw libxmu libxt libxpm libxext libx11 \
-libxkbui libxxf86misc libxi libdmx libxtst libxres virtual/libgl libxcalibrate \
-libxv ${DISTRO_XORG_CONFIG_MANAGER}"
-
-RRECOMMENDS_${PN} = "libpciaccess"
-
-XORG_PN = "xorg-server"
-SRC_URI = "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${PV}.tar.bz2"
-
-S = "${WORKDIR}/${XORG_PN}-${PV}"
-
-inherit autotools pkgconfig glx-use-tls
-
-EXTRA_OECONF += " --enable-xcalibrate \
- --enable-kdrive \
- --enable-xephyr \
- --disable-xfbdev \
- --disable-xnest \
- --disable-kdrive-vesa \
- --with-default-font-path="${datadir}/fonts/X11/misc" \
- ac_cv_file__usr_share_sgml_X11_defs_ent=no"
-
-# CONFIG_MANAGER_OPTION is used only in recipes which support those options
-
-EXTRA_OECONF_append_arm = " ac_cv_header_linux_apm_bios_h=no "
-
-PACKAGES =+ "xserver-security-policy"
-FILES_xserver-security-policy += "${libdir}/xserver/SecurityPolicy"
-RRECOMMENDS_${PN} += "xserver-security-policy xkeyboard-config rgb xserver-xf86-config"
-
-PACKAGES =+ "${PN}-sdl ${PN}-fbdev ${PN}-xprint ${PN}-xvfb ${PN}-utils ${PN}-xephyr"
-
-RDEPENDS_${PN}-xvfb += "xkeyboard-config"
-
-FILES_${PN}-fbdev = "${bindir}/Xfbdev"
-FILES_${PN}-sdl = "${bindir}/Xsdl"
-FILES_${PN}-xprint = "${libdir}/X11/xserver/*/print"
-FILES_${PN}-xvfb = "${bindir}/Xvfb"
-FILES_${PN}-utils = "${bindir}/scanpci ${bindir}/pcitweak ${bindir}/ioport ${bindir}/in[bwl] ${bindir}/out[bwl] ${bindir}/mmap[rw] ${bindir}/gtf ${bindir}/getconfig ${bindir}/getconfig.pl"
-FILES_${PN} = "${bindir} ${libdir}/X11/Options ${libdir}/X11/Cards ${libdir}/X11/getconfig ${libdir}/X11/etc ${libdir}/modules/*.so ${libdir}/xorg/modules/*.so /etc/X11 ${libdir}/xorg/protocol.txt ${datadir}/X11/xorg.conf.d"
-FILES_${PN}-doc += "${libdir}/X11/doc ${datadir}/X11/xkb/compiled/README.compiled"
-FILES_${PN}-xephyr = "${bindir}/Xephyr"
-
-FILES_${PN}-dbg += "${libdir}/xorg/modules/.debug \
- ${libdir}/xorg/modules/*/.debug \
- ${libdir}/xorg/modules/*/*/.debug \
- "
-
-# Split out some modules and extensions from the main package
-# These aren't needed for basic operations and only take up space:
-# 32.0k libdri.so
-# 336.0k libglx.so
-# 1360k libint10.so
-# 180.0k libwfb.so
-# 320.0k libxaa.so
-# 124.0k libxf1bpp.so
-# 84.0k libxf4bpp.so
-# librecord.so
-# libextmod.so
-# libdbe.so
-
-PACKAGES =+ "${PN}-extension-dri \
- ${PN}-extension-dri2 \
- ${PN}-extension-glx \
- ${PN}-extension-record \
- ${PN}-extension-extmod \
- ${PN}-extension-dbe \
- ${PN}-module-libint10 \
- ${PN}-module-libafb \
- ${PN}-module-libwfb \
- ${PN}-module-libmfb \
- ${PN}-module-libcfb \
- ${PN}-module-xaa \
- ${PN}-module-libxf1bpp \
- ${PN}-module-libxf4bpp"
-
-
-FILES_${PN}-extension-dri = "${libdir}/xorg/modules/extensions/libdri.so"
-FILES_${PN}-extension-dri2 = "${libdir}/xorg/modules/extensions/libdri2.so"
-FILES_${PN}-extension-glx = "${libdir}/xorg/modules/extensions/libglx.so"
-FILES_${PN}-extension-record = "${libdir}/xorg/modules/extensions/librecord.so"
-FILES_${PN}-extension-extmod = "${libdir}/xorg/modules/extensions/libextmod.so"
-FILES_${PN}-extension-dbe = "${libdir}/xorg/modules/extensions/libdbe.so"
-FILES_${PN}-module-libint10 = "${libdir}/xorg/modules/libint10.so"
-FILES_${PN}-module-libafb = "${libdir}/xorg/modules/libafb.so"
-FILES_${PN}-module-libwfb = "${libdir}/xorg/modules/libwfb.so"
-FILES_${PN}-module-libmfb = "${libdir}/xorg/modules/libmfb.so"
-FILES_${PN}-module-libcfb = "${libdir}/xorg/modules/libcfb.so"
-FILES_${PN}-module-xaa = "${libdir}/xorg/modules/libxaa.so"
-FILES_${PN}-module-libxf1bpp = "${libdir}/xorg/modules/libxf1bpp.so"
-FILES_${PN}-module-libxf4bpp = "${libdir}/xorg/modules/libxf4bpp.so"
-
-PACKAGES =+ "${PN}-multimedia-modules"
-
-FILES_${PN}-multimedia-modules = "${libdir}/xorg/modules/multimedia/*drv*"
-
-do_install_append () {
- ln -sf ${datadir}/fonts/X11 ${D}/${libdir}/X11/fonts
-}
diff --git a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.10.2/50b9d3142ff90af2f7fa35b7b1bf9e5a07723dbd.patch b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.10.2/50b9d3142ff90af2f7fa35b7b1bf9e5a07723dbd.patch
deleted file mode 100644
index 2c4078a..0000000
--- a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.10.2/50b9d3142ff90af2f7fa35b7b1bf9e5a07723dbd.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 50b9d3142ff90af2f7fa35b7b1bf9e5a07723dbd Mon Sep 17 00:00:00 2001
-From: Aaron Plattner <aplattner@nvidia.com>
-Date: Tue, 24 May 2011 23:02:42 +0000
-Subject: randr: check rotated virtual size limits correctly
-
-Commit d1107918d4626268803b54033a07405122278e7f introduced checks to
-the RandR path that cause RRSetScreenConfig requests to fail if the
-size is too large. Unfortunately, when RandR 1.1 rotation is enabled
-it compares the rotated screen dimensions to the unrotated limits,
-which causes 90- and 270-degree rotation to fail unless your screen
-happens to be square:
-
- X Error of failed request: BadValue (integer parameter out of range for operation)
- Major opcode of failed request: 153 (RANDR)
- Minor opcode of failed request: 2 (RRSetScreenConfig)
- Value in failed request: 0x780
- Serial number of failed request: 14
- Current serial number in output stream: 14
-
-Fix this by moving the check above the code that swaps the dimensions
-based on the rotation.
-
-Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
-Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
-Tested-by: Robert Hooker <robert.hooker@canonical.com>
-Tested-by: Kent Baxley <kent.baxley@canonical.com>
-Signed-off-by: Keith Packard <keithp@keithp.com>
-(cherry picked from commit b6c7b9b2f39e970cedb6bc1e073f901e28cb0fa3)
----
-diff --git a/randr/rrscreen.c b/randr/rrscreen.c
-index 1bc1a9e..da6d48d 100644
---- a/randr/rrscreen.c
-+++ b/randr/rrscreen.c
-@@ -910,12 +910,6 @@ ProcRRSetScreenConfig (ClientPtr client)
- */
- width = mode->mode.width;
- height = mode->mode.height;
-- if (rotation & (RR_Rotate_90|RR_Rotate_270))
-- {
-- width = mode->mode.height;
-- height = mode->mode.width;
-- }
--
- if (width < pScrPriv->minWidth || pScrPriv->maxWidth < width) {
- client->errorValue = width;
- free(pData);
-@@ -927,6 +921,12 @@ ProcRRSetScreenConfig (ClientPtr client)
- return BadValue;
- }
-
-+ if (rotation & (RR_Rotate_90|RR_Rotate_270))
-+ {
-+ width = mode->mode.height;
-+ height = mode->mode.width;
-+ }
-+
- if (width != pScreen->width || height != pScreen->height)
- {
- int c;
---
-cgit v0.8.3-6-g21f6
diff --git a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.10.2/hack-assume-pixman-supports-overlapped-blt.patch b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.10.2/hack-assume-pixman-supports-overlapped-blt.patch
deleted file mode 100644
index a947582..0000000
--- a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.10.2/hack-assume-pixman-supports-overlapped-blt.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-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/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.10.2/hack-fbdev-ignore-return-mode.patch b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.10.2/hack-fbdev-ignore-return-mode.patch
deleted file mode 100644
index d3661cb..0000000
--- a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.10.2/hack-fbdev-ignore-return-mode.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Ugly hack that prevents server termination with xf86-video-fbdev-0.4.1
-(and probably other) while returning from chvt or resume on some
-hardware (e. g. zaurus).
-
-Correct fix would require debugging of fbdev mode during LeaveVT and
-EnterVT.
-
-This patch may cause staying in incorrect or corrupted display mode
-after EnterVT, but on man affected devices it does not cause any visible
-problems.
-
-Hacked code is never called on properly written drivers.
-
-Devices affected and testers involved for future patch removal:
-Sharp Zaurus (spitz/akita): Stanislav Brabec <utx@penguin.cz>
-
-See also:
-https://bugzilla.redhat.com/show_bug.cgi?id=238451
-
-The bug (first line indicates that your device is affected):
-
-(EE) FBDEV(0): FBIOPUT_VSCREENINFO succeeded but modified mode
-
-Fatal server error:
-EnterVT failed for screen 0
-
-Index: xorg-server-1.7.3/hw/xfree86/fbdevhw/fbdevhw.c
-===================================================================
---- xorg-server-1.7.3.orig/hw/xfree86/fbdevhw/fbdevhw.c
-+++ xorg-server-1.7.3/hw/xfree86/fbdevhw/fbdevhw.c
-@@ -571,7 +571,7 @@ fbdevHWSetMode(ScrnInfoPtr pScrn, Displa
- #if DEBUG
- print_fbdev_mode("returned", &set_var);
- #endif
-- return FALSE;
-+ /* return FALSE; UGLY HACK to allow return from chvt */
- }
-
- if (!check)
diff --git a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.10.2/randr-support.patch b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.10.2/randr-support.patch
deleted file mode 100644
index 632a64c..0000000
--- a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.10.2/randr-support.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-diff -ur xorg-server-1.10.1.901//hw/xfree86/common/xf86Xinput.c git/xorg-server-1.10.1.901//hw/xfree86/common/xf86Xinput.c
---- xorg-server-1.10.1.901//hw/xfree86/common/xf86Xinput.c 2011-04-28 09:25:00.000000000 +0200
-+++ git/xorg-server-1.10.1.901//hw/xfree86/common/xf86Xinput.c 2011-05-19 00:31:01.178439874 +0200
-@@ -99,6 +99,8 @@
- return; \
- }
-
-+#define RR_Rotate_All (RR_Rotate_0|RR_Rotate_90|RR_Rotate_180|RR_Rotate_270)
-+
- EventListPtr xf86Events = NULL;
-
- static int
-@@ -1408,4 +1410,73 @@
- EnableDevice(dev, TRUE);
- }
-
-+/* Taken from evdev-properties.h. */
-+#define EVDEV_PROP_SWAP_AXES "Evdev Axes Swap"
-+#define EVDEV_PROP_INVERT_AXES "Evdev Axis Inversion"
-+
-+/* This is a hack until we get device -> CRTC association. */
-+void
-+xf86InputRotationNotify(Rotation rotation)
-+{
-+ DeviceIntPtr dev;
-+ //LocalDevicePtr local;
-+ int ret;
-+ int swap_axes = 0;
-+ CARD8 invert[2] = { 0, 0 };
-+ static Atom prop_swap = 0, prop_invert = 0;
-+ static int atom_generation = -1;
-+
-+ if (atom_generation != serverGeneration) {
-+ prop_swap = 0;
-+ prop_invert = 0;
-+ }
-+
-+ switch (rotation & RR_Rotate_All) {
-+ case RR_Rotate_0:
-+ swap_axes = 1;
-+ invert[0] = 0;
-+ invert[1] = 0;
-+ break;
-+ case RR_Rotate_90:
-+ swap_axes = 0;
-+ invert[0] = 0;
-+ invert[1] = 1;
-+ break;
-+ case RR_Rotate_180:
-+ swap_axes = 1;
-+ invert[0] = 1;
-+ invert[1] = 1;
-+ break;
-+ case RR_Rotate_270:
-+ swap_axes = 0;
-+ invert[0] = 1;
-+ invert[1] = 0;
-+ break;
-+ }
-+
-+ if (!prop_swap)
-+ prop_swap = MakeAtom(EVDEV_PROP_SWAP_AXES,
-+ strlen(EVDEV_PROP_SWAP_AXES), TRUE);
-+ if (!prop_invert)
-+ prop_invert = MakeAtom(EVDEV_PROP_INVERT_AXES,
-+ strlen(EVDEV_PROP_INVERT_AXES), TRUE);
-+
-+ for (dev = inputInfo.devices; dev; dev = dev->next) {
-+ //local = dev->public.devicePrivate;
-+ ret = XIChangeDeviceProperty(dev, prop_swap, XA_INTEGER, 8,
-+ PropModeReplace, 1, &swap_axes, FALSE);
-+ if (ret != Success) {
-+ xf86Msg(X_ERROR, "Changing swap_xy property failed!\n");
-+ continue;
-+ }
-+ ret = XIChangeDeviceProperty(dev, prop_invert, XA_INTEGER, 8,
-+ PropModeReplace, 2, invert, FALSE);
-+ if (ret != Success) {
-+ xf86Msg(X_ERROR, "Changing invert property failed!\n");
-+ continue;
-+ }
-+ }
-+}
-+
-+
- /* end of xf86Xinput.c */
-diff -ur xorg-server-1.10.1.901//hw/xfree86/modes/xf86Crtc.c git/xorg-server-1.10.1.901//hw/xfree86/modes/xf86Crtc.c
---- xorg-server-1.10.1.901//hw/xfree86/modes/xf86Crtc.c 2011-04-28 09:25:00.000000000 +0200
-+++ git/xorg-server-1.10.1.901//hw/xfree86/modes/xf86Crtc.c 2011-05-19 00:23:16.244383998 +0200
-@@ -389,6 +389,12 @@
- if (didLock)
- crtc->funcs->unlock (crtc);
-
-+ /*
-+ * Rotate Touchscreen
-+ */
-+ xf86InputRotationNotify(crtc->rotation);
-+
-+
- return ret;
- }
-
diff --git a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.10.2/replace-pkgconfig-sdkdir-poking.patch b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.10.2/replace-pkgconfig-sdkdir-poking.patch
deleted file mode 100644
index 3967c4c..0000000
--- a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.10.2/replace-pkgconfig-sdkdir-poking.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-configury forces pkg-config to poke for sdkdir variable which
-pkg-config happily returns but does not prepend sysroot to it
-since thats only done for includes and libs. This then gets -I
-prepended and added to CFLAGS. Guess what gcc cross gripes
-about including host includes in cross builds but does not bail
-out the build but it does not escape the wrath of our oe's
-QA checks and rightly so. We replace use of sdkdir with
---cflags-only-I which returns the include paths correctly
-pointing inside sysroot and not at the host includes and plus
-includedir if you look inside the .pc file is assigned sdkdir
-anyway so we do not lose anything
-
-This m4 macro is included in other packages e.g. xf86-video-fbdev
-which dont build on hosts which have installation of
-xorg-xserver-dev because it gets this include poisoning
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
-Upstream-status: Pending
-
-Index: xorg-server-1.10.1/xorg-server.m4
-===================================================================
---- xorg-server-1.10.1.orig/xorg-server.m4
-+++ xorg-server-1.10.1/xorg-server.m4
-@@ -31,7 +31,7 @@ dnl
- AC_DEFUN([XORG_DRIVER_CHECK_EXT],[
- AC_REQUIRE([PKG_PROG_PKG_CONFIG])
- SAVE_CFLAGS="$CFLAGS"
-- CFLAGS="$CFLAGS -I`$PKG_CONFIG --variable=sdkdir xorg-server`"
-+ CFLAGS="$CFLAGS `$PKG_CONFIG --cflags-only-I xorg-server`"
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
- #include "xorg-server.h"
- #if !defined $1
diff --git a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg_1.10.2.bb b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg_1.10.2.bb
deleted file mode 100644
index 1d88364..0000000
--- a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg_1.10.2.bb
+++ /dev/null
@@ -1,33 +0,0 @@
-# Assign it here, since the hal->udev transition happens post 1.7 in angstrom
-DISTRO_XORG_CONFIG_MANAGER_angstrom = "udev"
-
-require xorg-xserver-common.inc
-LIC_FILES_CHKSUM = "file://COPYING;md5=74df27b6254cc88d2799b5f4f5949c00"
-
-DESCRIPTION = "the X.Org X server"
-DEPENDS += "mesa-dri pixman libpciaccess openssl dri2proto glproto font-util-native"
-PE = "2"
-PR = "${INC_PR}.1"
-
-SRC_URI += " \
- file://50b9d3142ff90af2f7fa35b7b1bf9e5a07723dbd.patch \
- file://randr-support.patch \
- file://hack-fbdev-ignore-return-mode.patch \
- file://hack-assume-pixman-supports-overlapped-blt.patch \
- file://replace-pkgconfig-sdkdir-poking.patch \
- "
-SRC_URI[md5sum] = "c9ba50bd44ea70da51f13100336a5484"
-SRC_URI[sha256sum] = "65264f6640568b9db8d738aec1ddd036c3ae21b7ba05b98d006759d11a72792c"
-
-do_install_prepend() {
- mkdir -p ${D}/${libdir}/X11/fonts
-}
-
-# The NVidia driver requires Xinerama support in the X server. Ion uses it.
-PACKAGE_ARCH_ion = "${MACHINE_ARCH}"
-XINERAMA = "${@['--disable-xinerama','--enable-xinerama'][bb.data.getVar('MACHINE',d) in ['ion']]}"
-
-EXTRA_OECONF += " ${CONFIG_MANAGER_OPTION} ${XINERAMA} --disable-xsdl --disable-xfake --disable-xfbdev --disable-dmx"
-EXTRA_OECONF += " --enable-dri2 --disable-unit-tests --disable-docs --disable-devel-docs"
-
-export LDFLAGS += " -ldl "
--
1.7.6.1
^ permalink raw reply related [flat|nested] 46+ messages in thread
* [meta-oe][meta-efl][PATCH 10/15] libx11: drop here, 1.4.4 should be in oe-core
2011-09-30 12:56 [meta-oe][meta-efl][PATCH 00/15] Pull request #23 Martin Jansa
` (8 preceding siblings ...)
2011-09-30 12:56 ` [meta-oe][meta-efl][PATCH 09/15] xserver-xorg: drop 1.10.2 and use xserver-xf86-lite-1.11.0 from oe-core instead Martin Jansa
@ 2011-09-30 12:56 ` Martin Jansa
2011-09-30 12:56 ` [meta-oe][meta-efl][PATCH 11/15] task-x11: use xserver-xf86-lite as default XSERVER Martin Jansa
` (5 subsequent siblings)
15 siblings, 0 replies; 46+ messages in thread
From: Martin Jansa @ 2011-09-30 12:56 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
.../xorg-lib/libx11-1.4.3/keysymdef_include.patch | 19 -------
.../libx11-1.4.3/x11_disable_makekeys.patch | 29 -----------
meta-oe/recipes-graphics/xorg-lib/libx11.inc | 52 --------------------
meta-oe/recipes-graphics/xorg-lib/libx11_1.4.3.bb | 11 ----
4 files changed, 0 insertions(+), 111 deletions(-)
delete mode 100644 meta-oe/recipes-graphics/xorg-lib/libx11-1.4.3/keysymdef_include.patch
delete mode 100644 meta-oe/recipes-graphics/xorg-lib/libx11-1.4.3/x11_disable_makekeys.patch
delete mode 100644 meta-oe/recipes-graphics/xorg-lib/libx11.inc
delete mode 100644 meta-oe/recipes-graphics/xorg-lib/libx11_1.4.3.bb
diff --git a/meta-oe/recipes-graphics/xorg-lib/libx11-1.4.3/keysymdef_include.patch b/meta-oe/recipes-graphics/xorg-lib/libx11-1.4.3/keysymdef_include.patch
deleted file mode 100644
index 1a30e34..0000000
--- a/meta-oe/recipes-graphics/xorg-lib/libx11-1.4.3/keysymdef_include.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -uNr libX11-1.3.6.orig//configure.ac libX11-1.3.6/configure.ac
---- libX11-1.3.6.orig//configure.ac 2010-09-20 08:04:16.000000000 +0200
-+++ libX11-1.3.6/configure.ac 2010-09-28 16:29:26.000000000 +0200
-@@ -355,7 +355,14 @@
- # Find keysymdef.h
- #
- AC_MSG_CHECKING([keysym definitions])
--KEYSYMDEFDIR=`$PKG_CONFIG --variable=includedir xproto`/X11
-+AC_ARG_WITH(keysymdefdir,
-+ AC_HELP_STRING([--with-keysymdefdir=DIR], [The location of keysymdef.h]),
-+ KEYSYMDEFDIR=$withval, KEYSYMDEFDIR="")
-+
-+if test x$KEYSYMDEFDIR = x; then
-+ KEYSYMDEFDIR=`$PKG_CONFIG --variable=includedir xproto`/X11
-+fi
-+
- FILES="keysymdef.h XF86keysym.h Sunkeysym.h DECkeysym.h HPkeysym.h"
- for i in $FILES; do
- if test -f "$KEYSYMDEFDIR/$i"; then
diff --git a/meta-oe/recipes-graphics/xorg-lib/libx11-1.4.3/x11_disable_makekeys.patch b/meta-oe/recipes-graphics/xorg-lib/libx11-1.4.3/x11_disable_makekeys.patch
deleted file mode 100644
index 9763313..0000000
--- a/meta-oe/recipes-graphics/xorg-lib/libx11-1.4.3/x11_disable_makekeys.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Index: libX11-1.3.4/src/util/Makefile.am
-===================================================================
---- libX11-1.3.4.orig/src/util/Makefile.am
-+++ libX11-1.3.4/src/util/Makefile.am
-@@ -1,24 +1 @@
--
--noinst_PROGRAMS=makekeys
--
--makekeys_CFLAGS = \
-- $(X11_CFLAGS) \
-- $(CWARNFLAGS)
--
--CC = @CC_FOR_BUILD@
--CPPFLAGS = @CPPFLAGS_FOR_BUILD@
--CFLAGS = @CFLAGS_FOR_BUILD@
--LDFLAGS = @LDFLAGS_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/meta-oe/recipes-graphics/xorg-lib/libx11.inc b/meta-oe/recipes-graphics/xorg-lib/libx11.inc
deleted file mode 100644
index 9f7e990..0000000
--- a/meta-oe/recipes-graphics/xorg-lib/libx11.inc
+++ /dev/null
@@ -1,52 +0,0 @@
-require xorg-lib-common.inc
-
-DESCRIPTION = "Base X libs."
-DEPENDS += "util-macros xtrans libxdmcp libxau \
- bigreqsproto xproto xextproto xcmiscproto \
- xf86bigfontproto kbproto inputproto libxcb \
- xproto-native"
-
-FILESPATHPKG .= ":libx11-${PV}:libx11"
-BBCLASSEXTEND = "native nativesdk"
-PROVIDES = "virtual/libx11"
-PE = "1"
-
-PACKAGES =+ "${PN}-xcb"
-
-FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${libdir}/X11/Xcms.txt"
-FILES_${PN}-xcb += "${libdir}/libX11-xcb.so.*"
-FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale"
-
-XORG_PN = "libX11"
-
-EXTRA_OECONF += "--with-keysymdefdir=${STAGING_INCDIR}/X11 --with-groff=no --with-ps2pdf=no --with-fop=no --disable-specs"
-
-# Below option is added to overcome the GCC bug on ARM
-# see http://gcc.gnu.org/PR42981 for further details.
-# We could potentially take it off when its fixed in gcc 4.5
-
-CFLAGS_append_arm = " -fforward-propagate "
-
-SRC_URI += " file://keysymdef_include.patch \
- file://x11_disable_makekeys.patch \
-"
-
-do_compile_prepend() {
- (
- unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS
- cd src/util;
- mv makekeys.c.orig makekeys.c || true
- # MIN_REHASH 10 is only in 1.0.1
- sed -i -e 's:MIN_REHASH 10:MIN_REHASH 16:g' makekeys.c
- sed -i -e 's:MIN_REHASH 15:MIN_REHASH 16:g' makekeys.c
- 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
-}
-
-python () {
- if not oe.utils.contains ('DISTRO_FEATURES', 'x11', True, False, d):
- raise bb.parse.SkipPackage("X11 not enabled for this DISTRO")
-}
diff --git a/meta-oe/recipes-graphics/xorg-lib/libx11_1.4.3.bb b/meta-oe/recipes-graphics/xorg-lib/libx11_1.4.3.bb
deleted file mode 100644
index 3c6a170..0000000
--- a/meta-oe/recipes-graphics/xorg-lib/libx11_1.4.3.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-require libx11.inc
-
-LICENSE = "MIT & MIT-style & BSD"
-LIC_FILES_CHKSUM = "file://COPYING;md5=172255dee66bb0151435b2d5d709fcf7"
-
-#--without-xcb is not an option anymore
-#http://cgit.freedesktop.org/xorg/lib/libX11/commit/?id=15e5eaf62897b3179d1fbe457cb19f886f0449f8
-PR = "${INC_PR}.0"
-
-SRC_URI[md5sum] = "85e942627aaa020813e0eb8433353563"
-SRC_URI[sha256sum] = "38b5ddd93291714a46a02cb8a5dd94b995a04ed76a608551c44d1598e113635a"
--
1.7.6.1
^ permalink raw reply related [flat|nested] 46+ messages in thread
* [meta-oe][meta-efl][PATCH 11/15] task-x11: use xserver-xf86-lite as default XSERVER
2011-09-30 12:56 [meta-oe][meta-efl][PATCH 00/15] Pull request #23 Martin Jansa
` (9 preceding siblings ...)
2011-09-30 12:56 ` [meta-oe][meta-efl][PATCH 10/15] libx11: drop here, 1.4.4 should be in oe-core Martin Jansa
@ 2011-09-30 12:56 ` Martin Jansa
2011-09-30 12:56 ` [meta-oe][meta-efl][PATCH 12/15] xf86-video-glamo: change RDEPENDS for xserver-xf86-dri-lite Martin Jansa
` (4 subsequent siblings)
15 siblings, 0 replies; 46+ messages in thread
From: Martin Jansa @ 2011-09-30 12:56 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta-oe/recipes-core/tasks/task-x11.bb | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta-oe/recipes-core/tasks/task-x11.bb b/meta-oe/recipes-core/tasks/task-x11.bb
index a7faa00..31c7c43 100644
--- a/meta-oe/recipes-core/tasks/task-x11.bb
+++ b/meta-oe/recipes-core/tasks/task-x11.bb
@@ -3,7 +3,7 @@ SECTION = "x11/server"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
PV = "1.0"
-PR = "r8"
+PR = "r9"
# WORK IN PROGRESS
@@ -21,7 +21,7 @@ RRECOMMENDS_${PN} = "\
# Some machines don't set a *runtime* provider for X, so default to Xfbdev here
# virtual/xserver won't work, since the kdrive recipes will build multiple xserver packages
-XSERVER ?= "xserver-xorg"
+XSERVER ?= "xserver-xf86-lite"
XSERVER_COMMON ?= "xserver-common"
PACKAGE_ARCH = "${MACHINE_ARCH}"
--
1.7.6.1
^ permalink raw reply related [flat|nested] 46+ messages in thread
* [meta-oe][meta-efl][PATCH 12/15] xf86-video-glamo: change RDEPENDS for xserver-xf86-dri-lite
2011-09-30 12:56 [meta-oe][meta-efl][PATCH 00/15] Pull request #23 Martin Jansa
` (10 preceding siblings ...)
2011-09-30 12:56 ` [meta-oe][meta-efl][PATCH 11/15] task-x11: use xserver-xf86-lite as default XSERVER Martin Jansa
@ 2011-09-30 12:56 ` Martin Jansa
2011-09-30 12:56 ` [meta-oe][meta-efl][PATCH 13/15] mesa: drop, there should be mesa-7.11 in oe-core Martin Jansa
` (3 subsequent siblings)
15 siblings, 0 replies; 46+ messages in thread
From: Martin Jansa @ 2011-09-30 12:56 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
.../xorg-driver/xf86-video-glamo_git.bb | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo_git.bb b/meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo_git.bb
index 51397da..9517553 100644
--- a/meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo_git.bb
+++ b/meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo_git.bb
@@ -4,7 +4,7 @@ DEPENDS += "libdrm"
LIC_FILES_CHKSUM = "file://COPYING;md5=d8cbd99fff773f92e844948f74ef0df8"
-RDEPENDS_${PN} = "xserver-xorg-extension-dri xserver-xorg-extension-dri2 xserver-xorg-extension-glx"
+RDEPENDS_${PN} = "xserver-xf86-dri-lite-extension-dri xserver-xf86-dri-lite-extension-dri2 xserver-xf86-dri-lite-extension-glx"
PE = "2"
PV = "1.0.0+gitr${SRCPV}"
PR = "r16"
--
1.7.6.1
^ permalink raw reply related [flat|nested] 46+ messages in thread
* [meta-oe][meta-efl][PATCH 13/15] mesa: drop, there should be mesa-7.11 in oe-core
2011-09-30 12:56 [meta-oe][meta-efl][PATCH 00/15] Pull request #23 Martin Jansa
` (11 preceding siblings ...)
2011-09-30 12:56 ` [meta-oe][meta-efl][PATCH 12/15] xf86-video-glamo: change RDEPENDS for xserver-xf86-dri-lite Martin Jansa
@ 2011-09-30 12:56 ` Martin Jansa
2011-09-30 12:56 ` [meta-oe][meta-efl][PATCH 14/15] talloc: drop from meta-oe, no longer needed by mesa Martin Jansa
` (2 subsequent siblings)
15 siblings, 0 replies; 46+ messages in thread
From: Martin Jansa @ 2011-09-30 12:56 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta-oe/recipes-graphics/mesa/README | 12 -
meta-oe/recipes-graphics/mesa/mesa-7.10.2.inc | 19 -
.../recipes-graphics/mesa/mesa-7.10.2/glamo.patch | 2425 --------------------
.../recipes-graphics/mesa/mesa-7.10.2/uclibc.patch | 26 -
meta-oe/recipes-graphics/mesa/mesa-common.inc | 49 -
meta-oe/recipes-graphics/mesa/mesa-dri.inc | 27 -
meta-oe/recipes-graphics/mesa/mesa-dri_7.10.2.bb | 4 -
meta-oe/recipes-graphics/mesa/mesa-xlib.inc | 5 -
meta-oe/recipes-graphics/mesa/mesa-xlib_7.10.2.bb | 4 -
meta-oe/recipes-graphics/mesa/mesa_7.10.2.bb | 6 -
10 files changed, 0 insertions(+), 2577 deletions(-)
delete mode 100644 meta-oe/recipes-graphics/mesa/README
delete mode 100644 meta-oe/recipes-graphics/mesa/mesa-7.10.2.inc
delete mode 100644 meta-oe/recipes-graphics/mesa/mesa-7.10.2/glamo.patch
delete mode 100644 meta-oe/recipes-graphics/mesa/mesa-7.10.2/uclibc.patch
delete mode 100644 meta-oe/recipes-graphics/mesa/mesa-common.inc
delete mode 100644 meta-oe/recipes-graphics/mesa/mesa-dri.inc
delete mode 100644 meta-oe/recipes-graphics/mesa/mesa-dri_7.10.2.bb
delete mode 100644 meta-oe/recipes-graphics/mesa/mesa-xlib.inc
delete mode 100644 meta-oe/recipes-graphics/mesa/mesa-xlib_7.10.2.bb
delete mode 100644 meta-oe/recipes-graphics/mesa/mesa_7.10.2.bb
diff --git a/meta-oe/recipes-graphics/mesa/README b/meta-oe/recipes-graphics/mesa/README
deleted file mode 100644
index 3c6de3e..0000000
--- a/meta-oe/recipes-graphics/mesa/README
+++ /dev/null
@@ -1,12 +0,0 @@
-mesa-common.inc
-* Settings shared by ALL recipes
-
-mesa-${PV}.inc
-* Settings for particular version, mostly checksums and additional patches
-* Patches are stored mesa-${PV} dir and -dri and xlib has adjusted FILESPATHPKG
-
-mesa-dri.inc
-* Setting shared by ALL dri recipes - defines what is mesa-dri
-
-mesa-xlib.inc
-* Setting shared by ALL xlib recipes - defines what is mesa-xlib
diff --git a/meta-oe/recipes-graphics/mesa/mesa-7.10.2.inc b/meta-oe/recipes-graphics/mesa/mesa-7.10.2.inc
deleted file mode 100644
index f49f495..0000000
--- a/meta-oe/recipes-graphics/mesa/mesa-7.10.2.inc
+++ /dev/null
@@ -1,19 +0,0 @@
-SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2;name=archive \
- file://glamo.patch \
- file://uclibc.patch \
- "
-
-DEPENDS += "talloc"
-
-SRC_URI[archive.md5sum] = "f5de82852f1243f42cc004039e10b771"
-SRC_URI[archive.sha256sum] = "8ced2678ce11cf30804694a92ea3ca6b82f158ae8995bdc626c7e85aac71c7c1"
-
-EXTRA_OECONF += " --disable-gallium"
-
-#needs more testing and updated glamo.patch before making default
-DEFAULT_PREFERENCE = "-2"
-
-do_configure_prepend() {
- #check for python not python2, because python-native does not stage python2 binary/link
- sed -i 's/AC_CHECK_PROGS(\[PYTHON2\], \[python2 python\])/AC_CHECK_PROGS(\[PYTHON2\], \[python python\])/g' ${S}/configure.ac
-}
diff --git a/meta-oe/recipes-graphics/mesa/mesa-7.10.2/glamo.patch b/meta-oe/recipes-graphics/mesa/mesa-7.10.2/glamo.patch
deleted file mode 100644
index 5aa45d5..0000000
--- a/meta-oe/recipes-graphics/mesa/mesa-7.10.2/glamo.patch
+++ /dev/null
@@ -1,2425 +0,0 @@
-git diff upstream/7.10 and gitorious/7.10
-
-http://gitorious.org/mesa/mesa/commits/7.10
-
-diff --git a/configs/autoconf.in b/configs/autoconf.in
-index e2d70c6..5874955 100644
---- a/configs/autoconf.in
-+++ b/configs/autoconf.in
-@@ -120,7 +120,7 @@ OSMESA_LIB_DEPS = -L$(TOP)/$(LIB_DIR) @OSMESA_MESA_DEPS@ \
- $(EXTRA_LIB_PATH) @OSMESA_LIB_DEPS@
- EGL_LIB_DEPS = $(EXTRA_LIB_PATH) @EGL_LIB_DEPS@
- GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) @GLU_MESA_DEPS@ \
-- $(EXTRA_LIB_PATH) @GLU_LIB_DEPS@
-+ $(EXTRA_LIB_PATH) @GLU_LIB_DEPS@ -lstdc++
- GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) @GLUT_MESA_DEPS@ \
- $(EXTRA_LIB_PATH) @GLUT_LIB_DEPS@
- GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) @GLW_MESA_DEPS@ \
-diff --git a/src/mesa/drivers/dri/glamo/Makefile b/src/mesa/drivers/dri/glamo/Makefile
-new file mode 100644
-index 0000000..e77193d
---- /dev/null
-+++ b/src/mesa/drivers/dri/glamo/Makefile
-@@ -0,0 +1,22 @@
-+# src/mesa/drivers/dri/glamo/Makefile
-+
-+TOP = ../../../../..
-+include $(TOP)/configs/current
-+
-+LIBNAME = glamo_dri.so
-+
-+DRIVER_SOURCES = \
-+ glamo_screen.c glamo_context.c glamo_state.c glamo_fbo.c glamo_tris.c \
-+ glamo_cmdq.c glamo_render.c
-+
-+C_SOURCES = \
-+ $(COMMON_SOURCES) \
-+ $(DRIVER_SOURCES)
-+
-+ASM_SOURCES =
-+
-+DRI_LIB_DEPS += -ldrm_glamo
-+
-+include ../Makefile.template
-+
-+symlinks:
-diff --git a/src/mesa/drivers/dri/glamo/glamo_cmdq.c b/src/mesa/drivers/dri/glamo/glamo_cmdq.c
-new file mode 100644
-index 0000000..1334f8e
---- /dev/null
-+++ b/src/mesa/drivers/dri/glamo/glamo_cmdq.c
-@@ -0,0 +1,110 @@
-+/*
-+ * Command queue submission via DRM
-+ *
-+ * Copyright 2009 Thomas White <taw@bitwiz.org.uk>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License as
-+ * published by the Free Software Foundation; either version 2 of
-+ * the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ * MA 02111-1307 USA
-+ */
-+
-+
-+#include <stdint.h>
-+#include <stdlib.h>
-+#include <drm.h>
-+#include <glamo_drm.h>
-+#include <glamo_bo.h>
-+
-+#include "glamo_context.h"
-+#include "glamo_cmdq.h"
-+
-+
-+/* Submit the prepared command sequence to the kernel */
-+void glamoDRMDispatch(glamoContext *gCtx)
-+{
-+ drm_glamo_cmd_burst_t burst;
-+ int r;
-+
-+ burst.base = gCtx->cmd_burst_base;
-+ burst.data = gCtx->cmdq_drm;
-+ burst.bufsz = gCtx->cmdq_drm_used * 2; /* -> bytes */
-+ burst.nobjs = gCtx->cmdq_obj_used;
-+ burst.objs = gCtx->cmdq_objs;
-+ burst.obj_pos = gCtx->cmdq_obj_pos;
-+
-+ r = drmCommandWrite(gCtx->drm_fd, DRM_GLAMO_CMDBURST,
-+ &burst, sizeof(burst));
-+ if ( r != 0 ) {
-+ fprintf(stderr, "DRM_GLAMO_CMDBURST failed\n");
-+ }
-+
-+ /* Reset counts to zero for the next sequence */
-+ gCtx->cmdq_obj_used = 0;
-+ gCtx->cmdq_drm_used = 0;
-+}
-+
-+
-+void glamoDRMAddData(glamoContext *gCtx, uint32_t val, int len)
-+{
-+ if ( gCtx->cmdq_drm_used+4 > gCtx->cmdq_drm_size ) {
-+ fprintf(stderr, "Burst command too large\n");
-+ return;
-+ }
-+
-+ /* Record command */
-+ if ( len == 2 ) {
-+ gCtx->cmdq_drm[gCtx->cmdq_drm_used++] = val & 0xffff;
-+ } else if ( len == 4 ) {
-+ gCtx->cmdq_drm[gCtx->cmdq_drm_used++] = val & 0x0000ffff;
-+ gCtx->cmdq_drm[gCtx->cmdq_drm_used++] = val & 0xffff0000;
-+ } else {
-+ fprintf(stderr, "Wrong command length!\n");
-+ }
-+}
-+
-+
-+void glamoDRMAddBO(glamoContext *gCtx, struct glamo_bo *bo)
-+{
-+ if ( gCtx->cmdq_drm_used+4 > gCtx->cmdq_drm_size ) {
-+ fprintf(stderr, "Burst command too large\n");
-+ return;
-+ }
-+
-+ /* Record object position */
-+ gCtx->cmdq_objs[gCtx->cmdq_obj_used] = bo->handle;
-+ /* -> bytes */
-+ gCtx->cmdq_obj_pos[gCtx->cmdq_obj_used] = gCtx->cmdq_drm_used * 2;
-+ gCtx->cmdq_obj_used++;
-+
-+ /* Record command */
-+ gCtx->cmdq_drm[gCtx->cmdq_drm_used++] = 0x0000;
-+ gCtx->cmdq_drm[gCtx->cmdq_drm_used++] = 0x0000;
-+}
-+
-+
-+void glamoDRMStartBurst(glamoContext *gCtx, uint16_t base)
-+{
-+ gCtx->cmd_burst_base = base;
-+}
-+
-+
-+void glamoInitCmdqCache(glamoContext *gCtx)
-+{
-+ gCtx->cmdq_objs = malloc(1024);
-+ gCtx->cmdq_obj_pos = malloc(1024);
-+ gCtx->cmdq_obj_used = 0;
-+ gCtx->cmdq_drm_used = 0;
-+ gCtx->cmdq_drm_size = 4 * 1024;
-+ gCtx->cmdq_drm = malloc(gCtx->cmdq_drm_size);
-+}
-diff --git a/src/mesa/drivers/dri/glamo/glamo_cmdq.h b/src/mesa/drivers/dri/glamo/glamo_cmdq.h
-new file mode 100644
-index 0000000..7420d7b
---- /dev/null
-+++ b/src/mesa/drivers/dri/glamo/glamo_cmdq.h
-@@ -0,0 +1,33 @@
-+/*
-+ * Command queue submission via DRM
-+ *
-+ * Copyright 2009 Thomas White <taw@bitwiz.org.uk>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License as
-+ * published by the Free Software Foundation; either version 2 of
-+ * the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ * MA 02111-1307 USA
-+ */
-+
-+
-+#include <stdint.h>
-+#include <glamo_bo.h>
-+
-+#include "glamo_context.h"
-+
-+
-+extern void glamoDRMDispatch(glamoContext *gCtx);
-+extern void glamoDRMAddBO(glamoContext *gCtx, struct glamo_bo *bo);
-+extern void glamoDRMAddData(glamoContext *gCtx, uint32_t val, int len);
-+extern void glamoDRMStartBurst(glamoContext *gCtx, uint16_t base);
-+extern void glamoInitCmdqCache(glamoContext *gCtx);
-diff --git a/src/mesa/drivers/dri/glamo/glamo_context.c b/src/mesa/drivers/dri/glamo/glamo_context.c
-new file mode 100644
-index 0000000..39eb4e7
---- /dev/null
-+++ b/src/mesa/drivers/dri/glamo/glamo_context.c
-@@ -0,0 +1,360 @@
-+/*
-+ * Direct Rendering Support for SMedia Glamo 336x/337x
-+ *
-+ * (c) 2009 Thomas White <taw@bitwiz.org.uk>
-+ * Roughly based on sis_context.c (c) 2003 Eric Anholt
-+ * and radeon_common_context.c
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining a
-+ * copy of this software and associated documentation files (the "Software"),
-+ * to deal in the Software without restriction, including without limitation
-+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
-+ * and/or sell copies of the Software, and to permit persons to whom the
-+ * Software is furnished to do so, subject to the following conditions:
-+ *
-+ * The above copyright notice and this permission notice shall be included
-+ * in all copies or substantial portions of the Software.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-+ * THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+ */
-+
-+
-+#include "dri_util.h"
-+#include "drirenderbuffer.h"
-+#include "utils.h"
-+
-+#include "swrast/swrast.h"
-+#include "swrast_setup/swrast_setup.h"
-+#include "drivers/common/driverfuncs.h"
-+#include "vbo/vbo.h"
-+#include "tnl/tnl.h"
-+#include "tnl/t_pipeline.h"
-+#include "main/state.h"
-+
-+#include "glamo_context.h"
-+#include "glamo_screen.h"
-+#include "glamo_state.h"
-+#include "glamo_fbo.h"
-+#include "glamo_tris.h"
-+#include "glamo_render.h"
-+#include "glamo_cmdq.h"
-+
-+#include <glamo_bo.h>
-+#include <glamo_bo_gem.h>
-+#include <glamo_drm.h>
-+
-+
-+#define DRIVER_DATE "20090913"
-+
-+
-+static inline struct glamo_renderbuffer *glamo_get_renderbuffer(
-+ struct gl_framebuffer *fb,
-+ int att_index)
-+{
-+ if ( att_index >= 0 ) {
-+ struct glamo_renderbuffer *gr;
-+ gr = glamo_renderbuffer(fb->Attachment[att_index].Renderbuffer);
-+ return gr;
-+ } else {
-+ return NULL;
-+ }
-+}
-+
-+
-+static const GLubyte *glamoGetString(struct gl_context *ctx, GLenum name)
-+{
-+ static char buffer[128];
-+
-+ switch (name) {
-+ case GL_VENDOR:
-+ return (GLubyte *)"Thomas White";
-+ case GL_RENDERER: {
-+ driGetRendererString(buffer, "Glamo", DRIVER_DATE, 0);
-+ return (GLubyte *) buffer;
-+ }
-+ default:
-+ return 0;
-+ }
-+}
-+
-+
-+/* Called when Mesa needs to know the size of the framebuffer */
-+static void glamoBufferSize(struct gl_framebuffer *buffer,
-+ GLuint *width, GLuint *height)
-+{
-+ GET_CURRENT_CONTEXT(ctx);
-+ glamoContextPtr glamo = GLAMO_CONTEXT(ctx);
-+
-+ *width = glamo->driDrawable->w;
-+ *height = glamo->driDrawable->h;
-+}
-+
-+
-+GLboolean glamoCreateContext(const struct gl_config *glVisual,
-+ __DRIcontext *driContextPriv,
-+ void *sharedContextPrivate)
-+{
-+ struct gl_context *ctx, *shareCtx;
-+ __DRIscreen *sPriv = driContextPriv->driScreenPriv;
-+ glamoContextPtr context;
-+ glamoScreenPtr glamoScreen;
-+ struct dd_function_table functions;
-+
-+ context = (glamoContextPtr)CALLOC(sizeof(*context));
-+ if ( context == NULL ) return GL_FALSE;
-+
-+ _mesa_init_driver_functions(&functions);
-+
-+ /* Allocate the Mesa context */
-+ if ( sharedContextPrivate )
-+ shareCtx = ((glamoContextPtr)sharedContextPrivate)->glCtx;
-+ else
-+ shareCtx = NULL;
-+ context->glCtx = _mesa_create_context(glVisual, shareCtx,
-+ &functions, (void *)context);
-+ if ( context->glCtx == NULL ) {
-+ FREE(context);
-+ return GL_FALSE;
-+ }
-+ driContextPriv->driverPrivate = context;
-+ ctx = context->glCtx;
-+
-+ glamoScreen = context->glamoScreen = (glamoScreenPtr)sPriv->private;
-+
-+ ctx->Driver.GetString = glamoGetString;
-+ ctx->Driver.GetBufferSize = glamoBufferSize;
-+
-+ context->driContext = driContextPriv;
-+ context->driScreen = sPriv;
-+ context->driDrawable = NULL;
-+ context->drm_fd = sPriv->fd;
-+
-+ /* Initialize the software rasterizer and helper modules. */
-+ _swrast_CreateContext(ctx);
-+ _vbo_CreateContext(ctx);
-+ _tnl_CreateContext(ctx);
-+ _swsetup_CreateContext(ctx);
-+
-+ /* Install our pipeline (see glamo_render.c) */
-+ _tnl_install_pipeline(ctx, glamo_pipeline);
-+
-+ _swrast_allow_pixel_fog(ctx, GL_TRUE);
-+ _swrast_allow_vertex_fog(ctx, GL_FALSE);
-+ _tnl_allow_pixel_fog(ctx, GL_TRUE);
-+ _tnl_allow_vertex_fog(ctx, GL_FALSE);
-+
-+ glamoInitCmdqCache(context);
-+ glamoInitStateFuncs(ctx);
-+ glamoInitTriFuncs(ctx);
-+
-+ return GL_TRUE;
-+}
-+
-+
-+void glamoDestroyContext(__DRIcontext *driContextPriv)
-+{
-+ glamoContextPtr context;
-+
-+ context = (glamoContextPtr)driContextPriv->driverPrivate;
-+ assert(context != NULL);
-+
-+ if ( context != NULL ) {
-+
-+ _swsetup_DestroyContext(context->glCtx);
-+ _tnl_DestroyContext(context->glCtx);
-+ _vbo_DestroyContext(context->glCtx);
-+ _swrast_DestroyContext(context->glCtx);
-+
-+ _mesa_destroy_context(context->glCtx);
-+
-+ }
-+
-+ FREE(context);
-+}
-+
-+
-+void glamo_update_renderbuffers(__DRIcontext *context,
-+ __DRIdrawable *drawable)
-+{
-+ unsigned int attachments[10];
-+ __DRIbuffer *buffers;
-+ __DRIscreen *screen;
-+ int i, count;
-+ struct glamo_framebuffer *draw;
-+ glamoContextPtr glamo;
-+ struct glamo_bo *bo;
-+
-+ draw = drawable->driverPrivate;
-+ screen = context->driScreenPriv;
-+ glamo = (glamoContextPtr)context->driverPrivate;
-+ i = 0;
-+ if ( draw->color_rb[0] ) {
-+ attachments[i++] = __DRI_BUFFER_FRONT_LEFT;
-+ }
-+ if ( draw->color_rb[1] ) {
-+ attachments[i++] = __DRI_BUFFER_BACK_LEFT;
-+ }
-+
-+ buffers = screen->dri2.loader->getBuffers(drawable,
-+ &drawable->w,
-+ &drawable->h,
-+ attachments, i,
-+ &count,
-+ drawable->loaderPrivate);
-+ if ( buffers == NULL ) return;
-+
-+ /* Set one cliprect to cover the whole drawable */
-+ drawable->x = 0;
-+ drawable->y = 0;
-+ drawable->backX = 0;
-+ drawable->backY = 0;
-+ drawable->numClipRects = 1;
-+ drawable->pClipRects[0].x1 = 0;
-+ drawable->pClipRects[0].y1 = 0;
-+ drawable->pClipRects[0].x2 = drawable->w;
-+ drawable->pClipRects[0].y2 = drawable->h;
-+ drawable->numBackClipRects = 1;
-+ drawable->pBackClipRects[0].x1 = 0;
-+ drawable->pBackClipRects[0].y1 = 0;
-+ drawable->pBackClipRects[0].x2 = drawable->w;
-+ drawable->pBackClipRects[0].y2 = drawable->h;
-+
-+ /* For each attachment */
-+ for ( i=0; i<count; i++ ) {
-+
-+ struct glamo_renderbuffer *grb;
-+
-+ switch ( buffers[i].attachment ) {
-+ case __DRI_BUFFER_FRONT_LEFT:
-+ grb = draw->color_rb[0];
-+ break;
-+ case __DRI_BUFFER_BACK_LEFT:
-+ grb = draw->color_rb[1];
-+ break;
-+ case __DRI_BUFFER_DEPTH:
-+ grb = glamo_get_renderbuffer(&draw->base, BUFFER_DEPTH);
-+ break;
-+ case __DRI_BUFFER_STENCIL:
-+ grb = glamo_get_renderbuffer(&draw->base,
-+ BUFFER_STENCIL);
-+ break;
-+ case __DRI_BUFFER_FAKE_FRONT_LEFT:
-+ grb = draw->color_rb[0];
-+ break;
-+ case __DRI_BUFFER_ACCUM:
-+ default:
-+ fprintf(stderr,
-+ "Unhandled buffer attach event,"
-+ " attachment type %d\n", buffers[i].attachment);
-+ return;
-+ }
-+
-+ if ( grb == NULL ) {
-+ /* Don't know how to handle this type of buffer */
-+ continue;
-+ }
-+
-+ if ( grb->bo ) {
-+ uint32_t name = glamo_gem_get_name(grb->bo);
-+ if ( name == buffers[i].name ) {
-+ /* Buffer already attached. No action needed */
-+ continue;
-+ }
-+ }
-+
-+ grb->cpp = buffers[i].cpp;
-+ grb->pitch = buffers[i].pitch;
-+ grb->width = drawable->w;
-+ grb->height = drawable->h;
-+
-+ bo = glamo_bo_open(glamo->glamoScreen->bom, buffers[i].name,
-+ 0, 0, GLAMO_GEM_DOMAIN_VRAM,
-+ buffers[i].flags);
-+ if ( bo == NULL ) {
-+ fprintf(stderr, "Failed to attach buffer %d\n",
-+ buffers[i].name);
-+ }
-+
-+ glamo_renderbuffer_set_bo(grb, bo);
-+ glamo_bo_unref(bo);
-+
-+ }
-+
-+ driUpdateFramebufferSize(glamo->glCtx, drawable);
-+}
-+
-+
-+GLboolean glamoMakeCurrent(__DRIcontext *driContextPriv,
-+ __DRIdrawable *driDrawPriv,
-+ __DRIdrawable *driReadPriv)
-+{
-+ struct glamo_framebuffer *draw_fb;
-+ struct gl_framebuffer *read_fb;
-+ glamoContextPtr glamo;
-+
-+ if ( driContextPriv == NULL ) {
-+ _mesa_make_current(NULL, NULL, NULL);
-+ return GL_TRUE;
-+ }
-+
-+ /* The Glamo context we're switching to */
-+ glamo = (glamoContextPtr)driContextPriv->driverPrivate;
-+
-+ glamo->driDrawable = driDrawPriv;
-+
-+ /* These two will probably be the same */
-+ draw_fb = (struct glamo_framebuffer *)driDrawPriv->driverPrivate;
-+ read_fb = (struct gl_framebuffer *)driReadPriv->driverPrivate;
-+
-+ glamo_update_renderbuffers(driContextPriv, driDrawPriv);
-+ if (driDrawPriv != driReadPriv)
-+ glamo_update_renderbuffers(driContextPriv, driReadPriv);
-+
-+ _mesa_make_current(glamo->glCtx, &draw_fb->base, read_fb);
-+ _mesa_update_state(glamo->glCtx);
-+
-+ return GL_TRUE;
-+}
-+
-+
-+GLboolean glamoUnbindContext(__DRIcontext *driContextPriv)
-+{
-+ return GL_TRUE;
-+}
-+
-+
-+/* Convert IEEE754 32-bit float to Glamo's signed 24-bit float */
-+uint32_t float7s16(GLfloat in)
-+{
-+ uint32_t a, b;
-+ uint32_t sign, expo, mant; /* Sign, exponent, significand */
-+
-+ a = *(uint32_t *)∈
-+
-+ /* This is bad */
-+ if ( a & 0x40000000 ) {
-+ printf(stderr, "Warning: Exponent won't fit into 7 bits\n");
-+ }
-+
-+ /* This hopefully isn't a big problem */
-+ if ( a & 0x0000007f ) {
-+ printf(stderr, "Warning: Precision lost in FP conversion\n");
-+ }
-+
-+ /* Separate out the right bits */
-+ mant = a & 0x007fff80; /* Bits 7-22 (bits 0-6 are lost) */
-+ expo = a & 0x3f800000; /* Bits 23-29 (bit 30 is lost) */
-+ sign = a & 0x80000000; /* Bit 31 */
-+
-+ /* Shift and recombine */
-+ b = sign >> 8; /* Fills bit 23 */
-+ b |= expo >> 7; /* Fills bits 16-22 */
-+ b |= mant >> 7; /* Fills bits 0-15 */
-+
-+ return b;
-+}
-diff --git a/src/mesa/drivers/dri/glamo/glamo_context.h b/src/mesa/drivers/dri/glamo/glamo_context.h
-new file mode 100644
-index 0000000..8de3946
---- /dev/null
-+++ b/src/mesa/drivers/dri/glamo/glamo_context.h
-@@ -0,0 +1,106 @@
-+/*
-+ * Direct Rendering Support for SMedia Glamo 336x/337x
-+ *
-+ * (c) 2009 Thomas White <taw@bitwiz.org.uk>
-+ * Roughly based on sis_context.h (c) 2003 Eric Anholt
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining a
-+ * copy of this software and associated documentation files (the "Software"),
-+ * to deal in the Software without restriction, including without limitation
-+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
-+ * and/or sell copies of the Software, and to permit persons to whom the
-+ * Software is furnished to do so, subject to the following conditions:
-+ *
-+ * The above copyright notice and this permission notice shall be included
-+ * in all copies or substantial portions of the Software.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-+ * THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+ */
-+
-+#ifndef __GLAMO_CONTEXT_H
-+#define __GLAMO_CONTEXT_H
-+
-+
-+#include "dri_util.h"
-+#include "utils.h"
-+#include "tnl/t_vertex.h"
-+
-+#include "glamo_screen.h"
-+
-+
-+typedef struct glamo_context glamoContext;
-+typedef struct glamo_context *glamoContextPtr;
-+
-+struct glamo_context {
-+
-+ struct gl_context *glCtx; /* Must be first in this structure */
-+
-+ int drm_fd; /* DRM fd */
-+
-+ __DRIcontext *driContext; /* DRI context */
-+ __DRIscreen *driScreen; /* DRI screen */
-+ __DRIdrawable *driDrawable; /* DRI drawable bound to this ctx */
-+
-+ glamoScreenPtr glamoScreen; /* Screen private DRI data */
-+
-+ driOptionCache optionCache;
-+
-+ uint16_t *cmdq_drm; /* Command queue cache */
-+ uint16_t cmd_burst_base;
-+ int cmdq_drm_used;
-+ int cmdq_drm_size;
-+ int cmdq_obj_used;
-+ uint32_t *cmdq_objs;
-+ unsigned int *cmdq_obj_pos;
-+
-+ /* Information about the current primitive */
-+ struct {
-+ GLuint id;
-+ uint32_t primitive; /* Current hardware primitive type */
-+ struct glamo_bo *vb_bo;
-+ uint8_t *vb;
-+ unsigned int start_offset; /* Byte offset of start */
-+ unsigned int current_offset; /* Byte offset of next vertex */
-+ unsigned int count; /* Number of vertices */
-+ } prim;
-+
-+ /* Current vertex format and attributes */
-+ int vertex_size;
-+ struct tnl_attr_map vertex_attrs[VERT_ATTRIB_MAX];
-+
-+ /* State */
-+ GLuint new_state; /* State which must be updated */
-+ uint16_t col_clear;
-+
-+};
-+
-+#define GLAMO_CONTEXT(ctx) ((glamoContextPtr)(ctx->DriverCtx))
-+
-+#define TAG(x) glamo##x
-+#include "tnl_dd/t_dd_vertex.h"
-+#undef TAG
-+
-+extern GLboolean glamoCreateContext(const struct gl_config *glVis,
-+ __DRIcontext *driContextPriv,
-+ void *sharedContextPrivate);
-+extern void glamoDestroyContext(__DRIcontext *dcp);
-+extern GLboolean glamoMakeCurrent(__DRIcontext *driContextPriv,
-+ __DRIdrawable *driDrawPriv,
-+ __DRIdrawable *driReadPriv);
-+extern GLboolean glamoUnbindContext(__DRIcontext *driContextPriv);
-+extern void glamo_update_renderbuffers(__DRIcontext *context,
-+ __DRIdrawable *drawable);
-+
-+#define GLAMO_PACKCOLOR565(r, g, b) \
-+ ((((r) & 0xf8) << 8) \
-+ | (((g) & 0xfc) << 3) \
-+ | (((b) & 0xf8) >> 3))
-+
-+extern uint32_t float7s16(GLfloat in);
-+
-+#endif /* __GLAMO_CONTEXT_H */
-diff --git a/src/mesa/drivers/dri/glamo/glamo_fbo.c b/src/mesa/drivers/dri/glamo/glamo_fbo.c
-new file mode 100644
-index 0000000..e25ca31
---- /dev/null
-+++ b/src/mesa/drivers/dri/glamo/glamo_fbo.c
-@@ -0,0 +1,130 @@
-+/*
-+ * Direct Rendering Support for SMedia Glamo 336x/337x
-+ *
-+ * (c) 2009 Thomas White <taw@bitwiz.org.uk>
-+ * Roughly based on radeon_fbo.c (c) 2008 Red Hat Inc
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining a
-+ * copy of this software and associated documentation files (the "Software"),
-+ * to deal in the Software without restriction, including without limitation
-+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
-+ * and/or sell copies of the Software, and to permit persons to whom the
-+ * Software is furnished to do so, subject to the following conditions:
-+ *
-+ * The above copyright notice and this permission notice shall be included
-+ * in all copies or substantial portions of the Software.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-+ * THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+ */
-+
-+
-+#include "main/imports.h"
-+#include "main/macros.h"
-+#include "main/mtypes.h"
-+#include "main/formats.h"
-+#include "main/fbobject.h"
-+#include "main/framebuffer.h"
-+#include "main/renderbuffer.h"
-+#include "main/context.h"
-+#include "dri_util.h"
-+
-+/* This comes from libdrm_glamo */
-+#include <glamo_bo.h>
-+
-+#include "glamo_fbo.h"
-+
-+
-+static void glamo_delete_renderbuffer(struct gl_renderbuffer *rb)
-+{
-+ struct glamo_renderbuffer *grb = glamo_renderbuffer(rb);
-+
-+ ASSERT(grb);
-+
-+ if ( grb && grb->bo ) {
-+ glamo_bo_unref(grb->bo);
-+ }
-+ free(grb);
-+}
-+
-+
-+static void *glamo_get_pointer(struct gl_context *ctx, struct gl_renderbuffer *rb,
-+ GLint x, GLint y)
-+{
-+ return NULL; /* Can't be directly addressed */
-+}
-+
-+
-+/* Called for each hardware renderbuffer when a _window_ is resized.
-+ * Just update fields.
-+ * Not used for user-created renderbuffers!
-+ */
-+static GLboolean glamo_alloc_window_storage(struct gl_context *ctx,
-+ struct gl_renderbuffer *rb,
-+ GLenum internalFormat,
-+ GLuint width, GLuint height)
-+{
-+ ASSERT(rb->Name == 0);
-+ rb->Width = width;
-+ rb->Height = height;
-+ rb->Format = internalFormat;
-+ return GL_TRUE;
-+}
-+
-+
-+/* Create a buffer, such as a colour or depth buffer */
-+struct glamo_renderbuffer *glamo_create_renderbuffer(GLenum format,
-+ __DRIdrawable *driDrawPriv)
-+{
-+ struct glamo_renderbuffer *grb;
-+
-+ grb = CALLOC_STRUCT(glamo_renderbuffer);
-+ if ( !grb ) return NULL;
-+
-+ _mesa_init_renderbuffer(&grb->base, 0);
-+ grb->base.ClassID = GLAMO_RB_CLASS;
-+
-+ switch (format) {
-+ case GL_RGB5:
-+ grb->base.Format = MESA_FORMAT_RGB565;
-+ grb->base._BaseFormat = GL_RGB;
-+
-+ grb->base.DataType = GL_UNSIGNED_BYTE;
-+ break;
-+ case GL_DEPTH_COMPONENT16:
-+ grb->base.DataType = GL_UNSIGNED_SHORT;
-+ grb->base._BaseFormat = GL_DEPTH_COMPONENT;
-+ break;
-+ default:
-+ fprintf(stderr, "%s: Unknown format 0x%04x\n", __FUNCTION__, format);
-+ _mesa_delete_renderbuffer(&grb->base);
-+ return NULL;
-+ }
-+
-+ grb->dPriv = driDrawPriv;
-+ grb->base.InternalFormat = format;
-+
-+ grb->base.Delete = glamo_delete_renderbuffer;
-+ grb->base.AllocStorage = glamo_alloc_window_storage;
-+ grb->base.GetPointer = glamo_get_pointer;
-+
-+ return grb;
-+}
-+
-+
-+void glamo_renderbuffer_set_bo(struct glamo_renderbuffer *grb,
-+ struct glamo_bo *bo)
-+{
-+ struct glamo_bo *old;
-+ old = grb->bo;
-+ grb->bo = bo;
-+ glamo_bo_ref(bo);
-+ if ( old ) glamo_bo_unref(old);
-+}
-+
-+
-+/* kate: space-indent on; indent-width 3; mixedindent off; indent-mode cstyle; */
-diff --git a/src/mesa/drivers/dri/glamo/glamo_fbo.h b/src/mesa/drivers/dri/glamo/glamo_fbo.h
-new file mode 100644
-index 0000000..48210dd
---- /dev/null
-+++ b/src/mesa/drivers/dri/glamo/glamo_fbo.h
-@@ -0,0 +1,77 @@
-+/*
-+ * Direct Rendering Support for SMedia Glamo 336x/337x
-+ *
-+ * (c) 2009 Thomas White <taw@bitwiz.org.uk>
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining a
-+ * copy of this software and associated documentation files (the "Software"),
-+ * to deal in the Software without restriction, including without limitation
-+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
-+ * and/or sell copies of the Software, and to permit persons to whom the
-+ * Software is furnished to do so, subject to the following conditions:
-+ *
-+ * The above copyright notice and this permission notice shall be included
-+ * in all copies or substantial portions of the Software.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-+ * THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+ */
-+
-+#ifndef __GLAMO_FBO_H
-+#define __GLAMO_FBO_H
-+
-+
-+#include "main/mtypes.h"
-+#include "dri_util.h"
-+
-+
-+/* This is just a marker so we can tell a Glamo renderbuffer from a Mesa one */
-+#define GLAMO_RB_CLASS (0xdeadbeef)
-+
-+
-+struct glamo_renderbuffer
-+{
-+ struct gl_renderbuffer base; /* Must be first */
-+ struct glamo_bo *bo;
-+ unsigned int cpp;
-+ unsigned int pitch;
-+ unsigned int width;
-+ unsigned int height;
-+
-+ __DRIdrawable *dPriv;
-+};
-+
-+
-+struct glamo_framebuffer
-+{
-+ struct gl_framebuffer base;
-+ struct glamo_renderbuffer *color_rb[2];
-+};
-+
-+
-+/* This is just a small wrapper function to return NULL if the gl_renderbuffer
-+ * is not a glamo_renderbuffer */
-+static inline struct glamo_renderbuffer
-+ *glamo_renderbuffer(struct gl_renderbuffer *rb)
-+{
-+ struct glamo_renderbuffer *grb = (struct glamo_renderbuffer *)rb;
-+ if ( grb && grb->base.ClassID == GLAMO_RB_CLASS )
-+ return grb;
-+ else
-+ return NULL;
-+}
-+
-+
-+extern struct glamo_renderbuffer *glamo_create_renderbuffer(GLenum format,
-+ __DRIdrawable *driDrawPriv);
-+
-+extern void glamo_renderbuffer_set_bo(struct glamo_renderbuffer *grb,
-+ struct glamo_bo *bo);
-+
-+#endif /* __GLAMO_FBO_H */
-+
-+/* kate: space-indent on; indent-width 3; mixedindent off; indent-mode cstyle; */
-diff --git a/src/mesa/drivers/dri/glamo/glamo_regs.h b/src/mesa/drivers/dri/glamo/glamo_regs.h
-new file mode 100644
-index 0000000..02b2294
---- /dev/null
-+++ b/src/mesa/drivers/dri/glamo/glamo_regs.h
-@@ -0,0 +1,174 @@
-+#ifndef _GLAMO_REGS_H
-+#define _GLAMO_REGS_H
-+
-+/* Smedia Glamo 336x/337x driver
-+ *
-+ * (C) 2007 by OpenMoko, Inc.
-+ * Author: Harald Welte <laforge@openmoko.org>
-+ * All rights reserved.
-+ *
-+ * Modified for Glamo Mesa driver by Thomas White <taw@bitwiz.org.uk>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License as
-+ * published by the Free Software Foundation; either version 2 of
-+ * the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ * MA 02111-1307 USA
-+ */
-+
-+enum glamo_regster_offsets {
-+ GLAMO_REGOFS_GENERIC = 0x0000,
-+ GLAMO_REGOFS_HOSTBUS = 0x0200,
-+ GLAMO_REGOFS_MEMORY = 0x0300,
-+ GLAMO_REGOFS_VIDCAP = 0x0400,
-+ GLAMO_REGOFS_ISP = 0x0500,
-+ GLAMO_REGOFS_JPEG = 0x0800,
-+ GLAMO_REGOFS_MPEG = 0x0c00,
-+ GLAMO_REGOFS_LCD = 0x1100,
-+ GLAMO_REGOFS_MMC = 0x1400,
-+ GLAMO_REGOFS_MPROC0 = 0x1500,
-+ GLAMO_REGOFS_MPROC1 = 0x1580,
-+ GLAMO_REGOFS_CMDQUEUE = 0x1600,
-+ GLAMO_REGOFS_RISC = 0x1680,
-+ GLAMO_REGOFS_2D = 0x1700,
-+ GLAMO_REGOFS_3D = 0x1b00,
-+};
-+
-+
-+#define REG_MPEG(x) (GLAMO_REGOFS_MPEG+(x))
-+
-+enum glamo_register_mpeg {
-+ //
-+ GLAMO_REG_MPEG_DC_ADDRL = REG_MPEG(0x3c),
-+ GLAMO_REG_MPEG_DC_ADDRH = REG_MPEG(0x3e),
-+ GLAMO_REG_MPEG_AC_ADDRL = REG_MPEG(0x40),
-+ GLAMO_REG_MPEG_AC_ADDRH = REG_MPEG(0x42),
-+ //
-+ GLAMO_REG_MPEG_SAFE_1 = REG_MPEG(0x60),
-+ GLAMO_REG_MPEG_SAFE_2 = REG_MPEG(0x62),
-+ GLAMO_REG_MPEG_SAFE_3 = REG_MPEG(0x64),
-+ //
-+ GLAMO_REG_MPEG_DEC_OUT0_Y_ADDRL = REG_MPEG(0x6e),
-+ GLAMO_REG_MPEG_DEC_OUT0_Y_ADDRH = REG_MPEG(0x70),
-+ GLAMO_REG_MPEG_DEC_OUT0_U_ADDRL = REG_MPEG(0x72),
-+ GLAMO_REG_MPEG_DEC_OUT0_U_ADDRH = REG_MPEG(0x74),
-+ GLAMO_REG_MPEG_DEC_OUT0_V_ADDRL = REG_MPEG(0x76),
-+ GLAMO_REG_MPEG_DEC_OUT0_V_ADDRH = REG_MPEG(0x78),
-+ GLAMO_REG_MPEG_DEC_OUT1_Y_ADDRL = REG_MPEG(0x7a),
-+ GLAMO_REG_MPEG_DEC_OUT1_Y_ADDRH = REG_MPEG(0x7c),
-+ GLAMO_REG_MPEG_DEC_OUT1_U_ADDRL = REG_MPEG(0x7e),
-+ GLAMO_REG_MPEG_DEC_OUT1_U_ADDRH = REG_MPEG(0x80),
-+ GLAMO_REG_MPEG_DEC_OUT1_V_ADDRL = REG_MPEG(0x82),
-+ GLAMO_REG_MPEG_DEC_OUT1_V_ADDRH = REG_MPEG(0x84),
-+ GLAMO_REG_MPEG_DEC_OUT2_Y_ADDRL = REG_MPEG(0x86),
-+ GLAMO_REG_MPEG_DEC_OUT2_Y_ADDRH = REG_MPEG(0x88),
-+ GLAMO_REG_MPEG_DEC_OUT2_U_ADDRL = REG_MPEG(0x8a),
-+ GLAMO_REG_MPEG_DEC_OUT2_U_ADDRH = REG_MPEG(0x8c),
-+ GLAMO_REG_MPEG_DEC_OUT2_V_ADDRL = REG_MPEG(0x8e),
-+ GLAMO_REG_MPEG_DEC_OUT2_V_ADDRH = REG_MPEG(0x90),
-+ GLAMO_REG_MPEG_DEC_WIDTH = REG_MPEG(0x92),
-+ GLAMO_REG_MPEG_DEC_HEIGHT = REG_MPEG(0x94),
-+ GLAMO_REG_MPEG_SPECIAL = REG_MPEG(0x96),
-+ GLAMO_REG_MPEG_DEC_IN_ADDRL = REG_MPEG(0x98),
-+ GLAMO_REG_MPEG_DEC_IN_ADDRH = REG_MPEG(0x9a),
-+ //
-+ GLAMO_REG_MPEG_DEBLK_THRESHOLD = REG_MPEG(0xc0),
-+ //
-+ GLAMO_REG_MPEG_DEC_STATUS = REG_MPEG(0xc8),
-+ GLAMO_REG_MPEG_DEC_RB0 = REG_MPEG(0xca),
-+ GLAMO_REG_MPEG_DEC_RB1 = REG_MPEG(0xcc),
-+};
-+
-+
-+#define REG_2D(x) (GLAMO_REGOFS_2D+(x))
-+
-+enum glamo_register_2d {
-+ GLAMO_REG_2D_SRC_ADDRL = REG_2D(0x00),
-+ GLAMO_REG_2D_SRC_ADDRH = REG_2D(0x02),
-+ GLAMO_REG_2D_SRC_PITCH = REG_2D(0x04),
-+ GLAMO_REG_2D_SRC_X = REG_2D(0x06),
-+ GLAMO_REG_2D_SRC_Y = REG_2D(0x08),
-+ GLAMO_REG_2D_DST_X = REG_2D(0x0a),
-+ GLAMO_REG_2D_DST_Y = REG_2D(0x0c),
-+ GLAMO_REG_2D_DST_ADDRL = REG_2D(0x0e),
-+ GLAMO_REG_2D_DST_ADDRH = REG_2D(0x10),
-+ GLAMO_REG_2D_DST_PITCH = REG_2D(0x12),
-+ GLAMO_REG_2D_DST_HEIGHT = REG_2D(0x14),
-+ GLAMO_REG_2D_RECT_WIDTH = REG_2D(0x16),
-+ GLAMO_REG_2D_RECT_HEIGHT = REG_2D(0x18),
-+ GLAMO_REG_2D_PAT_ADDRL = REG_2D(0x1a),
-+ GLAMO_REG_2D_PAT_ADDRH = REG_2D(0x1c),
-+ GLAMO_REG_2D_PAT_FG = REG_2D(0x1e),
-+ GLAMO_REG_2D_PAT_BG = REG_2D(0x20),
-+ GLAMO_REG_2D_SRC_FG = REG_2D(0x22),
-+ GLAMO_REG_2D_SRC_BG = REG_2D(0x24),
-+ GLAMO_REG_2D_MASK1 = REG_2D(0x26),
-+ GLAMO_REG_2D_MASK2 = REG_2D(0x28),
-+ GLAMO_REG_2D_MASK3 = REG_2D(0x2a),
-+ GLAMO_REG_2D_MASK4 = REG_2D(0x2c),
-+ GLAMO_REG_2D_ROT_X = REG_2D(0x2e),
-+ GLAMO_REG_2D_ROT_Y = REG_2D(0x30),
-+ GLAMO_REG_2D_LEFT_CLIP = REG_2D(0x32),
-+ GLAMO_REG_2D_TOP_CLIP = REG_2D(0x34),
-+ GLAMO_REG_2D_RIGHT_CLIP = REG_2D(0x36),
-+ GLAMO_REG_2D_BOTTOM_CLIP = REG_2D(0x38),
-+ GLAMO_REG_2D_COMMAND1 = REG_2D(0x3A),
-+ GLAMO_REG_2D_COMMAND2 = REG_2D(0x3C),
-+ GLAMO_REG_2D_COMMAND3 = REG_2D(0x3E),
-+ GLAMO_REG_2D_SAFE = REG_2D(0x40),
-+ GLAMO_REG_2D_STATUS = REG_2D(0x42),
-+ GLAMO_REG_2D_ID1 = REG_2D(0x44),
-+ GLAMO_REG_2D_ID2 = REG_2D(0x46),
-+ GLAMO_REG_2D_ID3 = REG_2D(0x48),
-+};
-+
-+
-+/* No offset this time */
-+#define REG_3D(x) (x)
-+
-+enum glamo_register_3d
-+{
-+ /* Fire the engine */
-+ G3D_FIRE = REG_3D(0x2058),
-+
-+ /* Streams of vertex/colour/normal/texcoord data */
-+ G3D_ACTIVE_STREAMS = REG_3D(0x1f00),
-+ G3D_LAST_STREAM__VCOLFMT = REG_3D(0x2030),
-+ G3D_STREAM_MODE_0 = REG_3D(0x1f10),
-+ G3D_STREAM_BASE_0 = REG_3D(0x1f14),
-+ G3D_STREAM_MODE_1 = REG_3D(0x1f18),
-+ G3D_STREAM_BASE_1 = REG_3D(0x1f1c),
-+ G3D_STREAM_MODE_2 = REG_3D(0x1f20),
-+ G3D_STREAM_BASE_2 = REG_3D(0x1f24),
-+ G3D_STREAM_MODE_3 = REG_3D(0x1f28),
-+ G3D_STREAM_BASE_3 = REG_3D(0x1f2c),
-+ G3D_STREAM_MODE_4 = REG_3D(0x1f30),
-+ G3D_STREAM_BASE_4 = REG_3D(0x1f34),
-+ G3D_STREAM_MODE_5 = REG_3D(0x1f38),
-+ G3D_STREAM_BASE_5 = REG_3D(0x1f3c),
-+ G3D_STREAM_MODE_6 = REG_3D(0x1f40),
-+ G3D_STREAM_BASE_6 = REG_3D(0x1f44),
-+ G3D_STREAM_MODE_7 = REG_3D(0x1f48),
-+ G3D_STREAM_BASE_7 = REG_3D(0x1f4c),
-+
-+ /* Modelview*projection matrix */
-+ G3D_MATRIX_MVP = REG_3D(0x26a0), /* .. 0x27df */
-+
-+ /* Modelview matrix */
-+ G3D_MATRIX_MV = REG_3D(0x26e0), /* .. 0x270f */
-+
-+ /* Inverse MVP, 3x3 only */
-+ G3D_MATRIX_IMVP = REG_3D(0x2710), /* .. 0x2733 */
-+
-+};
-+
-+#endif /* _GLAMO_REGS_H */
-diff --git a/src/mesa/drivers/dri/glamo/glamo_render.c b/src/mesa/drivers/dri/glamo/glamo_render.c
-new file mode 100644
-index 0000000..d8b21d5
---- /dev/null
-+++ b/src/mesa/drivers/dri/glamo/glamo_render.c
-@@ -0,0 +1,230 @@
-+/*
-+ * Direct Rendering Support for SMedia Glamo 336x/337x
-+ *
-+ * (c) 2009 Thomas White <taw@bitwiz.org.uk>
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining a
-+ * copy of this software and associated documentation files (the "Software"),
-+ * to deal in the Software without restriction, including without limitation
-+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
-+ * and/or sell copies of the Software, and to permit persons to whom the
-+ * Software is furnished to do so, subject to the following conditions:
-+ *
-+ * The above copyright notice and this permission notice shall be included
-+ * in all copies or substantial portions of the Software.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-+ * THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+ *
-+ *
-+ * Based on intel_render.c, to which the following notice applies:
-+ *
-+ * Copyright 2003 Tungsten Graphics, Inc., Cedar Park, Texas.
-+ * All Rights Reserved.
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining a
-+ * copy of this software and associated documentation files (the
-+ * "Software"), to deal in the Software without restriction, including
-+ * without limitation the rights to use, copy, modify, merge, publish,
-+ * distribute, sub license, and/or sell copies of the Software, and to
-+ * permit persons to whom the Software is furnished to do so, subject to
-+ * the following conditions:
-+ *
-+ * The above copyright notice and this permission notice (including the
-+ * next paragraph) shall be included in all copies or substantial portions
-+ * of the Software.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
-+ * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
-+ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+ *
-+ */
-+
-+
-+/*
-+ * Render unclipped vertex buffers by emitting vertices directly to
-+ * dma buffers. Use strip/fan hardware acceleration where possible.
-+ *
-+ */
-+#include "main/glheader.h"
-+#include "main/context.h"
-+#include "main/macros.h"
-+#include "main/imports.h"
-+#include "main/mtypes.h"
-+#include "main/enums.h"
-+
-+#include "tnl/t_context.h"
-+#include "tnl/t_vertex.h"
-+#include "tnl/t_pipeline.h"
-+#include "math/m_xform.h"
-+
-+#include "glamo_context.h"
-+#include "glamo_tris.h"
-+#include "glamo_regs.h"
-+
-+/*
-+ * Render unclipped vertex buffers by emitting vertices directly to
-+ * VRAM buffers. Use strip/fan hardware primitives where possible.
-+ * Try to simulate missing primitives with indexed vertices.
-+ */
-+#define HAVE_POINTS 1
-+#define HAVE_LINES 1
-+#define HAVE_LINE_STRIPS 0
-+#define HAVE_TRIANGLES 1
-+#define HAVE_TRI_STRIPS 0
-+#define HAVE_TRI_STRIP_1 0
-+#define HAVE_TRI_FANS 0
-+#define HAVE_POLYGONS 0
-+#define HAVE_QUADS 0
-+#define HAVE_QUAD_STRIPS 0
-+#define HAVE_ELTS 0
-+
-+
-+static void glamoFlushPrim(struct glamo_context *gCtx)
-+{
-+ printf("glamoFlushPrim: %i vertices, %i %i\n", gCtx->prim.count,
-+ gCtx->prim.start_offset, gCtx->prim.current_offset);
-+
-+ if ( gCtx->prim.vb_bo == NULL ) return;
-+
-+ /* Upload to hardware */
-+ glamo_bo_subdata(gCtx->prim.vb_bo, 0, gCtx->prim.current_offset,
-+ gCtx->prim.vb);
-+
-+ /* Dispatch to the hardware */
-+ glamoDRMStartBurst(gCtx, G3D_STREAM_MODE_0);
-+ glamoDRMAddData(gCtx, 0x000f0300, 4);
-+ glamoDRMAddBO(gCtx, gCtx->prim.vb_bo);
-+ glamoDRMDispatch(gCtx);
-+
-+ /* Please use a new BO for the next buffer */
-+ gCtx->prim.vb_bo = NULL;
-+
-+ /* Continue from new start */
-+ gCtx->prim.start_offset = gCtx->prim.current_offset;
-+}
-+
-+
-+static inline GLuint glamoGetVBMax(struct glamo_context *gCtx)
-+{
-+ return GLAMO_VB_SIZE / gCtx->vertex_size;
-+}
-+
-+
-+static inline GLuint glamoGetCurrentMax(struct glamo_context *gCtx)
-+{
-+ /* How many more vertices can be accommodated?
-+ * Each vertex takes up 4x 32-bit fixed point values */
-+ return (GLAMO_VB_SIZE - gCtx->prim.current_offset) / gCtx->vertex_size;
-+}
-+
-+
-+#define LOCAL_VARS \
-+ struct glamo_context *gCtx = GLAMO_CONTEXT(ctx);
-+
-+#define INIT(prim)
-+
-+#define FLUSH() glamoFlushPrim(gCtx)
-+
-+#define GET_SUBSEQUENT_VB_MAX_VERTS() glamoGetVBMax(gCtx)
-+#define GET_CURRENT_VB_MAX_VERTS() glamoGetCurrentMax(gCtx)
-+
-+#define ALLOC_VERTS(nr) glamoGetPrimSpace(gCtx, nr)
-+
-+#define EMIT_VERTS(ctx, j, nr, buf) \
-+ _tnl_emit_vertices_to_buffer(ctx, j, (j)+(nr), buf)
-+
-+#define TAG(x) glamo_##x
-+#include "tnl_dd/t_dd_dmatmp.h"
-+
-+
-+/**********************************************************************/
-+/* Render pipeline stage */
-+/**********************************************************************/
-+
-+static void glamoFireEngine(struct glamo_context *gCtx)
-+{
-+ glamoDRMStartBurst(gCtx, G3D_FIRE);
-+ glamoDRMAddData(gCtx, 0, 2); /* Fire! */
-+ glamoDRMDispatch(gCtx);
-+}
-+
-+
-+static GLboolean glamoRunRender(struct gl_context *ctx,
-+ struct tnl_pipeline_stage *stage)
-+{
-+ TNLcontext *tnl = TNL_CONTEXT(ctx);
-+ struct glamo_context *gCtx = GLAMO_CONTEXT(ctx);
-+ struct vertex_buffer *VB = &tnl->vb;
-+ GLuint i;
-+
-+ printf("glamoRunRender\n");
-+
-+ /* Don't handle clipping */
-+ if ( !glamo_validate_render(ctx, VB) ) {
-+ return GL_TRUE; /* Failed */
-+ }
-+
-+ /* Validate GPU state */
-+ if ( gCtx->new_state ) {
-+ if ( !glamoValidateState(ctx, gCtx->new_state) ) {
-+ printf("Couldn't validate state...\n");
-+ }
-+ } /* else nothing to update */
-+
-+ tnl->clipspace.new_inputs |= VERT_BIT_POS;
-+
-+ tnl->Driver.Render.Start(ctx);
-+
-+ for ( i=0; i<VB->PrimitiveCount; i++ ) {
-+
-+ GLuint prim = _tnl_translate_prim(&VB->Primitive[i]);
-+ GLuint start = VB->Primitive[i].start;
-+ GLuint length = VB->Primitive[i].count;
-+
-+ if (!length) continue;
-+
-+ glamo_render_tab_verts[prim & PRIM_MODE_MASK](ctx, start,
-+ start + length, prim);
-+
-+ }
-+
-+ tnl->Driver.Render.Finish(ctx);
-+
-+ glamoFireEngine(gCtx);
-+
-+ return GL_FALSE; /* Ok */
-+}
-+
-+
-+static const struct tnl_pipeline_stage _glamo_render_stage = {
-+ "glamo render",
-+ NULL,
-+ NULL,
-+ NULL,
-+ NULL,
-+ glamoRunRender
-+};
-+
-+
-+const struct tnl_pipeline_stage *glamo_pipeline[] = {
-+ &_tnl_vertex_transform_stage,
-+ &_tnl_normal_transform_stage,
-+ &_tnl_lighting_stage,
-+ &_tnl_fog_coordinate_stage,
-+ &_tnl_texgen_stage,
-+ &_tnl_texture_transform_stage,
-+ &_tnl_point_attenuation_stage,
-+ &_tnl_vertex_program_stage,
-+ &_glamo_render_stage, /* ADD: unclipped rastersetup-to-dma */
-+ &_tnl_render_stage,
-+ 0,
-+};
-diff --git a/src/mesa/drivers/dri/glamo/glamo_render.h b/src/mesa/drivers/dri/glamo/glamo_render.h
-new file mode 100644
-index 0000000..99c36a8
---- /dev/null
-+++ b/src/mesa/drivers/dri/glamo/glamo_render.h
-@@ -0,0 +1,31 @@
-+/*
-+ * Direct Rendering Support for SMedia Glamo 336x/337x
-+ *
-+ * (c) 2009 Thomas White <taw@bitwiz.org.uk>
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining a
-+ * copy of this software and associated documentation files (the "Software"),
-+ * to deal in the Software without restriction, including without limitation
-+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
-+ * and/or sell copies of the Software, and to permit persons to whom the
-+ * Software is furnished to do so, subject to the following conditions:
-+ *
-+ * The above copyright notice and this permission notice shall be included
-+ * in all copies or substantial portions of the Software.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-+ * THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+ */
-+
-+#ifndef __GLAMO_RENDER_H
-+#define __GLAMO_RENDER_H
-+
-+#include "main/mtypes.h"
-+
-+extern const struct tnl_pipeline_stage *glamo_pipeline[];
-+
-+#endif /* __GLAMO_RENDER_H */
-diff --git a/src/mesa/drivers/dri/glamo/glamo_screen.c b/src/mesa/drivers/dri/glamo/glamo_screen.c
-new file mode 100644
-index 0000000..cc8a730
---- /dev/null
-+++ b/src/mesa/drivers/dri/glamo/glamo_screen.c
-@@ -0,0 +1,250 @@
-+/*
-+ * Direct Rendering Support for SMedia Glamo 336x/337x
-+ *
-+ * (c) 2009 Thomas White <taw@bitwiz.org.uk>
-+ * Roughly based on sis_screen.c (c) 2003 Eric Anholt
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining a
-+ * copy of this software and associated documentation files (the "Software"),
-+ * to deal in the Software without restriction, including without limitation
-+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
-+ * and/or sell copies of the Software, and to permit persons to whom the
-+ * Software is furnished to do so, subject to the following conditions:
-+ *
-+ * The above copyright notice and this permission notice shall be included
-+ * in all copies or substantial portions of the Software.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-+ * THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+ */
-+
-+
-+#include "dri_util.h"
-+#include "utils.h"
-+#include "xmlconfig.h"
-+#include "GL/internal/dri_interface.h"
-+#include "main/framebuffer.h"
-+#include "main/renderbuffer.h"
-+
-+#include "glamo_screen.h"
-+#include "glamo_context.h"
-+#include "glamo_fbo.h"
-+
-+/* This comes from libdrm_glamo */
-+#include <glamo_bo_gem.h>
-+
-+
-+static int glamoInitDriver(__DRIscreen *psp)
-+{
-+ return 0;
-+}
-+
-+
-+static glamoScreenPtr glamoCreateScreen(__DRIscreen *sPriv)
-+{
-+ glamoScreenPtr glamoScreen;
-+
-+ /* Allocate the private area */
-+ glamoScreen = (glamoScreenPtr)CALLOC(sizeof(*glamoScreen));
-+ if ( glamoScreen == NULL )
-+ return NULL;
-+
-+ glamoScreen->driScreen = sPriv;
-+
-+ /* This is our link to the kernel's memory manager, via libdrm */
-+ glamoScreen->bom = glamo_bo_manager_gem_ctor(sPriv->fd);
-+
-+ return glamoScreen;
-+}
-+
-+
-+static void glamoDestroyScreen(__DRIscreen *sPriv)
-+{
-+ glamoScreenPtr glamoScreen = (glamoScreenPtr)sPriv->private;
-+
-+ if ( glamoScreen == NULL )
-+ return;
-+
-+ FREE(glamoScreen);
-+ sPriv->private = NULL;
-+}
-+
-+
-+static const __DRIconfig **glamoInitScreen(__DRIscreen *sPriv)
-+{
-+ __DRIconfig **configs;
-+ uint8_t depth_bits_array[2];
-+ uint8_t stencil_bits_array[2];
-+ uint8_t msaa_samples_array[1];
-+ static const GLenum db_modes[] = { GLX_SWAP_COPY_OML, GLX_NONE };
-+
-+ /* Driver initialisation */
-+ if ( glamoInitDriver(sPriv) ) {
-+ return NULL;
-+ }
-+
-+ /* Screen-specific initialisation */
-+ sPriv->private = glamoCreateScreen(sPriv);
-+ if ( !sPriv->private ) {
-+ glamoDestroyScreen(sPriv);
-+ return NULL;
-+ }
-+
-+ depth_bits_array[0] = 0;
-+ stencil_bits_array[0] = 0;
-+ depth_bits_array[1] = 16;
-+ stencil_bits_array[1] = 0;
-+ msaa_samples_array[0] = 0;
-+
-+ configs = driCreateConfigs(GL_RGB, GL_UNSIGNED_SHORT_5_6_5,
-+ depth_bits_array, stencil_bits_array, 2,
-+ db_modes, 2, msaa_samples_array, 1, GL_TRUE);
-+
-+ if ( configs == NULL ) {
-+ fprintf(stderr, "[%s:%u] Error creating FBConfig!\n", __func__, __LINE__);
-+ return NULL;
-+ }
-+
-+ return (const __DRIconfig **)configs;
-+}
-+
-+
-+static const __DRIconfig **glamoInitScreen2(__DRIscreen *sPriv)
-+{
-+ __DRIconfig **configs;
-+ uint8_t depth_bits_array[2];
-+ uint8_t stencil_bits_array[2];
-+ uint8_t msaa_samples_array[1];
-+ static const GLenum db_modes[] = { GLX_SWAP_COPY_OML, GLX_NONE };
-+
-+ /* Driver initialisation */
-+ if ( glamoInitDriver(sPriv) ) {
-+ return NULL;
-+ }
-+
-+ /* Screen-specific initialisation */
-+ sPriv->private = glamoCreateScreen(sPriv);
-+ if ( !sPriv->private ) {
-+ glamoDestroyScreen(sPriv);
-+ return NULL;
-+ }
-+
-+ depth_bits_array[0] = 0;
-+ stencil_bits_array[0] = 0;
-+ depth_bits_array[1] = 16;
-+ stencil_bits_array[1] = 0;
-+ msaa_samples_array[0] = 0;
-+
-+ configs = driCreateConfigs(GL_RGB, GL_UNSIGNED_SHORT_5_6_5,
-+ depth_bits_array, stencil_bits_array, 2,
-+ db_modes, 2, msaa_samples_array, 1, GL_TRUE);
-+
-+ if ( configs == NULL ) {
-+ fprintf(stderr, "[%s:%u] Error creating FBConfig!\n", __func__, __LINE__);
-+ return NULL;
-+ }
-+
-+ return (const __DRIconfig **)configs;
-+}
-+
-+
-+/* Allocate buffers for a context. This is where the fun starts... */
-+static GLboolean glamoCreateBuffer(__DRIscreen *driScrnPriv,
-+ __DRIdrawable *driDrawPriv,
-+ const struct gl_config *mesaVis,
-+ GLboolean isPixmap)
-+{
-+ struct glamo_framebuffer *gfb;
-+ GLenum rgbFormat;
-+
-+ if ( isPixmap ) return GL_FALSE; /* not implemented */
-+
-+ gfb = CALLOC_STRUCT(glamo_framebuffer);
-+ if ( !gfb ) return GL_FALSE;
-+
-+ _mesa_initialize_window_framebuffer(&gfb->base, mesaVis);
-+
-+ /* we only support this one format at the moment */
-+ rgbFormat = GL_RGB5;
-+
-+ /* Front color renderbuffer */
-+ gfb->color_rb[0] = glamo_create_renderbuffer(rgbFormat, driDrawPriv);
-+ _mesa_add_renderbuffer(&gfb->base, BUFFER_FRONT_LEFT,
-+ &gfb->color_rb[0]->base);
-+
-+ /* Back color renderbuffer, if requested */
-+ if ( mesaVis->doubleBufferMode ) {
-+ gfb->color_rb[1] = glamo_create_renderbuffer(rgbFormat, driDrawPriv);
-+ _mesa_add_renderbuffer(&gfb->base, BUFFER_BACK_LEFT,
-+ &gfb->color_rb[1]->base);
-+ }
-+
-+ if ( mesaVis->depthBits == 16 ) {
-+ struct glamo_renderbuffer *depth;
-+ depth = glamo_create_renderbuffer(GL_DEPTH_COMPONENT16, driDrawPriv);
-+ _mesa_add_renderbuffer(&gfb->base, BUFFER_DEPTH, &depth->base);
-+ }
-+
-+ /* Add software renderbuffers for the things we can't support in hardware */
-+ _mesa_add_soft_renderbuffers(&gfb->base,
-+ GL_FALSE, /* color */
-+ GL_FALSE, /* depth */
-+ mesaVis->stencilBits > 0, /* stencil, if required */
-+ mesaVis->accumRedBits > 0, /* accum, if required */
-+ GL_FALSE, /* alpha */
-+ GL_FALSE /* aux */
-+ );
-+ driDrawPriv->driverPrivate = (void *)gfb;
-+
-+ return (driDrawPriv->driverPrivate != NULL);
-+}
-+
-+
-+static void glamoDestroyBuffer(__DRIdrawable *driDrawPriv)
-+{
-+}
-+
-+
-+static void glamoSwapBuffers(__DRIdrawable *driDrawPriv)
-+{
-+ printf("glamoSwapBuffers\n"); fflush(stdout);
-+}
-+
-+
-+/*
-+ * Mesa entry points
-+ *
-+ * See src/mesa/drivers/dri/common/dri_util.h for information about these
-+ */
-+const struct __DriverAPIRec driDriverAPI = {
-+ .InitScreen = glamoInitScreen,
-+ .DestroyScreen = glamoDestroyScreen,
-+ .CreateContext = glamoCreateContext,
-+ .DestroyContext = glamoDestroyContext,
-+ .CreateBuffer = glamoCreateBuffer,
-+ .DestroyBuffer = glamoDestroyBuffer,
-+ .SwapBuffers = glamoSwapBuffers,
-+ .MakeCurrent = glamoMakeCurrent,
-+ .UnbindContext = glamoUnbindContext,
-+ .GetSwapInfo = NULL, /* Not used */
-+ .WaitForMSC = NULL,
-+ .WaitForSBC = NULL,
-+ .SwapBuffersMSC = NULL,
-+ .CopySubBuffer = NULL,
-+ .GetDrawableMSC = NULL, /* Not used */
-+ .InitScreen2 = glamoInitScreen2, /* For DRI2 */
-+};
-+
-+/* This is the table of extensions that the loader will dlsym() for. */
-+PUBLIC const __DRIextension *__driDriverExtensions[] = {
-+ &driCoreExtension.base,
-+ &driLegacyExtension.base,
-+ &driDRI2Extension.base,
-+ NULL
-+};
-+
-+/* kate: space-indent on; indent-width 3; mixedindent off; indent-mode cstyle; */
-diff --git a/src/mesa/drivers/dri/glamo/glamo_screen.h b/src/mesa/drivers/dri/glamo/glamo_screen.h
-new file mode 100644
-index 0000000..3f2eb5f
---- /dev/null
-+++ b/src/mesa/drivers/dri/glamo/glamo_screen.h
-@@ -0,0 +1,44 @@
-+/*
-+ * Direct Rendering Support for SMedia Glamo 336x/337x
-+ *
-+ * (c) 2009 Thomas White <taw@bitwiz.org.uk>
-+ * Roughly based on sis_screen.h (c) 2003 Eric Anholt
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining a
-+ * copy of this software and associated documentation files (the "Software"),
-+ * to deal in the Software without restriction, including without limitation
-+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
-+ * and/or sell copies of the Software, and to permit persons to whom the
-+ * Software is furnished to do so, subject to the following conditions:
-+ *
-+ * The above copyright notice and this permission notice shall be included
-+ * in all copies or substantial portions of the Software.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-+ * THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+ */
-+
-+#ifndef __GLAMO_SCREEN_H
-+#define __GLAMO_SCREEN_H
-+
-+#include "xmlconfig.h"
-+#include "dri_util.h"
-+
-+#include <glamo_bo_gem.h>
-+
-+typedef struct {
-+
-+ __DRIscreen *driScreen;
-+ driOptionCache optionCache;
-+
-+ struct glamo_bo_manager *bom;
-+
-+} glamoScreenRec, *glamoScreenPtr;
-+
-+#endif /* __GLAMO_SCREEN_H */
-+
-+/* kate: space-indent on; indent-width 3; mixedindent off; indent-mode cstyle; */
-diff --git a/src/mesa/drivers/dri/glamo/glamo_state.c b/src/mesa/drivers/dri/glamo/glamo_state.c
-new file mode 100644
-index 0000000..3aa2f8b
---- /dev/null
-+++ b/src/mesa/drivers/dri/glamo/glamo_state.c
-@@ -0,0 +1,305 @@
-+/*
-+ * Direct Rendering Support for SMedia Glamo 336x/337x
-+ *
-+ * (c) 2009-2010 Thomas White <taw@bitwiz.org.uk>
-+ * Roughly based on sis_state.c (c) 2003 Eric Anholt
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining a
-+ * copy of this software and associated documentation files (the "Software"),
-+ * to deal in the Software without restriction, including without limitation
-+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
-+ * and/or sell copies of the Software, and to permit persons to whom the
-+ * Software is furnished to do so, subject to the following conditions:
-+ *
-+ * The above copyright notice and this permission notice shall be included
-+ * in all copies or substantial portions of the Software.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-+ * THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+ *
-+ *
-+ * Also partially based on intel_fbo.c, to which the following notice applies:
-+ *
-+ * Copyright 2006 Tungsten Graphics, Inc., Cedar Park, Texas.
-+ * All Rights Reserved.
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining a
-+ * copy of this software and associated documentation files (the
-+ * "Software"), to deal in the Software without restriction, including
-+ * without limitation the rights to use, copy, modify, merge, publish,
-+ * distribute, sub license, and/or sell copies of the Software, and to
-+ * permit persons to whom the Software is furnished to do so, subject to
-+ * the following conditions:
-+ *
-+ * The above copyright notice and this permission notice (including the
-+ * next paragraph) shall be included in all copies or substantial portions
-+ * of the Software.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
-+ * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
-+ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+ */
-+
-+
-+#include "main/context.h"
-+#include "main/framebuffer.h"
-+#include "main/api_arrayelt.h"
-+#include "main/macros.h"
-+#include "swrast/swrast.h"
-+#include "swrast_setup/swrast_setup.h"
-+#include "tnl/tnl.h"
-+
-+#include "glamo_fbo.h"
-+#include "glamo_state.h"
-+#include "glamo_context.h"
-+#include "glamo_cmdq.h"
-+#include "glamo_regs.h"
-+
-+
-+static void glamoResizeBuffers(struct gl_context *ctx, struct gl_framebuffer *fb,
-+ GLuint width, GLuint height)
-+{
-+ struct glamo_framebuffer *glamo_fb = (struct glamo_framebuffer *)fb;
-+ int i;
-+
-+ _mesa_resize_framebuffer(ctx, fb, width, height);
-+
-+ fb->Initialized = GL_TRUE; /* XXX remove someday */
-+
-+ if (fb->Name != 0) {
-+ return;
-+ }
-+
-+ /* Make sure all window system renderbuffers are up to date */
-+ for (i = 0; i < 2; i++) {
-+ struct gl_renderbuffer *rb = &glamo_fb->color_rb[i]->base;
-+
-+ /* only resize if size is changing */
-+ if (rb && (rb->Width != width || rb->Height != height)) {
-+ rb->AllocStorage(ctx, rb, rb->InternalFormat,
-+ width, height);
-+ }
-+ }
-+}
-+
-+
-+static void glamoClear(struct gl_context *ctx, GLbitfield mask)
-+{
-+ glamoContext *gCtx;
-+ struct gl_framebuffer *fb;
-+ int i;
-+
-+ gCtx = GLAMO_CONTEXT(ctx);
-+ fb = ctx->DrawBuffer;
-+
-+ printf("glamoClear (%f %f %f %f)\n", ctx->Color.ClearColor[0],
-+ ctx->Color.ClearColor[1], ctx->Color.ClearColor[2],
-+ ctx->Color.ClearColor[3]); fflush(stdout);
-+
-+ for (i = 0; i < fb->_NumColorDrawBuffers; i++) {
-+
-+ struct glamo_renderbuffer *grb;
-+
-+ grb = glamo_renderbuffer(fb->_ColorDrawBuffers[i]);
-+
-+ glamoDRMStartBurst(gCtx, GLAMO_REG_2D_DST_X);
-+ glamoDRMAddData(gCtx, fb->_Xmin, 2); /* dest X */
-+ glamoDRMAddData(gCtx, fb->_Ymin, 2); /* dest Y */
-+ glamoDRMAddBO(gCtx, grb->bo); /* dest L/H */
-+ glamoDRMAddData(gCtx, grb->pitch & 0x7ff, 2); /* dest pitch */
-+ glamoDRMAddData(gCtx, grb->height, 2); /* dest height */
-+ glamoDRMAddData(gCtx, fb->_Xmax-fb->_Xmin, 2); /* width */
-+ glamoDRMAddData(gCtx, fb->_Ymax-fb->_Ymin, 2); /* height */
-+ glamoDRMAddData(gCtx, 0x0000, 2); /* patt L */
-+ glamoDRMAddData(gCtx, 0x0000, 2); /* patt H */
-+ glamoDRMAddData(gCtx, gCtx->col_clear, 2); /* FG colour */
-+ glamoDRMDispatch(gCtx);
-+
-+ glamoDRMStartBurst(gCtx, GLAMO_REG_2D_COMMAND1);
-+ glamoDRMAddData(gCtx, 0x0000, 2); /* Cmd param 1 */
-+ glamoDRMAddData(gCtx, 0xf0 << 8, 2); /* Cmd param 2 */
-+ glamoDRMAddData(gCtx, 0x0000, 2); /* Cmd param 3 */
-+ glamoDRMDispatch(gCtx);
-+
-+ }
-+}
-+
-+
-+static void glamoClearColor(struct gl_context *ctx, const GLfloat color[4])
-+{
-+ struct glamo_context *gCtx = GLAMO_CONTEXT(ctx);
-+ GLubyte col_byte[4];
-+
-+ printf("glamoClearColor (%f %f %f %f)\n", color[0], color[1], color[2],
-+ color[3]); fflush(stdout);
-+
-+ CLAMPED_FLOAT_TO_UBYTE(col_byte[0], color[0]);
-+ CLAMPED_FLOAT_TO_UBYTE(col_byte[1], color[1]);
-+ CLAMPED_FLOAT_TO_UBYTE(col_byte[2], color[2]);
-+ CLAMPED_FLOAT_TO_UBYTE(col_byte[3], color[3]);
-+
-+ gCtx->col_clear = GLAMO_PACKCOLOR565(col_byte[0], col_byte[1],
-+ col_byte[2]);
-+}
-+
-+
-+static void glamoShadeModel(struct gl_context *ctx, GLenum mode)
-+{
-+ printf("glamoShadeModel\n"); fflush(stdout);
-+}
-+
-+
-+static void glamoViewport(struct gl_context *ctx, GLint x, GLint y,
-+ GLsizei width, GLsizei height )
-+{
-+ struct glamo_context *gCtx = GLAMO_CONTEXT(ctx);
-+ __DRIcontext *driContext = gCtx->driContext;
-+ void (*old_viewport)(struct gl_context *ctx, GLint x, GLint y,
-+ GLsizei w, GLsizei h);
-+
-+ if ( !driContext->driScreenPriv->dri2.enabled ) return;
-+
-+ /* TODO: Flush before fiddling with fake front buffer */
-+
-+ if ( ctx->DrawBuffer->Name == 0 ) {
-+
-+ glamo_update_renderbuffers(driContext,
-+ driContext->driDrawablePriv);
-+ if ( driContext->driDrawablePriv
-+ != driContext->driReadablePriv ) {
-+ glamo_update_renderbuffers(driContext,
-+ driContext->driReadablePriv);
-+ }
-+
-+ }
-+
-+ old_viewport = ctx->Driver.Viewport;
-+ ctx->Driver.Viewport = NULL;
-+ gCtx->driDrawable = driContext->driDrawablePriv;
-+ ctx->Driver.Viewport = old_viewport;
-+}
-+
-+
-+static void glamoUploadMatrix(struct glamo_context *gCtx, uint16_t mreg,
-+ GLfloat *matrix)
-+{
-+ int i;
-+ char *type;
-+
-+ switch ( mreg ) {
-+ case G3D_MATRIX_MVP :
-+ type = "MVP"; break;
-+ case G3D_MATRIX_MV :
-+ type = "MV"; break;
-+ case G3D_MATRIX_IMVP :
-+ type = "inverse MVP"; break;
-+ default :
-+ type = "unknown"; break;
-+ }
-+ printf("Uploading %s matrix...\n", type);
-+
-+ glamoDRMStartBurst(gCtx, mreg);
-+ if ( mreg != G3D_MATRIX_IMVP ) {
-+ for ( i=0; i<16; i++ ) {
-+ glamoDRMAddData(gCtx, float7s16(matrix[i]), 4);
-+ }
-+ } else {
-+ /* Normal matrix needs special treatment */
-+ for ( i=0; i<3; i++ ) {
-+ glamoDRMAddData(gCtx, float7s16(matrix[4*i]), 4);
-+ glamoDRMAddData(gCtx, float7s16(matrix[4*i+1]), 4);
-+ glamoDRMAddData(gCtx, float7s16(matrix[4*i+2]), 4);
-+ }
-+ }
-+ glamoDRMDispatch(gCtx);
-+}
-+
-+
-+GLboolean glamoValidateState(struct gl_context *ctx, GLuint new_state)
-+{
-+ struct glamo_context *gCtx = GLAMO_CONTEXT(ctx);
-+
-+ if ( new_state & (_NEW_MODELVIEW|_NEW_PROJECTION) ) {
-+
-+ glamoUploadMatrix(gCtx, G3D_MATRIX_MVP,
-+ ctx->_ModelProjectMatrix.m);
-+
-+ /* FIXME: The following two aren't needed unless lighting
-+ * is in use... */
-+ glamoUploadMatrix(gCtx, G3D_MATRIX_MV,
-+ ctx->ModelviewMatrixStack.Top->m);
-+ _math_matrix_alloc_inv(&(ctx->_ModelProjectMatrix));
-+ _math_matrix_analyse(&(ctx->_ModelProjectMatrix));
-+ glamoUploadMatrix(gCtx, G3D_MATRIX_IMVP,
-+ ctx->_ModelProjectMatrix.inv);
-+ }
-+
-+ gCtx->new_state = 0;
-+ return GL_TRUE;
-+}
-+
-+
-+static void glamoUpdateState(struct gl_context *ctx, GLbitfield new_state)
-+{
-+ struct glamo_context *gCtx = GLAMO_CONTEXT(ctx);
-+
-+ printf("glamoUpdateState\n");
-+
-+ _swrast_InvalidateState(ctx, new_state);
-+ _swsetup_InvalidateState(ctx, new_state);
-+ _vbo_InvalidateState(ctx, new_state);
-+ _tnl_InvalidateState(ctx, new_state);
-+ _ae_invalidate_state(ctx, new_state);
-+
-+ /* Make a note that some state has changed,
-+ * so that it can be sent to the GPU later. */
-+ gCtx->new_state |= new_state;
-+}
-+
-+
-+static void glamoFlush(struct gl_context *ctx)
-+{
-+ printf("glamoFlush\n");
-+}
-+
-+
-+void glamoInitStateFuncs(struct gl_context *ctx)
-+{
-+ ctx->Driver.UpdateState = glamoUpdateState;
-+ ctx->Driver.Clear = glamoClear;
-+ ctx->Driver.ClearColor = glamoClearColor;
-+ ctx->Driver.ClearDepth = NULL;
-+ ctx->Driver.ClearStencil = NULL;
-+ ctx->Driver.AlphaFunc = NULL;
-+ ctx->Driver.BlendFuncSeparate = NULL;
-+ ctx->Driver.ColorMask = NULL;
-+ ctx->Driver.CullFace = NULL;
-+ ctx->Driver.DepthMask = NULL;
-+ ctx->Driver.DepthFunc = NULL;
-+ ctx->Driver.DepthRange = NULL;
-+ ctx->Driver.DrawBuffer = NULL;
-+ ctx->Driver.Enable = NULL;
-+ ctx->Driver.FrontFace = NULL;
-+ ctx->Driver.Fogfv = NULL;
-+ ctx->Driver.Hint = NULL;
-+ ctx->Driver.Lightfv = NULL;
-+ ctx->Driver.LogicOpcode = NULL;
-+ ctx->Driver.PolygonMode = NULL;
-+ ctx->Driver.PolygonStipple = NULL;
-+ ctx->Driver.ReadBuffer = NULL;
-+ ctx->Driver.RenderMode = NULL;
-+ ctx->Driver.Scissor = NULL;
-+ ctx->Driver.ShadeModel = glamoShadeModel;
-+ ctx->Driver.LightModelfv = NULL;
-+ ctx->Driver.Viewport = glamoViewport;
-+ ctx->Driver.ResizeBuffers = glamoResizeBuffers;
-+ ctx->Driver.Flush = glamoFlush;
-+}
-diff --git a/src/mesa/drivers/dri/glamo/glamo_state.h b/src/mesa/drivers/dri/glamo/glamo_state.h
-new file mode 100644
-index 0000000..c3872c0
---- /dev/null
-+++ b/src/mesa/drivers/dri/glamo/glamo_state.h
-@@ -0,0 +1,34 @@
-+/*
-+ * Direct Rendering Support for SMedia Glamo 336x/337x
-+ *
-+ * (c) 2009 Thomas White <taw@bitwiz.org.uk>
-+ * Roughly based on sis_state.h (c) 2003 Eric Anholt
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining a
-+ * copy of this software and associated documentation files (the "Software"),
-+ * to deal in the Software without restriction, including without limitation
-+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
-+ * and/or sell copies of the Software, and to permit persons to whom the
-+ * Software is furnished to do so, subject to the following conditions:
-+ *
-+ * The above copyright notice and this permission notice shall be included
-+ * in all copies or substantial portions of the Software.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-+ * THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+ */
-+
-+#ifndef __GLAMO_STATE_H
-+#define __GLAMO_STATE_H
-+
-+#include "main/context.h"
-+
-+extern void glamoInitStateFuncs(struct gl_context *ctx);
-+
-+#endif /* __GLAMO_STATE_H */
-+
-+/* kate: space-indent on; indent-width 3; mixedindent off; indent-mode cstyle; */
-diff --git a/src/mesa/drivers/dri/glamo/glamo_tris.c b/src/mesa/drivers/dri/glamo/glamo_tris.c
-new file mode 100644
-index 0000000..c45fe53
---- /dev/null
-+++ b/src/mesa/drivers/dri/glamo/glamo_tris.c
-@@ -0,0 +1,310 @@
-+/*
-+ * Direct Rendering Support for SMedia Glamo 336x/337x
-+ *
-+ * (c) 2009 Thomas White <taw@bitwiz.org.uk>
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining a
-+ * copy of this software and associated documentation files (the "Software"),
-+ * to deal in the Software without restriction, including without limitation
-+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
-+ * and/or sell copies of the Software, and to permit persons to whom the
-+ * Software is furnished to do so, subject to the following conditions:
-+ *
-+ * The above copyright notice and this permission notice shall be included
-+ * in all copies or substantial portions of the Software.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-+ * THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+ *
-+ *
-+ * Based on intel_tris.c, to which the following notice applies:
-+ *
-+ * Copyright 2003 Tungsten Graphics, Inc., Cedar Park, Texas.
-+ * All Rights Reserved.
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining a
-+ * copy of this software and associated documentation files (the
-+ * "Software"), to deal in the Software without restriction, including
-+ * without limitation the rights to use, copy, modify, merge, publish,
-+ * distribute, sub license, and/or sell copies of the Software, and to
-+ * permit persons to whom the Software is furnished to do so, subject to
-+ * the following conditions:
-+ *
-+ * The above copyright notice and this permission notice (including the
-+ * next paragraph) shall be included in all copies or substantial portions
-+ * of the Software.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
-+ * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
-+ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+ *
-+ */
-+
-+
-+#include <glamo_bo.h>
-+#include <glamo_bo_gem.h>
-+#include <glamo_drm.h>
-+
-+#include "main/mtypes.h"
-+#include "swrast/swrast.h"
-+#include "tnl/t_context.h"
-+#include "tnl/t_vertex.h"
-+#include "tnl/t_pipeline.h"
-+
-+#include "glamo_tris.h"
-+#include "glamo_context.h"
-+
-+
-+static void glamoRunPipeline(struct gl_context *ctx)
-+{
-+ printf("glamoRunPipeline\n");
-+
-+ /* TODO: Emit state */
-+
-+ _tnl_run_pipeline(ctx);
-+}
-+
-+
-+static void glamoRenderStart(struct gl_context *ctx)
-+{
-+ struct glamo_context *gCtx = GLAMO_CONTEXT(ctx);
-+
-+ /* Decide which attributes will be used */
-+ gCtx->vertex_attrs[0].attrib = _TNL_ATTRIB_POS;
-+ gCtx->vertex_attrs[0].format = EMIT_4F;
-+
-+ gCtx->vertex_size = _tnl_install_attrs(ctx, gCtx->vertex_attrs, 1,
-+ NULL, 0);
-+}
-+
-+
-+static void glamoRenderFinish(struct gl_context *ctx)
-+{
-+ printf("glamoRenderFinish\n");
-+}
-+
-+
-+static void glamoPrimitiveNotify(struct gl_context *ctx, GLenum prim)
-+{
-+ printf("glamoPrimitiveNotify\n");
-+}
-+
-+
-+uint32_t *glamoGetPrimSpace(struct glamo_context *gCtx, unsigned int count)
-+{
-+ uint32_t *addr;
-+
-+ printf("glamoGetPrimSpace\n");
-+
-+ /* Check for space in the existing VB */
-+ if (gCtx->prim.vb_bo == NULL || (gCtx->prim.current_offset +
-+ count * gCtx->vertex_size) > GLAMO_VB_SIZE) {
-+
-+ /* Not enough space, or no VB existing. Start a new one... */
-+ if (gCtx->prim.vb == NULL) {
-+ printf("Allocated %i bytes\n", GLAMO_VB_SIZE);
-+ gCtx->prim.vb = malloc(GLAMO_VB_SIZE);
-+ }
-+ gCtx->prim.vb_bo = glamo_bo_open(gCtx->glamoScreen->bom, 0,
-+ GLAMO_VB_SIZE, 4,
-+ GLAMO_GEM_DOMAIN_VRAM, 0);
-+ gCtx->prim.start_offset = 0;
-+ gCtx->prim.current_offset = 0;
-+ }
-+
-+ addr = (uint32_t *)(gCtx->prim.vb + gCtx->prim.current_offset);
-+ gCtx->prim.current_offset += gCtx->vertex_size * count;
-+ gCtx->prim.count += count;
-+
-+ return addr;
-+}
-+
-+
-+#define COPY_DWORDS( j, vb, vertsize, v ) \
-+do { \
-+ for ( j = 0 ; j < vertsize ; j++ ) { \
-+ vb[j] = ((GLuint *)v)[j]; \
-+ } \
-+ vb += vertsize; \
-+} while (0)
-+
-+
-+static void glamo_draw_triangle(struct glamo_context *gCtx,
-+ glamoVertexPtr v0, glamoVertexPtr v1,
-+ glamoVertexPtr v2)
-+{
-+ GLuint *vb = glamoGetPrimSpace(gCtx, 3);
-+ int j;
-+
-+ COPY_DWORDS(j, vb, gCtx->vertex_size, v0);
-+ COPY_DWORDS(j, vb, gCtx->vertex_size, v1);
-+ COPY_DWORDS(j, vb, gCtx->vertex_size, v2);
-+}
-+
-+
-+static void glamo_draw_line(struct glamo_context *gCtx,
-+ glamoVertexPtr v0, glamoVertexPtr v1)
-+{
-+ GLuint *vb = glamoGetPrimSpace(gCtx, 2);
-+ int j;
-+
-+ COPY_DWORDS(j, vb, gCtx->vertex_size, v0);
-+ COPY_DWORDS(j, vb, gCtx->vertex_size, v1);
-+}
-+
-+
-+static void glamo_draw_point(struct glamo_context *gCtx, glamoVertexPtr v0)
-+{
-+ GLuint *vb = glamoGetPrimSpace(gCtx, 2);
-+ int j;
-+
-+ COPY_DWORDS(j, vb, gCtx->vertex_size, v0);
-+}
-+
-+
-+#define TRI( a, b, c ) \
-+do { \
-+ glamo_draw_triangle(gCtx, a, b, c ); \
-+} while (0)
-+
-+
-+#define QUAD( a, b, c, d ) \
-+printf("Drawing a quad\n"); \
-+do { \
-+ glamo_draw_triangle(gCtx, a, b, d); \
-+ glamo_draw_triangle(gCtx, b, c, d); \
-+} while (0)
-+
-+
-+#define LINE(v0, v1) \
-+do { \
-+ glamo_draw_line(gCtx, v0, v1); \
-+} while (0)
-+
-+
-+#define POINT(v0) \
-+do { \
-+ glamo_draw_point(gCtx, v0); \
-+} while (0)
-+
-+
-+#define IND (0)
-+#define TAG(x) x
-+#include "tnl_dd/t_dd_tritmp.h"
-+
-+#define IND (0)
-+#define TAG(x) x##_offset
-+#include "tnl_dd/t_dd_tritmp.h"
-+
-+#define IND (0)
-+#define TAG(x) x##_twoside
-+#include "tnl_dd/t_dd_tritmp.h"
-+
-+#define IND (0)
-+#define TAG(x) x##_twoside_offset
-+#include "tnl_dd/t_dd_tritmp.h"
-+
-+#define IND (0)
-+#define TAG(x) x##_unfilled
-+#include "tnl_dd/t_dd_tritmp.h"
-+
-+#define IND (0)
-+#define TAG(x) x##_offset_unfilled
-+#include "tnl_dd/t_dd_tritmp.h"
-+
-+#define IND (0)
-+#define TAG(x) x##_twoside_unfilled
-+#include "tnl_dd/t_dd_tritmp.h"
-+
-+#define IND (0)
-+#define TAG(x) x##_twoside_offset_unfilled
-+#include "tnl_dd/t_dd_tritmp.h"
-+
-+#define IND (0)
-+#define TAG(x) x##_fallback
-+#include "tnl_dd/t_dd_tritmp.h"
-+
-+#define IND (0)
-+#define TAG(x) x##_offset_fallback
-+#include "tnl_dd/t_dd_tritmp.h"
-+
-+#define IND (0)
-+#define TAG(x) x##_twoside_fallback
-+#include "tnl_dd/t_dd_tritmp.h"
-+
-+#define IND (0)
-+#define TAG(x) x##_twoside_offset_fallback
-+#include "tnl_dd/t_dd_tritmp.h"
-+
-+#define IND (0)
-+#define TAG(x) x##_unfilled_fallback
-+#include "tnl_dd/t_dd_tritmp.h"
-+
-+#define IND (0)
-+#define TAG(x) x##_offset_unfilled_fallback
-+#include "tnl_dd/t_dd_tritmp.h"
-+
-+#define IND (0)
-+#define TAG(x) x##_twoside_unfilled_fallback
-+#include "tnl_dd/t_dd_tritmp.h"
-+
-+#define IND (0)
-+#define TAG(x) x##_twoside_offset_unfilled_fallback
-+#include "tnl_dd/t_dd_tritmp.h"
-+
-+
-+static void init_rast_tab()
-+{
-+ init();
-+ init_offset();
-+ init_twoside();
-+ init_twoside_offset();
-+ init_unfilled();
-+ init_offset_unfilled();
-+ init_twoside_unfilled();
-+ init_twoside_offset_unfilled();
-+ init_fallback();
-+ init_offset_fallback();
-+ init_twoside_fallback();
-+ init_twoside_offset_fallback();
-+ init_unfilled_fallback();
-+ init_offset_unfilled_fallback();
-+ init_twoside_unfilled_fallback();
-+ init_twoside_offset_unfilled_fallback();
-+}
-+
-+
-+void glamoInitTriFuncs(struct gl_context *ctx)
-+{
-+ TNLcontext *tnl = TNL_CONTEXT(ctx);
-+ struct glamo_context *gCtx = GLAMO_CONTEXT(ctx);
-+ static int firsttime = 1;
-+
-+ if (firsttime) {
-+ init_rast_tab();
-+ firsttime = 0;
-+ }
-+
-+ gCtx->prim.start_offset = 0;
-+ gCtx->prim.current_offset = 0;
-+ gCtx->prim.vb_bo = NULL;
-+ gCtx->prim.vb = NULL;
-+ gCtx->prim.count = 0;
-+
-+ tnl->Driver.RunPipeline = glamoRunPipeline;
-+ tnl->Driver.Render.Start = glamoRenderStart;
-+ tnl->Driver.Render.Finish = glamoRenderFinish;
-+ tnl->Driver.Render.PrimitiveNotify = glamoPrimitiveNotify;
-+ tnl->Driver.Render.ResetLineStipple = _swrast_ResetLineStipple;
-+ tnl->Driver.Render.BuildVertices = _tnl_build_vertices;
-+ tnl->Driver.Render.CopyPV = _tnl_copy_pv;
-+ tnl->Driver.Render.Interp = _tnl_interp;
-+}
-diff --git a/src/mesa/drivers/dri/glamo/glamo_tris.h b/src/mesa/drivers/dri/glamo/glamo_tris.h
-new file mode 100644
-index 0000000..ea396c1
---- /dev/null
-+++ b/src/mesa/drivers/dri/glamo/glamo_tris.h
-@@ -0,0 +1,38 @@
-+/*
-+ * Direct Rendering Support for SMedia Glamo 336x/337x
-+ *
-+ * (c) 2009 Thomas White <taw@bitwiz.org.uk>
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining a
-+ * copy of this software and associated documentation files (the "Software"),
-+ * to deal in the Software without restriction, including without limitation
-+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
-+ * and/or sell copies of the Software, and to permit persons to whom the
-+ * Software is furnished to do so, subject to the following conditions:
-+ *
-+ * The above copyright notice and this permission notice shall be included
-+ * in all copies or substantial portions of the Software.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-+ * THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+ */
-+
-+#ifndef __GLAMO_TRIS_H
-+#define __GLAMO_TRIS_H
-+
-+#include "main/mtypes.h"
-+
-+#include "glamo_context.h"
-+
-+/* Amount of space reserved for vertex submission */
-+#define GLAMO_VB_SIZE (32*1024)
-+
-+extern void glamoInitTriFuncs(struct gl_context *ctx);
-+extern uint32_t *glamoGetPrimSpace(struct glamo_context *gCtx,
-+ unsigned int count);
-+
-+#endif /* __GLAMO_TRIS_H */
-diff --git a/src/mesa/tnl_dd/t_dd_dmatmp.h b/src/mesa/tnl_dd/t_dd_dmatmp.h
-index 997fc0b..e3c9119 100644
---- a/src/mesa/tnl_dd/t_dd_dmatmp.h
-+++ b/src/mesa/tnl_dd/t_dd_dmatmp.h
-@@ -127,6 +127,8 @@ static void TAG(render_points_verts)( struct gl_context *ctx,
- currentsz = dmasz;
- }
-
-+ FLUSH();
-+
- } else {
- fprintf(stderr, "%s - cannot draw primitive\n", __FUNCTION__);
- return;
-@@ -162,6 +164,8 @@ static void TAG(render_lines_verts)( struct gl_context *ctx,
- currentsz = dmasz;
- }
-
-+ FLUSH();
-+
- } else {
- fprintf(stderr, "%s - cannot draw primitive\n", __FUNCTION__);
- return;
-@@ -191,7 +195,7 @@ static void TAG(render_line_strip_verts)( struct gl_context *ctx,
- TAG(emit_verts)( ctx, j, nr, ALLOC_VERTS(nr) );
- currentsz = dmasz;
- }
--
-+
- FLUSH();
-
- } else {
-@@ -294,6 +298,8 @@ static void TAG(render_triangles_verts)( struct gl_context *ctx,
- TAG(emit_verts)( ctx, j, nr, ALLOC_VERTS(nr) );
- currentsz = dmasz;
- }
-+
-+ FLUSH();
- }
-
-
-@@ -567,6 +573,8 @@ static void TAG(render_quads_verts)( struct gl_context *ctx,
- TAG(emit_verts)( ctx, j, nr, ALLOC_VERTS(nr) );
- currentsz = dmasz;
- }
-+
-+ FLUSH();
- }
- else if (HAVE_ELTS) {
- /* Hardware doesn't have a quad primitive type -- try to
-@@ -640,6 +648,8 @@ static void TAG(render_quads_verts)( struct gl_context *ctx,
- tmp = EMIT_VERTS(ctx, j + 1, 3, tmp);
- (void) tmp;
- }
-+
-+ FLUSH();
- }
- else {
- /* Vertices won't fit in a single buffer, should never happen.
diff --git a/meta-oe/recipes-graphics/mesa/mesa-7.10.2/uclibc.patch b/meta-oe/recipes-graphics/mesa/mesa-7.10.2/uclibc.patch
deleted file mode 100644
index 0508112..0000000
--- a/meta-oe/recipes-graphics/mesa/mesa-7.10.2/uclibc.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: Mesa-7.9.1/src/mesa/main/imports.c
-===================================================================
---- Mesa-7.9.1.orig/src/mesa/main/imports.c 2010-12-15 13:50:00.000000000 -0800
-+++ Mesa-7.9.1/src/mesa/main/imports.c 2011-01-10 12:23:48.848656001 -0800
-@@ -757,7 +757,7 @@
- float
- _mesa_strtof( const char *s, char **end )
- {
--#if defined(_GNU_SOURCE) && !defined(__CYGWIN__) && !defined(__FreeBSD__)
-+#if defined(_GNU_SOURCE) && !defined(__CYGWIN__) && !defined(__FreeBSD__) && !defined(__UCLIBC__)
- static locale_t loc = NULL;
- if (!loc) {
- loc = newlocale(LC_CTYPE_MASK, "C", NULL);
-Index: Mesa-7.9.1/src/glsl/strtod.c
-===================================================================
---- Mesa-7.9.1.orig/src/glsl/strtod.c 2011-01-10 20:08:01.568656001 -0800
-+++ Mesa-7.9.1/src/glsl/strtod.c 2011-01-10 20:08:39.898656001 -0800
-@@ -44,7 +44,7 @@
- double
- glsl_strtod(const char *s, char **end)
- {
--#if defined(_GNU_SOURCE) && !defined(__CYGWIN__) && !defined(__FreeBSD__)
-+#if defined(_GNU_SOURCE) && !defined(__CYGWIN__) && !defined(__FreeBSD__) && !defined(__UCLIBC__)
- static locale_t loc = NULL;
- if (!loc) {
- loc = newlocale(LC_CTYPE_MASK, "C", NULL);
diff --git a/meta-oe/recipes-graphics/mesa/mesa-common.inc b/meta-oe/recipes-graphics/mesa/mesa-common.inc
deleted file mode 100644
index 2e6b599..0000000
--- a/meta-oe/recipes-graphics/mesa/mesa-common.inc
+++ /dev/null
@@ -1,49 +0,0 @@
-SECTION = "x11"
-
-DESCRIPTION = "An open source implementation of the OpenGL spec"
-HOMEPAGE = "http://mesa3d.org"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://docs/license.html;md5=7a3373c039b6b925c427755a4f779c1d"
-
-INC_PR = "r12"
-PE = "2"
-
-PROTO_DEPS = "xf86driproto glproto"
-LIB_DEPS = "virtual/libx11 libxext libxxf86vm libxdamage libxfixes"
-
-DEPENDS = "makedepend-native ${PROTO_DEPS} ${LIB_DEPS}"
-
-SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2;name=archive \
- "
-S = "${WORKDIR}/Mesa-${PV}"
-
-PROVIDES = "virtual/libgl"
-
-inherit autotools pkgconfig
-
-EXTRA_OECONF = "--enable-glu \
- --disable-glw \
- --disable-glut \
- "
-
-inherit glx-use-tls
-
-PACKAGES =+ "libegl libegl-dev libegl-dbg libglu libglu-dev libosmesa libosmesa-dev libgl libgl-dev"
-FILES_libegl = "${libdir}/libEGL.so.* ${libdir}/egl/*.so"
-FILES_libgl = "${libdir}/libGL.so.*"
-FILES_libglu = "${libdir}/libGLU.so.*"
-FILES_libosmesa = "${libdir}/libOSMesa.so.*"
-
-FILES_libegl-dev = "${libdir}/libEGL.* ${includedir}/EGL"
-FILES_libgl-dev = "${libdir}/libGL.* ${includedir}/GL"
-FILES_libglu-dev = "${libdir}/libGLU.* ${includedir}/GL/glu*.h"
-FILES_libosmesa-dev = "${libdir}/libOSMesa.* ${includedir}/osmesa.h"
-
-FILES_${PN}-dbg += "${libdir}/dri/.debug/*"
-FILES_libegl-dbg += "${libdir}/egl/.debug/*"
-
-NATIVE_INSTALL_WORKS = "1"
-do_install_append () {
- install -d ${D}/${includedir}/GL
- cp -pPr ${S}/include/GL/internal* ${D}/${includedir}/GL
-}
diff --git a/meta-oe/recipes-graphics/mesa/mesa-dri.inc b/meta-oe/recipes-graphics/mesa/mesa-dri.inc
deleted file mode 100644
index 8aa82c0..0000000
--- a/meta-oe/recipes-graphics/mesa/mesa-dri.inc
+++ /dev/null
@@ -1,27 +0,0 @@
-DEPENDS += "dri2proto expat libdrm"
-
-#not supported in oe-core base.bbclass
-#FILESPATHPKG =. "mesa-${PV}:mesa:"
-FILESPATH =. "${FILE_DIRNAME}/mesa:${FILE_DIRNAME}/mesa-${PV}:"
-
-# most of our targets do not have DRI so will use mesa-xlib
-DEFAULT_PREFERENCE = "-1"
-
-MACHINE_DRI_MODULES ?= ""
-#PACKAGE_ARCH = "${@['${MACHINE_ARCH}','${BASE_PACKAGE_ARCH}'][bb.data.getVar('MACHINE_DRI_MODULES',d,1) == '']}"
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-EXTRA_OECONF += "--with-driver=dri --disable-egl --disable-gallium -with-dri-drivers=swrast,${MACHINE_DRI_MODULES}"
-
-python populate_packages_prepend() {
- import os.path
-
- dri_drivers_root = os.path.join(bb.data.getVar('libdir', d, 1), "dri")
-
- do_split_packages(d, dri_drivers_root, '^(.*)_dri\.so$', 'mesa-dri-driver-%s', 'Mesa %s DRI driver', extra_depends='')
-}
-
-PACKAGES_DYNAMIC = "mesa-dri-driver-*"
-
-FILES_${PN}-dbg += "${libdir}/dri/.debug/*"
-
diff --git a/meta-oe/recipes-graphics/mesa/mesa-dri_7.10.2.bb b/meta-oe/recipes-graphics/mesa/mesa-dri_7.10.2.bb
deleted file mode 100644
index bd62c98..0000000
--- a/meta-oe/recipes-graphics/mesa/mesa-dri_7.10.2.bb
+++ /dev/null
@@ -1,4 +0,0 @@
-require mesa-common.inc
-require mesa-${PV}.inc
-require mesa-dri.inc
-PR = "${INC_PR}.1"
diff --git a/meta-oe/recipes-graphics/mesa/mesa-xlib.inc b/meta-oe/recipes-graphics/mesa/mesa-xlib.inc
deleted file mode 100644
index cc4a9c0..0000000
--- a/meta-oe/recipes-graphics/mesa/mesa-xlib.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-#not supported in oe-core base.bbclass
-#FILESPATHPKG =. "mesa-${PV}:mesa:"
-FILESPATH =. "${FILE_DIRNAME}/mesa:${FILE_DIRNAME}/mesa-${PV}:"
-
-EXTRA_OECONF += " --with-driver=xlib"
diff --git a/meta-oe/recipes-graphics/mesa/mesa-xlib_7.10.2.bb b/meta-oe/recipes-graphics/mesa/mesa-xlib_7.10.2.bb
deleted file mode 100644
index 93bb8cd..0000000
--- a/meta-oe/recipes-graphics/mesa/mesa-xlib_7.10.2.bb
+++ /dev/null
@@ -1,4 +0,0 @@
-require mesa-common.inc
-require mesa-${PV}.inc
-require mesa-xlib.inc
-PR = "${INC_PR}.0"
diff --git a/meta-oe/recipes-graphics/mesa/mesa_7.10.2.bb b/meta-oe/recipes-graphics/mesa/mesa_7.10.2.bb
deleted file mode 100644
index 4cb8db7..0000000
--- a/meta-oe/recipes-graphics/mesa/mesa_7.10.2.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-# This is a dummy package so OE can use the poky mesa files
-require mesa-dri_${PV}.bb
-
-PR = "${INC_PR}.0"
-
-EXTRA_OECONF += "--disable-egl"
--
1.7.6.1
^ permalink raw reply related [flat|nested] 46+ messages in thread
* [meta-oe][meta-efl][PATCH 14/15] talloc: drop from meta-oe, no longer needed by mesa
2011-09-30 12:56 [meta-oe][meta-efl][PATCH 00/15] Pull request #23 Martin Jansa
` (12 preceding siblings ...)
2011-09-30 12:56 ` [meta-oe][meta-efl][PATCH 13/15] mesa: drop, there should be mesa-7.11 in oe-core Martin Jansa
@ 2011-09-30 12:56 ` Martin Jansa
2011-09-30 12:56 ` [meta-oe][meta-efl][PATCH 15/15] glx-use-tls: moved to oe-core with mesa recipes Martin Jansa
2011-10-03 11:47 ` [meta-oe][meta-efl][PATCH 00/15] Pull request #23 Martin Jansa
15 siblings, 0 replies; 46+ messages in thread
From: Martin Jansa @ 2011-09-30 12:56 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta-oe/recipes-support/talloc/talloc_2.0.1.bb | 27 ------------------------
1 files changed, 0 insertions(+), 27 deletions(-)
delete mode 100644 meta-oe/recipes-support/talloc/talloc_2.0.1.bb
diff --git a/meta-oe/recipes-support/talloc/talloc_2.0.1.bb b/meta-oe/recipes-support/talloc/talloc_2.0.1.bb
deleted file mode 100644
index a69bd40..0000000
--- a/meta-oe/recipes-support/talloc/talloc_2.0.1.bb
+++ /dev/null
@@ -1,27 +0,0 @@
-DESCRIPTION = "Hierarchical, reference counted memory pool system with destructors"
-HOMEPAGE = "http://talloc.samba.org"
-LICENSE = "LGPL"
-LIC_FILES_CHKSUM = "file://NEWS;md5=5fe776b23a711c9153ee94bc87e47334"
-
-inherit autotools pkgconfig
-
-SRC_URI = "http://samba.org/ftp/${BPN}/${BPN}-${PV}.tar.gz"
-SRC_URI[md5sum] = "c6e736540145ca58cb3dcb42f91cf57b"
-SRC_URI[sha256sum] = "5b810527405f29d54f50efd78bf2c89e318f2cd8bed001f22f2a1412fd27c9b4"
-
-TARGET_CC_ARCH += "${LDFLAGS}"
-
-PR = "r1"
-
-# autoreconf doesn't work well while reconfiguring included libreplace
-do_configure () {
- gnu-configize
- oe_runconf
-}
-
-do_install_append() {
- install -d ${D}${libdir}
- ln -s libtalloc.so.2.0.1 ${D}${libdir}/libtalloc.so.2.0
- ln -s libtalloc.so.2.0 ${D}${libdir}/libtalloc.so.2
- ln -s libtalloc.so.2 ${D}${libdir}/libtalloc.so
-}
--
1.7.6.1
^ permalink raw reply related [flat|nested] 46+ messages in thread
* [meta-oe][meta-efl][PATCH 15/15] glx-use-tls: moved to oe-core with mesa recipes
2011-09-30 12:56 [meta-oe][meta-efl][PATCH 00/15] Pull request #23 Martin Jansa
` (13 preceding siblings ...)
2011-09-30 12:56 ` [meta-oe][meta-efl][PATCH 14/15] talloc: drop from meta-oe, no longer needed by mesa Martin Jansa
@ 2011-09-30 12:56 ` Martin Jansa
2011-10-03 11:47 ` [meta-oe][meta-efl][PATCH 00/15] Pull request #23 Martin Jansa
15 siblings, 0 replies; 46+ messages in thread
From: Martin Jansa @ 2011-09-30 12:56 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta-oe/classes/glx-use-tls.bbclass | 7 -------
1 files changed, 0 insertions(+), 7 deletions(-)
delete mode 100644 meta-oe/classes/glx-use-tls.bbclass
diff --git a/meta-oe/classes/glx-use-tls.bbclass b/meta-oe/classes/glx-use-tls.bbclass
deleted file mode 100644
index 7530872..0000000
--- a/meta-oe/classes/glx-use-tls.bbclass
+++ /dev/null
@@ -1,7 +0,0 @@
-def get_tls_setting(bb, d):
- # until we have no prober TLS support in uclibc disable it
- if bb.data.getVar('TARGET_OS', d, 1).find('uclibc') >= 0 :
- return ""
- return "--enable-glx-tls"
-
-EXTRA_OECONF += "${@get_tls_setting(bb, d)}"
--
1.7.6.1
^ permalink raw reply related [flat|nested] 46+ messages in thread
* Re: [meta-oe][meta-efl][PATCH 01/15] glib-2.0: upgrade from 2.29.3+git to 2.30.0 release
2011-09-30 12:56 ` [meta-oe][meta-efl][PATCH 01/15] glib-2.0: upgrade from 2.29.3+git to 2.30.0 release Martin Jansa
@ 2011-09-30 15:51 ` Martin Jansa
0 siblings, 0 replies; 46+ messages in thread
From: Martin Jansa @ 2011-09-30 15:51 UTC (permalink / raw)
To: openembedded-devel
[-- Attachment #1: Type: text/plain, Size: 11463 bytes --]
On Fri, Sep 30, 2011 at 02:56:37PM +0200, Martin Jansa wrote:
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> ---
> ...003-gatomic-proper-pointer-get-cast.patch.patch | 28 -------
> .../0005-glib-mkenums-interpreter.patch.patch | 25 -------
> .../60_wait-longer-for-threads-to-die.patch | 24 +++---
> .../glib-2.0/remove.test.for.qsort_r.patch | 77 ++++++++++----------
> .../{glib-2.0_git.bb => glib-2.0_2.30.0.bb} | 21 ++++--
> 5 files changed, 65 insertions(+), 110 deletions(-)
> delete mode 100644 meta-oe/recipes-core/glib-2.0/glib-2.0/0003-gatomic-proper-pointer-get-cast.patch.patch
> delete mode 100644 meta-oe/recipes-core/glib-2.0/glib-2.0/0005-glib-mkenums-interpreter.patch.patch
> rename meta-oe/recipes-core/glib-2.0/{glib-2.0_git.bb => glib-2.0_2.30.0.bb} (61%)
This patch was superseeded by new pull request..
[meta-oe][PATCH 0/6] Glib related changes
>
> diff --git a/meta-oe/recipes-core/glib-2.0/glib-2.0/0003-gatomic-proper-pointer-get-cast.patch.patch b/meta-oe/recipes-core/glib-2.0/glib-2.0/0003-gatomic-proper-pointer-get-cast.patch.patch
> deleted file mode 100644
> index ad1ca12..0000000
> --- a/meta-oe/recipes-core/glib-2.0/glib-2.0/0003-gatomic-proper-pointer-get-cast.patch.patch
> +++ /dev/null
> @@ -1,28 +0,0 @@
> -From 3d371334d5668bcd02a38ff99884bd343c244d68 Mon Sep 17 00:00:00 2001
> -From: Koen Kooi <koen@dominion.thruhere.net>
> -Date: Sat, 18 Jun 2011 23:51:35 +0200
> -Subject: [PATCH 3/7] gatomic-proper-pointer-get-cast.patch
> -
> -Upstream-Status: Unknown
> -
> -Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
> ----
> - glib/gatomic.h | 2 +-
> - 1 files changed, 1 insertions(+), 1 deletions(-)
> -
> -diff --git a/glib/gatomic.h b/glib/gatomic.h
> -index ddd39b8..b758142 100644
> ---- a/glib/gatomic.h
> -+++ b/glib/gatomic.h
> -@@ -70,7 +70,7 @@ void g_atomic_pointer_set (volatile gpointer G_GNUC_MAY_ALI
> - (g_atomic_int_set) ((volatile gint G_GNUC_MAY_ALIAS *) (volatile void *) (atomic), (newval)))
> - # define g_atomic_pointer_get(atomic) \
> - ((void) sizeof (gchar [sizeof (*(atomic)) == sizeof (gpointer) ? 1 : -1]), \
> -- (g_atomic_pointer_get) ((volatile gpointer G_GNUC_MAY_ALIAS *) (volatile void *) (atomic)))
> -+ (g_atomic_pointer_get) ((volatile gpointer G_GNUC_MAY_ALIAS *) (volatile void G_GNUC_MAY_ALIAS *) (atomic)))
> - # define g_atomic_pointer_set(atomic, newval) \
> - ((void) sizeof (gchar [sizeof (*(atomic)) == sizeof (gpointer) ? 1 : -1]), \
> - (g_atomic_pointer_set) ((volatile gpointer G_GNUC_MAY_ALIAS *) (volatile void *) (atomic), (newval)))
> ---
> -1.6.6.1
> -
> diff --git a/meta-oe/recipes-core/glib-2.0/glib-2.0/0005-glib-mkenums-interpreter.patch.patch b/meta-oe/recipes-core/glib-2.0/glib-2.0/0005-glib-mkenums-interpreter.patch.patch
> deleted file mode 100644
> index 6780330..0000000
> --- a/meta-oe/recipes-core/glib-2.0/glib-2.0/0005-glib-mkenums-interpreter.patch.patch
> +++ /dev/null
> @@ -1,25 +0,0 @@
> -From a8e5c4a808e7f8572bd5023645a6cb4386b9aff8 Mon Sep 17 00:00:00 2001
> -From: Koen Kooi <koen@dominion.thruhere.net>
> -Date: Sat, 18 Jun 2011 23:52:17 +0200
> -Subject: [PATCH 5/7] don't leak buildpaths into perl hashbang
> -
> -Upstream-Status: Unknown
> -
> -Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
> ----
> - gobject/glib-mkenums.in | 2 +-
> - 1 files changed, 1 insertions(+), 1 deletions(-)
> -
> -diff --git a/gobject/glib-mkenums.in b/gobject/glib-mkenums.in
> -index 6372245..b486fe9 100755
> ---- a/gobject/glib-mkenums.in
> -+++ b/gobject/glib-mkenums.in
> -@@ -1,4 +1,4 @@
> --#! @PERL_PATH@
> -+#! /usr/bin/env perl
> -
> - use warnings;
> - use File::Basename;
> ---
> -1.6.6.1
> -
> diff --git a/meta-oe/recipes-core/glib-2.0/glib-2.0/60_wait-longer-for-threads-to-die.patch b/meta-oe/recipes-core/glib-2.0/glib-2.0/60_wait-longer-for-threads-to-die.patch
> index b65a474..4ff7b80 100644
> --- a/meta-oe/recipes-core/glib-2.0/glib-2.0/60_wait-longer-for-threads-to-die.patch
> +++ b/meta-oe/recipes-core/glib-2.0/glib-2.0/60_wait-longer-for-threads-to-die.patch
> @@ -4,9 +4,9 @@ Rebased for glib-2.27.3 by Dongxiao Xu <dongxiao.xu@intel.com>, 11/16/2010
>
> Upstream-Status: Inappropriate [patches for test code]
>
> -diff -ruN glib-2.27.3-orig/tests/threadpool-test.c glib-2.27.3/tests/threadpool-test.c
> ---- glib-2.27.3-orig/tests/threadpool-test.c 2009-04-01 07:04:21.000000000 +0800
> -+++ glib-2.27.3/tests/threadpool-test.c 2010-11-16 12:28:09.002172678 +0800
> +diff -ruN glib-2.30.0-orig/tests/threadpool-test.c glib-2.30.0/tests/threadpool-test.c
> +--- glib-2.30.0-orig/tests/threadpool-test.c 2009-04-01 07:04:21.000000000 +0800
> ++++ glib-2.30.0/tests/threadpool-test.c 2010-11-16 12:28:09.002172678 +0800
> @@ -5,8 +5,8 @@
>
> #include <glib.h>
> @@ -18,16 +18,16 @@ diff -ruN glib-2.27.3-orig/tests/threadpool-test.c glib-2.27.3/tests/threadpool-
>
> #define WAIT 5 /* seconds */
> #define MAX_THREADS 10
> -@@ -124,10 +124,10 @@
> - DEBUG_MSG (("[unused] stopping unused threads"));
> - g_thread_pool_stop_unused_threads ();
> +@@ -130,10 +130,10 @@
> + test_count_threads () == 0)
> + break;
>
> -- DEBUG_MSG (("[unused] waiting ONE second for threads to die"));
> -+ DEBUG_MSG (("[unused] waiting FIVE second for threads to die"));
> +- DEBUG_MSG (("[unused] waiting ONE second for threads to die"));
> ++ DEBUG_MSG (("[unused] waiting FIVE second for threads to die"));
>
> - /* Some time for threads to die. */
> -- g_usleep (G_USEC_PER_SEC);
> -+ g_usleep (5 * G_USEC_PER_SEC);
> + /* Some time for threads to die. */
> +- g_usleep (G_USEC_PER_SEC);
> ++ g_usleep (5 * G_USEC_PER_SEC);
> + }
>
> DEBUG_MSG (("[unused] stopped idle threads, %d remain, %d threads still exist",
> - g_thread_pool_get_num_unused_threads (),
> diff --git a/meta-oe/recipes-core/glib-2.0/glib-2.0/remove.test.for.qsort_r.patch b/meta-oe/recipes-core/glib-2.0/glib-2.0/remove.test.for.qsort_r.patch
> index 3300eb0..05805d0 100644
> --- a/meta-oe/recipes-core/glib-2.0/glib-2.0/remove.test.for.qsort_r.patch
> +++ b/meta-oe/recipes-core/glib-2.0/glib-2.0/remove.test.for.qsort_r.patch
> @@ -1,52 +1,49 @@
> while cross compiling we cannot execute run tests
>
> -diff --git a/configure.ac b/configure.ac
> -index 378b082..3f2a8d3 100644
> ---- a/configure.ac
> -+++ b/configure.ac
> -@@ -580,46 +580,7 @@ AC_FUNC_VPRINTF
> - AC_FUNC_ALLOCA
> - AC_CHECK_FUNCS(mmap posix_memalign memalign valloc fsync pipe2)
> - AC_CHECK_FUNCS(atexit on_exit timegm gmtime_r)
> +--- glib-2.30.0.orig/configure.ac 2011-09-29 16:57:35.000000000 +0200
> ++++ glib-2.30.0/configure.ac 2011-09-29 17:00:19.931493488 +0200
> +@@ -586,45 +586,7 @@
> + dnl until we have checked this function is actually usable
> + AC_CHECK_FUNC([qsort_r])
> +
> -# BSD has a qsort_r with wrong argument order
> --AC_CACHE_CHECK([for qsort_r], glib_cv_have_qsort_r, [
> --AC_RUN_IFELSE([AC_LANG_SOURCE([[
> --#define _GNU_SOURCE
> --#include <stdlib.h>
> +-if test x$ac_cv_func_qsort_r = xyes ; then
> +- AC_CACHE_CHECK([if qsort_r uses glibc compatible argument order], glib_cv_have_qsort_r, [
> +- AC_RUN_IFELSE([AC_LANG_SOURCE([[
> +- #define _GNU_SOURCE
> +- #include <stdlib.h>
> -
> --static int
> --cmp (const void *a, const void *b, void *c)
> --{
> -- const int *ia = a;
> -- const int *ib = b;
> +- static int
> +- cmp (const void *a, const void *b, void *c)
> +- {
> +- const int *ia = a;
> +- const int *ib = b;
> -
> -- if (*ia < *ib)
> -- return -1;
> -- else if (*ia > *ib)
> -- return 1;
> -- else
> -- return 0;
> --}
> +- if (*ia < *ib)
> +- return -1;
> +- else if (*ia > *ib)
> +- return 1;
> +- else
> +- return 0;
> +- }
> -
> --int
> --main (int argc, char **argv)
> --{
> -- int arr[3] = { 1, 2, 0 };
> -- int d = 3;
> +- int
> +- main (int argc, char **argv)
> +- {
> +- int arr[3] = { 1, 2, 0 };
> +- int d = 3;
> -
> -- qsort_r (arr, 3, sizeof (int), cmp, &d);
> +- qsort_r (arr, 3, sizeof (int), cmp, &d);
> -
> -- if (arr[0] == 0 && arr[1] == 1 && arr[2] == 2)
> -- return 0;
> -- else
> -- return 1;
> --}]])],[glib_cv_have_qsort_r=yes],[glib_cv_have_qsort_r=no])])
> +- if (arr[0] == 0 && arr[1] == 1 && arr[2] == 2)
> +- return 0;
> +- else
> +- return 1;
> +- }]])],[glib_cv_have_qsort_r=yes],[glib_cv_have_qsort_r=no])])
> +-fi
> -
> --if test $glib_cv_have_qsort_r = yes ; then
> -- AC_MSG_RESULT([yes])
> -- AC_DEFINE(HAVE_QSORT_R, 1, [Define to 1 if you have the 'qsort_r' function])
> --else
> -- AC_MSG_RESULT([no])
> +-if test x$glib_cv_have_qsort_r = xyes ; then
> +- AC_DEFINE(HAVE_QSORT_R, 1, [Define to 1 if you have the 'qsort_r' function])
> -fi
> +AC_DEFINE(HAVE_QSORT_R, 1, [Define to 1 if you have the 'qsort_r' function])
>
> diff --git a/meta-oe/recipes-core/glib-2.0/glib-2.0_git.bb b/meta-oe/recipes-core/glib-2.0/glib-2.0_2.30.0.bb
> similarity index 61%
> rename from meta-oe/recipes-core/glib-2.0/glib-2.0_git.bb
> rename to meta-oe/recipes-core/glib-2.0/glib-2.0_2.30.0.bb
> index 34fcaf6..b4305b8 100644
> --- a/meta-oe/recipes-core/glib-2.0/glib-2.0_git.bb
> +++ b/meta-oe/recipes-core/glib-2.0/glib-2.0_2.30.0.bb
> @@ -1,22 +1,22 @@
> require glib.inc
>
> PE = "1"
> -PR = "r1"
>
> DEFAULT_PREFERENCE = "-1"
>
> DEPENDS += "libffi python-argparse-native"
> DEPENDS_virtclass-native += "libffi-native python-argparse-native"
>
> -SRC_URI = "git://git.gnome.org/glib;protocol=git;branch=master \
> +SHRT_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}"
> +
> +SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.bz2 \
> file://configure-libtool.patch \
> file://60_wait-longer-for-threads-to-die.patch \
> file://g_once_init_enter.patch \
> file://remove.test.for.qsort_r.patch \
> "
> -SRCREV = "d97cbc6731deab137770bc0fe9c69b06f689f5b4"
> -PV = "2.29.3+gitr${SRCPV}"
> -S = "${WORKDIR}/git"
> +SRC_URI[md5sum] = "fee101d9d7daa8ddfbae00325f307f3b"
> +SRC_URI[sha256sum] = "ca9c731017ab370859e847f8b70079bc6dcf389dc0ccb0d0419925aff81b9687"
>
> # Only apply this patch for target recipe on uclibc
> SRC_URI_append_libc-uclibc = " ${@['', 'file://no-iconv.patch']['${PN}' == '${BPN}']}"
> @@ -30,3 +30,14 @@ do_configure_prepend() {
> sed -i 's/SUBDIRS = . m4macros glib gmodule gthread gobject gio tests po docs/SUBDIRS = . m4macros glib gmodule gthread gobject gio tests po/g' ${S}/Makefile.am
> sed -i -e "s:TEST_PROGS += gdbus-serialization::g" ${S}/gio/tests/Makefile.am
> }
> +
> +do_install_append() {
> + # remove some unpackaged files
> + rm -f ${D}${datadir}/glib-2.0/gettext/mkinstalldirs
> + rm -f ${D}${datadir}/glib-2.0/gettext/po/Makefile.in.in
> + rm -f ${D}${libdir}/gdbus-2.0/codegen/*.pyc
> + rm -f ${D}${libdir}/gdbus-2.0/codegen/*.pyo
> +}
> +
> +PACKAGES += "${PN}-codegen"
> +FILES_${PN}-codegen = "${libdir}/gdbus-2.0/codegen/*.py"
> --
> 1.7.6.1
>
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 46+ messages in thread
* Re: [meta-oe][meta-efl][PATCH 00/15] Pull request #23
2011-09-30 12:56 [meta-oe][meta-efl][PATCH 00/15] Pull request #23 Martin Jansa
` (14 preceding siblings ...)
2011-09-30 12:56 ` [meta-oe][meta-efl][PATCH 15/15] glx-use-tls: moved to oe-core with mesa recipes Martin Jansa
@ 2011-10-03 11:47 ` Martin Jansa
2011-10-03 13:27 ` [meta-oe][meta-efl][PATCHv2 00/25] " Martin Jansa
15 siblings, 1 reply; 46+ messages in thread
From: Martin Jansa @ 2011-10-03 11:47 UTC (permalink / raw)
To: openembedded-devel
[-- Attachment #1: Type: text/plain, Size: 520 bytes --]
On Fri, Sep 30, 2011 at 02:56:39PM +0200, Martin Jansa wrote:
> Hi,
>
> this patchset depends on oe-core changes from:
> http://lists.linuxtogo.org/pipermail/openembedded-core/2011-September/010393.html
> but first few patches from that patchset are already in master-next and we need to
> be ready to adapt.
I've sent another patchset to oe-core which renames xserver-xf86 to
xserver-xorg as we're used to call it.. so I'll resend consolidated pull
request with new xorg/glib/poppler changes.
Regards,
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 46+ messages in thread
* [meta-oe][meta-efl][PATCHv2 01/25] xorg-driver: use renamed .inc from oe-core
2011-10-03 13:27 ` [meta-oe][meta-efl][PATCHv2 00/25] " Martin Jansa
@ 2011-10-03 13:26 ` Martin Jansa
2011-10-03 13:27 ` [meta-oe][meta-efl][PATCHv2 02/25] libxft, libxrender, renderproto: move native BBCLASSEXTENDs to oe-core Martin Jansa
` (24 subsequent siblings)
25 siblings, 0 replies; 46+ messages in thread
From: Martin Jansa @ 2011-10-03 13:26 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
.../xorg-driver/xf86-input-tslib_0.0.6.bb | 4 ++--
.../xorg-driver/xf86-input-void_1.4.0.bb | 4 ++--
.../xorg-driver/xf86-video-fbdev_0.4.2.bb | 4 ++--
.../xorg-driver/xf86-video-geode_2.11.12.bb | 4 ++--
.../xorg-driver/xf86-video-glamo_git.bb | 4 ++--
.../xorg-driver/xf86-video-omapfb_git.bb | 2 +-
6 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib_0.0.6.bb b/meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib_0.0.6.bb
index fa59036..9ce5093 100644
--- a/meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib_0.0.6.bb
+++ b/meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib_0.0.6.bb
@@ -1,4 +1,4 @@
-require recipes-graphics/xorg-driver/xf86-input-common.inc
+require recipes-graphics/xorg-driver/xorg-driver-input.inc
DESCRIPTION = "X.Org X server -- tslib input driver"
DEPENDS += "tslib"
RRECOMMENDS_${PN} += "tslib-calibrate"
@@ -8,7 +8,7 @@ RSUGGESTS_${PN} += "hal"
LIC_FILES_CHKSUM = "file://src/tslib.c;endline=28;md5=bd62eaef222dcf5cd59e490a12bd795e \
file://COPYING;md5=4641deddaa80fe7ca88e944e1fd94a94"
-PR = "r16"
+PR = "${INC_PR}.0"
SRC_URI = "http://www.pengutronix.de/software/xf86-input-tslib/download/xf86-input-tslib-${PV}.tar.bz2;name=archive \
file://double-free-crash.patch \
diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-input-void_1.4.0.bb b/meta-oe/recipes-graphics/xorg-driver/xf86-input-void_1.4.0.bb
index 71b7cbc..a6e49a5 100644
--- a/meta-oe/recipes-graphics/xorg-driver/xf86-input-void_1.4.0.bb
+++ b/meta-oe/recipes-graphics/xorg-driver/xf86-input-void_1.4.0.bb
@@ -1,6 +1,6 @@
-require recipes-graphics/xorg-driver/xf86-input-common.inc
+require recipes-graphics/xorg-driver/xorg-driver-input.inc
DESCRIPTION = "X.Org X server -- void input driver"
-PR = "r16"
+PR = "${INC_PR}.0"
LIC_FILES_CHKSUM = "file://COPYING;md5=4be6a915bfbf111cd88706fc6a6f141b"
diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-video-fbdev_0.4.2.bb b/meta-oe/recipes-graphics/xorg-driver/xf86-video-fbdev_0.4.2.bb
index 4c85704..23da386 100644
--- a/meta-oe/recipes-graphics/xorg-driver/xf86-video-fbdev_0.4.2.bb
+++ b/meta-oe/recipes-graphics/xorg-driver/xf86-video-fbdev_0.4.2.bb
@@ -1,8 +1,8 @@
-require recipes-graphics/xorg-driver/xf86-video-common.inc
+require recipes-graphics/xorg-driver/xorg-driver-video.inc
LIC_FILES_CHKSUM = "file://COPYING;md5=d8cbd99fff773f92e844948f74ef0df8"
DESCRIPTION = "X.Org X server -- fbdev display driver"
-PR = "r16"
+PR = "${INC_PR}.0"
SRC_URI[md5sum] = "53a533d9e0c2da50962282526bace074"
SRC_URI[sha256sum] = "93b271b4b41d7e5ca108849a583b9523e96c51813d046282285355b7001f82d5"
diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-video-geode_2.11.12.bb b/meta-oe/recipes-graphics/xorg-driver/xf86-video-geode_2.11.12.bb
index e44cf49..2327054 100644
--- a/meta-oe/recipes-graphics/xorg-driver/xf86-video-geode_2.11.12.bb
+++ b/meta-oe/recipes-graphics/xorg-driver/xf86-video-geode_2.11.12.bb
@@ -1,8 +1,8 @@
-require recipes-graphics/xorg-driver/xf86-video-common.inc
+require recipes-graphics/xorg-driver/xorg-driver-video.inc
LIC_FILES_CHKSUM = "file://COPYING;md5=f8ad89d9d9a024f19d7dcc5acb044a42"
DESCRIPTION = "X.org server -- Geode GX2/LX display driver"
-PR = "r16"
+PR = "${INC_PR}.0"
SRC_URI[md5sum] = "a99c521db731c2f1df309057a8465e4c"
SRC_URI[sha256sum] = "28d845d727d99bfa4d4b93c5486ec01b72eb222e0910a766089db1103b1c2d92"
diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo_git.bb b/meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo_git.bb
index 3608fb2..5d752db 100644
--- a/meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo_git.bb
+++ b/meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo_git.bb
@@ -1,4 +1,4 @@
-require recipes-graphics/xorg-driver/xf86-video-common.inc
+require recipes-graphics/xorg-driver/xorg-driver-video.inc
DESCRIPTION = "X.Org X server -- Glamo display driver with KMS support"
DEPENDS += "libdrm"
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d8cbd99fff773f92e844948f74ef0df8"
RDEPENDS_${PN} = "xserver-xorg-extension-dri xserver-xorg-extension-dri2 xserver-xorg-extension-glx"
PE = "2"
PV = "1.0.0+gitr${SRCPV}"
-PR = "r16"
+PR = "${INC_PR}.0"
SRC_URI = "git://git.openmoko.org/git/xf86-video-glamo.git;protocol=git;branch=master \
file://0001-glamo-kms-driver-drop-unused-xf86_config.patch \
diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb b/meta-oe/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb
index e30972c..a73b5e6 100644
--- a/meta-oe/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb
+++ b/meta-oe/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb
@@ -1,4 +1,4 @@
-require recipes-graphics/xorg-driver/xf86-driver-common.inc
+require recipes-graphics/xorg-driver/xorg-driver-common.inc
DESCRIPTION = "X.Org X server -- OMAP display driver"
PV = "0.1.1+${PR}+gitr${SRCREV}"
--
1.7.7
^ permalink raw reply related [flat|nested] 46+ messages in thread
* [meta-oe][meta-efl][PATCHv2 00/25] Pull request #23
2011-10-03 11:47 ` [meta-oe][meta-efl][PATCH 00/15] Pull request #23 Martin Jansa
@ 2011-10-03 13:27 ` Martin Jansa
2011-10-03 13:26 ` [meta-oe][meta-efl][PATCHv2 01/25] xorg-driver: use renamed .inc from oe-core Martin Jansa
` (25 more replies)
0 siblings, 26 replies; 46+ messages in thread
From: Martin Jansa @ 2011-10-03 13:27 UTC (permalink / raw)
To: openembedded-devel
Hi,
this patchset depends on oe-core changes from:
http://lists.linuxtogo.org/pipermail/openembedded-core/2011-September/010393.html
but first few patches from that patchset are already in master-next and we need to
be ready to adapt.
And some changes depend on
http://lists.linuxtogo.org/pipermail/openembedded-core/2011-September/010447.html
Regards,
The following changes since commit b297ece0b5663aca97d30927a32c20ccce97eb2a:
systemd: update to latest git (2011-10-02 20:08:50 +0200)
are available in the git repository at:
git://git.openembedded.org/meta-openembedded-contrib jansa/pull
http://cgit.openembedded.org/cgit.cgi/meta-openembedded-contrib/log/?h=jansa/pull
Martin Jansa (25):
xorg-driver: use renamed .inc from oe-core
libxft, libxrender, renderproto: move native BBCLASSEXTENDs to
oe-core
xf86-video-omapfb: merged to oe-core
xserver-xorg: drop 1.10.2 and use xserver-xf86-lite-1.11.0 from
oe-core instead
libx11: drop here, 1.4.4 should be in oe-core
mesa: drop, there should be mesa-7.11 in oe-core
talloc: drop from meta-oe, no longer needed by mesa
glx-use-tls: moved to oe-core with mesa recipes
recipes: use allarch instead of PACKAGE_ARCH = all
glib-2.0: drop 2.29.3+git from meta-oe, there should be 2.30.0 in
oe-core
gdbus-binding-tool: drop from meta-oe, superseeded by glib-2.30.0
where it's included
pango: upgrade to 1.29.4
poppler-data: upgrade from 0.4.0 to 0.4.5
poppler: upgrade from 0.12.3 to 0.18.0
python-cython: upgrade to 0.15.1 because 0.13 doesn't work with
python-2.7.2
python-cython: add patch to fix build error with some distutils
packages
pidgin: package purple-2/libymsg.so to libpurple-dev
e-base: bump EFL_SRCREV
e-wm: include /usr/lib/enlightenment/modules/wizard/favorites/.order
in FILES+${PN}
e-wm-theme-illume-efenniht, exquisite-theme-illume,
elementary-theme-efenniht: add LIC_FILES_CHKSUM
elementary: fir order of PACKAGES
epdf: fix build with poppler >= 0.16
elementary, ethumb, libeflvala: bump PR to rebuild against newer
poppler
python-efl: use INC_PR
elfe: bump PR to rebuild against newer poppler
meta-efl/classes/e-base.bbclass | 2 +-
.../recipes-devtools/python/python-ecore_svn.bb | 1 +
.../recipes-devtools/python/python-edbus_svn.bb | 1 +
.../recipes-devtools/python/python-edje_svn.bb | 1 +
meta-efl/recipes-devtools/python/python-efl.inc | 2 +-
.../python/python-elementary_svn.bb | 1 +
.../recipes-devtools/python/python-emotion_svn.bb | 1 +
.../recipes-devtools/python/python-evas_svn.bb | 1 +
.../e17/e-wm-theme-illume-efenniht/LICENSE | 25 +
.../e17/e-wm-theme-illume-efenniht_svn.bb | 11 +-
meta-efl/recipes-efl/e17/e-wm_svn.bb | 23 +-
meta-efl/recipes-efl/e17/elfe_svn.bb | 2 +-
meta-efl/recipes-efl/e17/exquisite-theme-illume.bb | 12 +-
.../recipes-efl/e17/exquisite-theme-illume/LICENSE | 25 +
.../efl/elementary-theme-efenniht/LICENSE | 25 +
.../efl/elementary-theme-efenniht_svn.bb | 9 +-
meta-efl/recipes-efl/efl/elementary_svn.bb | 4 +-
.../efl/epdf/epdf.poppler-0.16.api.change.patch | 11 +
meta-efl/recipes-efl/efl/epdf_svn.bb | 6 +-
meta-efl/recipes-efl/efl/ethumb_svn.bb | 1 +
meta-efl/recipes-efl/efl/libeflvala_svn.bb | 1 +
.../hicolor-icon-theme/hicolor-icon-theme_0.12.bb | 6 +-
.../recipes-gnome/themes/gnome-themes_2.32.1.bb | 5 +-
meta-oe/classes/glx-use-tls.bbclass | 7 -
meta-oe/recipes-core/glib-2.0/glib-2.0.inc | 6 -
...003-gatomic-proper-pointer-get-cast.patch.patch | 28 -
.../0005-glib-mkenums-interpreter.patch.patch | 25 -
.../60_wait-longer-for-threads-to-die.patch | 33 -
.../glib-2.0/glib-2.0/configure-libtool.patch | 38 -
.../glib-2.0/glib-2.0/g_once_init_enter.patch | 24 -
.../glib-2.0/glib-2.0/glib-gettextize-dir.patch | 24 -
.../recipes-core/glib-2.0/glib-2.0/no-iconv.patch | 104 -
.../glib-2.0/remove.test.for.qsort_r.patch | 54 -
meta-oe/recipes-core/glib-2.0/glib-2.0_git.bb | 32 -
meta-oe/recipes-core/glib-2.0/glib.inc | 38 -
meta-oe/recipes-core/udev/udev-extra-rules.bb | 6 +-
.../gdbus-binding-tool/gdbus-binding-tool/COPYING | 482 ----
.../gdbus-binding-tool/gdbus-binding-tool_git.bb | 37 -
...pend-docs-to-_Extension.extension.__doc__.patch | 27 +
...thon-cython_0.13.bb => python-cython_0.15.1.bb} | 11 +-
meta-oe/recipes-graphics/mesa/README | 12 -
meta-oe/recipes-graphics/mesa/mesa-7.10.2.inc | 19 -
.../recipes-graphics/mesa/mesa-7.10.2/glamo.patch | 2425 --------------------
.../recipes-graphics/mesa/mesa-7.10.2/uclibc.patch | 26 -
meta-oe/recipes-graphics/mesa/mesa-common.inc | 49 -
meta-oe/recipes-graphics/mesa/mesa-dri.inc | 27 -
meta-oe/recipes-graphics/mesa/mesa-dri_7.10.2.bb | 4 -
meta-oe/recipes-graphics/mesa/mesa-xlib.inc | 5 -
meta-oe/recipes-graphics/mesa/mesa-xlib_7.10.2.bb | 4 -
meta-oe/recipes-graphics/mesa/mesa_7.10.2.bb | 6 -
.../pango/pango-1.28.3/no-tests.patch | 10 -
.../pango/pango-1.29.4/no-tests.patch | 11 +
meta-oe/recipes-graphics/pango/pango_1.28.3.bb | 9 -
meta-oe/recipes-graphics/pango/pango_1.29.4.bb | 9 +
.../xorg-driver/xf86-input-tslib_0.0.6.bb | 4 +-
.../xorg-driver/xf86-input-void_1.4.0.bb | 4 +-
.../xorg-driver/xf86-video-fbdev_0.4.2.bb | 4 +-
.../xorg-driver/xf86-video-geode_2.11.12.bb | 4 +-
.../xorg-driver/xf86-video-glamo_git.bb | 4 +-
.../xf86-video-omapfb/0001-blacklist-tv-out.patch | 28 -
...virtual-size-when-configuring-framebuffer.patch | 26 -
.../xf86-video-omapfb/0003-force-plain-mode.patch | 26 -
.../0004-Attempt-to-fix-VRFB.patch | 320 ---
.../xorg-driver/xf86-video-omapfb_git.bb | 27 -
.../xorg-lib/libx11-1.4.3/keysymdef_include.patch | 19 -
.../libx11-1.4.3/x11_disable_makekeys.patch | 29 -
meta-oe/recipes-graphics/xorg-lib/libx11.inc | 52 -
meta-oe/recipes-graphics/xorg-lib/libx11_1.4.3.bb | 11 -
.../xorg-lib/libxft_2.2.0.bbappend | 1 -
.../xorg-lib/libxrender_0.9.6.bbappend | 1 -
.../xorg-proto/renderproto_0.11.1.bbappend | 1 -
.../xorg-xserver/xorg-xserver-common.inc | 126 -
.../50b9d3142ff90af2f7fa35b7b1bf9e5a07723dbd.patch | 61 -
...ack-assume-pixman-supports-overlapped-blt.patch | 14 -
.../hack-fbdev-ignore-return-mode.patch | 39 -
.../xserver-xorg-1.10.2/randr-support.patch | 102 -
.../replace-pkgconfig-sdkdir-poking.patch | 33 -
.../xorg-xserver/xserver-xorg_1.10.2.bb | 33 -
.../recipes-navigation/navit/navit-icons_svn.bb | 7 +-
meta-oe/recipes-support/iso-codes/iso-codes_1.4.bb | 7 +-
meta-oe/recipes-support/pidgin/pidgin.inc | 3 +-
...poppler-data_0.4.0.bb => poppler-data_0.4.5.bb} | 6 +-
meta-oe/recipes-support/poppler/poppler_0.12.3.bb | 10 -
meta-oe/recipes-support/poppler/poppler_0.18.0.bb | 10 +
meta-oe/recipes-support/talloc/talloc_2.0.1.bb | 27 -
85 files changed, 213 insertions(+), 4594 deletions(-)
create mode 100644 meta-efl/recipes-efl/e17/e-wm-theme-illume-efenniht/LICENSE
create mode 100644 meta-efl/recipes-efl/e17/exquisite-theme-illume/LICENSE
create mode 100644 meta-efl/recipes-efl/efl/elementary-theme-efenniht/LICENSE
create mode 100644 meta-efl/recipes-efl/efl/epdf/epdf.poppler-0.16.api.change.patch
delete mode 100644 meta-oe/classes/glx-use-tls.bbclass
delete mode 100644 meta-oe/recipes-core/glib-2.0/glib-2.0.inc
delete mode 100644 meta-oe/recipes-core/glib-2.0/glib-2.0/0003-gatomic-proper-pointer-get-cast.patch.patch
delete mode 100644 meta-oe/recipes-core/glib-2.0/glib-2.0/0005-glib-mkenums-interpreter.patch.patch
delete mode 100644 meta-oe/recipes-core/glib-2.0/glib-2.0/60_wait-longer-for-threads-to-die.patch
delete mode 100644 meta-oe/recipes-core/glib-2.0/glib-2.0/configure-libtool.patch
delete mode 100644 meta-oe/recipes-core/glib-2.0/glib-2.0/g_once_init_enter.patch
delete mode 100644 meta-oe/recipes-core/glib-2.0/glib-2.0/glib-gettextize-dir.patch
delete mode 100644 meta-oe/recipes-core/glib-2.0/glib-2.0/no-iconv.patch
delete mode 100644 meta-oe/recipes-core/glib-2.0/glib-2.0/remove.test.for.qsort_r.patch
delete mode 100644 meta-oe/recipes-core/glib-2.0/glib-2.0_git.bb
delete mode 100644 meta-oe/recipes-core/glib-2.0/glib.inc
delete mode 100644 meta-oe/recipes-devtools/gdbus-binding-tool/gdbus-binding-tool/COPYING
delete mode 100644 meta-oe/recipes-devtools/gdbus-binding-tool/gdbus-binding-tool_git.bb
create mode 100644 meta-oe/recipes-devtools/python/python-cython-0.15.1/0001-Don-t-append-docs-to-_Extension.extension.__doc__.patch
rename meta-oe/recipes-devtools/python/{python-cython_0.13.bb => python-cython_0.15.1.bb} (68%)
delete mode 100644 meta-oe/recipes-graphics/mesa/README
delete mode 100644 meta-oe/recipes-graphics/mesa/mesa-7.10.2.inc
delete mode 100644 meta-oe/recipes-graphics/mesa/mesa-7.10.2/glamo.patch
delete mode 100644 meta-oe/recipes-graphics/mesa/mesa-7.10.2/uclibc.patch
delete mode 100644 meta-oe/recipes-graphics/mesa/mesa-common.inc
delete mode 100644 meta-oe/recipes-graphics/mesa/mesa-dri.inc
delete mode 100644 meta-oe/recipes-graphics/mesa/mesa-dri_7.10.2.bb
delete mode 100644 meta-oe/recipes-graphics/mesa/mesa-xlib.inc
delete mode 100644 meta-oe/recipes-graphics/mesa/mesa-xlib_7.10.2.bb
delete mode 100644 meta-oe/recipes-graphics/mesa/mesa_7.10.2.bb
delete mode 100644 meta-oe/recipes-graphics/pango/pango-1.28.3/no-tests.patch
create mode 100644 meta-oe/recipes-graphics/pango/pango-1.29.4/no-tests.patch
delete mode 100644 meta-oe/recipes-graphics/pango/pango_1.28.3.bb
create mode 100644 meta-oe/recipes-graphics/pango/pango_1.29.4.bb
delete mode 100644 meta-oe/recipes-graphics/xorg-driver/xf86-video-omapfb/0001-blacklist-tv-out.patch
delete mode 100644 meta-oe/recipes-graphics/xorg-driver/xf86-video-omapfb/0002-Revert-Set-virtual-size-when-configuring-framebuffer.patch
delete mode 100644 meta-oe/recipes-graphics/xorg-driver/xf86-video-omapfb/0003-force-plain-mode.patch
delete mode 100644 meta-oe/recipes-graphics/xorg-driver/xf86-video-omapfb/0004-Attempt-to-fix-VRFB.patch
delete mode 100644 meta-oe/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb
delete mode 100644 meta-oe/recipes-graphics/xorg-lib/libx11-1.4.3/keysymdef_include.patch
delete mode 100644 meta-oe/recipes-graphics/xorg-lib/libx11-1.4.3/x11_disable_makekeys.patch
delete mode 100644 meta-oe/recipes-graphics/xorg-lib/libx11.inc
delete mode 100644 meta-oe/recipes-graphics/xorg-lib/libx11_1.4.3.bb
delete mode 100644 meta-oe/recipes-graphics/xorg-lib/libxft_2.2.0.bbappend
delete mode 100644 meta-oe/recipes-graphics/xorg-lib/libxrender_0.9.6.bbappend
delete mode 100644 meta-oe/recipes-graphics/xorg-proto/renderproto_0.11.1.bbappend
delete mode 100644 meta-oe/recipes-graphics/xorg-xserver/xorg-xserver-common.inc
delete mode 100644 meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.10.2/50b9d3142ff90af2f7fa35b7b1bf9e5a07723dbd.patch
delete mode 100644 meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.10.2/hack-assume-pixman-supports-overlapped-blt.patch
delete mode 100644 meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.10.2/hack-fbdev-ignore-return-mode.patch
delete mode 100644 meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.10.2/randr-support.patch
delete mode 100644 meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.10.2/replace-pkgconfig-sdkdir-poking.patch
delete mode 100644 meta-oe/recipes-graphics/xorg-xserver/xserver-xorg_1.10.2.bb
rename meta-oe/recipes-support/poppler/{poppler-data_0.4.0.bb => poppler-data_0.4.5.bb} (77%)
delete mode 100644 meta-oe/recipes-support/poppler/poppler_0.12.3.bb
create mode 100644 meta-oe/recipes-support/poppler/poppler_0.18.0.bb
delete mode 100644 meta-oe/recipes-support/talloc/talloc_2.0.1.bb
--
1.7.7
^ permalink raw reply [flat|nested] 46+ messages in thread
* [meta-oe][meta-efl][PATCHv2 02/25] libxft, libxrender, renderproto: move native BBCLASSEXTENDs to oe-core
2011-10-03 13:27 ` [meta-oe][meta-efl][PATCHv2 00/25] " Martin Jansa
2011-10-03 13:26 ` [meta-oe][meta-efl][PATCHv2 01/25] xorg-driver: use renamed .inc from oe-core Martin Jansa
@ 2011-10-03 13:27 ` Martin Jansa
2011-10-03 13:27 ` [meta-oe][meta-efl][PATCHv2 03/25] xf86-video-omapfb: merged " Martin Jansa
` (23 subsequent siblings)
25 siblings, 0 replies; 46+ messages in thread
From: Martin Jansa @ 2011-10-03 13:27 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
.../xorg-lib/libxft_2.2.0.bbappend | 1 -
.../xorg-lib/libxrender_0.9.6.bbappend | 1 -
.../xorg-proto/renderproto_0.11.1.bbappend | 1 -
3 files changed, 0 insertions(+), 3 deletions(-)
delete mode 100644 meta-oe/recipes-graphics/xorg-lib/libxft_2.2.0.bbappend
delete mode 100644 meta-oe/recipes-graphics/xorg-lib/libxrender_0.9.6.bbappend
delete mode 100644 meta-oe/recipes-graphics/xorg-proto/renderproto_0.11.1.bbappend
diff --git a/meta-oe/recipes-graphics/xorg-lib/libxft_2.2.0.bbappend b/meta-oe/recipes-graphics/xorg-lib/libxft_2.2.0.bbappend
deleted file mode 100644
index 608377e..0000000
--- a/meta-oe/recipes-graphics/xorg-lib/libxft_2.2.0.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-oe/recipes-graphics/xorg-lib/libxrender_0.9.6.bbappend b/meta-oe/recipes-graphics/xorg-lib/libxrender_0.9.6.bbappend
deleted file mode 100644
index 608377e..0000000
--- a/meta-oe/recipes-graphics/xorg-lib/libxrender_0.9.6.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-oe/recipes-graphics/xorg-proto/renderproto_0.11.1.bbappend b/meta-oe/recipes-graphics/xorg-proto/renderproto_0.11.1.bbappend
deleted file mode 100644
index 608377e..0000000
--- a/meta-oe/recipes-graphics/xorg-proto/renderproto_0.11.1.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-BBCLASSEXTEND = "native nativesdk"
--
1.7.7
^ permalink raw reply related [flat|nested] 46+ messages in thread
* [meta-oe][meta-efl][PATCHv2 03/25] xf86-video-omapfb: merged to oe-core
2011-10-03 13:27 ` [meta-oe][meta-efl][PATCHv2 00/25] " Martin Jansa
2011-10-03 13:26 ` [meta-oe][meta-efl][PATCHv2 01/25] xorg-driver: use renamed .inc from oe-core Martin Jansa
2011-10-03 13:27 ` [meta-oe][meta-efl][PATCHv2 02/25] libxft, libxrender, renderproto: move native BBCLASSEXTENDs to oe-core Martin Jansa
@ 2011-10-03 13:27 ` Martin Jansa
2011-10-03 13:27 ` [meta-oe][meta-efl][PATCHv2 04/25] xserver-xorg: drop 1.10.2 and use xserver-xf86-lite-1.11.0 from oe-core instead Martin Jansa
` (22 subsequent siblings)
25 siblings, 0 replies; 46+ messages in thread
From: Martin Jansa @ 2011-10-03 13:27 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
.../xf86-video-omapfb/0001-blacklist-tv-out.patch | 28 --
...virtual-size-when-configuring-framebuffer.patch | 26 --
.../xf86-video-omapfb/0003-force-plain-mode.patch | 26 --
.../0004-Attempt-to-fix-VRFB.patch | 320 --------------------
.../xorg-driver/xf86-video-omapfb_git.bb | 27 --
5 files changed, 0 insertions(+), 427 deletions(-)
delete mode 100644 meta-oe/recipes-graphics/xorg-driver/xf86-video-omapfb/0001-blacklist-tv-out.patch
delete mode 100644 meta-oe/recipes-graphics/xorg-driver/xf86-video-omapfb/0002-Revert-Set-virtual-size-when-configuring-framebuffer.patch
delete mode 100644 meta-oe/recipes-graphics/xorg-driver/xf86-video-omapfb/0003-force-plain-mode.patch
delete mode 100644 meta-oe/recipes-graphics/xorg-driver/xf86-video-omapfb/0004-Attempt-to-fix-VRFB.patch
delete mode 100644 meta-oe/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb
diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-video-omapfb/0001-blacklist-tv-out.patch b/meta-oe/recipes-graphics/xorg-driver/xf86-video-omapfb/0001-blacklist-tv-out.patch
deleted file mode 100644
index 5ac3b7a..0000000
--- a/meta-oe/recipes-graphics/xorg-driver/xf86-video-omapfb/0001-blacklist-tv-out.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 05efb061f1945425d214ff6b6050883e6d8633bf Mon Sep 17 00:00:00 2001
-From: Koen Kooi <koen@dominion.thruhere.net>
-Date: Wed, 26 Jan 2011 13:21:12 +0100
-Subject: [PATCH 1/3] blacklist tv out
-
-Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
----
- src/omapfb-output-dss.c | 4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
-
-diff --git a/src/omapfb-output-dss.c b/src/omapfb-output-dss.c
-index 6cc52de..83cb711 100644
---- a/src/omapfb-output-dss.c
-+++ b/src/omapfb-output-dss.c
-@@ -205,6 +205,10 @@ OMAPFBDSSOutputDetect (xf86OutputPtr output)
- if(ofb->timings[idx][0] == '\0')
- return XF86OutputStatusDisconnected;
-
-+ // Hack to disable the tv out
-+ if (strncmp(output->name, "tv", 2) == 0)
-+ return XF86OutputStatusDisconnected;
-+
- return XF86OutputStatusConnected;
- }
-
---
-1.6.6.1
-
diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-video-omapfb/0002-Revert-Set-virtual-size-when-configuring-framebuffer.patch b/meta-oe/recipes-graphics/xorg-driver/xf86-video-omapfb/0002-Revert-Set-virtual-size-when-configuring-framebuffer.patch
deleted file mode 100644
index 41d5f13..0000000
--- a/meta-oe/recipes-graphics/xorg-driver/xf86-video-omapfb/0002-Revert-Set-virtual-size-when-configuring-framebuffer.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 316f31253902eb3567ef62faf52b3f0a5d6b0c93 Mon Sep 17 00:00:00 2001
-From: Koen Kooi <koen@dominion.thruhere.net>
-Date: Wed, 26 Jan 2011 13:27:20 +0100
-Subject: [PATCH 2/3] Revert "Set virtual size when configuring framebuffer"
-
-This reverts commit 2653ef07883fbd1a5e7025f9300cf89b79ba429a.
----
- src/omapfb-crtc.c | 2 --
- 1 files changed, 0 insertions(+), 2 deletions(-)
-
-diff --git a/src/omapfb-crtc.c b/src/omapfb-crtc.c
-index 9aaa52f..d321a5a 100644
---- a/src/omapfb-crtc.c
-+++ b/src/omapfb-crtc.c
-@@ -98,8 +98,6 @@ OMAPFBCrtcCommitChangeMode (xf86CrtcPtr crtc)
- v = ofb->state_info;
- v.xres = mode->HDisplay;
- v.yres = mode->VDisplay;
-- v.xres_virtual = crtc->scrn->virtualX;
-- v.yres_virtual = crtc->scrn->virtualY;
- v.activate = FB_ACTIVATE_NOW;
- v.pixclock = KHZ2PICOS(mode->Clock ? mode->Clock : 56000);
- v.left_margin = mode->HTotal - mode->HSyncEnd;
---
-1.6.6.1
-
diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-video-omapfb/0003-force-plain-mode.patch b/meta-oe/recipes-graphics/xorg-driver/xf86-video-omapfb/0003-force-plain-mode.patch
deleted file mode 100644
index 06eeca9..0000000
--- a/meta-oe/recipes-graphics/xorg-driver/xf86-video-omapfb/0003-force-plain-mode.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From b7acfade1ac15332ebfd24d4bf02b466858c8cf8 Mon Sep 17 00:00:00 2001
-From: Koen Kooi <koen@dominion.thruhere.net>
-Date: Wed, 26 Jan 2011 13:20:20 +0100
-Subject: [PATCH 3/3] force 'plain' mode
-
-Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
----
- src/omapfb-driver.c | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/src/omapfb-driver.c b/src/omapfb-driver.c
-index 018e040..48aa09c 100644
---- a/src/omapfb-driver.c
-+++ b/src/omapfb-driver.c
-@@ -326,7 +326,7 @@ OMAPFBPreInit(ScrnInfoPtr pScrn, int flags)
- OMAPFBProbeController(ofb->ctrl_name);
-
- /* Do we have the DSS kernel API? */
-- if (stat(SYSFS_DSS_DIR, &st) == 0) {
-+ if (0) { //stat(SYSFS_DSS_DIR, &st) == 0) {
- ofb->dss = TRUE;
- } else {
- ofb->dss = FALSE;
---
-1.6.6.1
-
diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-video-omapfb/0004-Attempt-to-fix-VRFB.patch b/meta-oe/recipes-graphics/xorg-driver/xf86-video-omapfb/0004-Attempt-to-fix-VRFB.patch
deleted file mode 100644
index 4d2ecd3..0000000
--- a/meta-oe/recipes-graphics/xorg-driver/xf86-video-omapfb/0004-Attempt-to-fix-VRFB.patch
+++ /dev/null
@@ -1,320 +0,0 @@
-From 9f034f7a83751e4d1bbff6dd742d54bd96d38230 Mon Sep 17 00:00:00 2001
-From: Eino-Ville Talvala <talvala@stanford.edu>
-Date: Tue, 23 Aug 2011 18:37:01 +0200
-Subject: [PATCH] Attempt to fix VRFB Signed-off-by: Sebastian Krzyszkowiak
- <dos@dosowisko.net>
-
----
- src/image-format-conversions.c | 4 +-
- src/image-format-conversions.h | 2 +-
- src/omapfb-driver.c | 28 +++++++++++++--
- src/omapfb-xv-blizzard.c | 1 +
- src/omapfb-xv-generic.c | 72 +++++++++++++++++++++++++++++++--------
- src/omapfb-xv.c | 3 ++
- 6 files changed, 88 insertions(+), 22 deletions(-)
-
-diff --git a/src/image-format-conversions.c b/src/image-format-conversions.c
-index dcefa9b..d43427d 100644
---- a/src/image-format-conversions.c
-+++ b/src/image-format-conversions.c
-@@ -38,13 +38,13 @@
- #include "image-format-conversions.h"
-
- /* Basic line-based copy for packed formats */
--void packed_line_copy(int w, int h, int stride, uint8_t *src, uint8_t *dest)
-+void packed_line_copy(int w, int h, int src_stride, int dst_stride, uint8_t *src, uint8_t *dest)
- {
- int i;
- int len = w * 2;
- for (i = 0; i < h; i++)
- {
-- memcpy(dest + i * len, src + i * stride, len);
-+ memcpy(dest + i * dst_stride, src + i * src_stride, len);
- }
- }
-
-diff --git a/src/image-format-conversions.h b/src/image-format-conversions.h
-index 584896a..ba7caf2 100644
---- a/src/image-format-conversions.h
-+++ b/src/image-format-conversions.h
-@@ -27,7 +27,7 @@
- #include <stdint.h>
-
- /* Basic line-based copy for packed formats */
--void packed_line_copy(int w, int h, int stride, uint8_t *src, uint8_t *dest);
-+void packed_line_copy(int w, int h, int src_stride, int dst_stride, uint8_t *src, uint8_t *dest);
-
- /* Basic C implementation of YV12/I420 to UYVY conversion */
- void uv12_to_uyvy(int w, int h, int y_pitch, int uv_pitch, uint8_t *y_p, uint8_t *u_p, uint8_t *v_p, uint8_t *dest);
-diff --git a/src/omapfb-driver.c b/src/omapfb-driver.c
-index 48aa09c..07989f5 100644
---- a/src/omapfb-driver.c
-+++ b/src/omapfb-driver.c
-@@ -66,6 +66,7 @@
- #define OMAPFB_VERSION 1000
- #define OMAPFB_DRIVER_NAME "OMAPFB"
- #define OMAPFB_NAME "omapfb"
-+#define ENFORCE_MODES
-
- static Bool OMAPFBProbe(DriverPtr drv, int flags);
- static Bool OMAPFBPreInit(ScrnInfoPtr pScrn, int flags);
-@@ -105,11 +106,13 @@ static SymTabRec OMAPFBChipsets[] = {
- typedef enum {
- OPTION_ACCELMETHOD,
- OPTION_FB,
-+ OPTION_ROTATE,
- } FBDevOpts;
-
- static const OptionInfoRec OMAPFBOptions[] = {
- { OPTION_ACCELMETHOD, "AccelMethod", OPTV_STRING, {0}, FALSE },
- { OPTION_FB, "fb", OPTV_STRING, {0}, FALSE },
-+ { OPTION_ROTATE, "rotation", OPTV_STRING, {0}, FALSE },
- { -1, NULL, OPTV_NONE, {0}, FALSE }
- };
-
-@@ -286,6 +289,7 @@ OMAPFBPreInit(ScrnInfoPtr pScrn, int flags)
- {
- OMAPFBPtr ofb;
- EntityInfoPtr pEnt;
-+ char *rotate;
- rgb zeros = { 0, 0, 0 };
- struct stat st;
-
-@@ -379,6 +383,8 @@ OMAPFBPreInit(ScrnInfoPtr pScrn, int flags)
- pScrn->progClock = TRUE;
- pScrn->chipset = "omapfb";
-
-+ xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Rotate test version 0.02\n");
-+
- /* Start with configured virtual size */
- pScrn->virtualX = pScrn->display->virtualX;
- pScrn->virtualY = pScrn->display->virtualY;
-@@ -496,12 +502,21 @@ OMAPFBScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
- ofb->CloseScreen = pScreen->CloseScreen;
- pScreen->CloseScreen = OMAPFBCloseScreen;
-
-+ /* Enforce the default mode (this is silly I guess) */
-+#ifdef ENFORCE_MODES
-+ //xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Enforcing modes\n");
-+ //set_mode(ofb, &ofb->default_mode);
-+ //pScrn->displayWidth = ofb->fixed_info.line_length /
-+ // (ofb->state_info.bits_per_pixel>>3); //ofb->state_info.xres;
-+#endif
-+
- /* Map our framebuffer memory */
-+ ofb->mem_info.size = ofb->fixed_info.line_length * ofb->state_info.yres;
- ofb->fb = mmap (NULL, ofb->mem_info.size,
- PROT_READ | PROT_WRITE, MAP_SHARED,
- ofb->fd, 0);
-- if (ofb->fb == NULL) {
-- xf86DrvMsg(scrnIndex, X_ERROR, "Mapping framebuffer memory failed\n");
-+ if (ofb->fb == MAP_FAILED) {
-+ xf86DrvMsg(scrnIndex, X_ERROR, "Mapping framebuffer memory failed, wanted %d bytes.\n", ofb->mem_info.size);
- return FALSE;
- }
-
-@@ -578,8 +593,13 @@ OMAPFBScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
- } else if (!ofb->dss) {
-
- ofb->plane_info.enabled = 1;
-- ofb->plane_info.out_width = ofb->state_info.xres;
-- ofb->plane_info.out_height = ofb->state_info.yres;
-+ if (ofb->state_info.rotate == 0 || ofb->state_info.rotate == 2) {
-+ ofb->plane_info.out_width = ofb->state_info.xres;
-+ ofb->plane_info.out_height = ofb->state_info.yres;
-+ } else {
-+ ofb->plane_info.out_width = ofb->state_info.yres;
-+ ofb->plane_info.out_height = ofb->state_info.xres;
-+ }
-
- if (ioctl (ofb->fd, OMAPFB_SETUP_PLANE, &ofb->plane_info)) {
- xf86DrvMsg(scrnIndex, X_ERROR,
-diff --git a/src/omapfb-xv-blizzard.c b/src/omapfb-xv-blizzard.c
-index 406ffc6..b71d2aa 100644
---- a/src/omapfb-xv-blizzard.c
-+++ b/src/omapfb-xv-blizzard.c
-@@ -220,6 +220,7 @@ int OMAPFBXVPutImageBlizzard (ScrnInfoPtr pScrn,
- packed_line_copy(src_w & ~3,
- src_h & ~3,
- ((src_w + 1) & ~1) * 2,
-+ ofb->port->fixed_info.line_length,
- (uint8_t*)buf,
- (uint8_t*)ofb->port->fb);
- break;
-diff --git a/src/omapfb-xv-generic.c b/src/omapfb-xv-generic.c
-index e6f89fe..b33f344 100644
---- a/src/omapfb-xv-generic.c
-+++ b/src/omapfb-xv-generic.c
-@@ -62,7 +62,7 @@ int OMAPXVAllocPlane(ScrnInfoPtr pScrn)
- {
- OMAPFBPtr ofb = OMAPFB(pScrn);
-
-- /* The memory size is already set in OMAPFBXVQueryImageAttributes */
-+ /* The memory size is already set before we get here */
- if (ioctl(ofb->port->fd, OMAPFB_SETUP_MEM, &ofb->port->mem_info) != 0) {
- xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
- "Failed to allocate video plane memory\n");
-@@ -73,19 +73,20 @@ int OMAPXVAllocPlane(ScrnInfoPtr pScrn)
- ofb->port->fb = mmap (NULL, ofb->port->mem_info.size,
- PROT_READ | PROT_WRITE, MAP_SHARED,
- ofb->port->fd, 0);
-- if (ofb->port->fb == NULL) {
-+ if (ofb->port->fb == MAP_FAILED) {
- xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
- "Mapping video memory failed\n");
- return XvBadAlloc;
- }
-
- /* Update the state info */
-+ /* Let's not - it's bad
- if (ioctl (ofb->port->fd, FBIOGET_VSCREENINFO, &ofb->port->state_info))
- {
- xf86Msg(X_ERROR, "%s: Reading state info failed\n", __FUNCTION__);
- return XvBadAlloc;
- }
--
-+ */
- return Success;
- }
-
-@@ -93,6 +94,7 @@ int OMAPXVAllocPlane(ScrnInfoPtr pScrn)
- int OMAPXVSetupVideoPlane(ScrnInfoPtr pScrn)
- {
- OMAPFBPtr ofb = OMAPFB(pScrn);
-+ int ret;
-
- if (ioctl (ofb->port->fd, FBIOPUT_VSCREENINFO, &ofb->port->state_info))
- {
-@@ -104,6 +106,31 @@ int OMAPXVSetupVideoPlane(ScrnInfoPtr pScrn)
- xf86Msg(X_ERROR, "%s: Reading state info failed\n", __FUNCTION__);
- return XvBadAlloc;
- }
-+ /* Changing rotation/nonstd flags can change the fixed info! */
-+ if (ioctl (ofb->port->fd, FBIOGET_FSCREENINFO, &ofb->port->fixed_info))
-+ {
-+ xf86Msg(X_ERROR, "%s: Reading state info failed\n", __FUNCTION__);
-+ return XvBadAlloc;
-+ }
-+ /* Correct fixed info requires recalculation of needed memory */
-+ ofb->port->mem_info.size = ofb->port->fixed_info.line_length * ofb->port->state_info.yres;
-+
-+ /* Allocate buffer memory */
-+ ret = OMAPXVAllocPlane(pScrn);
-+ if (ret != Success)
-+ return ret;
-+
-+ /* Workaround for reset of mode after memory allo */
-+ if (ioctl (ofb->port->fd, FBIOPUT_VSCREENINFO, &ofb->port->state_info))
-+ {
-+ xf86Msg(X_ERROR, "%s: setting state info failed\n", __FUNCTION__);
-+ return XvBadAlloc;
-+ }
-+ if (ioctl (ofb->port->fd, FBIOGET_VSCREENINFO, &ofb->port->state_info))
-+ {
-+ xf86Msg(X_ERROR, "%s: Reading state info failed\n", __FUNCTION__);
-+ return XvBadAlloc;
-+ }
-
- if(ioctl(ofb->port->fd, OMAPFB_SETUP_PLANE,
- &ofb->port->plane_info) != 0) {
-@@ -124,6 +151,8 @@ int OMAPFBXVPutImageGeneric (ScrnInfoPtr pScrn,
- DrawablePtr pDraw)
- {
- OMAPFBPtr ofb = OMAPFB(pScrn);
-+ short drw_temp;
-+ short rot_xres, rot_yres;
-
- if (!ofb->port->plane_info.enabled
- || ofb->port->update_window.x != src_x
-@@ -163,13 +192,6 @@ int OMAPFBXVPutImageGeneric (ScrnInfoPtr pScrn,
- return Success;
- }
-
-- /* If we don't have the plane running, enable it */
-- if (!ofb->port->plane_info.enabled) {
-- ret = OMAPXVAllocPlane(pScrn);
-- if (ret != Success)
-- return ret;
-- }
--
- /* Set up the state info, xres and yres will be used for
- * scaling to the values in the plane info struct
- */
-@@ -179,12 +201,31 @@ int OMAPFBXVPutImageGeneric (ScrnInfoPtr pScrn,
- ofb->port->state_info.yres_virtual = 0;
- ofb->port->state_info.xoffset = 0;
- ofb->port->state_info.yoffset = 0;
-- ofb->port->state_info.rotate = 0;
-+ //ofb->port->state_info.rotate = 0;
- ofb->port->state_info.grayscale = 0;
- ofb->port->state_info.activate = FB_ACTIVATE_NOW;
- ofb->port->state_info.bits_per_pixel = 0;
- ofb->port->state_info.nonstd = xv_to_omapfb_format(image);
-
-+ /* Plane info does not rotate with state_info */
-+ if (ofb->port->state_info.rotate == 1 ||
-+ ofb->port->state_info.rotate == 3) {
-+ drw_temp = drw_x;
-+ drw_x = drw_y;
-+ drw_y = drw_temp;
-+
-+ drw_temp = drw_w;
-+ drw_w = drw_h;
-+ drw_h = drw_temp;
-+
-+ rot_xres = ofb->port->state_info.yres;
-+ rot_yres = ofb->port->state_info.xres;
-+ } else {
-+ rot_xres = ofb->port->state_info.xres;
-+ rot_yres = ofb->port->state_info.yres;
-+ }
-+
-+
- /* Set up the video plane info */
- ofb->port->plane_info.enabled = 1;
- ofb->port->plane_info.pos_x = drw_x;
-@@ -193,13 +234,13 @@ int OMAPFBXVPutImageGeneric (ScrnInfoPtr pScrn,
- ofb->port->plane_info.out_height = drw_h & ~15;
-
- /* Cap output to screen size */
-- if (ofb->port->plane_info.out_width > ofb->state_info.xres) {
-+ if (ofb->port->plane_info.out_width > rot_xres) {
- ofb->port->plane_info.pos_x = 0;
-- ofb->port->plane_info.out_width = ofb->state_info.xres;
-+ ofb->port->plane_info.out_width = rot_xres;
- }
-- if (ofb->port->plane_info.out_height > ofb->state_info.yres) {
-+ if (ofb->port->plane_info.out_height > rot_yres) {
- ofb->port->plane_info.pos_y = 0;
-- ofb->port->plane_info.out_height = ofb->state_info.yres;
-+ ofb->port->plane_info.out_height = rot_yres;
- }
-
- ret = OMAPXVSetupVideoPlane(pScrn);
-@@ -223,6 +264,7 @@ int OMAPFBXVPutImageGeneric (ScrnInfoPtr pScrn,
- packed_line_copy(src_w & ~15,
- src_h & ~15,
- ((src_w + 1) & ~1) * 2,
-+ ofb->port->fixed_info.line_length,
- (uint8_t*)buf,
- (uint8_t*)ofb->port->fb);
- break;
-diff --git a/src/omapfb-xv.c b/src/omapfb-xv.c
-index 1df651e..0fee2c6 100644
---- a/src/omapfb-xv.c
-+++ b/src/omapfb-xv.c
-@@ -169,8 +169,11 @@ static int OMAPFBXVQueryImageAttributes (ScrnInfoPtr pScrn,
- h = *height;
-
- w = (w + 1) & ~1;
-+
-+ /* Can't calculate these here - don't know line length
- ofb->port->mem_info.size = w << 1;
- ofb->port->mem_info.size *= h;
-+ */
-
- return size;
- }
---
-1.7.5.4
-
diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb b/meta-oe/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb
deleted file mode 100644
index a73b5e6..0000000
--- a/meta-oe/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb
+++ /dev/null
@@ -1,27 +0,0 @@
-require recipes-graphics/xorg-driver/xorg-driver-common.inc
-
-DESCRIPTION = "X.Org X server -- OMAP display driver"
-PV = "0.1.1+${PR}+gitr${SRCREV}"
-PR = "r16"
-
-LICENSE = "MIT-X"
-LIC_FILES_CHKSUM = "file://src/omapfb-driver.c;beginline=1;endline=30;md5=a44c2a37e04d1c2c5f0313afb493f833"
-
-SRC_URI = "git://git.pingu.fi/xf86-video-omapfb;protocol=http \
- file://0001-blacklist-tv-out.patch \
- file://0002-Revert-Set-virtual-size-when-configuring-framebuffer.patch \
- file://0003-force-plain-mode.patch \
- file://0004-Attempt-to-fix-VRFB.patch \
- "
-
-SRCREV_pn-${PN} = "28c006c94e57ea71df11ec4fff79d7ffcfc4860f"
-S = "${WORKDIR}/git"
-
-EXTRA_OECONF_armv7a = " --enable-neon "
-
-# Use overlay 2 on omap3 to enable other apps to use overlay 1 (e.g. dmai or omapfbplay)
-do_compile_prepend_armv7a () {
- sed -i -e s:fb1:fb2:g ${S}/src/omapfb-xv.c
-}
-
-CFLAGS += " -I${STAGING_INCDIR}/xorg "
--
1.7.7
^ permalink raw reply related [flat|nested] 46+ messages in thread
* [meta-oe][meta-efl][PATCHv2 04/25] xserver-xorg: drop 1.10.2 and use xserver-xf86-lite-1.11.0 from oe-core instead
2011-10-03 13:27 ` [meta-oe][meta-efl][PATCHv2 00/25] " Martin Jansa
` (2 preceding siblings ...)
2011-10-03 13:27 ` [meta-oe][meta-efl][PATCHv2 03/25] xf86-video-omapfb: merged " Martin Jansa
@ 2011-10-03 13:27 ` Martin Jansa
2011-10-03 13:27 ` [meta-oe][meta-efl][PATCHv2 05/25] libx11: drop here, 1.4.4 should be in oe-core Martin Jansa
` (21 subsequent siblings)
25 siblings, 0 replies; 46+ messages in thread
From: Martin Jansa @ 2011-10-03 13:27 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
.../xorg-xserver/xorg-xserver-common.inc | 126 --------------------
.../50b9d3142ff90af2f7fa35b7b1bf9e5a07723dbd.patch | 61 ----------
...ack-assume-pixman-supports-overlapped-blt.patch | 14 --
.../hack-fbdev-ignore-return-mode.patch | 39 ------
.../xserver-xorg-1.10.2/randr-support.patch | 102 ----------------
.../replace-pkgconfig-sdkdir-poking.patch | 33 -----
.../xorg-xserver/xserver-xorg_1.10.2.bb | 33 -----
7 files changed, 0 insertions(+), 408 deletions(-)
delete mode 100644 meta-oe/recipes-graphics/xorg-xserver/xorg-xserver-common.inc
delete mode 100644 meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.10.2/50b9d3142ff90af2f7fa35b7b1bf9e5a07723dbd.patch
delete mode 100644 meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.10.2/hack-assume-pixman-supports-overlapped-blt.patch
delete mode 100644 meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.10.2/hack-fbdev-ignore-return-mode.patch
delete mode 100644 meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.10.2/randr-support.patch
delete mode 100644 meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.10.2/replace-pkgconfig-sdkdir-poking.patch
delete mode 100644 meta-oe/recipes-graphics/xorg-xserver/xserver-xorg_1.10.2.bb
diff --git a/meta-oe/recipes-graphics/xorg-xserver/xorg-xserver-common.inc b/meta-oe/recipes-graphics/xorg-xserver/xorg-xserver-common.inc
deleted file mode 100644
index 0b4a854..0000000
--- a/meta-oe/recipes-graphics/xorg-xserver/xorg-xserver-common.inc
+++ /dev/null
@@ -1,126 +0,0 @@
-HOMEPAGE = "http://www.x.org"
-SECTION = "x11/base"
-LICENSE = "MIT-X"
-LIC_FILES_CHKSUM = "file://COPYING;md5=3dd2bbe3563837f80ed8926b06c1c353"
-
-INC_PR = "r21"
-
-# xf86-*-* packages depend on an X server built with the xfree86 DDX
-# so we have a virtual to represent that:
-PROVIDES = "virtual/xserver-xf86"
-
-# Other packages tend to just care that there is *an* X server:
-PROVIDES += "virtual/xserver"
-
-# Config manager for xserver, options are: hal, udev, empty (for configuration in xorg.conf)
-DISTRO_XORG_CONFIG_MANAGER ?= "udev"
-
-# default none, enabled by DISTRO_XORG_CONFIG_MANAGER setting
-CONFIG_MANAGER_OPTION += "${@['--disable-config-hal','--enable-config-hal',''][bb.data.getVar('DISTRO_XORG_CONFIG_MANAGER',d) in ['hal']]}"
-CONFIG_MANAGER_OPTION += "${@['--disable-config-udev','--enable-config-udev',''][bb.data.getVar('DISTRO_XORG_CONFIG_MANAGER',d) in ['udev']]}"
-
-DEPENDS = "fontconfig freetype flex-native liblbxutil kbproto \
-xf86driproto drm glproto randrproto renderproto fixesproto damageproto \
-xcmiscproto xextproto xproto xf86miscproto xf86vidmodeproto xf86bigfontproto \
-scrnsaverproto bigreqsproto resourceproto fontsproto inputproto \
-xf86dgaproto videoproto compositeproto trapproto recordproto dmxproto \
-resourceproto xineramaproto xtrans evieext libxkbfile libxfont libxau \
-libfontenc libxdmcp libxxf86vm libxaw libxmu libxt libxpm libxext libx11 \
-libxkbui libxxf86misc libxi libdmx libxtst libxres virtual/libgl libxcalibrate \
-libxv ${DISTRO_XORG_CONFIG_MANAGER}"
-
-RRECOMMENDS_${PN} = "libpciaccess"
-
-XORG_PN = "xorg-server"
-SRC_URI = "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${PV}.tar.bz2"
-
-S = "${WORKDIR}/${XORG_PN}-${PV}"
-
-inherit autotools pkgconfig glx-use-tls
-
-EXTRA_OECONF += " --enable-xcalibrate \
- --enable-kdrive \
- --enable-xephyr \
- --disable-xfbdev \
- --disable-xnest \
- --disable-kdrive-vesa \
- --with-default-font-path="${datadir}/fonts/X11/misc" \
- ac_cv_file__usr_share_sgml_X11_defs_ent=no"
-
-# CONFIG_MANAGER_OPTION is used only in recipes which support those options
-
-EXTRA_OECONF_append_arm = " ac_cv_header_linux_apm_bios_h=no "
-
-PACKAGES =+ "xserver-security-policy"
-FILES_xserver-security-policy += "${libdir}/xserver/SecurityPolicy"
-RRECOMMENDS_${PN} += "xserver-security-policy xkeyboard-config rgb xserver-xf86-config"
-
-PACKAGES =+ "${PN}-sdl ${PN}-fbdev ${PN}-xprint ${PN}-xvfb ${PN}-utils ${PN}-xephyr"
-
-RDEPENDS_${PN}-xvfb += "xkeyboard-config"
-
-FILES_${PN}-fbdev = "${bindir}/Xfbdev"
-FILES_${PN}-sdl = "${bindir}/Xsdl"
-FILES_${PN}-xprint = "${libdir}/X11/xserver/*/print"
-FILES_${PN}-xvfb = "${bindir}/Xvfb"
-FILES_${PN}-utils = "${bindir}/scanpci ${bindir}/pcitweak ${bindir}/ioport ${bindir}/in[bwl] ${bindir}/out[bwl] ${bindir}/mmap[rw] ${bindir}/gtf ${bindir}/getconfig ${bindir}/getconfig.pl"
-FILES_${PN} = "${bindir} ${libdir}/X11/Options ${libdir}/X11/Cards ${libdir}/X11/getconfig ${libdir}/X11/etc ${libdir}/modules/*.so ${libdir}/xorg/modules/*.so /etc/X11 ${libdir}/xorg/protocol.txt ${datadir}/X11/xorg.conf.d"
-FILES_${PN}-doc += "${libdir}/X11/doc ${datadir}/X11/xkb/compiled/README.compiled"
-FILES_${PN}-xephyr = "${bindir}/Xephyr"
-
-FILES_${PN}-dbg += "${libdir}/xorg/modules/.debug \
- ${libdir}/xorg/modules/*/.debug \
- ${libdir}/xorg/modules/*/*/.debug \
- "
-
-# Split out some modules and extensions from the main package
-# These aren't needed for basic operations and only take up space:
-# 32.0k libdri.so
-# 336.0k libglx.so
-# 1360k libint10.so
-# 180.0k libwfb.so
-# 320.0k libxaa.so
-# 124.0k libxf1bpp.so
-# 84.0k libxf4bpp.so
-# librecord.so
-# libextmod.so
-# libdbe.so
-
-PACKAGES =+ "${PN}-extension-dri \
- ${PN}-extension-dri2 \
- ${PN}-extension-glx \
- ${PN}-extension-record \
- ${PN}-extension-extmod \
- ${PN}-extension-dbe \
- ${PN}-module-libint10 \
- ${PN}-module-libafb \
- ${PN}-module-libwfb \
- ${PN}-module-libmfb \
- ${PN}-module-libcfb \
- ${PN}-module-xaa \
- ${PN}-module-libxf1bpp \
- ${PN}-module-libxf4bpp"
-
-
-FILES_${PN}-extension-dri = "${libdir}/xorg/modules/extensions/libdri.so"
-FILES_${PN}-extension-dri2 = "${libdir}/xorg/modules/extensions/libdri2.so"
-FILES_${PN}-extension-glx = "${libdir}/xorg/modules/extensions/libglx.so"
-FILES_${PN}-extension-record = "${libdir}/xorg/modules/extensions/librecord.so"
-FILES_${PN}-extension-extmod = "${libdir}/xorg/modules/extensions/libextmod.so"
-FILES_${PN}-extension-dbe = "${libdir}/xorg/modules/extensions/libdbe.so"
-FILES_${PN}-module-libint10 = "${libdir}/xorg/modules/libint10.so"
-FILES_${PN}-module-libafb = "${libdir}/xorg/modules/libafb.so"
-FILES_${PN}-module-libwfb = "${libdir}/xorg/modules/libwfb.so"
-FILES_${PN}-module-libmfb = "${libdir}/xorg/modules/libmfb.so"
-FILES_${PN}-module-libcfb = "${libdir}/xorg/modules/libcfb.so"
-FILES_${PN}-module-xaa = "${libdir}/xorg/modules/libxaa.so"
-FILES_${PN}-module-libxf1bpp = "${libdir}/xorg/modules/libxf1bpp.so"
-FILES_${PN}-module-libxf4bpp = "${libdir}/xorg/modules/libxf4bpp.so"
-
-PACKAGES =+ "${PN}-multimedia-modules"
-
-FILES_${PN}-multimedia-modules = "${libdir}/xorg/modules/multimedia/*drv*"
-
-do_install_append () {
- ln -sf ${datadir}/fonts/X11 ${D}/${libdir}/X11/fonts
-}
diff --git a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.10.2/50b9d3142ff90af2f7fa35b7b1bf9e5a07723dbd.patch b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.10.2/50b9d3142ff90af2f7fa35b7b1bf9e5a07723dbd.patch
deleted file mode 100644
index 2c4078a..0000000
--- a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.10.2/50b9d3142ff90af2f7fa35b7b1bf9e5a07723dbd.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 50b9d3142ff90af2f7fa35b7b1bf9e5a07723dbd Mon Sep 17 00:00:00 2001
-From: Aaron Plattner <aplattner@nvidia.com>
-Date: Tue, 24 May 2011 23:02:42 +0000
-Subject: randr: check rotated virtual size limits correctly
-
-Commit d1107918d4626268803b54033a07405122278e7f introduced checks to
-the RandR path that cause RRSetScreenConfig requests to fail if the
-size is too large. Unfortunately, when RandR 1.1 rotation is enabled
-it compares the rotated screen dimensions to the unrotated limits,
-which causes 90- and 270-degree rotation to fail unless your screen
-happens to be square:
-
- X Error of failed request: BadValue (integer parameter out of range for operation)
- Major opcode of failed request: 153 (RANDR)
- Minor opcode of failed request: 2 (RRSetScreenConfig)
- Value in failed request: 0x780
- Serial number of failed request: 14
- Current serial number in output stream: 14
-
-Fix this by moving the check above the code that swaps the dimensions
-based on the rotation.
-
-Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
-Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
-Tested-by: Robert Hooker <robert.hooker@canonical.com>
-Tested-by: Kent Baxley <kent.baxley@canonical.com>
-Signed-off-by: Keith Packard <keithp@keithp.com>
-(cherry picked from commit b6c7b9b2f39e970cedb6bc1e073f901e28cb0fa3)
----
-diff --git a/randr/rrscreen.c b/randr/rrscreen.c
-index 1bc1a9e..da6d48d 100644
---- a/randr/rrscreen.c
-+++ b/randr/rrscreen.c
-@@ -910,12 +910,6 @@ ProcRRSetScreenConfig (ClientPtr client)
- */
- width = mode->mode.width;
- height = mode->mode.height;
-- if (rotation & (RR_Rotate_90|RR_Rotate_270))
-- {
-- width = mode->mode.height;
-- height = mode->mode.width;
-- }
--
- if (width < pScrPriv->minWidth || pScrPriv->maxWidth < width) {
- client->errorValue = width;
- free(pData);
-@@ -927,6 +921,12 @@ ProcRRSetScreenConfig (ClientPtr client)
- return BadValue;
- }
-
-+ if (rotation & (RR_Rotate_90|RR_Rotate_270))
-+ {
-+ width = mode->mode.height;
-+ height = mode->mode.width;
-+ }
-+
- if (width != pScreen->width || height != pScreen->height)
- {
- int c;
---
-cgit v0.8.3-6-g21f6
diff --git a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.10.2/hack-assume-pixman-supports-overlapped-blt.patch b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.10.2/hack-assume-pixman-supports-overlapped-blt.patch
deleted file mode 100644
index a947582..0000000
--- a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.10.2/hack-assume-pixman-supports-overlapped-blt.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-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/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.10.2/hack-fbdev-ignore-return-mode.patch b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.10.2/hack-fbdev-ignore-return-mode.patch
deleted file mode 100644
index d3661cb..0000000
--- a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.10.2/hack-fbdev-ignore-return-mode.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Ugly hack that prevents server termination with xf86-video-fbdev-0.4.1
-(and probably other) while returning from chvt or resume on some
-hardware (e. g. zaurus).
-
-Correct fix would require debugging of fbdev mode during LeaveVT and
-EnterVT.
-
-This patch may cause staying in incorrect or corrupted display mode
-after EnterVT, but on man affected devices it does not cause any visible
-problems.
-
-Hacked code is never called on properly written drivers.
-
-Devices affected and testers involved for future patch removal:
-Sharp Zaurus (spitz/akita): Stanislav Brabec <utx@penguin.cz>
-
-See also:
-https://bugzilla.redhat.com/show_bug.cgi?id=238451
-
-The bug (first line indicates that your device is affected):
-
-(EE) FBDEV(0): FBIOPUT_VSCREENINFO succeeded but modified mode
-
-Fatal server error:
-EnterVT failed for screen 0
-
-Index: xorg-server-1.7.3/hw/xfree86/fbdevhw/fbdevhw.c
-===================================================================
---- xorg-server-1.7.3.orig/hw/xfree86/fbdevhw/fbdevhw.c
-+++ xorg-server-1.7.3/hw/xfree86/fbdevhw/fbdevhw.c
-@@ -571,7 +571,7 @@ fbdevHWSetMode(ScrnInfoPtr pScrn, Displa
- #if DEBUG
- print_fbdev_mode("returned", &set_var);
- #endif
-- return FALSE;
-+ /* return FALSE; UGLY HACK to allow return from chvt */
- }
-
- if (!check)
diff --git a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.10.2/randr-support.patch b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.10.2/randr-support.patch
deleted file mode 100644
index 632a64c..0000000
--- a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.10.2/randr-support.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-diff -ur xorg-server-1.10.1.901//hw/xfree86/common/xf86Xinput.c git/xorg-server-1.10.1.901//hw/xfree86/common/xf86Xinput.c
---- xorg-server-1.10.1.901//hw/xfree86/common/xf86Xinput.c 2011-04-28 09:25:00.000000000 +0200
-+++ git/xorg-server-1.10.1.901//hw/xfree86/common/xf86Xinput.c 2011-05-19 00:31:01.178439874 +0200
-@@ -99,6 +99,8 @@
- return; \
- }
-
-+#define RR_Rotate_All (RR_Rotate_0|RR_Rotate_90|RR_Rotate_180|RR_Rotate_270)
-+
- EventListPtr xf86Events = NULL;
-
- static int
-@@ -1408,4 +1410,73 @@
- EnableDevice(dev, TRUE);
- }
-
-+/* Taken from evdev-properties.h. */
-+#define EVDEV_PROP_SWAP_AXES "Evdev Axes Swap"
-+#define EVDEV_PROP_INVERT_AXES "Evdev Axis Inversion"
-+
-+/* This is a hack until we get device -> CRTC association. */
-+void
-+xf86InputRotationNotify(Rotation rotation)
-+{
-+ DeviceIntPtr dev;
-+ //LocalDevicePtr local;
-+ int ret;
-+ int swap_axes = 0;
-+ CARD8 invert[2] = { 0, 0 };
-+ static Atom prop_swap = 0, prop_invert = 0;
-+ static int atom_generation = -1;
-+
-+ if (atom_generation != serverGeneration) {
-+ prop_swap = 0;
-+ prop_invert = 0;
-+ }
-+
-+ switch (rotation & RR_Rotate_All) {
-+ case RR_Rotate_0:
-+ swap_axes = 1;
-+ invert[0] = 0;
-+ invert[1] = 0;
-+ break;
-+ case RR_Rotate_90:
-+ swap_axes = 0;
-+ invert[0] = 0;
-+ invert[1] = 1;
-+ break;
-+ case RR_Rotate_180:
-+ swap_axes = 1;
-+ invert[0] = 1;
-+ invert[1] = 1;
-+ break;
-+ case RR_Rotate_270:
-+ swap_axes = 0;
-+ invert[0] = 1;
-+ invert[1] = 0;
-+ break;
-+ }
-+
-+ if (!prop_swap)
-+ prop_swap = MakeAtom(EVDEV_PROP_SWAP_AXES,
-+ strlen(EVDEV_PROP_SWAP_AXES), TRUE);
-+ if (!prop_invert)
-+ prop_invert = MakeAtom(EVDEV_PROP_INVERT_AXES,
-+ strlen(EVDEV_PROP_INVERT_AXES), TRUE);
-+
-+ for (dev = inputInfo.devices; dev; dev = dev->next) {
-+ //local = dev->public.devicePrivate;
-+ ret = XIChangeDeviceProperty(dev, prop_swap, XA_INTEGER, 8,
-+ PropModeReplace, 1, &swap_axes, FALSE);
-+ if (ret != Success) {
-+ xf86Msg(X_ERROR, "Changing swap_xy property failed!\n");
-+ continue;
-+ }
-+ ret = XIChangeDeviceProperty(dev, prop_invert, XA_INTEGER, 8,
-+ PropModeReplace, 2, invert, FALSE);
-+ if (ret != Success) {
-+ xf86Msg(X_ERROR, "Changing invert property failed!\n");
-+ continue;
-+ }
-+ }
-+}
-+
-+
- /* end of xf86Xinput.c */
-diff -ur xorg-server-1.10.1.901//hw/xfree86/modes/xf86Crtc.c git/xorg-server-1.10.1.901//hw/xfree86/modes/xf86Crtc.c
---- xorg-server-1.10.1.901//hw/xfree86/modes/xf86Crtc.c 2011-04-28 09:25:00.000000000 +0200
-+++ git/xorg-server-1.10.1.901//hw/xfree86/modes/xf86Crtc.c 2011-05-19 00:23:16.244383998 +0200
-@@ -389,6 +389,12 @@
- if (didLock)
- crtc->funcs->unlock (crtc);
-
-+ /*
-+ * Rotate Touchscreen
-+ */
-+ xf86InputRotationNotify(crtc->rotation);
-+
-+
- return ret;
- }
-
diff --git a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.10.2/replace-pkgconfig-sdkdir-poking.patch b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.10.2/replace-pkgconfig-sdkdir-poking.patch
deleted file mode 100644
index 3967c4c..0000000
--- a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.10.2/replace-pkgconfig-sdkdir-poking.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-configury forces pkg-config to poke for sdkdir variable which
-pkg-config happily returns but does not prepend sysroot to it
-since thats only done for includes and libs. This then gets -I
-prepended and added to CFLAGS. Guess what gcc cross gripes
-about including host includes in cross builds but does not bail
-out the build but it does not escape the wrath of our oe's
-QA checks and rightly so. We replace use of sdkdir with
---cflags-only-I which returns the include paths correctly
-pointing inside sysroot and not at the host includes and plus
-includedir if you look inside the .pc file is assigned sdkdir
-anyway so we do not lose anything
-
-This m4 macro is included in other packages e.g. xf86-video-fbdev
-which dont build on hosts which have installation of
-xorg-xserver-dev because it gets this include poisoning
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
-Upstream-status: Pending
-
-Index: xorg-server-1.10.1/xorg-server.m4
-===================================================================
---- xorg-server-1.10.1.orig/xorg-server.m4
-+++ xorg-server-1.10.1/xorg-server.m4
-@@ -31,7 +31,7 @@ dnl
- AC_DEFUN([XORG_DRIVER_CHECK_EXT],[
- AC_REQUIRE([PKG_PROG_PKG_CONFIG])
- SAVE_CFLAGS="$CFLAGS"
-- CFLAGS="$CFLAGS -I`$PKG_CONFIG --variable=sdkdir xorg-server`"
-+ CFLAGS="$CFLAGS `$PKG_CONFIG --cflags-only-I xorg-server`"
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
- #include "xorg-server.h"
- #if !defined $1
diff --git a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg_1.10.2.bb b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg_1.10.2.bb
deleted file mode 100644
index 1d88364..0000000
--- a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg_1.10.2.bb
+++ /dev/null
@@ -1,33 +0,0 @@
-# Assign it here, since the hal->udev transition happens post 1.7 in angstrom
-DISTRO_XORG_CONFIG_MANAGER_angstrom = "udev"
-
-require xorg-xserver-common.inc
-LIC_FILES_CHKSUM = "file://COPYING;md5=74df27b6254cc88d2799b5f4f5949c00"
-
-DESCRIPTION = "the X.Org X server"
-DEPENDS += "mesa-dri pixman libpciaccess openssl dri2proto glproto font-util-native"
-PE = "2"
-PR = "${INC_PR}.1"
-
-SRC_URI += " \
- file://50b9d3142ff90af2f7fa35b7b1bf9e5a07723dbd.patch \
- file://randr-support.patch \
- file://hack-fbdev-ignore-return-mode.patch \
- file://hack-assume-pixman-supports-overlapped-blt.patch \
- file://replace-pkgconfig-sdkdir-poking.patch \
- "
-SRC_URI[md5sum] = "c9ba50bd44ea70da51f13100336a5484"
-SRC_URI[sha256sum] = "65264f6640568b9db8d738aec1ddd036c3ae21b7ba05b98d006759d11a72792c"
-
-do_install_prepend() {
- mkdir -p ${D}/${libdir}/X11/fonts
-}
-
-# The NVidia driver requires Xinerama support in the X server. Ion uses it.
-PACKAGE_ARCH_ion = "${MACHINE_ARCH}"
-XINERAMA = "${@['--disable-xinerama','--enable-xinerama'][bb.data.getVar('MACHINE',d) in ['ion']]}"
-
-EXTRA_OECONF += " ${CONFIG_MANAGER_OPTION} ${XINERAMA} --disable-xsdl --disable-xfake --disable-xfbdev --disable-dmx"
-EXTRA_OECONF += " --enable-dri2 --disable-unit-tests --disable-docs --disable-devel-docs"
-
-export LDFLAGS += " -ldl "
--
1.7.7
^ permalink raw reply related [flat|nested] 46+ messages in thread
* [meta-oe][meta-efl][PATCHv2 05/25] libx11: drop here, 1.4.4 should be in oe-core
2011-10-03 13:27 ` [meta-oe][meta-efl][PATCHv2 00/25] " Martin Jansa
` (3 preceding siblings ...)
2011-10-03 13:27 ` [meta-oe][meta-efl][PATCHv2 04/25] xserver-xorg: drop 1.10.2 and use xserver-xf86-lite-1.11.0 from oe-core instead Martin Jansa
@ 2011-10-03 13:27 ` Martin Jansa
2011-10-03 13:27 ` [meta-oe][meta-efl][PATCHv2 06/25] mesa: drop, there should be mesa-7.11 " Martin Jansa
` (20 subsequent siblings)
25 siblings, 0 replies; 46+ messages in thread
From: Martin Jansa @ 2011-10-03 13:27 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
.../xorg-lib/libx11-1.4.3/keysymdef_include.patch | 19 -------
.../libx11-1.4.3/x11_disable_makekeys.patch | 29 -----------
meta-oe/recipes-graphics/xorg-lib/libx11.inc | 52 --------------------
meta-oe/recipes-graphics/xorg-lib/libx11_1.4.3.bb | 11 ----
4 files changed, 0 insertions(+), 111 deletions(-)
delete mode 100644 meta-oe/recipes-graphics/xorg-lib/libx11-1.4.3/keysymdef_include.patch
delete mode 100644 meta-oe/recipes-graphics/xorg-lib/libx11-1.4.3/x11_disable_makekeys.patch
delete mode 100644 meta-oe/recipes-graphics/xorg-lib/libx11.inc
delete mode 100644 meta-oe/recipes-graphics/xorg-lib/libx11_1.4.3.bb
diff --git a/meta-oe/recipes-graphics/xorg-lib/libx11-1.4.3/keysymdef_include.patch b/meta-oe/recipes-graphics/xorg-lib/libx11-1.4.3/keysymdef_include.patch
deleted file mode 100644
index 1a30e34..0000000
--- a/meta-oe/recipes-graphics/xorg-lib/libx11-1.4.3/keysymdef_include.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -uNr libX11-1.3.6.orig//configure.ac libX11-1.3.6/configure.ac
---- libX11-1.3.6.orig//configure.ac 2010-09-20 08:04:16.000000000 +0200
-+++ libX11-1.3.6/configure.ac 2010-09-28 16:29:26.000000000 +0200
-@@ -355,7 +355,14 @@
- # Find keysymdef.h
- #
- AC_MSG_CHECKING([keysym definitions])
--KEYSYMDEFDIR=`$PKG_CONFIG --variable=includedir xproto`/X11
-+AC_ARG_WITH(keysymdefdir,
-+ AC_HELP_STRING([--with-keysymdefdir=DIR], [The location of keysymdef.h]),
-+ KEYSYMDEFDIR=$withval, KEYSYMDEFDIR="")
-+
-+if test x$KEYSYMDEFDIR = x; then
-+ KEYSYMDEFDIR=`$PKG_CONFIG --variable=includedir xproto`/X11
-+fi
-+
- FILES="keysymdef.h XF86keysym.h Sunkeysym.h DECkeysym.h HPkeysym.h"
- for i in $FILES; do
- if test -f "$KEYSYMDEFDIR/$i"; then
diff --git a/meta-oe/recipes-graphics/xorg-lib/libx11-1.4.3/x11_disable_makekeys.patch b/meta-oe/recipes-graphics/xorg-lib/libx11-1.4.3/x11_disable_makekeys.patch
deleted file mode 100644
index 9763313..0000000
--- a/meta-oe/recipes-graphics/xorg-lib/libx11-1.4.3/x11_disable_makekeys.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Index: libX11-1.3.4/src/util/Makefile.am
-===================================================================
---- libX11-1.3.4.orig/src/util/Makefile.am
-+++ libX11-1.3.4/src/util/Makefile.am
-@@ -1,24 +1 @@
--
--noinst_PROGRAMS=makekeys
--
--makekeys_CFLAGS = \
-- $(X11_CFLAGS) \
-- $(CWARNFLAGS)
--
--CC = @CC_FOR_BUILD@
--CPPFLAGS = @CPPFLAGS_FOR_BUILD@
--CFLAGS = @CFLAGS_FOR_BUILD@
--LDFLAGS = @LDFLAGS_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/meta-oe/recipes-graphics/xorg-lib/libx11.inc b/meta-oe/recipes-graphics/xorg-lib/libx11.inc
deleted file mode 100644
index 9f7e990..0000000
--- a/meta-oe/recipes-graphics/xorg-lib/libx11.inc
+++ /dev/null
@@ -1,52 +0,0 @@
-require xorg-lib-common.inc
-
-DESCRIPTION = "Base X libs."
-DEPENDS += "util-macros xtrans libxdmcp libxau \
- bigreqsproto xproto xextproto xcmiscproto \
- xf86bigfontproto kbproto inputproto libxcb \
- xproto-native"
-
-FILESPATHPKG .= ":libx11-${PV}:libx11"
-BBCLASSEXTEND = "native nativesdk"
-PROVIDES = "virtual/libx11"
-PE = "1"
-
-PACKAGES =+ "${PN}-xcb"
-
-FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${libdir}/X11/Xcms.txt"
-FILES_${PN}-xcb += "${libdir}/libX11-xcb.so.*"
-FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale"
-
-XORG_PN = "libX11"
-
-EXTRA_OECONF += "--with-keysymdefdir=${STAGING_INCDIR}/X11 --with-groff=no --with-ps2pdf=no --with-fop=no --disable-specs"
-
-# Below option is added to overcome the GCC bug on ARM
-# see http://gcc.gnu.org/PR42981 for further details.
-# We could potentially take it off when its fixed in gcc 4.5
-
-CFLAGS_append_arm = " -fforward-propagate "
-
-SRC_URI += " file://keysymdef_include.patch \
- file://x11_disable_makekeys.patch \
-"
-
-do_compile_prepend() {
- (
- unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS
- cd src/util;
- mv makekeys.c.orig makekeys.c || true
- # MIN_REHASH 10 is only in 1.0.1
- sed -i -e 's:MIN_REHASH 10:MIN_REHASH 16:g' makekeys.c
- sed -i -e 's:MIN_REHASH 15:MIN_REHASH 16:g' makekeys.c
- 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
-}
-
-python () {
- if not oe.utils.contains ('DISTRO_FEATURES', 'x11', True, False, d):
- raise bb.parse.SkipPackage("X11 not enabled for this DISTRO")
-}
diff --git a/meta-oe/recipes-graphics/xorg-lib/libx11_1.4.3.bb b/meta-oe/recipes-graphics/xorg-lib/libx11_1.4.3.bb
deleted file mode 100644
index 3c6a170..0000000
--- a/meta-oe/recipes-graphics/xorg-lib/libx11_1.4.3.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-require libx11.inc
-
-LICENSE = "MIT & MIT-style & BSD"
-LIC_FILES_CHKSUM = "file://COPYING;md5=172255dee66bb0151435b2d5d709fcf7"
-
-#--without-xcb is not an option anymore
-#http://cgit.freedesktop.org/xorg/lib/libX11/commit/?id=15e5eaf62897b3179d1fbe457cb19f886f0449f8
-PR = "${INC_PR}.0"
-
-SRC_URI[md5sum] = "85e942627aaa020813e0eb8433353563"
-SRC_URI[sha256sum] = "38b5ddd93291714a46a02cb8a5dd94b995a04ed76a608551c44d1598e113635a"
--
1.7.7
^ permalink raw reply related [flat|nested] 46+ messages in thread
* [meta-oe][meta-efl][PATCHv2 06/25] mesa: drop, there should be mesa-7.11 in oe-core
2011-10-03 13:27 ` [meta-oe][meta-efl][PATCHv2 00/25] " Martin Jansa
` (4 preceding siblings ...)
2011-10-03 13:27 ` [meta-oe][meta-efl][PATCHv2 05/25] libx11: drop here, 1.4.4 should be in oe-core Martin Jansa
@ 2011-10-03 13:27 ` Martin Jansa
2011-10-03 13:27 ` [meta-oe][meta-efl][PATCHv2 07/25] talloc: drop from meta-oe, no longer needed by mesa Martin Jansa
` (19 subsequent siblings)
25 siblings, 0 replies; 46+ messages in thread
From: Martin Jansa @ 2011-10-03 13:27 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta-oe/recipes-graphics/mesa/README | 12 -
meta-oe/recipes-graphics/mesa/mesa-7.10.2.inc | 19 -
.../recipes-graphics/mesa/mesa-7.10.2/glamo.patch | 2425 --------------------
.../recipes-graphics/mesa/mesa-7.10.2/uclibc.patch | 26 -
meta-oe/recipes-graphics/mesa/mesa-common.inc | 49 -
meta-oe/recipes-graphics/mesa/mesa-dri.inc | 27 -
meta-oe/recipes-graphics/mesa/mesa-dri_7.10.2.bb | 4 -
meta-oe/recipes-graphics/mesa/mesa-xlib.inc | 5 -
meta-oe/recipes-graphics/mesa/mesa-xlib_7.10.2.bb | 4 -
meta-oe/recipes-graphics/mesa/mesa_7.10.2.bb | 6 -
10 files changed, 0 insertions(+), 2577 deletions(-)
delete mode 100644 meta-oe/recipes-graphics/mesa/README
delete mode 100644 meta-oe/recipes-graphics/mesa/mesa-7.10.2.inc
delete mode 100644 meta-oe/recipes-graphics/mesa/mesa-7.10.2/glamo.patch
delete mode 100644 meta-oe/recipes-graphics/mesa/mesa-7.10.2/uclibc.patch
delete mode 100644 meta-oe/recipes-graphics/mesa/mesa-common.inc
delete mode 100644 meta-oe/recipes-graphics/mesa/mesa-dri.inc
delete mode 100644 meta-oe/recipes-graphics/mesa/mesa-dri_7.10.2.bb
delete mode 100644 meta-oe/recipes-graphics/mesa/mesa-xlib.inc
delete mode 100644 meta-oe/recipes-graphics/mesa/mesa-xlib_7.10.2.bb
delete mode 100644 meta-oe/recipes-graphics/mesa/mesa_7.10.2.bb
diff --git a/meta-oe/recipes-graphics/mesa/README b/meta-oe/recipes-graphics/mesa/README
deleted file mode 100644
index 3c6de3e..0000000
--- a/meta-oe/recipes-graphics/mesa/README
+++ /dev/null
@@ -1,12 +0,0 @@
-mesa-common.inc
-* Settings shared by ALL recipes
-
-mesa-${PV}.inc
-* Settings for particular version, mostly checksums and additional patches
-* Patches are stored mesa-${PV} dir and -dri and xlib has adjusted FILESPATHPKG
-
-mesa-dri.inc
-* Setting shared by ALL dri recipes - defines what is mesa-dri
-
-mesa-xlib.inc
-* Setting shared by ALL xlib recipes - defines what is mesa-xlib
diff --git a/meta-oe/recipes-graphics/mesa/mesa-7.10.2.inc b/meta-oe/recipes-graphics/mesa/mesa-7.10.2.inc
deleted file mode 100644
index f49f495..0000000
--- a/meta-oe/recipes-graphics/mesa/mesa-7.10.2.inc
+++ /dev/null
@@ -1,19 +0,0 @@
-SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2;name=archive \
- file://glamo.patch \
- file://uclibc.patch \
- "
-
-DEPENDS += "talloc"
-
-SRC_URI[archive.md5sum] = "f5de82852f1243f42cc004039e10b771"
-SRC_URI[archive.sha256sum] = "8ced2678ce11cf30804694a92ea3ca6b82f158ae8995bdc626c7e85aac71c7c1"
-
-EXTRA_OECONF += " --disable-gallium"
-
-#needs more testing and updated glamo.patch before making default
-DEFAULT_PREFERENCE = "-2"
-
-do_configure_prepend() {
- #check for python not python2, because python-native does not stage python2 binary/link
- sed -i 's/AC_CHECK_PROGS(\[PYTHON2\], \[python2 python\])/AC_CHECK_PROGS(\[PYTHON2\], \[python python\])/g' ${S}/configure.ac
-}
diff --git a/meta-oe/recipes-graphics/mesa/mesa-7.10.2/glamo.patch b/meta-oe/recipes-graphics/mesa/mesa-7.10.2/glamo.patch
deleted file mode 100644
index 5aa45d5..0000000
--- a/meta-oe/recipes-graphics/mesa/mesa-7.10.2/glamo.patch
+++ /dev/null
@@ -1,2425 +0,0 @@
-git diff upstream/7.10 and gitorious/7.10
-
-http://gitorious.org/mesa/mesa/commits/7.10
-
-diff --git a/configs/autoconf.in b/configs/autoconf.in
-index e2d70c6..5874955 100644
---- a/configs/autoconf.in
-+++ b/configs/autoconf.in
-@@ -120,7 +120,7 @@ OSMESA_LIB_DEPS = -L$(TOP)/$(LIB_DIR) @OSMESA_MESA_DEPS@ \
- $(EXTRA_LIB_PATH) @OSMESA_LIB_DEPS@
- EGL_LIB_DEPS = $(EXTRA_LIB_PATH) @EGL_LIB_DEPS@
- GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) @GLU_MESA_DEPS@ \
-- $(EXTRA_LIB_PATH) @GLU_LIB_DEPS@
-+ $(EXTRA_LIB_PATH) @GLU_LIB_DEPS@ -lstdc++
- GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) @GLUT_MESA_DEPS@ \
- $(EXTRA_LIB_PATH) @GLUT_LIB_DEPS@
- GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) @GLW_MESA_DEPS@ \
-diff --git a/src/mesa/drivers/dri/glamo/Makefile b/src/mesa/drivers/dri/glamo/Makefile
-new file mode 100644
-index 0000000..e77193d
---- /dev/null
-+++ b/src/mesa/drivers/dri/glamo/Makefile
-@@ -0,0 +1,22 @@
-+# src/mesa/drivers/dri/glamo/Makefile
-+
-+TOP = ../../../../..
-+include $(TOP)/configs/current
-+
-+LIBNAME = glamo_dri.so
-+
-+DRIVER_SOURCES = \
-+ glamo_screen.c glamo_context.c glamo_state.c glamo_fbo.c glamo_tris.c \
-+ glamo_cmdq.c glamo_render.c
-+
-+C_SOURCES = \
-+ $(COMMON_SOURCES) \
-+ $(DRIVER_SOURCES)
-+
-+ASM_SOURCES =
-+
-+DRI_LIB_DEPS += -ldrm_glamo
-+
-+include ../Makefile.template
-+
-+symlinks:
-diff --git a/src/mesa/drivers/dri/glamo/glamo_cmdq.c b/src/mesa/drivers/dri/glamo/glamo_cmdq.c
-new file mode 100644
-index 0000000..1334f8e
---- /dev/null
-+++ b/src/mesa/drivers/dri/glamo/glamo_cmdq.c
-@@ -0,0 +1,110 @@
-+/*
-+ * Command queue submission via DRM
-+ *
-+ * Copyright 2009 Thomas White <taw@bitwiz.org.uk>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License as
-+ * published by the Free Software Foundation; either version 2 of
-+ * the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ * MA 02111-1307 USA
-+ */
-+
-+
-+#include <stdint.h>
-+#include <stdlib.h>
-+#include <drm.h>
-+#include <glamo_drm.h>
-+#include <glamo_bo.h>
-+
-+#include "glamo_context.h"
-+#include "glamo_cmdq.h"
-+
-+
-+/* Submit the prepared command sequence to the kernel */
-+void glamoDRMDispatch(glamoContext *gCtx)
-+{
-+ drm_glamo_cmd_burst_t burst;
-+ int r;
-+
-+ burst.base = gCtx->cmd_burst_base;
-+ burst.data = gCtx->cmdq_drm;
-+ burst.bufsz = gCtx->cmdq_drm_used * 2; /* -> bytes */
-+ burst.nobjs = gCtx->cmdq_obj_used;
-+ burst.objs = gCtx->cmdq_objs;
-+ burst.obj_pos = gCtx->cmdq_obj_pos;
-+
-+ r = drmCommandWrite(gCtx->drm_fd, DRM_GLAMO_CMDBURST,
-+ &burst, sizeof(burst));
-+ if ( r != 0 ) {
-+ fprintf(stderr, "DRM_GLAMO_CMDBURST failed\n");
-+ }
-+
-+ /* Reset counts to zero for the next sequence */
-+ gCtx->cmdq_obj_used = 0;
-+ gCtx->cmdq_drm_used = 0;
-+}
-+
-+
-+void glamoDRMAddData(glamoContext *gCtx, uint32_t val, int len)
-+{
-+ if ( gCtx->cmdq_drm_used+4 > gCtx->cmdq_drm_size ) {
-+ fprintf(stderr, "Burst command too large\n");
-+ return;
-+ }
-+
-+ /* Record command */
-+ if ( len == 2 ) {
-+ gCtx->cmdq_drm[gCtx->cmdq_drm_used++] = val & 0xffff;
-+ } else if ( len == 4 ) {
-+ gCtx->cmdq_drm[gCtx->cmdq_drm_used++] = val & 0x0000ffff;
-+ gCtx->cmdq_drm[gCtx->cmdq_drm_used++] = val & 0xffff0000;
-+ } else {
-+ fprintf(stderr, "Wrong command length!\n");
-+ }
-+}
-+
-+
-+void glamoDRMAddBO(glamoContext *gCtx, struct glamo_bo *bo)
-+{
-+ if ( gCtx->cmdq_drm_used+4 > gCtx->cmdq_drm_size ) {
-+ fprintf(stderr, "Burst command too large\n");
-+ return;
-+ }
-+
-+ /* Record object position */
-+ gCtx->cmdq_objs[gCtx->cmdq_obj_used] = bo->handle;
-+ /* -> bytes */
-+ gCtx->cmdq_obj_pos[gCtx->cmdq_obj_used] = gCtx->cmdq_drm_used * 2;
-+ gCtx->cmdq_obj_used++;
-+
-+ /* Record command */
-+ gCtx->cmdq_drm[gCtx->cmdq_drm_used++] = 0x0000;
-+ gCtx->cmdq_drm[gCtx->cmdq_drm_used++] = 0x0000;
-+}
-+
-+
-+void glamoDRMStartBurst(glamoContext *gCtx, uint16_t base)
-+{
-+ gCtx->cmd_burst_base = base;
-+}
-+
-+
-+void glamoInitCmdqCache(glamoContext *gCtx)
-+{
-+ gCtx->cmdq_objs = malloc(1024);
-+ gCtx->cmdq_obj_pos = malloc(1024);
-+ gCtx->cmdq_obj_used = 0;
-+ gCtx->cmdq_drm_used = 0;
-+ gCtx->cmdq_drm_size = 4 * 1024;
-+ gCtx->cmdq_drm = malloc(gCtx->cmdq_drm_size);
-+}
-diff --git a/src/mesa/drivers/dri/glamo/glamo_cmdq.h b/src/mesa/drivers/dri/glamo/glamo_cmdq.h
-new file mode 100644
-index 0000000..7420d7b
---- /dev/null
-+++ b/src/mesa/drivers/dri/glamo/glamo_cmdq.h
-@@ -0,0 +1,33 @@
-+/*
-+ * Command queue submission via DRM
-+ *
-+ * Copyright 2009 Thomas White <taw@bitwiz.org.uk>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License as
-+ * published by the Free Software Foundation; either version 2 of
-+ * the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ * MA 02111-1307 USA
-+ */
-+
-+
-+#include <stdint.h>
-+#include <glamo_bo.h>
-+
-+#include "glamo_context.h"
-+
-+
-+extern void glamoDRMDispatch(glamoContext *gCtx);
-+extern void glamoDRMAddBO(glamoContext *gCtx, struct glamo_bo *bo);
-+extern void glamoDRMAddData(glamoContext *gCtx, uint32_t val, int len);
-+extern void glamoDRMStartBurst(glamoContext *gCtx, uint16_t base);
-+extern void glamoInitCmdqCache(glamoContext *gCtx);
-diff --git a/src/mesa/drivers/dri/glamo/glamo_context.c b/src/mesa/drivers/dri/glamo/glamo_context.c
-new file mode 100644
-index 0000000..39eb4e7
---- /dev/null
-+++ b/src/mesa/drivers/dri/glamo/glamo_context.c
-@@ -0,0 +1,360 @@
-+/*
-+ * Direct Rendering Support for SMedia Glamo 336x/337x
-+ *
-+ * (c) 2009 Thomas White <taw@bitwiz.org.uk>
-+ * Roughly based on sis_context.c (c) 2003 Eric Anholt
-+ * and radeon_common_context.c
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining a
-+ * copy of this software and associated documentation files (the "Software"),
-+ * to deal in the Software without restriction, including without limitation
-+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
-+ * and/or sell copies of the Software, and to permit persons to whom the
-+ * Software is furnished to do so, subject to the following conditions:
-+ *
-+ * The above copyright notice and this permission notice shall be included
-+ * in all copies or substantial portions of the Software.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-+ * THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+ */
-+
-+
-+#include "dri_util.h"
-+#include "drirenderbuffer.h"
-+#include "utils.h"
-+
-+#include "swrast/swrast.h"
-+#include "swrast_setup/swrast_setup.h"
-+#include "drivers/common/driverfuncs.h"
-+#include "vbo/vbo.h"
-+#include "tnl/tnl.h"
-+#include "tnl/t_pipeline.h"
-+#include "main/state.h"
-+
-+#include "glamo_context.h"
-+#include "glamo_screen.h"
-+#include "glamo_state.h"
-+#include "glamo_fbo.h"
-+#include "glamo_tris.h"
-+#include "glamo_render.h"
-+#include "glamo_cmdq.h"
-+
-+#include <glamo_bo.h>
-+#include <glamo_bo_gem.h>
-+#include <glamo_drm.h>
-+
-+
-+#define DRIVER_DATE "20090913"
-+
-+
-+static inline struct glamo_renderbuffer *glamo_get_renderbuffer(
-+ struct gl_framebuffer *fb,
-+ int att_index)
-+{
-+ if ( att_index >= 0 ) {
-+ struct glamo_renderbuffer *gr;
-+ gr = glamo_renderbuffer(fb->Attachment[att_index].Renderbuffer);
-+ return gr;
-+ } else {
-+ return NULL;
-+ }
-+}
-+
-+
-+static const GLubyte *glamoGetString(struct gl_context *ctx, GLenum name)
-+{
-+ static char buffer[128];
-+
-+ switch (name) {
-+ case GL_VENDOR:
-+ return (GLubyte *)"Thomas White";
-+ case GL_RENDERER: {
-+ driGetRendererString(buffer, "Glamo", DRIVER_DATE, 0);
-+ return (GLubyte *) buffer;
-+ }
-+ default:
-+ return 0;
-+ }
-+}
-+
-+
-+/* Called when Mesa needs to know the size of the framebuffer */
-+static void glamoBufferSize(struct gl_framebuffer *buffer,
-+ GLuint *width, GLuint *height)
-+{
-+ GET_CURRENT_CONTEXT(ctx);
-+ glamoContextPtr glamo = GLAMO_CONTEXT(ctx);
-+
-+ *width = glamo->driDrawable->w;
-+ *height = glamo->driDrawable->h;
-+}
-+
-+
-+GLboolean glamoCreateContext(const struct gl_config *glVisual,
-+ __DRIcontext *driContextPriv,
-+ void *sharedContextPrivate)
-+{
-+ struct gl_context *ctx, *shareCtx;
-+ __DRIscreen *sPriv = driContextPriv->driScreenPriv;
-+ glamoContextPtr context;
-+ glamoScreenPtr glamoScreen;
-+ struct dd_function_table functions;
-+
-+ context = (glamoContextPtr)CALLOC(sizeof(*context));
-+ if ( context == NULL ) return GL_FALSE;
-+
-+ _mesa_init_driver_functions(&functions);
-+
-+ /* Allocate the Mesa context */
-+ if ( sharedContextPrivate )
-+ shareCtx = ((glamoContextPtr)sharedContextPrivate)->glCtx;
-+ else
-+ shareCtx = NULL;
-+ context->glCtx = _mesa_create_context(glVisual, shareCtx,
-+ &functions, (void *)context);
-+ if ( context->glCtx == NULL ) {
-+ FREE(context);
-+ return GL_FALSE;
-+ }
-+ driContextPriv->driverPrivate = context;
-+ ctx = context->glCtx;
-+
-+ glamoScreen = context->glamoScreen = (glamoScreenPtr)sPriv->private;
-+
-+ ctx->Driver.GetString = glamoGetString;
-+ ctx->Driver.GetBufferSize = glamoBufferSize;
-+
-+ context->driContext = driContextPriv;
-+ context->driScreen = sPriv;
-+ context->driDrawable = NULL;
-+ context->drm_fd = sPriv->fd;
-+
-+ /* Initialize the software rasterizer and helper modules. */
-+ _swrast_CreateContext(ctx);
-+ _vbo_CreateContext(ctx);
-+ _tnl_CreateContext(ctx);
-+ _swsetup_CreateContext(ctx);
-+
-+ /* Install our pipeline (see glamo_render.c) */
-+ _tnl_install_pipeline(ctx, glamo_pipeline);
-+
-+ _swrast_allow_pixel_fog(ctx, GL_TRUE);
-+ _swrast_allow_vertex_fog(ctx, GL_FALSE);
-+ _tnl_allow_pixel_fog(ctx, GL_TRUE);
-+ _tnl_allow_vertex_fog(ctx, GL_FALSE);
-+
-+ glamoInitCmdqCache(context);
-+ glamoInitStateFuncs(ctx);
-+ glamoInitTriFuncs(ctx);
-+
-+ return GL_TRUE;
-+}
-+
-+
-+void glamoDestroyContext(__DRIcontext *driContextPriv)
-+{
-+ glamoContextPtr context;
-+
-+ context = (glamoContextPtr)driContextPriv->driverPrivate;
-+ assert(context != NULL);
-+
-+ if ( context != NULL ) {
-+
-+ _swsetup_DestroyContext(context->glCtx);
-+ _tnl_DestroyContext(context->glCtx);
-+ _vbo_DestroyContext(context->glCtx);
-+ _swrast_DestroyContext(context->glCtx);
-+
-+ _mesa_destroy_context(context->glCtx);
-+
-+ }
-+
-+ FREE(context);
-+}
-+
-+
-+void glamo_update_renderbuffers(__DRIcontext *context,
-+ __DRIdrawable *drawable)
-+{
-+ unsigned int attachments[10];
-+ __DRIbuffer *buffers;
-+ __DRIscreen *screen;
-+ int i, count;
-+ struct glamo_framebuffer *draw;
-+ glamoContextPtr glamo;
-+ struct glamo_bo *bo;
-+
-+ draw = drawable->driverPrivate;
-+ screen = context->driScreenPriv;
-+ glamo = (glamoContextPtr)context->driverPrivate;
-+ i = 0;
-+ if ( draw->color_rb[0] ) {
-+ attachments[i++] = __DRI_BUFFER_FRONT_LEFT;
-+ }
-+ if ( draw->color_rb[1] ) {
-+ attachments[i++] = __DRI_BUFFER_BACK_LEFT;
-+ }
-+
-+ buffers = screen->dri2.loader->getBuffers(drawable,
-+ &drawable->w,
-+ &drawable->h,
-+ attachments, i,
-+ &count,
-+ drawable->loaderPrivate);
-+ if ( buffers == NULL ) return;
-+
-+ /* Set one cliprect to cover the whole drawable */
-+ drawable->x = 0;
-+ drawable->y = 0;
-+ drawable->backX = 0;
-+ drawable->backY = 0;
-+ drawable->numClipRects = 1;
-+ drawable->pClipRects[0].x1 = 0;
-+ drawable->pClipRects[0].y1 = 0;
-+ drawable->pClipRects[0].x2 = drawable->w;
-+ drawable->pClipRects[0].y2 = drawable->h;
-+ drawable->numBackClipRects = 1;
-+ drawable->pBackClipRects[0].x1 = 0;
-+ drawable->pBackClipRects[0].y1 = 0;
-+ drawable->pBackClipRects[0].x2 = drawable->w;
-+ drawable->pBackClipRects[0].y2 = drawable->h;
-+
-+ /* For each attachment */
-+ for ( i=0; i<count; i++ ) {
-+
-+ struct glamo_renderbuffer *grb;
-+
-+ switch ( buffers[i].attachment ) {
-+ case __DRI_BUFFER_FRONT_LEFT:
-+ grb = draw->color_rb[0];
-+ break;
-+ case __DRI_BUFFER_BACK_LEFT:
-+ grb = draw->color_rb[1];
-+ break;
-+ case __DRI_BUFFER_DEPTH:
-+ grb = glamo_get_renderbuffer(&draw->base, BUFFER_DEPTH);
-+ break;
-+ case __DRI_BUFFER_STENCIL:
-+ grb = glamo_get_renderbuffer(&draw->base,
-+ BUFFER_STENCIL);
-+ break;
-+ case __DRI_BUFFER_FAKE_FRONT_LEFT:
-+ grb = draw->color_rb[0];
-+ break;
-+ case __DRI_BUFFER_ACCUM:
-+ default:
-+ fprintf(stderr,
-+ "Unhandled buffer attach event,"
-+ " attachment type %d\n", buffers[i].attachment);
-+ return;
-+ }
-+
-+ if ( grb == NULL ) {
-+ /* Don't know how to handle this type of buffer */
-+ continue;
-+ }
-+
-+ if ( grb->bo ) {
-+ uint32_t name = glamo_gem_get_name(grb->bo);
-+ if ( name == buffers[i].name ) {
-+ /* Buffer already attached. No action needed */
-+ continue;
-+ }
-+ }
-+
-+ grb->cpp = buffers[i].cpp;
-+ grb->pitch = buffers[i].pitch;
-+ grb->width = drawable->w;
-+ grb->height = drawable->h;
-+
-+ bo = glamo_bo_open(glamo->glamoScreen->bom, buffers[i].name,
-+ 0, 0, GLAMO_GEM_DOMAIN_VRAM,
-+ buffers[i].flags);
-+ if ( bo == NULL ) {
-+ fprintf(stderr, "Failed to attach buffer %d\n",
-+ buffers[i].name);
-+ }
-+
-+ glamo_renderbuffer_set_bo(grb, bo);
-+ glamo_bo_unref(bo);
-+
-+ }
-+
-+ driUpdateFramebufferSize(glamo->glCtx, drawable);
-+}
-+
-+
-+GLboolean glamoMakeCurrent(__DRIcontext *driContextPriv,
-+ __DRIdrawable *driDrawPriv,
-+ __DRIdrawable *driReadPriv)
-+{
-+ struct glamo_framebuffer *draw_fb;
-+ struct gl_framebuffer *read_fb;
-+ glamoContextPtr glamo;
-+
-+ if ( driContextPriv == NULL ) {
-+ _mesa_make_current(NULL, NULL, NULL);
-+ return GL_TRUE;
-+ }
-+
-+ /* The Glamo context we're switching to */
-+ glamo = (glamoContextPtr)driContextPriv->driverPrivate;
-+
-+ glamo->driDrawable = driDrawPriv;
-+
-+ /* These two will probably be the same */
-+ draw_fb = (struct glamo_framebuffer *)driDrawPriv->driverPrivate;
-+ read_fb = (struct gl_framebuffer *)driReadPriv->driverPrivate;
-+
-+ glamo_update_renderbuffers(driContextPriv, driDrawPriv);
-+ if (driDrawPriv != driReadPriv)
-+ glamo_update_renderbuffers(driContextPriv, driReadPriv);
-+
-+ _mesa_make_current(glamo->glCtx, &draw_fb->base, read_fb);
-+ _mesa_update_state(glamo->glCtx);
-+
-+ return GL_TRUE;
-+}
-+
-+
-+GLboolean glamoUnbindContext(__DRIcontext *driContextPriv)
-+{
-+ return GL_TRUE;
-+}
-+
-+
-+/* Convert IEEE754 32-bit float to Glamo's signed 24-bit float */
-+uint32_t float7s16(GLfloat in)
-+{
-+ uint32_t a, b;
-+ uint32_t sign, expo, mant; /* Sign, exponent, significand */
-+
-+ a = *(uint32_t *)∈
-+
-+ /* This is bad */
-+ if ( a & 0x40000000 ) {
-+ printf(stderr, "Warning: Exponent won't fit into 7 bits\n");
-+ }
-+
-+ /* This hopefully isn't a big problem */
-+ if ( a & 0x0000007f ) {
-+ printf(stderr, "Warning: Precision lost in FP conversion\n");
-+ }
-+
-+ /* Separate out the right bits */
-+ mant = a & 0x007fff80; /* Bits 7-22 (bits 0-6 are lost) */
-+ expo = a & 0x3f800000; /* Bits 23-29 (bit 30 is lost) */
-+ sign = a & 0x80000000; /* Bit 31 */
-+
-+ /* Shift and recombine */
-+ b = sign >> 8; /* Fills bit 23 */
-+ b |= expo >> 7; /* Fills bits 16-22 */
-+ b |= mant >> 7; /* Fills bits 0-15 */
-+
-+ return b;
-+}
-diff --git a/src/mesa/drivers/dri/glamo/glamo_context.h b/src/mesa/drivers/dri/glamo/glamo_context.h
-new file mode 100644
-index 0000000..8de3946
---- /dev/null
-+++ b/src/mesa/drivers/dri/glamo/glamo_context.h
-@@ -0,0 +1,106 @@
-+/*
-+ * Direct Rendering Support for SMedia Glamo 336x/337x
-+ *
-+ * (c) 2009 Thomas White <taw@bitwiz.org.uk>
-+ * Roughly based on sis_context.h (c) 2003 Eric Anholt
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining a
-+ * copy of this software and associated documentation files (the "Software"),
-+ * to deal in the Software without restriction, including without limitation
-+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
-+ * and/or sell copies of the Software, and to permit persons to whom the
-+ * Software is furnished to do so, subject to the following conditions:
-+ *
-+ * The above copyright notice and this permission notice shall be included
-+ * in all copies or substantial portions of the Software.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-+ * THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+ */
-+
-+#ifndef __GLAMO_CONTEXT_H
-+#define __GLAMO_CONTEXT_H
-+
-+
-+#include "dri_util.h"
-+#include "utils.h"
-+#include "tnl/t_vertex.h"
-+
-+#include "glamo_screen.h"
-+
-+
-+typedef struct glamo_context glamoContext;
-+typedef struct glamo_context *glamoContextPtr;
-+
-+struct glamo_context {
-+
-+ struct gl_context *glCtx; /* Must be first in this structure */
-+
-+ int drm_fd; /* DRM fd */
-+
-+ __DRIcontext *driContext; /* DRI context */
-+ __DRIscreen *driScreen; /* DRI screen */
-+ __DRIdrawable *driDrawable; /* DRI drawable bound to this ctx */
-+
-+ glamoScreenPtr glamoScreen; /* Screen private DRI data */
-+
-+ driOptionCache optionCache;
-+
-+ uint16_t *cmdq_drm; /* Command queue cache */
-+ uint16_t cmd_burst_base;
-+ int cmdq_drm_used;
-+ int cmdq_drm_size;
-+ int cmdq_obj_used;
-+ uint32_t *cmdq_objs;
-+ unsigned int *cmdq_obj_pos;
-+
-+ /* Information about the current primitive */
-+ struct {
-+ GLuint id;
-+ uint32_t primitive; /* Current hardware primitive type */
-+ struct glamo_bo *vb_bo;
-+ uint8_t *vb;
-+ unsigned int start_offset; /* Byte offset of start */
-+ unsigned int current_offset; /* Byte offset of next vertex */
-+ unsigned int count; /* Number of vertices */
-+ } prim;
-+
-+ /* Current vertex format and attributes */
-+ int vertex_size;
-+ struct tnl_attr_map vertex_attrs[VERT_ATTRIB_MAX];
-+
-+ /* State */
-+ GLuint new_state; /* State which must be updated */
-+ uint16_t col_clear;
-+
-+};
-+
-+#define GLAMO_CONTEXT(ctx) ((glamoContextPtr)(ctx->DriverCtx))
-+
-+#define TAG(x) glamo##x
-+#include "tnl_dd/t_dd_vertex.h"
-+#undef TAG
-+
-+extern GLboolean glamoCreateContext(const struct gl_config *glVis,
-+ __DRIcontext *driContextPriv,
-+ void *sharedContextPrivate);
-+extern void glamoDestroyContext(__DRIcontext *dcp);
-+extern GLboolean glamoMakeCurrent(__DRIcontext *driContextPriv,
-+ __DRIdrawable *driDrawPriv,
-+ __DRIdrawable *driReadPriv);
-+extern GLboolean glamoUnbindContext(__DRIcontext *driContextPriv);
-+extern void glamo_update_renderbuffers(__DRIcontext *context,
-+ __DRIdrawable *drawable);
-+
-+#define GLAMO_PACKCOLOR565(r, g, b) \
-+ ((((r) & 0xf8) << 8) \
-+ | (((g) & 0xfc) << 3) \
-+ | (((b) & 0xf8) >> 3))
-+
-+extern uint32_t float7s16(GLfloat in);
-+
-+#endif /* __GLAMO_CONTEXT_H */
-diff --git a/src/mesa/drivers/dri/glamo/glamo_fbo.c b/src/mesa/drivers/dri/glamo/glamo_fbo.c
-new file mode 100644
-index 0000000..e25ca31
---- /dev/null
-+++ b/src/mesa/drivers/dri/glamo/glamo_fbo.c
-@@ -0,0 +1,130 @@
-+/*
-+ * Direct Rendering Support for SMedia Glamo 336x/337x
-+ *
-+ * (c) 2009 Thomas White <taw@bitwiz.org.uk>
-+ * Roughly based on radeon_fbo.c (c) 2008 Red Hat Inc
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining a
-+ * copy of this software and associated documentation files (the "Software"),
-+ * to deal in the Software without restriction, including without limitation
-+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
-+ * and/or sell copies of the Software, and to permit persons to whom the
-+ * Software is furnished to do so, subject to the following conditions:
-+ *
-+ * The above copyright notice and this permission notice shall be included
-+ * in all copies or substantial portions of the Software.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-+ * THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+ */
-+
-+
-+#include "main/imports.h"
-+#include "main/macros.h"
-+#include "main/mtypes.h"
-+#include "main/formats.h"
-+#include "main/fbobject.h"
-+#include "main/framebuffer.h"
-+#include "main/renderbuffer.h"
-+#include "main/context.h"
-+#include "dri_util.h"
-+
-+/* This comes from libdrm_glamo */
-+#include <glamo_bo.h>
-+
-+#include "glamo_fbo.h"
-+
-+
-+static void glamo_delete_renderbuffer(struct gl_renderbuffer *rb)
-+{
-+ struct glamo_renderbuffer *grb = glamo_renderbuffer(rb);
-+
-+ ASSERT(grb);
-+
-+ if ( grb && grb->bo ) {
-+ glamo_bo_unref(grb->bo);
-+ }
-+ free(grb);
-+}
-+
-+
-+static void *glamo_get_pointer(struct gl_context *ctx, struct gl_renderbuffer *rb,
-+ GLint x, GLint y)
-+{
-+ return NULL; /* Can't be directly addressed */
-+}
-+
-+
-+/* Called for each hardware renderbuffer when a _window_ is resized.
-+ * Just update fields.
-+ * Not used for user-created renderbuffers!
-+ */
-+static GLboolean glamo_alloc_window_storage(struct gl_context *ctx,
-+ struct gl_renderbuffer *rb,
-+ GLenum internalFormat,
-+ GLuint width, GLuint height)
-+{
-+ ASSERT(rb->Name == 0);
-+ rb->Width = width;
-+ rb->Height = height;
-+ rb->Format = internalFormat;
-+ return GL_TRUE;
-+}
-+
-+
-+/* Create a buffer, such as a colour or depth buffer */
-+struct glamo_renderbuffer *glamo_create_renderbuffer(GLenum format,
-+ __DRIdrawable *driDrawPriv)
-+{
-+ struct glamo_renderbuffer *grb;
-+
-+ grb = CALLOC_STRUCT(glamo_renderbuffer);
-+ if ( !grb ) return NULL;
-+
-+ _mesa_init_renderbuffer(&grb->base, 0);
-+ grb->base.ClassID = GLAMO_RB_CLASS;
-+
-+ switch (format) {
-+ case GL_RGB5:
-+ grb->base.Format = MESA_FORMAT_RGB565;
-+ grb->base._BaseFormat = GL_RGB;
-+
-+ grb->base.DataType = GL_UNSIGNED_BYTE;
-+ break;
-+ case GL_DEPTH_COMPONENT16:
-+ grb->base.DataType = GL_UNSIGNED_SHORT;
-+ grb->base._BaseFormat = GL_DEPTH_COMPONENT;
-+ break;
-+ default:
-+ fprintf(stderr, "%s: Unknown format 0x%04x\n", __FUNCTION__, format);
-+ _mesa_delete_renderbuffer(&grb->base);
-+ return NULL;
-+ }
-+
-+ grb->dPriv = driDrawPriv;
-+ grb->base.InternalFormat = format;
-+
-+ grb->base.Delete = glamo_delete_renderbuffer;
-+ grb->base.AllocStorage = glamo_alloc_window_storage;
-+ grb->base.GetPointer = glamo_get_pointer;
-+
-+ return grb;
-+}
-+
-+
-+void glamo_renderbuffer_set_bo(struct glamo_renderbuffer *grb,
-+ struct glamo_bo *bo)
-+{
-+ struct glamo_bo *old;
-+ old = grb->bo;
-+ grb->bo = bo;
-+ glamo_bo_ref(bo);
-+ if ( old ) glamo_bo_unref(old);
-+}
-+
-+
-+/* kate: space-indent on; indent-width 3; mixedindent off; indent-mode cstyle; */
-diff --git a/src/mesa/drivers/dri/glamo/glamo_fbo.h b/src/mesa/drivers/dri/glamo/glamo_fbo.h
-new file mode 100644
-index 0000000..48210dd
---- /dev/null
-+++ b/src/mesa/drivers/dri/glamo/glamo_fbo.h
-@@ -0,0 +1,77 @@
-+/*
-+ * Direct Rendering Support for SMedia Glamo 336x/337x
-+ *
-+ * (c) 2009 Thomas White <taw@bitwiz.org.uk>
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining a
-+ * copy of this software and associated documentation files (the "Software"),
-+ * to deal in the Software without restriction, including without limitation
-+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
-+ * and/or sell copies of the Software, and to permit persons to whom the
-+ * Software is furnished to do so, subject to the following conditions:
-+ *
-+ * The above copyright notice and this permission notice shall be included
-+ * in all copies or substantial portions of the Software.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-+ * THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+ */
-+
-+#ifndef __GLAMO_FBO_H
-+#define __GLAMO_FBO_H
-+
-+
-+#include "main/mtypes.h"
-+#include "dri_util.h"
-+
-+
-+/* This is just a marker so we can tell a Glamo renderbuffer from a Mesa one */
-+#define GLAMO_RB_CLASS (0xdeadbeef)
-+
-+
-+struct glamo_renderbuffer
-+{
-+ struct gl_renderbuffer base; /* Must be first */
-+ struct glamo_bo *bo;
-+ unsigned int cpp;
-+ unsigned int pitch;
-+ unsigned int width;
-+ unsigned int height;
-+
-+ __DRIdrawable *dPriv;
-+};
-+
-+
-+struct glamo_framebuffer
-+{
-+ struct gl_framebuffer base;
-+ struct glamo_renderbuffer *color_rb[2];
-+};
-+
-+
-+/* This is just a small wrapper function to return NULL if the gl_renderbuffer
-+ * is not a glamo_renderbuffer */
-+static inline struct glamo_renderbuffer
-+ *glamo_renderbuffer(struct gl_renderbuffer *rb)
-+{
-+ struct glamo_renderbuffer *grb = (struct glamo_renderbuffer *)rb;
-+ if ( grb && grb->base.ClassID == GLAMO_RB_CLASS )
-+ return grb;
-+ else
-+ return NULL;
-+}
-+
-+
-+extern struct glamo_renderbuffer *glamo_create_renderbuffer(GLenum format,
-+ __DRIdrawable *driDrawPriv);
-+
-+extern void glamo_renderbuffer_set_bo(struct glamo_renderbuffer *grb,
-+ struct glamo_bo *bo);
-+
-+#endif /* __GLAMO_FBO_H */
-+
-+/* kate: space-indent on; indent-width 3; mixedindent off; indent-mode cstyle; */
-diff --git a/src/mesa/drivers/dri/glamo/glamo_regs.h b/src/mesa/drivers/dri/glamo/glamo_regs.h
-new file mode 100644
-index 0000000..02b2294
---- /dev/null
-+++ b/src/mesa/drivers/dri/glamo/glamo_regs.h
-@@ -0,0 +1,174 @@
-+#ifndef _GLAMO_REGS_H
-+#define _GLAMO_REGS_H
-+
-+/* Smedia Glamo 336x/337x driver
-+ *
-+ * (C) 2007 by OpenMoko, Inc.
-+ * Author: Harald Welte <laforge@openmoko.org>
-+ * All rights reserved.
-+ *
-+ * Modified for Glamo Mesa driver by Thomas White <taw@bitwiz.org.uk>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License as
-+ * published by the Free Software Foundation; either version 2 of
-+ * the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ * MA 02111-1307 USA
-+ */
-+
-+enum glamo_regster_offsets {
-+ GLAMO_REGOFS_GENERIC = 0x0000,
-+ GLAMO_REGOFS_HOSTBUS = 0x0200,
-+ GLAMO_REGOFS_MEMORY = 0x0300,
-+ GLAMO_REGOFS_VIDCAP = 0x0400,
-+ GLAMO_REGOFS_ISP = 0x0500,
-+ GLAMO_REGOFS_JPEG = 0x0800,
-+ GLAMO_REGOFS_MPEG = 0x0c00,
-+ GLAMO_REGOFS_LCD = 0x1100,
-+ GLAMO_REGOFS_MMC = 0x1400,
-+ GLAMO_REGOFS_MPROC0 = 0x1500,
-+ GLAMO_REGOFS_MPROC1 = 0x1580,
-+ GLAMO_REGOFS_CMDQUEUE = 0x1600,
-+ GLAMO_REGOFS_RISC = 0x1680,
-+ GLAMO_REGOFS_2D = 0x1700,
-+ GLAMO_REGOFS_3D = 0x1b00,
-+};
-+
-+
-+#define REG_MPEG(x) (GLAMO_REGOFS_MPEG+(x))
-+
-+enum glamo_register_mpeg {
-+ //
-+ GLAMO_REG_MPEG_DC_ADDRL = REG_MPEG(0x3c),
-+ GLAMO_REG_MPEG_DC_ADDRH = REG_MPEG(0x3e),
-+ GLAMO_REG_MPEG_AC_ADDRL = REG_MPEG(0x40),
-+ GLAMO_REG_MPEG_AC_ADDRH = REG_MPEG(0x42),
-+ //
-+ GLAMO_REG_MPEG_SAFE_1 = REG_MPEG(0x60),
-+ GLAMO_REG_MPEG_SAFE_2 = REG_MPEG(0x62),
-+ GLAMO_REG_MPEG_SAFE_3 = REG_MPEG(0x64),
-+ //
-+ GLAMO_REG_MPEG_DEC_OUT0_Y_ADDRL = REG_MPEG(0x6e),
-+ GLAMO_REG_MPEG_DEC_OUT0_Y_ADDRH = REG_MPEG(0x70),
-+ GLAMO_REG_MPEG_DEC_OUT0_U_ADDRL = REG_MPEG(0x72),
-+ GLAMO_REG_MPEG_DEC_OUT0_U_ADDRH = REG_MPEG(0x74),
-+ GLAMO_REG_MPEG_DEC_OUT0_V_ADDRL = REG_MPEG(0x76),
-+ GLAMO_REG_MPEG_DEC_OUT0_V_ADDRH = REG_MPEG(0x78),
-+ GLAMO_REG_MPEG_DEC_OUT1_Y_ADDRL = REG_MPEG(0x7a),
-+ GLAMO_REG_MPEG_DEC_OUT1_Y_ADDRH = REG_MPEG(0x7c),
-+ GLAMO_REG_MPEG_DEC_OUT1_U_ADDRL = REG_MPEG(0x7e),
-+ GLAMO_REG_MPEG_DEC_OUT1_U_ADDRH = REG_MPEG(0x80),
-+ GLAMO_REG_MPEG_DEC_OUT1_V_ADDRL = REG_MPEG(0x82),
-+ GLAMO_REG_MPEG_DEC_OUT1_V_ADDRH = REG_MPEG(0x84),
-+ GLAMO_REG_MPEG_DEC_OUT2_Y_ADDRL = REG_MPEG(0x86),
-+ GLAMO_REG_MPEG_DEC_OUT2_Y_ADDRH = REG_MPEG(0x88),
-+ GLAMO_REG_MPEG_DEC_OUT2_U_ADDRL = REG_MPEG(0x8a),
-+ GLAMO_REG_MPEG_DEC_OUT2_U_ADDRH = REG_MPEG(0x8c),
-+ GLAMO_REG_MPEG_DEC_OUT2_V_ADDRL = REG_MPEG(0x8e),
-+ GLAMO_REG_MPEG_DEC_OUT2_V_ADDRH = REG_MPEG(0x90),
-+ GLAMO_REG_MPEG_DEC_WIDTH = REG_MPEG(0x92),
-+ GLAMO_REG_MPEG_DEC_HEIGHT = REG_MPEG(0x94),
-+ GLAMO_REG_MPEG_SPECIAL = REG_MPEG(0x96),
-+ GLAMO_REG_MPEG_DEC_IN_ADDRL = REG_MPEG(0x98),
-+ GLAMO_REG_MPEG_DEC_IN_ADDRH = REG_MPEG(0x9a),
-+ //
-+ GLAMO_REG_MPEG_DEBLK_THRESHOLD = REG_MPEG(0xc0),
-+ //
-+ GLAMO_REG_MPEG_DEC_STATUS = REG_MPEG(0xc8),
-+ GLAMO_REG_MPEG_DEC_RB0 = REG_MPEG(0xca),
-+ GLAMO_REG_MPEG_DEC_RB1 = REG_MPEG(0xcc),
-+};
-+
-+
-+#define REG_2D(x) (GLAMO_REGOFS_2D+(x))
-+
-+enum glamo_register_2d {
-+ GLAMO_REG_2D_SRC_ADDRL = REG_2D(0x00),
-+ GLAMO_REG_2D_SRC_ADDRH = REG_2D(0x02),
-+ GLAMO_REG_2D_SRC_PITCH = REG_2D(0x04),
-+ GLAMO_REG_2D_SRC_X = REG_2D(0x06),
-+ GLAMO_REG_2D_SRC_Y = REG_2D(0x08),
-+ GLAMO_REG_2D_DST_X = REG_2D(0x0a),
-+ GLAMO_REG_2D_DST_Y = REG_2D(0x0c),
-+ GLAMO_REG_2D_DST_ADDRL = REG_2D(0x0e),
-+ GLAMO_REG_2D_DST_ADDRH = REG_2D(0x10),
-+ GLAMO_REG_2D_DST_PITCH = REG_2D(0x12),
-+ GLAMO_REG_2D_DST_HEIGHT = REG_2D(0x14),
-+ GLAMO_REG_2D_RECT_WIDTH = REG_2D(0x16),
-+ GLAMO_REG_2D_RECT_HEIGHT = REG_2D(0x18),
-+ GLAMO_REG_2D_PAT_ADDRL = REG_2D(0x1a),
-+ GLAMO_REG_2D_PAT_ADDRH = REG_2D(0x1c),
-+ GLAMO_REG_2D_PAT_FG = REG_2D(0x1e),
-+ GLAMO_REG_2D_PAT_BG = REG_2D(0x20),
-+ GLAMO_REG_2D_SRC_FG = REG_2D(0x22),
-+ GLAMO_REG_2D_SRC_BG = REG_2D(0x24),
-+ GLAMO_REG_2D_MASK1 = REG_2D(0x26),
-+ GLAMO_REG_2D_MASK2 = REG_2D(0x28),
-+ GLAMO_REG_2D_MASK3 = REG_2D(0x2a),
-+ GLAMO_REG_2D_MASK4 = REG_2D(0x2c),
-+ GLAMO_REG_2D_ROT_X = REG_2D(0x2e),
-+ GLAMO_REG_2D_ROT_Y = REG_2D(0x30),
-+ GLAMO_REG_2D_LEFT_CLIP = REG_2D(0x32),
-+ GLAMO_REG_2D_TOP_CLIP = REG_2D(0x34),
-+ GLAMO_REG_2D_RIGHT_CLIP = REG_2D(0x36),
-+ GLAMO_REG_2D_BOTTOM_CLIP = REG_2D(0x38),
-+ GLAMO_REG_2D_COMMAND1 = REG_2D(0x3A),
-+ GLAMO_REG_2D_COMMAND2 = REG_2D(0x3C),
-+ GLAMO_REG_2D_COMMAND3 = REG_2D(0x3E),
-+ GLAMO_REG_2D_SAFE = REG_2D(0x40),
-+ GLAMO_REG_2D_STATUS = REG_2D(0x42),
-+ GLAMO_REG_2D_ID1 = REG_2D(0x44),
-+ GLAMO_REG_2D_ID2 = REG_2D(0x46),
-+ GLAMO_REG_2D_ID3 = REG_2D(0x48),
-+};
-+
-+
-+/* No offset this time */
-+#define REG_3D(x) (x)
-+
-+enum glamo_register_3d
-+{
-+ /* Fire the engine */
-+ G3D_FIRE = REG_3D(0x2058),
-+
-+ /* Streams of vertex/colour/normal/texcoord data */
-+ G3D_ACTIVE_STREAMS = REG_3D(0x1f00),
-+ G3D_LAST_STREAM__VCOLFMT = REG_3D(0x2030),
-+ G3D_STREAM_MODE_0 = REG_3D(0x1f10),
-+ G3D_STREAM_BASE_0 = REG_3D(0x1f14),
-+ G3D_STREAM_MODE_1 = REG_3D(0x1f18),
-+ G3D_STREAM_BASE_1 = REG_3D(0x1f1c),
-+ G3D_STREAM_MODE_2 = REG_3D(0x1f20),
-+ G3D_STREAM_BASE_2 = REG_3D(0x1f24),
-+ G3D_STREAM_MODE_3 = REG_3D(0x1f28),
-+ G3D_STREAM_BASE_3 = REG_3D(0x1f2c),
-+ G3D_STREAM_MODE_4 = REG_3D(0x1f30),
-+ G3D_STREAM_BASE_4 = REG_3D(0x1f34),
-+ G3D_STREAM_MODE_5 = REG_3D(0x1f38),
-+ G3D_STREAM_BASE_5 = REG_3D(0x1f3c),
-+ G3D_STREAM_MODE_6 = REG_3D(0x1f40),
-+ G3D_STREAM_BASE_6 = REG_3D(0x1f44),
-+ G3D_STREAM_MODE_7 = REG_3D(0x1f48),
-+ G3D_STREAM_BASE_7 = REG_3D(0x1f4c),
-+
-+ /* Modelview*projection matrix */
-+ G3D_MATRIX_MVP = REG_3D(0x26a0), /* .. 0x27df */
-+
-+ /* Modelview matrix */
-+ G3D_MATRIX_MV = REG_3D(0x26e0), /* .. 0x270f */
-+
-+ /* Inverse MVP, 3x3 only */
-+ G3D_MATRIX_IMVP = REG_3D(0x2710), /* .. 0x2733 */
-+
-+};
-+
-+#endif /* _GLAMO_REGS_H */
-diff --git a/src/mesa/drivers/dri/glamo/glamo_render.c b/src/mesa/drivers/dri/glamo/glamo_render.c
-new file mode 100644
-index 0000000..d8b21d5
---- /dev/null
-+++ b/src/mesa/drivers/dri/glamo/glamo_render.c
-@@ -0,0 +1,230 @@
-+/*
-+ * Direct Rendering Support for SMedia Glamo 336x/337x
-+ *
-+ * (c) 2009 Thomas White <taw@bitwiz.org.uk>
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining a
-+ * copy of this software and associated documentation files (the "Software"),
-+ * to deal in the Software without restriction, including without limitation
-+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
-+ * and/or sell copies of the Software, and to permit persons to whom the
-+ * Software is furnished to do so, subject to the following conditions:
-+ *
-+ * The above copyright notice and this permission notice shall be included
-+ * in all copies or substantial portions of the Software.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-+ * THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+ *
-+ *
-+ * Based on intel_render.c, to which the following notice applies:
-+ *
-+ * Copyright 2003 Tungsten Graphics, Inc., Cedar Park, Texas.
-+ * All Rights Reserved.
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining a
-+ * copy of this software and associated documentation files (the
-+ * "Software"), to deal in the Software without restriction, including
-+ * without limitation the rights to use, copy, modify, merge, publish,
-+ * distribute, sub license, and/or sell copies of the Software, and to
-+ * permit persons to whom the Software is furnished to do so, subject to
-+ * the following conditions:
-+ *
-+ * The above copyright notice and this permission notice (including the
-+ * next paragraph) shall be included in all copies or substantial portions
-+ * of the Software.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
-+ * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
-+ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+ *
-+ */
-+
-+
-+/*
-+ * Render unclipped vertex buffers by emitting vertices directly to
-+ * dma buffers. Use strip/fan hardware acceleration where possible.
-+ *
-+ */
-+#include "main/glheader.h"
-+#include "main/context.h"
-+#include "main/macros.h"
-+#include "main/imports.h"
-+#include "main/mtypes.h"
-+#include "main/enums.h"
-+
-+#include "tnl/t_context.h"
-+#include "tnl/t_vertex.h"
-+#include "tnl/t_pipeline.h"
-+#include "math/m_xform.h"
-+
-+#include "glamo_context.h"
-+#include "glamo_tris.h"
-+#include "glamo_regs.h"
-+
-+/*
-+ * Render unclipped vertex buffers by emitting vertices directly to
-+ * VRAM buffers. Use strip/fan hardware primitives where possible.
-+ * Try to simulate missing primitives with indexed vertices.
-+ */
-+#define HAVE_POINTS 1
-+#define HAVE_LINES 1
-+#define HAVE_LINE_STRIPS 0
-+#define HAVE_TRIANGLES 1
-+#define HAVE_TRI_STRIPS 0
-+#define HAVE_TRI_STRIP_1 0
-+#define HAVE_TRI_FANS 0
-+#define HAVE_POLYGONS 0
-+#define HAVE_QUADS 0
-+#define HAVE_QUAD_STRIPS 0
-+#define HAVE_ELTS 0
-+
-+
-+static void glamoFlushPrim(struct glamo_context *gCtx)
-+{
-+ printf("glamoFlushPrim: %i vertices, %i %i\n", gCtx->prim.count,
-+ gCtx->prim.start_offset, gCtx->prim.current_offset);
-+
-+ if ( gCtx->prim.vb_bo == NULL ) return;
-+
-+ /* Upload to hardware */
-+ glamo_bo_subdata(gCtx->prim.vb_bo, 0, gCtx->prim.current_offset,
-+ gCtx->prim.vb);
-+
-+ /* Dispatch to the hardware */
-+ glamoDRMStartBurst(gCtx, G3D_STREAM_MODE_0);
-+ glamoDRMAddData(gCtx, 0x000f0300, 4);
-+ glamoDRMAddBO(gCtx, gCtx->prim.vb_bo);
-+ glamoDRMDispatch(gCtx);
-+
-+ /* Please use a new BO for the next buffer */
-+ gCtx->prim.vb_bo = NULL;
-+
-+ /* Continue from new start */
-+ gCtx->prim.start_offset = gCtx->prim.current_offset;
-+}
-+
-+
-+static inline GLuint glamoGetVBMax(struct glamo_context *gCtx)
-+{
-+ return GLAMO_VB_SIZE / gCtx->vertex_size;
-+}
-+
-+
-+static inline GLuint glamoGetCurrentMax(struct glamo_context *gCtx)
-+{
-+ /* How many more vertices can be accommodated?
-+ * Each vertex takes up 4x 32-bit fixed point values */
-+ return (GLAMO_VB_SIZE - gCtx->prim.current_offset) / gCtx->vertex_size;
-+}
-+
-+
-+#define LOCAL_VARS \
-+ struct glamo_context *gCtx = GLAMO_CONTEXT(ctx);
-+
-+#define INIT(prim)
-+
-+#define FLUSH() glamoFlushPrim(gCtx)
-+
-+#define GET_SUBSEQUENT_VB_MAX_VERTS() glamoGetVBMax(gCtx)
-+#define GET_CURRENT_VB_MAX_VERTS() glamoGetCurrentMax(gCtx)
-+
-+#define ALLOC_VERTS(nr) glamoGetPrimSpace(gCtx, nr)
-+
-+#define EMIT_VERTS(ctx, j, nr, buf) \
-+ _tnl_emit_vertices_to_buffer(ctx, j, (j)+(nr), buf)
-+
-+#define TAG(x) glamo_##x
-+#include "tnl_dd/t_dd_dmatmp.h"
-+
-+
-+/**********************************************************************/
-+/* Render pipeline stage */
-+/**********************************************************************/
-+
-+static void glamoFireEngine(struct glamo_context *gCtx)
-+{
-+ glamoDRMStartBurst(gCtx, G3D_FIRE);
-+ glamoDRMAddData(gCtx, 0, 2); /* Fire! */
-+ glamoDRMDispatch(gCtx);
-+}
-+
-+
-+static GLboolean glamoRunRender(struct gl_context *ctx,
-+ struct tnl_pipeline_stage *stage)
-+{
-+ TNLcontext *tnl = TNL_CONTEXT(ctx);
-+ struct glamo_context *gCtx = GLAMO_CONTEXT(ctx);
-+ struct vertex_buffer *VB = &tnl->vb;
-+ GLuint i;
-+
-+ printf("glamoRunRender\n");
-+
-+ /* Don't handle clipping */
-+ if ( !glamo_validate_render(ctx, VB) ) {
-+ return GL_TRUE; /* Failed */
-+ }
-+
-+ /* Validate GPU state */
-+ if ( gCtx->new_state ) {
-+ if ( !glamoValidateState(ctx, gCtx->new_state) ) {
-+ printf("Couldn't validate state...\n");
-+ }
-+ } /* else nothing to update */
-+
-+ tnl->clipspace.new_inputs |= VERT_BIT_POS;
-+
-+ tnl->Driver.Render.Start(ctx);
-+
-+ for ( i=0; i<VB->PrimitiveCount; i++ ) {
-+
-+ GLuint prim = _tnl_translate_prim(&VB->Primitive[i]);
-+ GLuint start = VB->Primitive[i].start;
-+ GLuint length = VB->Primitive[i].count;
-+
-+ if (!length) continue;
-+
-+ glamo_render_tab_verts[prim & PRIM_MODE_MASK](ctx, start,
-+ start + length, prim);
-+
-+ }
-+
-+ tnl->Driver.Render.Finish(ctx);
-+
-+ glamoFireEngine(gCtx);
-+
-+ return GL_FALSE; /* Ok */
-+}
-+
-+
-+static const struct tnl_pipeline_stage _glamo_render_stage = {
-+ "glamo render",
-+ NULL,
-+ NULL,
-+ NULL,
-+ NULL,
-+ glamoRunRender
-+};
-+
-+
-+const struct tnl_pipeline_stage *glamo_pipeline[] = {
-+ &_tnl_vertex_transform_stage,
-+ &_tnl_normal_transform_stage,
-+ &_tnl_lighting_stage,
-+ &_tnl_fog_coordinate_stage,
-+ &_tnl_texgen_stage,
-+ &_tnl_texture_transform_stage,
-+ &_tnl_point_attenuation_stage,
-+ &_tnl_vertex_program_stage,
-+ &_glamo_render_stage, /* ADD: unclipped rastersetup-to-dma */
-+ &_tnl_render_stage,
-+ 0,
-+};
-diff --git a/src/mesa/drivers/dri/glamo/glamo_render.h b/src/mesa/drivers/dri/glamo/glamo_render.h
-new file mode 100644
-index 0000000..99c36a8
---- /dev/null
-+++ b/src/mesa/drivers/dri/glamo/glamo_render.h
-@@ -0,0 +1,31 @@
-+/*
-+ * Direct Rendering Support for SMedia Glamo 336x/337x
-+ *
-+ * (c) 2009 Thomas White <taw@bitwiz.org.uk>
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining a
-+ * copy of this software and associated documentation files (the "Software"),
-+ * to deal in the Software without restriction, including without limitation
-+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
-+ * and/or sell copies of the Software, and to permit persons to whom the
-+ * Software is furnished to do so, subject to the following conditions:
-+ *
-+ * The above copyright notice and this permission notice shall be included
-+ * in all copies or substantial portions of the Software.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-+ * THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+ */
-+
-+#ifndef __GLAMO_RENDER_H
-+#define __GLAMO_RENDER_H
-+
-+#include "main/mtypes.h"
-+
-+extern const struct tnl_pipeline_stage *glamo_pipeline[];
-+
-+#endif /* __GLAMO_RENDER_H */
-diff --git a/src/mesa/drivers/dri/glamo/glamo_screen.c b/src/mesa/drivers/dri/glamo/glamo_screen.c
-new file mode 100644
-index 0000000..cc8a730
---- /dev/null
-+++ b/src/mesa/drivers/dri/glamo/glamo_screen.c
-@@ -0,0 +1,250 @@
-+/*
-+ * Direct Rendering Support for SMedia Glamo 336x/337x
-+ *
-+ * (c) 2009 Thomas White <taw@bitwiz.org.uk>
-+ * Roughly based on sis_screen.c (c) 2003 Eric Anholt
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining a
-+ * copy of this software and associated documentation files (the "Software"),
-+ * to deal in the Software without restriction, including without limitation
-+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
-+ * and/or sell copies of the Software, and to permit persons to whom the
-+ * Software is furnished to do so, subject to the following conditions:
-+ *
-+ * The above copyright notice and this permission notice shall be included
-+ * in all copies or substantial portions of the Software.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-+ * THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+ */
-+
-+
-+#include "dri_util.h"
-+#include "utils.h"
-+#include "xmlconfig.h"
-+#include "GL/internal/dri_interface.h"
-+#include "main/framebuffer.h"
-+#include "main/renderbuffer.h"
-+
-+#include "glamo_screen.h"
-+#include "glamo_context.h"
-+#include "glamo_fbo.h"
-+
-+/* This comes from libdrm_glamo */
-+#include <glamo_bo_gem.h>
-+
-+
-+static int glamoInitDriver(__DRIscreen *psp)
-+{
-+ return 0;
-+}
-+
-+
-+static glamoScreenPtr glamoCreateScreen(__DRIscreen *sPriv)
-+{
-+ glamoScreenPtr glamoScreen;
-+
-+ /* Allocate the private area */
-+ glamoScreen = (glamoScreenPtr)CALLOC(sizeof(*glamoScreen));
-+ if ( glamoScreen == NULL )
-+ return NULL;
-+
-+ glamoScreen->driScreen = sPriv;
-+
-+ /* This is our link to the kernel's memory manager, via libdrm */
-+ glamoScreen->bom = glamo_bo_manager_gem_ctor(sPriv->fd);
-+
-+ return glamoScreen;
-+}
-+
-+
-+static void glamoDestroyScreen(__DRIscreen *sPriv)
-+{
-+ glamoScreenPtr glamoScreen = (glamoScreenPtr)sPriv->private;
-+
-+ if ( glamoScreen == NULL )
-+ return;
-+
-+ FREE(glamoScreen);
-+ sPriv->private = NULL;
-+}
-+
-+
-+static const __DRIconfig **glamoInitScreen(__DRIscreen *sPriv)
-+{
-+ __DRIconfig **configs;
-+ uint8_t depth_bits_array[2];
-+ uint8_t stencil_bits_array[2];
-+ uint8_t msaa_samples_array[1];
-+ static const GLenum db_modes[] = { GLX_SWAP_COPY_OML, GLX_NONE };
-+
-+ /* Driver initialisation */
-+ if ( glamoInitDriver(sPriv) ) {
-+ return NULL;
-+ }
-+
-+ /* Screen-specific initialisation */
-+ sPriv->private = glamoCreateScreen(sPriv);
-+ if ( !sPriv->private ) {
-+ glamoDestroyScreen(sPriv);
-+ return NULL;
-+ }
-+
-+ depth_bits_array[0] = 0;
-+ stencil_bits_array[0] = 0;
-+ depth_bits_array[1] = 16;
-+ stencil_bits_array[1] = 0;
-+ msaa_samples_array[0] = 0;
-+
-+ configs = driCreateConfigs(GL_RGB, GL_UNSIGNED_SHORT_5_6_5,
-+ depth_bits_array, stencil_bits_array, 2,
-+ db_modes, 2, msaa_samples_array, 1, GL_TRUE);
-+
-+ if ( configs == NULL ) {
-+ fprintf(stderr, "[%s:%u] Error creating FBConfig!\n", __func__, __LINE__);
-+ return NULL;
-+ }
-+
-+ return (const __DRIconfig **)configs;
-+}
-+
-+
-+static const __DRIconfig **glamoInitScreen2(__DRIscreen *sPriv)
-+{
-+ __DRIconfig **configs;
-+ uint8_t depth_bits_array[2];
-+ uint8_t stencil_bits_array[2];
-+ uint8_t msaa_samples_array[1];
-+ static const GLenum db_modes[] = { GLX_SWAP_COPY_OML, GLX_NONE };
-+
-+ /* Driver initialisation */
-+ if ( glamoInitDriver(sPriv) ) {
-+ return NULL;
-+ }
-+
-+ /* Screen-specific initialisation */
-+ sPriv->private = glamoCreateScreen(sPriv);
-+ if ( !sPriv->private ) {
-+ glamoDestroyScreen(sPriv);
-+ return NULL;
-+ }
-+
-+ depth_bits_array[0] = 0;
-+ stencil_bits_array[0] = 0;
-+ depth_bits_array[1] = 16;
-+ stencil_bits_array[1] = 0;
-+ msaa_samples_array[0] = 0;
-+
-+ configs = driCreateConfigs(GL_RGB, GL_UNSIGNED_SHORT_5_6_5,
-+ depth_bits_array, stencil_bits_array, 2,
-+ db_modes, 2, msaa_samples_array, 1, GL_TRUE);
-+
-+ if ( configs == NULL ) {
-+ fprintf(stderr, "[%s:%u] Error creating FBConfig!\n", __func__, __LINE__);
-+ return NULL;
-+ }
-+
-+ return (const __DRIconfig **)configs;
-+}
-+
-+
-+/* Allocate buffers for a context. This is where the fun starts... */
-+static GLboolean glamoCreateBuffer(__DRIscreen *driScrnPriv,
-+ __DRIdrawable *driDrawPriv,
-+ const struct gl_config *mesaVis,
-+ GLboolean isPixmap)
-+{
-+ struct glamo_framebuffer *gfb;
-+ GLenum rgbFormat;
-+
-+ if ( isPixmap ) return GL_FALSE; /* not implemented */
-+
-+ gfb = CALLOC_STRUCT(glamo_framebuffer);
-+ if ( !gfb ) return GL_FALSE;
-+
-+ _mesa_initialize_window_framebuffer(&gfb->base, mesaVis);
-+
-+ /* we only support this one format at the moment */
-+ rgbFormat = GL_RGB5;
-+
-+ /* Front color renderbuffer */
-+ gfb->color_rb[0] = glamo_create_renderbuffer(rgbFormat, driDrawPriv);
-+ _mesa_add_renderbuffer(&gfb->base, BUFFER_FRONT_LEFT,
-+ &gfb->color_rb[0]->base);
-+
-+ /* Back color renderbuffer, if requested */
-+ if ( mesaVis->doubleBufferMode ) {
-+ gfb->color_rb[1] = glamo_create_renderbuffer(rgbFormat, driDrawPriv);
-+ _mesa_add_renderbuffer(&gfb->base, BUFFER_BACK_LEFT,
-+ &gfb->color_rb[1]->base);
-+ }
-+
-+ if ( mesaVis->depthBits == 16 ) {
-+ struct glamo_renderbuffer *depth;
-+ depth = glamo_create_renderbuffer(GL_DEPTH_COMPONENT16, driDrawPriv);
-+ _mesa_add_renderbuffer(&gfb->base, BUFFER_DEPTH, &depth->base);
-+ }
-+
-+ /* Add software renderbuffers for the things we can't support in hardware */
-+ _mesa_add_soft_renderbuffers(&gfb->base,
-+ GL_FALSE, /* color */
-+ GL_FALSE, /* depth */
-+ mesaVis->stencilBits > 0, /* stencil, if required */
-+ mesaVis->accumRedBits > 0, /* accum, if required */
-+ GL_FALSE, /* alpha */
-+ GL_FALSE /* aux */
-+ );
-+ driDrawPriv->driverPrivate = (void *)gfb;
-+
-+ return (driDrawPriv->driverPrivate != NULL);
-+}
-+
-+
-+static void glamoDestroyBuffer(__DRIdrawable *driDrawPriv)
-+{
-+}
-+
-+
-+static void glamoSwapBuffers(__DRIdrawable *driDrawPriv)
-+{
-+ printf("glamoSwapBuffers\n"); fflush(stdout);
-+}
-+
-+
-+/*
-+ * Mesa entry points
-+ *
-+ * See src/mesa/drivers/dri/common/dri_util.h for information about these
-+ */
-+const struct __DriverAPIRec driDriverAPI = {
-+ .InitScreen = glamoInitScreen,
-+ .DestroyScreen = glamoDestroyScreen,
-+ .CreateContext = glamoCreateContext,
-+ .DestroyContext = glamoDestroyContext,
-+ .CreateBuffer = glamoCreateBuffer,
-+ .DestroyBuffer = glamoDestroyBuffer,
-+ .SwapBuffers = glamoSwapBuffers,
-+ .MakeCurrent = glamoMakeCurrent,
-+ .UnbindContext = glamoUnbindContext,
-+ .GetSwapInfo = NULL, /* Not used */
-+ .WaitForMSC = NULL,
-+ .WaitForSBC = NULL,
-+ .SwapBuffersMSC = NULL,
-+ .CopySubBuffer = NULL,
-+ .GetDrawableMSC = NULL, /* Not used */
-+ .InitScreen2 = glamoInitScreen2, /* For DRI2 */
-+};
-+
-+/* This is the table of extensions that the loader will dlsym() for. */
-+PUBLIC const __DRIextension *__driDriverExtensions[] = {
-+ &driCoreExtension.base,
-+ &driLegacyExtension.base,
-+ &driDRI2Extension.base,
-+ NULL
-+};
-+
-+/* kate: space-indent on; indent-width 3; mixedindent off; indent-mode cstyle; */
-diff --git a/src/mesa/drivers/dri/glamo/glamo_screen.h b/src/mesa/drivers/dri/glamo/glamo_screen.h
-new file mode 100644
-index 0000000..3f2eb5f
---- /dev/null
-+++ b/src/mesa/drivers/dri/glamo/glamo_screen.h
-@@ -0,0 +1,44 @@
-+/*
-+ * Direct Rendering Support for SMedia Glamo 336x/337x
-+ *
-+ * (c) 2009 Thomas White <taw@bitwiz.org.uk>
-+ * Roughly based on sis_screen.h (c) 2003 Eric Anholt
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining a
-+ * copy of this software and associated documentation files (the "Software"),
-+ * to deal in the Software without restriction, including without limitation
-+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
-+ * and/or sell copies of the Software, and to permit persons to whom the
-+ * Software is furnished to do so, subject to the following conditions:
-+ *
-+ * The above copyright notice and this permission notice shall be included
-+ * in all copies or substantial portions of the Software.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-+ * THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+ */
-+
-+#ifndef __GLAMO_SCREEN_H
-+#define __GLAMO_SCREEN_H
-+
-+#include "xmlconfig.h"
-+#include "dri_util.h"
-+
-+#include <glamo_bo_gem.h>
-+
-+typedef struct {
-+
-+ __DRIscreen *driScreen;
-+ driOptionCache optionCache;
-+
-+ struct glamo_bo_manager *bom;
-+
-+} glamoScreenRec, *glamoScreenPtr;
-+
-+#endif /* __GLAMO_SCREEN_H */
-+
-+/* kate: space-indent on; indent-width 3; mixedindent off; indent-mode cstyle; */
-diff --git a/src/mesa/drivers/dri/glamo/glamo_state.c b/src/mesa/drivers/dri/glamo/glamo_state.c
-new file mode 100644
-index 0000000..3aa2f8b
---- /dev/null
-+++ b/src/mesa/drivers/dri/glamo/glamo_state.c
-@@ -0,0 +1,305 @@
-+/*
-+ * Direct Rendering Support for SMedia Glamo 336x/337x
-+ *
-+ * (c) 2009-2010 Thomas White <taw@bitwiz.org.uk>
-+ * Roughly based on sis_state.c (c) 2003 Eric Anholt
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining a
-+ * copy of this software and associated documentation files (the "Software"),
-+ * to deal in the Software without restriction, including without limitation
-+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
-+ * and/or sell copies of the Software, and to permit persons to whom the
-+ * Software is furnished to do so, subject to the following conditions:
-+ *
-+ * The above copyright notice and this permission notice shall be included
-+ * in all copies or substantial portions of the Software.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-+ * THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+ *
-+ *
-+ * Also partially based on intel_fbo.c, to which the following notice applies:
-+ *
-+ * Copyright 2006 Tungsten Graphics, Inc., Cedar Park, Texas.
-+ * All Rights Reserved.
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining a
-+ * copy of this software and associated documentation files (the
-+ * "Software"), to deal in the Software without restriction, including
-+ * without limitation the rights to use, copy, modify, merge, publish,
-+ * distribute, sub license, and/or sell copies of the Software, and to
-+ * permit persons to whom the Software is furnished to do so, subject to
-+ * the following conditions:
-+ *
-+ * The above copyright notice and this permission notice (including the
-+ * next paragraph) shall be included in all copies or substantial portions
-+ * of the Software.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
-+ * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
-+ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+ */
-+
-+
-+#include "main/context.h"
-+#include "main/framebuffer.h"
-+#include "main/api_arrayelt.h"
-+#include "main/macros.h"
-+#include "swrast/swrast.h"
-+#include "swrast_setup/swrast_setup.h"
-+#include "tnl/tnl.h"
-+
-+#include "glamo_fbo.h"
-+#include "glamo_state.h"
-+#include "glamo_context.h"
-+#include "glamo_cmdq.h"
-+#include "glamo_regs.h"
-+
-+
-+static void glamoResizeBuffers(struct gl_context *ctx, struct gl_framebuffer *fb,
-+ GLuint width, GLuint height)
-+{
-+ struct glamo_framebuffer *glamo_fb = (struct glamo_framebuffer *)fb;
-+ int i;
-+
-+ _mesa_resize_framebuffer(ctx, fb, width, height);
-+
-+ fb->Initialized = GL_TRUE; /* XXX remove someday */
-+
-+ if (fb->Name != 0) {
-+ return;
-+ }
-+
-+ /* Make sure all window system renderbuffers are up to date */
-+ for (i = 0; i < 2; i++) {
-+ struct gl_renderbuffer *rb = &glamo_fb->color_rb[i]->base;
-+
-+ /* only resize if size is changing */
-+ if (rb && (rb->Width != width || rb->Height != height)) {
-+ rb->AllocStorage(ctx, rb, rb->InternalFormat,
-+ width, height);
-+ }
-+ }
-+}
-+
-+
-+static void glamoClear(struct gl_context *ctx, GLbitfield mask)
-+{
-+ glamoContext *gCtx;
-+ struct gl_framebuffer *fb;
-+ int i;
-+
-+ gCtx = GLAMO_CONTEXT(ctx);
-+ fb = ctx->DrawBuffer;
-+
-+ printf("glamoClear (%f %f %f %f)\n", ctx->Color.ClearColor[0],
-+ ctx->Color.ClearColor[1], ctx->Color.ClearColor[2],
-+ ctx->Color.ClearColor[3]); fflush(stdout);
-+
-+ for (i = 0; i < fb->_NumColorDrawBuffers; i++) {
-+
-+ struct glamo_renderbuffer *grb;
-+
-+ grb = glamo_renderbuffer(fb->_ColorDrawBuffers[i]);
-+
-+ glamoDRMStartBurst(gCtx, GLAMO_REG_2D_DST_X);
-+ glamoDRMAddData(gCtx, fb->_Xmin, 2); /* dest X */
-+ glamoDRMAddData(gCtx, fb->_Ymin, 2); /* dest Y */
-+ glamoDRMAddBO(gCtx, grb->bo); /* dest L/H */
-+ glamoDRMAddData(gCtx, grb->pitch & 0x7ff, 2); /* dest pitch */
-+ glamoDRMAddData(gCtx, grb->height, 2); /* dest height */
-+ glamoDRMAddData(gCtx, fb->_Xmax-fb->_Xmin, 2); /* width */
-+ glamoDRMAddData(gCtx, fb->_Ymax-fb->_Ymin, 2); /* height */
-+ glamoDRMAddData(gCtx, 0x0000, 2); /* patt L */
-+ glamoDRMAddData(gCtx, 0x0000, 2); /* patt H */
-+ glamoDRMAddData(gCtx, gCtx->col_clear, 2); /* FG colour */
-+ glamoDRMDispatch(gCtx);
-+
-+ glamoDRMStartBurst(gCtx, GLAMO_REG_2D_COMMAND1);
-+ glamoDRMAddData(gCtx, 0x0000, 2); /* Cmd param 1 */
-+ glamoDRMAddData(gCtx, 0xf0 << 8, 2); /* Cmd param 2 */
-+ glamoDRMAddData(gCtx, 0x0000, 2); /* Cmd param 3 */
-+ glamoDRMDispatch(gCtx);
-+
-+ }
-+}
-+
-+
-+static void glamoClearColor(struct gl_context *ctx, const GLfloat color[4])
-+{
-+ struct glamo_context *gCtx = GLAMO_CONTEXT(ctx);
-+ GLubyte col_byte[4];
-+
-+ printf("glamoClearColor (%f %f %f %f)\n", color[0], color[1], color[2],
-+ color[3]); fflush(stdout);
-+
-+ CLAMPED_FLOAT_TO_UBYTE(col_byte[0], color[0]);
-+ CLAMPED_FLOAT_TO_UBYTE(col_byte[1], color[1]);
-+ CLAMPED_FLOAT_TO_UBYTE(col_byte[2], color[2]);
-+ CLAMPED_FLOAT_TO_UBYTE(col_byte[3], color[3]);
-+
-+ gCtx->col_clear = GLAMO_PACKCOLOR565(col_byte[0], col_byte[1],
-+ col_byte[2]);
-+}
-+
-+
-+static void glamoShadeModel(struct gl_context *ctx, GLenum mode)
-+{
-+ printf("glamoShadeModel\n"); fflush(stdout);
-+}
-+
-+
-+static void glamoViewport(struct gl_context *ctx, GLint x, GLint y,
-+ GLsizei width, GLsizei height )
-+{
-+ struct glamo_context *gCtx = GLAMO_CONTEXT(ctx);
-+ __DRIcontext *driContext = gCtx->driContext;
-+ void (*old_viewport)(struct gl_context *ctx, GLint x, GLint y,
-+ GLsizei w, GLsizei h);
-+
-+ if ( !driContext->driScreenPriv->dri2.enabled ) return;
-+
-+ /* TODO: Flush before fiddling with fake front buffer */
-+
-+ if ( ctx->DrawBuffer->Name == 0 ) {
-+
-+ glamo_update_renderbuffers(driContext,
-+ driContext->driDrawablePriv);
-+ if ( driContext->driDrawablePriv
-+ != driContext->driReadablePriv ) {
-+ glamo_update_renderbuffers(driContext,
-+ driContext->driReadablePriv);
-+ }
-+
-+ }
-+
-+ old_viewport = ctx->Driver.Viewport;
-+ ctx->Driver.Viewport = NULL;
-+ gCtx->driDrawable = driContext->driDrawablePriv;
-+ ctx->Driver.Viewport = old_viewport;
-+}
-+
-+
-+static void glamoUploadMatrix(struct glamo_context *gCtx, uint16_t mreg,
-+ GLfloat *matrix)
-+{
-+ int i;
-+ char *type;
-+
-+ switch ( mreg ) {
-+ case G3D_MATRIX_MVP :
-+ type = "MVP"; break;
-+ case G3D_MATRIX_MV :
-+ type = "MV"; break;
-+ case G3D_MATRIX_IMVP :
-+ type = "inverse MVP"; break;
-+ default :
-+ type = "unknown"; break;
-+ }
-+ printf("Uploading %s matrix...\n", type);
-+
-+ glamoDRMStartBurst(gCtx, mreg);
-+ if ( mreg != G3D_MATRIX_IMVP ) {
-+ for ( i=0; i<16; i++ ) {
-+ glamoDRMAddData(gCtx, float7s16(matrix[i]), 4);
-+ }
-+ } else {
-+ /* Normal matrix needs special treatment */
-+ for ( i=0; i<3; i++ ) {
-+ glamoDRMAddData(gCtx, float7s16(matrix[4*i]), 4);
-+ glamoDRMAddData(gCtx, float7s16(matrix[4*i+1]), 4);
-+ glamoDRMAddData(gCtx, float7s16(matrix[4*i+2]), 4);
-+ }
-+ }
-+ glamoDRMDispatch(gCtx);
-+}
-+
-+
-+GLboolean glamoValidateState(struct gl_context *ctx, GLuint new_state)
-+{
-+ struct glamo_context *gCtx = GLAMO_CONTEXT(ctx);
-+
-+ if ( new_state & (_NEW_MODELVIEW|_NEW_PROJECTION) ) {
-+
-+ glamoUploadMatrix(gCtx, G3D_MATRIX_MVP,
-+ ctx->_ModelProjectMatrix.m);
-+
-+ /* FIXME: The following two aren't needed unless lighting
-+ * is in use... */
-+ glamoUploadMatrix(gCtx, G3D_MATRIX_MV,
-+ ctx->ModelviewMatrixStack.Top->m);
-+ _math_matrix_alloc_inv(&(ctx->_ModelProjectMatrix));
-+ _math_matrix_analyse(&(ctx->_ModelProjectMatrix));
-+ glamoUploadMatrix(gCtx, G3D_MATRIX_IMVP,
-+ ctx->_ModelProjectMatrix.inv);
-+ }
-+
-+ gCtx->new_state = 0;
-+ return GL_TRUE;
-+}
-+
-+
-+static void glamoUpdateState(struct gl_context *ctx, GLbitfield new_state)
-+{
-+ struct glamo_context *gCtx = GLAMO_CONTEXT(ctx);
-+
-+ printf("glamoUpdateState\n");
-+
-+ _swrast_InvalidateState(ctx, new_state);
-+ _swsetup_InvalidateState(ctx, new_state);
-+ _vbo_InvalidateState(ctx, new_state);
-+ _tnl_InvalidateState(ctx, new_state);
-+ _ae_invalidate_state(ctx, new_state);
-+
-+ /* Make a note that some state has changed,
-+ * so that it can be sent to the GPU later. */
-+ gCtx->new_state |= new_state;
-+}
-+
-+
-+static void glamoFlush(struct gl_context *ctx)
-+{
-+ printf("glamoFlush\n");
-+}
-+
-+
-+void glamoInitStateFuncs(struct gl_context *ctx)
-+{
-+ ctx->Driver.UpdateState = glamoUpdateState;
-+ ctx->Driver.Clear = glamoClear;
-+ ctx->Driver.ClearColor = glamoClearColor;
-+ ctx->Driver.ClearDepth = NULL;
-+ ctx->Driver.ClearStencil = NULL;
-+ ctx->Driver.AlphaFunc = NULL;
-+ ctx->Driver.BlendFuncSeparate = NULL;
-+ ctx->Driver.ColorMask = NULL;
-+ ctx->Driver.CullFace = NULL;
-+ ctx->Driver.DepthMask = NULL;
-+ ctx->Driver.DepthFunc = NULL;
-+ ctx->Driver.DepthRange = NULL;
-+ ctx->Driver.DrawBuffer = NULL;
-+ ctx->Driver.Enable = NULL;
-+ ctx->Driver.FrontFace = NULL;
-+ ctx->Driver.Fogfv = NULL;
-+ ctx->Driver.Hint = NULL;
-+ ctx->Driver.Lightfv = NULL;
-+ ctx->Driver.LogicOpcode = NULL;
-+ ctx->Driver.PolygonMode = NULL;
-+ ctx->Driver.PolygonStipple = NULL;
-+ ctx->Driver.ReadBuffer = NULL;
-+ ctx->Driver.RenderMode = NULL;
-+ ctx->Driver.Scissor = NULL;
-+ ctx->Driver.ShadeModel = glamoShadeModel;
-+ ctx->Driver.LightModelfv = NULL;
-+ ctx->Driver.Viewport = glamoViewport;
-+ ctx->Driver.ResizeBuffers = glamoResizeBuffers;
-+ ctx->Driver.Flush = glamoFlush;
-+}
-diff --git a/src/mesa/drivers/dri/glamo/glamo_state.h b/src/mesa/drivers/dri/glamo/glamo_state.h
-new file mode 100644
-index 0000000..c3872c0
---- /dev/null
-+++ b/src/mesa/drivers/dri/glamo/glamo_state.h
-@@ -0,0 +1,34 @@
-+/*
-+ * Direct Rendering Support for SMedia Glamo 336x/337x
-+ *
-+ * (c) 2009 Thomas White <taw@bitwiz.org.uk>
-+ * Roughly based on sis_state.h (c) 2003 Eric Anholt
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining a
-+ * copy of this software and associated documentation files (the "Software"),
-+ * to deal in the Software without restriction, including without limitation
-+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
-+ * and/or sell copies of the Software, and to permit persons to whom the
-+ * Software is furnished to do so, subject to the following conditions:
-+ *
-+ * The above copyright notice and this permission notice shall be included
-+ * in all copies or substantial portions of the Software.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-+ * THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+ */
-+
-+#ifndef __GLAMO_STATE_H
-+#define __GLAMO_STATE_H
-+
-+#include "main/context.h"
-+
-+extern void glamoInitStateFuncs(struct gl_context *ctx);
-+
-+#endif /* __GLAMO_STATE_H */
-+
-+/* kate: space-indent on; indent-width 3; mixedindent off; indent-mode cstyle; */
-diff --git a/src/mesa/drivers/dri/glamo/glamo_tris.c b/src/mesa/drivers/dri/glamo/glamo_tris.c
-new file mode 100644
-index 0000000..c45fe53
---- /dev/null
-+++ b/src/mesa/drivers/dri/glamo/glamo_tris.c
-@@ -0,0 +1,310 @@
-+/*
-+ * Direct Rendering Support for SMedia Glamo 336x/337x
-+ *
-+ * (c) 2009 Thomas White <taw@bitwiz.org.uk>
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining a
-+ * copy of this software and associated documentation files (the "Software"),
-+ * to deal in the Software without restriction, including without limitation
-+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
-+ * and/or sell copies of the Software, and to permit persons to whom the
-+ * Software is furnished to do so, subject to the following conditions:
-+ *
-+ * The above copyright notice and this permission notice shall be included
-+ * in all copies or substantial portions of the Software.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-+ * THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+ *
-+ *
-+ * Based on intel_tris.c, to which the following notice applies:
-+ *
-+ * Copyright 2003 Tungsten Graphics, Inc., Cedar Park, Texas.
-+ * All Rights Reserved.
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining a
-+ * copy of this software and associated documentation files (the
-+ * "Software"), to deal in the Software without restriction, including
-+ * without limitation the rights to use, copy, modify, merge, publish,
-+ * distribute, sub license, and/or sell copies of the Software, and to
-+ * permit persons to whom the Software is furnished to do so, subject to
-+ * the following conditions:
-+ *
-+ * The above copyright notice and this permission notice (including the
-+ * next paragraph) shall be included in all copies or substantial portions
-+ * of the Software.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
-+ * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
-+ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+ *
-+ */
-+
-+
-+#include <glamo_bo.h>
-+#include <glamo_bo_gem.h>
-+#include <glamo_drm.h>
-+
-+#include "main/mtypes.h"
-+#include "swrast/swrast.h"
-+#include "tnl/t_context.h"
-+#include "tnl/t_vertex.h"
-+#include "tnl/t_pipeline.h"
-+
-+#include "glamo_tris.h"
-+#include "glamo_context.h"
-+
-+
-+static void glamoRunPipeline(struct gl_context *ctx)
-+{
-+ printf("glamoRunPipeline\n");
-+
-+ /* TODO: Emit state */
-+
-+ _tnl_run_pipeline(ctx);
-+}
-+
-+
-+static void glamoRenderStart(struct gl_context *ctx)
-+{
-+ struct glamo_context *gCtx = GLAMO_CONTEXT(ctx);
-+
-+ /* Decide which attributes will be used */
-+ gCtx->vertex_attrs[0].attrib = _TNL_ATTRIB_POS;
-+ gCtx->vertex_attrs[0].format = EMIT_4F;
-+
-+ gCtx->vertex_size = _tnl_install_attrs(ctx, gCtx->vertex_attrs, 1,
-+ NULL, 0);
-+}
-+
-+
-+static void glamoRenderFinish(struct gl_context *ctx)
-+{
-+ printf("glamoRenderFinish\n");
-+}
-+
-+
-+static void glamoPrimitiveNotify(struct gl_context *ctx, GLenum prim)
-+{
-+ printf("glamoPrimitiveNotify\n");
-+}
-+
-+
-+uint32_t *glamoGetPrimSpace(struct glamo_context *gCtx, unsigned int count)
-+{
-+ uint32_t *addr;
-+
-+ printf("glamoGetPrimSpace\n");
-+
-+ /* Check for space in the existing VB */
-+ if (gCtx->prim.vb_bo == NULL || (gCtx->prim.current_offset +
-+ count * gCtx->vertex_size) > GLAMO_VB_SIZE) {
-+
-+ /* Not enough space, or no VB existing. Start a new one... */
-+ if (gCtx->prim.vb == NULL) {
-+ printf("Allocated %i bytes\n", GLAMO_VB_SIZE);
-+ gCtx->prim.vb = malloc(GLAMO_VB_SIZE);
-+ }
-+ gCtx->prim.vb_bo = glamo_bo_open(gCtx->glamoScreen->bom, 0,
-+ GLAMO_VB_SIZE, 4,
-+ GLAMO_GEM_DOMAIN_VRAM, 0);
-+ gCtx->prim.start_offset = 0;
-+ gCtx->prim.current_offset = 0;
-+ }
-+
-+ addr = (uint32_t *)(gCtx->prim.vb + gCtx->prim.current_offset);
-+ gCtx->prim.current_offset += gCtx->vertex_size * count;
-+ gCtx->prim.count += count;
-+
-+ return addr;
-+}
-+
-+
-+#define COPY_DWORDS( j, vb, vertsize, v ) \
-+do { \
-+ for ( j = 0 ; j < vertsize ; j++ ) { \
-+ vb[j] = ((GLuint *)v)[j]; \
-+ } \
-+ vb += vertsize; \
-+} while (0)
-+
-+
-+static void glamo_draw_triangle(struct glamo_context *gCtx,
-+ glamoVertexPtr v0, glamoVertexPtr v1,
-+ glamoVertexPtr v2)
-+{
-+ GLuint *vb = glamoGetPrimSpace(gCtx, 3);
-+ int j;
-+
-+ COPY_DWORDS(j, vb, gCtx->vertex_size, v0);
-+ COPY_DWORDS(j, vb, gCtx->vertex_size, v1);
-+ COPY_DWORDS(j, vb, gCtx->vertex_size, v2);
-+}
-+
-+
-+static void glamo_draw_line(struct glamo_context *gCtx,
-+ glamoVertexPtr v0, glamoVertexPtr v1)
-+{
-+ GLuint *vb = glamoGetPrimSpace(gCtx, 2);
-+ int j;
-+
-+ COPY_DWORDS(j, vb, gCtx->vertex_size, v0);
-+ COPY_DWORDS(j, vb, gCtx->vertex_size, v1);
-+}
-+
-+
-+static void glamo_draw_point(struct glamo_context *gCtx, glamoVertexPtr v0)
-+{
-+ GLuint *vb = glamoGetPrimSpace(gCtx, 2);
-+ int j;
-+
-+ COPY_DWORDS(j, vb, gCtx->vertex_size, v0);
-+}
-+
-+
-+#define TRI( a, b, c ) \
-+do { \
-+ glamo_draw_triangle(gCtx, a, b, c ); \
-+} while (0)
-+
-+
-+#define QUAD( a, b, c, d ) \
-+printf("Drawing a quad\n"); \
-+do { \
-+ glamo_draw_triangle(gCtx, a, b, d); \
-+ glamo_draw_triangle(gCtx, b, c, d); \
-+} while (0)
-+
-+
-+#define LINE(v0, v1) \
-+do { \
-+ glamo_draw_line(gCtx, v0, v1); \
-+} while (0)
-+
-+
-+#define POINT(v0) \
-+do { \
-+ glamo_draw_point(gCtx, v0); \
-+} while (0)
-+
-+
-+#define IND (0)
-+#define TAG(x) x
-+#include "tnl_dd/t_dd_tritmp.h"
-+
-+#define IND (0)
-+#define TAG(x) x##_offset
-+#include "tnl_dd/t_dd_tritmp.h"
-+
-+#define IND (0)
-+#define TAG(x) x##_twoside
-+#include "tnl_dd/t_dd_tritmp.h"
-+
-+#define IND (0)
-+#define TAG(x) x##_twoside_offset
-+#include "tnl_dd/t_dd_tritmp.h"
-+
-+#define IND (0)
-+#define TAG(x) x##_unfilled
-+#include "tnl_dd/t_dd_tritmp.h"
-+
-+#define IND (0)
-+#define TAG(x) x##_offset_unfilled
-+#include "tnl_dd/t_dd_tritmp.h"
-+
-+#define IND (0)
-+#define TAG(x) x##_twoside_unfilled
-+#include "tnl_dd/t_dd_tritmp.h"
-+
-+#define IND (0)
-+#define TAG(x) x##_twoside_offset_unfilled
-+#include "tnl_dd/t_dd_tritmp.h"
-+
-+#define IND (0)
-+#define TAG(x) x##_fallback
-+#include "tnl_dd/t_dd_tritmp.h"
-+
-+#define IND (0)
-+#define TAG(x) x##_offset_fallback
-+#include "tnl_dd/t_dd_tritmp.h"
-+
-+#define IND (0)
-+#define TAG(x) x##_twoside_fallback
-+#include "tnl_dd/t_dd_tritmp.h"
-+
-+#define IND (0)
-+#define TAG(x) x##_twoside_offset_fallback
-+#include "tnl_dd/t_dd_tritmp.h"
-+
-+#define IND (0)
-+#define TAG(x) x##_unfilled_fallback
-+#include "tnl_dd/t_dd_tritmp.h"
-+
-+#define IND (0)
-+#define TAG(x) x##_offset_unfilled_fallback
-+#include "tnl_dd/t_dd_tritmp.h"
-+
-+#define IND (0)
-+#define TAG(x) x##_twoside_unfilled_fallback
-+#include "tnl_dd/t_dd_tritmp.h"
-+
-+#define IND (0)
-+#define TAG(x) x##_twoside_offset_unfilled_fallback
-+#include "tnl_dd/t_dd_tritmp.h"
-+
-+
-+static void init_rast_tab()
-+{
-+ init();
-+ init_offset();
-+ init_twoside();
-+ init_twoside_offset();
-+ init_unfilled();
-+ init_offset_unfilled();
-+ init_twoside_unfilled();
-+ init_twoside_offset_unfilled();
-+ init_fallback();
-+ init_offset_fallback();
-+ init_twoside_fallback();
-+ init_twoside_offset_fallback();
-+ init_unfilled_fallback();
-+ init_offset_unfilled_fallback();
-+ init_twoside_unfilled_fallback();
-+ init_twoside_offset_unfilled_fallback();
-+}
-+
-+
-+void glamoInitTriFuncs(struct gl_context *ctx)
-+{
-+ TNLcontext *tnl = TNL_CONTEXT(ctx);
-+ struct glamo_context *gCtx = GLAMO_CONTEXT(ctx);
-+ static int firsttime = 1;
-+
-+ if (firsttime) {
-+ init_rast_tab();
-+ firsttime = 0;
-+ }
-+
-+ gCtx->prim.start_offset = 0;
-+ gCtx->prim.current_offset = 0;
-+ gCtx->prim.vb_bo = NULL;
-+ gCtx->prim.vb = NULL;
-+ gCtx->prim.count = 0;
-+
-+ tnl->Driver.RunPipeline = glamoRunPipeline;
-+ tnl->Driver.Render.Start = glamoRenderStart;
-+ tnl->Driver.Render.Finish = glamoRenderFinish;
-+ tnl->Driver.Render.PrimitiveNotify = glamoPrimitiveNotify;
-+ tnl->Driver.Render.ResetLineStipple = _swrast_ResetLineStipple;
-+ tnl->Driver.Render.BuildVertices = _tnl_build_vertices;
-+ tnl->Driver.Render.CopyPV = _tnl_copy_pv;
-+ tnl->Driver.Render.Interp = _tnl_interp;
-+}
-diff --git a/src/mesa/drivers/dri/glamo/glamo_tris.h b/src/mesa/drivers/dri/glamo/glamo_tris.h
-new file mode 100644
-index 0000000..ea396c1
---- /dev/null
-+++ b/src/mesa/drivers/dri/glamo/glamo_tris.h
-@@ -0,0 +1,38 @@
-+/*
-+ * Direct Rendering Support for SMedia Glamo 336x/337x
-+ *
-+ * (c) 2009 Thomas White <taw@bitwiz.org.uk>
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining a
-+ * copy of this software and associated documentation files (the "Software"),
-+ * to deal in the Software without restriction, including without limitation
-+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
-+ * and/or sell copies of the Software, and to permit persons to whom the
-+ * Software is furnished to do so, subject to the following conditions:
-+ *
-+ * The above copyright notice and this permission notice shall be included
-+ * in all copies or substantial portions of the Software.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-+ * THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+ */
-+
-+#ifndef __GLAMO_TRIS_H
-+#define __GLAMO_TRIS_H
-+
-+#include "main/mtypes.h"
-+
-+#include "glamo_context.h"
-+
-+/* Amount of space reserved for vertex submission */
-+#define GLAMO_VB_SIZE (32*1024)
-+
-+extern void glamoInitTriFuncs(struct gl_context *ctx);
-+extern uint32_t *glamoGetPrimSpace(struct glamo_context *gCtx,
-+ unsigned int count);
-+
-+#endif /* __GLAMO_TRIS_H */
-diff --git a/src/mesa/tnl_dd/t_dd_dmatmp.h b/src/mesa/tnl_dd/t_dd_dmatmp.h
-index 997fc0b..e3c9119 100644
---- a/src/mesa/tnl_dd/t_dd_dmatmp.h
-+++ b/src/mesa/tnl_dd/t_dd_dmatmp.h
-@@ -127,6 +127,8 @@ static void TAG(render_points_verts)( struct gl_context *ctx,
- currentsz = dmasz;
- }
-
-+ FLUSH();
-+
- } else {
- fprintf(stderr, "%s - cannot draw primitive\n", __FUNCTION__);
- return;
-@@ -162,6 +164,8 @@ static void TAG(render_lines_verts)( struct gl_context *ctx,
- currentsz = dmasz;
- }
-
-+ FLUSH();
-+
- } else {
- fprintf(stderr, "%s - cannot draw primitive\n", __FUNCTION__);
- return;
-@@ -191,7 +195,7 @@ static void TAG(render_line_strip_verts)( struct gl_context *ctx,
- TAG(emit_verts)( ctx, j, nr, ALLOC_VERTS(nr) );
- currentsz = dmasz;
- }
--
-+
- FLUSH();
-
- } else {
-@@ -294,6 +298,8 @@ static void TAG(render_triangles_verts)( struct gl_context *ctx,
- TAG(emit_verts)( ctx, j, nr, ALLOC_VERTS(nr) );
- currentsz = dmasz;
- }
-+
-+ FLUSH();
- }
-
-
-@@ -567,6 +573,8 @@ static void TAG(render_quads_verts)( struct gl_context *ctx,
- TAG(emit_verts)( ctx, j, nr, ALLOC_VERTS(nr) );
- currentsz = dmasz;
- }
-+
-+ FLUSH();
- }
- else if (HAVE_ELTS) {
- /* Hardware doesn't have a quad primitive type -- try to
-@@ -640,6 +648,8 @@ static void TAG(render_quads_verts)( struct gl_context *ctx,
- tmp = EMIT_VERTS(ctx, j + 1, 3, tmp);
- (void) tmp;
- }
-+
-+ FLUSH();
- }
- else {
- /* Vertices won't fit in a single buffer, should never happen.
diff --git a/meta-oe/recipes-graphics/mesa/mesa-7.10.2/uclibc.patch b/meta-oe/recipes-graphics/mesa/mesa-7.10.2/uclibc.patch
deleted file mode 100644
index 0508112..0000000
--- a/meta-oe/recipes-graphics/mesa/mesa-7.10.2/uclibc.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: Mesa-7.9.1/src/mesa/main/imports.c
-===================================================================
---- Mesa-7.9.1.orig/src/mesa/main/imports.c 2010-12-15 13:50:00.000000000 -0800
-+++ Mesa-7.9.1/src/mesa/main/imports.c 2011-01-10 12:23:48.848656001 -0800
-@@ -757,7 +757,7 @@
- float
- _mesa_strtof( const char *s, char **end )
- {
--#if defined(_GNU_SOURCE) && !defined(__CYGWIN__) && !defined(__FreeBSD__)
-+#if defined(_GNU_SOURCE) && !defined(__CYGWIN__) && !defined(__FreeBSD__) && !defined(__UCLIBC__)
- static locale_t loc = NULL;
- if (!loc) {
- loc = newlocale(LC_CTYPE_MASK, "C", NULL);
-Index: Mesa-7.9.1/src/glsl/strtod.c
-===================================================================
---- Mesa-7.9.1.orig/src/glsl/strtod.c 2011-01-10 20:08:01.568656001 -0800
-+++ Mesa-7.9.1/src/glsl/strtod.c 2011-01-10 20:08:39.898656001 -0800
-@@ -44,7 +44,7 @@
- double
- glsl_strtod(const char *s, char **end)
- {
--#if defined(_GNU_SOURCE) && !defined(__CYGWIN__) && !defined(__FreeBSD__)
-+#if defined(_GNU_SOURCE) && !defined(__CYGWIN__) && !defined(__FreeBSD__) && !defined(__UCLIBC__)
- static locale_t loc = NULL;
- if (!loc) {
- loc = newlocale(LC_CTYPE_MASK, "C", NULL);
diff --git a/meta-oe/recipes-graphics/mesa/mesa-common.inc b/meta-oe/recipes-graphics/mesa/mesa-common.inc
deleted file mode 100644
index 2e6b599..0000000
--- a/meta-oe/recipes-graphics/mesa/mesa-common.inc
+++ /dev/null
@@ -1,49 +0,0 @@
-SECTION = "x11"
-
-DESCRIPTION = "An open source implementation of the OpenGL spec"
-HOMEPAGE = "http://mesa3d.org"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://docs/license.html;md5=7a3373c039b6b925c427755a4f779c1d"
-
-INC_PR = "r12"
-PE = "2"
-
-PROTO_DEPS = "xf86driproto glproto"
-LIB_DEPS = "virtual/libx11 libxext libxxf86vm libxdamage libxfixes"
-
-DEPENDS = "makedepend-native ${PROTO_DEPS} ${LIB_DEPS}"
-
-SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2;name=archive \
- "
-S = "${WORKDIR}/Mesa-${PV}"
-
-PROVIDES = "virtual/libgl"
-
-inherit autotools pkgconfig
-
-EXTRA_OECONF = "--enable-glu \
- --disable-glw \
- --disable-glut \
- "
-
-inherit glx-use-tls
-
-PACKAGES =+ "libegl libegl-dev libegl-dbg libglu libglu-dev libosmesa libosmesa-dev libgl libgl-dev"
-FILES_libegl = "${libdir}/libEGL.so.* ${libdir}/egl/*.so"
-FILES_libgl = "${libdir}/libGL.so.*"
-FILES_libglu = "${libdir}/libGLU.so.*"
-FILES_libosmesa = "${libdir}/libOSMesa.so.*"
-
-FILES_libegl-dev = "${libdir}/libEGL.* ${includedir}/EGL"
-FILES_libgl-dev = "${libdir}/libGL.* ${includedir}/GL"
-FILES_libglu-dev = "${libdir}/libGLU.* ${includedir}/GL/glu*.h"
-FILES_libosmesa-dev = "${libdir}/libOSMesa.* ${includedir}/osmesa.h"
-
-FILES_${PN}-dbg += "${libdir}/dri/.debug/*"
-FILES_libegl-dbg += "${libdir}/egl/.debug/*"
-
-NATIVE_INSTALL_WORKS = "1"
-do_install_append () {
- install -d ${D}/${includedir}/GL
- cp -pPr ${S}/include/GL/internal* ${D}/${includedir}/GL
-}
diff --git a/meta-oe/recipes-graphics/mesa/mesa-dri.inc b/meta-oe/recipes-graphics/mesa/mesa-dri.inc
deleted file mode 100644
index 8aa82c0..0000000
--- a/meta-oe/recipes-graphics/mesa/mesa-dri.inc
+++ /dev/null
@@ -1,27 +0,0 @@
-DEPENDS += "dri2proto expat libdrm"
-
-#not supported in oe-core base.bbclass
-#FILESPATHPKG =. "mesa-${PV}:mesa:"
-FILESPATH =. "${FILE_DIRNAME}/mesa:${FILE_DIRNAME}/mesa-${PV}:"
-
-# most of our targets do not have DRI so will use mesa-xlib
-DEFAULT_PREFERENCE = "-1"
-
-MACHINE_DRI_MODULES ?= ""
-#PACKAGE_ARCH = "${@['${MACHINE_ARCH}','${BASE_PACKAGE_ARCH}'][bb.data.getVar('MACHINE_DRI_MODULES',d,1) == '']}"
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-EXTRA_OECONF += "--with-driver=dri --disable-egl --disable-gallium -with-dri-drivers=swrast,${MACHINE_DRI_MODULES}"
-
-python populate_packages_prepend() {
- import os.path
-
- dri_drivers_root = os.path.join(bb.data.getVar('libdir', d, 1), "dri")
-
- do_split_packages(d, dri_drivers_root, '^(.*)_dri\.so$', 'mesa-dri-driver-%s', 'Mesa %s DRI driver', extra_depends='')
-}
-
-PACKAGES_DYNAMIC = "mesa-dri-driver-*"
-
-FILES_${PN}-dbg += "${libdir}/dri/.debug/*"
-
diff --git a/meta-oe/recipes-graphics/mesa/mesa-dri_7.10.2.bb b/meta-oe/recipes-graphics/mesa/mesa-dri_7.10.2.bb
deleted file mode 100644
index bd62c98..0000000
--- a/meta-oe/recipes-graphics/mesa/mesa-dri_7.10.2.bb
+++ /dev/null
@@ -1,4 +0,0 @@
-require mesa-common.inc
-require mesa-${PV}.inc
-require mesa-dri.inc
-PR = "${INC_PR}.1"
diff --git a/meta-oe/recipes-graphics/mesa/mesa-xlib.inc b/meta-oe/recipes-graphics/mesa/mesa-xlib.inc
deleted file mode 100644
index cc4a9c0..0000000
--- a/meta-oe/recipes-graphics/mesa/mesa-xlib.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-#not supported in oe-core base.bbclass
-#FILESPATHPKG =. "mesa-${PV}:mesa:"
-FILESPATH =. "${FILE_DIRNAME}/mesa:${FILE_DIRNAME}/mesa-${PV}:"
-
-EXTRA_OECONF += " --with-driver=xlib"
diff --git a/meta-oe/recipes-graphics/mesa/mesa-xlib_7.10.2.bb b/meta-oe/recipes-graphics/mesa/mesa-xlib_7.10.2.bb
deleted file mode 100644
index 93bb8cd..0000000
--- a/meta-oe/recipes-graphics/mesa/mesa-xlib_7.10.2.bb
+++ /dev/null
@@ -1,4 +0,0 @@
-require mesa-common.inc
-require mesa-${PV}.inc
-require mesa-xlib.inc
-PR = "${INC_PR}.0"
diff --git a/meta-oe/recipes-graphics/mesa/mesa_7.10.2.bb b/meta-oe/recipes-graphics/mesa/mesa_7.10.2.bb
deleted file mode 100644
index 4cb8db7..0000000
--- a/meta-oe/recipes-graphics/mesa/mesa_7.10.2.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-# This is a dummy package so OE can use the poky mesa files
-require mesa-dri_${PV}.bb
-
-PR = "${INC_PR}.0"
-
-EXTRA_OECONF += "--disable-egl"
--
1.7.7
^ permalink raw reply related [flat|nested] 46+ messages in thread
* [meta-oe][meta-efl][PATCHv2 07/25] talloc: drop from meta-oe, no longer needed by mesa
2011-10-03 13:27 ` [meta-oe][meta-efl][PATCHv2 00/25] " Martin Jansa
` (5 preceding siblings ...)
2011-10-03 13:27 ` [meta-oe][meta-efl][PATCHv2 06/25] mesa: drop, there should be mesa-7.11 " Martin Jansa
@ 2011-10-03 13:27 ` Martin Jansa
2011-10-03 13:27 ` [meta-oe][meta-efl][PATCHv2 08/25] glx-use-tls: moved to oe-core with mesa recipes Martin Jansa
` (18 subsequent siblings)
25 siblings, 0 replies; 46+ messages in thread
From: Martin Jansa @ 2011-10-03 13:27 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta-oe/recipes-support/talloc/talloc_2.0.1.bb | 27 ------------------------
1 files changed, 0 insertions(+), 27 deletions(-)
delete mode 100644 meta-oe/recipes-support/talloc/talloc_2.0.1.bb
diff --git a/meta-oe/recipes-support/talloc/talloc_2.0.1.bb b/meta-oe/recipes-support/talloc/talloc_2.0.1.bb
deleted file mode 100644
index a69bd40..0000000
--- a/meta-oe/recipes-support/talloc/talloc_2.0.1.bb
+++ /dev/null
@@ -1,27 +0,0 @@
-DESCRIPTION = "Hierarchical, reference counted memory pool system with destructors"
-HOMEPAGE = "http://talloc.samba.org"
-LICENSE = "LGPL"
-LIC_FILES_CHKSUM = "file://NEWS;md5=5fe776b23a711c9153ee94bc87e47334"
-
-inherit autotools pkgconfig
-
-SRC_URI = "http://samba.org/ftp/${BPN}/${BPN}-${PV}.tar.gz"
-SRC_URI[md5sum] = "c6e736540145ca58cb3dcb42f91cf57b"
-SRC_URI[sha256sum] = "5b810527405f29d54f50efd78bf2c89e318f2cd8bed001f22f2a1412fd27c9b4"
-
-TARGET_CC_ARCH += "${LDFLAGS}"
-
-PR = "r1"
-
-# autoreconf doesn't work well while reconfiguring included libreplace
-do_configure () {
- gnu-configize
- oe_runconf
-}
-
-do_install_append() {
- install -d ${D}${libdir}
- ln -s libtalloc.so.2.0.1 ${D}${libdir}/libtalloc.so.2.0
- ln -s libtalloc.so.2.0 ${D}${libdir}/libtalloc.so.2
- ln -s libtalloc.so.2 ${D}${libdir}/libtalloc.so
-}
--
1.7.7
^ permalink raw reply related [flat|nested] 46+ messages in thread
* [meta-oe][meta-efl][PATCHv2 08/25] glx-use-tls: moved to oe-core with mesa recipes
2011-10-03 13:27 ` [meta-oe][meta-efl][PATCHv2 00/25] " Martin Jansa
` (6 preceding siblings ...)
2011-10-03 13:27 ` [meta-oe][meta-efl][PATCHv2 07/25] talloc: drop from meta-oe, no longer needed by mesa Martin Jansa
@ 2011-10-03 13:27 ` Martin Jansa
2011-10-03 13:27 ` [meta-oe][meta-efl][PATCHv2 09/25] recipes: use allarch instead of PACKAGE_ARCH = all Martin Jansa
` (17 subsequent siblings)
25 siblings, 0 replies; 46+ messages in thread
From: Martin Jansa @ 2011-10-03 13:27 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta-oe/classes/glx-use-tls.bbclass | 7 -------
1 files changed, 0 insertions(+), 7 deletions(-)
delete mode 100644 meta-oe/classes/glx-use-tls.bbclass
diff --git a/meta-oe/classes/glx-use-tls.bbclass b/meta-oe/classes/glx-use-tls.bbclass
deleted file mode 100644
index 7530872..0000000
--- a/meta-oe/classes/glx-use-tls.bbclass
+++ /dev/null
@@ -1,7 +0,0 @@
-def get_tls_setting(bb, d):
- # until we have no prober TLS support in uclibc disable it
- if bb.data.getVar('TARGET_OS', d, 1).find('uclibc') >= 0 :
- return ""
- return "--enable-glx-tls"
-
-EXTRA_OECONF += "${@get_tls_setting(bb, d)}"
--
1.7.7
^ permalink raw reply related [flat|nested] 46+ messages in thread
* [meta-oe][meta-efl][PATCHv2 09/25] recipes: use allarch instead of PACKAGE_ARCH = all
2011-10-03 13:27 ` [meta-oe][meta-efl][PATCHv2 00/25] " Martin Jansa
` (7 preceding siblings ...)
2011-10-03 13:27 ` [meta-oe][meta-efl][PATCHv2 08/25] glx-use-tls: moved to oe-core with mesa recipes Martin Jansa
@ 2011-10-03 13:27 ` Martin Jansa
2011-10-03 13:27 ` [meta-oe][meta-efl][PATCHv2 10/25] glib-2.0: drop 2.29.3+git from meta-oe, there should be 2.30.0 in oe-core Martin Jansa
` (16 subsequent siblings)
25 siblings, 0 replies; 46+ messages in thread
From: Martin Jansa @ 2011-10-03 13:27 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
.../e17/e-wm-theme-illume-efenniht_svn.bb | 4 +-
meta-efl/recipes-efl/e17/e-wm_svn.bb | 22 +-------------------
meta-efl/recipes-efl/e17/exquisite-theme-illume.bb | 5 +--
.../efl/elementary-theme-efenniht_svn.bb | 5 +--
.../hicolor-icon-theme/hicolor-icon-theme_0.12.bb | 6 +---
.../recipes-gnome/themes/gnome-themes_2.32.1.bb | 5 +--
| 6 ++--
.../recipes-navigation/navit/navit-icons_svn.bb | 7 +----
meta-oe/recipes-support/iso-codes/iso-codes_1.4.bb | 7 ++---
9 files changed, 19 insertions(+), 48 deletions(-)
diff --git a/meta-efl/recipes-efl/e17/e-wm-theme-illume-efenniht_svn.bb b/meta-efl/recipes-efl/e17/e-wm-theme-illume-efenniht_svn.bb
index 804f670..aaa2e14 100644
--- a/meta-efl/recipes-efl/e17/e-wm-theme-illume-efenniht_svn.bb
+++ b/meta-efl/recipes-efl/e17/e-wm-theme-illume-efenniht_svn.bb
@@ -4,13 +4,13 @@ HOMEPAGE = "http://trac.enlightenment.org/e/wiki/Themes#Efenniht"
DEPENDS = "edje-native"
RDEPENDS_${PN} = "e-wm"
RSUGGESTS_${PN} = "elementary-theme-efenniht"
-PACKAGE_ARCH = "all"
LICENSE = "MIT/BSD"
SRCREV = "${EFL_SRCREV}"
PV = "0.0+svnr${SRCPV}"
+PR = "r1"
-inherit e-base
+inherit e-base allarch
SRCNAME = "efenniht"
SRC_URI = "${E_SVN}/trunk/THEMES;module=${SRCNAME};proto=http"
diff --git a/meta-efl/recipes-efl/e17/e-wm_svn.bb b/meta-efl/recipes-efl/e17/e-wm_svn.bb
index 2d0f44d..55c9874 100644
--- a/meta-efl/recipes-efl/e17/e-wm_svn.bb
+++ b/meta-efl/recipes-efl/e17/e-wm_svn.bb
@@ -4,7 +4,7 @@ LICENSE = "MIT BSD"
LIC_FILES_CHKSUM = "file://COPYING;md5=2667a0f4120372ea91f7467cdff4095f"
SRCNAME = "e"
PV = "0.16.999.060+svnr${SRCPV}"
-PR = "r19"
+PR = "r20"
SRCREV = "${EFL_SRCREV}"
inherit e update-alternatives gettext
@@ -95,26 +95,6 @@ RRECOMMENDS_${PN} = "\
${ESYSACTIONS} \
"
-PACKAGE_ARCH_${PN}-config-default = "all"
-PACKAGE_ARCH_${PN}-config-illume2 = "all"
-PACKAGE_ARCH_${PN}-config-minimalist = "all"
-PACKAGE_ARCH_${PN}-config-netbook = "all"
-PACKAGE_ARCH_${PN}-config-scaleable = "all"
-PACKAGE_ARCH_${PN}-config-standard = "all"
-PACKAGE_ARCH_${PN}-theme-default = "all"
-PACKAGE_ARCH_${PN}-background-dark-gradient = "all"
-PACKAGE_ARCH_${PN}-background-light-gradient = "all"
-PACKAGE_ARCH_${PN}-images = "all"
-PACKAGE_ARCH_${PN}-icons = "all"
-PACKAGE_ARCH_${PN}-other = "all"
-PACKAGE_ARCH_${PN}-input-methods = "all"
-PACKAGE_ARCH_${PN}-sysactions = "all"
-PACKAGE_ARCH_${PN}-menu = "all"
-PACKAGE_ARCH_efm-desktop-icon = "all"
-PACKAGE_ARCH_illume-keyboard-default-alpha = "all"
-PACKAGE_ARCH_illume-keyboard-default-numeric = "all"
-PACKAGE_ARCH_illume-keyboard-default-terminal = "all"
-
FILES_${PN} = "\
${bindir}/* \
${libdir}/enlightenment/utils/* \
diff --git a/meta-efl/recipes-efl/e17/exquisite-theme-illume.bb b/meta-efl/recipes-efl/e17/exquisite-theme-illume.bb
index ba16190..fa394f7 100644
--- a/meta-efl/recipes-efl/e17/exquisite-theme-illume.bb
+++ b/meta-efl/recipes-efl/e17/exquisite-theme-illume.bb
@@ -3,10 +3,10 @@ LICENSE = "MIT/BSD"
SECTION = "x11"
DEPENDS = "edje-native"
PV = "1.0+svnr${SRCPV}"
-PR = "r6"
+PR = "r7"
SRCREV = "${EFL_SRCREV}"
-inherit e-base update-alternatives
+inherit e-base update-alternatives allarch
ALTERNATIVE_NAME = "exquisite-config"
ALTERNATIVE_LINK = "${sysconfdir}/exquisite/config"
@@ -29,6 +29,5 @@ do_install() {
echo 'THEME="-t illume"' > ${D}${sysconfdir}/exquisite/config-illume
}
-PACKAGE_ARCH = "all"
CONFFILES_${PN} = "${sysconfdir}/exquisite/config-illume"
FILES_${PN} = "${sysconfdir}/exquisite ${datadir}/exquisite/data/themes"
diff --git a/meta-efl/recipes-efl/efl/elementary-theme-efenniht_svn.bb b/meta-efl/recipes-efl/efl/elementary-theme-efenniht_svn.bb
index 68d9ee3..1cf7bd5 100644
--- a/meta-efl/recipes-efl/efl/elementary-theme-efenniht_svn.bb
+++ b/meta-efl/recipes-efl/efl/elementary-theme-efenniht_svn.bb
@@ -3,7 +3,6 @@ SECTION = "e/utils"
HOMEPAGE = "http://trac.enlightenment.org/e/wiki/Themes#Efenniht"
DEPENDS = "edje-native"
RSUGGESTS_${PN} = "e-wm-theme-illume-efenniht"
-PACKAGE_ARCH = "all"
LICENSE = "MIT/BSD"
SRCREV_THM_REV ?= "${EFL_SRCREV}"
@@ -11,9 +10,9 @@ SRCREV_ELM_REV ?= "${EFL_SRCREV}"
SRCREV_FORMAT = "THM_REV"
PV = "0.0+svnr${SRCPV}"
-PACKAGE_ARCH = "all"
+PR = "r1"
-inherit e-base
+inherit e-base allarch
SRCNAME = "efenniht"
SRC_URI = "${E_SVN}/trunk/THEMES;module=${SRCNAME};proto=http;name=THM_REV"
diff --git a/meta-gnome/recipes-gnome/hicolor-icon-theme/hicolor-icon-theme_0.12.bb b/meta-gnome/recipes-gnome/hicolor-icon-theme/hicolor-icon-theme_0.12.bb
index 1934cdb..db43267 100644
--- a/meta-gnome/recipes-gnome/hicolor-icon-theme/hicolor-icon-theme_0.12.bb
+++ b/meta-gnome/recipes-gnome/hicolor-icon-theme/hicolor-icon-theme_0.12.bb
@@ -6,15 +6,13 @@ LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=f08a446809913fc9b3c718f0eaea0426"
SECTION = "unknown"
-inherit gnome
+inherit gnome allarch
-PR = "r0"
+PR = "r1"
SRC_URI = "http://icon-theme.freedesktop.org/releases/${BPN}-${PV}.tar.gz \
file://index.theme"
-PACKAGE_ARCH = "all"
-
FILES_${PN} += "${datadir}/icons"
do_install_append () {
diff --git a/meta-gnome/recipes-gnome/themes/gnome-themes_2.32.1.bb b/meta-gnome/recipes-gnome/themes/gnome-themes_2.32.1.bb
index d0bc699..f40d355 100644
--- a/meta-gnome/recipes-gnome/themes/gnome-themes_2.32.1.bb
+++ b/meta-gnome/recipes-gnome/themes/gnome-themes_2.32.1.bb
@@ -2,6 +2,8 @@ DESCRIPTION = "GNOME themes"
LICENSE = "LGPLv2.1"
LIC_FILES_CHKSUM = "file://COPYING;md5=2b543dc97eb7594d026af39d9b54204b"
+PR = "r1"
+
SECTION = "x11/gnome"
DEPENDS = "gtk-engines icon-naming-utils icon-naming-utils-native glib-2.0 intltool-native"
RDEPENDS_${PN} = "gnome-icon-theme"
@@ -14,9 +16,6 @@ do_configure_prepend() {
sed -i -e 's:`$PKG_CONFIG --variable=program_path icon-naming-utils`:${STAGING_DIR_NATIVE}${libexecdir}:g' configure.in
}
-# allarch doesn't work, it tests the compiler
-PACKAGE_ARCH = "all"
-
PACKAGES =+ " gnome-theme-crux gnome-theme-highcontrast gnome-theme-highcontrastinverse gnome-theme-highcontrastlargeprint gnome-theme-highcontrastlargeprintinverse gnome-theme-largeprint gnome-theme-mist"
FILES_gnome-theme-crux = "${datadir}/themes/Crux ${datadir}/icons/Crux"
FILES_gnome-theme-highcontrast = "${datadir}/themes/HighContrast ${datadir}/icons/HighContrast"
--git a/meta-oe/recipes-core/udev/udev-extra-rules.bb b/meta-oe/recipes-core/udev/udev-extra-rules.bb
index dfd4080..ec3f017 100644
--- a/meta-oe/recipes-core/udev/udev-extra-rules.bb
+++ b/meta-oe/recipes-core/udev/udev-extra-rules.bb
@@ -2,7 +2,9 @@ DESCRIPTION = "Extra udev rules"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58"
-PR = "r2"
+inherit allarch
+
+PR = "r3"
SRC_URI = " \
file://automount.rules \
@@ -31,5 +33,3 @@ do_install() {
FILES_${PN} = "${sysconfdir}/udev"
RDEPENDS_${PN} = "udev"
-PACKAGE_ARCH = "all"
-
diff --git a/meta-oe/recipes-navigation/navit/navit-icons_svn.bb b/meta-oe/recipes-navigation/navit/navit-icons_svn.bb
index 116ff43..8688d0c 100644
--- a/meta-oe/recipes-navigation/navit/navit-icons_svn.bb
+++ b/meta-oe/recipes-navigation/navit/navit-icons_svn.bb
@@ -5,17 +5,14 @@ LIC_FILES_CHKSUM = "file://${WORKDIR}/GPL-2;md5=751419260aa954499f7abaabaa882bbe
SECTION = "x11/applications"
DEPENDS = "glib-2.0 gtk+ imagemagick-native librsvg-native"
-#only icons present in the package
-PACKAGE_ARCH = "all"
-
PV = "0.1.0+svnr${SRCPV}"
-PR = "r2"
+PR = "r3"
EXTRA_OECONF = "--disable-binding-python --disable-gui-sdl --disable-samplemap --enable-avoid-float --enable-avoid-unaligned --enable-svg2png-scaling-flag=32 --disable-speech-speech-dispatcher"
S = "${WORKDIR}/xpm"
-inherit autotools
+inherit autotools allarch
FILES_${PN} = " /usr/share/navit/xpm/"
diff --git a/meta-oe/recipes-support/iso-codes/iso-codes_1.4.bb b/meta-oe/recipes-support/iso-codes/iso-codes_1.4.bb
index de1893d..c9b9113 100644
--- a/meta-oe/recipes-support/iso-codes/iso-codes_1.4.bb
+++ b/meta-oe/recipes-support/iso-codes/iso-codes_1.4.bb
@@ -1,13 +1,12 @@
LICENSE = "LGPLv2.1"
LIC_FILES_CHKSUM = "file://LGPL-2.1;md5=fbc093901857fcd118f065f900982c24"
-PACKAGE_ARCH = "all"
+PR = "r1"
+
SRC_URI = "ftp://pkg-isocodes.alioth.debian.org/pub/pkg-isocodes/iso-codes-${PV}.tar.bz2"
SRC_URI[md5sum] = "4073466e57df23d39721513219e4f7ae"
SRC_URI[sha256sum] = "0a7cf177c25b3f0d77c60a5f1149aab9e03ba70f69bac70138a867efe19a1d97"
-inherit autotools
+inherit autotools allarch
FILES_${PN} += "${datadir}/xml/"
-PACKAGE_ARCH = "all"
-
--
1.7.7
^ permalink raw reply related [flat|nested] 46+ messages in thread
* [meta-oe][meta-efl][PATCHv2 10/25] glib-2.0: drop 2.29.3+git from meta-oe, there should be 2.30.0 in oe-core
2011-10-03 13:27 ` [meta-oe][meta-efl][PATCHv2 00/25] " Martin Jansa
` (8 preceding siblings ...)
2011-10-03 13:27 ` [meta-oe][meta-efl][PATCHv2 09/25] recipes: use allarch instead of PACKAGE_ARCH = all Martin Jansa
@ 2011-10-03 13:27 ` Martin Jansa
2011-10-03 13:27 ` [meta-oe][meta-efl][PATCHv2 11/25] gdbus-binding-tool: drop from meta-oe, superseeded by glib-2.30.0 where it's included Martin Jansa
` (15 subsequent siblings)
25 siblings, 0 replies; 46+ messages in thread
From: Martin Jansa @ 2011-10-03 13:27 UTC (permalink / raw)
To: openembedded-devel
* see http://lists.linuxtogo.org/pipermail/openembedded-core/2011-September/010447.html
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta-oe/recipes-core/glib-2.0/glib-2.0.inc | 6 -
...003-gatomic-proper-pointer-get-cast.patch.patch | 28 -----
.../0005-glib-mkenums-interpreter.patch.patch | 25 -----
.../60_wait-longer-for-threads-to-die.patch | 33 ------
.../glib-2.0/glib-2.0/configure-libtool.patch | 38 -------
.../glib-2.0/glib-2.0/g_once_init_enter.patch | 24 -----
.../glib-2.0/glib-2.0/glib-gettextize-dir.patch | 24 -----
.../recipes-core/glib-2.0/glib-2.0/no-iconv.patch | 104 --------------------
.../glib-2.0/remove.test.for.qsort_r.patch | 54 ----------
meta-oe/recipes-core/glib-2.0/glib-2.0_git.bb | 32 ------
meta-oe/recipes-core/glib-2.0/glib.inc | 38 -------
11 files changed, 0 insertions(+), 406 deletions(-)
delete mode 100644 meta-oe/recipes-core/glib-2.0/glib-2.0.inc
delete mode 100644 meta-oe/recipes-core/glib-2.0/glib-2.0/0003-gatomic-proper-pointer-get-cast.patch.patch
delete mode 100644 meta-oe/recipes-core/glib-2.0/glib-2.0/0005-glib-mkenums-interpreter.patch.patch
delete mode 100644 meta-oe/recipes-core/glib-2.0/glib-2.0/60_wait-longer-for-threads-to-die.patch
delete mode 100644 meta-oe/recipes-core/glib-2.0/glib-2.0/configure-libtool.patch
delete mode 100644 meta-oe/recipes-core/glib-2.0/glib-2.0/g_once_init_enter.patch
delete mode 100644 meta-oe/recipes-core/glib-2.0/glib-2.0/glib-gettextize-dir.patch
delete mode 100644 meta-oe/recipes-core/glib-2.0/glib-2.0/no-iconv.patch
delete mode 100644 meta-oe/recipes-core/glib-2.0/glib-2.0/remove.test.for.qsort_r.patch
delete mode 100644 meta-oe/recipes-core/glib-2.0/glib-2.0_git.bb
delete mode 100644 meta-oe/recipes-core/glib-2.0/glib.inc
diff --git a/meta-oe/recipes-core/glib-2.0/glib-2.0.inc b/meta-oe/recipes-core/glib-2.0/glib-2.0.inc
deleted file mode 100644
index ccbbd2b..0000000
--- a/meta-oe/recipes-core/glib-2.0/glib-2.0.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-
-python () {
- import bb
- if bb.data.getVar("USE_NLS", d, 1) == "no":
- raise bb.parse.SkipPackage("${PN} requires native language support.")
-}
diff --git a/meta-oe/recipes-core/glib-2.0/glib-2.0/0003-gatomic-proper-pointer-get-cast.patch.patch b/meta-oe/recipes-core/glib-2.0/glib-2.0/0003-gatomic-proper-pointer-get-cast.patch.patch
deleted file mode 100644
index ad1ca12..0000000
--- a/meta-oe/recipes-core/glib-2.0/glib-2.0/0003-gatomic-proper-pointer-get-cast.patch.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 3d371334d5668bcd02a38ff99884bd343c244d68 Mon Sep 17 00:00:00 2001
-From: Koen Kooi <koen@dominion.thruhere.net>
-Date: Sat, 18 Jun 2011 23:51:35 +0200
-Subject: [PATCH 3/7] gatomic-proper-pointer-get-cast.patch
-
-Upstream-Status: Unknown
-
-Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
----
- glib/gatomic.h | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/glib/gatomic.h b/glib/gatomic.h
-index ddd39b8..b758142 100644
---- a/glib/gatomic.h
-+++ b/glib/gatomic.h
-@@ -70,7 +70,7 @@ void g_atomic_pointer_set (volatile gpointer G_GNUC_MAY_ALI
- (g_atomic_int_set) ((volatile gint G_GNUC_MAY_ALIAS *) (volatile void *) (atomic), (newval)))
- # define g_atomic_pointer_get(atomic) \
- ((void) sizeof (gchar [sizeof (*(atomic)) == sizeof (gpointer) ? 1 : -1]), \
-- (g_atomic_pointer_get) ((volatile gpointer G_GNUC_MAY_ALIAS *) (volatile void *) (atomic)))
-+ (g_atomic_pointer_get) ((volatile gpointer G_GNUC_MAY_ALIAS *) (volatile void G_GNUC_MAY_ALIAS *) (atomic)))
- # define g_atomic_pointer_set(atomic, newval) \
- ((void) sizeof (gchar [sizeof (*(atomic)) == sizeof (gpointer) ? 1 : -1]), \
- (g_atomic_pointer_set) ((volatile gpointer G_GNUC_MAY_ALIAS *) (volatile void *) (atomic), (newval)))
---
-1.6.6.1
-
diff --git a/meta-oe/recipes-core/glib-2.0/glib-2.0/0005-glib-mkenums-interpreter.patch.patch b/meta-oe/recipes-core/glib-2.0/glib-2.0/0005-glib-mkenums-interpreter.patch.patch
deleted file mode 100644
index 6780330..0000000
--- a/meta-oe/recipes-core/glib-2.0/glib-2.0/0005-glib-mkenums-interpreter.patch.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From a8e5c4a808e7f8572bd5023645a6cb4386b9aff8 Mon Sep 17 00:00:00 2001
-From: Koen Kooi <koen@dominion.thruhere.net>
-Date: Sat, 18 Jun 2011 23:52:17 +0200
-Subject: [PATCH 5/7] don't leak buildpaths into perl hashbang
-
-Upstream-Status: Unknown
-
-Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
----
- gobject/glib-mkenums.in | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/gobject/glib-mkenums.in b/gobject/glib-mkenums.in
-index 6372245..b486fe9 100755
---- a/gobject/glib-mkenums.in
-+++ b/gobject/glib-mkenums.in
-@@ -1,4 +1,4 @@
--#! @PERL_PATH@
-+#! /usr/bin/env perl
-
- use warnings;
- use File::Basename;
---
-1.6.6.1
-
diff --git a/meta-oe/recipes-core/glib-2.0/glib-2.0/60_wait-longer-for-threads-to-die.patch b/meta-oe/recipes-core/glib-2.0/glib-2.0/60_wait-longer-for-threads-to-die.patch
deleted file mode 100644
index b65a474..0000000
--- a/meta-oe/recipes-core/glib-2.0/glib-2.0/60_wait-longer-for-threads-to-die.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-copy from OE, said to borrow from Ubuntu. Not in glib-2.0 upstream yet. Add for sanity.
-Added to poky by Kevin Tian <kevin.tian@intel.com>, 06/25/2010
-Rebased for glib-2.27.3 by Dongxiao Xu <dongxiao.xu@intel.com>, 11/16/2010
-
-Upstream-Status: Inappropriate [patches for test code]
-
-diff -ruN glib-2.27.3-orig/tests/threadpool-test.c glib-2.27.3/tests/threadpool-test.c
---- glib-2.27.3-orig/tests/threadpool-test.c 2009-04-01 07:04:21.000000000 +0800
-+++ glib-2.27.3/tests/threadpool-test.c 2010-11-16 12:28:09.002172678 +0800
-@@ -5,8 +5,8 @@
-
- #include <glib.h>
-
--#define DEBUG_MSG(x)
--/* #define DEBUG_MSG(args) g_printerr args ; g_printerr ("\n"); */
-+/* #define DEBUG_MSG(x) */
-+#define DEBUG_MSG(args) g_printerr args ; g_printerr ("\n");
-
- #define WAIT 5 /* seconds */
- #define MAX_THREADS 10
-@@ -124,10 +124,10 @@
- DEBUG_MSG (("[unused] stopping unused threads"));
- g_thread_pool_stop_unused_threads ();
-
-- DEBUG_MSG (("[unused] waiting ONE second for threads to die"));
-+ DEBUG_MSG (("[unused] waiting FIVE second for threads to die"));
-
- /* Some time for threads to die. */
-- g_usleep (G_USEC_PER_SEC);
-+ g_usleep (5 * G_USEC_PER_SEC);
-
- DEBUG_MSG (("[unused] stopped idle threads, %d remain, %d threads still exist",
- g_thread_pool_get_num_unused_threads (),
diff --git a/meta-oe/recipes-core/glib-2.0/glib-2.0/configure-libtool.patch b/meta-oe/recipes-core/glib-2.0/glib-2.0/configure-libtool.patch
deleted file mode 100644
index c21e378..0000000
--- a/meta-oe/recipes-core/glib-2.0/glib-2.0/configure-libtool.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-# Poky renames libtool to $host_alias-libtool.
-# ./$host_alias-libtool isn't created until after configure runs with libtool >= 2.2.2
-# so we can't call # it at this point. We can safely assume a version is available
-# from PATH though
-# Rebased to glib-2.27.3 by Dongxiao Xu <dongxiao.xu@intel.com>
-
-Upstream-Status: Inappropriate [configuration]
-
-diff -ruN glib-2.27.3-orig/configure.ac glib-2.27.3/configure.ac
---- glib-2.27.3-orig/configure.ac 2010-11-03 11:02:05.000000000 +0800
-+++ glib-2.27.3/configure.ac 2010-11-16 12:38:12.610485990 +0800
-@@ -1385,7 +1385,7 @@
- G_MODULE_LDFLAGS=
- else
- export SED
-- G_MODULE_LDFLAGS=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
-+ G_MODULE_LDFLAGS=`(./$host_alias-libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
- fi
- dnl G_MODULE_IMPL= don't reset, so cmd-line can override
- G_MODULE_NEED_USCORE=0
-@@ -1450,7 +1450,7 @@
- LDFLAGS="$LDFLAGS $G_MODULE_LDFLAGS"
- dnl *** check for OSF1/5.0 RTLD_GLOBAL brokenness
- echo "void glib_plugin_test(void) { }" > plugin.c
-- ${SHELL} ./libtool --mode=compile ${CC} -shared \
-+ ${SHELL} ./$host_alias-libtool --mode=compile ${CC} -shared \
- -export-dynamic -o plugin.o plugin.c 2>&1 >/dev/null
- AC_CACHE_CHECK([for RTLD_GLOBAL brokenness],
- glib_cv_rtldglobal_broken,[
-@@ -1524,7 +1524,7 @@
-
- AC_MSG_CHECKING(for the suffix of module shared libraries)
- export SED
--shrext_cmds=`./libtool --config | grep '^shrext_cmds='`
-+shrext_cmds=`./$host_alias-libtool --config | grep '^shrext_cmds='`
- eval $shrext_cmds
- module=yes eval std_shrext=$shrext_cmds
- # chop the initial dot
diff --git a/meta-oe/recipes-core/glib-2.0/glib-2.0/g_once_init_enter.patch b/meta-oe/recipes-core/glib-2.0/glib-2.0/g_once_init_enter.patch
deleted file mode 100644
index 2eaa19b..0000000
--- a/meta-oe/recipes-core/glib-2.0/glib-2.0/g_once_init_enter.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-fix g_once_init_enter compile failure
-
-Kernelshark trips over a compile bug in glib-2.0 addressed by Open Embedded
-back in the 2.22 timeframe. It appears to still be present in 2.27.
-
-http://www.mail-archive.com/openembedded-devel@lists.openembedded.org/msg005
-
-Signed-off-by: Darren Hart <dvhart@linux.intel.com>
-
-Upstream-Status: Pending
-
-Index: glib-2.27.5/glib/gthread.h
-===================================================================
---- glib-2.27.5.orig/glib/gthread.h
-+++ glib-2.27.5/glib/gthread.h
-@@ -344,7 +344,7 @@ void g_once_init_leav
- G_INLINE_FUNC gboolean
- g_once_init_enter (volatile gsize *value_location)
- {
-- if G_LIKELY ((gpointer) g_atomic_pointer_get (value_location) != NULL)
-+ if G_LIKELY ((gpointer) g_atomic_pointer_get ((volatile gpointer *)value_location) != NULL)
- return FALSE;
- else
- return g_once_init_enter_impl (value_location);
diff --git a/meta-oe/recipes-core/glib-2.0/glib-2.0/glib-gettextize-dir.patch b/meta-oe/recipes-core/glib-2.0/glib-2.0/glib-gettextize-dir.patch
deleted file mode 100644
index ee43511..0000000
--- a/meta-oe/recipes-core/glib-2.0/glib-2.0/glib-gettextize-dir.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-# an very old patch cherry-picked in every glib-2.0 patch directory. The earliest container
-# for it is 2.6.5 in OE. The earliest commit for it is c8e5702127e507e82e6f68a4b8c546803accea9d
-# in OE side which ports from previous bitkeeper SCM. In OE side it's only used til 2.12.4.
-#
-# keep it since it's always cleaner to not hardcode destination path. Use @datadir@ is more
-# portable here. mark for upstream
-#
-# by Kevin Tian <kevin.tian@intel.com>, 06/25/2010
-# Rebased by Dongxiao Xu <dongxiao.xu@intel.com>, 11/16/2010
-
-Upstream-Status: Inappropriate [configuration]
-
-diff -ruN glib-2.27.3-orig/glib-gettextize.in glib-2.27.3/glib-gettextize.in
---- glib-2.27.3-orig/glib-gettextize.in 2009-04-01 07:04:20.000000000 +0800
-+++ glib-2.27.3/glib-gettextize.in 2010-11-16 12:55:06.874605916 +0800
-@@ -52,7 +52,7 @@
- datadir=@datadir@
- datarootdir=@datarootdir@
-
--gettext_dir=$prefix/share/glib-2.0/gettext
-+gettext_dir=@datadir@/glib-2.0/gettext
-
- while test $# -gt 0; do
- case "$1" in
diff --git a/meta-oe/recipes-core/glib-2.0/glib-2.0/no-iconv.patch b/meta-oe/recipes-core/glib-2.0/glib-2.0/no-iconv.patch
deleted file mode 100644
index cca57d4..0000000
--- a/meta-oe/recipes-core/glib-2.0/glib-2.0/no-iconv.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-We provide dummy implementation of iconv functionality if it does not find
-iconv which will be case with uclibc. We remove the check for iconv in configure
-
-This is needed when libintl and libiconv is not available. It wont have any
-impact on case when they are available.
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
-
-Index: glib-2.26.1/glib/gconvert.c
-===================================================================
---- glib-2.26.1.orig/glib/gconvert.c
-+++ glib-2.26.1/glib/gconvert.c
-@@ -23,7 +23,7 @@
- #include "config.h"
- #include "glibconfig.h"
-
--#ifndef G_OS_WIN32
-+#if !defined G_OS_WIN32 && defined HAVE_ICONV_H
- #include <iconv.h>
- #endif
- #include <errno.h>
-@@ -65,6 +65,28 @@
- #error GNU libiconv not in use but included iconv.h is from libiconv
- #endif
-
-+#ifndef HAVE_ICONV_H
-+typedef void *iconv_t;
-+
-+iconv_t iconv_open(const char *tocode, const char *fromcode)
-+{
-+ return (iconv_t)(-1);
-+}
-+
-+int iconv_close(iconv_t cd)
-+{
-+ free(cd);
-+
-+ return 0;
-+}
-+size_t iconv (iconv_t __cd, char **__inbuf,
-+ size_t *__inbytesleft,
-+ char **__outbuf,
-+ size_t *__outbytesleft)
-+{
-+ return 0;
-+}
-+#endif
-
- /**
- * SECTION:conversions
-Index: glib-2.26.1/configure.ac
-===================================================================
---- glib-2.26.1.orig/configure.ac
-+++ glib-2.26.1/configure.ac
-@@ -373,46 +373,8 @@ dnl *** Tests for iconv ***
- dnl ***********************
- dnl
- dnl We do this before the gettext checks, to avoid distortion
--
--dnl On Windows we use a native implementation
--
--if test x"$glib_native_win32" = xyes; then
-- with_libiconv=native
--else
-- AC_ARG_WITH(libiconv,
-- [AC_HELP_STRING([--with-libiconv=@<:@no/gnu/native@:>@],
-- [use the libiconv library])],,
-- [with_libiconv=maybe])
--
-- found_iconv=no
-- case $with_libiconv in
-- maybe)
-- # Check in the C library first
-- AC_CHECK_FUNC(iconv_open, [with_libiconv=no; found_iconv=yes])
-- # Check if we have GNU libiconv
-- if test $found_iconv = "no"; then
-- AC_CHECK_LIB(iconv, libiconv_open, [with_libiconv=gnu; found_iconv=yes])
-- fi
-- # Check if we have a iconv in -liconv, possibly from vendor
-- if test $found_iconv = "no"; then
-- AC_CHECK_LIB(iconv, iconv_open, [with_libiconv=native; found_iconv=yes])
-- fi
-- ;;
-- no)
-- AC_CHECK_FUNC(iconv_open, [with_libiconv=no; found_iconv=yes])
-- ;;
-- gnu|yes)
-- AC_CHECK_LIB(iconv, libiconv_open, [with_libiconv=gnu; found_iconv=yes])
-- ;;
-- native)
-- AC_CHECK_LIB(iconv, iconv_open, [with_libiconv=native; found_iconv=yes])
-- ;;
-- esac
--
-- if test "x$found_iconv" = "xno" ; then
-- AC_MSG_ERROR([*** No iconv() implementation found in C library or libiconv])
-- fi
--fi
-+found_iconv=yes
-+with_libiconv=no
-
- gl_GLIBC21
- AC_ARG_ENABLE(iconv-cache,
diff --git a/meta-oe/recipes-core/glib-2.0/glib-2.0/remove.test.for.qsort_r.patch b/meta-oe/recipes-core/glib-2.0/glib-2.0/remove.test.for.qsort_r.patch
deleted file mode 100644
index 3300eb0..0000000
--- a/meta-oe/recipes-core/glib-2.0/glib-2.0/remove.test.for.qsort_r.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-while cross compiling we cannot execute run tests
-
-diff --git a/configure.ac b/configure.ac
-index 378b082..3f2a8d3 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -580,46 +580,7 @@ AC_FUNC_VPRINTF
- AC_FUNC_ALLOCA
- AC_CHECK_FUNCS(mmap posix_memalign memalign valloc fsync pipe2)
- AC_CHECK_FUNCS(atexit on_exit timegm gmtime_r)
--# BSD has a qsort_r with wrong argument order
--AC_CACHE_CHECK([for qsort_r], glib_cv_have_qsort_r, [
--AC_RUN_IFELSE([AC_LANG_SOURCE([[
--#define _GNU_SOURCE
--#include <stdlib.h>
--
--static int
--cmp (const void *a, const void *b, void *c)
--{
-- const int *ia = a;
-- const int *ib = b;
--
-- if (*ia < *ib)
-- return -1;
-- else if (*ia > *ib)
-- return 1;
-- else
-- return 0;
--}
--
--int
--main (int argc, char **argv)
--{
-- int arr[3] = { 1, 2, 0 };
-- int d = 3;
--
-- qsort_r (arr, 3, sizeof (int), cmp, &d);
--
-- if (arr[0] == 0 && arr[1] == 1 && arr[2] == 2)
-- return 0;
-- else
-- return 1;
--}]])],[glib_cv_have_qsort_r=yes],[glib_cv_have_qsort_r=no])])
--
--if test $glib_cv_have_qsort_r = yes ; then
-- AC_MSG_RESULT([yes])
-- AC_DEFINE(HAVE_QSORT_R, 1, [Define to 1 if you have the 'qsort_r' function])
--else
-- AC_MSG_RESULT([no])
--fi
-+AC_DEFINE(HAVE_QSORT_R, 1, [Define to 1 if you have the 'qsort_r' function])
-
- AC_CHECK_SIZEOF(char)
- AC_CHECK_SIZEOF(short)
diff --git a/meta-oe/recipes-core/glib-2.0/glib-2.0_git.bb b/meta-oe/recipes-core/glib-2.0/glib-2.0_git.bb
deleted file mode 100644
index 34fcaf6..0000000
--- a/meta-oe/recipes-core/glib-2.0/glib-2.0_git.bb
+++ /dev/null
@@ -1,32 +0,0 @@
-require glib.inc
-
-PE = "1"
-PR = "r1"
-
-DEFAULT_PREFERENCE = "-1"
-
-DEPENDS += "libffi python-argparse-native"
-DEPENDS_virtclass-native += "libffi-native python-argparse-native"
-
-SRC_URI = "git://git.gnome.org/glib;protocol=git;branch=master \
- file://configure-libtool.patch \
- file://60_wait-longer-for-threads-to-die.patch \
- file://g_once_init_enter.patch \
- file://remove.test.for.qsort_r.patch \
- "
-SRCREV = "d97cbc6731deab137770bc0fe9c69b06f689f5b4"
-PV = "2.29.3+gitr${SRCPV}"
-S = "${WORKDIR}/git"
-
-# Only apply this patch for target recipe on uclibc
-SRC_URI_append_libc-uclibc = " ${@['', 'file://no-iconv.patch']['${PN}' == '${BPN}']}"
-
-SRC_URI_append_virtclass-native = " file://glib-gettextize-dir.patch"
-BBCLASSEXTEND = "native"
-
-do_configure_prepend() {
- # missing ${topdir}/gtk-doc.make and --disable-gtk-doc* is not enough, because it calls gtkdocize (not provided by gtk-doc-native)
- sed -i '/^docs/d' ${S}/configure.ac
- sed -i 's/SUBDIRS = . m4macros glib gmodule gthread gobject gio tests po docs/SUBDIRS = . m4macros glib gmodule gthread gobject gio tests po/g' ${S}/Makefile.am
- sed -i -e "s:TEST_PROGS += gdbus-serialization::g" ${S}/gio/tests/Makefile.am
-}
diff --git a/meta-oe/recipes-core/glib-2.0/glib.inc b/meta-oe/recipes-core/glib-2.0/glib.inc
deleted file mode 100644
index 0800c85..0000000
--- a/meta-oe/recipes-core/glib-2.0/glib.inc
+++ /dev/null
@@ -1,38 +0,0 @@
-SUMMARY = "A general-purpose utility library"
-DESCRIPTION = "GLib is a general-purpose utility library, which provides many useful data types, macros, type conversions, string utilities, file utilities, a main loop abstraction, and so on."
-# pcre is under BSD;
-# docs/reference/COPYING is with a 'public domai'-like license!
-LICENSE = "LGPLv2+ & BSD & PD"
-LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \
- file://glib/glib.h;startline=4;endline=17;md5=a4332fe58b076f29d07c9c066d2967b6 \
- file://gmodule/COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \
- file://gmodule/gmodule.h;startline=4;endline=17;md5=76ab161b37202cd004073c42fac276ed \
- file://glib/pcre/COPYING;md5=266ebc3ff74ee9ce6fad65577667c0f4 \
- file://glib/pcre/pcre.h;startline=11;endline=35;md5=ce867cf87ebbd2bb55e980d90328390d \
- file://docs/reference/COPYING;md5=f51a5100c17af6bae00735cd791e1fcc"
-BUGTRACKER = "http://bugzilla.gnome.org"
-SECTION = "libs"
-
-require glib-2.0.inc
-
-DEPENDS = "glib-2.0-native gtk-doc-native zip dbus"
-DEPENDS_virtclass-native = "gtk-doc-native pkgconfig-native gettext-native dbus-native"
-DEPENDS_virtclass-nativesdk = "libtool-nativesdk"
-PACKAGES =+ "${PN}-utils "
-
-LEAD_SONAME = "libglib-2.0.*"
-FILES_${PN}-utils = "${bindir}/*"
-
-inherit autotools pkgconfig gettext
-
-S = "${WORKDIR}/glib-${PV}"
-
-EXTRA_OECONF = "--disable-debug --enable-included-printf=no"
-EXTRA_OECONF_virtclass-native = ""
-EXTRA_OECONF_linuxstdbase = "--enable-included-printf=no"
-
-FILES_${PN} = "${libdir}/lib*${SOLIBS} ${sysconfdir}/bash_completion.d ${datadir}/glib-2.0/schemas"
-FILES_${PN}-dev += "${libdir}/glib-2.0/include"
-FILES_${PN}-dbg += "${datadir}/glib-2.0/gdb ${datadir}/gdb"
-
-ARM_INSTRUCTION_SET = "arm"
--
1.7.7
^ permalink raw reply related [flat|nested] 46+ messages in thread
* [meta-oe][meta-efl][PATCHv2 11/25] gdbus-binding-tool: drop from meta-oe, superseeded by glib-2.30.0 where it's included
2011-10-03 13:27 ` [meta-oe][meta-efl][PATCHv2 00/25] " Martin Jansa
` (9 preceding siblings ...)
2011-10-03 13:27 ` [meta-oe][meta-efl][PATCHv2 10/25] glib-2.0: drop 2.29.3+git from meta-oe, there should be 2.30.0 in oe-core Martin Jansa
@ 2011-10-03 13:27 ` Martin Jansa
2011-10-03 13:27 ` [meta-oe][meta-efl][PATCHv2 12/25] pango: upgrade to 1.29.4 Martin Jansa
` (14 subsequent siblings)
25 siblings, 0 replies; 46+ messages in thread
From: Martin Jansa @ 2011-10-03 13:27 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
.../gdbus-binding-tool/gdbus-binding-tool/COPYING | 482 --------------------
.../gdbus-binding-tool/gdbus-binding-tool_git.bb | 37 --
2 files changed, 0 insertions(+), 519 deletions(-)
delete mode 100644 meta-oe/recipes-devtools/gdbus-binding-tool/gdbus-binding-tool/COPYING
delete mode 100644 meta-oe/recipes-devtools/gdbus-binding-tool/gdbus-binding-tool_git.bb
diff --git a/meta-oe/recipes-devtools/gdbus-binding-tool/gdbus-binding-tool/COPYING b/meta-oe/recipes-devtools/gdbus-binding-tool/gdbus-binding-tool/COPYING
deleted file mode 100644
index bf50f20..0000000
--- a/meta-oe/recipes-devtools/gdbus-binding-tool/gdbus-binding-tool/COPYING
+++ /dev/null
@@ -1,482 +0,0 @@
- GNU LIBRARY GENERAL PUBLIC LICENSE
- Version 2, June 1991
-
- Copyright (C) 1991 Free Software Foundation, Inc.
- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the library GPL. It is
- numbered 2 because it goes with version 2 of the ordinary GPL.]
-
- Preamble
-
- The licenses for most software are designed to take away your
-freedom to share and change it. By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
- This license, the Library General Public License, applies to some
-specially designated Free Software Foundation software, and to any
-other libraries whose authors decide to use it. You can use it for
-your libraries, too.
-
- When we speak of free software, we are referring to freedom, not
-price. Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
- To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if
-you distribute copies of the library, or if you modify it.
-
- For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you. You must make sure that they, too, receive or can get the source
-code. If you link a program with the library, you must provide
-complete object files to the recipients so that they can relink them
-with the library, after making changes to the library and recompiling
-it. And you must show them these terms so they know their rights.
-
- Our method of protecting your rights has two steps: (1) copyright
-the library, and (2) offer you this license which gives you legal
-permission to copy, distribute and/or modify the library.
-
- Also, for each distributor's protection, we want to make certain
-that everyone understands that there is no warranty for this free
-library. If the library is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original
-version, so that any problems introduced by others will not reflect on
-the original authors' reputations.
-\f
- Finally, any free program is threatened constantly by software
-patents. We wish to avoid the danger that companies distributing free
-software will individually obtain patent licenses, thus in effect
-transforming the program into proprietary software. To prevent this,
-we have made it clear that any patent must be licensed for everyone's
-free use or not licensed at all.
-
- Most GNU software, including some libraries, is covered by the ordinary
-GNU General Public License, which was designed for utility programs. This
-license, the GNU Library General Public License, applies to certain
-designated libraries. This license is quite different from the ordinary
-one; be sure to read it in full, and don't assume that anything in it is
-the same as in the ordinary license.
-
- The reason we have a separate public license for some libraries is that
-they blur the distinction we usually make between modifying or adding to a
-program and simply using it. Linking a program with a library, without
-changing the library, is in some sense simply using the library, and is
-analogous to running a utility program or application program. However, in
-a textual and legal sense, the linked executable is a combined work, a
-derivative of the original library, and the ordinary General Public License
-treats it as such.
-
- Because of this blurred distinction, using the ordinary General
-Public License for libraries did not effectively promote software
-sharing, because most developers did not use the libraries. We
-concluded that weaker conditions might promote sharing better.
-
- However, unrestricted linking of non-free programs would deprive the
-users of those programs of all benefit from the free status of the
-libraries themselves. This Library General Public License is intended to
-permit developers of non-free programs to use free libraries, while
-preserving your freedom as a user of such programs to change the free
-libraries that are incorporated in them. (We have not seen how to achieve
-this as regards changes in header files, but we have achieved it as regards
-changes in the actual functions of the Library.) The hope is that this
-will lead to faster development of free libraries.
-
- The precise terms and conditions for copying, distribution and
-modification follow. Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library". The
-former contains code derived from the library, while the latter only
-works together with the library.
-
- Note that it is possible for a library to be covered by the ordinary
-General Public License rather than by this special one.
-\f
- GNU LIBRARY GENERAL PUBLIC LICENSE
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
- 0. This License Agreement applies to any software library which
-contains a notice placed by the copyright holder or other authorized
-party saying it may be distributed under the terms of this Library
-General Public License (also called "this License"). Each licensee is
-addressed as "you".
-
- A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
- The "Library", below, refers to any such software library or work
-which has been distributed under these terms. A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language. (Hereinafter, translation is
-included without limitation in the term "modification".)
-
- "Source code" for a work means the preferred form of the work for
-making modifications to it. For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
- Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope. The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it). Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-
- 1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
- You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-\f
- 2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
- a) The modified work must itself be a software library.
-
- b) You must cause the files modified to carry prominent notices
- stating that you changed the files and the date of any change.
-
- c) You must cause the whole of the work to be licensed at no
- charge to all third parties under the terms of this License.
-
- d) If a facility in the modified Library refers to a function or a
- table of data to be supplied by an application program that uses
- the facility, other than as an argument passed when the facility
- is invoked, then you must make a good faith effort to ensure that,
- in the event an application does not supply such function or
- table, the facility still operates, and performs whatever part of
- its purpose remains meaningful.
-
- (For example, a function in a library to compute square roots has
- a purpose that is entirely well-defined independent of the
- application. Therefore, Subsection 2d requires that any
- application-supplied function or table used by this function must
- be optional: if the application does not supply it, the square
- root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole. If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works. But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
- 3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library. To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License. (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.) Do not make any other change in
-these notices.
-\f
- Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
- This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
- 4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
- If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
- 5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library". Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
- However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library". The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
- When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library. The
-threshold for this to be true is not precisely defined by law.
-
- If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work. (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
- Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-\f
- 6. As an exception to the Sections above, you may also compile or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
- You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License. You must supply a copy of this License. If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License. Also, you must do one
-of these things:
-
- a) Accompany the work with the complete corresponding
- machine-readable source code for the Library including whatever
- changes were used in the work (which must be distributed under
- Sections 1 and 2 above); and, if the work is an executable linked
- with the Library, with the complete machine-readable "work that
- uses the Library", as object code and/or source code, so that the
- user can modify the Library and then relink to produce a modified
- executable containing the modified Library. (It is understood
- that the user who changes the contents of definitions files in the
- Library will not necessarily be able to recompile the application
- to use the modified definitions.)
-
- b) Accompany the work with a written offer, valid for at
- least three years, to give the same user the materials
- specified in Subsection 6a, above, for a charge no more
- than the cost of performing this distribution.
-
- c) If distribution of the work is made by offering access to copy
- from a designated place, offer equivalent access to copy the above
- specified materials from the same place.
-
- d) Verify that the user has already received a copy of these
- materials or that you have already sent this user a copy.
-
- For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it. However, as a special exception,
-the source code distributed need not include anything that is normally
-distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
- It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system. Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-\f
- 7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
- a) Accompany the combined library with a copy of the same work
- based on the Library, uncombined with any other library
- facilities. This must be distributed under the terms of the
- Sections above.
-
- b) Give prominent notice with the combined library of the fact
- that part of it is a work based on the Library, and explaining
- where to find the accompanying uncombined form of the same work.
-
- 8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License. Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License. However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
- 9. You are not required to accept this License, since you have not
-signed it. However, nothing else grants you permission to modify or
-distribute the Library or its derivative works. These actions are
-prohibited by law if you do not accept this License. Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
- 10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions. You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-\f
- 11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all. For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices. Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
- 12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded. In such case, this License incorporates the limitation as if
-written in the body of this License.
-
- 13. The Free Software Foundation may publish revised and/or new
-versions of the Library General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation. If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-\f
- 14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission. For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this. Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
- NO WARRANTY
-
- 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
- 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
- END OF TERMS AND CONDITIONS
-\f
- How to Apply These Terms to Your New Libraries
-
- If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change. You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms of the
-ordinary General Public License).
-
- To apply these terms, attach the following notices to the library. It is
-safest to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least the
-"copyright" line and a pointer to where the full notice is found.
-
- <one line to give the library's name and a brief idea of what it does.>
- Copyright (C) <year> <name of author>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public
- License along with this library; if not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307 USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the library, if
-necessary. Here is a sample; alter the names:
-
- Yoyodyne, Inc., hereby disclaims all copyright interest in the
- library `Frob' (a library for tweaking knobs) written by James Random Hacker.
-
- <signature of Ty Coon>, 1 April 1990
- Ty Coon, President of Vice
-
-That's all there is to it!
diff --git a/meta-oe/recipes-devtools/gdbus-binding-tool/gdbus-binding-tool_git.bb b/meta-oe/recipes-devtools/gdbus-binding-tool/gdbus-binding-tool_git.bb
deleted file mode 100644
index 715a7a9..0000000
--- a/meta-oe/recipes-devtools/gdbus-binding-tool/gdbus-binding-tool_git.bb
+++ /dev/null
@@ -1,37 +0,0 @@
-DESCRIPTION = "gdbus-binding-tool is used to generate C code for interacting with remote objects using D-Bus."
-DEPENDS = "glib-2.0 libffi python-argparse gdbus-binding-tool-native"
-DEPENDS_virtclass-native = "glib-2.0-native libffi-native python-argparse-native"
-RDEPENDS_${PN} = "glib-2.0-utils"
-# taken from glib where this is supposed to be moved later
-LICENSE = "LGPLv2+ & BSD & public domain"
-LIC_FILES_CHKSUM = "file://${WORKDIR}/COPYING;md5=3bf50002aefd002f49e7bb854063f7e7"
-
-PR = "r2"
-
-inherit autotools pkgconfig
-
-SRC_URI = "git://anongit.freedesktop.org/~david/${BPN};protocol=git;branch=master \
- file://COPYING"
-SRCREV = "286f4eaf48ea79821be5a4e6bf493566b156faa4"
-PV = "0.1+gitr${SRCPV}"
-S = "${WORKDIR}/git"
-
-do_configure() {
- # missing ${topdir}/gtk-doc.make and --disable-gtk-doc* is not enough
- sed -i '/^doc\/Makefile/d' ${S}/configure.ac
- sed -i 's/SUBDIRS = src doc/SUBDIRS = src/g' ${S}/Makefile.am
-
- # cannot execute target binary, so use staged native
- sed -i "s#\$(top_builddir)/src/gdbus-codegen#${STAGING_BINDIR_NATIVE}/gdbus-codegen#g" ${S}/src/Makefile.am
-
- autotools_do_configure
-}
-do_configure_virtclass-native() {
- # missing ${topdir}/gtk-doc.make and --disable-gtk-doc* is not enough
- sed -i '/^doc\/Makefile/d' ${S}/configure.ac
- sed -i 's/SUBDIRS = src doc/SUBDIRS = src/g' ${S}/Makefile.am
-
- autotools_do_configure
-}
-
-BBCLASSEXTEND = "native"
--
1.7.7
^ permalink raw reply related [flat|nested] 46+ messages in thread
* [meta-oe][meta-efl][PATCHv2 12/25] pango: upgrade to 1.29.4
2011-10-03 13:27 ` [meta-oe][meta-efl][PATCHv2 00/25] " Martin Jansa
` (10 preceding siblings ...)
2011-10-03 13:27 ` [meta-oe][meta-efl][PATCHv2 11/25] gdbus-binding-tool: drop from meta-oe, superseeded by glib-2.30.0 where it's included Martin Jansa
@ 2011-10-03 13:27 ` Martin Jansa
2011-10-03 13:27 ` [meta-oe][meta-efl][PATCHv2 13/25] poppler-data: upgrade from 0.4.0 to 0.4.5 Martin Jansa
` (13 subsequent siblings)
25 siblings, 0 replies; 46+ messages in thread
From: Martin Jansa @ 2011-10-03 13:27 UTC (permalink / raw)
To: openembedded-devel
* pango older than 1.29.1 causes ie libglade build fail with
/usr/include/pango-1.0/pango/pango-script.h:132:12: error: unknown type name 'G_CONST_RETURN'
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
.../pango/pango-1.28.3/no-tests.patch | 10 ----------
.../pango/pango-1.29.4/no-tests.patch | 11 +++++++++++
meta-oe/recipes-graphics/pango/pango_1.28.3.bb | 9 ---------
meta-oe/recipes-graphics/pango/pango_1.29.4.bb | 9 +++++++++
4 files changed, 20 insertions(+), 19 deletions(-)
delete mode 100644 meta-oe/recipes-graphics/pango/pango-1.28.3/no-tests.patch
create mode 100644 meta-oe/recipes-graphics/pango/pango-1.29.4/no-tests.patch
delete mode 100644 meta-oe/recipes-graphics/pango/pango_1.28.3.bb
create mode 100644 meta-oe/recipes-graphics/pango/pango_1.29.4.bb
diff --git a/meta-oe/recipes-graphics/pango/pango-1.28.3/no-tests.patch b/meta-oe/recipes-graphics/pango/pango-1.28.3/no-tests.patch
deleted file mode 100644
index dafcb20..0000000
--- a/meta-oe/recipes-graphics/pango/pango-1.28.3/no-tests.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- /tmp/Makefile.am 2007-03-01 13:29:37.000000000 +0100
-+++ pango-1.16.0/Makefile.am 2007-03-01 13:29:52.545251000 +0100
-@@ -1,6 +1,6 @@
- ## Process this file with automake to create Makefile.in.
-
--SUBDIRS= pango modules pango-view examples docs tools tests
-+SUBDIRS= pango modules pango-view examples docs tools
-
- EXTRA_DIST = \
- autogen.sh \
diff --git a/meta-oe/recipes-graphics/pango/pango-1.29.4/no-tests.patch b/meta-oe/recipes-graphics/pango/pango-1.29.4/no-tests.patch
new file mode 100644
index 0000000..ce64db1
--- /dev/null
+++ b/meta-oe/recipes-graphics/pango/pango-1.29.4/no-tests.patch
@@ -0,0 +1,11 @@
+diff -uNr pango-1.29.4.orig/Makefile.am pango-1.29.4/Makefile.am
+--- pango-1.29.4.orig/Makefile.am 2011-08-16 03:11:08.000000000 +0200
++++ pango-1.29.4/Makefile.am 2011-09-30 16:11:53.792567952 +0200
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to create Makefile.in.
+
+-SUBDIRS= pango modules pango-view examples docs tools tests build
++SUBDIRS= pango modules pango-view examples docs tools build
+
+ EXTRA_DIST = \
+ autogen.sh \
diff --git a/meta-oe/recipes-graphics/pango/pango_1.28.3.bb b/meta-oe/recipes-graphics/pango/pango_1.28.3.bb
deleted file mode 100644
index 4c875bf..0000000
--- a/meta-oe/recipes-graphics/pango/pango_1.28.3.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require pango.inc
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7"
-
-SRC_URI[archive.md5sum] = "caa74baea47e7e16bc73c89f9089d522"
-SRC_URI[archive.sha256sum] = "5e278bc9430cc7bb00270f183360d262c5006b51248e8b537ea904573f200632"
-
-PR = "${INC_PR}.0"
-
diff --git a/meta-oe/recipes-graphics/pango/pango_1.29.4.bb b/meta-oe/recipes-graphics/pango/pango_1.29.4.bb
new file mode 100644
index 0000000..0642bea
--- /dev/null
+++ b/meta-oe/recipes-graphics/pango/pango_1.29.4.bb
@@ -0,0 +1,9 @@
+require pango.inc
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7"
+
+SRC_URI[archive.md5sum] = "a5ee785f4f31d6bdd8625a09ea3f8b4b"
+SRC_URI[archive.sha256sum] = "f15deecaecf1e9dcb7db0e4947d12b5bcff112586434f8d30a5afd750747ff2b"
+
+PR = "${INC_PR}.0"
+
--
1.7.7
^ permalink raw reply related [flat|nested] 46+ messages in thread
* [meta-oe][meta-efl][PATCHv2 13/25] poppler-data: upgrade from 0.4.0 to 0.4.5
2011-10-03 13:27 ` [meta-oe][meta-efl][PATCHv2 00/25] " Martin Jansa
` (11 preceding siblings ...)
2011-10-03 13:27 ` [meta-oe][meta-efl][PATCHv2 12/25] pango: upgrade to 1.29.4 Martin Jansa
@ 2011-10-03 13:27 ` Martin Jansa
2011-10-03 13:27 ` [meta-oe][meta-efl][PATCHv2 14/25] poppler: upgrade from 0.12.3 to 0.18.0 Martin Jansa
` (12 subsequent siblings)
25 siblings, 0 replies; 46+ messages in thread
From: Martin Jansa @ 2011-10-03 13:27 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
...poppler-data_0.4.0.bb => poppler-data_0.4.5.bb} | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
rename meta-oe/recipes-support/poppler/{poppler-data_0.4.0.bb => poppler-data_0.4.5.bb} (77%)
diff --git a/meta-oe/recipes-support/poppler/poppler-data_0.4.0.bb b/meta-oe/recipes-support/poppler/poppler-data_0.4.5.bb
similarity index 77%
rename from meta-oe/recipes-support/poppler/poppler-data_0.4.0.bb
rename to meta-oe/recipes-support/poppler/poppler-data_0.4.5.bb
index c59cc73..cbb02b4 100644
--- a/meta-oe/recipes-support/poppler/poppler-data_0.4.0.bb
+++ b/meta-oe/recipes-support/poppler/poppler-data_0.4.5.bb
@@ -5,8 +5,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4870b98343f0bbb25fa43b9d2ba59448 \
file://COPYING.gpl2;md5=751419260aa954499f7abaabaa882bbe \
"
-PR = "r2"
-
SRC_URI = "http://poppler.freedesktop.org/${PN}-${PV}.tar.gz"
do_compile() {
@@ -19,5 +17,5 @@ do_install() {
FILES_${PN} += "${datadir}"
inherit allarch
-SRC_URI[md5sum] = "6975bf8e9ea2cfb42b9ecdbcc257cf57"
-SRC_URI[sha256sum] = "5caf7e10b7b0c6a4e1e753af09be52224e88bb8fbcb47794ad72b99b9e24b109"
+SRC_URI[md5sum] = "448dd7c5077570e340340706cef931aa"
+SRC_URI[sha256sum] = "3190bc457bafe4b158f79a08e8a3f1824031ec12acefc359e68e0f04da0f70fd"
--
1.7.7
^ permalink raw reply related [flat|nested] 46+ messages in thread
* [meta-oe][meta-efl][PATCHv2 14/25] poppler: upgrade from 0.12.3 to 0.18.0
2011-10-03 13:27 ` [meta-oe][meta-efl][PATCHv2 00/25] " Martin Jansa
` (12 preceding siblings ...)
2011-10-03 13:27 ` [meta-oe][meta-efl][PATCHv2 13/25] poppler-data: upgrade from 0.4.0 to 0.4.5 Martin Jansa
@ 2011-10-03 13:27 ` Martin Jansa
2011-10-03 13:27 ` [meta-oe][meta-efl][PATCHv2 15/25] python-cython: upgrade to 0.15.1 because 0.13 doesn't work with python-2.7.2 Martin Jansa
` (11 subsequent siblings)
25 siblings, 0 replies; 46+ messages in thread
From: Martin Jansa @ 2011-10-03 13:27 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta-oe/recipes-support/poppler/poppler_0.12.3.bb | 10 ----------
meta-oe/recipes-support/poppler/poppler_0.18.0.bb | 10 ++++++++++
2 files changed, 10 insertions(+), 10 deletions(-)
delete mode 100644 meta-oe/recipes-support/poppler/poppler_0.12.3.bb
create mode 100644 meta-oe/recipes-support/poppler/poppler_0.18.0.bb
diff --git a/meta-oe/recipes-support/poppler/poppler_0.12.3.bb b/meta-oe/recipes-support/poppler/poppler_0.12.3.bb
deleted file mode 100644
index ce1952e..0000000
--- a/meta-oe/recipes-support/poppler/poppler_0.12.3.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require poppler.inc
-
-DEPENDS += "lcms"
-
-EXTRA_OECONF_append = " --disable-abiword-output "
-
-RDEPENDS_${PN} = "poppler-data"
-
-SRC_URI[md5sum] = "d0ca8344d8d94e27aaba6d432688365d"
-SRC_URI[sha256sum] = "7a4ffe6d2950c446c285700d3b2dc399540a27ce635dd712aff646f02f8dfbcc"
diff --git a/meta-oe/recipes-support/poppler/poppler_0.18.0.bb b/meta-oe/recipes-support/poppler/poppler_0.18.0.bb
new file mode 100644
index 0000000..463b544
--- /dev/null
+++ b/meta-oe/recipes-support/poppler/poppler_0.18.0.bb
@@ -0,0 +1,10 @@
+require poppler.inc
+
+DEPENDS += "lcms"
+
+EXTRA_OECONF_append = " --disable-abiword-output "
+
+RDEPENDS_${PN} = "poppler-data"
+
+SRC_URI[md5sum] = "4cd3bf2a0a13fa8eaf00d31368915f77"
+SRC_URI[sha256sum] = "9019b15ef10a878e607e4088a27fb4967f61cdfada7806d0fee97954f76648e8"
--
1.7.7
^ permalink raw reply related [flat|nested] 46+ messages in thread
* [meta-oe][meta-efl][PATCHv2 15/25] python-cython: upgrade to 0.15.1 because 0.13 doesn't work with python-2.7.2
2011-10-03 13:27 ` [meta-oe][meta-efl][PATCHv2 00/25] " Martin Jansa
` (13 preceding siblings ...)
2011-10-03 13:27 ` [meta-oe][meta-efl][PATCHv2 14/25] poppler: upgrade from 0.12.3 to 0.18.0 Martin Jansa
@ 2011-10-03 13:27 ` Martin Jansa
2011-10-03 13:27 ` [meta-oe][meta-efl][PATCHv2 16/25] python-cython: add patch to fix build error with some distutils packages Martin Jansa
` (10 subsequent siblings)
25 siblings, 0 replies; 46+ messages in thread
From: Martin Jansa @ 2011-10-03 13:27 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
...thon-cython_0.13.bb => python-cython_0.15.1.bb} | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
rename meta-oe/recipes-devtools/python/{python-cython_0.13.bb => python-cython_0.15.1.bb} (73%)
diff --git a/meta-oe/recipes-devtools/python/python-cython_0.13.bb b/meta-oe/recipes-devtools/python/python-cython_0.15.1.bb
similarity index 73%
rename from meta-oe/recipes-devtools/python/python-cython_0.13.bb
rename to meta-oe/recipes-devtools/python/python-cython_0.15.1.bb
index b547de6..f22a473 100644
--- a/meta-oe/recipes-devtools/python/python-cython_0.13.bb
+++ b/meta-oe/recipes-devtools/python/python-cython_0.15.1.bb
@@ -6,13 +6,11 @@ LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e23fadd6ceef8c618fc1c65191d846fa"
SRCNAME = "Cython"
BBCLASSEXTEND = "native"
-NATIVE_INSTALL_WORKS = "1"
-DEPENDS = "python"
SRC_URI = "http://www.cython.org/release/${SRCNAME}-${PV}.tar.gz"
S = "${WORKDIR}/${SRCNAME}-${PV}"
-SRC_URI[md5sum] = "ed2ec5e0df60a6b8e500bedf93bb1feb"
-SRC_URI[sha256sum] = "a30d5e26c82ec65d65703c7cf312161a21b30339addc1a42d3b2965dea254ca6"
+SRC_URI[md5sum] = "171021b3845c9ca8bd6d8185b3cde664"
+SRC_URI[sha256sum] = "248123f2f02f2701a28d9452132ac835533b396a273cda9d361cb65c26067edc"
inherit distutils
--
1.7.7
^ permalink raw reply related [flat|nested] 46+ messages in thread
* [meta-oe][meta-efl][PATCHv2 16/25] python-cython: add patch to fix build error with some distutils packages
2011-10-03 13:27 ` [meta-oe][meta-efl][PATCHv2 00/25] " Martin Jansa
` (14 preceding siblings ...)
2011-10-03 13:27 ` [meta-oe][meta-efl][PATCHv2 15/25] python-cython: upgrade to 0.15.1 because 0.13 doesn't work with python-2.7.2 Martin Jansa
@ 2011-10-03 13:27 ` Martin Jansa
2011-10-03 13:27 ` [meta-oe][meta-efl][PATCHv2 17/25] pidgin: package purple-2/libymsg.so to libpurple-dev Martin Jansa
` (9 subsequent siblings)
25 siblings, 0 replies; 46+ messages in thread
From: Martin Jansa @ 2011-10-03 13:27 UTC (permalink / raw)
To: openembedded-devel
* fails with TypeError: unsupported operand type(s) for +: 'NoneType' and 'str' in setup.py
when using python-2.6 or python-2.7 (don't know about python-3*)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
...pend-docs-to-_Extension.extension.__doc__.patch | 27 ++++++++++++++++++++
.../python/python-cython_0.15.1.bb | 5 +++-
2 files changed, 31 insertions(+), 1 deletions(-)
create mode 100644 meta-oe/recipes-devtools/python/python-cython-0.15.1/0001-Don-t-append-docs-to-_Extension.extension.__doc__.patch
diff --git a/meta-oe/recipes-devtools/python/python-cython-0.15.1/0001-Don-t-append-docs-to-_Extension.extension.__doc__.patch b/meta-oe/recipes-devtools/python/python-cython-0.15.1/0001-Don-t-append-docs-to-_Extension.extension.__doc__.patch
new file mode 100644
index 0000000..9b9dd46
--- /dev/null
+++ b/meta-oe/recipes-devtools/python/python-cython-0.15.1/0001-Don-t-append-docs-to-_Extension.extension.__doc__.patch
@@ -0,0 +1,27 @@
+From bfed128dfe9551a3a40b1ac4269f18ecfeac80a9 Mon Sep 17 00:00:00 2001
+From: Martin Jansa <Martin.Jansa@gmail.com>
+Date: Sat, 1 Oct 2011 11:46:30 +0200
+Subject: [PATCH] Don't append docs to _Extension.extension.__doc__
+
+* here it fails with TypeError: unsupported operand type(s) for +: 'NoneType' and 'str' in setup.py
+
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+---
+ Cython/Distutils/extension.py | 1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
+
+diff --git a/Cython/Distutils/extension.py b/Cython/Distutils/extension.py
+index a5a6638..e76c1e7 100644
+--- a/Cython/Distutils/extension.py
++++ b/Cython/Distutils/extension.py
+@@ -16,7 +16,6 @@ except ImportError:
+ warnings = None
+
+ class Extension(_Extension.Extension):
+- _Extension.Extension.__doc__ + \
+ """pyrex_include_dirs : [string]
+ list of directories to search for Pyrex header files (.pxd) (in
+ Unix form for portability)
+--
+1.7.6.1
+
diff --git a/meta-oe/recipes-devtools/python/python-cython_0.15.1.bb b/meta-oe/recipes-devtools/python/python-cython_0.15.1.bb
index f22a473..3b85601 100644
--- a/meta-oe/recipes-devtools/python/python-cython_0.15.1.bb
+++ b/meta-oe/recipes-devtools/python/python-cython_0.15.1.bb
@@ -6,8 +6,11 @@ LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e23fadd6ceef8c618fc1c65191d846fa"
SRCNAME = "Cython"
BBCLASSEXTEND = "native"
+PR = "r1"
-SRC_URI = "http://www.cython.org/release/${SRCNAME}-${PV}.tar.gz"
+SRC_URI = "http://www.cython.org/release/${SRCNAME}-${PV}.tar.gz \
+ file://0001-Don-t-append-docs-to-_Extension.extension.__doc__.patch \
+"
S = "${WORKDIR}/${SRCNAME}-${PV}"
SRC_URI[md5sum] = "171021b3845c9ca8bd6d8185b3cde664"
--
1.7.7
^ permalink raw reply related [flat|nested] 46+ messages in thread
* [meta-oe][meta-efl][PATCHv2 17/25] pidgin: package purple-2/libymsg.so to libpurple-dev
2011-10-03 13:27 ` [meta-oe][meta-efl][PATCHv2 00/25] " Martin Jansa
` (15 preceding siblings ...)
2011-10-03 13:27 ` [meta-oe][meta-efl][PATCHv2 16/25] python-cython: add patch to fix build error with some distutils packages Martin Jansa
@ 2011-10-03 13:27 ` Martin Jansa
2011-10-03 13:27 ` [meta-oe][meta-efl][PATCHv2 18/25] e-base: bump EFL_SRCREV Martin Jansa
` (8 subsequent siblings)
25 siblings, 0 replies; 46+ messages in thread
From: Martin Jansa @ 2011-10-03 13:27 UTC (permalink / raw)
To: openembedded-devel
* otherwise fails with ERROR: QA Issue: non -dev/-dbg/-nativesdk package contains symlink .so: libpurple path '/work/armv4t-oe-linux-gnueabi/pidgin-2.7.9-r0.0/packages-split/libpurple/usr/lib/purple-2/libymsg.so'
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta-oe/recipes-support/pidgin/pidgin.inc | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/meta-oe/recipes-support/pidgin/pidgin.inc b/meta-oe/recipes-support/pidgin/pidgin.inc
index 9d21976..91ed9a2 100644
--- a/meta-oe/recipes-support/pidgin/pidgin.inc
+++ b/meta-oe/recipes-support/pidgin/pidgin.inc
@@ -3,7 +3,7 @@ SECTION = "x11/network"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
DEPENDS = "python startup-notification avahi gtk+ ncurses gnutls virtual/libintl gstreamer dbus"
-INC_PR = "r0"
+INC_PR = "r1"
inherit autotools gettext pkgconfig gconf perlnative
@@ -37,6 +37,7 @@ FILES_libpurple-dev = "${libdir}/libpurple*.la \
${libdir}/purple-2/*.la \
${libdir}/purple-2/libjabber.so \
${libdir}/purple-2/liboscar.so \
+ ${libdir}/purple-2/libymsg.so \
${datadir}/aclocal"
FILES_libpurple-dbg += "${libdir}/.debug/libpurple* \
${libdir}/purple-2/.debug"
--
1.7.7
^ permalink raw reply related [flat|nested] 46+ messages in thread
* [meta-oe][meta-efl][PATCHv2 18/25] e-base: bump EFL_SRCREV
2011-10-03 13:27 ` [meta-oe][meta-efl][PATCHv2 00/25] " Martin Jansa
` (16 preceding siblings ...)
2011-10-03 13:27 ` [meta-oe][meta-efl][PATCHv2 17/25] pidgin: package purple-2/libymsg.so to libpurple-dev Martin Jansa
@ 2011-10-03 13:27 ` Martin Jansa
2011-10-03 13:27 ` [meta-oe][meta-efl][PATCHv2 19/25] e-wm: include /usr/lib/enlightenment/modules/wizard/favorites/.order in FILES+${PN} Martin Jansa
` (7 subsequent siblings)
25 siblings, 0 replies; 46+ messages in thread
From: Martin Jansa @ 2011-10-03 13:27 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta-efl/classes/e-base.bbclass | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta-efl/classes/e-base.bbclass b/meta-efl/classes/e-base.bbclass
index 0ffabdd..8eaabd8 100644
--- a/meta-efl/classes/e-base.bbclass
+++ b/meta-efl/classes/e-base.bbclass
@@ -2,7 +2,7 @@ HOMEPAGE = "http://www.enlightenment.org"
SRCNAME ?= "${BPN}"
# usually tracks svn trunk HEAD
-EFL_SRCREV ?= "63195"
+EFL_SRCREV ?= "63721"
# revision when 1.0.0 was released, for recipes which don't need rebuild so often
EFL_SRCREV_1.0.0 ?= "56356"
--
1.7.7
^ permalink raw reply related [flat|nested] 46+ messages in thread
* [meta-oe][meta-efl][PATCHv2 19/25] e-wm: include /usr/lib/enlightenment/modules/wizard/favorites/.order in FILES+${PN}
2011-10-03 13:27 ` [meta-oe][meta-efl][PATCHv2 00/25] " Martin Jansa
` (17 preceding siblings ...)
2011-10-03 13:27 ` [meta-oe][meta-efl][PATCHv2 18/25] e-base: bump EFL_SRCREV Martin Jansa
@ 2011-10-03 13:27 ` Martin Jansa
2011-10-03 13:27 ` [meta-oe][meta-efl][PATCHv2 20/25] e-wm-theme-illume-efenniht, exquisite-theme-illume, elementary-theme-efenniht: add LIC_FILES_CHKSUM Martin Jansa
` (6 subsequent siblings)
25 siblings, 0 replies; 46+ messages in thread
From: Martin Jansa @ 2011-10-03 13:27 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta-efl/recipes-efl/e17/e-wm_svn.bb | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/meta-efl/recipes-efl/e17/e-wm_svn.bb b/meta-efl/recipes-efl/e17/e-wm_svn.bb
index 55c9874..a4fb5b4 100644
--- a/meta-efl/recipes-efl/e17/e-wm_svn.bb
+++ b/meta-efl/recipes-efl/e17/e-wm_svn.bb
@@ -100,6 +100,7 @@ FILES_${PN} = "\
${libdir}/enlightenment/utils/* \
${libdir}/enlightenment/modules/*/*.* \
${libdir}/enlightenment/modules/*/*/* \
+ ${libdir}/enlightenment/modules/*/*/.order \
${libdir}/enlightenment/*plugins/*/*/* \
${libdir}/enlightenment/preload/e_precache.so \
${datadir}/enlightenment/data/icons \
--
1.7.7
^ permalink raw reply related [flat|nested] 46+ messages in thread
* [meta-oe][meta-efl][PATCHv2 20/25] e-wm-theme-illume-efenniht, exquisite-theme-illume, elementary-theme-efenniht: add LIC_FILES_CHKSUM
2011-10-03 13:27 ` [meta-oe][meta-efl][PATCHv2 00/25] " Martin Jansa
` (18 preceding siblings ...)
2011-10-03 13:27 ` [meta-oe][meta-efl][PATCHv2 19/25] e-wm: include /usr/lib/enlightenment/modules/wizard/favorites/.order in FILES+${PN} Martin Jansa
@ 2011-10-03 13:27 ` Martin Jansa
2011-10-03 13:27 ` [meta-oe][meta-efl][PATCHv2 21/25] elementary: fir order of PACKAGES Martin Jansa
` (5 subsequent siblings)
25 siblings, 0 replies; 46+ messages in thread
From: Martin Jansa @ 2011-10-03 13:27 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
.../e17/e-wm-theme-illume-efenniht/LICENSE | 25 ++++++++++++++++++++
.../e17/e-wm-theme-illume-efenniht_svn.bb | 7 ++++-
meta-efl/recipes-efl/e17/exquisite-theme-illume.bb | 7 ++++-
.../recipes-efl/e17/exquisite-theme-illume/LICENSE | 25 ++++++++++++++++++++
.../efl/elementary-theme-efenniht/LICENSE | 25 ++++++++++++++++++++
.../efl/elementary-theme-efenniht_svn.bb | 4 ++-
6 files changed, 88 insertions(+), 5 deletions(-)
create mode 100644 meta-efl/recipes-efl/e17/e-wm-theme-illume-efenniht/LICENSE
create mode 100644 meta-efl/recipes-efl/e17/exquisite-theme-illume/LICENSE
create mode 100644 meta-efl/recipes-efl/efl/elementary-theme-efenniht/LICENSE
diff --git a/meta-efl/recipes-efl/e17/e-wm-theme-illume-efenniht/LICENSE b/meta-efl/recipes-efl/e17/e-wm-theme-illume-efenniht/LICENSE
new file mode 100644
index 0000000..61bb2f6
--- /dev/null
+++ b/meta-efl/recipes-efl/e17/e-wm-theme-illume-efenniht/LICENSE
@@ -0,0 +1,25 @@
+Copyright notice for Enlightenment:
+
+Copyright (C) 2000-2010 Carsten Haitzler and various contributors (see AUTHORS)
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/meta-efl/recipes-efl/e17/e-wm-theme-illume-efenniht_svn.bb b/meta-efl/recipes-efl/e17/e-wm-theme-illume-efenniht_svn.bb
index aaa2e14..5dfc7c9 100644
--- a/meta-efl/recipes-efl/e17/e-wm-theme-illume-efenniht_svn.bb
+++ b/meta-efl/recipes-efl/e17/e-wm-theme-illume-efenniht_svn.bb
@@ -4,7 +4,8 @@ HOMEPAGE = "http://trac.enlightenment.org/e/wiki/Themes#Efenniht"
DEPENDS = "edje-native"
RDEPENDS_${PN} = "e-wm"
RSUGGESTS_${PN} = "elementary-theme-efenniht"
-LICENSE = "MIT/BSD"
+LICENSE = "MIT BSD"
+LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE;md5=f523ab5986cc79b52a90d2ac3d5454a2"
SRCREV = "${EFL_SRCREV}"
PV = "0.0+svnr${SRCPV}"
@@ -13,7 +14,9 @@ PR = "r1"
inherit e-base allarch
SRCNAME = "efenniht"
-SRC_URI = "${E_SVN}/trunk/THEMES;module=${SRCNAME};proto=http"
+SRC_URI = "${E_SVN}/trunk/THEMES;module=${SRCNAME};proto=http \
+ file://LICENSE \
+"
S = "${WORKDIR}/${SRCNAME}"
do_compile() {
diff --git a/meta-efl/recipes-efl/e17/exquisite-theme-illume.bb b/meta-efl/recipes-efl/e17/exquisite-theme-illume.bb
index fa394f7..5dabea2 100644
--- a/meta-efl/recipes-efl/e17/exquisite-theme-illume.bb
+++ b/meta-efl/recipes-efl/e17/exquisite-theme-illume.bb
@@ -1,5 +1,6 @@
DDESCRIPTION = "A theme for exquisite"
-LICENSE = "MIT/BSD"
+LICENSE = "MIT BSD"
+LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE;md5=f523ab5986cc79b52a90d2ac3d5454a2"
SECTION = "x11"
DEPENDS = "edje-native"
PV = "1.0+svnr${SRCPV}"
@@ -15,7 +16,9 @@ ALTERNATIVE_PRIORITY = "10"
SRCNAME = "b_and_w"
-SRC_URI = "${E_SVN}/trunk/THEMES;module=${SRCNAME};proto=http"
+SRC_URI = "${E_SVN}/trunk/THEMES;module=${SRCNAME};proto=http \
+ file://LICENSE \
+"
S = "${WORKDIR}/${SRCNAME}"
do_compile() {
diff --git a/meta-efl/recipes-efl/e17/exquisite-theme-illume/LICENSE b/meta-efl/recipes-efl/e17/exquisite-theme-illume/LICENSE
new file mode 100644
index 0000000..61bb2f6
--- /dev/null
+++ b/meta-efl/recipes-efl/e17/exquisite-theme-illume/LICENSE
@@ -0,0 +1,25 @@
+Copyright notice for Enlightenment:
+
+Copyright (C) 2000-2010 Carsten Haitzler and various contributors (see AUTHORS)
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/meta-efl/recipes-efl/efl/elementary-theme-efenniht/LICENSE b/meta-efl/recipes-efl/efl/elementary-theme-efenniht/LICENSE
new file mode 100644
index 0000000..61bb2f6
--- /dev/null
+++ b/meta-efl/recipes-efl/efl/elementary-theme-efenniht/LICENSE
@@ -0,0 +1,25 @@
+Copyright notice for Enlightenment:
+
+Copyright (C) 2000-2010 Carsten Haitzler and various contributors (see AUTHORS)
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/meta-efl/recipes-efl/efl/elementary-theme-efenniht_svn.bb b/meta-efl/recipes-efl/efl/elementary-theme-efenniht_svn.bb
index 1cf7bd5..5655490 100644
--- a/meta-efl/recipes-efl/efl/elementary-theme-efenniht_svn.bb
+++ b/meta-efl/recipes-efl/efl/elementary-theme-efenniht_svn.bb
@@ -3,7 +3,8 @@ SECTION = "e/utils"
HOMEPAGE = "http://trac.enlightenment.org/e/wiki/Themes#Efenniht"
DEPENDS = "edje-native"
RSUGGESTS_${PN} = "e-wm-theme-illume-efenniht"
-LICENSE = "MIT/BSD"
+LICENSE = "MIT BSD"
+LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE;md5=f523ab5986cc79b52a90d2ac3d5454a2"
SRCREV_THM_REV ?= "${EFL_SRCREV}"
SRCREV_ELM_REV ?= "${EFL_SRCREV}"
@@ -17,6 +18,7 @@ inherit e-base allarch
SRCNAME = "efenniht"
SRC_URI = "${E_SVN}/trunk/THEMES;module=${SRCNAME};proto=http;name=THM_REV"
SRC_URI += "${E_SVN}/trunk/elementary/data;module=themes;proto=http;name=ELM_REV"
+SRC_URI += "file://LICENSE"
S = "${WORKDIR}/${SRCNAME}"
do_compile() {
--
1.7.7
^ permalink raw reply related [flat|nested] 46+ messages in thread
* [meta-oe][meta-efl][PATCHv2 21/25] elementary: fir order of PACKAGES
2011-10-03 13:27 ` [meta-oe][meta-efl][PATCHv2 00/25] " Martin Jansa
` (19 preceding siblings ...)
2011-10-03 13:27 ` [meta-oe][meta-efl][PATCHv2 20/25] e-wm-theme-illume-efenniht, exquisite-theme-illume, elementary-theme-efenniht: add LIC_FILES_CHKSUM Martin Jansa
@ 2011-10-03 13:27 ` Martin Jansa
2011-10-03 13:27 ` [meta-oe][meta-efl][PATCHv2 22/25] epdf: fix build with poppler >= 0.16 Martin Jansa
` (4 subsequent siblings)
25 siblings, 0 replies; 46+ messages in thread
From: Martin Jansa @ 2011-10-03 13:27 UTC (permalink / raw)
To: openembedded-devel
* -accessibility needs to be after -dbg
fixes ERROR: QA Issue: non debug package contains .debug directory: elementary-accessibility path /work/armv4t-oe-linux-gnueabi/elementary-2_0.7.0+svnr63721-r11/packages-split/elementary-accessibility/usr/lib/elementary/modules/access_output/linux-gnueabi-arm-0.7.0/.debug/module.so
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta-efl/recipes-efl/efl/elementary_svn.bb | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta-efl/recipes-efl/efl/elementary_svn.bb b/meta-efl/recipes-efl/efl/elementary_svn.bb
index fda1622..0cfa821 100644
--- a/meta-efl/recipes-efl/efl/elementary_svn.bb
+++ b/meta-efl/recipes-efl/efl/elementary_svn.bb
@@ -21,7 +21,7 @@ do_compile_append() {
elementary.pc
}
-PACKAGES =+ "${PN}-configs ${PN}-accessibility"
+PACKAGES += "${PN}-configs ${PN}-accessibility"
RDEPENDS_${PN} = "\
${PN}-themes \
--
1.7.7
^ permalink raw reply related [flat|nested] 46+ messages in thread
* [meta-oe][meta-efl][PATCHv2 22/25] epdf: fix build with poppler >= 0.16
2011-10-03 13:27 ` [meta-oe][meta-efl][PATCHv2 00/25] " Martin Jansa
` (20 preceding siblings ...)
2011-10-03 13:27 ` [meta-oe][meta-efl][PATCHv2 21/25] elementary: fir order of PACKAGES Martin Jansa
@ 2011-10-03 13:27 ` Martin Jansa
2011-10-03 13:27 ` [meta-oe][meta-efl][PATCHv2 23/25] elementary, ethumb, libeflvala: bump PR to rebuild against newer poppler Martin Jansa
` (3 subsequent siblings)
25 siblings, 0 replies; 46+ messages in thread
From: Martin Jansa @ 2011-10-03 13:27 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
.../efl/epdf/epdf.poppler-0.16.api.change.patch | 11 +++++++++++
meta-efl/recipes-efl/efl/epdf_svn.bb | 6 ++++--
2 files changed, 15 insertions(+), 2 deletions(-)
create mode 100644 meta-efl/recipes-efl/efl/epdf/epdf.poppler-0.16.api.change.patch
diff --git a/meta-efl/recipes-efl/efl/epdf/epdf.poppler-0.16.api.change.patch b/meta-efl/recipes-efl/efl/epdf/epdf.poppler-0.16.api.change.patch
new file mode 100644
index 0000000..7c0ae65
--- /dev/null
+++ b/meta-efl/recipes-efl/efl/epdf/epdf.poppler-0.16.api.change.patch
@@ -0,0 +1,11 @@
+diff -uNr epdf.orig/src/lib/poppler/epdf_poppler_postscript.cpp epdf/src/lib/poppler/epdf_poppler_postscript.cpp
+--- epdf.orig/src/lib/poppler/epdf_poppler_postscript.cpp 2011-09-30 20:50:03.580218578 +0200
++++ epdf/src/lib/poppler/epdf_poppler_postscript.cpp 2011-09-30 20:49:11.573219667 +0200
+@@ -84,6 +84,7 @@
+
+ // FIXME: fix postscript title
+ ps_dev = new PSOutputDev (postscript->filename,
++ postscript->pdfdoc,
+ postscript->pdfdoc->getXRef(),
+ postscript->pdfdoc->getCatalog(),
+ "PS title",
diff --git a/meta-efl/recipes-efl/efl/epdf_svn.bb b/meta-efl/recipes-efl/efl/epdf_svn.bb
index 490b3ce..d479da6 100644
--- a/meta-efl/recipes-efl/efl/epdf_svn.bb
+++ b/meta-efl/recipes-efl/efl/epdf_svn.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Epdf is the glue between EFL and libpoppler"
DEPENDS = "poppler evas ecore"
PV = "0.1.0+svnr${SRCPV}"
-PR = "r4"
+PR = "r5"
SRCREV = "${EFL_SRCREV}"
inherit efl
@@ -12,7 +12,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
file://COPYING.LESSER;md5=6a6a8e020838b23406c81b19c1d46df6 \
"
-SRC_URI = "${E_SVN}/trunk/PROTO;module=${SRCNAME};proto=http;scmdata=keep"
+SRC_URI = "${E_SVN}/trunk/PROTO;module=${SRCNAME};proto=http;scmdata=keep \
+ file://epdf.poppler-0.16.api.change.patch \
+"
S = "${WORKDIR}/${SRCNAME}"
EXTRA_OECONF = "\
--
1.7.7
^ permalink raw reply related [flat|nested] 46+ messages in thread
* [meta-oe][meta-efl][PATCHv2 23/25] elementary, ethumb, libeflvala: bump PR to rebuild against newer poppler
2011-10-03 13:27 ` [meta-oe][meta-efl][PATCHv2 00/25] " Martin Jansa
` (21 preceding siblings ...)
2011-10-03 13:27 ` [meta-oe][meta-efl][PATCHv2 22/25] epdf: fix build with poppler >= 0.16 Martin Jansa
@ 2011-10-03 13:27 ` Martin Jansa
2011-10-03 13:27 ` [meta-oe][meta-efl][PATCHv2 24/25] python-efl: use INC_PR Martin Jansa
` (2 subsequent siblings)
25 siblings, 0 replies; 46+ messages in thread
From: Martin Jansa @ 2011-10-03 13:27 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta-efl/recipes-efl/efl/elementary_svn.bb | 2 +-
meta-efl/recipes-efl/efl/ethumb_svn.bb | 1 +
meta-efl/recipes-efl/efl/libeflvala_svn.bb | 1 +
3 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/meta-efl/recipes-efl/efl/elementary_svn.bb b/meta-efl/recipes-efl/efl/elementary_svn.bb
index 0cfa821..1034e0f 100644
--- a/meta-efl/recipes-efl/efl/elementary_svn.bb
+++ b/meta-efl/recipes-efl/efl/elementary_svn.bb
@@ -3,7 +3,7 @@ LICENSE = "LGPLv2.1"
LIC_FILES_CHKSUM = "file://COPYING;md5=cdc6c12b238ccd62635a7517dfe89438"
DEPENDS = "eet-native efreet evas ecore edje eet edbus ethumb"
PV = "0.7.0+svnr${SRCPV}"
-PR = "r11"
+PR = "r12"
SRCREV = "${EFL_SRCREV}"
inherit efl gettext
diff --git a/meta-efl/recipes-efl/efl/ethumb_svn.bb b/meta-efl/recipes-efl/efl/ethumb_svn.bb
index 2908ee1..e9087ce 100644
--- a/meta-efl/recipes-efl/efl/ethumb_svn.bb
+++ b/meta-efl/recipes-efl/efl/ethumb_svn.bb
@@ -3,6 +3,7 @@ LICENSE = "LGPLv2.1"
LIC_FILES_CHKSUM = "file://COPYING;md5=e6a6db9e80255adbafa16e817d9a4d8c"
DEPENDS = "libexif eet-native evas ecore edje eet edbus emotion epdf"
PV = "0.1.0+svnr${SRCPV}"
+PR = "r1"
SRCREV = "${EFL_SRCREV}"
inherit efl
diff --git a/meta-efl/recipes-efl/efl/libeflvala_svn.bb b/meta-efl/recipes-efl/efl/libeflvala_svn.bb
index 3ac2384..f70f953 100644
--- a/meta-efl/recipes-efl/efl/libeflvala_svn.bb
+++ b/meta-efl/recipes-efl/efl/libeflvala_svn.bb
@@ -5,6 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
SECTION = "devel"
DEPENDS = "vala-native glib-2.0 dbus dbus-glib eina eet evas ecore edje elementary"
PV = "2011.01.13.1+svnr${SRCPV}"
+PR = "r1"
PE = "1"
SRCREV = "${EFL_SRCREV}"
SRCNAME = "vala"
--
1.7.7
^ permalink raw reply related [flat|nested] 46+ messages in thread
* [meta-oe][meta-efl][PATCHv2 24/25] python-efl: use INC_PR
2011-10-03 13:27 ` [meta-oe][meta-efl][PATCHv2 00/25] " Martin Jansa
` (22 preceding siblings ...)
2011-10-03 13:27 ` [meta-oe][meta-efl][PATCHv2 23/25] elementary, ethumb, libeflvala: bump PR to rebuild against newer poppler Martin Jansa
@ 2011-10-03 13:27 ` Martin Jansa
2011-10-03 13:27 ` [meta-oe][meta-efl][PATCHv2 25/25] elfe: bump PR to rebuild against newer poppler Martin Jansa
2011-10-12 6:37 ` [meta-oe][meta-efl][PATCHv2 00/25] Pull request #23 Martin Jansa
25 siblings, 0 replies; 46+ messages in thread
From: Martin Jansa @ 2011-10-03 13:27 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
.../recipes-devtools/python/python-ecore_svn.bb | 1 +
.../recipes-devtools/python/python-edbus_svn.bb | 1 +
.../recipes-devtools/python/python-edje_svn.bb | 1 +
meta-efl/recipes-devtools/python/python-efl.inc | 2 +-
.../python/python-elementary_svn.bb | 1 +
.../recipes-devtools/python/python-emotion_svn.bb | 1 +
.../recipes-devtools/python/python-evas_svn.bb | 1 +
7 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/meta-efl/recipes-devtools/python/python-ecore_svn.bb b/meta-efl/recipes-devtools/python/python-ecore_svn.bb
index 0b87608..a6ec5e6 100644
--- a/meta-efl/recipes-devtools/python/python-ecore_svn.bb
+++ b/meta-efl/recipes-devtools/python/python-ecore_svn.bb
@@ -1,6 +1,7 @@
require python-efl.inc
LICENSE = "LGPLv2.1"
LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24"
+PR = "${INC_PR}.0"
SRCREV = "${EFL_SRCREV}"
DEPENDS += "python-evas ecore"
RDEPENDS_${PN} += "python-evas"
diff --git a/meta-efl/recipes-devtools/python/python-edbus_svn.bb b/meta-efl/recipes-devtools/python/python-edbus_svn.bb
index d6144e9..518f7c2 100644
--- a/meta-efl/recipes-devtools/python/python-edbus_svn.bb
+++ b/meta-efl/recipes-devtools/python/python-edbus_svn.bb
@@ -1,6 +1,7 @@
require python-efl.inc
LICENSE = "LGPLv2.1"
LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24"
+PR = "${INC_PR}.0"
SRCREV = "${EFL_SRCREV}"
DEPENDS += "edbus python-dbus"
RDEPENDS_${PN} += "python-dbus"
diff --git a/meta-efl/recipes-devtools/python/python-edje_svn.bb b/meta-efl/recipes-devtools/python/python-edje_svn.bb
index 581cc1c..8afcbfd 100644
--- a/meta-efl/recipes-devtools/python/python-edje_svn.bb
+++ b/meta-efl/recipes-devtools/python/python-edje_svn.bb
@@ -1,6 +1,7 @@
require python-efl.inc
LICENSE = "LGPLv2.1"
LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24"
+PR = "${INC_PR}.0"
SRCREV = "${EFL_SRCREV}"
DEPENDS += "edje python-evas"
RDEPENDS_${PN} += "python-evas"
diff --git a/meta-efl/recipes-devtools/python/python-efl.inc b/meta-efl/recipes-devtools/python/python-efl.inc
index f816305..fe4521c 100644
--- a/meta-efl/recipes-devtools/python/python-efl.inc
+++ b/meta-efl/recipes-devtools/python/python-efl.inc
@@ -7,7 +7,7 @@ AUTHOR = "Gustavo Sverzut Barbieri <barbieri@gmail.com>"
DEPENDS = "python-cython-native python-pyrex-native python-numeric eina"
RDEPENDS_${PN} += "python-lang"
PV = "0.7.3+svnr${SRCPV}"
-PR = "ml1"
+INC_PR = "r2"
# necessary to let the call for python-config succeed
export BUILD_SYS
diff --git a/meta-efl/recipes-devtools/python/python-elementary_svn.bb b/meta-efl/recipes-devtools/python/python-elementary_svn.bb
index e7f18ec..ffb6d5e 100644
--- a/meta-efl/recipes-devtools/python/python-elementary_svn.bb
+++ b/meta-efl/recipes-devtools/python/python-elementary_svn.bb
@@ -1,6 +1,7 @@
require python-efl.inc
LICENSE = "LGPLv3"
LIC_FILES_CHKSUM = "file://COPYING;md5=6a6a8e020838b23406c81b19c1d46df6"
+PR = "${INC_PR}.0"
SRCREV = "${EFL_SRCREV}"
DEPENDS += "elementary python-evas"
RDEPENDS_${PN} += "python-evas python-ecore python-edje"
diff --git a/meta-efl/recipes-devtools/python/python-emotion_svn.bb b/meta-efl/recipes-devtools/python/python-emotion_svn.bb
index ae2eb4c..89002c3 100644
--- a/meta-efl/recipes-devtools/python/python-emotion_svn.bb
+++ b/meta-efl/recipes-devtools/python/python-emotion_svn.bb
@@ -1,6 +1,7 @@
require python-efl.inc
LICENSE = "LGPLv2.1"
LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24"
+PR = "${INC_PR}.0"
SRCREV = "${EFL_SRCREV}"
DEPENDS += "emotion python-evas"
RDEPENDS_${PN} += "python-ecore"
diff --git a/meta-efl/recipes-devtools/python/python-evas_svn.bb b/meta-efl/recipes-devtools/python/python-evas_svn.bb
index 8ec9c41..79844be 100644
--- a/meta-efl/recipes-devtools/python/python-evas_svn.bb
+++ b/meta-efl/recipes-devtools/python/python-evas_svn.bb
@@ -1,5 +1,6 @@
require python-efl.inc
LICENSE = "LGPLv2.1"
LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24"
+PR = "${INC_PR}.0"
SRCREV = "${EFL_SRCREV}"
DEPENDS += "evas"
--
1.7.7
^ permalink raw reply related [flat|nested] 46+ messages in thread
* [meta-oe][meta-efl][PATCHv2 25/25] elfe: bump PR to rebuild against newer poppler
2011-10-03 13:27 ` [meta-oe][meta-efl][PATCHv2 00/25] " Martin Jansa
` (23 preceding siblings ...)
2011-10-03 13:27 ` [meta-oe][meta-efl][PATCHv2 24/25] python-efl: use INC_PR Martin Jansa
@ 2011-10-03 13:27 ` Martin Jansa
2011-10-12 6:37 ` [meta-oe][meta-efl][PATCHv2 00/25] Pull request #23 Martin Jansa
25 siblings, 0 replies; 46+ messages in thread
From: Martin Jansa @ 2011-10-03 13:27 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta-efl/recipes-efl/e17/elfe_svn.bb | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta-efl/recipes-efl/e17/elfe_svn.bb b/meta-efl/recipes-efl/e17/elfe_svn.bb
index b5126f9..151ef7e 100644
--- a/meta-efl/recipes-efl/e17/elfe_svn.bb
+++ b/meta-efl/recipes-efl/e17/elfe_svn.bb
@@ -1,7 +1,7 @@
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://COPYING;md5=344895f253c32f38e182dcaf30fe8a35"
PV = "0.0.1+svnr${SRCPV}"
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
require e-module.inc
--
1.7.7
^ permalink raw reply related [flat|nested] 46+ messages in thread
* Re: [meta-oe][meta-efl][PATCHv2 00/25] Pull request #23
2011-10-03 13:27 ` [meta-oe][meta-efl][PATCHv2 00/25] " Martin Jansa
` (24 preceding siblings ...)
2011-10-03 13:27 ` [meta-oe][meta-efl][PATCHv2 25/25] elfe: bump PR to rebuild against newer poppler Martin Jansa
@ 2011-10-12 6:37 ` Martin Jansa
2011-10-12 7:18 ` Martin Jansa
25 siblings, 1 reply; 46+ messages in thread
From: Martin Jansa @ 2011-10-12 6:37 UTC (permalink / raw)
To: openembedded-devel
[-- Attachment #1: Type: text/plain, Size: 13776 bytes --]
On Mon, Oct 03, 2011 at 03:27:00PM +0200, Martin Jansa wrote:
> Hi,
>
> this patchset depends on oe-core changes from:
> http://lists.linuxtogo.org/pipermail/openembedded-core/2011-September/010393.html
> but first few patches from that patchset are already in master-next and we need to
> be ready to adapt.
>
> And some changes depend on
> http://lists.linuxtogo.org/pipermail/openembedded-core/2011-September/010447.html
Another part of this patchset was applied.
Please apply the rest of this patchset except:
[meta-oe][meta-efl][PATCHv2 06/25] mesa: drop, there should be mesa-7.11 in oe-core
[meta-oe][meta-efl][PATCHv2 08/25] glx-use-tls: moved to oe-core with mesa recipes
And I wouldn't mind if you apply also those 2 as I was probably only user of them
(and I (as meta-shr) depend 2.30.0 from oe-core already).
[meta-oe][meta-efl][PATCHv2 10/25] glib-2.0: drop 2.29.3+git from meta-oe, there should be 2.30.0 in oe-core
[meta-oe][meta-efl][PATCHv2 11/25] gdbus-binding-tool: drop from meta-oe, superseeded by glib-2.30.0 where it's included
I hope my next pull requests won't be so cross-layer..
(well except xserver-common/xserver-nodm-init I plan to merge next)
Regards,
>
> Regards,
>
> The following changes since commit b297ece0b5663aca97d30927a32c20ccce97eb2a:
>
> systemd: update to latest git (2011-10-02 20:08:50 +0200)
>
> are available in the git repository at:
> git://git.openembedded.org/meta-openembedded-contrib jansa/pull
> http://cgit.openembedded.org/cgit.cgi/meta-openembedded-contrib/log/?h=jansa/pull
>
> Martin Jansa (25):
> xorg-driver: use renamed .inc from oe-core
> libxft, libxrender, renderproto: move native BBCLASSEXTENDs to
> oe-core
> xf86-video-omapfb: merged to oe-core
> xserver-xorg: drop 1.10.2 and use xserver-xf86-lite-1.11.0 from
> oe-core instead
> libx11: drop here, 1.4.4 should be in oe-core
> mesa: drop, there should be mesa-7.11 in oe-core
> talloc: drop from meta-oe, no longer needed by mesa
> glx-use-tls: moved to oe-core with mesa recipes
> recipes: use allarch instead of PACKAGE_ARCH = all
> glib-2.0: drop 2.29.3+git from meta-oe, there should be 2.30.0 in
> oe-core
> gdbus-binding-tool: drop from meta-oe, superseeded by glib-2.30.0
> where it's included
> pango: upgrade to 1.29.4
> poppler-data: upgrade from 0.4.0 to 0.4.5
> poppler: upgrade from 0.12.3 to 0.18.0
> python-cython: upgrade to 0.15.1 because 0.13 doesn't work with
> python-2.7.2
> python-cython: add patch to fix build error with some distutils
> packages
> pidgin: package purple-2/libymsg.so to libpurple-dev
> e-base: bump EFL_SRCREV
> e-wm: include /usr/lib/enlightenment/modules/wizard/favorites/.order
> in FILES+${PN}
> e-wm-theme-illume-efenniht, exquisite-theme-illume,
> elementary-theme-efenniht: add LIC_FILES_CHKSUM
> elementary: fir order of PACKAGES
> epdf: fix build with poppler >= 0.16
> elementary, ethumb, libeflvala: bump PR to rebuild against newer
> poppler
> python-efl: use INC_PR
> elfe: bump PR to rebuild against newer poppler
>
> meta-efl/classes/e-base.bbclass | 2 +-
> .../recipes-devtools/python/python-ecore_svn.bb | 1 +
> .../recipes-devtools/python/python-edbus_svn.bb | 1 +
> .../recipes-devtools/python/python-edje_svn.bb | 1 +
> meta-efl/recipes-devtools/python/python-efl.inc | 2 +-
> .../python/python-elementary_svn.bb | 1 +
> .../recipes-devtools/python/python-emotion_svn.bb | 1 +
> .../recipes-devtools/python/python-evas_svn.bb | 1 +
> .../e17/e-wm-theme-illume-efenniht/LICENSE | 25 +
> .../e17/e-wm-theme-illume-efenniht_svn.bb | 11 +-
> meta-efl/recipes-efl/e17/e-wm_svn.bb | 23 +-
> meta-efl/recipes-efl/e17/elfe_svn.bb | 2 +-
> meta-efl/recipes-efl/e17/exquisite-theme-illume.bb | 12 +-
> .../recipes-efl/e17/exquisite-theme-illume/LICENSE | 25 +
> .../efl/elementary-theme-efenniht/LICENSE | 25 +
> .../efl/elementary-theme-efenniht_svn.bb | 9 +-
> meta-efl/recipes-efl/efl/elementary_svn.bb | 4 +-
> .../efl/epdf/epdf.poppler-0.16.api.change.patch | 11 +
> meta-efl/recipes-efl/efl/epdf_svn.bb | 6 +-
> meta-efl/recipes-efl/efl/ethumb_svn.bb | 1 +
> meta-efl/recipes-efl/efl/libeflvala_svn.bb | 1 +
> .../hicolor-icon-theme/hicolor-icon-theme_0.12.bb | 6 +-
> .../recipes-gnome/themes/gnome-themes_2.32.1.bb | 5 +-
> meta-oe/classes/glx-use-tls.bbclass | 7 -
> meta-oe/recipes-core/glib-2.0/glib-2.0.inc | 6 -
> ...003-gatomic-proper-pointer-get-cast.patch.patch | 28 -
> .../0005-glib-mkenums-interpreter.patch.patch | 25 -
> .../60_wait-longer-for-threads-to-die.patch | 33 -
> .../glib-2.0/glib-2.0/configure-libtool.patch | 38 -
> .../glib-2.0/glib-2.0/g_once_init_enter.patch | 24 -
> .../glib-2.0/glib-2.0/glib-gettextize-dir.patch | 24 -
> .../recipes-core/glib-2.0/glib-2.0/no-iconv.patch | 104 -
> .../glib-2.0/remove.test.for.qsort_r.patch | 54 -
> meta-oe/recipes-core/glib-2.0/glib-2.0_git.bb | 32 -
> meta-oe/recipes-core/glib-2.0/glib.inc | 38 -
> meta-oe/recipes-core/udev/udev-extra-rules.bb | 6 +-
> .../gdbus-binding-tool/gdbus-binding-tool/COPYING | 482 ----
> .../gdbus-binding-tool/gdbus-binding-tool_git.bb | 37 -
> ...pend-docs-to-_Extension.extension.__doc__.patch | 27 +
> ...thon-cython_0.13.bb => python-cython_0.15.1.bb} | 11 +-
> meta-oe/recipes-graphics/mesa/README | 12 -
> meta-oe/recipes-graphics/mesa/mesa-7.10.2.inc | 19 -
> .../recipes-graphics/mesa/mesa-7.10.2/glamo.patch | 2425 --------------------
> .../recipes-graphics/mesa/mesa-7.10.2/uclibc.patch | 26 -
> meta-oe/recipes-graphics/mesa/mesa-common.inc | 49 -
> meta-oe/recipes-graphics/mesa/mesa-dri.inc | 27 -
> meta-oe/recipes-graphics/mesa/mesa-dri_7.10.2.bb | 4 -
> meta-oe/recipes-graphics/mesa/mesa-xlib.inc | 5 -
> meta-oe/recipes-graphics/mesa/mesa-xlib_7.10.2.bb | 4 -
> meta-oe/recipes-graphics/mesa/mesa_7.10.2.bb | 6 -
> .../pango/pango-1.28.3/no-tests.patch | 10 -
> .../pango/pango-1.29.4/no-tests.patch | 11 +
> meta-oe/recipes-graphics/pango/pango_1.28.3.bb | 9 -
> meta-oe/recipes-graphics/pango/pango_1.29.4.bb | 9 +
> .../xorg-driver/xf86-input-tslib_0.0.6.bb | 4 +-
> .../xorg-driver/xf86-input-void_1.4.0.bb | 4 +-
> .../xorg-driver/xf86-video-fbdev_0.4.2.bb | 4 +-
> .../xorg-driver/xf86-video-geode_2.11.12.bb | 4 +-
> .../xorg-driver/xf86-video-glamo_git.bb | 4 +-
> .../xf86-video-omapfb/0001-blacklist-tv-out.patch | 28 -
> ...virtual-size-when-configuring-framebuffer.patch | 26 -
> .../xf86-video-omapfb/0003-force-plain-mode.patch | 26 -
> .../0004-Attempt-to-fix-VRFB.patch | 320 ---
> .../xorg-driver/xf86-video-omapfb_git.bb | 27 -
> .../xorg-lib/libx11-1.4.3/keysymdef_include.patch | 19 -
> .../libx11-1.4.3/x11_disable_makekeys.patch | 29 -
> meta-oe/recipes-graphics/xorg-lib/libx11.inc | 52 -
> meta-oe/recipes-graphics/xorg-lib/libx11_1.4.3.bb | 11 -
> .../xorg-lib/libxft_2.2.0.bbappend | 1 -
> .../xorg-lib/libxrender_0.9.6.bbappend | 1 -
> .../xorg-proto/renderproto_0.11.1.bbappend | 1 -
> .../xorg-xserver/xorg-xserver-common.inc | 126 -
> .../50b9d3142ff90af2f7fa35b7b1bf9e5a07723dbd.patch | 61 -
> ...ack-assume-pixman-supports-overlapped-blt.patch | 14 -
> .../hack-fbdev-ignore-return-mode.patch | 39 -
> .../xserver-xorg-1.10.2/randr-support.patch | 102 -
> .../replace-pkgconfig-sdkdir-poking.patch | 33 -
> .../xorg-xserver/xserver-xorg_1.10.2.bb | 33 -
> .../recipes-navigation/navit/navit-icons_svn.bb | 7 +-
> meta-oe/recipes-support/iso-codes/iso-codes_1.4.bb | 7 +-
> meta-oe/recipes-support/pidgin/pidgin.inc | 3 +-
> ...poppler-data_0.4.0.bb => poppler-data_0.4.5.bb} | 6 +-
> meta-oe/recipes-support/poppler/poppler_0.12.3.bb | 10 -
> meta-oe/recipes-support/poppler/poppler_0.18.0.bb | 10 +
> meta-oe/recipes-support/talloc/talloc_2.0.1.bb | 27 -
> 85 files changed, 213 insertions(+), 4594 deletions(-)
> create mode 100644 meta-efl/recipes-efl/e17/e-wm-theme-illume-efenniht/LICENSE
> create mode 100644 meta-efl/recipes-efl/e17/exquisite-theme-illume/LICENSE
> create mode 100644 meta-efl/recipes-efl/efl/elementary-theme-efenniht/LICENSE
> create mode 100644 meta-efl/recipes-efl/efl/epdf/epdf.poppler-0.16.api.change.patch
> delete mode 100644 meta-oe/classes/glx-use-tls.bbclass
> delete mode 100644 meta-oe/recipes-core/glib-2.0/glib-2.0.inc
> delete mode 100644 meta-oe/recipes-core/glib-2.0/glib-2.0/0003-gatomic-proper-pointer-get-cast.patch.patch
> delete mode 100644 meta-oe/recipes-core/glib-2.0/glib-2.0/0005-glib-mkenums-interpreter.patch.patch
> delete mode 100644 meta-oe/recipes-core/glib-2.0/glib-2.0/60_wait-longer-for-threads-to-die.patch
> delete mode 100644 meta-oe/recipes-core/glib-2.0/glib-2.0/configure-libtool.patch
> delete mode 100644 meta-oe/recipes-core/glib-2.0/glib-2.0/g_once_init_enter.patch
> delete mode 100644 meta-oe/recipes-core/glib-2.0/glib-2.0/glib-gettextize-dir.patch
> delete mode 100644 meta-oe/recipes-core/glib-2.0/glib-2.0/no-iconv.patch
> delete mode 100644 meta-oe/recipes-core/glib-2.0/glib-2.0/remove.test.for.qsort_r.patch
> delete mode 100644 meta-oe/recipes-core/glib-2.0/glib-2.0_git.bb
> delete mode 100644 meta-oe/recipes-core/glib-2.0/glib.inc
> delete mode 100644 meta-oe/recipes-devtools/gdbus-binding-tool/gdbus-binding-tool/COPYING
> delete mode 100644 meta-oe/recipes-devtools/gdbus-binding-tool/gdbus-binding-tool_git.bb
> create mode 100644 meta-oe/recipes-devtools/python/python-cython-0.15.1/0001-Don-t-append-docs-to-_Extension.extension.__doc__.patch
> rename meta-oe/recipes-devtools/python/{python-cython_0.13.bb => python-cython_0.15.1.bb} (68%)
> delete mode 100644 meta-oe/recipes-graphics/mesa/README
> delete mode 100644 meta-oe/recipes-graphics/mesa/mesa-7.10.2.inc
> delete mode 100644 meta-oe/recipes-graphics/mesa/mesa-7.10.2/glamo.patch
> delete mode 100644 meta-oe/recipes-graphics/mesa/mesa-7.10.2/uclibc.patch
> delete mode 100644 meta-oe/recipes-graphics/mesa/mesa-common.inc
> delete mode 100644 meta-oe/recipes-graphics/mesa/mesa-dri.inc
> delete mode 100644 meta-oe/recipes-graphics/mesa/mesa-dri_7.10.2.bb
> delete mode 100644 meta-oe/recipes-graphics/mesa/mesa-xlib.inc
> delete mode 100644 meta-oe/recipes-graphics/mesa/mesa-xlib_7.10.2.bb
> delete mode 100644 meta-oe/recipes-graphics/mesa/mesa_7.10.2.bb
> delete mode 100644 meta-oe/recipes-graphics/pango/pango-1.28.3/no-tests.patch
> create mode 100644 meta-oe/recipes-graphics/pango/pango-1.29.4/no-tests.patch
> delete mode 100644 meta-oe/recipes-graphics/pango/pango_1.28.3.bb
> create mode 100644 meta-oe/recipes-graphics/pango/pango_1.29.4.bb
> delete mode 100644 meta-oe/recipes-graphics/xorg-driver/xf86-video-omapfb/0001-blacklist-tv-out.patch
> delete mode 100644 meta-oe/recipes-graphics/xorg-driver/xf86-video-omapfb/0002-Revert-Set-virtual-size-when-configuring-framebuffer.patch
> delete mode 100644 meta-oe/recipes-graphics/xorg-driver/xf86-video-omapfb/0003-force-plain-mode.patch
> delete mode 100644 meta-oe/recipes-graphics/xorg-driver/xf86-video-omapfb/0004-Attempt-to-fix-VRFB.patch
> delete mode 100644 meta-oe/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb
> delete mode 100644 meta-oe/recipes-graphics/xorg-lib/libx11-1.4.3/keysymdef_include.patch
> delete mode 100644 meta-oe/recipes-graphics/xorg-lib/libx11-1.4.3/x11_disable_makekeys.patch
> delete mode 100644 meta-oe/recipes-graphics/xorg-lib/libx11.inc
> delete mode 100644 meta-oe/recipes-graphics/xorg-lib/libx11_1.4.3.bb
> delete mode 100644 meta-oe/recipes-graphics/xorg-lib/libxft_2.2.0.bbappend
> delete mode 100644 meta-oe/recipes-graphics/xorg-lib/libxrender_0.9.6.bbappend
> delete mode 100644 meta-oe/recipes-graphics/xorg-proto/renderproto_0.11.1.bbappend
> delete mode 100644 meta-oe/recipes-graphics/xorg-xserver/xorg-xserver-common.inc
> delete mode 100644 meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.10.2/50b9d3142ff90af2f7fa35b7b1bf9e5a07723dbd.patch
> delete mode 100644 meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.10.2/hack-assume-pixman-supports-overlapped-blt.patch
> delete mode 100644 meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.10.2/hack-fbdev-ignore-return-mode.patch
> delete mode 100644 meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.10.2/randr-support.patch
> delete mode 100644 meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.10.2/replace-pkgconfig-sdkdir-poking.patch
> delete mode 100644 meta-oe/recipes-graphics/xorg-xserver/xserver-xorg_1.10.2.bb
> rename meta-oe/recipes-support/poppler/{poppler-data_0.4.0.bb => poppler-data_0.4.5.bb} (77%)
> delete mode 100644 meta-oe/recipes-support/poppler/poppler_0.12.3.bb
> create mode 100644 meta-oe/recipes-support/poppler/poppler_0.18.0.bb
> delete mode 100644 meta-oe/recipes-support/talloc/talloc_2.0.1.bb
>
> --
> 1.7.7
>
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 46+ messages in thread
* Re: [meta-oe][meta-efl][PATCHv2 00/25] Pull request #23
2011-10-12 6:37 ` [meta-oe][meta-efl][PATCHv2 00/25] Pull request #23 Martin Jansa
@ 2011-10-12 7:18 ` Martin Jansa
0 siblings, 0 replies; 46+ messages in thread
From: Martin Jansa @ 2011-10-12 7:18 UTC (permalink / raw)
To: openembedded-devel
[-- Attachment #1: Type: text/plain, Size: 14480 bytes --]
On Wed, Oct 12, 2011 at 08:37:10AM +0200, Martin Jansa wrote:
> On Mon, Oct 03, 2011 at 03:27:00PM +0200, Martin Jansa wrote:
> > Hi,
> >
> > this patchset depends on oe-core changes from:
> > http://lists.linuxtogo.org/pipermail/openembedded-core/2011-September/010393.html
> > but first few patches from that patchset are already in master-next and we need to
> > be ready to adapt.
> >
> > And some changes depend on
> > http://lists.linuxtogo.org/pipermail/openembedded-core/2011-September/010447.html
>
> Another part of this patchset was applied.
> Please apply the rest of this patchset except:
>
> [meta-oe][meta-efl][PATCHv2 06/25] mesa: drop, there should be mesa-7.11 in oe-core
> [meta-oe][meta-efl][PATCHv2 08/25] glx-use-tls: moved to oe-core with mesa recipes
and also without
talloc: drop from meta-oe, no longer needed by mesa
which is now also used by samba.. so should stay here
> And I wouldn't mind if you apply also those 2 as I was probably only user of them
> (and I (as meta-shr) depend 2.30.0 from oe-core already).
> [meta-oe][meta-efl][PATCHv2 10/25] glib-2.0: drop 2.29.3+git from meta-oe, there should be 2.30.0 in oe-core
> [meta-oe][meta-efl][PATCHv2 11/25] gdbus-binding-tool: drop from meta-oe, superseeded by glib-2.30.0 where it's included
>
> I hope my next pull requests won't be so cross-layer..
> (well except xserver-common/xserver-nodm-init I plan to merge next)
>
> Regards,
>
> >
> > Regards,
> >
> > The following changes since commit b297ece0b5663aca97d30927a32c20ccce97eb2a:
> >
> > systemd: update to latest git (2011-10-02 20:08:50 +0200)
> >
> > are available in the git repository at:
> > git://git.openembedded.org/meta-openembedded-contrib jansa/pull
> > http://cgit.openembedded.org/cgit.cgi/meta-openembedded-contrib/log/?h=jansa/pull
> >
> > Martin Jansa (25):
> > xorg-driver: use renamed .inc from oe-core
> > libxft, libxrender, renderproto: move native BBCLASSEXTENDs to
> > oe-core
> > xf86-video-omapfb: merged to oe-core
> > xserver-xorg: drop 1.10.2 and use xserver-xf86-lite-1.11.0 from
> > oe-core instead
> > libx11: drop here, 1.4.4 should be in oe-core
> > mesa: drop, there should be mesa-7.11 in oe-core
> > talloc: drop from meta-oe, no longer needed by mesa
> > glx-use-tls: moved to oe-core with mesa recipes
> > recipes: use allarch instead of PACKAGE_ARCH = all
> > glib-2.0: drop 2.29.3+git from meta-oe, there should be 2.30.0 in
> > oe-core
> > gdbus-binding-tool: drop from meta-oe, superseeded by glib-2.30.0
> > where it's included
> > pango: upgrade to 1.29.4
> > poppler-data: upgrade from 0.4.0 to 0.4.5
> > poppler: upgrade from 0.12.3 to 0.18.0
> > python-cython: upgrade to 0.15.1 because 0.13 doesn't work with
> > python-2.7.2
> > python-cython: add patch to fix build error with some distutils
> > packages
> > pidgin: package purple-2/libymsg.so to libpurple-dev
> > e-base: bump EFL_SRCREV
> > e-wm: include /usr/lib/enlightenment/modules/wizard/favorites/.order
> > in FILES+${PN}
> > e-wm-theme-illume-efenniht, exquisite-theme-illume,
> > elementary-theme-efenniht: add LIC_FILES_CHKSUM
> > elementary: fir order of PACKAGES
> > epdf: fix build with poppler >= 0.16
> > elementary, ethumb, libeflvala: bump PR to rebuild against newer
> > poppler
> > python-efl: use INC_PR
> > elfe: bump PR to rebuild against newer poppler
> >
> > meta-efl/classes/e-base.bbclass | 2 +-
> > .../recipes-devtools/python/python-ecore_svn.bb | 1 +
> > .../recipes-devtools/python/python-edbus_svn.bb | 1 +
> > .../recipes-devtools/python/python-edje_svn.bb | 1 +
> > meta-efl/recipes-devtools/python/python-efl.inc | 2 +-
> > .../python/python-elementary_svn.bb | 1 +
> > .../recipes-devtools/python/python-emotion_svn.bb | 1 +
> > .../recipes-devtools/python/python-evas_svn.bb | 1 +
> > .../e17/e-wm-theme-illume-efenniht/LICENSE | 25 +
> > .../e17/e-wm-theme-illume-efenniht_svn.bb | 11 +-
> > meta-efl/recipes-efl/e17/e-wm_svn.bb | 23 +-
> > meta-efl/recipes-efl/e17/elfe_svn.bb | 2 +-
> > meta-efl/recipes-efl/e17/exquisite-theme-illume.bb | 12 +-
> > .../recipes-efl/e17/exquisite-theme-illume/LICENSE | 25 +
> > .../efl/elementary-theme-efenniht/LICENSE | 25 +
> > .../efl/elementary-theme-efenniht_svn.bb | 9 +-
> > meta-efl/recipes-efl/efl/elementary_svn.bb | 4 +-
> > .../efl/epdf/epdf.poppler-0.16.api.change.patch | 11 +
> > meta-efl/recipes-efl/efl/epdf_svn.bb | 6 +-
> > meta-efl/recipes-efl/efl/ethumb_svn.bb | 1 +
> > meta-efl/recipes-efl/efl/libeflvala_svn.bb | 1 +
> > .../hicolor-icon-theme/hicolor-icon-theme_0.12.bb | 6 +-
> > .../recipes-gnome/themes/gnome-themes_2.32.1.bb | 5 +-
> > meta-oe/classes/glx-use-tls.bbclass | 7 -
> > meta-oe/recipes-core/glib-2.0/glib-2.0.inc | 6 -
> > ...003-gatomic-proper-pointer-get-cast.patch.patch | 28 -
> > .../0005-glib-mkenums-interpreter.patch.patch | 25 -
> > .../60_wait-longer-for-threads-to-die.patch | 33 -
> > .../glib-2.0/glib-2.0/configure-libtool.patch | 38 -
> > .../glib-2.0/glib-2.0/g_once_init_enter.patch | 24 -
> > .../glib-2.0/glib-2.0/glib-gettextize-dir.patch | 24 -
> > .../recipes-core/glib-2.0/glib-2.0/no-iconv.patch | 104 -
> > .../glib-2.0/remove.test.for.qsort_r.patch | 54 -
> > meta-oe/recipes-core/glib-2.0/glib-2.0_git.bb | 32 -
> > meta-oe/recipes-core/glib-2.0/glib.inc | 38 -
> > meta-oe/recipes-core/udev/udev-extra-rules.bb | 6 +-
> > .../gdbus-binding-tool/gdbus-binding-tool/COPYING | 482 ----
> > .../gdbus-binding-tool/gdbus-binding-tool_git.bb | 37 -
> > ...pend-docs-to-_Extension.extension.__doc__.patch | 27 +
> > ...thon-cython_0.13.bb => python-cython_0.15.1.bb} | 11 +-
> > meta-oe/recipes-graphics/mesa/README | 12 -
> > meta-oe/recipes-graphics/mesa/mesa-7.10.2.inc | 19 -
> > .../recipes-graphics/mesa/mesa-7.10.2/glamo.patch | 2425 --------------------
> > .../recipes-graphics/mesa/mesa-7.10.2/uclibc.patch | 26 -
> > meta-oe/recipes-graphics/mesa/mesa-common.inc | 49 -
> > meta-oe/recipes-graphics/mesa/mesa-dri.inc | 27 -
> > meta-oe/recipes-graphics/mesa/mesa-dri_7.10.2.bb | 4 -
> > meta-oe/recipes-graphics/mesa/mesa-xlib.inc | 5 -
> > meta-oe/recipes-graphics/mesa/mesa-xlib_7.10.2.bb | 4 -
> > meta-oe/recipes-graphics/mesa/mesa_7.10.2.bb | 6 -
> > .../pango/pango-1.28.3/no-tests.patch | 10 -
> > .../pango/pango-1.29.4/no-tests.patch | 11 +
> > meta-oe/recipes-graphics/pango/pango_1.28.3.bb | 9 -
> > meta-oe/recipes-graphics/pango/pango_1.29.4.bb | 9 +
> > .../xorg-driver/xf86-input-tslib_0.0.6.bb | 4 +-
> > .../xorg-driver/xf86-input-void_1.4.0.bb | 4 +-
> > .../xorg-driver/xf86-video-fbdev_0.4.2.bb | 4 +-
> > .../xorg-driver/xf86-video-geode_2.11.12.bb | 4 +-
> > .../xorg-driver/xf86-video-glamo_git.bb | 4 +-
> > .../xf86-video-omapfb/0001-blacklist-tv-out.patch | 28 -
> > ...virtual-size-when-configuring-framebuffer.patch | 26 -
> > .../xf86-video-omapfb/0003-force-plain-mode.patch | 26 -
> > .../0004-Attempt-to-fix-VRFB.patch | 320 ---
> > .../xorg-driver/xf86-video-omapfb_git.bb | 27 -
> > .../xorg-lib/libx11-1.4.3/keysymdef_include.patch | 19 -
> > .../libx11-1.4.3/x11_disable_makekeys.patch | 29 -
> > meta-oe/recipes-graphics/xorg-lib/libx11.inc | 52 -
> > meta-oe/recipes-graphics/xorg-lib/libx11_1.4.3.bb | 11 -
> > .../xorg-lib/libxft_2.2.0.bbappend | 1 -
> > .../xorg-lib/libxrender_0.9.6.bbappend | 1 -
> > .../xorg-proto/renderproto_0.11.1.bbappend | 1 -
> > .../xorg-xserver/xorg-xserver-common.inc | 126 -
> > .../50b9d3142ff90af2f7fa35b7b1bf9e5a07723dbd.patch | 61 -
> > ...ack-assume-pixman-supports-overlapped-blt.patch | 14 -
> > .../hack-fbdev-ignore-return-mode.patch | 39 -
> > .../xserver-xorg-1.10.2/randr-support.patch | 102 -
> > .../replace-pkgconfig-sdkdir-poking.patch | 33 -
> > .../xorg-xserver/xserver-xorg_1.10.2.bb | 33 -
> > .../recipes-navigation/navit/navit-icons_svn.bb | 7 +-
> > meta-oe/recipes-support/iso-codes/iso-codes_1.4.bb | 7 +-
> > meta-oe/recipes-support/pidgin/pidgin.inc | 3 +-
> > ...poppler-data_0.4.0.bb => poppler-data_0.4.5.bb} | 6 +-
> > meta-oe/recipes-support/poppler/poppler_0.12.3.bb | 10 -
> > meta-oe/recipes-support/poppler/poppler_0.18.0.bb | 10 +
> > meta-oe/recipes-support/talloc/talloc_2.0.1.bb | 27 -
> > 85 files changed, 213 insertions(+), 4594 deletions(-)
> > create mode 100644 meta-efl/recipes-efl/e17/e-wm-theme-illume-efenniht/LICENSE
> > create mode 100644 meta-efl/recipes-efl/e17/exquisite-theme-illume/LICENSE
> > create mode 100644 meta-efl/recipes-efl/efl/elementary-theme-efenniht/LICENSE
> > create mode 100644 meta-efl/recipes-efl/efl/epdf/epdf.poppler-0.16.api.change.patch
> > delete mode 100644 meta-oe/classes/glx-use-tls.bbclass
> > delete mode 100644 meta-oe/recipes-core/glib-2.0/glib-2.0.inc
> > delete mode 100644 meta-oe/recipes-core/glib-2.0/glib-2.0/0003-gatomic-proper-pointer-get-cast.patch.patch
> > delete mode 100644 meta-oe/recipes-core/glib-2.0/glib-2.0/0005-glib-mkenums-interpreter.patch.patch
> > delete mode 100644 meta-oe/recipes-core/glib-2.0/glib-2.0/60_wait-longer-for-threads-to-die.patch
> > delete mode 100644 meta-oe/recipes-core/glib-2.0/glib-2.0/configure-libtool.patch
> > delete mode 100644 meta-oe/recipes-core/glib-2.0/glib-2.0/g_once_init_enter.patch
> > delete mode 100644 meta-oe/recipes-core/glib-2.0/glib-2.0/glib-gettextize-dir.patch
> > delete mode 100644 meta-oe/recipes-core/glib-2.0/glib-2.0/no-iconv.patch
> > delete mode 100644 meta-oe/recipes-core/glib-2.0/glib-2.0/remove.test.for.qsort_r.patch
> > delete mode 100644 meta-oe/recipes-core/glib-2.0/glib-2.0_git.bb
> > delete mode 100644 meta-oe/recipes-core/glib-2.0/glib.inc
> > delete mode 100644 meta-oe/recipes-devtools/gdbus-binding-tool/gdbus-binding-tool/COPYING
> > delete mode 100644 meta-oe/recipes-devtools/gdbus-binding-tool/gdbus-binding-tool_git.bb
> > create mode 100644 meta-oe/recipes-devtools/python/python-cython-0.15.1/0001-Don-t-append-docs-to-_Extension.extension.__doc__.patch
> > rename meta-oe/recipes-devtools/python/{python-cython_0.13.bb => python-cython_0.15.1.bb} (68%)
> > delete mode 100644 meta-oe/recipes-graphics/mesa/README
> > delete mode 100644 meta-oe/recipes-graphics/mesa/mesa-7.10.2.inc
> > delete mode 100644 meta-oe/recipes-graphics/mesa/mesa-7.10.2/glamo.patch
> > delete mode 100644 meta-oe/recipes-graphics/mesa/mesa-7.10.2/uclibc.patch
> > delete mode 100644 meta-oe/recipes-graphics/mesa/mesa-common.inc
> > delete mode 100644 meta-oe/recipes-graphics/mesa/mesa-dri.inc
> > delete mode 100644 meta-oe/recipes-graphics/mesa/mesa-dri_7.10.2.bb
> > delete mode 100644 meta-oe/recipes-graphics/mesa/mesa-xlib.inc
> > delete mode 100644 meta-oe/recipes-graphics/mesa/mesa-xlib_7.10.2.bb
> > delete mode 100644 meta-oe/recipes-graphics/mesa/mesa_7.10.2.bb
> > delete mode 100644 meta-oe/recipes-graphics/pango/pango-1.28.3/no-tests.patch
> > create mode 100644 meta-oe/recipes-graphics/pango/pango-1.29.4/no-tests.patch
> > delete mode 100644 meta-oe/recipes-graphics/pango/pango_1.28.3.bb
> > create mode 100644 meta-oe/recipes-graphics/pango/pango_1.29.4.bb
> > delete mode 100644 meta-oe/recipes-graphics/xorg-driver/xf86-video-omapfb/0001-blacklist-tv-out.patch
> > delete mode 100644 meta-oe/recipes-graphics/xorg-driver/xf86-video-omapfb/0002-Revert-Set-virtual-size-when-configuring-framebuffer.patch
> > delete mode 100644 meta-oe/recipes-graphics/xorg-driver/xf86-video-omapfb/0003-force-plain-mode.patch
> > delete mode 100644 meta-oe/recipes-graphics/xorg-driver/xf86-video-omapfb/0004-Attempt-to-fix-VRFB.patch
> > delete mode 100644 meta-oe/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb
> > delete mode 100644 meta-oe/recipes-graphics/xorg-lib/libx11-1.4.3/keysymdef_include.patch
> > delete mode 100644 meta-oe/recipes-graphics/xorg-lib/libx11-1.4.3/x11_disable_makekeys.patch
> > delete mode 100644 meta-oe/recipes-graphics/xorg-lib/libx11.inc
> > delete mode 100644 meta-oe/recipes-graphics/xorg-lib/libx11_1.4.3.bb
> > delete mode 100644 meta-oe/recipes-graphics/xorg-lib/libxft_2.2.0.bbappend
> > delete mode 100644 meta-oe/recipes-graphics/xorg-lib/libxrender_0.9.6.bbappend
> > delete mode 100644 meta-oe/recipes-graphics/xorg-proto/renderproto_0.11.1.bbappend
> > delete mode 100644 meta-oe/recipes-graphics/xorg-xserver/xorg-xserver-common.inc
> > delete mode 100644 meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.10.2/50b9d3142ff90af2f7fa35b7b1bf9e5a07723dbd.patch
> > delete mode 100644 meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.10.2/hack-assume-pixman-supports-overlapped-blt.patch
> > delete mode 100644 meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.10.2/hack-fbdev-ignore-return-mode.patch
> > delete mode 100644 meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.10.2/randr-support.patch
> > delete mode 100644 meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.10.2/replace-pkgconfig-sdkdir-poking.patch
> > delete mode 100644 meta-oe/recipes-graphics/xorg-xserver/xserver-xorg_1.10.2.bb
> > rename meta-oe/recipes-support/poppler/{poppler-data_0.4.0.bb => poppler-data_0.4.5.bb} (77%)
> > delete mode 100644 meta-oe/recipes-support/poppler/poppler_0.12.3.bb
> > create mode 100644 meta-oe/recipes-support/poppler/poppler_0.18.0.bb
> > delete mode 100644 meta-oe/recipes-support/talloc/talloc_2.0.1.bb
> >
> > --
> > 1.7.7
> >
>
> --
> Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 46+ messages in thread
end of thread, other threads:[~2011-10-12 7:24 UTC | newest]
Thread overview: 46+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-09-30 12:56 [meta-oe][meta-efl][PATCH 00/15] Pull request #23 Martin Jansa
2011-09-30 12:56 ` [meta-oe][meta-efl][PATCH 01/15] glib-2.0: upgrade from 2.29.3+git to 2.30.0 release Martin Jansa
2011-09-30 15:51 ` Martin Jansa
2011-09-30 12:56 ` [meta-oe][meta-efl][PATCH 02/15] xorg-driver: use renamed .inc from oe-core Martin Jansa
2011-09-30 12:56 ` [meta-oe][meta-efl][PATCH 03/15] libxft, libxrender, renderproto: move native BBCLASSEXTENDs to oe-core Martin Jansa
2011-09-30 12:56 ` [meta-oe][meta-efl][PATCH 04/15] xf86-video-omapfb: merged " Martin Jansa
2011-09-30 12:56 ` [meta-oe][meta-efl][PATCH 05/15] recipes: use allarch instead of PACKAGE_ARCH = all Martin Jansa
2011-09-30 12:56 ` [meta-oe][meta-efl][PATCH 06/15] e-base: bump EFL_SRCREV Martin Jansa
2011-09-30 12:56 ` [meta-oe][meta-efl][PATCH 07/15] e-wm: include /usr/lib/enlightenment/modules/wizard/favorites/.order in FILES+${PN} Martin Jansa
2011-09-30 12:56 ` [meta-oe][meta-efl][PATCH 08/15] e-wm-theme-illume-efenniht, exquisite-theme-illume, elementary-theme-efenniht: add LIC_FILES_CHKSUM Martin Jansa
2011-09-30 12:56 ` [meta-oe][meta-efl][PATCH 09/15] xserver-xorg: drop 1.10.2 and use xserver-xf86-lite-1.11.0 from oe-core instead Martin Jansa
2011-09-30 12:56 ` [meta-oe][meta-efl][PATCH 10/15] libx11: drop here, 1.4.4 should be in oe-core Martin Jansa
2011-09-30 12:56 ` [meta-oe][meta-efl][PATCH 11/15] task-x11: use xserver-xf86-lite as default XSERVER Martin Jansa
2011-09-30 12:56 ` [meta-oe][meta-efl][PATCH 12/15] xf86-video-glamo: change RDEPENDS for xserver-xf86-dri-lite Martin Jansa
2011-09-30 12:56 ` [meta-oe][meta-efl][PATCH 13/15] mesa: drop, there should be mesa-7.11 in oe-core Martin Jansa
2011-09-30 12:56 ` [meta-oe][meta-efl][PATCH 14/15] talloc: drop from meta-oe, no longer needed by mesa Martin Jansa
2011-09-30 12:56 ` [meta-oe][meta-efl][PATCH 15/15] glx-use-tls: moved to oe-core with mesa recipes Martin Jansa
2011-10-03 11:47 ` [meta-oe][meta-efl][PATCH 00/15] Pull request #23 Martin Jansa
2011-10-03 13:27 ` [meta-oe][meta-efl][PATCHv2 00/25] " Martin Jansa
2011-10-03 13:26 ` [meta-oe][meta-efl][PATCHv2 01/25] xorg-driver: use renamed .inc from oe-core Martin Jansa
2011-10-03 13:27 ` [meta-oe][meta-efl][PATCHv2 02/25] libxft, libxrender, renderproto: move native BBCLASSEXTENDs to oe-core Martin Jansa
2011-10-03 13:27 ` [meta-oe][meta-efl][PATCHv2 03/25] xf86-video-omapfb: merged " Martin Jansa
2011-10-03 13:27 ` [meta-oe][meta-efl][PATCHv2 04/25] xserver-xorg: drop 1.10.2 and use xserver-xf86-lite-1.11.0 from oe-core instead Martin Jansa
2011-10-03 13:27 ` [meta-oe][meta-efl][PATCHv2 05/25] libx11: drop here, 1.4.4 should be in oe-core Martin Jansa
2011-10-03 13:27 ` [meta-oe][meta-efl][PATCHv2 06/25] mesa: drop, there should be mesa-7.11 " Martin Jansa
2011-10-03 13:27 ` [meta-oe][meta-efl][PATCHv2 07/25] talloc: drop from meta-oe, no longer needed by mesa Martin Jansa
2011-10-03 13:27 ` [meta-oe][meta-efl][PATCHv2 08/25] glx-use-tls: moved to oe-core with mesa recipes Martin Jansa
2011-10-03 13:27 ` [meta-oe][meta-efl][PATCHv2 09/25] recipes: use allarch instead of PACKAGE_ARCH = all Martin Jansa
2011-10-03 13:27 ` [meta-oe][meta-efl][PATCHv2 10/25] glib-2.0: drop 2.29.3+git from meta-oe, there should be 2.30.0 in oe-core Martin Jansa
2011-10-03 13:27 ` [meta-oe][meta-efl][PATCHv2 11/25] gdbus-binding-tool: drop from meta-oe, superseeded by glib-2.30.0 where it's included Martin Jansa
2011-10-03 13:27 ` [meta-oe][meta-efl][PATCHv2 12/25] pango: upgrade to 1.29.4 Martin Jansa
2011-10-03 13:27 ` [meta-oe][meta-efl][PATCHv2 13/25] poppler-data: upgrade from 0.4.0 to 0.4.5 Martin Jansa
2011-10-03 13:27 ` [meta-oe][meta-efl][PATCHv2 14/25] poppler: upgrade from 0.12.3 to 0.18.0 Martin Jansa
2011-10-03 13:27 ` [meta-oe][meta-efl][PATCHv2 15/25] python-cython: upgrade to 0.15.1 because 0.13 doesn't work with python-2.7.2 Martin Jansa
2011-10-03 13:27 ` [meta-oe][meta-efl][PATCHv2 16/25] python-cython: add patch to fix build error with some distutils packages Martin Jansa
2011-10-03 13:27 ` [meta-oe][meta-efl][PATCHv2 17/25] pidgin: package purple-2/libymsg.so to libpurple-dev Martin Jansa
2011-10-03 13:27 ` [meta-oe][meta-efl][PATCHv2 18/25] e-base: bump EFL_SRCREV Martin Jansa
2011-10-03 13:27 ` [meta-oe][meta-efl][PATCHv2 19/25] e-wm: include /usr/lib/enlightenment/modules/wizard/favorites/.order in FILES+${PN} Martin Jansa
2011-10-03 13:27 ` [meta-oe][meta-efl][PATCHv2 20/25] e-wm-theme-illume-efenniht, exquisite-theme-illume, elementary-theme-efenniht: add LIC_FILES_CHKSUM Martin Jansa
2011-10-03 13:27 ` [meta-oe][meta-efl][PATCHv2 21/25] elementary: fir order of PACKAGES Martin Jansa
2011-10-03 13:27 ` [meta-oe][meta-efl][PATCHv2 22/25] epdf: fix build with poppler >= 0.16 Martin Jansa
2011-10-03 13:27 ` [meta-oe][meta-efl][PATCHv2 23/25] elementary, ethumb, libeflvala: bump PR to rebuild against newer poppler Martin Jansa
2011-10-03 13:27 ` [meta-oe][meta-efl][PATCHv2 24/25] python-efl: use INC_PR Martin Jansa
2011-10-03 13:27 ` [meta-oe][meta-efl][PATCHv2 25/25] elfe: bump PR to rebuild against newer poppler Martin Jansa
2011-10-12 6:37 ` [meta-oe][meta-efl][PATCHv2 00/25] Pull request #23 Martin Jansa
2011-10-12 7:18 ` Martin Jansa
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.