summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/libmatchbox
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2012-12-11 21:54:29 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-12-13 15:18:45 +0000
commitd7bca38b11f537405341c890526adf4891f23df4 (patch)
treed4ab57e23ee6360a309f1c3079a6f3fd79a01275 /meta/recipes-graphics/libmatchbox
parentebd508d88164da6ddb0bb978374fddaf321f0c65 (diff)
downloadpoky-d7bca38b11f537405341c890526adf4891f23df4.tar.gz
libmatchbox: upgrade to 1.10, drop git
All patches have been upstreamed so drop them, and as upstream isn't heavily developed drop the git recipe. (From OE-Core rev: 3465570601480d2e476e82b8b7254e94f87d2682) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/libmatchbox')
-rw-r--r--meta/recipes-graphics/libmatchbox/files/16bppfixes-2.patch260
-rw-r--r--meta/recipes-graphics/libmatchbox/files/16bppfixes.patch38
-rw-r--r--meta/recipes-graphics/libmatchbox/files/autofoo.patch21
-rw-r--r--meta/recipes-graphics/libmatchbox/files/configure_fixes.patch81
-rw-r--r--meta/recipes-graphics/libmatchbox/files/fix-configure-for-1.9.patch16
-rw-r--r--meta/recipes-graphics/libmatchbox/files/matchbox-start-fix.patch23
-rw-r--r--meta/recipes-graphics/libmatchbox/libmatchbox_1.10.bb (renamed from meta/recipes-graphics/libmatchbox/libmatchbox.inc)19
-rw-r--r--meta/recipes-graphics/libmatchbox/libmatchbox_1.9.bb16
-rw-r--r--meta/recipes-graphics/libmatchbox/libmatchbox_git.bb16
9 files changed, 15 insertions, 475 deletions
diff --git a/meta/recipes-graphics/libmatchbox/files/16bppfixes-2.patch b/meta/recipes-graphics/libmatchbox/files/16bppfixes-2.patch
deleted file mode 100644
index 9bcd582e27..0000000000
--- a/meta/recipes-graphics/libmatchbox/files/16bppfixes-2.patch
+++ /dev/null
@@ -1,260 +0,0 @@
1Upstream-Status: Pending
2
3--- libmatchbox/libmb/mbpixbuf.c.orig 2007-05-04 14:41:55.000000000 +0100
4+++ libmatchbox/libmb/mbpixbuf.c 2007-05-04 14:41:55.000000000 +0100
5@@ -710,46 +710,19 @@
6 return colnum;
7 }
8
9-
10-static unsigned long
11-mb_pixbuf_get_pixel(MBPixbuf *pb, int r, int g, int b, int a)
12+/*
13+ * Split the mb_pixbuf_get_pixel() function into several specialized
14+ * functions which we will inline; this allows us to optimize
15+ * mb_pixbuf_img_render_to_drawable_with_gc () by taking some of the
16+ * decision taking outside of the double loop
17+ */
18+
19+/*
20+ * Get pixel value for rgb values and pixel depth <= 8
21+ */
22+static inline unsigned long
23+mb_pixbuf_get_pixel_le8_rgb (MBPixbuf *pb, int r, int g, int b)
24 {
25- if (pb->depth > 8)
26- {
27- switch (pb->depth)
28- {
29- case 15:
30- return ((r & 0xf8) << 7) | ((g & 0xf8) << 2) | ((b & 0xf8) >> 3);
31- case 16:
32- return ((r & 0xf8) << 8) | ((g & 0xfc) << 3) | ((b & 0xf8) >> 3);
33- case 24:
34- case 32:
35- switch (pb->byte_order)
36- {
37- case BYTE_ORD_24_RGB:
38- return ((r & 0xff) << 16) | ((g & 0xff) << 8) | (b & 0xff);
39- case BYTE_ORD_24_RBG:
40- return ((r & 0xff) << 16) | ((b & 0xff) << 8) | (g & 0xff);
41- case BYTE_ORD_24_BRG:
42- return ((b & 0xff) << 16) | ((r & 0xff) << 8) | (g & 0xff);
43- case BYTE_ORD_24_BGR:
44- return ((b & 0xff) << 16) | ((g & 0xff) << 8) | (r & 0xff);
45- case BYTE_ORD_24_GRB:
46- return ((g & 0xff) << 16) | ((r & 0xff) << 8) | (b & 0xff);
47- case BYTE_ORD_24_GBR:
48- return ((g & 0xff) << 16) | ((b & 0xff) << 8) | (r & 0xff);
49- case BYTE_ORD_32_ARGB:
50- return (a << 24) | (r << 16) | (g << 8) | b;
51- default:
52- return 0;
53- }
54- default:
55- return 0;
56- }
57- return 0;
58- }
59-
60- /* pb->depth <= 8 */
61 switch(pb->vis->class)
62 {
63 case PseudoColor:
64@@ -794,6 +767,111 @@
65 return 0;
66 }
67
68+/*
69+ * Get pixel value from a pointer to 16bbp value for pixel depth <= 8
70+ * and advance the pointer
71+ */
72+static inline unsigned long
73+mb_pixbuf_get_pixel_le8_16bpp_advance (MBPixbuf *pb, unsigned char ** p)
74+{
75+ unsigned short s = SHORT_FROM_2BYTES(*p);
76+ int r, b, g;
77+
78+ r = (s & 0xf800) >> 8;
79+ g = (s & 0x07e0) >> 3;
80+ b = (s & 0x001f) << 3;
81+
82+ *p += 2;
83+
84+ return mb_pixbuf_get_pixel_le8_rgb (pb, r, g, b);
85+}
86+
87+/*
88+ * Get pixel value for rgba values and pixel depth > 8
89+ *
90+ */
91+static inline unsigned long
92+mb_pixbuf_get_pixel_gt8_rgba (MBPixbuf *pb, int r, int g, int b, int a)
93+{
94+ switch (pb->depth)
95+ {
96+ case 15:
97+ switch (pb->byte_order)
98+ {
99+ case BYTE_ORD_24_RGB:
100+ return ((r & 0xf8) << 7) | ((g & 0xf8) << 2) | ((b & 0xf8) >> 3);
101+ case BYTE_ORD_24_BGR:
102+ return ((b & 0xf8) << 7) | ((g & 0xf8) << 2) | ((r & 0xf8) >> 3);
103+ }
104+ case 16:
105+ switch (pb->byte_order)
106+ {
107+ case BYTE_ORD_24_RGB:
108+ return ((r & 0xf8) << 8) | ((g & 0xfc) << 3) | ((b & 0xf8) >> 3);
109+ case BYTE_ORD_24_BGR:
110+ return ((b & 0xf8) << 8) | ((g & 0xfc) << 3) | ((r & 0xf8) >> 3);
111+ }
112+ case 24:
113+ case 32:
114+ switch (pb->byte_order)
115+ {
116+ case BYTE_ORD_24_RGB:
117+ return ((r & 0xff) << 16) | ((g & 0xff) << 8) | (b & 0xff);
118+ case BYTE_ORD_24_RBG:
119+ return ((r & 0xff) << 16) | ((b & 0xff) << 8) | (g & 0xff);
120+ case BYTE_ORD_24_BRG:
121+ return ((b & 0xff) << 16) | ((r & 0xff) << 8) | (g & 0xff);
122+ case BYTE_ORD_24_BGR:
123+ return ((b & 0xff) << 16) | ((g & 0xff) << 8) | (r & 0xff);
124+ case BYTE_ORD_24_GRB:
125+ return ((g & 0xff) << 16) | ((r & 0xff) << 8) | (b & 0xff);
126+ case BYTE_ORD_24_GBR:
127+ return ((g & 0xff) << 16) | ((b & 0xff) << 8) | (r & 0xff);
128+ case BYTE_ORD_32_ARGB:
129+ return (a << 24) | (r << 16) | (g << 8) | b;
130+ default:
131+ return 0;
132+ }
133+ default:
134+ return 0;
135+ }
136+}
137+
138+/*
139+ * Get pixel value from pointer to 16bpp data for pixel depth > 8
140+ * and advance the pointer
141+ *
142+ * TODO ? We could take the 32bit case out of here, which would allow
143+ * to ignore the alpha value for <15, 24>, but we might not gain that
144+ * much by this on arm due to the conditional execution.
145+ */
146+static inline unsigned long
147+mb_pixbuf_get_pixel_gt8_16bpp_advance (MBPixbuf *pb, unsigned char ** p,
148+ int has_alpha)
149+{
150+ unsigned short s = SHORT_FROM_2BYTES(*p);
151+ int r, b, g, a;
152+
153+ r = (s & 0xf800) >> 8;
154+ g = (s & 0x07e0) >> 3;
155+ b = (s & 0x001f) << 3;
156+
157+ *p += 2;
158+
159+ a = has_alpha ? *(*p)++ : 0xff;
160+
161+ return mb_pixbuf_get_pixel_gt8_rgba (pb, r, g, b, a);
162+}
163+
164+static inline unsigned long
165+mb_pixbuf_get_pixel(MBPixbuf *pb, int r, int g, int b, int a)
166+{
167+ if (pb->depth > 8)
168+ return mb_pixbuf_get_pixel_gt8_rgba (pb, r, g, b, a);
169+
170+ return mb_pixbuf_get_pixel_le8_rgb (pb, r, g, b);
171+}
172+
173 unsigned long
174 mb_pixbuf_lookup_x_pixel(MBPixbuf *pb, int r, int g, int b, int a)
175 {
176@@ -1825,7 +1903,6 @@
177 mb_pixbuf_img_render_to_drawable_with_gc(pb, img, drw, drw_x, drw_y, pb->gc);
178 }
179
180-
181 void
182 mb_pixbuf_img_render_to_drawable_with_gc(MBPixbuf *pb,
183 MBPixbufImage *img,
184@@ -1883,31 +1960,57 @@
185
186 if (pb->internal_bytespp == 2)
187 {
188- for(y=0; y<img->height; y++)
189- for(x=0; x<img->width; x++)
190- {
191- /* Below is potentially dangerous.
192- */
193- pixel = ( *p | (*(p+1) << 8));
194-
195- p += ((img->has_alpha) ? 3 : 2);
196-
197- XPutPixel(img->ximg, x, y, pixel);
198- }
199+ if (pb->depth > 8)
200+ {
201+ for(y=0; y<img->height; y++)
202+ for(x=0; x<img->width; x++)
203+ {
204+ pixel = mb_pixbuf_get_pixel_gt8_16bpp_advance(pb, &p,
205+ img->has_alpha);
206+ XPutPixel(img->ximg, x, y, pixel);
207+ }
208+ }
209+ else
210+ {
211+ for(y=0; y<img->height; y++)
212+ for(x=0; x<img->width; x++)
213+ {
214+ pixel = mb_pixbuf_get_pixel_le8_16bpp_advance(pb, &p);
215+ XPutPixel(img->ximg, x, y, pixel);
216+ }
217+ }
218 }
219 else
220 {
221- for(y=0; y<img->height; y++)
222+ if (pb->depth > 8)
223 {
224- for(x=0; x<img->width; x++)
225+ for(y=0; y<img->height; y++)
226 {
227- r = ( *p++ );
228- g = ( *p++ );
229- b = ( *p++ );
230- a = ((img->has_alpha) ? *p++ : 0xff);
231+ for(x=0; x<img->width; x++)
232+ {
233+ r = ( *p++ );
234+ g = ( *p++ );
235+ b = ( *p++ );
236+ a = ((img->has_alpha) ? *p++ : 0xff);
237
238- pixel = mb_pixbuf_get_pixel(pb, r, g, b, a);
239- XPutPixel(img->ximg, x, y, pixel);
240+ pixel = mb_pixbuf_get_pixel_gt8_rgba(pb, r, g, b, a);
241+ XPutPixel(img->ximg, x, y, pixel);
242+ }
243+ }
244+ }
245+ else
246+ {
247+ for(y=0; y<img->height; y++)
248+ {
249+ for(x=0; x<img->width; x++)
250+ {
251+ r = ( *p++ );
252+ g = ( *p++ );
253+ b = ( *p++ );
254+
255+ pixel = mb_pixbuf_get_pixel_le8_rgb(pb, r, g, b);
256+ XPutPixel(img->ximg, x, y, pixel);
257+ }
258 }
259 }
260 }
diff --git a/meta/recipes-graphics/libmatchbox/files/16bppfixes.patch b/meta/recipes-graphics/libmatchbox/files/16bppfixes.patch
deleted file mode 100644
index ac22b9995f..0000000000
--- a/meta/recipes-graphics/libmatchbox/files/16bppfixes.patch
+++ /dev/null
@@ -1,38 +0,0 @@
1Upstream-Status: Accepted
2
3Index: libmb/mbpixbuf.c
4===================================================================
5--- libmatchbox/libmb.orig/mbpixbuf.c 2006-02-01 12:45:55.000000000 +0000
6+++ libmatchbox/libmb/mbpixbuf.c 2006-03-11 15:20:47.000000000 +0000
7@@ -716,7 +716,13 @@
8 case 15:
9 return ((r & 0xf8) << 7) | ((g & 0xf8) << 2) | ((b & 0xf8) >> 3);
10 case 16:
11- return ((r & 0xf8) << 8) | ((g & 0xfc) << 3) | ((b & 0xf8) >> 3);
12+ switch (pb->byte_order)
13+ {
14+ case BYTE_ORD_24_RGB:
15+ return ((r & 0xf8) << 8) | ((g & 0xfc) << 3) | ((b & 0xf8) >> 3);
16+ case BYTE_ORD_24_BGR:
17+ return ((b & 0xf8) << 8) | ((g & 0xfc) << 3) | ((r & 0xf8) >> 3);
18+ }
19 case 24:
20 case 32:
21 switch (pb->byte_order)
22@@ -1880,12 +1886,11 @@
23 for(y=0; y<img->height; y++)
24 for(x=0; x<img->width; x++)
25 {
26- /* Below is potentially dangerous.
27- */
28- pixel = ( *p | (*(p+1) << 8));
29+ internal_16bpp_pixel_to_rgb(p, r, g, b);
30+ internal_16bpp_pixel_next(p);
31+ a = ((img->has_alpha) ? *p++ : 0xff);
32
33- p += ((img->has_alpha) ? 3 : 2);
34-
35+ pixel = mb_pixbuf_get_pixel(pb, r, g, b, a);
36 XPutPixel(img->ximg, x, y, pixel);
37 }
38 }
diff --git a/meta/recipes-graphics/libmatchbox/files/autofoo.patch b/meta/recipes-graphics/libmatchbox/files/autofoo.patch
deleted file mode 100644
index 78849a424f..0000000000
--- a/meta/recipes-graphics/libmatchbox/files/autofoo.patch
+++ /dev/null
@@ -1,21 +0,0 @@
1
2#
3# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
4#
5
6Upstream-Status: Inappropriate [configuration]
7
8--- libmatchbox-1.5/configure.ac~autofoo 2004-12-21 12:56:46.000000000 -0500
9+++ libmatchbox-1.5/configure.ac 2005-01-18 16:40:04.421179624 -0500
10@@ -1,10 +1,10 @@
11 AC_PREREQ(2.53)
12 AC_INIT([libmatchbox], 1.5, [mallum@handhelds.org])
13 AC_CONFIG_SRCDIR([libmb/mbtray.c])
14+AC_CONFIG_AUX_DIR(.)
15
16 AM_INIT_AUTOMAKE()
17 AM_CONFIG_HEADER([config.h])
18-AC_CONFIG_AUX_DIR(.)
19
20 # Checks for programs.
21 AC_GNU_SOURCE
diff --git a/meta/recipes-graphics/libmatchbox/files/configure_fixes.patch b/meta/recipes-graphics/libmatchbox/files/configure_fixes.patch
deleted file mode 100644
index 30fd67b02f..0000000000
--- a/meta/recipes-graphics/libmatchbox/files/configure_fixes.patch
+++ /dev/null
@@ -1,81 +0,0 @@
1---
2 configure.ac | 15 +++++++--------
3 libmb.pc.in | 2 +-
4 2 files changed, 8 insertions(+), 9 deletions(-)
5
6Upstream-Status: Inappropriate [configuration]
7
8Index: libmatchbox-1.9/configure.ac
9===================================================================
10--- libmatchbox-1.9.orig/configure.ac 2007-11-11 22:26:43.000000000 +0000
11+++ libmatchbox-1.9/configure.ac 2007-11-11 22:52:09.000000000 +0000
12@@ -84,6 +84,7 @@ if test $have_libx11pc = yes; then
13 xft_pkg=xft
14 SUPPORTS_XFT=1
15 AC_DEFINE(USE_XFT, [1], [Use Xft])
16+ XFT_REQUIRED="xft"
17 fi
18 # XXX : xau is missing from x11.pc - workaround is too add here
19 PKG_CHECK_MODULES(XLIBS, x11 xext $xft_pkg)
20@@ -108,6 +109,7 @@ if test x$enable_xft != xno; then
21 AC_DEFINE(USE_XFT, [1], [Use Xft])
22 SUPPORTS_XFT=1
23 AC_MSG_RESULT(yes)
24+ XFT_REQUIRED="xft"
25 else
26
27 AC_PATH_PROG(XFT_CONFIG, xft-config, no)
28@@ -122,21 +124,17 @@ if test x$enable_xft != xno; then
29 AC_DEFINE(USE_XFT, [1], [Use Xft])
30 SUPPORTS_XFT=1
31 AC_MSG_RESULT(yes)
32+ MB_EXTRA_CFLAGS="$MB_EXTRA_CFLAGS $XFT_CFLAGS"
33+ MB_EXTRA_LIBS="$MB_EXTRA_LIBS $XFT_LIBS"
34 fi
35 fi
36 fi
37
38 XLIBS_CFLAGS="$XLIBS_CLAGS $XFT_CFLAGS"
39-XLIBS_LIBS="$X_LIBS $XFT_LIBS -lX11 -lXext"
40-
41-MB_EXTRA_LIBS="$MB_EXTRA_LIBS $XLIBS_LIBS"
42+XLIBS_LIBS="$XLIBS_LIBS $XFT_LIBS -lX11 -lXext"
43
44 fi
45
46-# do this here for freetype include
47-MB_EXTRA_CFLAGS="$MB_EXTRA_CFLAGS $XLIBS_CFLAGS"
48-
49-
50 dnl ------ Check for Pango ---------------------------------------------------
51
52 if test x$enable_pango != xno; then
53@@ -172,7 +170,7 @@ if test x$enable_png != xno; then
54 AC_DEFINE(USE_PNG, [1], [Use Png])
55 SUPPORTS_PNG=1
56 PNG_LIBS="-lpng -lz"
57- MB_EXTRA_LIBS="$MB_EXTRA_LIBS $XLIBS_LIBS $PNG_LIBS"
58+ MB_EXTRA_LIBS="$MB_EXTRA_LIBS $PNG_LIBS"
59 else
60 AC_MSG_WARN([*** Cannot find PNG, disabling support])
61 enable_png=no
62@@ -340,6 +338,7 @@ AC_SUBST(MB_EXTRA_CFLAGS)
63 AC_SUBST(XLIBS_REQUIRED)
64 AC_SUBST(PANGO_REQUIRED)
65 AC_SUBST(PNG_REQUIRED)
66+AC_SUBST(XFT_REQUIRED)
67
68 dnl ------ Below used for mbconfig.h ----------------------------------------
69
70Index: libmatchbox-1.9/libmb.pc.in
71===================================================================
72--- libmatchbox-1.9.orig/libmb.pc.in 2007-11-11 22:30:47.000000000 +0000
73+++ libmatchbox-1.9/libmb.pc.in 2007-11-11 22:31:01.000000000 +0000
74@@ -7,6 +7,6 @@ Name: libmb
75 Description: Utility Library used by Matchbox utilities.
76 Version: @VERSION@
77
78-Requires: @XLIBS_REQUIRED@ @PANGO_REQUIRED@ @PNG_REQUIRED@
79+Requires: @XLIBS_REQUIRED@ @PANGO_REQUIRED@ @PNG_REQUIRED@ @XFT_REQUIRED@
80 Libs: -L${libdir} -lmb @MB_EXTRA_LIBS@
81 Cflags: -I${includedir} @MB_EXTRA_CFLAGS@
diff --git a/meta/recipes-graphics/libmatchbox/files/fix-configure-for-1.9.patch b/meta/recipes-graphics/libmatchbox/files/fix-configure-for-1.9.patch
deleted file mode 100644
index 2f147eb267..0000000000
--- a/meta/recipes-graphics/libmatchbox/files/fix-configure-for-1.9.patch
+++ /dev/null
@@ -1,16 +0,0 @@
1Upstream-Status: Inappropriate [configuration]
2
3diff -urNd ../libmatchbox-1.6-r1/libmatchbox-1.6/configure.ac libmatchbox-1.6/configure.ac
4--- ../libmatchbox-1.6-r1/libmatchbox-1.6/configure.ac 2005-01-11 21:47:39 +00:00
5+++ libmatchbox-1.6/configure.ac 2005-03-14 03:06:25 +00:00
6@@ -2,9 +2,9 @@
7 AC_INIT([libmatchbox], 1.6, [mallum@handhelds.org])
8 AC_CONFIG_SRCDIR([libmb/mbtray.c])
9
10+AC_CONFIG_AUX_DIR(.)
11 AM_INIT_AUTOMAKE()
12 AM_CONFIG_HEADER([config.h])
13-AC_CONFIG_AUX_DIR(.)
14
15 # Checks for programs.
16 AC_GNU_SOURCE
diff --git a/meta/recipes-graphics/libmatchbox/files/matchbox-start-fix.patch b/meta/recipes-graphics/libmatchbox/files/matchbox-start-fix.patch
deleted file mode 100644
index 88f5d7091b..0000000000
--- a/meta/recipes-graphics/libmatchbox/files/matchbox-start-fix.patch
+++ /dev/null
@@ -1,23 +0,0 @@
1matchbox environment start fail on x86-64 target, while ok on x86 target. Root
2cause is libmatchbox use "0"(int) as termination indicator when calling
3XftFontOpen, which in turn called FcPatternVapBuild(in fontconfig). It try to
4get the "0" as char* and fetch wrong value, as int and char* has different size
5on x86-64. This patch forces a NULL pointer as terminator to fix it.
6
7Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
8
9Upstream-Status: Accepted
10
11Index: libmatchbox-1.9/libmb/mbexp.c
12===================================================================
13--- libmatchbox-1.9.orig/libmb/mbexp.c 2010-08-28 06:33:25.000000000 +0800
14+++ libmatchbox-1.9/libmb/mbexp.c 2010-08-28 06:30:05.000000000 +0800
15@@ -348,7 +348,7 @@
16 XFT_SIZE, XftTypeDouble , (double)font->pt_size,
17 XFT_WEIGHT, XftTypeInteger, weight,
18 XFT_SLANT, XftTypeInteger , slant,
19- 0);
20+ NULL);
21
22 if (font->font != NULL ) result = 2;
23
diff --git a/meta/recipes-graphics/libmatchbox/libmatchbox.inc b/meta/recipes-graphics/libmatchbox/libmatchbox_1.10.bb
index fdc866fe02..a1531b838e 100644
--- a/meta/recipes-graphics/libmatchbox/libmatchbox.inc
+++ b/meta/recipes-graphics/libmatchbox/libmatchbox_1.10.bb
@@ -1,17 +1,28 @@
1DESCRIPTION = "Matchbox window manager core library" 1DESCRIPTION = "Matchbox window manager core library"
2SECTION = "x11/libs"
2HOMEPAGE = "http://matchbox-project.org/" 3HOMEPAGE = "http://matchbox-project.org/"
3BUGTRACKER = "http://bugzilla.openedhand.com/" 4BUGTRACKER = "http://bugzilla.yoctoproject.com/"
4 5
5LICENSE = "LGPLv2+" 6LICENSE = "LGPLv2+"
6LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34 \ 7LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34 \
7 file://libmb/mbexp.c;endline=20;md5=28c0aef3b23e308464f5dae6a11b0d2f \ 8 file://libmb/mbexp.c;endline=20;md5=28c0aef3b23e308464f5dae6a11b0d2f \
8 file://libmb/mbdotdesktop.c;endline=21;md5=5a287156b3207e851c1d68d09c439b51" 9 file://libmb/mbdotdesktop.c;endline=21;md5=5a287156b3207e851c1d68d09c439b51"
9 10
10SECTION = "x11/libs"
11DEPENDS = "virtual/libx11 libxext expat libxft jpeg libpng zlib libxsettings-client startup-notification" 11DEPENDS = "virtual/libx11 libxext expat libxft jpeg libpng zlib libxsettings-client startup-notification"
12 12
13inherit autotools pkgconfig 13SRC_URI = "http://downloads.yoctoproject.org/releases/matchbox/${BPN}/${PV}/${BPN}-${PV}.tar.gz \
14 file://check.m4"
15SRC_URI[md5sum] = "042c5874631dfb95151aa793dc1434b8"
16SRC_URI[sha256sum] = "d14d4844840e3e1e4faa9f9e90060915d39b6033f6979464ab3ea3fe1c4f9293"
14 17
15EXTRA_OECONF = "--enable-jpeg --enable-expat --enable-xsettings --enable-startup-notification" 18PR = "r0"
19
20inherit autotools pkgconfig
16 21
17S = "${WORKDIR}/libmatchbox-${PV}" 22S = "${WORKDIR}/libmatchbox-${PV}"
23
24do_configure_prepend () {
25 cp ${WORKDIR}/check.m4 ${S}/
26}
27
28EXTRA_OECONF = "--enable-jpeg --enable-expat --enable-xsettings --enable-startup-notification"
diff --git a/meta/recipes-graphics/libmatchbox/libmatchbox_1.9.bb b/meta/recipes-graphics/libmatchbox/libmatchbox_1.9.bb
deleted file mode 100644
index 2fcd1b07b0..0000000000
--- a/meta/recipes-graphics/libmatchbox/libmatchbox_1.9.bb
+++ /dev/null
@@ -1,16 +0,0 @@
1require libmatchbox.inc
2
3PR = "r10"
4
5SRC_URI = "http://downloads.yoctoproject.org/releases/matchbox/${BPN}/${PV}/${BPN}-${PV}.tar.gz \
6 file://16bppfixes.patch \
7 file://configure_fixes.patch \
8 file://check.m4 \
9 file://matchbox-start-fix.patch"
10
11SRC_URI[md5sum] = "465fa15c43bf0091a3810e7702fe143f"
12SRC_URI[sha256sum] = "f7054f93c57ba6b758d0e4f47d4d2dd96a7fe487e1157eb70a4d642910275aea"
13
14do_configure_prepend () {
15 cp ${WORKDIR}/check.m4 ${S}/
16}
diff --git a/meta/recipes-graphics/libmatchbox/libmatchbox_git.bb b/meta/recipes-graphics/libmatchbox/libmatchbox_git.bb
deleted file mode 100644
index ac329e5193..0000000000
--- a/meta/recipes-graphics/libmatchbox/libmatchbox_git.bb
+++ /dev/null
@@ -1,16 +0,0 @@
1require libmatchbox.inc
2
3SRCREV = "d9dd0ac810de4f0b93cd813ce14aee34c722c2cf"
4PV = "1.9+git${SRCPV}"
5PR = "r0"
6DEFAULT_PREFERENCE = "-1"
7
8SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=git \
9 file://configure_fixes.patch \
10 file://check.m4"
11
12S = "${WORKDIR}/git"
13
14do_configure_prepend () {
15 cp ${WORKDIR}/check.m4 ${S}/
16}
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-05-10 15:29:51 +0000