summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--meta-moblin/conf/distro/include/moblin-fixed-revisions.inc4
-rw-r--r--meta-moblin/packages/bickley/bickley.inc2
-rw-r--r--meta-moblin/packages/hornsey/Makefile.am662
-rw-r--r--meta-moblin/packages/hornsey/hornsey.inc2
-rw-r--r--meta-moblin/packages/moblin-web-browser/moblin-web-browser_git.bb2
-rw-r--r--meta/conf/distro/include/poky-fixed-revisions.inc6
-rw-r--r--meta/packages/clutter/clutter-gst-0.10_git.bb14
-rw-r--r--meta/packages/clutter/clutter-gst-1.0_git.bb14
-rw-r--r--meta/packages/clutter/clutter-gst_git.bb15
-rw-r--r--meta/packages/clutter/clutter-gtk-0.10_git.bb12
-rw-r--r--meta/packages/clutter/clutter-gtk-1.0_git.bb (renamed from meta/packages/clutter/clutter-gtk_git.bb)4
11 files changed, 713 insertions, 24 deletions
diff --git a/meta-moblin/conf/distro/include/moblin-fixed-revisions.inc b/meta-moblin/conf/distro/include/moblin-fixed-revisions.inc
index adb3a8ef96..b1488185e0 100644
--- a/meta-moblin/conf/distro/include/moblin-fixed-revisions.inc
+++ b/meta-moblin/conf/distro/include/moblin-fixed-revisions.inc
@@ -52,8 +52,8 @@ SRCREV_pn-carrick ?= "9bd8f987b27d95694b1e63efe198b2dffbd4c5b0"
52SRCREV_pn-clutter ?= "e957e277b8a4893ce8c99e94402036d42a8b3748" 52SRCREV_pn-clutter ?= "e957e277b8a4893ce8c99e94402036d42a8b3748"
53SRCREV_pn-clutter-1.0 ?= "ce5025d0a2b701541ca9343686f9dac858905da4" 53SRCREV_pn-clutter-1.0 ?= "ce5025d0a2b701541ca9343686f9dac858905da4"
54SRCREV_pn-clutter-box2d ?= "2bcf5b836548dc4909e13b8ae7f60dc64c93d559" 54SRCREV_pn-clutter-box2d ?= "2bcf5b836548dc4909e13b8ae7f60dc64c93d559"
55SRCREV_pn-clutter-gst ?= "db9bcf9d6f3a7d0f34747bed0f3ab28d7eb8f6ab" 55SRCREV_pn-clutter-gst-0.10 ?= "78e853ac3269c13b8d798ebca1c4748d066a966e"
56SRCREV_pn-clutter-gtk ?= "5dfc07761adf3ab3d1c9ee97b92bc4a65473db36" 56SRCREV_pn-clutter-gtk-0.10 ?= "b92329c4c1288019e2dea6567e2b5e98eb0a9992"
57SRCREV_pn-clutter-imcontext ?= "2cb6f0ff153db639a489e58e36802e0e928b1968" 57SRCREV_pn-clutter-imcontext ?= "2cb6f0ff153db639a489e58e36802e0e928b1968"
58SRCREV_pn-clutter-mozembed ?= "738d017beb5579b2ff6e4d992d4889b61c974751" 58SRCREV_pn-clutter-mozembed ?= "738d017beb5579b2ff6e4d992d4889b61c974751"
59SRCREV_pn-connman ?= "fd401dcd103a309e22c00d66f5c91375bfc9cce4" 59SRCREV_pn-connman ?= "fd401dcd103a309e22c00d66f5c91375bfc9cce4"
diff --git a/meta-moblin/packages/bickley/bickley.inc b/meta-moblin/packages/bickley/bickley.inc
index 423b53544b..ada7e8a162 100644
--- a/meta-moblin/packages/bickley/bickley.inc
+++ b/meta-moblin/packages/bickley/bickley.inc
@@ -1,7 +1,7 @@
1DESCRIPTION = "A meta data manager API and framework (including Media)" 1DESCRIPTION = "A meta data manager API and framework (including Media)"
2SRC_URI = "http://download.moblin.org/sources/bickley/0.4/bickley-0.4_20091124.tar.bz2" 2SRC_URI = "http://download.moblin.org/sources/bickley/0.4/bickley-0.4_20091124.tar.bz2"
3 3
4DEPENDS = "gtk+ dbus-glib clutter-gst libexif taglib gupnp gupnp-av samba" 4DEPENDS = "gtk+ dbus-glib clutter-gst-0.10 libexif taglib gupnp gupnp-av samba"
5RDEPENDS = "xdg-user-dirs" 5RDEPENDS = "xdg-user-dirs"
6 6
7FILES_${PN} =+ "${datadir}/dbus-1/services/" 7FILES_${PN} =+ "${datadir}/dbus-1/services/"
diff --git a/meta-moblin/packages/hornsey/Makefile.am b/meta-moblin/packages/hornsey/Makefile.am
new file mode 100644
index 0000000000..bce92c4060
--- /dev/null
+++ b/meta-moblin/packages/hornsey/Makefile.am
@@ -0,0 +1,662 @@
1## Process this file with automake to create Makefile.in.
2
3# We set GPATH here; this gives us semantics for GNU make
4# which are more like other make's VPATH.
5GPATH = $(srcdir)
6
7if HAVE_FREETYPE
8OPENTYPE_SUBDIR=opentype
9endif
10
11EXTRA_DIST =
12BUILT_GIRSOURCES =
13
14FRIBIDI_SUBDIR=mini-fribidi
15
16SUBDIRS = $(OPENTYPE_SUBDIR) $(FRIBIDI_SUBDIR)
17
18DIST_SUBDIRS = mini-fribidi opentype
19
20INCLUDES = \
21 -DG_LOG_DOMAIN=\"Pango\" \
22 -DPANGO_ENABLE_BACKEND \
23 -DPANGO_ENABLE_ENGINE \
24 -DSYSCONFDIR=\"$(sysconfdir)\" \
25 -DLIBDIR=\"$(libdir)\" \
26 -I$(top_srcdir) \
27 $(PANGO_DEBUG_FLAGS) \
28 $(GLIB_CFLAGS) \
29 $(XFT_CFLAGS) \
30 $(CAIRO_CFLAGS) \
31 $(FREETYPE_CFLAGS) \
32 $(X_CFLAGS)
33
34BUILT_SOURCES = pango-enum-types.h pango-enum-types.c pango-features.h
35
36pangoincludedir=$(includedir)/pango-1.0/pango
37
38if OS_WIN32
39else
40libm = -lm
41endif
42
43# ------------------- libpango -------------------
44
45lib_LTLIBRARIES = libpango-1.0.la
46BUILT_GIRSOURCES += Pango-1.0.gir
47
48libpango_1_0_la_LDFLAGS = $(LIBRARY_LIBTOOL_OPTIONS)
49libpango_1_0_la_LIBADD = \
50 $(GLIB_LIBS) \
51 $(libm) \
52 $(INCLUDED_LANG_MODULES)
53libpango_1_0_la_DEPENDENCIES = \
54 $(INCLUDED_LANG_MODULES)
55
56libpango_1_0_la_LIBADD += mini-fribidi/libmini-fribidi.la
57libpango_1_0_la_DEPENDENCIES += mini-fribidi/libmini-fribidi.la
58
59if PLATFORM_WIN32
60libpango_1_0_la_LDFLAGS += -export-symbols $(srcdir)/pango.def -Wl,pango-win32-res.o
61libpango_1_0_la_DEPENDENCIES += pango-win32-res.o pango.def
62endif
63pango-win32-res.o: pango.rc
64 $(AM_V_GEN) $(WINDRES) $< $@
65
66libpango_1_0_la_SOURCES = \
67 break.c \
68 ellipsize.c \
69 fonts.c \
70 glyphstring.c \
71 modules.c \
72 pango-attributes.c \
73 pango-bidi-type.c \
74 pango-color.c \
75 pango-color-table.h \
76 pango-context.c \
77 pango-coverage.c \
78 pango-engine.c \
79 pango-engine-private.h \
80 pango-fontmap.c \
81 pango-fontset.c \
82 pango-glyph-item.c \
83 pango-gravity.c \
84 pango-impl-utils.h \
85 pango-item.c \
86 pango-language.c \
87 pango-language-sample-table.h \
88 pango-layout.c \
89 pango-layout-private.h \
90 pango-markup.c \
91 pango-matrix.c \
92 pango-renderer.c \
93 pango-script.c \
94 pango-script-lang-table.h \
95 pango-script-private.h \
96 pango-tabs.c \
97 pango-utils.c \
98 reorder-items.c \
99 shape.c \
100 pango-enum-types.c \
101 module-defs-lang.c
102
103pango_headers = \
104 pango.h \
105 pango-attributes.h \
106 pango-bidi-type.h \
107 pango-break.h \
108 pango-context.h \
109 pango-coverage.h \
110 pango-engine.h \
111 pango-font.h \
112 pango-fontmap.h \
113 pango-fontset.h \
114 pango-glyph.h \
115 pango-glyph-item.h \
116 pango-gravity.h \
117 pango-item.h \
118 pango-language.h \
119 pango-layout.h \
120 pango-matrix.h \
121 pango-modules.h \
122 pango-renderer.h \
123 pango-script.h \
124 pango-tabs.h \
125 pango-types.h \
126 pango-utils.h
127
128pangoinclude_HEADERS = \
129 $(pango_headers) \
130 pango-features.h \
131 pango-enum-types.h
132
133pango-enum-types.h: s-enum-types-h
134 $(AM_V_GEN) true
135s-enum-types-h: @REBUILD@ $(pango_headers) Makefile
136 $(AM_V_GEN) ( cd $(srcdir) && glib-mkenums \
137 --fhead "#ifndef __PANGO_ENUM_TYPES_H__\n#define __PANGO_ENUM_TYPES_H__\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n" \
138 --fprod "/* enumerations from \"@filename@\" */\n" \
139 --vhead "GType @enum_name@_get_type (void);\n#define @ENUMPREFIX@_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n" \
140 --ftail "G_END_DECLS\n\n#endif /* __PANGO_ENUM_TYPES_H__ */" \
141 $(pango_headers) ) > tmp-pango-enum-types.h \
142 && (cmp -s tmp-pango-enum-types.h pango-enum-types.h || cp tmp-pango-enum-types.h pango-enum-types.h ) \
143 && rm -f tmp-pango-enum-types.h \
144 && echo timestamp > $(@F)
145
146pango-enum-types.c: s-enum-types-c
147 $(AM_V_GEN) true
148s-enum-types-c: @REBUILD@ $(pango_headers) Makefile
149 $(AM_V_GEN) ( cd $(srcdir) && glib-mkenums \
150 --fhead "#include <pango.h>" \
151 --fprod "\n/* enumerations from \"@filename@\" */" \
152 --vhead "GType\n@enum_name@_get_type (void)\n{\n static GType etype = 0;\n if (etype == 0) {\n static const G@Type@Value values[] = {" \
153 --vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
154 --vtail " { 0, NULL, NULL }\n };\n etype = g_@type@_register_static (g_intern_static_string (\"@EnumName@\"), values);\n }\n return etype;\n}\n" \
155 $(pango_headers) ) > tmp-pango-enum-types.c \
156 && (cmp -s tmp-pango-enum-types.c pango-enum-types.c || cp tmp-pango-enum-types.c pango-enum-types.c ) \
157 && rm -f tmp-pango-enum-types.c \
158 && echo timestamp > $(@F)
159
160pango-features.h:
161 $(AM_V_GEN) cd $(top_builddir) && ./config.status pango/pango-features.h
162
163Pango-1.0.gir: $(libpango_1_0_la_SOURCES)
164Pango-1.0.gir: $(pango_headers)
165Pango-1.0.gir: libpango-1.0.la
166Pango-1.0.gir: $(G_IR_SCANNER) Makefile
167 $(AM_V_GEN) $(G_IR_SCANNER) -v --namespace Pango --nsversion=1.0 \
168 --add-include-path=$(srcdir) --add-include-path=. \
169 --include=GObject-2.0 \
170 --include=cairo-1.0 \
171 --library=libpango-1.0.la \
172 --libtool="$(LIBTOOL)" \
173 --output $@ \
174 --pkg gobject-2.0 \
175 --pkg cairo \
176 --pkg freetype2 \
177 -I$(top_srcdir) \
178 $(PANGO_CFLAGS) \
179 $(libpango_1_0_la_SOURCES) \
180 $(pango_headers) \
181 pango-enum-types.h
182
183# ------------------- libpangox -------------------
184
185if HAVE_X
186pangoinclude_HEADERS += $(pangox_headers)
187lib_LTLIBRARIES += libpangox-1.0.la
188aliasdir = $(sysconfdir)/pango
189alias_DATA = pangox.aliases
190endif
191
192pangox_headers = pangox.h
193pangox_public_sources = pangox.c
194
195libpangox_1_0_la_LDFLAGS = $(LIBRARY_LIBTOOL_OPTIONS)
196libpangox_1_0_la_LIBADD = \
197 libpango-$(PANGO_API_VERSION).la \
198 $(INCLUDED_X_MODULES) \
199 $(GLIB_LIBS) \
200 $(X_LIBS) \
201 $(X_EXTRA_LIBS)
202libpangox_1_0_la_DEPENDENCIES = \
203 libpango-$(PANGO_API_VERSION).la \
204 $(INCLUDED_X_MODULES)
205
206if PLATFORM_WIN32
207libpangox_1_0_la_LDFLAGS += -export-symbols $(srcdir)/pangox.def -Wl,pangox-win32-res.o
208libpangox_1_0_la_DEPENDENCIES += pangox-win32-res.o pangox.def
209endif
210
211pangox-win32-res.o: pangox.rc
212 $(WINDRES) $< $@
213
214libpangox_1_0_la_SOURCES = \
215 $(pangox_public_sources) \
216 modules.h \
217 module-defs-x.c \
218 pangox-private.h \
219 pangox-fontcache.c \
220 pangox-fontmap.c
221
222# ------------------- libpangoft2 -------------------
223
224if HAVE_FREETYPE
225pangoinclude_HEADERS += $(pangoft2_headers)
226lib_LTLIBRARIES += libpangoft2-1.0.la
227BUILT_GIRSOURCES += PangoFT2-1.0.gir
228endif
229
230pangoft2_headers = \
231 pango-ot.h \
232 pangofc-font.h \
233 pangofc-fontmap.h \
234 pangofc-decoder.h \
235 pangoft2.h
236
237pangoft2_public_sources = \
238 pangofc-font.c \
239 pangofc-fontmap.c \
240 pangofc-decoder.c \
241 pangoft2.c
242
243libpangoft2_1_0_la_LDFLAGS = $(LIBRARY_LIBTOOL_OPTIONS)
244libpangoft2_1_0_la_LIBADD = \
245 opentype/libharfbuzz.la \
246 libpango-$(PANGO_API_VERSION).la \
247 $(INCLUDED_FC_MODULES) \
248 $(GLIB_LIBS) \
249 $(FREETYPE_LIBS) \
250 $(libm)
251libpangoft2_1_0_la_DEPENDENCIES = \
252 opentype/libharfbuzz.la \
253 libpango-$(PANGO_API_VERSION).la \
254 $(INCLUDED_FC_MODULES)
255libpangoft2_1_0_la_SOURCES = \
256 $(pangoft2_public_sources) \
257 modules.h \
258 module-defs-fc.c \
259 pangofc-private.h \
260 pangoft2.h \
261 pangoft2-private.h \
262 pangoft2-fontmap.c \
263 pangoft2-render.c \
264 pango-ot-private.h \
265 pango-ot-buffer.c \
266 pango-ot-info.c \
267 pango-ot-ruleset.c \
268 pango-ot-tag.c
269
270
271if PLATFORM_WIN32
272libpangoft2_1_0_la_LDFLAGS += -export-symbols $(srcdir)/pangoft2.def -Wl,pangoft2-win32-res.o
273libpangoft2_1_0_la_DEPENDENCIES += pangoft2-win32-res.o pangoft2.def
274endif
275pangoft2-win32-res.o: pangoft2.rc
276 $(AM_V_GEN) $(WINDRES) $< $@
277
278PangoFT2-1.0.gir: $(pangoft2_headers)
279PangoFT2-1.0.gir: $(libpangoft2_1_0_la_SOURCES)
280PangoFT2-1.0.gir: libpangoft2-1.0.la
281PangoFT2-1.0.gir: Pango-1.0.gir $(G_IR_SCANNER) Makefile
282 $(AM_V_GEN) $(G_IR_SCANNER) -v --namespace PangoFT2 --nsversion=1.0 \
283 --add-include-path=$(srcdir) --add-include-path=. \
284 --include=GObject-2.0 \
285 --include=Pango-1.0 \
286 --include=freetype2-2.0 \
287 --include=fontconfig-2.0 \
288 --library=libpangoft2-1.0.la \
289 --libtool="$(LIBTOOL)" \
290 --output $@ \
291 --pkg gobject-2.0 \
292 --pkg freetype2 \
293 --pkg pangoft2 \
294 -I$(top_srcdir) \
295 $(pangoft2_headers) \
296 $(pangoft2_public_sources)
297
298# ------------------- libpangoxft -------------------
299
300if HAVE_XFT
301pangoinclude_HEADERS += $(pangoxft_headers)
302lib_LTLIBRARIES += libpangoxft-1.0.la
303BUILT_GIRSOURCES += PangoXft-1.0.gir
304endif
305
306pangoxft_headers = pangoxft.h pangoxft-render.h
307
308libpangoxft_1_0_la_LDFLAGS = $(LIBRARY_LIBTOOL_OPTIONS)
309libpangoxft_1_0_la_LIBADD = \
310 libpangoft2-$(PANGO_API_VERSION).la \
311 libpango-$(PANGO_API_VERSION).la \
312 $(GLIB_LIBS) \
313 $(X_LIBS) \
314 $(XFT_LIBS) \
315 $(FREETYPE_LIBS) \
316 $(libm)
317libpangoxft_1_0_la_DEPENDENCIES = \
318 libpangoft2-$(PANGO_API_VERSION).la \
319 libpango-$(PANGO_API_VERSION).la
320
321if PLATFORM_WIN32
322libpangoxft_1_0_la_LDFLAGS += -export-symbols $(srcdir)/pangoxft.def -Wl,pangoxft-win32-res.o
323libpangoxft_1_0_la_DEPENDENCIES += pangoxft-win32-res.o pangoxft.def
324endif
325pangoxft-win32-res.o: pangoxft.rc
326 $(AM_V_GEN) $(WINDRES) $< $@
327
328libpangoxft_1_0_la_SOURCES = \
329 pangoxft-font.c \
330 pangoxft-fontmap.c \
331 pangoxft-private.h \
332 pangoxft-render.c
333
334
335PangoXft-1.0.gir: $(pangoxft_headers)
336PangoXft-1.0.gir: $(libpangoxft_1_0_la_SOURCES)
337PangoXft-1.0.gir: libpangoxft-1.0.la
338PangoXft-1.0.gir: Pango-1.0.gir PangoFT2-1.0.gir $(G_IR_SCANNER) Makefile
339 $(AM_V_GEN) $(G_IR_SCANNER) -v --namespace PangoXft --nsversion=1.0 \
340 --add-include-path=$(srcdir) --add-include-path=. \
341 --include=GObject-2.0 \
342 --include=xft-2.0 \
343 --include=xlib-2.0 \
344 --include=PangoFT2-1.0 \
345 --library=libpangoxft-1.0.la \
346 --libtool="$(LIBTOOL)" \
347 --output $@ \
348 --pkg gobject-2.0 \
349 --pkg freetype2 \
350 -I$(top_srcdir) \
351 $(PANGO_CFLAGS) \
352 $(pangoxft_headers) \
353 $(libpangoxft_1_0_la_SOURCES)
354
355# ------------------- libpangocairo -------------------
356
357if HAVE_CAIRO
358pangoinclude_HEADERS += $(pangocairo_headers)
359lib_LTLIBRARIES += libpangocairo-1.0.la
360BUILT_GIRSOURCES += PangoCairo-1.0.gir
361endif
362
363pangocairo_headers = pangocairo.h
364
365libpangocairo_1_0_la_LDFLAGS = $(LIBRARY_LIBTOOL_OPTIONS)
366libpangocairo_1_0_la_LIBADD = \
367 libpango-$(PANGO_API_VERSION).la \
368 $(GLIB_LIBS) \
369 $(CAIRO_LIBS) \
370 $(libm)
371libpangocairo_1_0_la_DEPENDENCIES = \
372 libpango-$(PANGO_API_VERSION).la
373libpangocairo_1_0_la_SOURCES = \
374 pangocairo-context.c \
375 pangocairo-font.c \
376 pangocairo-fontmap.c \
377 pangocairo-render.c \
378 pangocairo-private.h
379
380if HAVE_CAIRO_WIN32
381if PLATFORM_WIN32
382libpangocairo_1_0_la_LDFLAGS += -export-symbols $(srcdir)/pangocairo.def
383libpangocairo_1_0_la_DEPENDENCIES += pangocairo.def
384endif
385
386libpangocairo_1_0_la_LIBADD += libpangowin32-$(PANGO_API_VERSION).la $(WIN32_LIBS)
387libpangocairo_1_0_la_DEPENDENCIES += libpangowin32-$(PANGO_API_VERSION).la
388
389libpangocairo_1_0_la_SOURCES += pangocairo-win32font.c pangocairo-win32fontmap.c pangocairo-win32.h
390endif
391
392if HAVE_CAIRO_FREETYPE
393libpangocairo_1_0_la_LIBADD += libpangoft2-$(PANGO_API_VERSION).la $(FREETYPE_LIBS)
394libpangocairo_1_0_la_DEPENDENCIES += libpangoft2-$(PANGO_API_VERSION).la
395PANGOCAIRO_FONT_BACKEND_GI_MODULE = PangoFT2-1.0
396
397libpangocairo_1_0_la_SOURCES += \
398 pangocairo-fcfont.c \
399 pangocairo-fcfontmap.c \
400 pangocairo-fc.h
401endif
402
403if HAVE_CAIRO_ATSUI
404libpangocairo_1_0_la_SOURCES += \
405 modules.h \
406 module-defs-atsui.c \
407 pangoatsui.h \
408 pangoatsui.c \
409 pangoatsui-private.h \
410 pangoatsui-fontmap.c \
411 pangocairo-atsui.h \
412 pangocairo-atsuifont.c \
413 pangocairo-atsuifont.h \
414 pangocairo-atsuifontmap.c
415pangoinclude_HEADERS += pangoatsui.h
416
417libpangocairo_1_0_la_CFLAGS = -xobjective-c
418libpangocairo_1_0_la_LDFLAGS += -framework CoreFoundation -framework Carbon -framework Cocoa
419libpangocairo_1_0_la_LIBADD += $(INCLUDED_ATSUI_MODULES)
420# We don't have an ATSUI GIR right now, so this is just hypothetical
421PANGOCAIRO_FONT_BACKEND_GI_MODULE = PangoATSUI-1.0
422endif
423
424PangoCairo-1.0.gir: $(libpangocairo_1_0_la_SOURCES)
425PangoCairo-1.0.gir: $(pangocairo_headers)
426PangoCairo-1.0.gir: libpangocairo-1.0.la
427PangoCairo-1.0.gir: Pango-1.0.gir $(PANGOCAIRO_FONT_BACKEND_GI_MODULE).gir $(G_IR_SCANNER) Makefile
428 $(AM_V_GEN) $(G_IR_SCANNER) -v --namespace PangoCairo --nsversion=1.0 \
429 --add-include-path=$(srcdir) --add-include-path=. \
430 --include=GObject-2.0 \
431 --include=cairo-1.0 \
432 --include=Pango-1.0 \
433 --add-include-path=. \
434 --include=$(PANGOCAIRO_FONT_BACKEND_GI_MODULE) \
435 --library=libpangocairo-1.0.la \
436 --libtool="$(LIBTOOL)" \
437 --output $@ \
438 --pkg gobject-2.0 \
439 --pkg cairo \
440 -I$(top_srcdir) \
441 $(PANGO_CFLAGS) \
442 $(libpangocairo_1_0_la_SOURCES) \
443 $(pangocairo_headers)
444
445# ------------------- libpangowin32 -------------------
446
447if HAVE_WIN32
448pangoinclude_HEADERS += pangowin32.h
449lib_LTLIBRARIES += libpangowin32-1.0.la
450endif
451
452libpangowin32_1_0_la_LDFLAGS = $(LIBRARY_LIBTOOL_OPTIONS)
453libpangowin32_1_0_la_LIBADD = \
454 libpango-$(PANGO_API_VERSION).la \
455 $(INCLUDED_WIN32_MODULES) \
456 $(GLIB_LIBS) \
457 $(WIN32_LIBS)
458libpangowin32_1_0_la_DEPENDENCIES = \
459 libpango-$(PANGO_API_VERSION).la \
460 $(INCLUDED_WIN32_MODULES)
461libpangowin32_1_0_la_SOURCES = \
462 modules.h \
463 module-defs-win32.c \
464 pangowin32.h \
465 pangowin32.c \
466 pangowin32-private.h \
467 pangowin32-fontcache.c \
468 pangowin32-fontmap.c
469
470if PLATFORM_WIN32
471libpangowin32_1_0_la_LDFLAGS += -export-symbols $(srcdir)/pangowin32.def -Wl,pangowin32-win32-res.o
472libpangowin32_1_0_la_DEPENDENCIES += pangowin32-win32-res.o pangowin32.def
473endif
474pangowin32-win32-res.o: pangowin32.rc
475 $(AM_V_GEN) $(WINDRES) $< $@
476
477
478# ------------------- win32 build stuff -------------------
479
480if OS_WIN32
481install-def-files:
482 $(AM_V_GEN) mkdir -p $(DESTDIR)$(libdir) && \
483 $(INSTALL) $(srcdir)/pango.def $(DESTDIR)$(libdir)/pango-$(PANGO_API_VERSION).def
484if HAVE_FREETYPE
485 $(INSTALL) $(srcdir)/pangoft2.def $(DESTDIR)$(libdir)/pangoft2-$(PANGO_API_VERSION).def
486endif
487 $(INSTALL) $(srcdir)/pangowin32.def $(DESTDIR)$(libdir)/pangowin32-$(PANGO_API_VERSION).def
488 $(INSTALL) $(srcdir)/pangocairo.def $(DESTDIR)$(libdir)/pangocairo-$(PANGO_API_VERSION).def
489if HAVE_X
490 $(INSTALL) $(srcdir)/pangox.def $(DESTDIR)$(libdir)/pangox-$(PANGO_API_VERSION).def
491 $(INSTALL) $(srcdir)/pangoxft.def $(DESTDIR)$(libdir)/pangoxft-$(PANGO_API_VERSION).def
492endif
493uninstall-def-files:
494 -rm $(DESTDIR)$(libdir)/pango$(PANGO_API_VERSION).def
495if HAVE_FREETYPE
496 -rm $(DESTDIR)$(libdir)/pangoft2-$(PANGO_API_VERSION).def
497endif
498 -rm $(DESTDIR)$(libdir)/pangowin32-$(PANGO_API_VERSION).def
499 -rm $(DESTDIR)$(libdir)/pangocairo-$(PANGO_API_VERSION).def
500if HAVE_X
501 -rm $(DESTDIR)$(libdir)/pangox-$(PANGO_API_VERSION).def
502 -rm $(DESTDIR)$(libdir)/pangoxft-$(PANGO_API_VERSION).def
503endif
504else
505install-def-files:
506uninstall-def-files:
507
508endif
509
510if MS_LIB_AVAILABLE
511MS_LIB_FILES = pango-$(PANGO_API_VERSION).lib pangowin32-$(PANGO_API_VERSION).lib pangocairo-$(PANGO_API_VERSION).lib
512
513if HAVE_FREETYPE
514MS_LIB_FILES += pangoft2-$(PANGO_API_VERSION).lib
515endif
516
517noinst_DATA = $(MS_LIB_FILES)
518
519install-ms-lib: $(MS_LIB_FILES)
520 $(INSTALL) pango-$(PANGO_API_VERSION).lib $(DESTDIR)$(libdir)
521if HAVE_FREETYPE
522 $(INSTALL) pangoft2-$(PANGO_API_VERSION).lib $(DESTDIR)$(libdir)
523endif
524 $(INSTALL) pangowin32-$(PANGO_API_VERSION).lib $(DESTDIR)$(libdir)
525 $(INSTALL) pangocairo-$(PANGO_API_VERSION).lib $(DESTDIR)$(libdir)
526
527uninstall-ms-lib:
528 -rm $(DESTDIR)$(libdir)/pango-$(PANGO_API_VERSION).lib
529 -rm $(DESTDIR)$(libdir)/pangoft2-$(PANGO_API_VERSION).lib
530 -rm $(DESTDIR)$(libdir)/pangowin32-$(PANGO_API_VERSION).lib
531 -rm $(DESTDIR)$(libdir)/pangocairo-$(PANGO_API_VERSION).lib
532else
533install-ms-lib:
534uninstall-ms-lib:
535endif
536
537pango-$(PANGO_API_VERSION).lib: libpango-$(PANGO_API_VERSION).la $(srcdir)/pango.def
538 $(AM_V_GEN) lib -machine:$(LIB_EXE_MACHINE_FLAG) -name:libpango-$(PANGO_API_VERSION)-$(PANGO_CURRENT_MINUS_AGE).dll -def:$(srcdir)/pango.def -out:$@
539
540pangoft2-$(PANGO_API_VERSION).lib: libpangoft2-$(PANGO_API_VERSION).la $(srcdir)/pangoft2.def
541 $(AM_V_GEN) lib -machine:$(LIB_EXE_MACHINE_FLAG) -name:libpangoft2-$(PANGO_API_VERSION)-$(PANGO_CURRENT_MINUS_AGE).dll -def:$(srcdir)/pangoft2.def -out:$@
542
543pangowin32-$(PANGO_API_VERSION).lib: libpangowin32-$(PANGO_API_VERSION).la $(srcdir)/pangowin32.def
544 $(AM_V_GEN) lib -machine:$(LIB_EXE_MACHINE_FLAG) -name:libpangowin32-$(PANGO_API_VERSION)-$(PANGO_CURRENT_MINUS_AGE).dll -def:$(srcdir)/pangowin32.def -out:$@
545
546pangocairo-$(PANGO_API_VERSION).lib: libpangocairo-$(PANGO_API_VERSION).la $(srcdir)/pangocairo.def
547 $(AM_V_GEN) lib -machine:$(LIB_EXE_MACHINE_FLAG) -name:libpangocairo-$(PANGO_API_VERSION)-$(PANGO_CURRENT_MINUS_AGE).dll -def:$(srcdir)/pangocairo.def -out:$@
548
549
550# ------------------- introspection -------------------
551
552if HAVE_INTROSPECTION
553
554girdir = $(GIRDIR)
555gir_DATA = $(BUILT_GIRSOURCES)
556
557typelibsdir = $(TYPELIBDIR)
558typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
559
560%.typelib: %.gir $(G_IR_COMPILER)
561 $(AM_V_GEN) LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}. $(G_IR_COMPILER) --includedir=$(srcdir) --includedir=. $(G_IR_COMPILER_OPTS) $< -o $(builddir)/$(@F)
562
563endif # HAVE_INTROSPECTION
564
565# ------------------- pango-querymodules -------------------
566
567bin_PROGRAMS = pango-querymodules
568
569#
570# As a temporary hack, we pull in libpangox here so that we can link
571#
572pango_querymodules_SOURCES = \
573 querymodules.c
574
575pango_querymodules_LDADD =
576if HAVE_X
577pango_querymodules_LDADD += libpangox-$(PANGO_API_VERSION).la
578endif
579if HAVE_XFT
580pango_querymodules_LDADD += libpangoxft-$(PANGO_API_VERSION).la
581endif
582if HAVE_FREETYPE
583pango_querymodules_LDADD += libpangoft2-$(PANGO_API_VERSION).la
584endif
585if HAVE_WIN32
586pango_querymodules_LDADD += libpangowin32-$(PANGO_API_VERSION).la
587endif
588pango_querymodules_LDADD += libpango-$(PANGO_API_VERSION).la $(GLIB_LIBS)
589
590EXTRA_DIST += \
591 pango-enum-types.h \
592 module-defs.h \
593 module-defs-fc.c.win32 \
594 module-defs-win32.c.win32 \
595 pango.def \
596 pangocairo.def \
597 pangowin32.def \
598 pangoft2.def \
599 makefile.msc \
600 pango.rc \
601 pango.rc.in \
602 pangox.aliases \
603 pangoft2.rc \
604 pangoft2.rc.in \
605 pangowin32.rc \
606 pangowin32.rc.in \
607 pangox.rc \
608 pangox.rc.in \
609 pangoxft.rc \
610 pangoxft.rc.in \
611 check.defs
612
613
614if HAVE_INCLUDED_MODULES
615included-modules:
616 $(AM_V_GEN) cd $(top_builddir)/modules && $(MAKE) $(AM_MAKEFLAGS) included-modules
617
618$(INCLUDED_LANG_MODULES) $(INCLUDED_X_MODULES) $(INCLUDED_FC_MODULES) $(INCLUDED_WIN32_MODULES) $(INCLUDED_ATSUI_MODULES): included-modules
619 $(AM_V_GEN) true
620
621.PHONY: included-modules
622endif
623
624MODULE_DEF_FILES = \
625 module-defs.h \
626 module-defs-lang.c \
627 module-defs-x.c \
628 module-defs-fc.c \
629 module-defs-win32.c \
630 module-defs-atsui.c
631
632$(MODULE_DEF_FILES): $(top_builddir)/config.status
633 $(AM_V_GEN) cd $(top_builddir) && $(SHELL) ./config.status pango/$@
634
635CLEANFILES = \
636 pango-enum-types.h \
637 s-enum-types-h \
638 pango-enum-types.c \
639 s-enum-types-c
640
641MOSTLYCLEANFILES = \
642 *.list \
643 *.expected
644
645DISTCLEANFILES = \
646 pango-features.h \
647 $(MODULE_DEF_FILES)
648
649install-data-local: install-ms-lib install-def-files
650
651install-exec-hook:
652if DISABLE_EXPLICIT_DEPS
653 -for i in libpangoft2-$(PANGO_API_VERSION).la libpangoxft-$(PANGO_API_VERSION).la libpangox-$(PANGO_API_VERSION).la libpangowin32-$(PANGO_API_VERSION).la; do \
654 test -f $(DESTDIR)$(libdir)/$$i && $(SHELL) $(top_srcdir)/sanitize-la.sh $(DESTDIR)$(libdir)/$$i ; \
655 done
656endif
657
658uninstall-local: uninstall-ms-lib uninstall-def-files
659
660TESTS = check.defs
661
662-include $(top_srcdir)/git.mk
diff --git a/meta-moblin/packages/hornsey/hornsey.inc b/meta-moblin/packages/hornsey/hornsey.inc
index 5cab0a07e2..46f66deb4c 100644
--- a/meta-moblin/packages/hornsey/hornsey.inc
+++ b/meta-moblin/packages/hornsey/hornsey.inc
@@ -4,7 +4,7 @@ LICENSE = "LGPLv2.1"
4 4
5SRC_URI = "http://download.moblin.org/sources/hornsey/1.0/hornsey-1.0_20091116.tar.bz2" 5SRC_URI = "http://download.moblin.org/sources/hornsey/1.0/hornsey-1.0_20091116.tar.bz2"
6 6
7DEPENDS = "clutter-1.0 clutter-gtk clutter-gst bickley bognor-regis nbtk startup-notification libunique xtst" 7DEPENDS = "clutter-1.0 clutter-gtk-0.10 clutter-gst-0.10 bickley bognor-regis nbtk startup-notification libunique xtst"
8 8
9EXTRA_OECONF = "--disable-shave" 9EXTRA_OECONF = "--disable-shave"
10 10
diff --git a/meta-moblin/packages/moblin-web-browser/moblin-web-browser_git.bb b/meta-moblin/packages/moblin-web-browser/moblin-web-browser_git.bb
index 3f4b0758ad..b03e9e18d9 100644
--- a/meta-moblin/packages/moblin-web-browser/moblin-web-browser_git.bb
+++ b/meta-moblin/packages/moblin-web-browser/moblin-web-browser_git.bb
@@ -7,7 +7,7 @@ LICENSE = "LGPLv2.1"
7PV = "0.0+git${SRCPV}" 7PV = "0.0+git${SRCPV}"
8PR = "r11" 8PR = "r11"
9 9
10DEPENDS = "clutter-1.0 clutter-mozembed clutter-gtk libunique mozilla-headless-services libccss nbtk mozilla-headless mutter-moblin" 10DEPENDS = "clutter-1.0 clutter-mozembed clutter-gtk-0.10 libunique mozilla-headless-services libccss nbtk mozilla-headless mutter-moblin"
11 11
12S = "${WORKDIR}/git" 12S = "${WORKDIR}/git"
13 13
diff --git a/meta/conf/distro/include/poky-fixed-revisions.inc b/meta/conf/distro/include/poky-fixed-revisions.inc
index a58637ef1d..584102fd81 100644
--- a/meta/conf/distro/include/poky-fixed-revisions.inc
+++ b/meta/conf/distro/include/poky-fixed-revisions.inc
@@ -28,11 +28,13 @@ SRCREV_pn-clutter-cairo-0.8 ?= "e27e507dedddec3f279a2902ecee0da1011c78eb"
28SRCREV_pn-clutter-cairo ?= "7b45e0de2d4b9f1cd47486e5de71a1a26e8fdf27" 28SRCREV_pn-clutter-cairo ?= "7b45e0de2d4b9f1cd47486e5de71a1a26e8fdf27"
29SRCREV_pn-clutter-gst-0.6 ?= "1c3dc539057dbcd6dd75f2cb5b4ba39b741892bd" 29SRCREV_pn-clutter-gst-0.6 ?= "1c3dc539057dbcd6dd75f2cb5b4ba39b741892bd"
30SRCREV_pn-clutter-gst-0.8 ?= "7a60a435fb0930d911e26158928ab53bda090f3e" 30SRCREV_pn-clutter-gst-0.8 ?= "7a60a435fb0930d911e26158928ab53bda090f3e"
31SRCREV_pn-clutter-gst ?= "db9bcf9d6f3a7d0f34747bed0f3ab28d7eb8f6ab" 31SRCREV_pn-clutter-gst-0.10 ?= "78e853ac3269c13b8d798ebca1c4748d066a966e"
32SRCREV_pn-clutter-gst-1.0 ?= "d48c6fc67b48304f90e51b520631c1ecc10410af"
32SRCREV_pn-clutter-helix ?= "b4514a7bae2a059f4e63de64245238a246ed10bd" 33SRCREV_pn-clutter-helix ?= "b4514a7bae2a059f4e63de64245238a246ed10bd"
33SRCREV_pn-clutter-gtk-0.6 ?= "2ba362a1a223c2b28541030a80aa11191615340a" 34SRCREV_pn-clutter-gtk-0.6 ?= "2ba362a1a223c2b28541030a80aa11191615340a"
34SRCREV_pn-clutter-gtk-0.8 ?= "7d3c3230376e731c06c21afa9d8c1d44dbea27cd" 35SRCREV_pn-clutter-gtk-0.8 ?= "7d3c3230376e731c06c21afa9d8c1d44dbea27cd"
35SRCREV_pn-clutter-gtk ?= "5dfc07761adf3ab3d1c9ee97b92bc4a65473db36" 36SRCREV_pn-clutter-gtk-0.10 ?= "b92329c4c1288019e2dea6567e2b5e98eb0a9992"
37SRCREV_pn-clutter-gtk-1.0 ?= "e8d828ba1d87937baa571e68fdff22f3e2d79ca8"
36SRCREV_pn-clutter-mozembed ?= "738d017beb5579b2ff6e4d992d4889b61c974751" 38SRCREV_pn-clutter-mozembed ?= "738d017beb5579b2ff6e4d992d4889b61c974751"
37SRCREV_pn-connman ?= "36e877dece72577a3ae6197eafd505d0e6e0c1d2" 39SRCREV_pn-connman ?= "36e877dece72577a3ae6197eafd505d0e6e0c1d2"
38SRCREV_pn-connman-gnome ?= "b589f4f89bff20d54682cc6b49efa86feac8adb4" 40SRCREV_pn-connman-gnome ?= "b589f4f89bff20d54682cc6b49efa86feac8adb4"
diff --git a/meta/packages/clutter/clutter-gst-0.10_git.bb b/meta/packages/clutter/clutter-gst-0.10_git.bb
new file mode 100644
index 0000000000..a0f874db25
--- /dev/null
+++ b/meta/packages/clutter/clutter-gst-0.10_git.bb
@@ -0,0 +1,14 @@
1require clutter-gst.inc
2
3PV = "0.10.0+git${SRCPV}"
4
5DEPENDS += "clutter-1.0"
6
7SRC_URI = "git://git.clutter-project.org/clutter-gst.git;protocol=git;branch=clutter-gst-0.10"
8
9S = "${WORKDIR}/git"
10
11do_configure_prepend () {
12 # Disable DOLT
13 sed -i -e 's/^DOLT//' ${S}/configure.ac
14}
diff --git a/meta/packages/clutter/clutter-gst-1.0_git.bb b/meta/packages/clutter/clutter-gst-1.0_git.bb
new file mode 100644
index 0000000000..5580596f09
--- /dev/null
+++ b/meta/packages/clutter/clutter-gst-1.0_git.bb
@@ -0,0 +1,14 @@
1require clutter-gst.inc
2
3PV = "0.11.0+git${SRCPV}"
4
5DEPENDS += "clutter-1.0"
6
7SRC_URI = "git://git.clutter-project.org/clutter-gst.git;protocol=git;branch=master"
8
9S = "${WORKDIR}/git"
10
11do_configure_prepend () {
12 # Disable DOLT
13 sed -i -e 's/^DOLT//' ${S}/configure.ac
14}
diff --git a/meta/packages/clutter/clutter-gst_git.bb b/meta/packages/clutter/clutter-gst_git.bb
deleted file mode 100644
index 4a72333595..0000000000
--- a/meta/packages/clutter/clutter-gst_git.bb
+++ /dev/null
@@ -1,15 +0,0 @@
1require clutter-gst.inc
2
3PV = "0.9.0+git${SRCPV}"
4PR = "r3"
5
6SRC_URI = "git://git.clutter-project.org/clutter-gst.git;protocol=git \
7 file://autofoo-9db4a61a25677764bb927369c5c68ada958fb65c.patch;patch=1;rev=9db4a61a25677764bb927369c5c68ada958fb65c \
8 file://autofoo.patch;patch=1;notrev=9db4a61a25677764bb927369c5c68ada958fb65c"
9
10S = "${WORKDIR}/git"
11
12do_configure_prepend () {
13 # Disable DOLT
14 sed -i -e 's/^DOLT//' ${S}/configure.ac
15}
diff --git a/meta/packages/clutter/clutter-gtk-0.10_git.bb b/meta/packages/clutter/clutter-gtk-0.10_git.bb
new file mode 100644
index 0000000000..d0613277a7
--- /dev/null
+++ b/meta/packages/clutter/clutter-gtk-0.10_git.bb
@@ -0,0 +1,12 @@
1require clutter-gtk.inc
2
3PV = "0.10.3+git${SRCPV}"
4PR = "r1"
5
6SRC_URI = "git://git.clutter-project.org/clutter-gtk.git;protocol=git;branch=clutter-gtk-0.10"
7
8S = "${WORKDIR}/git"
9
10DEPENDS += "clutter-1.0"
11
12EXTRA_OECONF += "--disable-introspection"
diff --git a/meta/packages/clutter/clutter-gtk_git.bb b/meta/packages/clutter/clutter-gtk-1.0_git.bb
index 9ea4e96f0a..dfabbd56cc 100644
--- a/meta/packages/clutter/clutter-gtk_git.bb
+++ b/meta/packages/clutter/clutter-gtk-1.0_git.bb
@@ -1,9 +1,9 @@
1require clutter-gtk.inc 1require clutter-gtk.inc
2 2
3PV = "0.9.0+git${SRCPV}" 3PV = "0.90.0+git${SRCPV}"
4PR = "r1" 4PR = "r1"
5 5
6SRC_URI = "git://git.clutter-project.org/clutter-gtk.git;protocol=git" 6SRC_URI = "git://git.clutter-project.org/clutter-gtk.git;protocol=git;branch=master"
7 7
8S = "${WORKDIR}/git" 8S = "${WORKDIR}/git"
9 9
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-16 10:45:16 +0000