Merge ssh://gitserver@git.pokylinux.org/poky

44 files changed, 430 insertions, 2757 deletions

diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index 1f280a0dc5..e801fd12a9 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -681,9 +681,20 @@ def oe_unpack_file(file, data, url = None):
                 if os.path.samefile(file, dest):
                         return True
 
+        # Change to subdir before executing command
+        save_cwd = os.getcwd();
+        parm = bb.decodeurl(url)[5]
+        if 'subdir' in parm:
+                newdir = ("%s/%s" % (os.getcwd(), parm['subdir']))
+                bb.mkdirhier(newdir)
+                os.chdir(newdir)
+
         cmd = "PATH=\"%s\" %s" % (bb.data.getVar('PATH', data, 1), cmd)
         bb.note("Unpacking %s to %s/" % (file, os.getcwd()))
         ret = os.system(cmd)
+
+        os.chdir(save_cwd)
+
         return ret == 0
 
 addtask unpack after do_fetch
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index fa53b1358c..df870142f1 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -23,7 +23,7 @@ def legitimize_package_name(s):
         # Remaining package name validity fixes
         return s.lower().replace('_', '-').replace('@', '+').replace(',', '+').replace('/', '-')
 
-def do_split_packages(d, root, file_regex, output_pattern, description, postinst=None, recursive=False, hook=None, extra_depends=None, aux_files_pattern=None, postrm=None, allow_dirs=False, prepend=False, match_path=False, aux_files_pattern_verbatim=None):
+def do_split_packages(d, root, file_regex, output_pattern, description, postinst=None, recursive=False, hook=None, extra_depends=None, aux_files_pattern=None, postrm=None, allow_dirs=False, prepend=False, match_path=False, aux_files_pattern_verbatim=None, allow_links=False):
         """
         Used in .bb files to split up dynamically generated subpackages of a 
         given package, usually plugins or modules.
@@ -72,7 +72,7 @@ def do_split_packages(d, root, file_regex, output_pattern, description, postinst
                         continue
                 f = os.path.join(dvar + root, o)
                 mode = os.lstat(f).st_mode
-                if not (stat.S_ISREG(mode) or (allow_dirs and stat.S_ISDIR(mode))):
+                if not (stat.S_ISREG(mode) or (allow_links and stat.S_ISLNK(mode)) or (allow_dirs and stat.S_ISDIR(mode))):
                         continue
                 on = legitimize_package_name(m.group(1))
                 pkg = output_pattern % on
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 692d9b1622..7f0da1b965 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -295,7 +295,7 @@ IMAGE_ROOTFS = "${TMPDIR}/rootfs"
 IMAGE_BASENAME = "${PN}"
 IMAGE_NAME = "${IMAGE_BASENAME}-${MACHINE}-${DATETIME}"
 IMAGE_LINK_NAME = "${IMAGE_BASENAME}-${MACHINE}"
-IMAGE_EXTRA_SPACE = 10240
+IMAGE_EXTRA_SPACE = 40240
 
 IMAGE_CMD = ""
 IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 ${EXTRA_IMAGECMD}"
@@ -424,7 +424,7 @@ EXTRA_OEMAKE_prepend_task-compile = "${PARALLEL_MAKE} "
 # Optimization flags.
 ##################################################################
 
-FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2"
+FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2 -ggdb -feliminate-unused-debug-types"
 DEBUG_OPTIMIZATION = "-O -fno-omit-frame-pointer -g"
 SELECTED_OPTIMIZATION = "${@bb.data.getVar(['FULL_OPTIMIZATION', 'DEBUG_OPTIMIZATION'][bb.data.getVar('DEBUG_BUILD', d, 1) == '1'], d, 1)}"
 BUILD_OPTIMIZATION = "-O2"
diff --git a/meta/conf/checksums.ini b/meta/conf/checksums.ini
index daf64cfd0b..f45e5560d2 100644
--- a/meta/conf/checksums.ini
+++ b/meta/conf/checksums.ini
@@ -702,6 +702,10 @@ sha256=140828e8aa7d690d8f2a9a54faeac38bcbf40ea18c1f44a186af51bd6964cd13
 md5=1ef201f29283179c8e5ab618529cac78
 sha256=744d8f3a8206fbc45a5558d92163d5ef7e5e0cc0700283bb6a617fb1201629f9
 
+[http://archive.apache.org/dist/tomcat/tomcat-4/v4.1.37/src/apache-tomcat-4.1.37-src.tar.gz]
+md5=fe50177a25a084ad1abf4a201d08c2a6
+sha256=65e4cc9d3ea4a7f30044bfd6c660c772adb75ac152d775342deb6049a0d19d74
+
 [ftp://ftp.buici.com/pub/apex/apex-1.4.11.tar.gz]
 md5=7259a49d93b1853b1b3435753893ab7c
 sha256=bce6638d95fa8d32b109176a7cef6aa71e40c130068fac71b0df369d1a36c82c
@@ -946,6 +950,10 @@ sha256=e25caa0e9639ea54dd7c4f21e8146ac9859a61fa126f397edf874b5fdc147430
 md5=4510391e6b3edaa4cffb3ced87c9560c
 sha256=b26a3499672b0eddcbd87c8e61dfb60ae74d9ee0cc181a5d924fb73db62a25ec
 
+[ftp://ftp.gnu.org/gnu/automake/automake-1.10.2.tar.bz2]
+md5=1498208ab1c8393dcbd9afb7d06df6d5
+sha256=c38ac9fe53d9492b0a0a02a8e691cd2c96d7f4cc13aedeedc6d08613b77e640f
+
 [ftp://ftp.gnu.org/gnu/automake/automake-1.10.tar.bz2]
 md5=0e2e0f757f9e1e89b66033905860fded
 sha256=2efebda5dd64fd52599a19564041d63dcaba68fafacc0080ffa6e8f0df8da697
@@ -1310,6 +1318,10 @@ sha256=ac6a5c3f4aa88f39e8f04fe43f00972f0235674ac3edb994c70ac802a1ed0219
 md5=5a6228512bcce7d9fabe8fc2d66269bf
 sha256=5cd1a5aeace83a9305f7221e9ec95127b5a26870c619fd00ae48f1962d59f48b
 
+[ftp://ftp.debian.org/debian/pool/main/b/blktool/blktool_4.orig.tar.gz]
+md5=62edc09c9908107e69391c87f4f3fd40
+sha256=b1e6d5912546d2a4b704ec65c2b9664aa3b4663e7d800e06803330335a2cb764
+
 [ftp://ftp.pl.debian.org/pub/debian/pool/main/b/blktool/blktool_4.orig.tar.gz]
 md5=62edc09c9908107e69391c87f4f3fd40
 sha256=b1e6d5912546d2a4b704ec65c2b9664aa3b4663e7d800e06803330335a2cb764
@@ -1594,6 +1606,14 @@ sha256=f7bf5368309d76e5daf3a89d4d1bea688dac7780742e7a0ae1af19be9316fe22
 md5=badb4563a02d4188b478df31fa1b657d
 sha256=5c4594f71eab62e24d12c67ae6a6aead306c537cf71e946c4e9fbebbe9786243
 
+[http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-0.98/cacao-0.98.tar.bz2]
+md5=8b8907c8b925761c9410bcadb9705346
+sha256=cb9363add825cedf77764fc49a223aaf43f0a9f485b711ba8c92f16b13fff188
+
+[http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-0.99.3/cacao-0.99.3.tar.bz2]
+md5=db93ab31c6d1b7f1e213771bb81bde58
+sha256=1ea5bd257f755ffcae2c7a1935c37147c7392478922410e0870361eea08b6c27
+
 [http://cairographics.org/releases/cairo-1.2.2.tar.gz]
 md5=2460487b1257a5583c889b1b9d2033ec
 sha256=9d53b8dd0bf76dd0da7cdbe65a6c6934be49bd3942dc5f7ef7bbcc7529d9ee02
@@ -1806,6 +1826,18 @@ sha256=6a068f70f908ee4de0ba4d7e1d5127b12ad548da371494c668966d1ff98e05a2
 md5=cf5aaaf07fe43567fa605b33165355d7
 sha256=4f2824c42062dea269e489c1acb2769c015bf78cdaa929ee75441d412f10a03b
 
+[ftp://ftp.gnu.org/gnu/classpath/classpath-0.93.tar.gz]
+md5=ffa9e9cac31c5acbf0ea9eff9efa923d
+sha256=df2d093612abd23fe67e9409d89bb2a8e79b1664fe2b2da40e1c8ed693e32945
+
+[ftp://ftp.gnu.org/gnu/classpath/classpath-0.96.1.tar.gz]
+md5=a2ffb40f13fc76c2dda8f8311b30add9
+sha256=ee464d20ef9df2196e238302d5d06954cb96a11e73c4c44c6ef376859de2a078
+
+[ftp://ftp.gnu.org/gnu/classpath/classpath-0.97.2.tar.gz]
+md5=6a35347901ace03c31cc49751b338f31
+sha256=001fee5ad3ddd043783d59593153510f09064b0d9b5aea82f535266f62f02db4
+
 [http://downloads.sourceforge.net/sylpheed-claws/claws-mail-2.7.2.tar.bz2]
 md5=079f167fba6e17ae2c688a0dae858b0f
 sha256=a47a079f583581c2d049195f12a26524390e272c820b2c7233a37582e887a5b5
@@ -2182,6 +2214,10 @@ sha256=4be82f4ef8f4657f997a44b3daddba3f95dbb6518487509767d803dd72bf529e
 md5=c552b9bc4b69e4c602644abc21b7661e
 sha256=6f1fca18af9214e896c5c0a11f94fe05a0345c641ed57da886a93a4e3b33147e
 
+[http://dbus.freedesktop.org/releases/dbus/dbus-1.2.4.tar.gz]
+md5=2e643910a09f44b000a0d76038637999
+sha256=ab3c24d8028a5792e62e8e3b40a9733b10b21327dc4c578e34b092a1793afbb8
+
 [http://freedesktop.org/software/dbus/releases/dbus-glib-0.71.tar.gz]
 md5=4e1e7348b26ee8b6485452113f4221cc
 sha256=b58a489fdd35a70d241f512bc08f3b6d9d8e05110f4a1d5341cff6a0b7d854b7
@@ -2418,6 +2454,10 @@ sha256=cc2c86cbd0ec020a4486ac9d195e6a848a0d11a280c3194e095719f60c9751a9
 md5=ab066a97c226066485ad20e5ad5ce424
 sha256=54f3e9ac2bd9f622b28ab0d5149e9bc13d62d8826be085c32abc929bc30dda6a
 
+[http://www.thekelleys.org.uk/dnsmasq/dnsmasq-2.46.tar.gz]
+md5=79ec740d1a10ee75f13efa4ff36d0250
+sha256=9888d96d7d91e518c96a034dc863f8f7d961acd9334a1acde849c6022e540212
+
 [ftp://sources.redhat.com/pub/docbook-tools/new-trials/SOURCES/docbook-utils-0.6.13.tar.gz]
 md5=af785716b207a7a562551851298a3b1a
 sha256=f74e9485f1e1f7484be432f4979415afbd9d8c20d0bdf6eab42eb2931b9b5d97
@@ -2506,6 +2546,22 @@ sha256=c4e482687d0cff240d02a70fcf423cc14296b6a7869cd8dd42d5404d098e0bb7
 md5=1c1c5177aea9a23b45b9b3f5b3241819
 sha256=635d6d07e5a4d615e599c051166af965baa754f9ff7435e746de1a5d2a5c0d56
 
+[http://downloads.sourceforge.net/e2fsprogs/e2fsprogs-libs-1.33.tar.gz]
+md5=c7545bb05e0c2fc59174f0dc455c6519
+sha256=a65d064bee3e97c164d07a490692db0e73da8da10019ad9a89866706c93ae703
+
+[http://downloads.sourceforge.net/e2fsprogs/e2fsprogs-libs-1.34.tar.gz]
+md5=b51824f1c34be88e8581d96fc418d224
+sha256=2c505a14157fe591bd540b9a0dca11f5d842e3b6c34a23dbbbd9eafcc9fa33fa
+
+[http://downloads.sourceforge.net/e2fsprogs/e2fsprogs-libs-1.35.tar.gz]
+md5=d31301cc2756dc9b0254b6aac03c376e
+sha256=236f1c173fe378b1306db797dc31f1884208ceac3ab81ad52f69e01f7bf61277
+
+[http://downloads.sourceforge.net/e2fsprogs/e2fsprogs-libs-1.39.tar.gz]
+md5=32a2f67223feb2d70233eb3f41e73311
+sha256=fe3c72d861f2a3791f31ea33043d25e29e9a4e3d6a3833b151237a62c5c703f9
+
 [http://www.pobox.com/~sheff/sw/e2tools/e2tools-0.0.16.tar.gz]
 md5=1829b2b261e0e0d07566066769b5b28b
 sha256=4e3c8e17786ccc03fc9fb4145724edf332bb50e1b3c91b6f33e0e3a54861949b
@@ -2530,6 +2586,10 @@ sha256=6b5a71790120977a96d5a468ed69987107c5079f14b0a4081f460b3b14fbf952
 md5=c3c60c83f6df30021e11da50a699dec9
 sha256=2382f315fda4241a0043bac1dfc669f006d8e93e87fa382b263b1672972f4077
 
+[http://mirrors.ibiblio.org/pub/mirrors/eclipse/eclipse/downloads/drops/R-3.4-200806172000/ecjsrc-3.4.zip]
+md5=f7b84d912e61dfdd77b7173065845250
+sha256=a6ce5f0682462e85e5e47229e5b16555f74c60188fa0bb17536beb1138c537b4
+
 [http://enlightenment.freedesktop.org/files/ecore-0.9.9.037.tar.gz]
 md5=ec6d00a39ca6648f12f58f8d4f2208cc
 sha256=2c31372ccfc9b411edc73785450c5212dc4a2fe286de9f49f38a02dd24895aea
@@ -2822,6 +2882,10 @@ sha256=52b31fa70151b97ef871d44ad9214e90279f7cbd95144c6b40da49079ed0f1ce
 md5=3654bbbf01deeb0d804df194e1b1a2b3
 sha256=52b31fa70151b97ef871d44ad9214e90279f7cbd95144c6b40da49079ed0f1ce
 
+[ftp://ftp.debian.org/debian/pool/main/f/fakeroot/fakeroot_1.9.4.tar.gz]
+md5=c324eb1e157edad17d98b1b2c8b99e25
+sha256=8c55b1640c726bd421b68a1119f20b002eb29d95ae58d480a1d5d7d8afba1e81
+
 [ftp://ftp.pl.debian.org/pub/debian/pool/main/f/fakeroot/fakeroot_1.9.4.tar.gz]
 md5=c324eb1e157edad17d98b1b2c8b99e25
 sha256=8c55b1640c726bd421b68a1119f20b002eb29d95ae58d480a1d5d7d8afba1e81
@@ -2838,6 +2902,10 @@ sha256=1e0aa136693a3e9f4b43ebd71e7bd934cea31817a4a6cba2edc7aac353b8a93f
 md5=2aaf871471a9ec037763c5dc7c193c57
 sha256=6b9785167934948a582839f9723e37214cab1607a9764c35f10d555f8e662575
 
+[http://download.savannah.nongnu.org/releases/fastjar/fastjar-0.95.tar.gz]
+md5=92a70f9e56223b653bce0f58f90cf950
+sha256=ca03811490c965abc9f466e75418ae48bb71f14d8e8ed4c43e8109207b85ce54
+
 [http://ftp3.ie.freebsd.org/pub/gentoo/distfiles/fbgetty-0.1.698.tar.gz]
 md5=1705bc0f8f1e03fe50d324ba84ac4e56
 sha256=332cbffa7c489b39a7d13d12d581c27dfc57ba098041431a6845b44785cf2d35
@@ -3498,6 +3566,10 @@ sha256=63dc1c03a107ec73871151bb765da7d5dfc1d699c0d0d6a3d244cf5ccb030913
 md5=b594ff4ea4fbef4ba9220887de713dfe
 sha256=3444179840638cb8664e8e53604900c4521d29d57785a5091202ee4937d8d0fd
 
+[ftp://ftp.gnu.org/gnu/gcc/gcc-3.4.6/gcc-3.4.6.tar.bz2]
+md5=4a21ac777d4b5617283ce488b808da7b
+sha256=7791a601878b765669022b8b3409fba33cc72f9e39340fec8af6d0e6f72dec39
+
 [ftp://ftp.gnu.org/gnu/gcc/gcc-4.0.0/gcc-4.0.0.tar.bz2]
 md5=55ee7df1b29f719138ec063c57b89db6
 sha256=38a9a01e195000976dcd04ec854c398478ada839510b1de384ffbd5f99791bdc
@@ -5598,6 +5670,10 @@ sha256=ef6b1c8def236f16ea914eccbb050c84ee314c0028b03c560ed20ff96776f74c
 md5=641ec45fe377529c7fd914f77b11b44f
 sha256=9ff8360375432a7a5c476cc6d55b3fdea9d6f3edc080d295a60421d8f47b1834
 
+[http://jalimo.evolvis.org/repository/sources/icepick-0.0+hg20080118.tar.bz2]
+md5=ce7b1827e6f4cbe73b9ffa90b0d45a6a
+sha256=63170836095f8451498c813a1f93a9ec70a1164d82aa30650c0f2216ca4377ab
+
 [http://ftp.debian.org/debian/pool/main/i/iceweasel/iceweasel_3.0.1-1.diff.gz]
 md5=7124ea3c13369ff27bcff0080aca678f
 sha256=1d70e21e1c20e8d88bf3d2590de75c3e65b12da335097716adc58712cea41dad
@@ -7870,6 +7946,10 @@ sha256=e69f4cc9baee9be87400371cbdca1cb03428394c624640e64397089d090dbf0d
 md5=c779f84c4add124e704e6ea3ccc4039c
 sha256=d98203f017c6e1de7dca2037c533000705fc86b12f29694ddb4db17854e5498a
 
+[http://ftp.gnome.org/pub/GNOME/sources/libsoup/2.4/libsoup-2.4.1.tar.bz2]
+md5=d0fc91ccb9da401e9e40d2f4612bdac9
+sha256=774094746748fb0c8985210de0994accdc7095c222fba42c5623e2137443b6cd
+
 [http://www.libspf2.org/spf/libspf2-1.0.4.tar.gz]
 md5=5fe69ba13bf35d505b733247032a8a64
 sha256=222803a98d1e86ac7eee9491beb5fbf30e259a3c74cd4166bda1796374c26cd1
@@ -8538,6 +8618,10 @@ sha256=e08067d89e306fad7f4be56821998c073fc457d9444a18f6eb55dc7c0710a9d5
 md5=dea74646b7e5c621fef7174df83c34b1
 sha256=a6c85d85f912e1c321723084389d63dee7660b81b8292452b190ea7190dd73bc
 
+[http://www.lua.org/ftp/lua-5.1.4.tar.gz]
+md5=d0870f2de55d59c1c8419f36e8fac150
+sha256=b038e225eaf2a5b57c9bcc35cd13aa8c6c8288ef493d52970c9545074098af3a
+
 [http://luaforge.net/frs/download.php/989/lua-gtk2-0.3.tar.gz]
 md5=a2788c45d60ef8ce30168811d7e72334
 sha256=b3dd85e34b22cf757eafb6ef15c5505d5ec5e71803caef4b69ddc7fd5d46fabe
@@ -8626,6 +8710,10 @@ sha256=d7ee2e668455f9a092418e5475f32676eb0b37c54ae38a7fcdf2d14e0fb80c91
 md5=be2790a34349ab452dddbcfe4c95606a
 sha256=c1c67839d4af290aecd8f7743312aacc0a39ae99757f0910918531ef9a63e14f
 
+[ftp://ftp.gnu.org/gnu/m4/m4-1.4.12.tar.gz]
+md5=0499a958a561781b125c740f18061ea8
+sha256=47e8f9a33ba06fa6710b42d6f6ded41f45027f6f4039b0a3ed887c5116bc2173
+
 [ftp://ftp.gnu.org/gnu/m4/m4-1.4.4.tar.gz]
 md5=8d1d64dbecf1494690a0f3ba8db4482a
 sha256=a116c52d314c8e3365756cb1e14c6b460d6bd28769121f92373a362497359d88
@@ -9594,6 +9682,10 @@ sha256=e4c0875794a74ac627b7b74b6098e75c8413bd156856dc434a49c4c112a68af2
 md5=7df692e3186109cc00db6825b777201e
 sha256=1d2d7996cc94f9b87d0c51cf0e028070ac177c4123ecbfd7ac1cb8d0b7d322d1
 
+[http://jalimo.evolvis.org/repository/sources/openjdk-langtools-jdk7-b31.tar.bz2]
+md5=670931f67b2e4ac46c6e0cd15418f2fa
+sha256=f8b8820e410c137d279d14dec7e7a93217cc371acdfe1b3343b2278d1728932e
+
 [ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/openldap-2.2.29.tgz]
 md5=6c4c72a1336aa45b463e738034c078d6
 sha256=82ed5a27d2b340826b2e10625e687627ccefc883a426314952e4a253d5a6af29
@@ -10082,6 +10174,10 @@ sha256=3d087c88f6e2cc8fde8d2ab12ff2f85ca3ecb2c67754d0483d158f2e5802b015
 md5=5f09df47a16e83462384b44b75310539
 sha256=72f3cdad93b5436070dcc63b67764a06c594f324ccc001e8bfb974a8d1a86f36
 
+[http://distro.ibiblio.org/pub/linux/distributions/gentoo/distfiles/pax-utils-0.1.19.tar.bz2]
+md5=98f6b9fe17a740a8cc577255422c6103
+sha256=3918628e9f2508708a1a28f5ed4cb39d07cbd5711747bbb3ddf63816d056c11e
+
 [http://the.earth.li/pub/e3/pbltool-0.2.c]
 md5=c8fd507f831d2b017dfecf60bc55e28a
 sha256=2a1e31d4ae859e530895882273fad0170374a2d5b838bb4558303e59236e9cb6
@@ -10178,6 +10274,10 @@ sha256=3e9510ce715f28b7e6b803fcdadb73b37c83792c0b5e1e9bcb066ab972649996
 md5=e6029fafcee029edcfa2ceed7a005333
 sha256=e105b6aad55589aecf20ae70ab7aa81eb202296fc52531f62e546af23077cca1
 
+[http://us2.php.net/distributions/php-5.2.6.tar.bz2]
+md5=7380ffecebd95c6edb317ef861229ebd
+sha256=1892b2dd50b56ae2c9aec027fcd9035b76673f113555bc2bc1007bab8ae4db81
+
 [http://efault.net/npat/hacks/picocom/dist/picocom-1.3.tar.gz]
 md5=21865bf2891222082afc44afdd80aeaa
 sha256=ed3e0190a1940cf08a167429aa3fd25b3ae7313fdf126f851a9abccc89845ee6
@@ -11046,6 +11146,10 @@ sha256=06b32d6f8fe7065b4c2c8142a244374e1be963757125bac20ba016b92231b5bf
 md5=5f8dd5a041ca7c700b16620228f922aa
 sha256=de7290f334baf631a14d031df304ee94cfb550aa69e7512aa589d21c2381c7d8
 
+[http://download.savannah.gnu.org/releases/quilt/quilt-0.47.tar.gz]
+md5=d33d2442bd34387260b1c1db3e623af0
+sha256=100a6a7d5012d36590e607ebc87535f62318cfe7368f4cd44cacb94a2cf938a2
+
 [http://downloads.sourceforge.net/qwt/qwt-4.2.0rc1.tgz]
 md5=142b10ab27e837c3c4603cf9a7e9343b
 sha256=3b6db68d53441119dced27e5bad26ec087294cb9d878d37bcea61e1f1e4849a1
@@ -11286,6 +11390,10 @@ sha256=59cc003bab753335b3ce14a908e663ea782514b3531dc7030379ff753ef1a78c
 md5=3fbb02294a8ca33d4684055adba5ed6f
 sha256=19590e972b80333e26a6514c34d976c2037138361481a16f27b75e5d33f33a58
 
+[ftp://ftp.ruby-lang.org/pub/ruby/1.8/ruby-1.8.6-p286.tar.gz]
+md5=797ea136fe43e4286c9362ee4516674e
+sha256=1774de918b156c360843c1b68690f5f57532ee48ff079d4d05c51dace8d523ed
+
 [http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-4.8.tar.bz2]
 md5=b8f69ee5a4a2cd195892107be3a3cb29
 sha256=de644640cf71a6ce72f27ac6489b65434105fc6c94538c471925a15e2259b796
@@ -11826,10 +11934,18 @@ sha256=0ad86c4b26cd687122b158bf848f0a07d7cd644033d15c4f43b6d643bd74cd81
 md5=b4f631268d811189cfca1d5259cb5dd8
 sha256=af0b4ca361435e54316ddf715737b5b94c737c41e3c0b0e6d66ee8a8938f4500
 
+[http://www.sqlite.org/sqlite-3.5.4.tar.gz]
+md5=f17da840eed792e896c3408d0ce97718
+sha256=47daba209bd3bcffa1c5fcd5fdfc4f524eae619b4fa855aeeb1bbbc8bd2bb04f
+
 [http://www.sqlite.org/sqlite-3.5.6.tar.gz]
 md5=903c9e935c538af392364a9172a3d98d
 sha256=1673b9218ec318067a662315c161ae123088cad319231ec079018acb4717e8bb
 
+[http://www.sqlite.org/sqlite-3.6.7.tar.gz]
+md5=5223d1f459b608ed8c2c54f8847f8e1a
+sha256=55464820daf6d0559ac6355e9c873b6f111f48a18a9751261a86c650291a65de
+
 [http://downloads.sourceforge.net/squashfs/squashfs2.0-r2.tar.gz]
 md5=0b7fcaab8e634ae2385984885c731082
 sha256=353b768294783959219f1203e76c128fb4c75fa37f3a3bb139603c5db55c6974
@@ -11954,6 +12070,10 @@ sha256=8f2275d9667909d3418213522d5d4ef3312c158190429062f79da6b982b9ce6b
 md5=157d31c9dc02aa22b5f27323e5a203fc
 sha256=c31d3bbee984c7971d2b24cddc279d8ad65edff8216778d617484c147ba3ae3d
 
+[http://swfdec.freedesktop.org/download/swfdec/0.7/swfdec-0.7.4.tar.gz]
+md5=08fcda4a46454bfc66b97fba2d385f8c
+sha256=4345da2a4790125bd7205bd10a3326bf94e36f97229850b99ec9e8f050a9ab4a
+
 [http://downloads.sourceforge.net/swig/swig-1.3.29.tar.gz]
 md5=44c6f6d8d724cf7fa4a5109e6f63c9b1
 sha256=68b1b032cdc6297f068ef8c3c09abdd46a08512e17705d477cc0bf7b80a550e8
@@ -13282,6 +13402,10 @@ sha256=41c091d05943817c0b667192dab8c8f3a3a59c04a66dd311a9573f48a7b70b3b
 md5=c0e88fc3483d90a7fea6a399298d90ea
 sha256=41c091d05943817c0b667192dab8c8f3a3a59c04a66dd311a9573f48a7b70b3b
 
+[http://xorg.freedesktop.org/releases/individual/app/xeyes-1.0.1.tar.bz2]
+md5=033f14f7c4e30d1f4edbb22d5ef86883
+sha256=530902e8732130e37d9b46e73eecff90d6dbc5d5628620fded74a4e054aa8029
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/app/xeyes-X11R7.0-1.0.1.tar.bz2]
 md5=3ffafa7f222ea799bcd9fcd85c60ab98
 sha256=e93bb322fe96ceabd0581bb70101aaa1001b0b8f894b3ae0e1fa2e4b38f41af2
diff --git a/meta/conf/distro/include/poky-fixed-revisions.inc b/meta/conf/distro/include/poky-fixed-revisions.inc
index 21b632a618..97c8da6897 100644
--- a/meta/conf/distro/include/poky-fixed-revisions.inc
+++ b/meta/conf/distro/include/poky-fixed-revisions.inc
@@ -33,7 +33,7 @@ SRCREV_pn-clutter-gtk-0.8 ?= "7d3c3230376e731c06c21afa9d8c1d44dbea27cd"
 SRCREV_pn-clutter-gtk ?= "70f4b0cbd568dfa265484a03be3bd08ad15ed12e"
 SRCREV_pn-clutter-0.6 ?= "62e852a51e29dd42c84d6b34fe23b80b2542be59"
 SRCREV_pn-clutter-0.8 ?= "3ba37ff115ed3fbe6c94195775941091a3ac2b30"
-SRCREV_pn-clutter ?= "4e0073cd508ad55c8d6b6d031f060ae9644620c2"
+SRCREV_pn-clutter ?= "269598a2cfa147b4d8361789356aba8318bde434"
 SRCREV_pn-connman ?= "e952851502277cc41cd2a54ef5386cca7a8843dd"
 SRCREV_pn-connman-gnome ?= "b589f4f89bff20d54682cc6b49efa86feac8adb4"
 SRCREV_pn-dialer ?= "42a2b4dd62cf94dc905caeb087f5e7e9f418bf93"
@@ -115,7 +115,7 @@ SRCREV_pn-ubootchart ?= "10"
 SRCREV_pn-dfu-util-native = "3139"
 SRCREV_pn-dfu-util = "3139"
 SRCREV_pn-libgsmd ?= "4335"
-SRCREV_pn-libjana = "732"
+SRCREV_pn-libjana = "749"
 SRCREV_pn-libmokogsmd2 ?= "4334"
 SRCREV_pn-libmokojournal2 ?= "3473"
 SRCREV_pn-libmokopanelui2 ?= "3349"
@@ -157,7 +157,7 @@ SRCREV_pn-xserver-xf86-dri-lite ?= "251d0d8090322b2c9dc0c8b7bef001f338d19433"
 SRCREV_pn-xserver-xf86-dri2-lite ?= "251d0d8090322b2c9dc0c8b7bef001f338d19433"
 SRCREV_pn-gsm0710muxd ?= "6fecc78198dd821bbe29efd096bd8fecd855179d"
 SRCREV_pn-gsmd2 ?= "963f34df8fa3ff4b301079dcf86e9acea6b6fe0f"
-SRCREV_pn-metacity-clutter ?= "69a57bc1e7324dc7b129eafa6b396ba34bc2fe9f"
+SRCREV_pn-mutter ?= "69a57bc1e7324dc7b129eafa6b396ba34bc2fe9f"
 SRCREV_pn-dri2proto ?= "8cab3f0e6f551220bd11074779f4ccec1e948e00"
 SRCREV_pn-inputproto ?= "7203036522ba9d4b224d282d6afc2d0b947711ee"
 SRCREV_pn-inputproto-native ?= "7203036522ba9d4b224d282d6afc2d0b947711ee"
@@ -199,7 +199,7 @@ PREFERRED_VERSION_glib-2.0-native ?= "2.18.1"
 PREFERRED_VERSION_atk ?= "1.24.0"
 PREFERRED_VERSION_cairo ?= "1.8.2"
 PREFERRED_VERSION_pango ?= "1.22.2"
-PREFERRED_VERSION_gtk+ ?= "2.12.7"
+PREFERRED_VERSION_gtk+ ?= "2.14.2"
 
 PREFERRED_VERSION_dbus ?= "1.2.4"
 PREFERRED_VERSION_dbus-native ?= "1.2.4"
diff --git a/meta/conf/distro/include/poky-floating-revisions.inc b/meta/conf/distro/include/poky-floating-revisions.inc
index 89e5c7a10a..99907c539c 100644
--- a/meta/conf/distro/include/poky-floating-revisions.inc
+++ b/meta/conf/distro/include/poky-floating-revisions.inc
@@ -56,7 +56,7 @@ SRCREV_pn-table ?= "${AUTOREV}"
 SRCREV_pn-libmatchbox ?= "${AUTOREV}"
 SRCREV_pn-tasks ?= "${AUTOREV}"
 SRCREV_pn-libjana = "${AUTOREV}"
-SRCREV_pn-metacity-clutter = "${AUTOREV}"
+SRCREV_pn-mutter = "${AUTOREV}"
 
 SRCREV_pn-dri2proto = "${AUTOREV}"
 #PREFERRED_VERSION_dri2proto ?= "1.99.1+git${SRCREV}"
diff --git a/meta/conf/distro/include/preferred-xorg-versions.inc b/meta/conf/distro/include/preferred-xorg-versions.inc
index f50f2b19a7..d076aca26f 100644
--- a/meta/conf/distro/include/preferred-xorg-versions.inc
+++ b/meta/conf/distro/include/preferred-xorg-versions.inc
@@ -129,23 +129,23 @@ PREFERRED_VERSION_xproxymanagementprotocol ?= "1.0.2"
 PREFERRED_VERSION_xrandr ?= "1.2.3"
 PREFERRED_VERSION_xrdb ?= "1.0.5"
 PREFERRED_VERSION_xserver-kdrive ?= "1.3.0.0"
-PREFERRED_VERSION_xserver-xf86-dri-lite ?= "1.5.99.1+git${SRCREV}"
+PREFERRED_VERSION_xserver-xf86-dri-lite ?= "1.6.0"
 PREFERRED_VERSION_xset ?= "1.0.4"
 PREFERRED_VERSION_xtrans ?= "1.2.2"
 PREFERRED_VERSION_xtrans-native ?= "1.2.2"
 PREFERRED_VERSION_xtrans-sdk ?= "1.2.2"
 PREFERRED_VERSION_xvinfo ?= "1.0.2"
 PREFERRED_VERSION_xwininfo ?= "1.0.4"
-PREFERRED_VERSION_mesa-dri ?= "7.3.0+git${SRCREV}"
-PREFERRED_VERSION_libdrm ?= "2.4.4"
+PREFERRED_VERSION_mesa-dri ?= "7.4"
+PREFERRED_VERSION_libdrm ?= "2.4.7"
 PREFERRED_VERSION_xcb-proto ?= "1.2"
 PREFERRED_VERSION_libxcb ?= "1.1.91"
 PREFERRED_VERSION_libxcb-sdk ?= "1.1.91"
 PREFERRED_VERSION_libpciaccess ?= "0.10.5"
-PREFERRED_VERSION_xf86-input-evdev ?= "2.1.1"
+PREFERRED_VERSION_xf86-input-evdev ?= "2.2.1"
 PREFERRED_VERSION_xf86-input-mouse ?= "1.4.0"
 PREFERRED_VERSION_xf86-input-keyboard ?= "1.3.2"
-PREFERRED_VERSION_xf86-input-synaptics ?= "0.99.3"
+PREFERRED_VERSION_xf86-input-synaptics ?= "1.1.0"
 PREFERRED_VERSION_xf86-video-intel ?= "2.4.97.0+git${SRCREV}"
 PREFERRED_VERSION_xf86-video-intel-dri2 ?= "2.4.97.0+git${SRCREV}"
 
diff --git a/meta/packages/clutter/clutter-mozembed/link-with-g++.patch b/meta/packages/clutter/clutter-mozembed/link-with-g++.patch
index 8f84e6142b..5a76e45222 100644
--- a/meta/packages/clutter/clutter-mozembed/link-with-g++.patch
+++ b/meta/packages/clutter/clutter-mozembed/link-with-g++.patch
@@ -1,25 +1,26 @@
 Index: git/cluttermozembed/Makefile.am
 ===================================================================
---- git.orig/cluttermozembed/Makefile.am        2009-01-27 14:17:00.000000000 +0000
-+++ git/cluttermozembed/Makefile.am     2009-01-28 15:36:27.000000000 +0000
-@@ -16,11 +16,11 @@
+--- git.orig/cluttermozembed/Makefile.am        2009-04-16 15:54:16.000000000 +0100
++++ git/cluttermozembed/Makefile.am     2009-04-16 15:57:02.000000000 +0100
+@@ -51,12 +51,13 @@
  source_h = \
         clutter-mozembed.h
  source_c = \
 -       clutter-mozembed.c
-+       clutter-mozembed.c dummy2.cpp
++       clutter-mozembed.c dummy.cpp
  
- bin_PROGRAMS = mozheadless
+ bin_PROGRAMS = clutter-mozheadless
  
--mozheadless_SOURCES = mozheadless.c
-+mozheadless_SOURCES = mozheadless.c dummy.cpp
+ clutter_mozheadless_SOURCES = \
+        clutter-mozheadless.c \
++       dummy2.cpp \
+        clutter-mozheadless.h
  
  lib_LTLIBRARIES = libcluttermozembed.la
- libcluttermozembed_la_SOURCES = $(source_c) $(source_h)
 Index: git/configure.ac
 ===================================================================
---- git.orig/configure.ac       2009-01-27 14:17:01.000000000 +0000
-+++ git/configure.ac    2009-01-28 15:35:38.000000000 +0000
+--- git.orig/configure.ac       2009-04-16 15:54:16.000000000 +0100
++++ git/configure.ac    2009-04-16 15:54:30.000000000 +0100
 @@ -7,6 +7,7 @@
  
  AC_ISC_POSIX
diff --git a/meta/packages/clutter/clutter/enable_tests.patch b/meta/packages/clutter/clutter/enable_tests.patch
index 8544614790..953edf6bbc 100644
--- a/meta/packages/clutter/clutter/enable_tests.patch
+++ b/meta/packages/clutter/clutter/enable_tests.patch
@@ -6,10 +6,10 @@
 
 Index: git/tests/interactive/Makefile.am
 ===================================================================
---- git.orig/tests/interactive/Makefile.am      2008-12-18 16:50:45.000000000 +0000
-+++ git/tests/interactive/Makefile.am   2008-12-18 16:57:36.000000000 +0000
-@@ -68,7 +68,7 @@
- AM_CFLAGS = $(CLUTTER_CFLAGS)
+--- git.orig/tests/interactive/Makefile.am      2009-03-12 11:01:36.000000000 +0000
++++ git/tests/interactive/Makefile.am   2009-03-12 11:04:12.000000000 +0000
+@@ -77,7 +77,7 @@
+ AM_CFLAGS = $(CLUTTER_CFLAGS) $(MAINTAINER_CFLAGS)
  AM_LDFLAGS = $(CLUTTER_LIBS)
  
 -noinst_PROGRAMS = test-interactive
@@ -19,14 +19,14 @@ Index: git/tests/interactive/Makefile.am
         test-main.c \
 Index: git/tests/interactive/test-actors.c
 ===================================================================
---- git.orig/tests/interactive/test-actors.c    2008-12-18 16:58:06.000000000 +0000
-+++ git/tests/interactive/test-actors.c 2008-12-18 16:58:13.000000000 +0000
-@@ -189,7 +189,7 @@
-       /* Create a texture from file, then clone in to same resources */
-       if (i == 0)
-        {
--         if ((oh->hand[i] = clutter_texture_new_from_file ("redhand.png",
-+         if ((oh->hand[i] = clutter_texture_new_from_file ("/usr/share/clutter/redhand.png",
-                                                            &error)) == NULL)
-            {
-              g_error ("image load failed: %s", error->message);
+--- git.orig/tests/interactive/test-actors.c    2009-03-12 11:01:36.000000000 +0000
++++ git/tests/interactive/test-actors.c 2009-03-12 11:06:32.000000000 +0000
+@@ -182,7 +182,7 @@
+   oh->scaler_1 = clutter_behaviour_scale_new (alpha, 0.5, 0.5, 1.0, 1.0);
+   oh->scaler_2 = clutter_behaviour_scale_new (alpha, 1.0, 1.0, 0.5, 0.5);
+ 
+-  real_hand = clutter_texture_new_from_file ("redhand.png", &error);
++  real_hand = clutter_texture_new_from_file ("/usr/share/clutter/redhand.png", &error);
+   if (real_hand == NULL)
+     {
+       g_error ("image load failed: %s", error->message);
diff --git a/meta/packages/dbus/dbus-native_1.2.4.bb b/meta/packages/dbus/dbus-native_1.2.4.bb
index 47e3167eda..d799ba2d1d 100644
--- a/meta/packages/dbus/dbus-native_1.2.4.bb
+++ b/meta/packages/dbus/dbus-native_1.2.4.bb
@@ -3,7 +3,7 @@ inherit native
 
 DEPENDS = "glib-2.0-native libxml2-native expat-native"
 
-PR = "r2"
+PR = "r3"
 
 do_stage() {
         oe_runmake install
diff --git a/meta/packages/dbus/dbus.inc b/meta/packages/dbus/dbus.inc
index 68c8a842ee..2efcf46b22 100644
--- a/meta/packages/dbus/dbus.inc
+++ b/meta/packages/dbus/dbus.inc
@@ -12,7 +12,7 @@ SRC_URI = "\
   file://99_dbus \
 "
 
-inherit autotools pkgconfig update-rc.d gettext
+inherit autotools pkgconfig gettext
 
 INITSCRIPT_NAME = "dbus-1"
 INITSCRIPT_PARAMS = "start 02 5 2 . stop 20 0 1 6 ."
diff --git a/meta/packages/dbus/dbus_1.2.4.bb b/meta/packages/dbus/dbus_1.2.4.bb
index 25ab98b9f9..b170e7b340 100644
--- a/meta/packages/dbus/dbus_1.2.4.bb
+++ b/meta/packages/dbus/dbus_1.2.4.bb
@@ -1,4 +1,7 @@
 include dbus.inc
 
+PR = "r1"
+
+inherit update-rc.d
 
 SRC_URI += "file://fix-install-daemon.patch;patch=1 "
diff --git a/meta/packages/drm/files/poulsbo.patch b/meta/packages/drm/files/poulsbo.patch
deleted file mode 100644
index 91f8975f50..0000000000
--- a/meta/packages/drm/files/poulsbo.patch
+++ /dev/null
@@ -1,2516 +0,0 @@
-Index: libdrm-2.4.4/libdrm/xf86drm.c
-===================================================================
---- libdrm-2.4.4.orig/libdrm/xf86drm.c  2009-01-10 01:08:29.000000000 +0000
-+++ libdrm-2.4.4/libdrm/xf86drm.c       2009-02-05 12:23:22.000000000 +0000
-@@ -2402,6 +2402,569 @@
-     return 0;
- }
- 
-+
-+/*
-+ * Valid flags are
-+ * DRM_FENCE_FLAG_EMIT
-+ * DRM_FENCE_FLAG_SHAREABLE
-+ * DRM_FENCE_MASK_DRIVER
-+ */
-+
-+int drmFenceCreate(int fd, unsigned flags, int fence_class, unsigned type,
-+                  drmFence *fence)
-+{
-+    drm_fence_arg_t arg;
-+
-+    memset(&arg, 0, sizeof(arg));
-+    arg.flags = flags;
-+    arg.type = type;
-+    arg.fence_class = fence_class;
-+
-+    if (ioctl(fd, DRM_IOCTL_FENCE_CREATE, &arg))
-+       return -errno;
-+    fence->handle = arg.handle;
-+    fence->fence_class = arg.fence_class;
-+    fence->type = arg.type;
-+    fence->flags = arg.flags;
-+    fence->signaled = 0;
-+    return 0;
-+}
-+
-+/*
-+ * Valid flags are
-+ * DRM_FENCE_FLAG_SHAREABLE
-+ * DRM_FENCE_MASK_DRIVER
-+ */
-+
-+int drmFenceBuffers(int fd, unsigned flags, uint32_t fence_class, drmFence *fence)
-+{
-+    drm_fence_arg_t arg;
-+
-+    memset(&arg, 0, sizeof(arg));
-+    arg.flags = flags;
-+    arg.fence_class = fence_class;
-+
-+    if (ioctl(fd, DRM_IOCTL_FENCE_BUFFERS, &arg))
-+       return -errno;
-+    fence->handle = arg.handle;
-+    fence->fence_class = arg.fence_class;
-+    fence->type = arg.type;
-+    fence->flags = arg.flags;
-+    fence->sequence = arg.sequence;
-+    fence->signaled = 0;
-+    return 0;
-+}
-+
-+int drmFenceReference(int fd, unsigned handle, drmFence *fence)
-+{
-+    drm_fence_arg_t arg;
-+
-+    memset(&arg, 0, sizeof(arg));
-+    arg.handle = handle;
-+
-+    if (ioctl(fd, DRM_IOCTL_FENCE_REFERENCE, &arg))
-+       return -errno;
-+    fence->handle = arg.handle;
-+    fence->fence_class = arg.fence_class;
-+    fence->type = arg.type;
-+    fence->flags = arg.flags;
-+    fence->signaled = arg.signaled;
-+    return 0;
-+}
-+
-+int drmFenceUnreference(int fd, const drmFence *fence)
-+{
-+    drm_fence_arg_t arg;
-+
-+    memset(&arg, 0, sizeof(arg));
-+    arg.handle = fence->handle;
-+
-+    if (ioctl(fd, DRM_IOCTL_FENCE_UNREFERENCE, &arg))
-+       return -errno;
-+    return 0;
-+}
-+
-+int drmFenceFlush(int fd, drmFence *fence, unsigned flush_type)
-+{
-+    drm_fence_arg_t arg;
-+
-+    memset(&arg, 0, sizeof(arg));
-+    arg.handle = fence->handle;
-+    arg.type = flush_type;
-+
-+    if (ioctl(fd, DRM_IOCTL_FENCE_FLUSH, &arg))
-+       return -errno;
-+    fence->fence_class = arg.fence_class;
-+    fence->type = arg.type;
-+    fence->signaled = arg.signaled;
-+    return arg.error;
-+}
-+
-+int drmFenceUpdate(int fd, drmFence *fence)
-+{
-+    drm_fence_arg_t arg;
-+
-+    memset(&arg, 0, sizeof(arg));
-+    arg.handle = fence->handle;
-+
-+    if (ioctl(fd, DRM_IOCTL_FENCE_SIGNALED, &arg))
-+       return -errno;
-+    fence->fence_class = arg.fence_class;
-+    fence->type = arg.type;
-+    fence->signaled = arg.signaled;
-+    return 0;
-+}
-+
-+int drmFenceSignaled(int fd, drmFence *fence, unsigned fenceType,
-+                    int *signaled)
-+{
-+    if ((fence->flags & DRM_FENCE_FLAG_SHAREABLE) ||
-+       ((fenceType & fence->signaled) != fenceType)) {
-+       int ret = drmFenceFlush(fd, fence, fenceType);
-+       if (ret)
-+           return ret;
-+    }
-+
-+    *signaled = ((fenceType & fence->signaled) == fenceType);
-+
-+    return 0;
-+}
-+
-+/*
-+ * Valid flags are
-+ * DRM_FENCE_FLAG_SHAREABLE
-+ * DRM_FENCE_MASK_DRIVER
-+ */
-+
-+
-+int drmFenceEmit(int fd, unsigned flags, drmFence *fence, unsigned emit_type)
-+{
-+    drm_fence_arg_t arg;
-+
-+    memset(&arg, 0, sizeof(arg));
-+    arg.fence_class = fence->fence_class;
-+    arg.flags = flags;
-+    arg.handle = fence->handle;
-+    arg.type = emit_type;
-+
-+    if (ioctl(fd, DRM_IOCTL_FENCE_EMIT, &arg))
-+       return -errno;
-+    fence->fence_class = arg.fence_class;
-+    fence->type = arg.type;
-+    fence->signaled = arg.signaled;
-+    fence->sequence = arg.sequence;
-+    return 0;
-+}
-+
-+/*
-+ * Valid flags are
-+ * DRM_FENCE_FLAG_WAIT_LAZY
-+ * DRM_FENCE_FLAG_WAIT_IGNORE_SIGNALS
-+ */
-+
-+#define DRM_IOCTL_TIMEOUT_USEC 3000000UL
-+
-+static unsigned long
-+drmTimeDiff(struct timeval *now, struct timeval *then)
-+{
-+    uint64_t val;
-+
-+    val = now->tv_sec - then->tv_sec;
-+    val *= 1000000LL;
-+    val += now->tv_usec;
-+    val -= then->tv_usec;
-+
-+    return (unsigned long) val;
-+}
-+
-+static int
-+drmIoctlTimeout(int fd, unsigned long request, void *argp)
-+{
-+    int haveThen = 0;
-+    struct timeval then, now;
-+    int ret;
-+
-+    do {
-+       ret = ioctl(fd, request, argp);
-+       if (ret != 0 && errno == EAGAIN) {
-+           if (!haveThen) {
-+               gettimeofday(&then, NULL);
-+               haveThen = 1;
-+           }
-+           gettimeofday(&now, NULL);
-+       }
-+    } while (ret != 0 && errno == EAGAIN &&
-+            drmTimeDiff(&now, &then) < DRM_IOCTL_TIMEOUT_USEC);
-+
-+    if (ret != 0)
-+       return ((errno == EAGAIN) ? -EBUSY : -errno);
-+
-+    return 0;
-+}
-+
-+
-+
-+
-+int drmFenceWait(int fd, unsigned flags, drmFence *fence, unsigned flush_type)
-+{
-+    drm_fence_arg_t arg;
-+    int ret;
-+
-+    if (flush_type == 0) {
-+       flush_type = fence->type;
-+    }
-+
-+    if (!(fence->flags & DRM_FENCE_FLAG_SHAREABLE)) {
-+       if ((flush_type & fence->signaled) == flush_type) {
-+           return 0;
-+       }
-+    }
-+
-+    memset(&arg, 0, sizeof(arg));
-+    arg.handle = fence->handle;
-+    arg.type = flush_type;
-+    arg.flags = flags;
-+
-+
-+    ret = drmIoctlTimeout(fd, DRM_IOCTL_FENCE_WAIT, &arg);
-+    if (ret)
-+       return ret;
-+
-+    fence->fence_class = arg.fence_class;
-+    fence->type = arg.type;
-+    fence->signaled = arg.signaled;
-+    return arg.error;
-+}
-+
-+static void drmBOCopyReply(const struct drm_bo_info_rep *rep, drmBO *buf)
-+{
-+    buf->handle = rep->handle;
-+    buf->flags = rep->flags;
-+    buf->size = rep->size;
-+    buf->offset = rep->offset;
-+    buf->mapHandle = rep->arg_handle;
-+    buf->mask = rep->proposed_flags;
-+    buf->start = rep->buffer_start;
-+    buf->fenceFlags = rep->fence_flags;
-+    buf->replyFlags = rep->rep_flags;
-+    buf->pageAlignment = rep->page_alignment;
-+    buf->tileInfo = rep->tile_info;
-+    buf->hwTileStride = rep->hw_tile_stride;
-+    buf->desiredTileStride = rep->desired_tile_stride;
-+}
-+
-+
-+
-+int drmBOCreate(int fd, unsigned long size,
-+               unsigned pageAlignment, void *user_buffer,
-+               uint64_t mask,
-+               unsigned hint, drmBO *buf)
-+{
-+    struct drm_bo_create_arg arg;
-+    struct drm_bo_create_req *req = &arg.d.req;
-+    struct drm_bo_info_rep *rep = &arg.d.rep;
-+    int ret;
-+
-+    memset(buf, 0, sizeof(*buf));
-+    memset(&arg, 0, sizeof(arg));
-+    req->flags = mask;
-+    req->hint = hint;
-+    req->size = size;
-+    req->page_alignment = pageAlignment;
-+    req->buffer_start = (unsigned long) user_buffer;
-+
-+    buf->virtual = NULL;
-+
-+    ret = drmIoctlTimeout(fd, DRM_IOCTL_BO_CREATE, &arg);
-+    if (ret)
-+       return ret;
-+
-+    drmBOCopyReply(rep, buf);
-+    buf->virtual = user_buffer;
-+    buf->mapCount = 0;
-+
-+    return 0;
-+}
-+
-+int drmBOReference(int fd, unsigned handle, drmBO *buf)
-+{
-+    struct drm_bo_reference_info_arg arg;
-+    struct drm_bo_handle_arg *req = &arg.d.req;
-+    struct drm_bo_info_rep *rep = &arg.d.rep;
-+
-+    memset(&arg, 0, sizeof(arg));
-+    req->handle = handle;
-+
-+    if (ioctl(fd, DRM_IOCTL_BO_REFERENCE, &arg))
-+       return -errno;
-+
-+    drmBOCopyReply(rep, buf);
-+    buf->mapVirtual = NULL;
-+    buf->mapCount = 0;
-+    buf->virtual = NULL;
-+
-+    return 0;
-+}
-+
-+int drmBOUnreference(int fd, drmBO *buf)
-+{
-+    struct drm_bo_handle_arg arg;
-+
-+    if (buf->mapVirtual && buf->mapHandle) {
-+       (void) munmap(buf->mapVirtual, buf->start + buf->size);
-+       buf->mapVirtual = NULL;
-+       buf->virtual = NULL;
-+    }
-+
-+    memset(&arg, 0, sizeof(arg));
-+    arg.handle = buf->handle;
-+
-+    if (ioctl(fd, DRM_IOCTL_BO_UNREFERENCE, &arg))
-+       return -errno;
-+
-+    buf->handle = 0;
-+    return 0;
-+}
-+
-+
-+/*
-+ * Flags can be  DRM_BO_FLAG_READ, DRM_BO_FLAG_WRITE or'ed together
-+ * Hint currently be DRM_BO_HINT_DONT_BLOCK, which makes the
-+ * call return an -EBUSY if it can' immediately honor the mapping request.
-+ */
-+
-+int drmBOMap(int fd, drmBO *buf, unsigned mapFlags, unsigned mapHint,
-+            void **address)
-+{
-+    struct drm_bo_map_wait_idle_arg arg;
-+    struct drm_bo_info_req *req = &arg.d.req;
-+    struct drm_bo_info_rep *rep = &arg.d.rep;
-+    int ret = 0;
-+
-+    /*
-+     * Make sure we have a virtual address of the buffer.
-+     */
-+
-+    if (!buf->virtual) {
-+       drmAddress virtual;
-+       virtual = mmap(0, buf->size + buf->start,
-+                      PROT_READ | PROT_WRITE, MAP_SHARED,
-+                      fd, buf->mapHandle);
-+       if (virtual == MAP_FAILED) {
-+           ret = -errno;
-+       }
-+       if (ret)
-+           return ret;
-+       buf->mapVirtual = virtual;
-+       buf->virtual = ((char *) virtual) + buf->start;
-+    }
-+
-+    memset(&arg, 0, sizeof(arg));
-+    req->handle = buf->handle;
-+    req->mask = mapFlags;
-+    req->hint = mapHint;
-+
-+    /*
-+     * May hang if the buffer object is busy.
-+     * This IOCTL synchronizes the buffer.
-+     */
-+
-+    ret = drmIoctlTimeout(fd, DRM_IOCTL_BO_MAP, &arg);
-+    if (ret)
-+       return ret;
-+
-+    drmBOCopyReply(rep, buf);
-+    buf->mapFlags = mapFlags;
-+    ++buf->mapCount;
-+    *address = buf->virtual;
-+
-+    return 0;
-+}
-+
-+
-+int drmBOUnmap(int fd, drmBO *buf)
-+{
-+    struct drm_bo_handle_arg arg;
-+
-+    memset(&arg, 0, sizeof(arg));
-+    arg.handle = buf->handle;
-+
-+    if (ioctl(fd, DRM_IOCTL_BO_UNMAP, &arg)) {
-+       return -errno;
-+    }
-+    buf->mapCount--;
-+    return 0;
-+}
-+
-+int drmBOSetStatus(int fd, drmBO *buf,
-+                  uint64_t flags, uint64_t mask,
-+                  unsigned int hint,
-+                  unsigned int desired_tile_stride,
-+                  unsigned int tile_info)
-+{
-+
-+    struct drm_bo_map_wait_idle_arg arg;
-+    struct drm_bo_info_req *req = &arg.d.req;
-+    struct drm_bo_info_rep *rep = &arg.d.rep;
-+    int ret = 0;
-+
-+    memset(&arg, 0, sizeof(arg));
-+    req->mask = mask;
-+    req->flags = flags;
-+    req->handle = buf->handle;
-+    req->hint = hint;
-+    req->desired_tile_stride = desired_tile_stride;
-+    req->tile_info = tile_info;
-+
-+    ret = drmIoctlTimeout(fd, DRM_IOCTL_BO_SETSTATUS, &arg);
-+    if (ret)
-+           return ret;
-+
-+    drmBOCopyReply(rep, buf);
-+    return 0;
-+}
-+
-+
-+int drmBOInfo(int fd, drmBO *buf)
-+{
-+    struct drm_bo_reference_info_arg arg;
-+    struct drm_bo_handle_arg *req = &arg.d.req;
-+    struct drm_bo_info_rep *rep = &arg.d.rep;
-+    int ret = 0;
-+
-+    memset(&arg, 0, sizeof(arg));
-+    req->handle = buf->handle;
-+
-+    ret = ioctl(fd, DRM_IOCTL_BO_INFO, &arg);
-+    if (ret)
-+       return -errno;
-+
-+    drmBOCopyReply(rep, buf);
-+    return 0;
-+}
-+
-+int drmBOWaitIdle(int fd, drmBO *buf, unsigned hint)
-+{
-+    struct drm_bo_map_wait_idle_arg arg;
-+    struct drm_bo_info_req *req = &arg.d.req;
-+    struct drm_bo_info_rep *rep = &arg.d.rep;
-+    int ret = 0;
-+
-+    if ((buf->flags & DRM_BO_FLAG_SHAREABLE) ||
-+       (buf->replyFlags & DRM_BO_REP_BUSY)) {
-+        memset(&arg, 0, sizeof(arg));
-+       req->handle = buf->handle;
-+       req->hint = hint;
-+
-+       ret = drmIoctlTimeout(fd, DRM_IOCTL_BO_WAIT_IDLE, &arg);
-+       if (ret)
-+           return ret;
-+
-+       drmBOCopyReply(rep, buf);
-+    }
-+    return 0;
-+}
-+
-+int drmBOBusy(int fd, drmBO *buf, int *busy)
-+{
-+    if (!(buf->flags & DRM_BO_FLAG_SHAREABLE) &&
-+       !(buf->replyFlags & DRM_BO_REP_BUSY)) {
-+       *busy = 0;
-+       return 0;
-+    }
-+    else {
-+       int ret = drmBOInfo(fd, buf);
-+       if (ret)
-+           return ret;
-+       *busy = (buf->replyFlags & DRM_BO_REP_BUSY);
-+       return 0;
-+    }
-+}
-+
-+int drmMMInit(int fd, unsigned long pOffset, unsigned long pSize,
-+             unsigned memType)
-+{
-+    struct drm_mm_init_arg arg;
-+
-+    memset(&arg, 0, sizeof(arg));
-+
-+    arg.magic = DRM_BO_INIT_MAGIC;
-+    arg.major = DRM_BO_INIT_MAJOR;
-+    arg.minor = DRM_BO_INIT_MINOR;
-+    arg.p_offset = pOffset;
-+    arg.p_size = pSize;
-+    arg.mem_type = memType;
-+
-+    if (ioctl(fd, DRM_IOCTL_MM_INIT, &arg))
-+       return -errno;
-+    return 0;
-+}
-+
-+int drmMMTakedown(int fd, unsigned memType)
-+{
-+    struct drm_mm_type_arg arg;
-+
-+    memset(&arg, 0, sizeof(arg));
-+    arg.mem_type = memType;
-+
-+    if (ioctl(fd, DRM_IOCTL_MM_TAKEDOWN, &arg))
-+       return -errno;
-+    return 0;
-+}
-+
-+/*
-+ * If this function returns an error, and lockBM was set to 1,
-+ * the buffer manager is NOT locked.
-+ */
-+
-+int drmMMLock(int fd, unsigned memType, int lockBM, int ignoreNoEvict)
-+{
-+    struct drm_mm_type_arg arg;
-+
-+    memset(&arg, 0, sizeof(arg));
-+    arg.mem_type = memType;
-+    arg.lock_flags |= (lockBM) ? DRM_BO_LOCK_UNLOCK_BM : 0;
-+    arg.lock_flags |= (ignoreNoEvict) ? DRM_BO_LOCK_IGNORE_NO_EVICT : 0;
-+
-+    return drmIoctlTimeout(fd, DRM_IOCTL_MM_LOCK, &arg);
-+}
-+
-+int drmMMUnlock(int fd, unsigned memType, int unlockBM)
-+{
-+    struct drm_mm_type_arg arg;
-+
-+    memset(&arg, 0, sizeof(arg));
-+
-+    arg.mem_type = memType;
-+    arg.lock_flags |= (unlockBM) ? DRM_BO_LOCK_UNLOCK_BM : 0;
-+
-+    return drmIoctlTimeout(fd, DRM_IOCTL_MM_UNLOCK, &arg);
-+}
-+
-+int drmBOVersion(int fd, unsigned int *major,
-+                unsigned int *minor,
-+                unsigned int *patchlevel)
-+{
-+    struct drm_bo_version_arg arg;
-+    int ret;
-+
-+    memset(&arg, 0, sizeof(arg));
-+    ret = ioctl(fd, DRM_IOCTL_BO_VERSION, &arg);
-+    if (ret)
-+       return -errno;
-+
-+    if (major)
-+       *major = arg.major;
-+    if (minor)
-+       *minor = arg.minor;
-+    if (patchlevel)
-+       *patchlevel = arg.patchlevel;
-+
-+    return 0;
-+}
-+
-+
-+
- #define DRM_MAX_FDS 16
- static struct {
-     char *BusID;
-Index: libdrm-2.4.4/libdrm/xf86drm.h
-===================================================================
---- libdrm-2.4.4.orig/libdrm/xf86drm.h  2008-12-17 18:28:24.000000000 +0000
-+++ libdrm-2.4.4/libdrm/xf86drm.h       2009-02-04 16:39:55.000000000 +0000
-@@ -665,4 +665,6 @@
- extern int drmSetMaster(int fd);
- extern int drmDropMaster(int fd);
- 
-+#include "xf86mm.h"
-+
- #endif
-Index: libdrm-2.4.4/libdrm/xf86mm.h
-===================================================================
---- /dev/null   1970-01-01 00:00:00.000000000 +0000
-+++ libdrm-2.4.4/libdrm/xf86mm.h        2009-02-04 16:39:55.000000000 +0000
-@@ -0,0 +1,140 @@
-+/**************************************************************************
-+ *
-+ * Copyright 2006 Tungsten Graphics, Inc., Bismarck, ND. USA.
-+ * 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 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
-+ * THE COPYRIGHT HOLDERS, AUTHORS 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.
-+ *
-+ * The above copyright notice and this permission notice (including the
-+ * next paragraph) shall be included in all copies or substantial portions
-+ * of the Software.
-+ *
-+ *
-+ **************************************************************************/
-+
-+#ifndef _XF86MM_H_
-+#define _XF86MM_H_
-+#include <stddef.h>
-+#include <stdint.h>
-+#include "drm.h"
-+
-+/*
-+ * Note on multithreaded applications using this interface.
-+ * Libdrm is not threadsafe, so common buffer, TTM, and fence objects need to
-+ * be protected using an external mutex.
-+ *
-+ * Note: Don't protect the following functions, as it may lead to deadlocks:
-+ * drmBOUnmap().
-+ * The kernel is synchronizing and refcounting buffer maps.
-+ * User space only needs to refcount object usage within the same application.
-+ */
-+
-+
-+/*
-+ * List macros heavily inspired by the Linux kernel
-+ * list handling. No list looping yet.
-+ */
-+
-+typedef struct _drmFence
-+{
-+    unsigned handle;
-+    int fence_class;
-+    unsigned type;
-+    unsigned flags;
-+    unsigned signaled;
-+    uint32_t sequence;
-+    unsigned pad[4]; /* for future expansion */
-+} drmFence;
-+
-+typedef struct _drmBO
-+{
-+    unsigned handle;
-+    uint64_t mapHandle;
-+    uint64_t flags;
-+    uint64_t mask;
-+    unsigned mapFlags;
-+    unsigned long size;
-+    unsigned long offset;
-+    unsigned long start;
-+    unsigned replyFlags;
-+    unsigned fenceFlags;
-+    unsigned pageAlignment;
-+    unsigned tileInfo;
-+    unsigned hwTileStride;
-+    unsigned desiredTileStride;
-+    void *virtual;
-+    void *mapVirtual;
-+    int mapCount;
-+    unsigned pad[8];     /* for future expansion */
-+} drmBO;
-+
-+/*
-+ * Fence functions.
-+ */
-+
-+extern int drmFenceCreate(int fd, unsigned flags, int fence_class,
-+                          unsigned type, drmFence *fence);
-+extern int drmFenceReference(int fd, unsigned handle, drmFence *fence);
-+extern int drmFenceUnreference(int fd, const drmFence *fence);
-+extern int drmFenceFlush(int fd, drmFence *fence, unsigned flush_type);
-+extern int drmFenceSignaled(int fd, drmFence *fence,
-+                            unsigned fenceType, int *signaled);
-+extern int drmFenceWait(int fd, unsigned flags, drmFence *fence,
-+                        unsigned flush_type);
-+extern int drmFenceEmit(int fd, unsigned flags, drmFence *fence,
-+                        unsigned emit_type);
-+extern int drmFenceBuffers(int fd, unsigned flags, uint32_t fence_class, drmFence *fence);
-+
-+
-+/*
-+ * Buffer object functions.
-+ */
-+
-+extern int drmBOCreate(int fd, unsigned long size,
-+                      unsigned pageAlignment, void *user_buffer,
-+                      uint64_t mask, unsigned hint, drmBO *buf);
-+extern int drmBOReference(int fd, unsigned handle, drmBO *buf);
-+extern int drmBOUnreference(int fd, drmBO *buf);
-+extern int drmBOMap(int fd, drmBO *buf, unsigned mapFlags, unsigned mapHint,
-+                   void **address);
-+extern int drmBOUnmap(int fd, drmBO *buf);
-+extern int drmBOFence(int fd, drmBO *buf, unsigned flags, unsigned fenceHandle);
-+extern int drmBOInfo(int fd, drmBO *buf);
-+extern int drmBOBusy(int fd, drmBO *buf, int *busy);
-+
-+extern int drmBOWaitIdle(int fd, drmBO *buf, unsigned hint);
-+
-+/*
-+ * Initialization functions.
-+ */
-+
-+extern int drmMMInit(int fd, unsigned long pOffset, unsigned long pSize,
-+                    unsigned memType);
-+extern int drmMMTakedown(int fd, unsigned memType);
-+extern int drmMMLock(int fd, unsigned memType, int lockBM, int ignoreNoEvict);
-+extern int drmMMUnlock(int fd, unsigned memType, int unlockBM);
-+extern int drmBOSetStatus(int fd, drmBO *buf,
-+                         uint64_t flags, uint64_t mask,
-+                         unsigned int hint,
-+                         unsigned int desired_tile_stride,
-+                         unsigned int tile_info);
-+extern int drmBOVersion(int fd, unsigned int *major,
-+                       unsigned int *minor,
-+                       unsigned int *patchlevel);
-+
-+
-+#endif
-Index: libdrm-2.4.4/shared-core/drm.h
-===================================================================
---- libdrm-2.4.4.orig/shared-core/drm.h 2008-12-17 18:28:24.000000000 +0000
-+++ libdrm-2.4.4/shared-core/drm.h      2009-02-05 12:20:53.000000000 +0000
-@@ -632,6 +632,8 @@
-        unsigned long handle;   /**< Used for mapping / unmapping */
- };
- 
-+
-+
- /**
-  * DRM_IOCTL_SET_VERSION ioctl argument type.
-  */
-@@ -1109,6 +1111,32 @@
- #define DRM_IOCTL_MODE_RMFB            DRM_IOWR(0xAF, uint32_t)
- #define DRM_IOCTL_MODE_REPLACEFB       DRM_IOWR(0xB0, struct drm_mode_fb_cmd)
- 
-+#define DRM_IOCTL_MM_INIT               DRM_IOWR(0xc0, struct drm_mm_init_arg)
-+#define DRM_IOCTL_MM_TAKEDOWN           DRM_IOWR(0xc1, struct drm_mm_type_arg)
-+#define DRM_IOCTL_MM_LOCK               DRM_IOWR(0xc2, struct drm_mm_type_arg)
-+#define DRM_IOCTL_MM_UNLOCK             DRM_IOWR(0xc3, struct drm_mm_type_arg)
-+
-+#define DRM_IOCTL_FENCE_CREATE          DRM_IOWR(0xc4, struct drm_fence_arg)
-+#define DRM_IOCTL_FENCE_REFERENCE       DRM_IOWR(0xc6, struct drm_fence_arg)
-+#define DRM_IOCTL_FENCE_UNREFERENCE     DRM_IOWR(0xc7, struct drm_fence_arg)
-+#define DRM_IOCTL_FENCE_SIGNALED        DRM_IOWR(0xc8, struct drm_fence_arg)
-+#define DRM_IOCTL_FENCE_FLUSH           DRM_IOWR(0xc9, struct drm_fence_arg)
-+#define DRM_IOCTL_FENCE_WAIT            DRM_IOWR(0xca, struct drm_fence_arg)
-+#define DRM_IOCTL_FENCE_EMIT            DRM_IOWR(0xcb, struct drm_fence_arg)
-+#define DRM_IOCTL_FENCE_BUFFERS         DRM_IOWR(0xcc, struct drm_fence_arg)
-+
-+#define DRM_IOCTL_BO_CREATE             DRM_IOWR(0xcd, struct drm_bo_create_arg)
-+#define DRM_IOCTL_BO_MAP                DRM_IOWR(0xcf, struct drm_bo_map_wait_idle_arg)
-+#define DRM_IOCTL_BO_UNMAP              DRM_IOWR(0xd0, struct drm_bo_handle_arg)
-+#define DRM_IOCTL_BO_REFERENCE          DRM_IOWR(0xd1, struct drm_bo_reference_info_arg)
-+#define DRM_IOCTL_BO_UNREFERENCE        DRM_IOWR(0xd2, struct drm_bo_handle_arg)
-+#define DRM_IOCTL_BO_SETSTATUS          DRM_IOWR(0xd3, struct drm_bo_map_wait_idle_arg)
-+#define DRM_IOCTL_BO_INFO               DRM_IOWR(0xd4, struct drm_bo_reference_info_arg)
-+#define DRM_IOCTL_BO_WAIT_IDLE          DRM_IOWR(0xd5, struct drm_bo_map_wait_idle_arg)
-+#define DRM_IOCTL_BO_VERSION          DRM_IOR(0xd6, struct drm_bo_version_arg)
-+
-+#define DRM_IOCTL_MODE_ADDMODE         DRM_IOWR(0xA7, struct drm_mode_modeinfo)
-+#define DRM_IOCTL_MODE_RMMODE          DRM_IOWR(0xA8, unsigned int)
- /*@}*/
- 
- /**
-Index: libdrm-2.4.4/shared-core/Makefile.am
-===================================================================
---- libdrm-2.4.4.orig/shared-core/Makefile.am   2008-12-17 18:28:24.000000000 +0000
-+++ libdrm-2.4.4/shared-core/Makefile.am        2009-02-04 16:39:55.000000000 +0000
-@@ -31,6 +31,8 @@
-                          mach64_drm.h \
-                          mga_drm.h \
-                          nouveau_drm.h \
-+                         psb_drm.h \
-+                         psb_reg.h \
-                          r128_drm.h \
-                          radeon_drm.h \
-                          savage_drm.h \
-Index: libdrm-2.4.4/shared-core/psb_drm.h
-===================================================================
---- /dev/null   1970-01-01 00:00:00.000000000 +0000
-+++ libdrm-2.4.4/shared-core/psb_drm.h  2009-02-04 16:39:55.000000000 +0000
-@@ -0,0 +1,359 @@
-+/**************************************************************************
-+ * Copyright (c) 2007, Intel Corporation.
-+ * All Rights Reserved.
-+ *
-+ * This program is free software; you can redistribute it and/or modify it
-+ * under the terms and conditions of the GNU General Public License,
-+ * version 2, as published by the Free Software Foundation.
-+ *
-+ * This program is distributed in the hope it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-+ * more details.
-+ *
-+ * You should have received a copy of the GNU General Public License along with
-+ * this program; if not, write to the Free Software Foundation, Inc.,
-+ * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
-+ *
-+ * Intel funded Tungsten Graphics (http://www.tungstengraphics.com) to
-+ * develop this driver.
-+ *
-+ **************************************************************************/
-+/*
-+ */
-+
-+#ifndef _PSB_DRM_H_
-+#define _PSB_DRM_H_
-+
-+#if defined(__linux__) && !defined(__KERNEL__)
-+#include<stdint.h>
-+#endif
-+
-+/*
-+ * Intel Poulsbo driver package version.
-+ *
-+ */
-+/* #define PSB_PACKAGE_VERSION "ED"__DATE__*/
-+#define PSB_PACKAGE_VERSION "2.0.0.32L.0007"
-+
-+#define DRM_PSB_SAREA_MAJOR 0
-+#define DRM_PSB_SAREA_MINOR 1
-+#define PSB_FIXED_SHIFT 16
-+
-+/*
-+ * Public memory types.
-+ */
-+
-+#define DRM_PSB_MEM_MMU DRM_BO_MEM_PRIV1
-+#define DRM_PSB_FLAG_MEM_MMU DRM_BO_FLAG_MEM_PRIV1
-+#define DRM_PSB_MEM_PDS DRM_BO_MEM_PRIV2
-+#define DRM_PSB_FLAG_MEM_PDS DRM_BO_FLAG_MEM_PRIV2
-+#define DRM_PSB_MEM_APER DRM_BO_MEM_PRIV3
-+#define DRM_PSB_FLAG_MEM_APER DRM_BO_FLAG_MEM_PRIV3
-+#define DRM_PSB_MEM_RASTGEOM DRM_BO_MEM_PRIV4
-+#define DRM_PSB_FLAG_MEM_RASTGEOM DRM_BO_FLAG_MEM_PRIV4
-+#define PSB_MEM_RASTGEOM_START   0x30000000
-+
-+typedef int32_t psb_fixed;
-+typedef uint32_t psb_ufixed;
-+
-+static inline psb_fixed psb_int_to_fixed(int a)
-+{
-+       return a * (1 << PSB_FIXED_SHIFT);
-+}
-+
-+static inline psb_ufixed psb_unsigned_to_ufixed(unsigned int a)
-+{
-+       return a << PSB_FIXED_SHIFT;
-+}
-+
-+/*Status of the command sent to the gfx device.*/
-+typedef enum {
-+       DRM_CMD_SUCCESS,
-+       DRM_CMD_FAILED,
-+       DRM_CMD_HANG
-+} drm_cmd_status_t;
-+
-+struct drm_psb_scanout {
-+       uint32_t buffer_id;     /* DRM buffer object ID */
-+       uint32_t rotation;      /* Rotation as in RR_rotation definitions */
-+       uint32_t stride;        /* Buffer stride in bytes */
-+       uint32_t depth;         /* Buffer depth in bits (NOT) bpp */
-+       uint32_t width;         /* Buffer width in pixels */
-+       uint32_t height;        /* Buffer height in lines */
-+       psb_fixed transform[3][3];      /* Buffer composite transform */
-+       /* (scaling, rot, reflect) */
-+};
-+
-+#define DRM_PSB_SAREA_OWNERS 16
-+#define DRM_PSB_SAREA_OWNER_2D 0
-+#define DRM_PSB_SAREA_OWNER_3D 1
-+
-+#define DRM_PSB_SAREA_SCANOUTS 3
-+
-+struct drm_psb_sarea {
-+       /* Track changes of this data structure */
-+
-+       uint32_t major;
-+       uint32_t minor;
-+
-+       /* Last context to touch part of hw */
-+       uint32_t ctx_owners[DRM_PSB_SAREA_OWNERS];
-+
-+       /* Definition of front- and rotated buffers */
-+       uint32_t num_scanouts;
-+       struct drm_psb_scanout scanouts[DRM_PSB_SAREA_SCANOUTS];
-+
-+       int planeA_x;
-+       int planeA_y;
-+       int planeA_w;
-+       int planeA_h;
-+       int planeB_x;
-+       int planeB_y;
-+       int planeB_w;
-+       int planeB_h;
-+       uint32_t msvdx_state;
-+       uint32_t msvdx_context;
-+};
-+
-+#define PSB_RELOC_MAGIC         0x67676767
-+#define PSB_RELOC_SHIFT_MASK    0x0000FFFF
-+#define PSB_RELOC_SHIFT_SHIFT   0
-+#define PSB_RELOC_ALSHIFT_MASK  0xFFFF0000
-+#define PSB_RELOC_ALSHIFT_SHIFT 16
-+
-+#define PSB_RELOC_OP_OFFSET     0      /* Offset of the indicated
-+                                        * buffer
-+                                        */
-+#define PSB_RELOC_OP_2D_OFFSET  1      /* Offset of the indicated
-+                                        *  buffer, relative to 2D
-+                                        *  base address
-+                                        */
-+#define PSB_RELOC_OP_PDS_OFFSET 2      /* Offset of the indicated buffer,
-+                                        *  relative to PDS base address
-+                                        */
-+#define PSB_RELOC_OP_STRIDE     3      /* Stride of the indicated
-+                                        * buffer (for tiling)
-+                                        */
-+#define PSB_RELOC_OP_USE_OFFSET 4      /* Offset of USE buffer
-+                                        * relative to base reg
-+                                        */
-+#define PSB_RELOC_OP_USE_REG    5      /* Base reg of USE buffer */
-+
-+struct drm_psb_reloc {
-+       uint32_t reloc_op;
-+       uint32_t where;         /* offset in destination buffer */
-+       uint32_t buffer;        /* Buffer reloc applies to */
-+       uint32_t mask;          /* Destination format: */
-+       uint32_t shift;         /* Destination format: */
-+       uint32_t pre_add;       /* Destination format: */
-+       uint32_t background;    /* Destination add */
-+       uint32_t dst_buffer;    /* Destination buffer. Index into buffer_list */
-+       uint32_t arg0;          /* Reloc-op dependant */
-+       uint32_t arg1;
-+};
-+
-+#define PSB_BO_FLAG_TA              (1ULL << 48)
-+#define PSB_BO_FLAG_SCENE           (1ULL << 49)
-+#define PSB_BO_FLAG_FEEDBACK        (1ULL << 50)
-+#define PSB_BO_FLAG_USSE            (1ULL << 51)
-+
-+#define PSB_ENGINE_2D 0
-+#define PSB_ENGINE_VIDEO 1
-+#define PSB_ENGINE_RASTERIZER 2
-+#define PSB_ENGINE_TA 3
-+#define PSB_ENGINE_HPRAST 4
-+
-+/*
-+ * For this fence class we have a couple of
-+ * fence types.
-+ */
-+
-+#define _PSB_FENCE_EXE_SHIFT           0
-+#define _PSB_FENCE_TA_DONE_SHIFT       1
-+#define _PSB_FENCE_RASTER_DONE_SHIFT   2
-+#define _PSB_FENCE_SCENE_DONE_SHIFT    3
-+#define _PSB_FENCE_FEEDBACK_SHIFT      4
-+
-+#define _PSB_ENGINE_TA_FENCE_TYPES   5
-+#define _PSB_FENCE_TYPE_TA_DONE     (1 << _PSB_FENCE_TA_DONE_SHIFT)
-+#define _PSB_FENCE_TYPE_RASTER_DONE (1 << _PSB_FENCE_RASTER_DONE_SHIFT)
-+#define _PSB_FENCE_TYPE_SCENE_DONE  (1 << _PSB_FENCE_SCENE_DONE_SHIFT)
-+#define _PSB_FENCE_TYPE_FEEDBACK    (1 << _PSB_FENCE_FEEDBACK_SHIFT)
-+
-+#define PSB_ENGINE_HPRAST 4
-+#define PSB_NUM_ENGINES 5
-+
-+#define PSB_TA_FLAG_FIRSTPASS    (1 << 0)
-+#define PSB_TA_FLAG_LASTPASS     (1 << 1)
-+
-+#define PSB_FEEDBACK_OP_VISTEST (1 << 0)
-+
-+struct drm_psb_scene {
-+       int handle_valid;
-+       uint32_t handle;
-+       uint32_t w;
-+       uint32_t h;
-+       uint32_t num_buffers;
-+};
-+
-+typedef struct drm_psb_cmdbuf_arg {
-+       uint64_t buffer_list;   /* List of buffers to validate */
-+       uint64_t clip_rects;    /* See i915 counterpart */
-+       uint64_t scene_arg;
-+       uint64_t fence_arg;
-+
-+       uint32_t ta_flags;
-+
-+       uint32_t ta_handle;     /* TA reg-value pairs */
-+       uint32_t ta_offset;
-+       uint32_t ta_size;
-+
-+       uint32_t oom_handle;
-+       uint32_t oom_offset;
-+       uint32_t oom_size;
-+
-+       uint32_t cmdbuf_handle; /* 2D Command buffer object or, */
-+       uint32_t cmdbuf_offset; /* rasterizer reg-value pairs */
-+       uint32_t cmdbuf_size;
-+
-+       uint32_t reloc_handle;  /* Reloc buffer object */
-+       uint32_t reloc_offset;
-+       uint32_t num_relocs;
-+
-+       int32_t damage;         /* Damage front buffer with cliprects */
-+       /* Not implemented yet */
-+       uint32_t fence_flags;
-+       uint32_t engine;
-+
-+       /*
-+        * Feedback;
-+        */
-+
-+       uint32_t feedback_ops;
-+       uint32_t feedback_handle;
-+       uint32_t feedback_offset;
-+       uint32_t feedback_breakpoints;
-+       uint32_t feedback_size;
-+} drm_psb_cmdbuf_arg_t;
-+
-+struct drm_psb_xhw_init_arg {
-+       uint32_t operation;
-+       uint32_t buffer_handle;
-+};
-+
-+/*
-+ * Feedback components:
-+ */
-+
-+/*
-+ * Vistest component. The number of these in the feedback buffer
-+ * equals the number of vistest breakpoints + 1.
-+ * This is currently the only feedback component.
-+ */
-+
-+struct drm_psb_vistest {
-+       uint32_t vt[8];
-+};
-+
-+#define PSB_HW_COOKIE_SIZE 16
-+#define PSB_HW_FEEDBACK_SIZE 8
-+#define PSB_HW_OOM_CMD_SIZE 6
-+
-+struct drm_psb_xhw_arg {
-+       uint32_t op;
-+       int ret;
-+       uint32_t irq_op;
-+       uint32_t issue_irq;
-+       uint32_t cookie[PSB_HW_COOKIE_SIZE];
-+       union {
-+               struct {
-+                       uint32_t w;
-+                       uint32_t h;
-+                       uint32_t size;
-+                       uint32_t clear_p_start;
-+                       uint32_t clear_num_pages;
-+               } si;
-+               struct {
-+                       uint32_t fire_flags;
-+                       uint32_t hw_context;
-+                       uint32_t offset;
-+                       uint32_t engine;
-+                       uint32_t flags;
-+                       uint32_t rca;
-+                       uint32_t num_oom_cmds;
-+                       uint32_t oom_cmds[PSB_HW_OOM_CMD_SIZE];
-+               } sb;
-+               struct {
-+                       uint32_t pages;
-+                       uint32_t size;
-+               } bi;
-+               struct {
-+                       uint32_t bca;
-+                       uint32_t rca;
-+                       uint32_t flags;
-+               } oom;
-+               struct {
-+                       uint32_t pt_offset;
-+                       uint32_t param_offset;
-+                       uint32_t flags;
-+               } bl;
-+               uint32_t feedback[PSB_HW_FEEDBACK_SIZE];
-+       } arg;
-+};
-+
-+#define DRM_PSB_CMDBUF          0x00
-+#define DRM_PSB_XHW_INIT        0x01
-+#define DRM_PSB_XHW             0x02
-+#define DRM_PSB_SCENE_UNREF     0x03
-+/* Controlling the kernel modesetting buffers */
-+#define DRM_PSB_KMS_OFF                0x04
-+#define DRM_PSB_KMS_ON         0x05
-+
-+#define PSB_XHW_INIT            0x00
-+#define PSB_XHW_TAKEDOWN        0x01
-+
-+#define PSB_XHW_FIRE_RASTER     0x00
-+#define PSB_XHW_SCENE_INFO      0x01
-+#define PSB_XHW_SCENE_BIND_FIRE 0x02
-+#define PSB_XHW_TA_MEM_INFO    0x03
-+#define PSB_XHW_RESET_DPM       0x04
-+#define PSB_XHW_OOM             0x05
-+#define PSB_XHW_TERMINATE       0x06
-+#define PSB_XHW_VISTEST         0x07
-+#define PSB_XHW_RESUME          0x08
-+#define PSB_XHW_TA_MEM_LOAD    0x09
-+
-+#define PSB_SCENE_FLAG_DIRTY       (1 << 0)
-+#define PSB_SCENE_FLAG_COMPLETE    (1 << 1)
-+#define PSB_SCENE_FLAG_SETUP       (1 << 2)
-+#define PSB_SCENE_FLAG_SETUP_ONLY  (1 << 3)
-+#define PSB_SCENE_FLAG_CLEARED     (1 << 4)
-+
-+#define PSB_TA_MEM_FLAG_TA            (1 << 0)
-+#define PSB_TA_MEM_FLAG_RASTER        (1 << 1)
-+#define PSB_TA_MEM_FLAG_HOSTA         (1 << 2)
-+#define PSB_TA_MEM_FLAG_HOSTD         (1 << 3)
-+#define PSB_TA_MEM_FLAG_INIT          (1 << 4)
-+#define PSB_TA_MEM_FLAG_NEW_PT_OFFSET (1 << 5)
-+
-+/*Raster fire will deallocate memory */
-+#define PSB_FIRE_FLAG_RASTER_DEALLOC  (1 << 0)
-+/*Isp reset needed due to change in ZLS format */
-+#define PSB_FIRE_FLAG_NEEDS_ISP_RESET (1 << 1)
-+/*These are set by Xpsb. */
-+#define PSB_FIRE_FLAG_XHW_MASK        0xff000000
-+/*The task has had at least one OOM and Xpsb will
-+  send back messages on each fire. */
-+#define PSB_FIRE_FLAG_XHW_OOM         (1 << 24)
-+
-+#define PSB_SCENE_ENGINE_TA    0
-+#define PSB_SCENE_ENGINE_RASTER    1
-+#define PSB_SCENE_NUM_ENGINES      2
-+
-+struct drm_psb_dev_info_arg {
-+       uint32_t num_use_attribute_registers;
-+};
-+#define DRM_PSB_DEVINFO         0x01
-+
-+#endif
-Index: libdrm-2.4.4/shared-core/psb_drv.h
-===================================================================
---- /dev/null   1970-01-01 00:00:00.000000000 +0000
-+++ libdrm-2.4.4/shared-core/psb_drv.h  2009-02-04 16:39:55.000000000 +0000
-@@ -0,0 +1,786 @@
-+/**************************************************************************
-+ * Copyright (c) 2007, Intel Corporation.
-+ * All Rights Reserved.
-+ *
-+ * This program is free software; you can redistribute it and/or modify it
-+ * under the terms and conditions of the GNU General Public License,
-+ * version 2, as published by the Free Software Foundation.
-+ *
-+ * This program is distributed in the hope it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-+ * more details.
-+ *
-+ * You should have received a copy of the GNU General Public License along with
-+ * this program; if not, write to the Free Software Foundation, Inc.,
-+ * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
-+ *
-+ * Intel funded Tungsten Graphics (http://www.tungstengraphics.com) to
-+ * develop this driver.
-+ *
-+ **************************************************************************/
-+/*
-+ */
-+#ifndef _PSB_DRV_H_
-+#define _PSB_DRV_H_
-+
-+#include "drmP.h"
-+#include "psb_drm.h"
-+#include "psb_reg.h"
-+#include "psb_schedule.h"
-+#include "intel_drv.h"
-+
-+enum {
-+       CHIP_PSB_8108 = 0,
-+       CHIP_PSB_8109 = 1
-+};
-+
-+#define DRIVER_NAME "psb"
-+#define DRIVER_DESC "drm driver for the Intel GMA500"
-+#define DRIVER_AUTHOR "Tungsten Graphics Inc."
-+
-+#define PSB_DRM_DRIVER_DATE "20080107"
-+#define PSB_DRM_DRIVER_MAJOR 4
-+#define PSB_DRM_DRIVER_MINOR 1
-+#define PSB_DRM_DRIVER_PATCHLEVEL 0
-+
-+#define PSB_VDC_OFFSET           0x00000000
-+#define PSB_VDC_SIZE             0x000080000
-+#define PSB_SGX_SIZE             0x8000
-+#define PSB_SGX_OFFSET           0x00040000
-+#define PSB_MMIO_RESOURCE        0
-+#define PSB_GATT_RESOURCE        2
-+#define PSB_GTT_RESOURCE         3
-+#define PSB_GMCH_CTRL            0x52
-+#define PSB_BSM                  0x5C
-+#define _PSB_GMCH_ENABLED        0x4
-+#define PSB_PGETBL_CTL           0x2020
-+#define _PSB_PGETBL_ENABLED      0x00000001
-+#define PSB_SGX_2D_SLAVE_PORT    0x4000
-+#define PSB_TT_PRIV0_LIMIT       (256*1024*1024)
-+#define PSB_TT_PRIV0_PLIMIT      (PSB_TT_PRIV0_LIMIT >> PAGE_SHIFT)
-+#define PSB_NUM_VALIDATE_BUFFERS 640
-+#define PSB_MEM_KERNEL_START     0x10000000
-+#define PSB_MEM_PDS_START        0x20000000
-+#define PSB_MEM_MMU_START        0x40000000
-+
-+#define DRM_PSB_MEM_KERNEL       DRM_BO_MEM_PRIV0
-+#define DRM_PSB_FLAG_MEM_KERNEL  DRM_BO_FLAG_MEM_PRIV0
-+
-+/*
-+ * Flags for external memory type field.
-+ */
-+
-+#define PSB_MSVDX_OFFSET        0x50000        /*MSVDX Base offset */
-+#define PSB_MSVDX_SIZE          0x8000 /*MSVDX MMIO region is 0x50000 - 0x57fff ==> 32KB */
-+
-+#define PSB_MMU_CACHED_MEMORY     0x0001       /* Bind to MMU only */
-+#define PSB_MMU_RO_MEMORY         0x0002       /* MMU RO memory */
-+#define PSB_MMU_WO_MEMORY         0x0004       /* MMU WO memory */
-+
-+/*
-+ * PTE's and PDE's
-+ */
-+
-+#define PSB_PDE_MASK              0x003FFFFF
-+#define PSB_PDE_SHIFT             22
-+#define PSB_PTE_SHIFT             12
-+
-+#define PSB_PTE_VALID             0x0001       /* PTE / PDE valid */
-+#define PSB_PTE_WO                0x0002       /* Write only */
-+#define PSB_PTE_RO                0x0004       /* Read only */
-+#define PSB_PTE_CACHED            0x0008       /* CPU cache coherent */
-+
-+/*
-+ * VDC registers and bits
-+ */
-+#define PSB_HWSTAM                0x2098
-+#define PSB_INSTPM                0x20C0
-+#define PSB_INT_IDENTITY_R        0x20A4
-+#define _PSB_VSYNC_PIPEB_FLAG     (1<<5)
-+#define _PSB_VSYNC_PIPEA_FLAG     (1<<7)
-+#define _PSB_IRQ_SGX_FLAG         (1<<18)
-+#define _PSB_IRQ_MSVDX_FLAG       (1<<19)
-+#define PSB_INT_MASK_R            0x20A8
-+#define PSB_INT_ENABLE_R          0x20A0
-+#define PSB_PIPEASTAT             0x70024
-+#define _PSB_VBLANK_INTERRUPT_ENABLE (1 << 17)
-+#define _PSB_VBLANK_CLEAR         (1 << 1)
-+#define PSB_PIPEBSTAT             0x71024
-+
-+#define _PSB_MMU_ER_MASK      0x0001FF00
-+#define _PSB_MMU_ER_HOST      (1 << 16)
-+#define GPIOA                  0x5010
-+#define GPIOB                  0x5014
-+#define GPIOC                  0x5018
-+#define GPIOD                  0x501c
-+#define GPIOE                  0x5020
-+#define GPIOF                  0x5024
-+#define GPIOG                  0x5028
-+#define GPIOH                  0x502c
-+#define GPIO_CLOCK_DIR_MASK            (1 << 0)
-+#define GPIO_CLOCK_DIR_IN              (0 << 1)
-+#define GPIO_CLOCK_DIR_OUT             (1 << 1)
-+#define GPIO_CLOCK_VAL_MASK            (1 << 2)
-+#define GPIO_CLOCK_VAL_OUT             (1 << 3)
-+#define GPIO_CLOCK_VAL_IN              (1 << 4)
-+#define GPIO_CLOCK_PULLUP_DISABLE      (1 << 5)
-+#define GPIO_DATA_DIR_MASK             (1 << 8)
-+#define GPIO_DATA_DIR_IN               (0 << 9)
-+#define GPIO_DATA_DIR_OUT              (1 << 9)
-+#define GPIO_DATA_VAL_MASK             (1 << 10)
-+#define GPIO_DATA_VAL_OUT              (1 << 11)
-+#define GPIO_DATA_VAL_IN               (1 << 12)
-+#define GPIO_DATA_PULLUP_DISABLE       (1 << 13)
-+
-+#define VCLK_DIVISOR_VGA0   0x6000
-+#define VCLK_DIVISOR_VGA1   0x6004
-+#define VCLK_POST_DIV       0x6010
-+
-+#define DRM_DRIVER_PRIVATE_T struct drm_psb_private
-+#define I915_WRITE(_offs, _val) \
-+  iowrite32(_val, dev_priv->vdc_reg + (_offs))
-+#define I915_READ(_offs) \
-+  ioread32(dev_priv->vdc_reg + (_offs))
-+
-+#define PSB_COMM_2D (PSB_ENGINE_2D << 4)
-+#define PSB_COMM_3D (PSB_ENGINE_3D << 4)
-+#define PSB_COMM_TA (PSB_ENGINE_TA << 4)
-+#define PSB_COMM_HP (PSB_ENGINE_HP << 4)
-+#define PSB_COMM_USER_IRQ (1024 >> 2)
-+#define PSB_COMM_USER_IRQ_LOST (PSB_COMM_USER_IRQ + 1)
-+#define PSB_COMM_FW (2048 >> 2)
-+
-+#define PSB_UIRQ_VISTEST               1
-+#define PSB_UIRQ_OOM_REPLY             2
-+#define PSB_UIRQ_FIRE_TA_REPLY         3
-+#define PSB_UIRQ_FIRE_RASTER_REPLY     4
-+
-+#define PSB_2D_SIZE (256*1024*1024)
-+#define PSB_MAX_RELOC_PAGES 1024
-+
-+#define PSB_LOW_REG_OFFS 0x0204
-+#define PSB_HIGH_REG_OFFS 0x0600
-+
-+#define PSB_NUM_VBLANKS 2
-+
-+#define PSB_COMM_2D (PSB_ENGINE_2D << 4)
-+#define PSB_COMM_3D (PSB_ENGINE_3D << 4)
-+#define PSB_COMM_TA (PSB_ENGINE_TA << 4)
-+#define PSB_COMM_HP (PSB_ENGINE_HP << 4)
-+#define PSB_COMM_FW (2048 >> 2)
-+
-+#define PSB_2D_SIZE (256*1024*1024)
-+#define PSB_MAX_RELOC_PAGES 1024
-+
-+#define PSB_LOW_REG_OFFS 0x0204
-+#define PSB_HIGH_REG_OFFS 0x0600
-+
-+#define PSB_NUM_VBLANKS 2
-+#define PSB_WATCHDOG_DELAY (DRM_HZ / 10)
-+
-+/*
-+ * User options.
-+ */
-+
-+struct drm_psb_uopt {
-+       int disable_clock_gating;
-+};
-+
-+struct psb_gtt {
-+       struct drm_device *dev;
-+       int initialized;
-+       uint32_t gatt_start;
-+       uint32_t gtt_start;
-+       uint32_t gtt_phys_start;
-+       unsigned gtt_pages;
-+       unsigned gatt_pages;
-+       uint32_t stolen_base;
-+       uint32_t pge_ctl;
-+       u16 gmch_ctrl;
-+       unsigned long stolen_size;
-+       uint32_t *gtt_map;
-+       struct rw_semaphore sem;
-+};
-+
-+struct psb_use_base {
-+       struct list_head head;
-+       struct drm_fence_object *fence;
-+       unsigned int reg;
-+       unsigned long offset;
-+       unsigned int dm;
-+};
-+
-+struct psb_buflist_item {
-+       struct drm_buffer_object *bo;
-+       void __user *data;
-+       struct drm_bo_info_rep rep;
-+       int ret;
-+};
-+
-+struct psb_msvdx_cmd_queue {
-+       struct list_head head;
-+       void *cmd;
-+       unsigned long cmd_size;
-+       uint32_t sequence;
-+};
-+
-+struct drm_psb_private {
-+       unsigned long chipset;
-+
-+       struct psb_xhw_buf resume_buf;
-+       struct drm_psb_dev_info_arg dev_info;
-+       struct drm_psb_uopt uopt;
-+
-+       struct psb_gtt *pg;
-+
-+       struct page *scratch_page;
-+       struct page *comm_page;
-+
-+       volatile uint32_t *comm;
-+       uint32_t comm_mmu_offset;
-+       uint32_t mmu_2d_offset;
-+       uint32_t sequence[PSB_NUM_ENGINES];
-+       uint32_t last_sequence[PSB_NUM_ENGINES];
-+       int idle[PSB_NUM_ENGINES];
-+       uint32_t last_submitted_seq[PSB_NUM_ENGINES];
-+       int engine_lockup_2d;
-+
-+       struct psb_mmu_driver *mmu;
-+       struct psb_mmu_pd *pf_pd;
-+
-+       uint8_t *sgx_reg;
-+       uint8_t *vdc_reg;
-+       uint8_t *msvdx_reg;
-+        /*MSVDX*/ int msvdx_needs_reset;
-+       int has_msvdx;
-+       uint32_t gatt_free_offset;
-+
-+       /*
-+        * Fencing / irq.
-+        */
-+
-+       uint32_t sgx_irq_mask;
-+       uint32_t vdc_irq_mask;
-+
-+       spinlock_t irqmask_lock;
-+       spinlock_t sequence_lock;
-+       int fence0_irq_on;
-+       int irq_enabled;
-+       unsigned int irqen_count_2d;
-+       wait_queue_head_t event_2d_queue;
-+
-+       uint32_t msvdx_current_sequence;
-+       uint32_t msvdx_last_sequence;
-+       int fence2_irq_on;
-+       struct mutex mutex_2d;
-+
-+       /*
-+        * MSVDX Rendec Memory
-+        */
-+       struct drm_buffer_object *ccb0;
-+       uint32_t base_addr0;
-+       struct drm_buffer_object *ccb1;
-+       uint32_t base_addr1;
-+
-+       /*
-+        * Memory managers
-+        */
-+
-+       int have_vram;
-+       int have_tt;
-+       int have_mem_mmu;
-+       int have_mem_aper;
-+       int have_mem_kernel;
-+       int have_mem_pds;
-+       int have_mem_rastgeom;
-+       struct mutex temp_mem;
-+
-+       /*
-+        * Relocation buffer mapping.
-+        */
-+
-+       spinlock_t reloc_lock;
-+       unsigned int rel_mapped_pages;
-+       wait_queue_head_t rel_mapped_queue;
-+
-+       /*
-+        * SAREA
-+        */
-+       struct drm_psb_sarea *sarea_priv;
-+
-+       /*
-+        * LVDS info
-+        */
-+       uint8_t blc_type;
-+       uint8_t blc_pol;
-+       uint8_t blc_freq;
-+       uint8_t blc_minbrightness;
-+       uint8_t blc_i2caddr;
-+       uint8_t blc_brightnesscmd;
-+       int backlight;  /* restore backlight to this value */
-+
-+       struct intel_i2c_chan *i2c_bus;
-+       u32 CoreClock;
-+       u32 PWMControlRegFreq;
-+
-+       unsigned char * OpRegion;
-+       unsigned int OpRegionSize;
-+
-+       int backlight_duty_cycle;       /* restore backlight to this value */
-+       bool panel_wants_dither;
-+       struct drm_display_mode *panel_fixed_mode;
-+
-+       /*
-+        * Register state
-+        */
-+       uint32_t saveDSPACNTR;
-+       uint32_t saveDSPBCNTR;
-+       uint32_t savePIPEACONF;
-+       uint32_t savePIPEBCONF;
-+       uint32_t savePIPEASRC;
-+       uint32_t savePIPEBSRC;
-+       uint32_t saveFPA0;
-+       uint32_t saveFPA1;
-+       uint32_t saveDPLL_A;
-+       uint32_t saveDPLL_A_MD;
-+       uint32_t saveHTOTAL_A;
-+       uint32_t saveHBLANK_A;
-+       uint32_t saveHSYNC_A;
-+       uint32_t saveVTOTAL_A;
-+       uint32_t saveVBLANK_A;
-+       uint32_t saveVSYNC_A;
-+       uint32_t saveDSPASTRIDE;
-+       uint32_t saveDSPASIZE;
-+       uint32_t saveDSPAPOS;
-+       uint32_t saveDSPABASE;
-+       uint32_t saveDSPASURF;
-+       uint32_t saveFPB0;
-+       uint32_t saveFPB1;
-+       uint32_t saveDPLL_B;
-+       uint32_t saveDPLL_B_MD;
-+       uint32_t saveHTOTAL_B;
-+       uint32_t saveHBLANK_B;
-+       uint32_t saveHSYNC_B;
-+       uint32_t saveVTOTAL_B;
-+       uint32_t saveVBLANK_B;
-+       uint32_t saveVSYNC_B;
-+       uint32_t saveDSPBSTRIDE;
-+       uint32_t saveDSPBSIZE;
-+       uint32_t saveDSPBPOS;
-+       uint32_t saveDSPBBASE;
-+       uint32_t saveDSPBSURF;
-+       uint32_t saveVCLK_DIVISOR_VGA0;
-+       uint32_t saveVCLK_DIVISOR_VGA1;
-+       uint32_t saveVCLK_POST_DIV;
-+       uint32_t saveVGACNTRL;
-+       uint32_t saveADPA;
-+       uint32_t saveLVDS;
-+       uint32_t saveDVOA;
-+       uint32_t saveDVOB;
-+       uint32_t saveDVOC;
-+       uint32_t savePP_ON;
-+       uint32_t savePP_OFF;
-+       uint32_t savePP_CONTROL;
-+       uint32_t savePP_CYCLE;
-+       uint32_t savePFIT_CONTROL;
-+       uint32_t savePaletteA[256];
-+       uint32_t savePaletteB[256];
-+       uint32_t saveBLC_PWM_CTL;
-+
-+       /*
-+        * USE code base register management.
-+        */
-+
-+       struct drm_reg_manager use_manager;
-+
-+       /*
-+        * Xhw
-+        */
-+
-+       uint32_t *xhw;
-+       struct drm_buffer_object *xhw_bo;
-+       struct drm_bo_kmap_obj xhw_kmap;
-+       struct list_head xhw_in;
-+       spinlock_t xhw_lock;
-+       atomic_t xhw_client;
-+       struct drm_file *xhw_file;
-+       wait_queue_head_t xhw_queue;
-+       wait_queue_head_t xhw_caller_queue;
-+       struct mutex xhw_mutex;
-+       struct psb_xhw_buf *xhw_cur_buf;
-+       int xhw_submit_ok;
-+       int xhw_on;
-+
-+       /*
-+        * Scheduling.
-+        */
-+
-+       struct mutex reset_mutex;
-+       struct mutex cmdbuf_mutex;
-+       struct psb_scheduler scheduler;
-+       struct psb_buflist_item buffers[PSB_NUM_VALIDATE_BUFFERS];
-+        uint32_t ta_mem_pages;
-+        struct psb_ta_mem *ta_mem;
-+        int force_ta_mem_load;
-+
-+       /*
-+        * Watchdog
-+        */
-+
-+       spinlock_t watchdog_lock;
-+       struct timer_list watchdog_timer;
-+       struct work_struct watchdog_wq;
-+       struct work_struct msvdx_watchdog_wq;
-+       int timer_available;
-+
-+       /*
-+        * msvdx command queue
-+        */
-+       spinlock_t msvdx_lock;
-+       struct mutex msvdx_mutex;
-+       struct list_head msvdx_queue;
-+       int msvdx_busy;
-+};
-+
-+struct psb_mmu_driver;
-+
-+extern struct psb_mmu_driver *psb_mmu_driver_init(uint8_t __iomem * registers,
-+                                                 int trap_pagefaults,
-+                                                 int invalid_type);
-+extern void psb_mmu_driver_takedown(struct psb_mmu_driver *driver);
-+extern struct psb_mmu_pd *psb_mmu_get_default_pd(struct psb_mmu_driver *driver);
-+extern void psb_mmu_mirror_gtt(struct psb_mmu_pd *pd, uint32_t mmu_offset,
-+                              uint32_t gtt_start, uint32_t gtt_pages);
-+extern void psb_mmu_test(struct psb_mmu_driver *driver, uint32_t offset);
-+extern struct psb_mmu_pd *psb_mmu_alloc_pd(struct psb_mmu_driver *driver,
-+                                          int trap_pagefaults,
-+                                          int invalid_type);
-+extern void psb_mmu_free_pagedir(struct psb_mmu_pd *pd);
-+extern void psb_mmu_flush(struct psb_mmu_driver *driver);
-+extern void psb_mmu_remove_pfn_sequence(struct psb_mmu_pd *pd,
-+                                       unsigned long address,
-+                                       uint32_t num_pages);
-+extern int psb_mmu_insert_pfn_sequence(struct psb_mmu_pd *pd,
-+                                      uint32_t start_pfn,
-+                                      unsigned long address,
-+                                      uint32_t num_pages, int type);
-+extern int psb_mmu_virtual_to_pfn(struct psb_mmu_pd *pd, uint32_t virtual,
-+                                 unsigned long *pfn);
-+
-+/*
-+ * Enable / disable MMU for different requestors.
-+ */
-+
-+extern void psb_mmu_enable_requestor(struct psb_mmu_driver *driver,
-+                                    uint32_t mask);
-+extern void psb_mmu_disable_requestor(struct psb_mmu_driver *driver,
-+                                     uint32_t mask);
-+extern void psb_mmu_set_pd_context(struct psb_mmu_pd *pd, int hw_context);
-+extern int psb_mmu_insert_pages(struct psb_mmu_pd *pd, struct page **pages,
-+                               unsigned long address, uint32_t num_pages,
-+                               uint32_t desired_tile_stride,
-+                               uint32_t hw_tile_stride, int type);
-+extern void psb_mmu_remove_pages(struct psb_mmu_pd *pd, unsigned long address,
-+                                uint32_t num_pages,
-+                                uint32_t desired_tile_stride,
-+                                uint32_t hw_tile_stride);
-+/*
-+ * psb_sgx.c
-+ */
-+
-+extern int psb_blit_sequence(struct drm_psb_private *dev_priv,
-+                            uint32_t sequence);
-+extern void psb_init_2d(struct drm_psb_private *dev_priv);
-+extern int drm_psb_idle(struct drm_device *dev);
-+extern int psb_emit_2d_copy_blit(struct drm_device *dev,
-+                                uint32_t src_offset,
-+                                uint32_t dst_offset, uint32_t pages,
-+                                int direction);
-+extern int psb_cmdbuf_ioctl(struct drm_device *dev, void *data,
-+                           struct drm_file *file_priv);
-+extern int psb_reg_submit(struct drm_psb_private *dev_priv, uint32_t * regs,
-+                         unsigned int cmds);
-+extern int psb_submit_copy_cmdbuf(struct drm_device *dev,
-+                                 struct drm_buffer_object *cmd_buffer,
-+                                 unsigned long cmd_offset,
-+                                 unsigned long cmd_size, int engine,
-+                                 uint32_t * copy_buffer);
-+
-+extern int psb_fence_for_errors(struct drm_file *priv,
-+                               struct drm_psb_cmdbuf_arg *arg,
-+                               struct drm_fence_arg *fence_arg,
-+                               struct drm_fence_object **fence_p);
-+
-+/*
-+ * psb_irq.c
-+ */
-+
-+extern irqreturn_t psb_irq_handler(DRM_IRQ_ARGS);
-+extern void psb_irq_preinstall(struct drm_device *dev);
-+extern void psb_irq_postinstall(struct drm_device *dev);
-+extern void psb_irq_uninstall(struct drm_device *dev);
-+extern int psb_vblank_wait2(struct drm_device *dev, unsigned int *sequence);
-+extern int psb_vblank_wait(struct drm_device *dev, unsigned int *sequence);
-+
-+/*
-+ * psb_fence.c
-+ */
-+
-+extern void psb_poke_flush(struct drm_device *dev, uint32_t class);
-+extern int psb_fence_emit_sequence(struct drm_device *dev, uint32_t class,
-+                                  uint32_t flags, uint32_t * sequence,
-+                                  uint32_t * native_type);
-+extern void psb_fence_handler(struct drm_device *dev, uint32_t class);
-+extern int psb_fence_has_irq(struct drm_device *dev, uint32_t class,
-+                            uint32_t flags);
-+extern void psb_2D_irq_off(struct drm_psb_private *dev_priv);
-+extern void psb_2D_irq_on(struct drm_psb_private *dev_priv);
-+extern uint32_t psb_fence_advance_sequence(struct drm_device *dev,
-+                                          uint32_t class);
-+extern void psb_fence_error(struct drm_device *dev,
-+                           uint32_t class,
-+                           uint32_t sequence, uint32_t type, int error);
-+
-+/*MSVDX stuff*/
-+extern void psb_msvdx_irq_off(struct drm_psb_private *dev_priv);
-+extern void psb_msvdx_irq_on(struct drm_psb_private *dev_priv);
-+
-+/*
-+ * psb_buffer.c
-+ */
-+extern struct drm_ttm_backend *drm_psb_tbe_init(struct drm_device *dev);
-+extern int psb_fence_types(struct drm_buffer_object *bo, uint32_t * class,
-+                          uint32_t * type);
-+extern uint32_t psb_evict_mask(struct drm_buffer_object *bo);
-+extern int psb_invalidate_caches(struct drm_device *dev, uint64_t flags);
-+extern int psb_init_mem_type(struct drm_device *dev, uint32_t type,
-+                            struct drm_mem_type_manager *man);
-+extern int psb_move(struct drm_buffer_object *bo,
-+                   int evict, int no_wait, struct drm_bo_mem_reg *new_mem);
-+
-+/*
-+ * psb_gtt.c
-+ */
-+extern int psb_gtt_init(struct psb_gtt *pg, int resume);
-+extern int psb_gtt_insert_pages(struct psb_gtt *pg, struct page **pages,
-+                               unsigned offset_pages, unsigned num_pages,
-+                               unsigned desired_tile_stride,
-+                               unsigned hw_tile_stride, int type);
-+extern int psb_gtt_remove_pages(struct psb_gtt *pg, unsigned offset_pages,
-+                               unsigned num_pages,
-+                               unsigned desired_tile_stride,
-+                               unsigned hw_tile_stride);
-+
-+extern struct psb_gtt *psb_gtt_alloc(struct drm_device *dev);
-+extern void psb_gtt_takedown(struct psb_gtt *pg, int free);
-+
-+/*
-+ * psb_fb.c
-+ */
-+extern int psbfb_probe(struct drm_device *dev, struct drm_crtc *crtc);
-+extern int psbfb_remove(struct drm_device *dev, struct drm_crtc *crtc);
-+extern int psbfb_kms_off_ioctl(struct drm_device *dev, void *data,
-+                              struct drm_file *file_priv);
-+extern int psbfb_kms_on_ioctl(struct drm_device *dev, void *data,
-+                             struct drm_file *file_priv);
-+
-+/*
-+ * psb_reset.c
-+ */
-+
-+extern void psb_reset(struct drm_psb_private *dev_priv, int reset_2d);
-+extern void psb_schedule_watchdog(struct drm_psb_private *dev_priv);
-+extern void psb_watchdog_init(struct drm_psb_private *dev_priv);
-+extern void psb_watchdog_takedown(struct drm_psb_private *dev_priv);
-+
-+/*
-+ * psb_regman.c
-+ */
-+
-+extern void psb_takedown_use_base(struct drm_psb_private *dev_priv);
-+extern int psb_grab_use_base(struct drm_psb_private *dev_priv,
-+                            unsigned long dev_virtual,
-+                            unsigned long size,
-+                            unsigned int data_master,
-+                            uint32_t fence_class,
-+                            uint32_t fence_type,
-+                            int no_wait,
-+                            int ignore_signals,
-+                            int *r_reg, uint32_t * r_offset);
-+extern int psb_init_use_base(struct drm_psb_private *dev_priv,
-+                            unsigned int reg_start, unsigned int reg_num);
-+
-+/*
-+ * psb_xhw.c
-+ */
-+
-+extern int psb_xhw_ioctl(struct drm_device *dev, void *data,
-+                        struct drm_file *file_priv);
-+extern int psb_xhw_init_ioctl(struct drm_device *dev, void *data,
-+                             struct drm_file *file_priv);
-+extern int psb_xhw_init(struct drm_device *dev);
-+extern void psb_xhw_takedown(struct drm_psb_private *dev_priv);
-+extern void psb_xhw_init_takedown(struct drm_psb_private *dev_priv,
-+                                 struct drm_file *file_priv, int closing);
-+extern int psb_xhw_scene_bind_fire(struct drm_psb_private *dev_priv,
-+                                  struct psb_xhw_buf *buf,
-+                                  uint32_t fire_flags,
-+                                  uint32_t hw_context,
-+                                  uint32_t * cookie,
-+                                  uint32_t * oom_cmds,
-+                                  uint32_t num_oom_cmds,
-+                                  uint32_t offset,
-+                                  uint32_t engine, uint32_t flags);
-+extern int psb_xhw_fire_raster(struct drm_psb_private *dev_priv,
-+                              struct psb_xhw_buf *buf, uint32_t fire_flags);
-+extern int psb_xhw_scene_info(struct drm_psb_private *dev_priv,
-+                             struct psb_xhw_buf *buf,
-+                             uint32_t w,
-+                             uint32_t h,
-+                             uint32_t * hw_cookie,
-+                             uint32_t * bo_size,
-+                             uint32_t * clear_p_start,
-+                             uint32_t * clear_num_pages);
-+
-+extern int psb_xhw_reset_dpm(struct drm_psb_private *dev_priv,
-+                            struct psb_xhw_buf *buf);
-+extern int psb_xhw_ta_mem_info(struct drm_psb_private *dev_priv,
-+                               struct psb_xhw_buf *buf,
-+                               uint32_t pages,
-+                               uint32_t * hw_cookie, uint32_t * size);
-+extern int psb_xhw_ta_oom(struct drm_psb_private *dev_priv,
-+                         struct psb_xhw_buf *buf, uint32_t * cookie);
-+extern void psb_xhw_ta_oom_reply(struct drm_psb_private *dev_priv,
-+                                struct psb_xhw_buf *buf,
-+                                uint32_t * cookie,
-+                                uint32_t * bca,
-+                                uint32_t * rca, uint32_t * flags);
-+extern int psb_xhw_vistest(struct drm_psb_private *dev_priv,
-+                          struct psb_xhw_buf *buf);
-+extern int psb_xhw_handler(struct drm_psb_private *dev_priv);
-+extern int psb_xhw_resume(struct drm_psb_private *dev_priv,
-+                         struct psb_xhw_buf *buf);
-+extern void psb_xhw_fire_reply(struct drm_psb_private *dev_priv,
-+                              struct psb_xhw_buf *buf, uint32_t * cookie);
-+extern int psb_xhw_ta_mem_load(struct drm_psb_private *dev_priv,
-+                               struct psb_xhw_buf *buf,
-+                               uint32_t flags,
-+                               uint32_t param_offset,
-+                               uint32_t pt_offset,
-+                               uint32_t *hw_cookie);
-+extern void psb_xhw_clean_buf(struct drm_psb_private *dev_priv,
-+                             struct psb_xhw_buf *buf);
-+
-+/*
-+ * Utilities
-+ */
-+
-+#define PSB_ALIGN_TO(_val, _align) \
-+  (((_val) + ((_align) - 1)) & ~((_align) - 1))
-+#define PSB_WVDC32(_val, _offs) \
-+  iowrite32(_val, dev_priv->vdc_reg + (_offs))
-+#define PSB_RVDC32(_offs) \
-+  ioread32(dev_priv->vdc_reg + (_offs))
-+#define PSB_WSGX32(_val, _offs) \
-+  iowrite32(_val, dev_priv->sgx_reg + (_offs))
-+#define PSB_RSGX32(_offs) \
-+  ioread32(dev_priv->sgx_reg + (_offs))
-+#define PSB_WMSVDX32(_val, _offs) \
-+  iowrite32(_val, dev_priv->msvdx_reg + (_offs))
-+#define PSB_RMSVDX32(_offs) \
-+  ioread32(dev_priv->msvdx_reg + (_offs))
-+
-+#define PSB_ALPL(_val, _base)                  \
-+  (((_val) >> (_base ## _ALIGNSHIFT)) << (_base ## _SHIFT))
-+#define PSB_ALPLM(_val, _base)                 \
-+  ((((_val) >> (_base ## _ALIGNSHIFT)) << (_base ## _SHIFT)) & (_base ## _MASK))
-+
-+static inline psb_fixed psb_mul_fixed(psb_fixed a, psb_fixed b)
-+{
-+       s64 tmp;
-+       s64 a64 = (s64) a;
-+       s64 b64 = (s64) b;
-+
-+       tmp = a64 * b64;
-+       return tmp / (1ULL << PSB_FIXED_SHIFT) +
-+           ((tmp & 0x80000000ULL) ? 1 : 0);
-+}
-+
-+static inline psb_fixed psb_mul_ufixed(psb_ufixed a, psb_fixed b)
-+{
-+       u64 tmp;
-+       u64 a64 = (u64) a;
-+       u64 b64 = (u64) b;
-+
-+       tmp = a64 * b64;
-+       return (tmp >> PSB_FIXED_SHIFT) + ((tmp & 0x80000000ULL) ? 1 : 0);
-+}
-+
-+static inline uint32_t psb_ufixed_to_float32(psb_ufixed a)
-+{
-+       uint32_t exp = 0x7f + 7;
-+       uint32_t mantissa = (uint32_t) a;
-+
-+       if (a == 0)
-+               return 0;
-+       while ((mantissa & 0xff800000) == 0) {
-+               exp -= 1;
-+               mantissa <<= 1;
-+       }
-+       while ((mantissa & 0xff800000) > 0x00800000) {
-+               exp += 1;
-+               mantissa >>= 1;
-+       }
-+       return (mantissa & ~0xff800000) | (exp << 23);
-+}
-+
-+static inline uint32_t psb_fixed_to_float32(psb_fixed a)
-+{
-+       if (a < 0)
-+               return psb_ufixed_to_float32(-a) | 0x80000000;
-+       else
-+               return psb_ufixed_to_float32(a);
-+}
-+
-+#define PSB_D_RENDER  (1 << 16)
-+
-+#define PSB_D_GENERAL (1 << 0)
-+#define PSB_D_INIT    (1 << 1)
-+#define PSB_D_IRQ     (1 << 2)
-+#define PSB_D_FW      (1 << 3)
-+#define PSB_D_PERF    (1 << 4)
-+#define PSB_D_TMP    (1 << 5)
-+
-+extern int drm_psb_debug;
-+extern int drm_psb_no_fb;
-+extern int drm_psb_disable_vsync;
-+
-+#define PSB_DEBUG_FW(_fmt, _arg...) \
-+       PSB_DEBUG(PSB_D_FW, _fmt, ##_arg)
-+#define PSB_DEBUG_GENERAL(_fmt, _arg...) \
-+       PSB_DEBUG(PSB_D_GENERAL, _fmt, ##_arg)
-+#define PSB_DEBUG_INIT(_fmt, _arg...) \
-+       PSB_DEBUG(PSB_D_INIT, _fmt, ##_arg)
-+#define PSB_DEBUG_IRQ(_fmt, _arg...) \
-+       PSB_DEBUG(PSB_D_IRQ, _fmt, ##_arg)
-+#define PSB_DEBUG_RENDER(_fmt, _arg...) \
-+       PSB_DEBUG(PSB_D_RENDER, _fmt, ##_arg)
-+#define PSB_DEBUG_PERF(_fmt, _arg...) \
-+       PSB_DEBUG(PSB_D_PERF, _fmt, ##_arg)
-+#define PSB_DEBUG_TMP(_fmt, _arg...) \
-+       PSB_DEBUG(PSB_D_TMP, _fmt, ##_arg)
-+
-+#if DRM_DEBUG_CODE
-+#define PSB_DEBUG(_flag, _fmt, _arg...)                                        \
-+       do {                                                            \
-+               if ((_flag) & drm_psb_debug)                            \
-+                       printk(KERN_DEBUG                               \
-+                              "[psb:0x%02x:%s] " _fmt , _flag, \
-+                              __FUNCTION__ , ##_arg);                  \
-+       } while (0)
-+#else
-+#define PSB_DEBUG(_fmt, _arg...)     do { } while (0)
-+#endif
-+
-+#endif
-Index: libdrm-2.4.4/shared-core/psb_reg.h
-===================================================================
---- /dev/null   1970-01-01 00:00:00.000000000 +0000
-+++ libdrm-2.4.4/shared-core/psb_reg.h  2009-02-04 16:39:55.000000000 +0000
-@@ -0,0 +1,555 @@
-+/**************************************************************************
-+ *
-+ * Copyright (c) (2005-2007) Imagination Technologies Limited.
-+ * Copyright (c) 2007, Intel Corporation.
-+ * All Rights Reserved.
-+ *
-+ * This program is free software; you can redistribute it and/or modify it
-+ * under the terms and conditions of the GNU General Public License,
-+ * version 2, as published by the Free Software Foundation.
-+ *
-+ * This program is distributed in the hope it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-+ * more details.
-+ *
-+ * You should have received a copy of the GNU General Public License along with
-+ * this program; if not, write to the Free Software Foundation, Inc.,
-+ * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
-+ *
-+ * Intel funded Tungsten Graphics (http://www.tungstengraphics.com) to
-+ * develop this driver.
-+ *
-+ **************************************************************************/
-+/*
-+ */
-+#ifndef _PSB_REG_H_
-+#define _PSB_REG_H_
-+
-+#define PSB_CR_CLKGATECTL                0x0000
-+#define _PSB_C_CLKGATECTL_AUTO_MAN_REG   (1 << 24)
-+#define _PSB_C_CLKGATECTL_USE_CLKG_SHIFT (20)
-+#define _PSB_C_CLKGATECTL_USE_CLKG_MASK  (0x3 << 20)
-+#define _PSB_C_CLKGATECTL_DPM_CLKG_SHIFT (16)
-+#define _PSB_C_CLKGATECTL_DPM_CLKG_MASK  (0x3 << 16)
-+#define _PSB_C_CLKGATECTL_TA_CLKG_SHIFT  (12)
-+#define _PSB_C_CLKGATECTL_TA_CLKG_MASK   (0x3 << 12)
-+#define _PSB_C_CLKGATECTL_TSP_CLKG_SHIFT (8)
-+#define _PSB_C_CLKGATECTL_TSP_CLKG_MASK  (0x3 << 8)
-+#define _PSB_C_CLKGATECTL_ISP_CLKG_SHIFT (4)
-+#define _PSB_C_CLKGATECTL_ISP_CLKG_MASK  (0x3 << 4)
-+#define _PSB_C_CLKGATECTL_2D_CLKG_SHIFT  (0)
-+#define _PSB_C_CLKGATECTL_2D_CLKG_MASK   (0x3 << 0)
-+#define _PSB_C_CLKGATECTL_CLKG_ENABLED   (0)
-+#define _PSB_C_CLKGATECTL_CLKG_DISABLED  (1)
-+#define _PSB_C_CLKGATECTL_CLKG_AUTO      (2)
-+
-+#define PSB_CR_CORE_ID                   0x0010
-+#define _PSB_CC_ID_ID_SHIFT              (16)
-+#define _PSB_CC_ID_ID_MASK               (0xFFFF << 16)
-+#define _PSB_CC_ID_CONFIG_SHIFT          (0)
-+#define _PSB_CC_ID_CONFIG_MASK           (0xFFFF << 0)
-+
-+#define PSB_CR_CORE_REVISION               0x0014
-+#define _PSB_CC_REVISION_DESIGNER_SHIFT    (24)
-+#define _PSB_CC_REVISION_DESIGNER_MASK     (0xFF << 24)
-+#define _PSB_CC_REVISION_MAJOR_SHIFT       (16)
-+#define _PSB_CC_REVISION_MAJOR_MASK        (0xFF << 16)
-+#define _PSB_CC_REVISION_MINOR_SHIFT       (8)
-+#define _PSB_CC_REVISION_MINOR_MASK        (0xFF << 8)
-+#define _PSB_CC_REVISION_MAINTENANCE_SHIFT (0)
-+#define _PSB_CC_REVISION_MAINTENANCE_MASK  (0xFF << 0)
-+
-+#define PSB_CR_DESIGNER_REV_FIELD1       0x0018
-+
-+#define PSB_CR_SOFT_RESET                0x0080
-+#define _PSB_CS_RESET_TSP_RESET          (1 << 6)
-+#define _PSB_CS_RESET_ISP_RESET          (1 << 5)
-+#define _PSB_CS_RESET_USE_RESET          (1 << 4)
-+#define _PSB_CS_RESET_TA_RESET           (1 << 3)
-+#define _PSB_CS_RESET_DPM_RESET          (1 << 2)
-+#define _PSB_CS_RESET_TWOD_RESET         (1 << 1)
-+#define _PSB_CS_RESET_BIF_RESET          (1 << 0)
-+
-+#define PSB_CR_DESIGNER_REV_FIELD2       0x001C
-+
-+#define PSB_CR_EVENT_STATUS              0x012C
-+
-+#define PSB_CR_EVENT_HOST_ENABLE         0x0130
-+
-+#define PSB_CR_EVENT_HOST_CLEAR          0x0134
-+#define _PSB_CE_MASTER_INTERRUPT         (1 << 31)
-+#define _PSB_CE_TA_DPM_FAULT             (1 << 28)
-+#define _PSB_CE_TWOD_COMPLETE            (1 << 27)
-+#define _PSB_CE_DPM_OUT_OF_MEMORY_ZLS    (1 << 25)
-+#define _PSB_CE_DPM_TA_MEM_FREE          (1 << 24)
-+#define _PSB_CE_PIXELBE_END_RENDER       (1 << 18)
-+#define _PSB_CE_SW_EVENT                 (1 << 14)
-+#define _PSB_CE_TA_FINISHED              (1 << 13)
-+#define _PSB_CE_TA_TERMINATE             (1 << 12)
-+#define _PSB_CE_DPM_REACHED_MEM_THRESH   (1 << 3)
-+#define _PSB_CE_DPM_OUT_OF_MEMORY_GBL    (1 << 2)
-+#define _PSB_CE_DPM_OUT_OF_MEMORY_MT     (1 << 1)
-+#define _PSB_CE_DPM_3D_MEM_FREE          (1 << 0)
-+
-+
-+#define PSB_USE_OFFSET_MASK              0x0007FFFF
-+#define PSB_USE_OFFSET_SIZE              (PSB_USE_OFFSET_MASK + 1)
-+#define PSB_CR_USE_CODE_BASE0            0x0A0C
-+#define PSB_CR_USE_CODE_BASE1            0x0A10
-+#define PSB_CR_USE_CODE_BASE2            0x0A14
-+#define PSB_CR_USE_CODE_BASE3            0x0A18
-+#define PSB_CR_USE_CODE_BASE4            0x0A1C
-+#define PSB_CR_USE_CODE_BASE5            0x0A20
-+#define PSB_CR_USE_CODE_BASE6            0x0A24
-+#define PSB_CR_USE_CODE_BASE7            0x0A28
-+#define PSB_CR_USE_CODE_BASE8            0x0A2C
-+#define PSB_CR_USE_CODE_BASE9            0x0A30
-+#define PSB_CR_USE_CODE_BASE10           0x0A34
-+#define PSB_CR_USE_CODE_BASE11           0x0A38
-+#define PSB_CR_USE_CODE_BASE12           0x0A3C
-+#define PSB_CR_USE_CODE_BASE13           0x0A40
-+#define PSB_CR_USE_CODE_BASE14           0x0A44
-+#define PSB_CR_USE_CODE_BASE15           0x0A48
-+#define PSB_CR_USE_CODE_BASE(_i) (0x0A0C + ((_i) << 2))
-+#define _PSB_CUC_BASE_DM_SHIFT           (25)
-+#define _PSB_CUC_BASE_DM_MASK            (0x3 << 25)
-+#define _PSB_CUC_BASE_ADDR_SHIFT         (0) // 1024-bit aligned address?
-+#define _PSB_CUC_BASE_ADDR_ALIGNSHIFT    (7)
-+#define _PSB_CUC_BASE_ADDR_MASK          (0x1FFFFFF << 0)
-+#define _PSB_CUC_DM_VERTEX              (0)
-+#define _PSB_CUC_DM_PIXEL               (1)
-+#define _PSB_CUC_DM_RESERVED            (2)
-+#define _PSB_CUC_DM_EDM                         (3)
-+
-+#define PSB_CR_PDS_EXEC_BASE             0x0AB8
-+#define _PSB_CR_PDS_EXEC_BASE_ADDR_SHIFT (20) // 1MB aligned address
-+#define _PSB_CR_PDS_EXEC_BASE_ADDR_ALIGNSHIFT (20)
-+
-+#define PSB_CR_EVENT_KICKER              0x0AC4
-+#define _PSB_CE_KICKER_ADDRESS_SHIFT     (4) // 128-bit aligned address
-+
-+#define PSB_CR_EVENT_KICK                0x0AC8
-+#define _PSB_CE_KICK_NOW                 (1 << 0)
-+
-+
-+#define PSB_CR_BIF_DIR_LIST_BASE1        0x0C38
-+
-+#define PSB_CR_BIF_CTRL                  0x0C00
-+#define _PSB_CB_CTRL_CLEAR_FAULT         (1 << 4)
-+#define _PSB_CB_CTRL_INVALDC             (1 << 3)
-+#define _PSB_CB_CTRL_FLUSH               (1 << 2)
-+
-+#define PSB_CR_BIF_INT_STAT              0x0C04
-+
-+#define PSB_CR_BIF_FAULT                 0x0C08
-+#define _PSB_CBI_STAT_PF_N_RW            (1 << 14)
-+#define _PSB_CBI_STAT_FAULT_SHIFT        (0)
-+#define _PSB_CBI_STAT_FAULT_MASK         (0x3FFF << 0)
-+#define _PSB_CBI_STAT_FAULT_CACHE        (1 << 1)
-+#define _PSB_CBI_STAT_FAULT_TA           (1 << 2)
-+#define _PSB_CBI_STAT_FAULT_VDM          (1 << 3)
-+#define _PSB_CBI_STAT_FAULT_2D           (1 << 4)
-+#define _PSB_CBI_STAT_FAULT_PBE          (1 << 5)
-+#define _PSB_CBI_STAT_FAULT_TSP          (1 << 6)
-+#define _PSB_CBI_STAT_FAULT_ISP          (1 << 7)
-+#define _PSB_CBI_STAT_FAULT_USSEPDS      (1 << 8)
-+#define _PSB_CBI_STAT_FAULT_HOST         (1 << 9)
-+
-+#define PSB_CR_BIF_BANK0                 0x0C78
-+
-+#define PSB_CR_BIF_BANK1                 0x0C7C
-+
-+#define PSB_CR_BIF_DIR_LIST_BASE0        0x0C84
-+
-+#define PSB_CR_BIF_TWOD_REQ_BASE         0x0C88
-+#define PSB_CR_BIF_3D_REQ_BASE           0x0CAC
-+
-+#define PSB_CR_2D_SOCIF                  0x0E18
-+#define _PSB_C2_SOCIF_FREESPACE_SHIFT    (0)
-+#define _PSB_C2_SOCIF_FREESPACE_MASK     (0xFF << 0)
-+#define _PSB_C2_SOCIF_EMPTY              (0x80 << 0)
-+
-+#define PSB_CR_2D_BLIT_STATUS            0x0E04
-+#define _PSB_C2B_STATUS_BUSY             (1 << 24)
-+#define _PSB_C2B_STATUS_COMPLETE_SHIFT   (0)
-+#define _PSB_C2B_STATUS_COMPLETE_MASK    (0xFFFFFF << 0)
-+
-+/*
-+ * 2D defs.
-+ */
-+
-+/*
-+ * 2D Slave Port Data : Block Header's Object Type
-+ */
-+
-+#define        PSB_2D_CLIP_BH                   (0x00000000)
-+#define        PSB_2D_PAT_BH                    (0x10000000)
-+#define        PSB_2D_CTRL_BH                   (0x20000000)
-+#define        PSB_2D_SRC_OFF_BH                (0x30000000)
-+#define        PSB_2D_MASK_OFF_BH               (0x40000000)
-+#define        PSB_2D_RESERVED1_BH              (0x50000000)
-+#define        PSB_2D_RESERVED2_BH              (0x60000000)
-+#define        PSB_2D_FENCE_BH                  (0x70000000)
-+#define        PSB_2D_BLIT_BH                   (0x80000000)
-+#define        PSB_2D_SRC_SURF_BH               (0x90000000)
-+#define        PSB_2D_DST_SURF_BH               (0xA0000000)
-+#define        PSB_2D_PAT_SURF_BH               (0xB0000000)
-+#define        PSB_2D_SRC_PAL_BH                (0xC0000000)
-+#define        PSB_2D_PAT_PAL_BH                (0xD0000000)
-+#define        PSB_2D_MASK_SURF_BH              (0xE0000000)
-+#define        PSB_2D_FLUSH_BH                  (0xF0000000)
-+
-+/*
-+ * Clip Definition block (PSB_2D_CLIP_BH)
-+ */
-+#define PSB_2D_CLIPCOUNT_MAX             (1)
-+#define PSB_2D_CLIPCOUNT_MASK            (0x00000000)
-+#define PSB_2D_CLIPCOUNT_CLRMASK         (0xFFFFFFFF)
-+#define PSB_2D_CLIPCOUNT_SHIFT           (0)
-+// clip rectangle min & max
-+#define PSB_2D_CLIP_XMAX_MASK            (0x00FFF000)
-+#define PSB_2D_CLIP_XMAX_CLRMASK         (0xFF000FFF)
-+#define PSB_2D_CLIP_XMAX_SHIFT           (12)
-+#define PSB_2D_CLIP_XMIN_MASK            (0x00000FFF)
-+#define PSB_2D_CLIP_XMIN_CLRMASK         (0x00FFF000)
-+#define PSB_2D_CLIP_XMIN_SHIFT           (0)
-+// clip rectangle offset
-+#define PSB_2D_CLIP_YMAX_MASK            (0x00FFF000)
-+#define PSB_2D_CLIP_YMAX_CLRMASK         (0xFF000FFF)
-+#define PSB_2D_CLIP_YMAX_SHIFT           (12)
-+#define PSB_2D_CLIP_YMIN_MASK            (0x00000FFF)
-+#define PSB_2D_CLIP_YMIN_CLRMASK         (0x00FFF000)
-+#define PSB_2D_CLIP_YMIN_SHIFT           (0)
-+
-+/*
-+ * Pattern Control (PSB_2D_PAT_BH)
-+ */
-+#define PSB_2D_PAT_HEIGHT_MASK           (0x0000001F)
-+#define PSB_2D_PAT_HEIGHT_SHIFT          (0)
-+#define PSB_2D_PAT_WIDTH_MASK            (0x000003E0)
-+#define PSB_2D_PAT_WIDTH_SHIFT           (5)
-+#define PSB_2D_PAT_YSTART_MASK           (0x00007C00)
-+#define PSB_2D_PAT_YSTART_SHIFT          (10)
-+#define PSB_2D_PAT_XSTART_MASK           (0x000F8000)
-+#define PSB_2D_PAT_XSTART_SHIFT          (15)
-+
-+/*
-+ * 2D Control block (PSB_2D_CTRL_BH)
-+ */
-+// Present Flags
-+#define PSB_2D_SRCCK_CTRL                (0x00000001)
-+#define PSB_2D_DSTCK_CTRL                (0x00000002)
-+#define PSB_2D_ALPHA_CTRL                (0x00000004)
-+// Colour Key Colour (SRC/DST)
-+#define PSB_2D_CK_COL_MASK               (0xFFFFFFFF)
-+#define PSB_2D_CK_COL_CLRMASK            (0x00000000)
-+#define PSB_2D_CK_COL_SHIFT              (0)
-+// Colour Key Mask (SRC/DST)
-+#define PSB_2D_CK_MASK_MASK              (0xFFFFFFFF)
-+#define PSB_2D_CK_MASK_CLRMASK           (0x00000000)
-+#define PSB_2D_CK_MASK_SHIFT             (0)
-+// Alpha Control (Alpha/RGB)
-+#define PSB_2D_GBLALPHA_MASK             (0x000FF000)
-+#define PSB_2D_GBLALPHA_CLRMASK          (0xFFF00FFF)
-+#define PSB_2D_GBLALPHA_SHIFT            (12)
-+#define PSB_2D_SRCALPHA_OP_MASK          (0x00700000)
-+#define PSB_2D_SRCALPHA_OP_CLRMASK       (0xFF8FFFFF)
-+#define PSB_2D_SRCALPHA_OP_SHIFT         (20)
-+#define PSB_2D_SRCALPHA_OP_ONE           (0x00000000)
-+#define PSB_2D_SRCALPHA_OP_SRC           (0x00100000)
-+#define PSB_2D_SRCALPHA_OP_DST           (0x00200000)
-+#define PSB_2D_SRCALPHA_OP_SG            (0x00300000)
-+#define PSB_2D_SRCALPHA_OP_DG            (0x00400000)
-+#define PSB_2D_SRCALPHA_OP_GBL           (0x00500000)
-+#define PSB_2D_SRCALPHA_OP_ZERO          (0x00600000)
-+#define PSB_2D_SRCALPHA_INVERT           (0x00800000)
-+#define PSB_2D_SRCALPHA_INVERT_CLR       (0xFF7FFFFF)
-+#define PSB_2D_DSTALPHA_OP_MASK          (0x07000000)
-+#define PSB_2D_DSTALPHA_OP_CLRMASK       (0xF8FFFFFF)
-+#define PSB_2D_DSTALPHA_OP_SHIFT         (24)
-+#define PSB_2D_DSTALPHA_OP_ONE           (0x00000000)
-+#define PSB_2D_DSTALPHA_OP_SRC           (0x01000000)
-+#define PSB_2D_DSTALPHA_OP_DST           (0x02000000)
-+#define PSB_2D_DSTALPHA_OP_SG            (0x03000000)
-+#define PSB_2D_DSTALPHA_OP_DG            (0x04000000)
-+#define PSB_2D_DSTALPHA_OP_GBL           (0x05000000)
-+#define PSB_2D_DSTALPHA_OP_ZERO          (0x06000000)
-+#define PSB_2D_DSTALPHA_INVERT           (0x08000000)
-+#define PSB_2D_DSTALPHA_INVERT_CLR       (0xF7FFFFFF)
-+
-+#define PSB_2D_PRE_MULTIPLICATION_ENABLE  (0x10000000)
-+#define PSB_2D_PRE_MULTIPLICATION_CLRMASK (0xEFFFFFFF)
-+#define PSB_2D_ZERO_SOURCE_ALPHA_ENABLE   (0x20000000)
-+#define PSB_2D_ZERO_SOURCE_ALPHA_CLRMASK  (0xDFFFFFFF)
-+
-+/*
-+ *Source Offset (PSB_2D_SRC_OFF_BH)
-+ */
-+#define PSB_2D_SRCOFF_XSTART_MASK        ((0x00000FFF) << 12)
-+#define PSB_2D_SRCOFF_XSTART_SHIFT       (12)
-+#define PSB_2D_SRCOFF_YSTART_MASK        (0x00000FFF)
-+#define PSB_2D_SRCOFF_YSTART_SHIFT       (0)
-+
-+/*
-+ * Mask Offset (PSB_2D_MASK_OFF_BH)
-+ */
-+#define PSB_2D_MASKOFF_XSTART_MASK       ((0x00000FFF) << 12)
-+#define PSB_2D_MASKOFF_XSTART_SHIFT      (12)
-+#define PSB_2D_MASKOFF_YSTART_MASK       (0x00000FFF)
-+#define PSB_2D_MASKOFF_YSTART_SHIFT      (0)
-+
-+/*
-+ * 2D Fence (see PSB_2D_FENCE_BH): bits 0:27 are ignored
-+ */
-+
-+/*
-+ *Blit Rectangle (PSB_2D_BLIT_BH)
-+ */
-+
-+#define PSB_2D_ROT_MASK                  (3<<25)
-+#define PSB_2D_ROT_CLRMASK               (~PSB_2D_ROT_MASK)
-+#define PSB_2D_ROT_NONE                  (0<<25)
-+#define PSB_2D_ROT_90DEGS                (1<<25)
-+#define PSB_2D_ROT_180DEGS               (2<<25)
-+#define PSB_2D_ROT_270DEGS               (3<<25)
-+
-+#define PSB_2D_COPYORDER_MASK            (3<<23)
-+#define PSB_2D_COPYORDER_CLRMASK         (~PSB_2D_COPYORDER_MASK)
-+#define PSB_2D_COPYORDER_TL2BR           (0<<23)
-+#define PSB_2D_COPYORDER_BR2TL           (1<<23)
-+#define PSB_2D_COPYORDER_TR2BL           (2<<23)
-+#define PSB_2D_COPYORDER_BL2TR           (3<<23)
-+
-+#define PSB_2D_DSTCK_CLRMASK             (0xFF9FFFFF)
-+#define PSB_2D_DSTCK_DISABLE             (0x00000000)
-+#define PSB_2D_DSTCK_PASS                (0x00200000)
-+#define PSB_2D_DSTCK_REJECT              (0x00400000)
-+
-+#define PSB_2D_SRCCK_CLRMASK             (0xFFE7FFFF)
-+#define PSB_2D_SRCCK_DISABLE             (0x00000000)
-+#define PSB_2D_SRCCK_PASS                (0x00080000)
-+#define PSB_2D_SRCCK_REJECT              (0x00100000)
-+
-+#define PSB_2D_CLIP_ENABLE               (0x00040000)
-+
-+#define PSB_2D_ALPHA_ENABLE              (0x00020000)
-+
-+#define PSB_2D_PAT_CLRMASK               (0xFFFEFFFF)
-+#define PSB_2D_PAT_MASK                  (0x00010000)
-+#define PSB_2D_USE_PAT                   (0x00010000)
-+#define PSB_2D_USE_FILL                  (0x00000000)
-+/*
-+ * Tungsten Graphics note on rop codes: If rop A and rop B are
-+ * identical, the mask surface will not be read and need not be
-+ * set up.
-+ */
-+
-+#define PSB_2D_ROP3B_MASK                (0x0000FF00)
-+#define PSB_2D_ROP3B_CLRMASK             (0xFFFF00FF)
-+#define PSB_2D_ROP3B_SHIFT               (8)
-+// rop code A
-+#define PSB_2D_ROP3A_MASK                (0x000000FF)
-+#define PSB_2D_ROP3A_CLRMASK             (0xFFFFFF00)
-+#define PSB_2D_ROP3A_SHIFT               (0)
-+
-+#define PSB_2D_ROP4_MASK                 (0x0000FFFF)
-+/*
-+ *     DWORD0: (Only pass if Pattern control == Use Fill Colour)
-+ *     Fill Colour RGBA8888
-+ */
-+#define PSB_2D_FILLCOLOUR_MASK           (0xFFFFFFFF)
-+#define PSB_2D_FILLCOLOUR_SHIFT          (0)
-+/*
-+ *     DWORD1: (Always Present)
-+ *     X Start (Dest)
-+ *     Y Start (Dest)
-+ */
-+#define PSB_2D_DST_XSTART_MASK           (0x00FFF000)
-+#define PSB_2D_DST_XSTART_CLRMASK        (0xFF000FFF)
-+#define PSB_2D_DST_XSTART_SHIFT          (12)
-+#define PSB_2D_DST_YSTART_MASK           (0x00000FFF)
-+#define PSB_2D_DST_YSTART_CLRMASK        (0xFFFFF000)
-+#define PSB_2D_DST_YSTART_SHIFT          (0)
-+/*
-+ *     DWORD2: (Always Present)
-+ *     X Size (Dest)
-+ *     Y Size (Dest)
-+ */
-+#define PSB_2D_DST_XSIZE_MASK            (0x00FFF000)
-+#define PSB_2D_DST_XSIZE_CLRMASK         (0xFF000FFF)
-+#define PSB_2D_DST_XSIZE_SHIFT           (12)
-+#define PSB_2D_DST_YSIZE_MASK            (0x00000FFF)
-+#define PSB_2D_DST_YSIZE_CLRMASK         (0xFFFFF000)
-+#define PSB_2D_DST_YSIZE_SHIFT           (0)
-+
-+/*
-+ * Source Surface (PSB_2D_SRC_SURF_BH)
-+ */
-+/*
-+ *      WORD 0
-+ */
-+
-+#define PSB_2D_SRC_FORMAT_MASK           (0x00078000)
-+#define PSB_2D_SRC_1_PAL                 (0x00000000)
-+#define PSB_2D_SRC_2_PAL                 (0x00008000)
-+#define PSB_2D_SRC_4_PAL                 (0x00010000)
-+#define PSB_2D_SRC_8_PAL                 (0x00018000)
-+#define PSB_2D_SRC_8_ALPHA               (0x00020000)
-+#define PSB_2D_SRC_4_ALPHA               (0x00028000)
-+#define PSB_2D_SRC_332RGB                (0x00030000)
-+#define PSB_2D_SRC_4444ARGB              (0x00038000)
-+#define PSB_2D_SRC_555RGB                (0x00040000)
-+#define PSB_2D_SRC_1555ARGB              (0x00048000)
-+#define PSB_2D_SRC_565RGB                (0x00050000)
-+#define PSB_2D_SRC_0888ARGB              (0x00058000)
-+#define PSB_2D_SRC_8888ARGB              (0x00060000)
-+#define PSB_2D_SRC_8888UYVY              (0x00068000)
-+#define PSB_2D_SRC_RESERVED              (0x00070000)
-+#define PSB_2D_SRC_1555ARGB_LOOKUP       (0x00078000)
-+
-+
-+#define PSB_2D_SRC_STRIDE_MASK           (0x00007FFF)
-+#define PSB_2D_SRC_STRIDE_CLRMASK        (0xFFFF8000)
-+#define PSB_2D_SRC_STRIDE_SHIFT          (0)
-+/*
-+ *  WORD 1 - Base Address
-+ */
-+#define PSB_2D_SRC_ADDR_MASK             (0x0FFFFFFC)
-+#define PSB_2D_SRC_ADDR_CLRMASK          (0x00000003)
-+#define PSB_2D_SRC_ADDR_SHIFT            (2)
-+#define PSB_2D_SRC_ADDR_ALIGNSHIFT       (2)
-+
-+/*
-+ * Pattern Surface (PSB_2D_PAT_SURF_BH)
-+ */
-+/*
-+ *  WORD 0
-+ */
-+
-+#define PSB_2D_PAT_FORMAT_MASK           (0x00078000)
-+#define PSB_2D_PAT_1_PAL                 (0x00000000)
-+#define PSB_2D_PAT_2_PAL                 (0x00008000)
-+#define PSB_2D_PAT_4_PAL                 (0x00010000)
-+#define PSB_2D_PAT_8_PAL                 (0x00018000)
-+#define PSB_2D_PAT_8_ALPHA               (0x00020000)
-+#define PSB_2D_PAT_4_ALPHA               (0x00028000)
-+#define PSB_2D_PAT_332RGB                (0x00030000)
-+#define PSB_2D_PAT_4444ARGB              (0x00038000)
-+#define PSB_2D_PAT_555RGB                (0x00040000)
-+#define PSB_2D_PAT_1555ARGB              (0x00048000)
-+#define PSB_2D_PAT_565RGB                (0x00050000)
-+#define PSB_2D_PAT_0888ARGB              (0x00058000)
-+#define PSB_2D_PAT_8888ARGB              (0x00060000)
-+
-+#define PSB_2D_PAT_STRIDE_MASK           (0x00007FFF)
-+#define PSB_2D_PAT_STRIDE_CLRMASK        (0xFFFF8000)
-+#define PSB_2D_PAT_STRIDE_SHIFT          (0)
-+/*
-+ *  WORD 1 - Base Address
-+ */
-+#define PSB_2D_PAT_ADDR_MASK             (0x0FFFFFFC)
-+#define PSB_2D_PAT_ADDR_CLRMASK          (0x00000003)
-+#define PSB_2D_PAT_ADDR_SHIFT            (2)
-+#define PSB_2D_PAT_ADDR_ALIGNSHIFT       (2)
-+
-+/*
-+ * Destination Surface (PSB_2D_DST_SURF_BH)
-+ */
-+/*
-+ * WORD 0
-+ */
-+
-+#define PSB_2D_DST_FORMAT_MASK           (0x00078000)
-+#define PSB_2D_DST_332RGB                (0x00030000)
-+#define PSB_2D_DST_4444ARGB              (0x00038000)
-+#define PSB_2D_DST_555RGB                (0x00040000)
-+#define PSB_2D_DST_1555ARGB              (0x00048000)
-+#define PSB_2D_DST_565RGB                (0x00050000)
-+#define PSB_2D_DST_0888ARGB              (0x00058000)
-+#define PSB_2D_DST_8888ARGB              (0x00060000)
-+#define PSB_2D_DST_8888AYUV              (0x00070000)
-+
-+#define PSB_2D_DST_STRIDE_MASK           (0x00007FFF)
-+#define PSB_2D_DST_STRIDE_CLRMASK        (0xFFFF8000)
-+#define PSB_2D_DST_STRIDE_SHIFT          (0)
-+/*
-+ * WORD 1 - Base Address
-+ */
-+#define PSB_2D_DST_ADDR_MASK             (0x0FFFFFFC)
-+#define PSB_2D_DST_ADDR_CLRMASK          (0x00000003)
-+#define PSB_2D_DST_ADDR_SHIFT            (2)
-+#define PSB_2D_DST_ADDR_ALIGNSHIFT       (2)
-+
-+/*
-+ * Mask Surface (PSB_2D_MASK_SURF_BH)
-+ */
-+/*
-+ * WORD 0
-+ */
-+#define PSB_2D_MASK_STRIDE_MASK          (0x00007FFF)
-+#define PSB_2D_MASK_STRIDE_CLRMASK       (0xFFFF8000)
-+#define PSB_2D_MASK_STRIDE_SHIFT         (0)
-+/*
-+ *  WORD 1 - Base Address
-+ */
-+#define PSB_2D_MASK_ADDR_MASK            (0x0FFFFFFC)
-+#define PSB_2D_MASK_ADDR_CLRMASK         (0x00000003)
-+#define PSB_2D_MASK_ADDR_SHIFT           (2)
-+#define PSB_2D_MASK_ADDR_ALIGNSHIFT      (2)
-+
-+/*
-+ * Source Palette (PSB_2D_SRC_PAL_BH)
-+ */
-+
-+#define PSB_2D_SRCPAL_ADDR_SHIFT         (0)
-+#define PSB_2D_SRCPAL_ADDR_CLRMASK       (0xF0000007)
-+#define PSB_2D_SRCPAL_ADDR_MASK          (0x0FFFFFF8)
-+#define PSB_2D_SRCPAL_BYTEALIGN          (1024)
-+
-+/*
-+ * Pattern Palette (PSB_2D_PAT_PAL_BH)
-+ */
-+
-+#define PSB_2D_PATPAL_ADDR_SHIFT         (0)
-+#define PSB_2D_PATPAL_ADDR_CLRMASK       (0xF0000007)
-+#define PSB_2D_PATPAL_ADDR_MASK          (0x0FFFFFF8)
-+#define PSB_2D_PATPAL_BYTEALIGN          (1024)
-+
-+/*
-+ * Rop3 Codes (2 LS bytes)
-+ */
-+
-+#define PSB_2D_ROP3_SRCCOPY              (0xCCCC)
-+#define PSB_2D_ROP3_PATCOPY              (0xF0F0)
-+#define PSB_2D_ROP3_WHITENESS            (0xFFFF)
-+#define PSB_2D_ROP3_BLACKNESS            (0x0000)
-+#define PSB_2D_ROP3_SRC                  (0xCC)
-+#define PSB_2D_ROP3_PAT                  (0xF0)
-+#define PSB_2D_ROP3_DST                  (0xAA)
-+
-+
-+/*
-+ * Sizes.
-+ */
-+
-+#define PSB_SCENE_HW_COOKIE_SIZE 16
-+#define PSB_TA_MEM_HW_COOKIE_SIZE 16
-+
-+/*
-+ * Scene stuff.
-+ */
-+
-+#define PSB_NUM_HW_SCENES          2
-+
-+/*
-+ * Scheduler completion actions.
-+ */
-+
-+#define PSB_RASTER_BLOCK 0
-+#define PSB_RASTER       1
-+#define PSB_RETURN       2
-+#define PSB_TA       3
-+
-+
-+#endif
-Index: libdrm-2.4.4/libdrm/Makefile.am
-===================================================================
---- libdrm-2.4.4.orig/libdrm/Makefile.am        2009-02-04 16:42:01.000000000 +0000
-+++ libdrm-2.4.4/libdrm/Makefile.am     2009-02-04 16:45:06.000000000 +0000
-@@ -31,6 +31,6 @@
-        libdrm_lists.h
- 
- libdrmincludedir = ${includedir}
--libdrminclude_HEADERS = xf86drm.h xf86drmMode.h
-+libdrminclude_HEADERS = xf86drm.h xf86drmMode.h xf86mm.h libdrm_lists.h
- 
- EXTRA_DIST = ChangeLog TODO
diff --git a/meta/packages/drm/libdrm-2.4.7/installtests.patch b/meta/packages/drm/libdrm-2.4.7/installtests.patch
new file mode 100644
index 0000000000..a16c8a738b
--- /dev/null
+++ b/meta/packages/drm/libdrm-2.4.7/installtests.patch
@@ -0,0 +1,39 @@
+Index: libdrm-2.4.7/tests/Makefile.am
+===================================================================
+--- libdrm-2.4.7.orig/tests/Makefile.am 2009-04-09 20:16:35.000000000 +0100
++++ libdrm-2.4.7/tests/Makefile.am      2009-04-17 12:35:14.000000000 +0100
+@@ -4,7 +4,7 @@
+ 
+ LDADD = $(top_builddir)/libdrm/libdrm.la
+ 
+-noinst_PROGRAMS = \
++bin_PROGRAMS = \
+        dristat \
+        drmstat
+ 
+Index: libdrm-2.4.7/tests/modeprint/Makefile.am
+===================================================================
+--- libdrm-2.4.7.orig/tests/modeprint/Makefile.am       2009-02-17 19:52:37.000000000 +0000
++++ libdrm-2.4.7/tests/modeprint/Makefile.am    2009-04-17 12:35:32.000000000 +0100
+@@ -3,7 +3,7 @@
+        -I$(top_srcdir)/libdrm/intel/ \
+        -I$(top_srcdir)/libdrm
+ 
+-noinst_PROGRAMS = \
++bin_PROGRAMS = \
+        modeprint
+ 
+ modeprint_SOURCES = \
+Index: libdrm-2.4.7/tests/modetest/Makefile.am
+===================================================================
+--- libdrm-2.4.7.orig/tests/modetest/Makefile.am        2009-02-17 19:52:37.000000000 +0000
++++ libdrm-2.4.7/tests/modetest/Makefile.am     2009-04-17 12:35:42.000000000 +0100
+@@ -4,7 +4,7 @@
+        -I$(top_srcdir)/libdrm \
+        $(CAIRO_CFLAGS)
+ 
+-noinst_PROGRAMS = \
++bin_PROGRAMS = \
+        modetest
+ 
+ modetest_SOURCES = \
diff --git a/meta/packages/drm/libdrm_2.4.4.bb b/meta/packages/drm/libdrm_2.4.4.bb
deleted file mode 100644
index 8198592f8e..0000000000
--- a/meta/packages/drm/libdrm_2.4.4.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-SECTION = "x11/base"
-LICENSE = "MIT"
-SRC_URI = "http://dri.freedesktop.org/libdrm/libdrm-${PV}.tar.bz2 \
-           file://poulsbo.patch;patch=1"
-PR = "r3"
-PROVIDES = "drm"
-DEPENDS = "libpthread-stubs"
-
-inherit autotools_stage pkgconfig
diff --git a/meta/packages/drm/libdrm_2.4.7.bb b/meta/packages/drm/libdrm_2.4.7.bb
new file mode 100644
index 0000000000..f0d5668937
--- /dev/null
+++ b/meta/packages/drm/libdrm_2.4.7.bb
@@ -0,0 +1,12 @@
+SECTION = "x11/base"
+LICENSE = "MIT"
+SRC_URI = "http://dri.freedesktop.org/libdrm/libdrm-${PV}.tar.bz2 \
+           file://installtests.patch;patch=1"
+PR = "r1"
+PROVIDES = "drm"
+DEPENDS = "libpthread-stubs udev cairo"
+
+PACKAGES =+ "libdrm-tests"
+FILES_libdrm-tests = "${bindir}/dr* ${bindir}/mode*"
+
+inherit autotools_stage pkgconfig
diff --git a/meta/packages/e2fsprogs/e2fsprogs-native_1.41.2.bb b/meta/packages/e2fsprogs/e2fsprogs-native_1.41.2.bb
index eaed14d935..90095d9ae7 100644
--- a/meta/packages/e2fsprogs/e2fsprogs-native_1.41.2.bb
+++ b/meta/packages/e2fsprogs/e2fsprogs-native_1.41.2.bb
@@ -2,7 +2,30 @@ require e2fsprogs_${PV}.bb
 inherit native
 
 DEPENDS = "gettext-native"
+PR = "r1"
 
 do_stage () {
-        oe_runmake install
+        oe_libinstall -a -C lib libblkid ${STAGING_LIBDIR}/
+        oe_libinstall -a -C lib libe2p ${STAGING_LIBDIR}/
+        oe_libinstall -a -C lib libext2fs ${STAGING_LIBDIR}/
+        oe_libinstall -a -C lib libuuid ${STAGING_LIBDIR}/
+        install -d ${STAGING_INCDIR}/e2p
+        for h in ${e2pheaders}; do
+                install -m 0644 lib/e2p/$h ${STAGING_INCDIR}/e2p/ || die "failed to install $h"
+        done
+        install -d ${STAGING_INCDIR}/ext2fs
+        for h in ${ext2fsheaders}; do
+                install -m 0644 lib/ext2fs/$h ${STAGING_INCDIR}/ext2fs/ || die "failed to install $h"
+        done
+        install -d ${STAGING_INCDIR}/blkid
+        for h in blkid.h blkid_types.h; do
+                install -m 0644 lib/blkid/$h ${STAGING_INCDIR}/blkid/ || die "failed to install $h"
+        done
+        install -d ${STAGING_INCDIR}/uuid
+        install -m 0644 lib/uuid/uuid.h ${STAGING_INCDIR}/uuid/ || die "failed to install $h"
+        
+        install -d ${STAGING_LIBDIR}/pkgconfig
+        for pc in lib/*/*.pc; do
+                install -m 0644 $pc ${STAGING_LIBDIR}/pkgconfig/ || die "failed to install $h"
+        done
 }
diff --git a/meta/packages/initrdscripts/files/init-live.sh b/meta/packages/initrdscripts/files/init-live.sh
index d4e53713ef..c96b1f47c3 100644
--- a/meta/packages/initrdscripts/files/init-live.sh
+++ b/meta/packages/initrdscripts/files/init-live.sh
@@ -58,6 +58,7 @@ do
   for i in `ls /media 2>/dev/null`; do
       if [ -f /media/$i/$ROOT_IMAGE ] ; then
           found="yes"
+          break
       fi
   done
   if [ "$found" = "yes" ]; then
diff --git a/meta/packages/initrdscripts/initramfs-live-boot_1.0.bb b/meta/packages/initrdscripts/initramfs-live-boot_1.0.bb
index 2c92f73773..07d349c8f5 100644
--- a/meta/packages/initrdscripts/initramfs-live-boot_1.0.bb
+++ b/meta/packages/initrdscripts/initramfs-live-boot_1.0.bb
@@ -2,7 +2,7 @@ DESCRIPTON = "A live image init script"
 
 SRC_URI = "file://init-live.sh"
 
-PR = "r1"
+PR = "r2"
 
 do_install() {
         install -m 0755 ${WORKDIR}/init-live.sh ${D}/init
diff --git a/meta/packages/libnl/libnl_1.0-pre6.bb b/meta/packages/libnl/libnl_1.0-pre8.bb
index 740bc937d7..0b98f896a8 100644
--- a/meta/packages/libnl/libnl_1.0-pre6.bb
+++ b/meta/packages/libnl/libnl_1.0-pre8.bb
@@ -3,11 +3,11 @@ SECTION = "libs/network"
 LICENSE = "LGPL"
 HOMEPAGE = "http://people.suug.ch/~tgr/libnl/"
 PRIORITY = "optional"
-PV = "0.99+1.0-pre6"
+PV = "0.99+1.0-pre8"
 
 inherit autotools_stage pkgconfig
 
-SRC_URI= "http://people.suug.ch/~tgr/libnl/files/${PN}-1.0-pre6.tar.gz \
+SRC_URI= "http://people.suug.ch/~tgr/libnl/files/${PN}-1.0-pre8.tar.gz \
            file://local-includes.patch;patch=1"
 
-S = "${WORKDIR}/${PN}-1.0-pre6"
+S = "${WORKDIR}/${PN}-1.0-pre8"
diff --git a/meta/packages/libproxy/libproxy/asneededfix.patch b/meta/packages/libproxy/libproxy/asneededfix.patch
new file mode 100644
index 0000000000..cc22077f07
--- /dev/null
+++ b/meta/packages/libproxy/libproxy/asneededfix.patch
@@ -0,0 +1,13 @@
+Index: libproxy-0.2.3/src/lib/Makefile.am
+===================================================================
+--- libproxy-0.2.3.orig/src/lib/Makefile.am     2009-03-09 16:24:08.000000000 +0000
++++ libproxy-0.2.3/src/lib/Makefile.am  2009-03-09 16:24:13.000000000 +0000
+@@ -2,7 +2,7 @@
+ libproxy_la_SOURCES = misc.c url.c pac.c dhcp.c dns.c slp.c wpad.c proxy_factory.c config_file.c \
+                                                misc.h url.h pac.h dhcp.h dns.h slp.h wpad.h proxy_factory.h proxy.h config_file.h
+ libproxy_la_CFLAGS  = -Wall
+-libproxy_la_LDFLAGS = -lm
++libproxy_la_LDFLAGS = -lm -ldl
+ 
+ include_HEADERS     = proxy.h
+ 
diff --git a/meta/packages/libproxy/libproxy_0.2.3.bb b/meta/packages/libproxy/libproxy_0.2.3.bb
new file mode 100644
index 0000000000..34172f263d
--- /dev/null
+++ b/meta/packages/libproxy/libproxy_0.2.3.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "A library that provides automatic proxy configuration management"
+HOMEPAGE = "http://code.google.com/p/libproxy/"
+LICENSE = "LGPL"
+SECTION = "libs"
+
+DEPENDS = "virtual/libx11 xmu gconf-dbus"
+
+SRC_URI = "http://libproxy.googlecode.com/files/libproxy-${PV}.tar.gz \
+           file://asneededfix.patch;patch=1"
+S = "${WORKDIR}/libproxy-${PV}"
+
+inherit autotools_stage pkgconfig
+
+EXTRA_OECONF = "--without-kde --with-gnome --without-webkit --without-python --without-mozjs --without-networkmanager"
+
+FILES_${PN}-dbg += "${libdir}/libproxy/0.2.3/plugins/"
\ No newline at end of file
diff --git a/meta/packages/libsoup/libsoup-2.4_2.25.91.bb b/meta/packages/libsoup/libsoup-2.4_2.25.91.bb
new file mode 100644
index 0000000000..e4494cf458
--- /dev/null
+++ b/meta/packages/libsoup/libsoup-2.4_2.25.91.bb
@@ -0,0 +1,14 @@
+DESCRIPTION = "An HTTP library implementation in C"
+LICENSE = "GPL"
+SECTION = "x11/gnome/libs"
+
+DEPENDS = "glib-2.0 gnutls libxml2 libproxy sqlite3"
+
+SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/libsoup/2.25/libsoup-${PV}.tar.bz2"
+S = "${WORKDIR}/libsoup-${PV}"
+
+inherit autotools_stage pkgconfig
+
+do_stage() {
+        autotools_stage_all
+}
diff --git a/meta/packages/mesa/mesa-7.0.2/fix-host-compile.patch b/meta/packages/mesa/mesa-7.0.2/fix-host-compile.patch
deleted file mode 100644
index d24d03d379..0000000000
--- a/meta/packages/mesa/mesa-7.0.2/fix-host-compile.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- /src/mesa/x86/orig-Makefile 2005-07-01 04:54:38.000000000 +0300
-+++ /src/mesa/x86/Makefile      2007-06-07 21:52:31.000000000 +0300
-@@ -5,6 +5,7 @@
- 
- 
- INCLUDE_DIRS = \
-+        -I/usr/include \
-        -I$(TOP)/include/GL \
-        -I$(TOP)/include \
-        -I.. \
-@@ -13,6 +14,10 @@
-        -I../glapi \
-        -I../tnl
- 
-+OPT_FLAGS_host = -fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os
-+
-+CFLAGS_host = -Wall -Wmissing-prototypes $(OPT_FLAGS_host) $(PIC_FLAGS) $(ARCH_FLAGS) \
-+        $(DEFINES) $(ASM_FLAGS) $(X11_INCLUDES) -std=c99 -ffast-math
- 
- default: gen_matypes matypes.h
- 
-@@ -21,7 +26,7 @@
- 
- 
- gen_matypes: gen_matypes.c
--       $(CC) $(INCLUDE_DIRS) $(CFLAGS) gen_matypes.c -o gen_matypes
-+       $(CC) $(INCLUDE_DIRS) $(CFLAGS_host) gen_matypes.c -o gen_matypes
- 
- # need some special rules here, unfortunately
- matypes.h: ../main/mtypes.h ../tnl/t_context.h gen_matypes
diff --git a/meta/packages/mesa/mesa-7.0.2/mklib-rpath-link.patch b/meta/packages/mesa/mesa-7.0.2/mklib-rpath-link.patch
deleted file mode 100644
index 618f5b57ed..0000000000
--- a/meta/packages/mesa/mesa-7.0.2/mklib-rpath-link.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- /tmp/mklib  2007-12-08 11:03:23.000000000 +0100
-+++ Mesa-7.0.2/bin/mklib        2007-12-08 11:04:02.509863000 +0100
-@@ -106,6 +106,9 @@
-        -L*)
-            DEPS="$DEPS $1"
-            ;;
-+        -Wl*)
-+            DEPS="$DEPS $1"
-+            ;;
-        -pthread)
-            # this is a special case (see bugzilla 10876)
-            DEPS="$DEPS $1"
---- /tmp/default        2007-12-08 11:04:17.000000000 +0100
-+++ Mesa-7.0.2/configs/default  2007-12-08 11:05:06.279863000 +0100
-@@ -76,7 +76,7 @@
- GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) $(EXTRA_LIB_PATH) -lXt -lX11
- 
- # Program dependencies - specific GL/glut libraries added in Makefiles
--APP_LIB_DEPS = -lm
-+APP_LIB_DEPS = $(EXTRA_LIB_PATH) -lm
- 
- 
- 
diff --git a/meta/packages/mesa/mesa-dri_7.2.bb b/meta/packages/mesa/mesa-dri_7.4.bb
index 43e4cb5527..43e4cb5527 100644
--- a/meta/packages/mesa/mesa-dri_7.2.bb
+++ b/meta/packages/mesa/mesa-dri_7.4.bb
diff --git a/meta/packages/mesa/mesa-dri_git.bb b/meta/packages/mesa/mesa-dri_git.bb
index e565ac5367..2608e226b1 100644
--- a/meta/packages/mesa/mesa-dri_git.bb
+++ b/meta/packages/mesa/mesa-dri_git.bb
@@ -14,7 +14,7 @@ DEFAULT_PREFERENCE = "-1"
 # Netbooks have DRI support so use mesa-dri by default
 DEFAULT_PREFERENCE_netbook = "1"
 
-SRC_URI = "git://anongit.freedesktop.org/git/mesa/mesa;protocol=git;branch=intel-2008-q3 "
+SRC_URI = "git://anongit.freedesktop.org/git/mesa/mesa;protocol=git;branch=master"
 S = "${WORKDIR}/git"
 
 PACKAGES =+ "${PN}-xprogs"
diff --git a/meta/packages/mesa/mesa-xlib_7.2.bb b/meta/packages/mesa/mesa-xlib_7.4.bb
index 069446904c..069446904c 100644
--- a/meta/packages/mesa/mesa-xlib_7.2.bb
+++ b/meta/packages/mesa/mesa-xlib_7.4.bb
diff --git a/meta/packages/mozilla-headless/mozilla-headless/configurefix.patch b/meta/packages/mozilla-headless/mozilla-headless/configurefix.patch
index 8a5fbbb77f..e02e4af2b6 100644
--- a/meta/packages/mozilla-headless/mozilla-headless/configurefix.patch
+++ b/meta/packages/mozilla-headless/mozilla-headless/configurefix.patch
@@ -1,7 +1,7 @@
-Index: git/configure.in
+Index: offscreen/configure.in
 ===================================================================
---- git.orig/configure.in       2009-01-27 16:11:22.000000000 +0000
-+++ git/configure.in    2009-01-27 16:16:45.000000000 +0000
+--- offscreen.orig/configure.in 2009-04-16 22:51:48.000000000 +0100
++++ offscreen/configure.in      2009-04-16 23:07:48.000000000 +0100
 @@ -62,7 +62,6 @@
  
  AC_PREREQ(2.13)
@@ -18,7 +18,7 @@ Index: git/configure.in
  
  dnl Set the version number of the libs included with mozilla
  dnl ========================================================
-@@ -137,6 +135,9 @@
+@@ -136,6 +134,9 @@
  
  MSMANIFEST_TOOL=
  
@@ -28,7 +28,7 @@ Index: git/configure.in
  dnl Set various checks
  dnl ========================================================
  MISSING_X=
-@@ -263,7 +264,7 @@
+@@ -281,7 +282,7 @@
      ;;
  esac
  
@@ -37,7 +37,7 @@ Index: git/configure.in
      echo "cross compiling from $host to $target"
      cross_compiling=yes
  
-@@ -301,7 +302,7 @@
+@@ -319,7 +320,7 @@
  
      AC_MSG_CHECKING([whether the host c compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works])
      AC_TRY_COMPILE([], [return(0);], 
@@ -46,7 +46,7 @@ Index: git/configure.in
         AC_MSG_ERROR([installation or configuration problem: host compiler $HOST_CC cannot create executables.]) )
  
      CC="$HOST_CXX"
-@@ -309,7 +310,7 @@
+@@ -327,7 +328,7 @@
  
      AC_MSG_CHECKING([whether the host c++ compiler ($HOST_CXX $HOST_CXXFLAGS $HOST_LDFLAGS) works])
      AC_TRY_COMPILE([], [return(0);], 
@@ -55,7 +55,7 @@ Index: git/configure.in
         AC_MSG_ERROR([installation or configuration problem: host compiler $HOST_CXX cannot create executables.]) )
      
      CC=$_SAVE_CC
-@@ -330,7 +331,7 @@
+@@ -348,7 +349,7 @@
          ;;
      esac
  
@@ -64,7 +64,7 @@ Index: git/configure.in
      unset ac_cv_prog_CC
      AC_PROG_CC
      AC_CHECK_PROGS(CXX, $CXX "${target_alias}-g++" "${target}-g++", :)
-@@ -354,37 +355,7 @@
+@@ -372,37 +373,6 @@
      AC_CHECK_PROGS(STRIP, $STRIP "${target_alias}-strip" "${target}-strip", :)
      AC_CHECK_PROGS(WINDRES, $WINDRES "${target_alias}-windres" "${target}-windres", :)
      AC_DEFINE(CROSS_COMPILE)
@@ -72,7 +72,7 @@ Index: git/configure.in
 -    AC_PROG_CC
 -    AC_PROG_CXX
 -    AC_PROG_RANLIB
--    AC_PATH_PROGS(AS, $AS as, $CC)
+-    MOZ_PATH_PROGS(AS, $AS as, $CC)
 -    AC_CHECK_PROGS(AR, ar, :)
 -    AC_CHECK_PROGS(LD, ld, :)
 -    AC_CHECK_PROGS(STRIP, strip, :)
@@ -99,11 +99,10 @@ Index: git/configure.in
 -       HOST_AR="$AR"
 -    fi
 -fi
-+
  
  GNU_AS=
  GNU_LD=
-@@ -1467,6 +1438,7 @@
+@@ -1569,6 +1539,7 @@
  '
  
  dnl test that the macros actually work:
@@ -111,7 +110,7 @@ Index: git/configure.in
  AC_MSG_CHECKING(that static assertion macros used in autoconf tests work)
  AC_CACHE_VAL(ac_cv_static_assertion_macros_work,
   [AC_LANG_SAVE
-@@ -2625,9 +2597,13 @@
+@@ -2730,9 +2701,13 @@
  AC_LANG_C
  AC_HEADER_STDC
  AC_C_CONST
@@ -125,7 +124,7 @@ Index: git/configure.in
  AC_TYPE_SIZE_T
  AC_STRUCT_ST_BLKSIZE
  AC_MSG_CHECKING(for siginfo_t)
-@@ -3009,19 +2985,9 @@
+@@ -3115,19 +3090,9 @@
  dnl We don't want to link against libm or libpthread on Darwin since
  dnl they both are just symlinks to libSystem and explicitly linking
  dnl against libSystem causes issues when debugging (see bug 299601).
@@ -146,7 +145,7 @@ Index: git/configure.in
  
  _SAVE_CFLAGS="$CFLAGS"
  CFLAGS="$CFLAGS -D_GNU_SOURCE"
-@@ -6763,18 +6729,13 @@
+@@ -6931,18 +6896,13 @@
  
  # Demangle only for debug or trace-malloc builds
  MOZ_DEMANGLE_SYMBOLS=
@@ -167,7 +166,7 @@ Index: git/configure.in
  
  dnl ========================================================
  dnl =
-@@ -7288,10 +7249,7 @@
+@@ -7454,10 +7414,7 @@
      dnl if no gtk/libIDL1 or gtk2/libIDL2 combination was found, fall back
      dnl to either libIDL1 or libIDL2.
      if test -z "$_LIBIDL_FOUND"; then
@@ -178,19 +177,21 @@ Index: git/configure.in
      fi
      dnl
      dnl If we don't have a libIDL config program & not cross-compiling, 
-@@ -7364,11 +7322,7 @@
+@@ -7529,13 +7486,7 @@
+ fi
  
  if test -z "$SKIP_PATH_CHECKS"; then
- if test -z "${GLIB_CFLAGS}" || test -z "${GLIB_LIBS}" ; then
+-if test -z "${GLIB_CFLAGS}" || test -z "${GLIB_LIBS}" ; then
 -    if test "$MOZ_ENABLE_GTK2" || test "$USE_ELF_DYNSTR_GC" || test "$MOZ_ENABLE_HEADLESS"; then
          PKG_CHECK_MODULES(GLIB, glib-2.0 >= 1.3.7 gobject-2.0)
 -    else
 -        AM_PATH_GLIB(${GLIB_VERSION})
 -    fi
- fi
+-fi
  fi
  
-@@ -8214,10 +8168,7 @@
+ if test -z "${GLIB_GMODULE_LIBS}" -a -n "${GLIB_CONFIG}"; then
+@@ -8346,10 +8297,7 @@
  HAVE_WCRTOMB
  "
  
@@ -202,7 +203,7 @@ Index: git/configure.in
  )
  
  # Save the defines header file before autoconf removes it.
-@@ -8276,28 +8227,9 @@
+@@ -8408,31 +8356,11 @@
  dnl   To add new Makefiles, edit allmakefiles.sh.
  dnl   allmakefiles.sh sets the variable, MAKEFILES.
  . ${srcdir}/allmakefiles.sh
@@ -225,14 +226,16 @@ Index: git/configure.in
 -. ./conftest.sh
 -rm conftest.sh
  
--echo $MAKEFILES > unallmakefiles
+ echo $MAKEFILES > unallmakefiles
  
--AC_OUTPUT($MAKEFILES)
-+echo $MAKEFILES > unallmakefiles
+ mv -f config/autoconf.mk config/autoconf.mk.orig 2> /dev/null
  
+-AC_OUTPUT($MAKEFILES)
+-
  dnl Prevent the regeneration of cairo-features.h forcing rebuilds of gfx stuff
  if test "$CAIRO_FEATURES_H"; then
-@@ -8323,14 +8255,14 @@
+   if cmp -s $CAIRO_FEATURES_H "$CAIRO_FEATURES_H".orig; then
+@@ -8458,14 +8386,14 @@
  HOST_LDFLAGS="$_SUBDIR_HOST_LDFLAGS"
  RC=
  
@@ -250,7 +253,7 @@ Index: git/configure.in
      if test -z "$MOZ_DEBUG"; then
          ac_configure_args="$ac_configure_args --disable-debug"
      fi
-@@ -8346,8 +8278,7 @@
+@@ -8481,8 +8409,7 @@
      if test -n "$USE_ARM_KUSER"; then
          ac_configure_args="$ac_configure_args --with-arm-kuser"
      fi
@@ -260,7 +263,7 @@ Index: git/configure.in
  fi
  
  if test -z "$MOZ_NATIVE_NSPR"; then
-@@ -8364,7 +8295,6 @@
+@@ -8499,7 +8426,6 @@
  
  # Run the SpiderMonkey 'configure' script.
  dist=$MOZ_BUILD_ROOT/dist
@@ -268,7 +271,7 @@ Index: git/configure.in
  ac_configure_args="$ac_configure_args --enable-threadsafe"
  if test -z "$MOZ_NATIVE_NSPR"; then
      ac_configure_args="$ac_configure_args --with-nspr-cflags='$NSPR_CFLAGS'"
-@@ -8378,7 +8308,11 @@
+@@ -8513,11 +8439,14 @@
  if test "$MOZ_MEMORY"; then
     ac_configure_args="$ac_configure_args --enable-jemalloc"  
  fi
@@ -277,15 +280,18 @@ Index: git/configure.in
 +AC_CONFIG_SUBDIRS(js/src)
  
  fi # COMPILE_ENVIRONMENT && !LIBXUL_SDK_DIR
-+
+ 
 +m4_pattern_allow(AS_BIN)
 +
 +AC_OUTPUT($MAKEFILES)
 +
-Index: git/js/src/configure.in
+ dnl Prevent the regeneration of autoconf.mk forcing rebuilds of the world
+ dnl Needs to be at the end to respect possible changes from NSPR configure
+ if cmp -s config/autoconf.mk config/autoconf.mk.orig; then
+Index: offscreen/js/src/configure.in
 ===================================================================
---- git.orig/js/src/configure.in        2009-01-27 16:11:53.000000000 +0000
-+++ git/js/src/configure.in     2009-01-27 16:16:45.000000000 +0000
+--- offscreen.orig/js/src/configure.in  2009-04-16 22:51:49.000000000 +0100
++++ offscreen/js/src/configure.in       2009-04-16 23:06:42.000000000 +0100
 @@ -62,7 +62,6 @@
  
  AC_PREREQ(2.13)
@@ -313,7 +319,7 @@ Index: git/js/src/configure.in
  dnl Set various checks
  dnl ========================================================
  MISSING_X=
-@@ -201,7 +205,7 @@
+@@ -200,7 +204,7 @@
  
  if test "$COMPILE_ENVIRONMENT"; then
  
@@ -322,7 +328,7 @@ Index: git/js/src/configure.in
      echo "cross compiling from $host to $target"
  
      _SAVE_CC="$CC"
-@@ -238,7 +242,7 @@
+@@ -237,7 +241,7 @@
  
      AC_MSG_CHECKING([whether the host c compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works])
      AC_TRY_COMPILE([], [return(0);], 
@@ -331,7 +337,7 @@ Index: git/js/src/configure.in
         AC_MSG_ERROR([installation or configuration problem: host compiler $HOST_CC cannot create executables.]) )
  
      CC="$HOST_CXX"
-@@ -246,7 +250,7 @@
+@@ -245,7 +249,7 @@
  
      AC_MSG_CHECKING([whether the host c++ compiler ($HOST_CXX $HOST_CXXFLAGS $HOST_LDFLAGS) works])
      AC_TRY_COMPILE([], [return(0);], 
@@ -340,7 +346,7 @@ Index: git/js/src/configure.in
         AC_MSG_ERROR([installation or configuration problem: host compiler $HOST_CXX cannot create executables.]) )
      
      CC=$_SAVE_CC
-@@ -267,7 +271,7 @@
+@@ -266,7 +270,7 @@
          ;;
      esac
  
@@ -349,7 +355,7 @@ Index: git/js/src/configure.in
      unset ac_cv_prog_CC
      AC_PROG_CC
      AC_CHECK_PROGS(CXX, $CXX "${target_alias}-g++" "${target}-g++", :)
-@@ -297,37 +301,6 @@
+@@ -296,37 +300,6 @@
      dnl able to run ppc code in a translated environment, making a cross
      dnl compiler appear native.  So we override that here.
      cross_compiling=yes
@@ -357,7 +363,7 @@ Index: git/js/src/configure.in
 -    AC_PROG_CC
 -    AC_PROG_CXX
 -    AC_PROG_RANLIB
--    AC_PATH_PROGS(AS, $AS as, $CC)
+-    MOZ_PATH_PROGS(AS, $AS as, $CC)
 -    AC_CHECK_PROGS(AR, ar, :)
 -    AC_CHECK_PROGS(LD, ld, :)
 -    AC_CHECK_PROGS(STRIP, strip, :)
@@ -387,7 +393,7 @@ Index: git/js/src/configure.in
  
  GNU_AS=
  GNU_LD=
-@@ -1396,6 +1369,8 @@
+@@ -1435,6 +1408,8 @@
  fi # GNU_CC
  fi # COMPILE_ENVIRONMENT
  
@@ -396,7 +402,7 @@ Index: git/js/src/configure.in
  dnl =================================================================
  dnl Set up and test static assertion macros used to avoid AC_TRY_RUN,
  dnl which is bad when cross compiling.
-@@ -2524,9 +2499,13 @@
+@@ -2565,9 +2540,13 @@
  AC_LANG_C
  AC_HEADER_STDC
  AC_C_CONST
@@ -410,7 +416,7 @@ Index: git/js/src/configure.in
  AC_TYPE_SIZE_T
  AC_STRUCT_ST_BLKSIZE
  AC_MSG_CHECKING(for siginfo_t)
-@@ -2551,7 +2530,8 @@
+@@ -2592,7 +2571,8 @@
  
  AC_CHECK_HEADER(stdint.h)
  if test "$ac_cv_header_stdint_h" = yes; then
@@ -420,7 +426,7 @@ Index: git/js/src/configure.in
  else
      dnl We'll figure them out for ourselves.  List more likely types
      dnl earlier.  If we ever really encounter a size for which none of
-@@ -2937,10 +2917,7 @@
+@@ -2990,10 +2970,7 @@
      ;;
  *)
      AC_CHECK_LIB(m, atan)
@@ -432,7 +438,7 @@ Index: git/js/src/configure.in
      ;;
  esac
  
-@@ -3839,6 +3816,7 @@
+@@ -3908,6 +3885,7 @@
  [  --with-nspr-libs=LIBS   Pass LIBS to LD when linking code that uses NSPR.
                            See --with-nspr-cflags for more details.],
      NSPR_LIBS=$withval)
@@ -440,7 +446,7 @@ Index: git/js/src/configure.in
  AC_SUBST(NSPR_CFLAGS)
  AC_SUBST(NSPR_LIBS)
  
-@@ -4467,18 +4445,11 @@
+@@ -4542,18 +4520,11 @@
  
  # Demangle only for debug or trace-malloc builds
  MOZ_DEMANGLE_SYMBOLS=
@@ -459,7 +465,7 @@ Index: git/js/src/configure.in
  
  dnl ========================================================
  dnl =
-@@ -5161,6 +5132,8 @@
+@@ -5256,6 +5227,8 @@
  done
  AC_SUBST(LIBS_PATH)
  
@@ -468,15 +474,15 @@ Index: git/js/src/configure.in
  dnl ========================================================
  dnl JavaScript shell
  dnl ========================================================
-@@ -5292,3 +5265,4 @@
+@@ -5396,3 +5369,4 @@
  # 'js-config' in Makefile.in.
  AC_MSG_RESULT(invoking make to create js-config script)
  $MAKE js-config
 +
-Index: git/nsprpub/configure.in
+Index: offscreen/nsprpub/configure.in
 ===================================================================
---- git.orig/nsprpub/configure.in       2009-01-27 16:12:40.000000000 +0000
-+++ git/nsprpub/configure.in    2009-01-27 16:16:45.000000000 +0000
+--- offscreen.orig/nsprpub/configure.in 2009-04-16 18:09:00.000000000 +0100
++++ offscreen/nsprpub/configure.in      2009-04-16 23:06:42.000000000 +0100
 @@ -42,7 +42,6 @@
  AC_PREREQ(2.12)
  AC_INIT(config/libc_r.h)
@@ -556,7 +562,7 @@ Index: git/nsprpub/configure.in
  
  dnl ========================================================
  dnl Check for gcc -pipe support
-@@ -2254,10 +2226,7 @@
+@@ -2249,10 +2221,7 @@
  *-darwin*|*-beos*)
      ;;
  *)
@@ -568,7 +574,7 @@ Index: git/nsprpub/configure.in
  esac
  
  
-@@ -2874,6 +2843,8 @@
+@@ -2869,6 +2838,8 @@
  dnl pr/tests/w16gui/Makefile
  dnl tools/Makefile
  
@@ -577,17 +583,17 @@ Index: git/nsprpub/configure.in
  if test -z "$USE_PTHREADS" && test -z "$USE_BTHREADS"; then
      MAKEFILES="$MAKEFILES pr/src/threads/combined/Makefile"
  elif test -n "$USE_PTHREADS"; then
-@@ -2889,3 +2860,5 @@
+@@ -2884,3 +2855,5 @@
  echo $MAKEFILES > unallmakefiles
  
  AC_OUTPUT([$MAKEFILES], [chmod +x config/nspr-config])
 +
 +
-Index: git/toolkit/toolkit-makefiles.sh
+Index: offscreen/toolkit/toolkit-makefiles.sh
 ===================================================================
---- git.orig/toolkit/toolkit-makefiles.sh       2009-01-27 16:13:11.000000000 +0000
-+++ git/toolkit/toolkit-makefiles.sh    2009-01-27 16:16:45.000000000 +0000
-@@ -632,7 +632,6 @@
+--- offscreen.orig/toolkit/toolkit-makefiles.sh 2009-04-16 22:51:50.000000000 +0100
++++ offscreen/toolkit/toolkit-makefiles.sh      2009-04-16 23:06:42.000000000 +0100
+@@ -628,7 +628,6 @@
    toolkit/crashreporter/client/Makefile
    toolkit/crashreporter/google-breakpad/src/client/Makefile
    toolkit/crashreporter/google-breakpad/src/client/mac/handler/Makefile
@@ -595,15 +601,15 @@ Index: git/toolkit/toolkit-makefiles.sh
    toolkit/crashreporter/google-breakpad/src/client/windows/handler/Makefile
    toolkit/crashreporter/google-breakpad/src/client/windows/sender/Makefile
    toolkit/crashreporter/google-breakpad/src/common/Makefile
-Index: git/js/src/Makefile.in
+Index: offscreen/js/src/Makefile.in
 ===================================================================
---- git.orig/js/src/Makefile.in 2009-01-27 16:11:52.000000000 +0000
-+++ git/js/src/Makefile.in      2009-01-27 16:16:45.000000000 +0000
-@@ -513,20 +513,8 @@
+--- offscreen.orig/js/src/Makefile.in   2009-04-16 18:07:56.000000000 +0100
++++ offscreen/js/src/Makefile.in        2009-04-16 23:06:42.000000000 +0100
+@@ -507,20 +507,8 @@
  
  export:: jsautocfg.h
  
--ifeq (,$(CROSS_COMPILE)$(filter-out WINNT,$(OS_ARCH)))
+-ifeq (,$(CROSS_COMPILE)$(GNU_CC)$(filter-out WINNT,$(OS_ARCH)))
  jsautocfg.h:
         touch $@
 -else
@@ -620,7 +626,7 @@ Index: git/js/src/Makefile.in
  
  # jscpucfg is a strange target
  # Needs to be built with the host compiler but needs to include
-@@ -556,7 +544,7 @@
+@@ -550,7 +538,7 @@
         echo no need to build jscpucfg $<
  else
  jscpucfg$(HOST_BIN_SUFFIX): jscpucfg.cpp Makefile.in
@@ -629,10 +635,10 @@ Index: git/js/src/Makefile.in
  endif
  endif
  
-Index: git/js/src/xpconnect/loader/mozJSComponentLoader.cpp
+Index: offscreen/js/src/xpconnect/loader/mozJSComponentLoader.cpp
 ===================================================================
---- git.orig/js/src/xpconnect/loader/mozJSComponentLoader.cpp   2009-01-27 16:11:55.000000000 +0000
-+++ git/js/src/xpconnect/loader/mozJSComponentLoader.cpp        2009-01-27 16:16:45.000000000 +0000
+--- offscreen.orig/js/src/xpconnect/loader/mozJSComponentLoader.cpp     2009-04-16 18:08:00.000000000 +0100
++++ offscreen/js/src/xpconnect/loader/mozJSComponentLoader.cpp  2009-04-16 23:06:42.000000000 +0100
 @@ -47,6 +47,8 @@
  
  #include <stdarg.h>
@@ -642,10 +648,10 @@ Index: git/js/src/xpconnect/loader/mozJSComponentLoader.cpp
  #include "prlog.h"
  
  #include "nsCOMPtr.h"
-Index: git/js/src/xpconnect/loader/mozJSSubScriptLoader.cpp
+Index: offscreen/js/src/xpconnect/loader/mozJSSubScriptLoader.cpp
 ===================================================================
---- git.orig/js/src/xpconnect/loader/mozJSSubScriptLoader.cpp   2009-01-27 16:11:55.000000000 +0000
-+++ git/js/src/xpconnect/loader/mozJSSubScriptLoader.cpp        2009-01-27 16:16:45.000000000 +0000
+--- offscreen.orig/js/src/xpconnect/loader/mozJSSubScriptLoader.cpp     2009-04-16 18:08:00.000000000 +0100
++++ offscreen/js/src/xpconnect/loader/mozJSSubScriptLoader.cpp  2009-04-16 23:06:42.000000000 +0100
 @@ -39,6 +39,8 @@
   *
   * ***** END LICENSE BLOCK ***** */
@@ -655,10 +661,10 @@ Index: git/js/src/xpconnect/loader/mozJSSubScriptLoader.cpp
  #if !defined(XPCONNECT_STANDALONE) && !defined(NO_SUBSCRIPT_LOADER)
  
  #include "mozJSSubScriptLoader.h"
-Index: git/modules/lcms/include/icc34.h
+Index: offscreen/modules/lcms/include/icc34.h
 ===================================================================
---- git.orig/modules/lcms/include/icc34.h       2009-01-27 16:12:31.000000000 +0000
-+++ git/modules/lcms/include/icc34.h    2009-01-27 16:16:45.000000000 +0000
+--- offscreen.orig/modules/lcms/include/icc34.h 2009-04-16 18:08:47.000000000 +0100
++++ offscreen/modules/lcms/include/icc34.h      2009-04-16 23:06:42.000000000 +0100
 @@ -144,7 +144,7 @@
   */
  
@@ -668,10 +674,10 @@ Index: git/modules/lcms/include/icc34.h
  /*
    June 9, 2003, Adapted for use with configure by Bob Friesenhahn
    Added the stupid check for autoconf by Marti Maria. 
-Index: git/toolkit/mozapps/update/src/updater/Makefile.in
+Index: offscreen/toolkit/mozapps/update/src/updater/Makefile.in
 ===================================================================
---- git.orig/toolkit/mozapps/update/src/updater/Makefile.in     2009-01-27 16:13:09.000000000 +0000
-+++ git/toolkit/mozapps/update/src/updater/Makefile.in  2009-01-27 16:16:45.000000000 +0000
+--- offscreen.orig/toolkit/mozapps/update/src/updater/Makefile.in       2009-04-16 18:09:35.000000000 +0100
++++ offscreen/toolkit/mozapps/update/src/updater/Makefile.in    2009-04-16 23:06:42.000000000 +0100
 @@ -59,7 +59,7 @@
  
  LIBS += \
@@ -681,10 +687,10 @@ Index: git/toolkit/mozapps/update/src/updater/Makefile.in
         $(NULL)
  
  ifeq ($(OS_ARCH),WINNT)
-Index: git/xpcom/sample/program/Makefile.in
+Index: offscreen/xpcom/sample/program/Makefile.in
 ===================================================================
---- git.orig/xpcom/sample/program/Makefile.in   2009-01-27 16:13:18.000000000 +0000
-+++ git/xpcom/sample/program/Makefile.in        2009-01-27 16:16:45.000000000 +0000
+--- offscreen.orig/xpcom/sample/program/Makefile.in     2009-04-16 18:09:47.000000000 +0100
++++ offscreen/xpcom/sample/program/Makefile.in  2009-04-16 23:06:42.000000000 +0100
 @@ -57,7 +57,7 @@
  # that the application be linked against the XPCOM dynamic library or the NSPR
  # dynamic libraries.
@@ -694,10 +700,10 @@ Index: git/xpcom/sample/program/Makefile.in
                 $(NULL)
  
  # Need to link with CoreFoundation on Mac
-Index: git/xpcom/tools/registry/Makefile.in
+Index: offscreen/xpcom/tools/registry/Makefile.in
 ===================================================================
---- git.orig/xpcom/tools/registry/Makefile.in   2009-01-27 16:13:18.000000000 +0000
-+++ git/xpcom/tools/registry/Makefile.in        2009-01-27 16:16:45.000000000 +0000
+--- offscreen.orig/xpcom/tools/registry/Makefile.in     2009-04-16 18:09:48.000000000 +0100
++++ offscreen/xpcom/tools/registry/Makefile.in  2009-04-16 23:06:42.000000000 +0100
 @@ -54,7 +54,7 @@
  SIMPLE_PROGRAMS        = $(CPPSRCS:.cpp=$(BIN_SUFFIX))
  
@@ -707,10 +713,10 @@ Index: git/xpcom/tools/registry/Makefile.in
                 $(NULL)
  
  # Need to link with CoreFoundation on Mac
-Index: git/xulrunner/app/Makefile.in
+Index: offscreen/xulrunner/app/Makefile.in
 ===================================================================
---- git.orig/xulrunner/app/Makefile.in  2009-01-27 16:13:19.000000000 +0000
-+++ git/xulrunner/app/Makefile.in       2009-01-27 16:16:45.000000000 +0000
+--- offscreen.orig/xulrunner/app/Makefile.in    2009-04-16 18:09:50.000000000 +0100
++++ offscreen/xulrunner/app/Makefile.in 2009-04-16 23:06:42.000000000 +0100
 @@ -180,7 +180,7 @@
  RCFLAGS += -DXULRUNNER_ICO=\"$(DIST)/branding/xulrunner.ico\" -DDOCUMENT_ICO=\"$(DIST)/branding/document.ico\"
  endif
@@ -720,10 +726,10 @@ Index: git/xulrunner/app/Makefile.in
  
  include $(topsrcdir)/config/rules.mk
  
-Index: git/xulrunner/stub/Makefile.in
+Index: offscreen/xulrunner/stub/Makefile.in
 ===================================================================
---- git.orig/xulrunner/stub/Makefile.in 2009-01-27 16:13:20.000000000 +0000
-+++ git/xulrunner/stub/Makefile.in      2009-01-27 16:16:45.000000000 +0000
+--- offscreen.orig/xulrunner/stub/Makefile.in   2009-04-16 18:09:50.000000000 +0100
++++ offscreen/xulrunner/stub/Makefile.in        2009-04-16 23:06:42.000000000 +0100
 @@ -101,7 +101,7 @@
  endif
  endif
@@ -733,10 +739,10 @@ Index: git/xulrunner/stub/Makefile.in
  
  include $(topsrcdir)/config/rules.mk
  
-Index: git/modules/plugin/test/testplugin/Makefile.in
+Index: offscreen/modules/plugin/test/testplugin/Makefile.in
 ===================================================================
---- git.orig/modules/plugin/test/testplugin/Makefile.in 2009-01-27 16:12:37.000000000 +0000
-+++ git/modules/plugin/test/testplugin/Makefile.in      2009-01-27 16:16:45.000000000 +0000
+--- offscreen.orig/modules/plugin/test/testplugin/Makefile.in   2009-04-16 18:08:56.000000000 +0100
++++ offscreen/modules/plugin/test/testplugin/Makefile.in        2009-04-16 23:06:42.000000000 +0100
 @@ -63,9 +63,7 @@
  CMMSRCS = nptest_macosx.mm
  endif
@@ -745,12 +751,12 @@ Index: git/modules/plugin/test/testplugin/Makefile.in
  CPPSRCS += nptest_gtk2.cpp
 -endif
  
- ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
- CPPSRCS  += nptest_windows.cpp
-Index: git/xulrunner/installer/libxul-unstable.pc.in
+ ifeq ($(MOZ_WIDGET_TOOLKIT),qt)
+ CPPSRCS += nptest_qt.cpp
+Index: offscreen/xulrunner/installer/libxul-unstable.pc.in
 ===================================================================
---- git.orig/xulrunner/installer/libxul-unstable.pc.in  2009-01-27 18:07:55.000000000 +0000
-+++ git/xulrunner/installer/libxul-unstable.pc.in       2009-01-28 15:19:22.000000000 +0000
+--- offscreen.orig/xulrunner/installer/libxul-unstable.pc.in    2009-04-16 18:09:50.000000000 +0100
++++ offscreen/xulrunner/installer/libxul-unstable.pc.in 2009-04-16 23:06:42.000000000 +0100
 @@ -8,5 +8,5 @@
  Description: The Mozilla Runtime and Embedding Engine (unstable API)
  Version: %MOZILLA_VERSION%
@@ -758,3 +764,12 @@ Index: git/xulrunner/installer/libxul-unstable.pc.in
 -Libs: -L${sdkdir}/lib -lxpcomglue_s -lxul -lxpcom
 +Libs: -L${sdkdir}/lib -lxpcomglue_s -lxul -lxpcom -lsmime3 -lnss3 -lssl3 -lnssutil3 -L${sdkdir}/../xulrunner-1.9.2a1pre
  Cflags: -I${includedir}/${includetype} %WCHAR_CFLAGS%
+Index: offscreen/js/src/aclocal.m4
+===================================================================
+--- offscreen.orig/js/src/aclocal.m4    2009-04-16 18:07:56.000000000 +0100
++++ offscreen/js/src/aclocal.m4 2009-04-16 23:06:42.000000000 +0100
+@@ -9,4 +9,3 @@
+ builtin(include, build/autoconf/moznbytetype.m4)dnl
+ builtin(include, build/autoconf/mozprog.m4)dnl
+ 
+-MOZ_PROG_CHECKMSYS()
diff --git a/meta/packages/mozilla-headless/mozilla-headless_git.bb b/meta/packages/mozilla-headless/mozilla-headless_git.bb
index 9a016ad69b..7e59ed35f7 100644
--- a/meta/packages/mozilla-headless/mozilla-headless_git.bb
+++ b/meta/packages/mozilla-headless/mozilla-headless_git.bb
@@ -1,14 +1,14 @@
 
-SRC_URI = "git://git.o-hand.com/${PN}.git;protocol=git \
+SRC_URI = "hg://hg.mozilla.org/incubator;protocol=http;rev=c6fe23d41598;module=offscreen \
            file://configurefix.patch;patch=1 \
            file://jsautocfg.h \
            file://mozconfig"
-PV = "0.0+git${SRCREV}"
-PR = "r8"
+PV = "0.0+hg-1.0+c6fe23d41598"
+PR = "r0"
 
-S = "${WORKDIR}/git"
+S = "${WORKDIR}/offscreen"
 
-DEPENDS = "gconf gnome-vfs pango dbus-glib alsa-lib libidl-native sqlite3"
+DEPENDS = "gconf gnome-vfs pango dbus-glib alsa-lib libidl-native sqlite3 libidl"
 
 FILES_${PN} += "${libdir}/xulrunner-1.9.2a1pre"
 FILES_${PN}-dev += "${libdir}/xulrunner-devel-1.9.2a1pre"
diff --git a/meta/packages/gnome/metacity-clutter/crosscompile.patch b/meta/packages/mutter/mutter/crosscompile.patch
index b27383b09a..b27383b09a 100644
--- a/meta/packages/gnome/metacity-clutter/crosscompile.patch
+++ b/meta/packages/mutter/mutter/crosscompile.patch
diff --git a/meta/packages/gnome/metacity-clutter/fix_pkgconfig.patch b/meta/packages/mutter/mutter/fix_pkgconfig.patch
index 3714383bc1..3714383bc1 100644
--- a/meta/packages/gnome/metacity-clutter/fix_pkgconfig.patch
+++ b/meta/packages/mutter/mutter/fix_pkgconfig.patch
diff --git a/meta/packages/gnome/metacity-clutter/nodocs.patch b/meta/packages/mutter/mutter/nodocs.patch
index 98f43be5e8..98f43be5e8 100644
--- a/meta/packages/gnome/metacity-clutter/nodocs.patch
+++ b/meta/packages/mutter/mutter/nodocs.patch
diff --git a/meta/packages/gnome/metacity-clutter_git.bb b/meta/packages/mutter/mutter_git.bb
index 00d9a9427e..7d3a3b8c4f 100644
--- a/meta/packages/gnome/metacity-clutter_git.bb
+++ b/meta/packages/mutter/mutter_git.bb
@@ -1,12 +1,12 @@
 SECTION = "x11/wm"
-DESCRIPTION = "Metacity is the boring window manager for the adult in you."
+DESCRIPTION = "Metacity is the boring window manager for the adult in you. Mutter is metacity + clutter."
 LICENSE = "GPL"
-DEPENDS = "startup-notification gtk+ gconf clutter-0.8 gdk-pixbuf-csource-native intltool glib-2.0-native"
+DEPENDS = "startup-notification gtk+ gconf clutter gdk-pixbuf-csource-native intltool glib-2.0-native"
 PR = "r8"
 PV = "2.25.1+git${SRCREV}"
 inherit gnome update-alternatives
 
-SRC_URI = "git://git.o-hand.com/metacity-clutter.git;protocol=git;branch=clutter \
+SRC_URI = "git://git.gnome.org/mutter.git;protocol=git;branch=master \
            file://nodocs.patch;patch=1 \
            file://crosscompile.patch;patch=1 \
            file://fix_pkgconfig.patch;patch=1"
diff --git a/meta/packages/sqlite/sqlite3_3.6.7.bb b/meta/packages/sqlite/sqlite3_3.6.10.bb
index 5075dd35b7..5075dd35b7 100644
--- a/meta/packages/sqlite/sqlite3_3.6.7.bb
+++ b/meta/packages/sqlite/sqlite3_3.6.10.bb
diff --git a/meta/packages/tasks/task-poky-x11-netbook.bb b/meta/packages/tasks/task-poky-x11-netbook.bb
index 61bd5833af..a5ebb54073 100644
--- a/meta/packages/tasks/task-poky-x11-netbook.bb
+++ b/meta/packages/tasks/task-poky-x11-netbook.bb
@@ -3,7 +3,7 @@
 #
 
 DESCRIPTION = "Netbook Tasks for Poky"
-PR = "r0"
+PR = "r1"
 
 PACKAGES = "\
     task-poky-x11-netbook \
@@ -17,7 +17,7 @@ ALLOW_EMPTY = "1"
 
 NETWORK_MANAGER ?= "networkmanager-applet"
 RDEPENDS_task-poky-x11-netbook = "\
-    metacity-clutter \
+    mutter \
     matchbox-desktop \
     matchbox-session-netbook \
     matchbox-config-gtk \
diff --git a/meta/packages/xorg-driver/xf86-input-evdev_2.1.1.bb b/meta/packages/xorg-driver/xf86-input-evdev_2.2.1.bb
index d1fb0f000d..d1fb0f000d 100644
--- a/meta/packages/xorg-driver/xf86-input-evdev_2.1.1.bb
+++ b/meta/packages/xorg-driver/xf86-input-evdev_2.2.1.bb
diff --git a/meta/packages/xorg-driver/xf86-input-synaptics_0.99.3.bb b/meta/packages/xorg-driver/xf86-input-synaptics_1.1.0.bb
index f554141c97..f554141c97 100644
--- a/meta/packages/xorg-driver/xf86-input-synaptics_0.99.3.bb
+++ b/meta/packages/xorg-driver/xf86-input-synaptics_1.1.0.bb
diff --git a/meta/packages/xorg-driver/xf86-video-intel-dri2_git.bb b/meta/packages/xorg-driver/xf86-video-intel-dri2_git.bb
deleted file mode 100644
index ca9334625c..0000000000
--- a/meta/packages/xorg-driver/xf86-video-intel-dri2_git.bb
+++ /dev/null
@@ -1,27 +0,0 @@
-require xf86-video-common.inc
-
-DESCRIPTION = "X.Org X server -- Intel i8xx, i9xx display driver"
-DEPENDS += "virtual/libx11 libxvmc drm dri2proto glproto \
-            virtual/libgl xineramaproto libpciaccess"
-PROVIDES = "xf86-video-intel"
-
-DEFAULT_PREFERENCE = "-1"
-
-PE = "1"
-PR = "r2"
-PV = "2.4.97.0+git${SRCREV}"
-
-FILESPATH = "${FILE_DIRNAME}/xf86-video-intel"
-
-SRC_URI = "git://anongit.freedesktop.org/git/xorg/driver/xf86-video-intel;protocol=git;branch=dri2 \
-           file://002_avoid_duplicate_SaveHWState.patch;patch=1 \
-           file://004_reduce_driver_boottime.patch;patch=1 \
-           file://005_disable_sdvo_TV_port_restoreHW.patch;patch=1 \
-           file://006_disable_check_lvds_panelpower_status.patch;patch=1"
-
-S = "${WORKDIR}/git"
-
-COMPATIBLE_HOST = '(i.86.*-linux)'
-
-EXTRA_OECONF = "--enable-dri --disable-static"
-
diff --git a/meta/packages/xorg-driver/xf86-video-intel_2.6.0.bb b/meta/packages/xorg-driver/xf86-video-intel_2.7.0.bb
index 30e713538d..30e713538d 100644
--- a/meta/packages/xorg-driver/xf86-video-intel_2.6.0.bb
+++ b/meta/packages/xorg-driver/xf86-video-intel_2.7.0.bb
diff --git a/meta/packages/xorg-lib/libice_1.0.4.bb b/meta/packages/xorg-lib/libice_1.0.4.bb
index e4a6557397..afe405a55e 100644
--- a/meta/packages/xorg-lib/libice_1.0.4.bb
+++ b/meta/packages/xorg-lib/libice_1.0.4.bb
@@ -7,3 +7,5 @@ PR = "r1"
 PE = "1"
 
 XORG_PN = "libICE"
+
+BBCLASSEXTEND = "native"
diff --git a/meta/packages/xorg-lib/libsm_1.1.0.bb b/meta/packages/xorg-lib/libsm_1.1.0.bb
index 32bee5bd85..72a1c726dd 100644
--- a/meta/packages/xorg-lib/libsm_1.1.0.bb
+++ b/meta/packages/xorg-lib/libsm_1.1.0.bb
@@ -6,3 +6,5 @@ PR = "r1"
 PE = "1"
 
 XORG_PN = "libSM"
+
+BBCLASSEXTEND = "native"
diff --git a/meta/packages/xorg-lib/libxt_1.0.5.bb b/meta/packages/xorg-lib/libxt_1.0.5.bb
index 504779933f..b0b983f67d 100644
--- a/meta/packages/xorg-lib/libxt_1.0.5.bb
+++ b/meta/packages/xorg-lib/libxt_1.0.5.bb
@@ -8,6 +8,8 @@ PE = "1"
 
 XORG_PN = "libXt"
 
+BBCLASSEXTEND = "native"
+
 EXTRA_OECONF += "--disable-install-makestrs --disable-xkb"
 
 do_compile() {
diff --git a/meta/packages/xorg-xserver/xserver-xf86-dri-lite.inc b/meta/packages/xorg-xserver/xserver-xf86-dri-lite.inc
index 227be4ec0c..3ffd4a4d19 100644
--- a/meta/packages/xorg-xserver/xserver-xf86-dri-lite.inc
+++ b/meta/packages/xorg-xserver/xserver-xf86-dri-lite.inc
@@ -2,7 +2,7 @@ require xserver-xf86-common.inc
 
 PROTO_DEPS = "randrproto renderproto fixesproto damageproto xextproto xproto xf86dgaproto xf86miscproto xf86rushproto xf86vidmodeproto xf86bigfontproto compositeproto recordproto resourceproto videoproto scrnsaverproto evieext trapproto xineramaproto fontsproto kbproto inputproto bigreqsproto xcmiscproto glproto"
 
-LIB_DEPS = "pixman mesa-dri libxfont xtrans libxau libxext libxdmcp libdrm libxkbfile libpciaccess openssl"
+LIB_DEPS = "pixman virtual/libgl libxfont xtrans libxau libxext libxdmcp libdrm libxkbfile libpciaccess openssl"
 
 DEPENDS = "${PROTO_DEPS} ${LIB_DEPS}"