mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-31 00:39:46 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Richard Purdie
2009-04-28 08:24:11 +01:00
parent 49ca46f588 d65be3dd2a
commit 3927e38eba
157 changed files with 50516 additions and 79253 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/classes/base.bbclass
+11
View File
@@ -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
meta/classes/package.bbclass
+2 -2
View File
@@ -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
meta/conf/bitbake.conf
+2 -2
View File
@@ -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"
meta/conf/checksums.ini
+124
View File
@@ -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
meta/conf/distro/include/poky-fixed-revisions.inc
+4 -4
View File
@@ -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"
meta/conf/distro/include/poky-floating-revisions.inc
+1 -1
View File
@@ -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}"
meta/conf/distro/include/preferred-xorg-versions.inc
+5 -5
View File
@@ -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}"
meta/packages/clutter/clutter-mozembed/link-with-g++.patch
+11 -10
View File
@@ -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
meta/packages/clutter/clutter/enable_tests.patch
+15 -15
View File
@@ -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);
meta/packages/dbus/dbus-native_1.2.4.bb
+1 -1
View File
@@ -3,7 +3,7 @@ inherit native
DEPENDS = "glib-2.0-native libxml2-native expat-native"
PR = "r2"
PR = "r3"
do_stage() {
oe_runmake install
meta/packages/dbus/dbus.inc
+1 -1
View File
@@ -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 ."
meta/packages/dbus/dbus_1.2.4.bb
+3
View File
@@ -1,4 +1,7 @@
include dbus.inc
PR = "r1"
inherit update-rc.d
SRC_URI += "file://fix-install-daemon.patch;patch=1 "
meta/packages/drm/files/poulsbo.patch
-2516
View File
File diff suppressed because it is too large Load Diff
meta/packages/drm/libdrm-2.4.7/installtests.patch
Vendored
+39
View File
@@ -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 = \
meta/packages/drm/libdrm_2.4.4.bb
-9
View File
@@ -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
meta/packages/drm/libdrm_2.4.7.bb
+12
View File
@@ -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
meta/packages/e2fsprogs/e2fsprogs-native_1.41.2.bb
+24 -1
View File
@@ -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
}
meta/packages/initrdscripts/files/init-live.sh
+1
View File
@@ -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
meta/packages/initrdscripts/initramfs-live-boot_1.0.bb
+1 -1
View File
@@ -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
meta/packages/libnl/libnl_1.0-pre6.bb → meta/packages/libnl/libnl_1.0-pre8.bb
+3 -3
View File
@@ -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"
meta/packages/libproxy/libproxy/asneededfix.patch
+13
View File
@@ -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
meta/packages/libproxy/libproxy_0.2.3.bb
+16
View File
@@ -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/"
meta/packages/libsoup/libsoup-2.4_2.25.91.bb
+14
View File
@@ -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
}
meta/packages/mesa/mesa-7.0.2/fix-host-compile.patch
Vendored
-30
View File
@@ -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
meta/packages/mesa/mesa-7.0.2/mklib-rpath-link.patch
Vendored
-23
View File
@@ -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
meta/packages/mesa/mesa-dri_7.2.bb → meta/packages/mesa/mesa-dri_7.4.bb
View File
meta/packages/mesa/mesa-dri_git.bb
+1 -1
View File
@@ -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"
meta/packages/mesa/mesa-xlib_7.2.bb → meta/packages/mesa/mesa-xlib_7.4.bb
View File
meta/packages/mozilla-headless/mozilla-headless/configurefix.patch
+109 -94
View File
@@ -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
mv -f config/autoconf.mk config/autoconf.mk.orig 2> /dev/null
-AC_OUTPUT($MAKEFILES)
+echo $MAKEFILES > unallmakefiles
-
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()
meta/packages/mozilla-headless/mozilla-headless_git.bb
+5 -5
View File
@@ -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"
meta/packages/gnome/metacity-clutter/crosscompile.patch → meta/packages/mutter/mutter/crosscompile.patch
View File
meta/packages/gnome/metacity-clutter/fix_pkgconfig.patch → meta/packages/mutter/mutter/fix_pkgconfig.patch
View File
meta/packages/gnome/metacity-clutter/nodocs.patch → meta/packages/mutter/mutter/nodocs.patch
View File
meta/packages/gnome/metacity-clutter_git.bb → meta/packages/mutter/mutter_git.bb
+3 -3
View File
@@ -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"
meta/packages/sqlite/sqlite3_3.6.7.bb → meta/packages/sqlite/sqlite3_3.6.10.bb
View File
meta/packages/tasks/task-poky-x11-netbook.bb
+2 -2
View File
@@ -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 \
meta/packages/xorg-driver/xf86-input-evdev_2.1.1.bb → meta/packages/xorg-driver/xf86-input-evdev_2.2.1.bb
View File
meta/packages/xorg-driver/xf86-input-synaptics_0.99.3.bb → meta/packages/xorg-driver/xf86-input-synaptics_1.1.0.bb
View File
meta/packages/xorg-driver/xf86-video-intel-dri2_git.bb
-27
View File
@@ -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"
meta/packages/xorg-driver/xf86-video-intel_2.6.0.bb → meta/packages/xorg-driver/xf86-video-intel_2.7.0.bb
View File
meta/packages/xorg-lib/libice_1.0.4.bb
+2
View File
@@ -7,3 +7,5 @@ PR = "r1"
PE = "1"
XORG_PN = "libICE"
BBCLASSEXTEND = "native"
meta/packages/xorg-lib/libsm_1.1.0.bb
+2
View File
@@ -6,3 +6,5 @@ PR = "r1"
PE = "1"
XORG_PN = "libSM"
BBCLASSEXTEND = "native"
meta/packages/xorg-lib/libxt_1.0.5.bb
+2
View File
@@ -8,6 +8,8 @@ PE = "1"
XORG_PN = "libXt"
BBCLASSEXTEND = "native"
EXTRA_OECONF += "--disable-install-makestrs --disable-xkb"
do_compile() {
meta/packages/xorg-xserver/xserver-xf86-dri-lite.inc
+1 -1
View File
@@ -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}"