summaryrefslogtreecommitdiffstats
path: root/meta-moblin/conf
diff options
context:
space:
mode:
Diffstat (limited to 'meta-moblin/conf')
-rw-r--r--meta-moblin/conf/distro/include/moblin-fixed-revisions.inc29
-rw-r--r--meta-moblin/conf/distro/include/moblin-floating-revisions.inc40
2 files changed, 51 insertions, 18 deletions
diff --git a/meta-moblin/conf/distro/include/moblin-fixed-revisions.inc b/meta-moblin/conf/distro/include/moblin-fixed-revisions.inc
index 7f4f2b00bb..d0e4751706 100644
--- a/meta-moblin/conf/distro/include/moblin-fixed-revisions.inc
+++ b/meta-moblin/conf/distro/include/moblin-fixed-revisions.inc
@@ -19,9 +19,26 @@ PREFERRED_VERSION_libx11-trim ?= "1.2.1"
19PREFERRED_VERSION_libdrm ?= "" 19PREFERRED_VERSION_libdrm ?= ""
20PREFERRED_VERSION_xf86-input-keyboard ?= "" 20PREFERRED_VERSION_xf86-input-keyboard ?= ""
21PREFERRED_VERSION_dri2proto ?= "" 21PREFERRED_VERSION_dri2proto ?= ""
22
23
24PREFERRED_VERSION_anerley ?= "0.1.7"
25PREFERRED_VERSION_bickley ?= "0.4"
26PREFERRED_VERSION_bisho ?= "0.17.1"
27PREFERRED_VERSION_bognor-regis ?= "0.5.0"
22PREFERRED_VERSION_carrick ?= "1.1.13" 28PREFERRED_VERSION_carrick ?= "1.1.13"
29PREFERRED_VERSION_dalston ?= "0.1.12"
30PREFERRED_VERSION_gupnp-av ?= "0.4"
31PREFERRED_VERSION_hornsey ?= "1.0"
32PREFERRED_VERSION_mojito ?= "0.21.7"
23PREFERRED_VERSION_nbtk ?= "1.2.3" 33PREFERRED_VERSION_nbtk ?= "1.2.3"
24 34PREFERRED_VERSION_moblin-panel-applications ?= "0.1.2"
35PREFERRED_VERSION_moblin-panel-media ?= "0.0.7"
36PREFERRED_VERSION_moblin-panel-myzone ?= "0.0.12"
37PREFERRED_VERSION_moblin-panel-pasteboard ?= "0.0.2"
38PREFERRED_VERSION_moblin-panel-people ?= "0.0.9"
39PREFERRED_VERSION_moblin-panel-status ?= "0.0.9"
40PREFERRED_VERSION_mutter ?= "2.28.1"
41PREFERRED_VERSION_mutter-moblin ?= "0.43.8"
25 42
26SRCREV_pn-libdrm ?= "3f3c5be6f908272199ccf53f108b1124bfe0a00e" 43SRCREV_pn-libdrm ?= "3f3c5be6f908272199ccf53f108b1124bfe0a00e"
27SRCREV_pn-xf86-input-keyboard ?= "3e28d68b50d291938734e9684b8296ca864f3892" 44SRCREV_pn-xf86-input-keyboard ?= "3e28d68b50d291938734e9684b8296ca864f3892"
@@ -38,7 +55,7 @@ SRCREV_pn-clutter-box2d ?= "2bcf5b836548dc4909e13b8ae7f60dc64c93d559"
38SRCREV_pn-clutter-gst ?= "db9bcf9d6f3a7d0f34747bed0f3ab28d7eb8f6ab" 55SRCREV_pn-clutter-gst ?= "db9bcf9d6f3a7d0f34747bed0f3ab28d7eb8f6ab"
39SRCREV_pn-clutter-gtk ?= "5dfc07761adf3ab3d1c9ee97b92bc4a65473db36" 56SRCREV_pn-clutter-gtk ?= "5dfc07761adf3ab3d1c9ee97b92bc4a65473db36"
40SRCREV_pn-clutter-imcontext ?= "2cb6f0ff153db639a489e58e36802e0e928b1968" 57SRCREV_pn-clutter-imcontext ?= "2cb6f0ff153db639a489e58e36802e0e928b1968"
41SRCREV_pn-clutter-mozembed ?= "5a5329425aec7fe7749e97fd8c430457259f6165" 58SRCREV_pn-clutter-mozembed ?= "738d017beb5579b2ff6e4d992d4889b61c974751"
42SRCREV_pn-connman ?= "fd401dcd103a309e22c00d66f5c91375bfc9cce4" 59SRCREV_pn-connman ?= "fd401dcd103a309e22c00d66f5c91375bfc9cce4"
43SRCREV_pn-connman-gnome ?= "4e38b3885654ee9256416e985b7fc615d18462b9" 60SRCREV_pn-connman-gnome ?= "4e38b3885654ee9256416e985b7fc615d18462b9"
44SRCREV_pn-contacts ?= "c8e6b16222d5bc9d8f60ae6594af4933613a4e25" 61SRCREV_pn-contacts ?= "c8e6b16222d5bc9d8f60ae6594af4933613a4e25"
@@ -48,7 +65,7 @@ SRCREV_pn-gconnman ?= "3d951640146d08249e0219cbae6a4c2da787a878"
48SRCREV_pn-hornsey ?= "39cb0cd0ee3526cba27aeebcc3e28dee6add136a" 65SRCREV_pn-hornsey ?= "39cb0cd0ee3526cba27aeebcc3e28dee6add136a"
49SRCREV_pn-json-glib ?= "7411cadc0fdd9ffc2bd7004c9980913ac857a495" 66SRCREV_pn-json-glib ?= "7411cadc0fdd9ffc2bd7004c9980913ac857a495"
50SRCREV_pn-libccss ?= "62697eb84fe190f9b8c65fcbaae10ec3d9edfffd" 67SRCREV_pn-libccss ?= "62697eb84fe190f9b8c65fcbaae10ec3d9edfffd"
51SRCREV_pn-librest ?= "ff4561e2a8c38f49127f6e3b2ce7c238a29e1571" 68SRCREV_pn-librest ?= "fe5048c92199afc9a7e9aef0add7f0e2b004bb47"
52SRCREV_pn-libsynthesis ?= "70f0065aa3b085bdf059830f95e5b5766eecb0bb" 69SRCREV_pn-libsynthesis ?= "70f0065aa3b085bdf059830f95e5b5766eecb0bb"
53SRCREV_pn-mobile-broadband-provider-info ?= "35ef359c591cccd99380225fa431855b16a12edc" 70SRCREV_pn-mobile-broadband-provider-info ?= "35ef359c591cccd99380225fa431855b16a12edc"
54SRCREV_pn-moblin-app-installer ?= "7f7d50079c8bcc63874fd60a61f23d849e025445" 71SRCREV_pn-moblin-app-installer ?= "7f7d50079c8bcc63874fd60a61f23d849e025445"
@@ -63,10 +80,10 @@ SRCREV_pn-moblin-panel-myzone ?= "54d9bee3a40a7700a69582a76aba89e213410046"
63SRCREV_pn-moblin-panel-pasteboard ?= "44411a4516e6ae22767662430fa37ed6a7d27a15" 80SRCREV_pn-moblin-panel-pasteboard ?= "44411a4516e6ae22767662430fa37ed6a7d27a15"
64SRCREV_pn-moblin-panel-people ?= "0766282d120587919718b3bcb91553af1a1a00da" 81SRCREV_pn-moblin-panel-people ?= "0766282d120587919718b3bcb91553af1a1a00da"
65SRCREV_pn-moblin-panel-status ?= "fb10eaf16bbd064c12587ec8c734abe72a9841d3" 82SRCREV_pn-moblin-panel-status ?= "fb10eaf16bbd064c12587ec8c734abe72a9841d3"
66SRCREV_pn-moblin-web-browser ?= "a3ea71159bef93dc03762195bd5404a51db5e4a6" 83SRCREV_pn-moblin-web-browser ?= "78ddd155cc297811720e4c4835d468ac6c4d9666"
67SRCREV_pn-mojito ?= "cfad50252a4ad60f28b12d21e2fdb35db56984f5" 84SRCREV_pn-mojito ?= "cfad50252a4ad60f28b12d21e2fdb35db56984f5"
68SRCREV_pn-mozilla-headless ?= "1a622cb7c384" 85SRCREV_pn-mozilla-headless ?= "177d8b8bda61"
69SRCREV_pn-mozilla-headless-services ?= "9091da493c679c546ec7312b653e63f9701d5c8f" 86SRCREV_pn-mozilla-headless-services ?= "c679b95dd8c2807b70186d233b3833861a499315"
70SRCREV_pn-mutter ?= "c96345dd81176f171c2d15dd9d5c5b20f334f842" 87SRCREV_pn-mutter ?= "c96345dd81176f171c2d15dd9d5c5b20f334f842"
71SRCREV_pn-mutter-moblin ?= "7a23e0d63cc31c12dab9de517de04b0ecf41b28a" 88SRCREV_pn-mutter-moblin ?= "7a23e0d63cc31c12dab9de517de04b0ecf41b28a"
72SRCREV_pn-mux ?= "72460e890dbb15edbf7dc193116be0dcf9794a8b" 89SRCREV_pn-mux ?= "72460e890dbb15edbf7dc193116be0dcf9794a8b"
diff --git a/meta-moblin/conf/distro/include/moblin-floating-revisions.inc b/meta-moblin/conf/distro/include/moblin-floating-revisions.inc
index 999e0d1dfa..4594d48bac 100644
--- a/meta-moblin/conf/distro/include/moblin-floating-revisions.inc
+++ b/meta-moblin/conf/distro/include/moblin-floating-revisions.inc
@@ -5,9 +5,13 @@ SRCREV_pn-bisho ?= "7b97cf8a9e2ef228be71e549e622df5d59869b39"
5 5
6SRCREV_pn-ashford ?= "${AUTOREV}" 6SRCREV_pn-ashford ?= "${AUTOREV}"
7SRCREV_pn-anerley ?= "${AUTOREV}" 7SRCREV_pn-anerley ?= "${AUTOREV}"
8PREFERRED_VERSION_anerley ?= "0.1.7+git%"
8SRCREV_pn-bickley ?= "${AUTOREV}" 9SRCREV_pn-bickley ?= "${AUTOREV}"
10PREFERRED_VERSION_bickley ?= "0.4+git%"
9SRCREV_pn-bisho ?= "${AUTOREV}" 11SRCREV_pn-bisho ?= "${AUTOREV}"
12PREFERRED_VERSION_bisho ?= "0.17.1+git%"
10SRCREV_pn-bognor-regis ?= "${AUTOREV}" 13SRCREV_pn-bognor-regis ?= "${AUTOREV}"
14PREFERRED_VERSION_bognor-regis ?= "0.5.0+git%"
11SRCREV_pn-carrick ?= "${AUTOREV}" 15SRCREV_pn-carrick ?= "${AUTOREV}"
12PREFERRED_VERSION_carrick ?= "1.2.0+git%" 16PREFERRED_VERSION_carrick ?= "1.2.0+git%"
13SRCREV_pn-clutter ?= "${AUTOREV}" 17SRCREV_pn-clutter ?= "${AUTOREV}"
@@ -20,9 +24,12 @@ SRCREV_pn-connman ?= "${AUTOREV}"
20SRCREV_pn-connman-gnome ?= "${AUTOREV}" 24SRCREV_pn-connman-gnome ?= "${AUTOREV}"
21SRCREV_pn-contacts ?= "${AUTOREV}" 25SRCREV_pn-contacts ?= "${AUTOREV}"
22SRCREV_pn-dalston ?= "${AUTOREV}" 26SRCREV_pn-dalston ?= "${AUTOREV}"
27PREFERRED_VERSION_dalston ?= "0.1.12+git%"
23SRCREV_pn-dates ?= "${AUTOREV}" 28SRCREV_pn-dates ?= "${AUTOREV}"
24SRCREV_pn-gconnman ?= "${AUTOREV}" 29SRCREV_pn-gconnman ?= "${AUTOREV}"
30PREFERRED_VERSION_gupnp-av ?= "0.5.2"
25SRCREV_pn-hornsey ?= "${AUTOREV}" 31SRCREV_pn-hornsey ?= "${AUTOREV}"
32PREFERRED_VERSION_hornsey ?= "1.0+git%"
26SRCREV_pn-json-glib ?= "${AUTOREV}" 33SRCREV_pn-json-glib ?= "${AUTOREV}"
27SRCREV_pn-libccss ?= "${AUTOREV}" 34SRCREV_pn-libccss ?= "${AUTOREV}"
28SRCREV_pn-librest ?= "${AUTOREV}" 35SRCREV_pn-librest ?= "${AUTOREV}"
@@ -36,16 +43,25 @@ SRCREV_pn-moblin-web-browser ?= "${AUTOREV}"
36SRCREV_pn-moblin-icon-theme ?= "${AUTOREV}" 43SRCREV_pn-moblin-icon-theme ?= "${AUTOREV}"
37SRCREV_pn-moblin-user-skel ?= "${AUTOREV}" 44SRCREV_pn-moblin-user-skel ?= "${AUTOREV}"
38SRCREV_pn-moblin-panel-applications ?= "${AUTOREV}" 45SRCREV_pn-moblin-panel-applications ?= "${AUTOREV}"
46PREFERRED_VERSION_moblin-panel-applications ?= "0.1.2+git%"
39SRCREV_pn-moblin-panel-media ?= "${AUTOREV}" 47SRCREV_pn-moblin-panel-media ?= "${AUTOREV}"
48PREFERRED_VERSION_moblin-panel-media ?= "0.0.7+git%"
40SRCREV_pn-moblin-panel-myzone ?= "${AUTOREV}" 49SRCREV_pn-moblin-panel-myzone ?= "${AUTOREV}"
50PREFERRED_VERSION_moblin-panel-myzone ?= "0.0.12+git%"
41SRCREV_pn-moblin-panel-pasteboard ?= "${AUTOREV}" 51SRCREV_pn-moblin-panel-pasteboard ?= "${AUTOREV}"
52PREFERRED_VERSION_moblin-panel-pasteboard ?= "0.0.2+git%"
42SRCREV_pn-moblin-panel-people ?= "${AUTOREV}" 53SRCREV_pn-moblin-panel-people ?= "${AUTOREV}"
54PREFERRED_VERSION_moblin-panel-people ?= "0.0.9+git%"
43SRCREV_pn-moblin-panel-status ?= "${AUTOREV}" 55SRCREV_pn-moblin-panel-status ?= "${AUTOREV}"
56PREFERRED_VERSION_moblin-panel-status ?= "0.0.9+git%"
44SRCREV_pn-mojito ?= "${AUTOREV}" 57SRCREV_pn-mojito ?= "${AUTOREV}"
58PREFERRED_VERSION_mojito ?= "0.21.7+git%"
45SRCREV_pn-mozilla-headless ?= "${AUTOREV}" 59SRCREV_pn-mozilla-headless ?= "${AUTOREV}"
46SRCREV_pn-mozilla-headless-services ?= "${AUTOREV}" 60SRCREV_pn-mozilla-headless-services ?= "${AUTOREV}"
47SRCREV_pn-mutter ?= "${AUTOREV}" 61SRCREV_pn-mutter ?= "${AUTOREV}"
62PREFERRED_VERSION_mutter ?= "2.28.1+git%"
48SRCREV_pn-mutter-moblin ?= "${AUTOREV}" 63SRCREV_pn-mutter-moblin ?= "${AUTOREV}"
64PREFERRED_VERSION_mutter-moblin ?= "0.43.8+git%"
49SRCREV_pn-mux ?= "${AUTOREV}" 65SRCREV_pn-mux ?= "${AUTOREV}"
50SRCREV_pn-nbtk ?= "${AUTOREV}" 66SRCREV_pn-nbtk ?= "${AUTOREV}"
51PREFERRED_VERSION_nbtk ?= "1.2.3+git% 67PREFERRED_VERSION_nbtk ?= "1.2.3+git%
@@ -57,20 +73,20 @@ SRCREV_pn-tasks ?= "${AUTOREV}"
57SRCREV_pn-twitter-glib ?= "${AUTOREV}" 73SRCREV_pn-twitter-glib ?= "${AUTOREV}"
58SRCREV_pn-xf86-video-gma500 ?= "${AUTOREV}" 74SRCREV_pn-xf86-video-gma500 ?= "${AUTOREV}"
59 75
60PREFERRED_VERSION_mesa-dri ?= "" 76SRCREV_pn-libdrm ?= "${AUTOREV}"
61PREFERRED_VERSION_xf86-video-intel ?= "" 77PREFERRED_VERSION_libdrm ?= "2.4.7+git%"
62PREFERRED_VERSION_xserver-xf86-dri-lite ?= "" 78SRCREV_pn-mesa-dri ?= "${AUTOREV}"
63PREFERRED_VERSION_libdrm ?= "" 79PREFERRED_VERSION_mesa-dri ?= "7.5+git%"
64PREFERRED_VERSION_xf86-input-keyboard ?= ""
65PREFERRED_VERSION_dri2proto ?= ""
66PREFERRED_VERSION_libx11-trim ?= ""
67PREFERRED_VERSION_libxcb ?= "1.3"
68PREFERRED_VERSION_xcb-proto ?= "1.5"
69
70SRCREV_pn-xf86-video-intel ?= "${AUTOREV}" 80SRCREV_pn-xf86-video-intel ?= "${AUTOREV}"
81PREFERRED_VERSION_xf86-video-intel ?= "2.7.1+git%"
71SRCREV_pn-xserver-xf86-dri-lite ?= "${AUTOREV}" 82SRCREV_pn-xserver-xf86-dri-lite ?= "${AUTOREV}"
72SRCREV_pn-mesa-dri ?= "${AUTOREV}" 83PREFERRED_VERSION_xserver-xf86-dri-lite ?= "1.6+git%"
73SRCREV_pn-libdrm ?= "${AUTOREV}"
74SRCREV_pn-xf86-input-keyboard ?= "${AUTOREV}" 84SRCREV_pn-xf86-input-keyboard ?= "${AUTOREV}"
85PREFERRED_VERSION_xf86-input-keyboard ?= "1.3.2+git%"
75SRCREV_pn-dri2proto ?= "${AUTOREV}" 86SRCREV_pn-dri2proto ?= "${AUTOREV}"
87PREFERRED_VERSION_dri2proto ?= "1.99.3+git%"
76SRCREV_pn-libx11-trim ?= "${AUTOREV}" 88SRCREV_pn-libx11-trim ?= "${AUTOREV}"
89PREFERRED_VERSION_libx11-trim ?= "1.2.1+git%"
90
91PREFERRED_VERSION_libxcb ?= "1.3"
92PREFERRED_VERSION_xcb-proto ?= "1.5"