diff options
| -rw-r--r-- | .SRCINFO | 5 | ||||
| -rw-r--r-- | 1.patch | 759 | ||||
| -rw-r--r-- | PKGBUILD | 9 |
3 files changed, 5 insertions, 768 deletions
@@ -1,6 +1,6 @@ pkgbase = libxft-bgra-git pkgdesc = libXft with BGRA glyph (color emoji) rendering & scaling patches by Maxime Coste - pkgver = 2.3.4.r147.42c6616 + pkgver = 2.3.4.r169.4356b58 pkgrel = 1 url = https://gitlab.freedesktop.org/xorg/lib/libxft.git arch = x86_64 @@ -11,7 +11,6 @@ pkgbase = libxft-bgra-git makedepends = automake makedepends = xorg-util-macros makedepends = autoconf - makedepends = patch makedepends = make makedepends = libtool makedepends = gcc @@ -20,8 +19,6 @@ pkgbase = libxft-bgra-git provides = libxft conflicts = libxft source = git+https://gitlab.freedesktop.org/xorg/lib/libxft.git - source = 1.patch md5sums = SKIP - md5sums = 49c10bb362132e2c0e37296ae95db279 pkgname = libxft-bgra-git diff --git a/1.patch b/1.patch deleted file mode 100644 index aa33b678024a..000000000000 --- a/1.patch +++ /dev/null @@ -1,759 +0,0 @@ -diff '--color=auto' -bur a/src/xftfreetype.c b/src/xftfreetype.c ---- a/src/xftfreetype.c 2022-06-09 11:41:58.673303128 +0700 -+++ b/src/xftfreetype.c 2022-06-09 11:43:47.013299999 +0700 -@@ -523,7 +523,7 @@ - /* - * Compute glyph load flags - */ -- fi->load_flags = FT_LOAD_DEFAULT; -+ fi->load_flags = FT_LOAD_DEFAULT | FT_LOAD_COLOR; - - #ifndef XFT_EMBEDDED_BITMAP - #define XFT_EMBEDDED_BITMAP "embeddedbitmap" -@@ -775,6 +775,7 @@ - FcChar32 hash_value; - FcChar32 rehash_value; - FcBool antialias; -+ FcBool color; - int max_glyph_memory; - size_t alloc_size; - int ascent, descent, height; -@@ -831,12 +832,18 @@ - if (!(face->face_flags & FT_FACE_FLAG_SCALABLE)) - antialias = FcFalse; - -+ color = FT_HAS_COLOR(face) ? FcTrue : FcFalse; -+ - /* - * Find the appropriate picture format - */ - if (fi->render) - { -- if (antialias) -+ if (color) -+ { -+ format = XRenderFindStandardFormat (dpy, PictStandardARGB32); -+ } -+ else if (antialias) - { - switch (fi->rgba) { - case FC_RGBA_RGB: -@@ -968,6 +975,13 @@ - * which doesn't happen in XftFontInfoFill - */ - font->info.antialias = antialias; -+ -+ /* -+ * Set color value, which is only known once the -+ * font was loaded -+ */ -+ font->info.color = color; -+ - /* - * bump XftFile reference count - */ -Only in b/src: xftfreetype.c.orig -diff '--color=auto' -bur a/src/xftglyphs.c b/src/xftglyphs.c ---- a/src/xftglyphs.c 2022-06-09 11:41:58.673303128 +0700 -+++ b/src/xftglyphs.c 2022-06-09 11:43:47.013299999 +0700 -@@ -26,6 +26,8 @@ - - #include FT_SYNTHESIS_H - -+#include FT_GLYPH_H -+ - /* - * Validate the memory info for a font - */ -@@ -78,9 +80,11 @@ - static int - _compute_xrender_bitmap_size( FT_Bitmap* target, - FT_GlyphSlot slot, -- FT_Render_Mode mode ) -+ FT_Render_Mode mode, -+ FT_Matrix* matrix ) - { - FT_Bitmap* ftbit; -+ FT_Vector vector; - int width, height, pitch; - - if ( slot->format != FT_GLYPH_FORMAT_BITMAP ) -@@ -91,6 +95,16 @@ - - width = (int)ftbit->width; - height = (int)ftbit->rows; -+ -+ if ( matrix && mode == FT_RENDER_MODE_NORMAL ) -+ { -+ vector.x = ftbit->width; -+ vector.y = ftbit->rows; -+ FT_Vector_Transform(&vector, matrix); -+ -+ width = (int)vector.x; -+ height = (int)vector.y; -+ } - pitch = (width+3) & ~3; - - switch ( ftbit->pixel_mode ) -@@ -112,6 +126,10 @@ - } - break; - -+ case FT_PIXEL_MODE_BGRA: -+ pitch = width * 4; -+ break; -+ - case FT_PIXEL_MODE_LCD: - if ( mode != FT_RENDER_MODE_LCD ) - return -1; -@@ -143,6 +161,105 @@ - } - - /* this functions converts the glyph bitmap found in a FT_GlyphSlot -+ * into a different format while scaling by applying the given matrix -+ * (see _compute_xrender_bitmap_size) -+ * -+ * you should call this function after _compute_xrender_bitmap_size -+ * -+ * target :: target bitmap descriptor. Note that its 'buffer' pointer -+ * must point to memory allocated by the caller -+ * -+ * source :: the source bitmap descriptor -+ * -+ * matrix :: the scaling matrix to apply -+ */ -+static void -+_scaled_fill_xrender_bitmap( FT_Bitmap* target, -+ FT_Bitmap* source, -+ const FT_Matrix* matrix ) -+{ -+ unsigned char* src_buf = source->buffer; -+ unsigned char* dst_line = target->buffer; -+ int src_pitch = source->pitch; -+ int width = target->width; -+ int height = target->rows; -+ int pitch = target->pitch; -+ int h; -+ FT_Vector vector; -+ FT_Matrix inverse = *matrix; -+ int sampling_width; -+ int sampling_height; -+ int sample_count; -+ -+ if ( src_pitch < 0 ) -+ src_buf -= src_pitch * (source->rows - 1); -+ -+ FT_Matrix_Invert(&inverse); -+ -+ /* compute how many source pixels a target pixel spans */ -+ vector.x = 1; -+ vector.y = 1; -+ FT_Vector_Transform(&vector, &inverse); -+ sampling_width = vector.x / 2; -+ sampling_height = vector.y / 2; -+ sample_count = (2 * sampling_width + 1) * (2 * sampling_height + 1); -+ -+ for ( h = height; h > 0; h--, dst_line += pitch ) -+ { -+ int x; -+ -+ for ( x = 0; x < width; x++ ) -+ { -+ unsigned char* src; -+ -+#define CLAMP(x, min, max) ((x) < (min) ? (min) : ((x) > (max) ? (max) : (x))) -+ -+ /* compute target pixel location in source space */ -+ vector.x = (x * 0x10000) + 0x10000 / 2; -+ vector.y = ((height - h) * 0x10000) + 0x10000 / 2; -+ FT_Vector_Transform(&vector, &inverse); -+ vector.x = CLAMP(FT_RoundFix(vector.x) / 0x10000, 0, source->width - 1); -+ vector.y = CLAMP(FT_RoundFix(vector.y) / 0x10000, 0, source->rows - 1); -+ -+ switch ( source->pixel_mode ) -+ { -+ case FT_PIXEL_MODE_MONO: /* convert mono to 8-bit gray, scale using nearest pixel */ -+ src = src_buf + (vector.y * src_pitch); -+ if ( src[(vector.x >> 3)] & (0x80 >> (vector.x & 7)) ) -+ dst_line[x] = 0xff; -+ break; -+ -+ case FT_PIXEL_MODE_GRAY: /* scale using nearest pixel */ -+ src = src_buf + (vector.y * src_pitch); -+ dst_line[x] = src[vector.x]; -+ break; -+ -+ case FT_PIXEL_MODE_BGRA: /* scale by averaging all relevant source pixels, keep BGRA format */ -+ { -+ int sample_x, sample_y; -+ int bgra[4] = {}; -+ for (sample_y = - sampling_height; sample_y < sampling_height + 1; ++sample_y) -+ { -+ int src_y = CLAMP(vector.y + sample_y, 0, source->rows - 1); -+ src = src_buf + (src_y * src_pitch); -+ for (sample_x = - sampling_width; sample_x < sampling_width + 1; ++sample_x) -+ { -+ int src_x = CLAMP(vector.x + sample_x, 0, source->width - 1); -+ for (int i = 0; i < 4; ++i) -+ bgra[i] += src[src_x * 4 + i]; -+ } -+ } -+ -+ for (int i = 0; i < 4; ++i) -+ dst_line[4 * x + i] = bgra[i] / sample_count; -+ break; -+ } -+ } -+ } -+ } -+} -+ -+/* this functions converts the glyph bitmap found in a FT_GlyphSlot - * into a different format (see _compute_xrender_bitmap_size) - * - * you should call this function after _compute_xrender_bitmap_size -@@ -244,6 +361,11 @@ - } - break; - -+ case FT_PIXEL_MODE_BGRA: /* Preserve BGRA format */ -+ for ( h = height; h > 0; h--, srcLine += src_pitch, dstLine += pitch ) -+ memcpy( dstLine, srcLine, width * 4 ); -+ break; -+ - case FT_PIXEL_MODE_LCD: - if ( !bgr ) - { -@@ -339,6 +461,55 @@ - } - } - -+/* This function creates a Picture for the given glyph on the default root window -+ * It will only work in Xinerama mode -+ * -+ * dpy :: target display -+ * -+ * format :: target pixmap format -+ * -+ * width :: picture width -+ * -+ * width :: picture height -+ * -+ * data :: bitmap data -+ * -+ */ -+static Picture -+_create_glyph_bgra_picture (Display *dpy, -+ XRenderPictFormat *format, -+ int width, -+ int height, -+ unsigned char *data) -+{ -+ XImage image = { -+ width, height, 0, ZPixmap, (char *)data, -+ dpy->byte_order, dpy->bitmap_unit, dpy->bitmap_bit_order, 32, -+ 32, 0, 32, -+ 0, 0, 0 -+ }; -+ Picture picture; -+ Pixmap pixmap; -+ GC gc; -+ -+ pixmap = XCreatePixmap(dpy, DefaultRootWindow(dpy), width, height, 32); -+ if (!pixmap) -+ return None; -+ -+ gc = XCreateGC(dpy, pixmap, 0, NULL); -+ if (!gc) -+ return None; -+ -+ XInitImage(&image); -+ XPutImage(dpy, pixmap, gc, &image, 0, 0, 0, 0, width, height); -+ picture = XRenderCreatePicture(dpy, pixmap, format, 0, NULL); -+ -+ XFreeGC(dpy, gc); -+ XFreePixmap(dpy, pixmap); -+ -+ return picture; -+} -+ - _X_EXPORT void - XftFontLoadGlyphs (Display *dpy, - XftFont *pub, -@@ -365,6 +536,8 @@ - FT_Vector vector; - FT_Face face; - FT_Render_Mode mode = FT_RENDER_MODE_MONO; -+ FcBool transform; -+ FcBool glyph_transform; - - if (!info) - return; -@@ -374,6 +547,8 @@ - if (!face) - return; - -+ if (font->info.color) -+ mode = FT_RENDER_MODE_NORMAL; - if (font->info.antialias) - { - switch (font->info.rgba) { -@@ -390,6 +565,8 @@ - } - } - -+ transform = font->info.transform && mode != FT_RENDER_MODE_MONO; -+ - while (nglyph--) - { - glyphindex = *glyphs++; -@@ -440,7 +617,7 @@ - /* - * Compute glyph metrics from FreeType information - */ -- if(font->info.transform && glyphslot->format != FT_GLYPH_FORMAT_BITMAP) -+ if (transform) - { - /* - * calculate the true width by transforming all four corners. -@@ -487,7 +664,7 @@ - * Clip charcell glyphs to the bounding box - * XXX transformed? - */ -- if (font->info.spacing >= FC_CHARCELL && !font->info.transform) -+ if (font->info.spacing >= FC_CHARCELL && !transform) - { - if (font->info.load_flags & FT_LOAD_VERTICAL_LAYOUT) - { -@@ -519,18 +696,20 @@ - } - } - -+ glyph_transform = transform; - if ( glyphslot->format != FT_GLYPH_FORMAT_BITMAP ) - { - error = FT_Render_Glyph( face->glyph, mode ); - if (error) - continue; -+ glyph_transform = False; - } - - FT_Library_SetLcdFilter( _XftFTlibrary, FT_LCD_FILTER_NONE ); - - if (font->info.spacing >= FC_MONO) - { -- if (font->info.transform) -+ if (transform) - { - if (font->info.load_flags & FT_LOAD_VERTICAL_LAYOUT) - { -@@ -613,14 +792,27 @@ - } - } - -- size = _compute_xrender_bitmap_size( &local, glyphslot, mode ); -+ size = _compute_xrender_bitmap_size( &local, glyphslot, mode, glyph_transform ? &font->info.matrix : NULL ); - if ( size < 0 ) - continue; - - xftg->metrics.width = (unsigned short)local.width; - xftg->metrics.height = (unsigned short)local.rows; -+ if (transform) -+ { -+ vector.x = - glyphslot->bitmap_left; -+ vector.y = glyphslot->bitmap_top; -+ -+ FT_Vector_Transform(&vector, &font->info.matrix); -+ -+ xftg->metrics.x = (short)vector.x; -+ xftg->metrics.y = (short)vector.y; -+ } -+ else -+ { - xftg->metrics.x = (short)(- glyphslot->bitmap_left); - xftg->metrics.y = (short)( glyphslot->bitmap_top); -+ } - - /* - * If the glyph is relatively large (> 1% of server memory), -@@ -645,6 +837,9 @@ - - local.buffer = bufBitmap; - -+ if (mode == FT_RENDER_MODE_NORMAL && glyph_transform) -+ _scaled_fill_xrender_bitmap(&local, &glyphslot->bitmap, &font->info.matrix); -+ else - _fill_xrender_bitmap( &local, glyphslot, mode, - (font->info.rgba == FC_RGBA_BGR || - font->info.rgba == FC_RGBA_VBGR ) ); -@@ -662,6 +857,7 @@ - */ - glyph = (Glyph) glyphindex; - -+ xftg->picture = 0; - xftg->glyph_memory = (size_t)size + sizeof (XftGlyph); - if (font->format) - { -@@ -685,12 +881,18 @@ - } - } - } -- else if ( mode != FT_RENDER_MODE_NORMAL ) -+ else if (glyphslot->bitmap.pixel_mode == FT_PIXEL_MODE_BGRA || mode != FT_RENDER_MODE_NORMAL) - { - /* invert ARGB <=> BGRA */ - if (ImageByteOrder (dpy) != XftNativeByteOrder ()) - XftSwapCARD32 ((CARD32 *) bufBitmap, size >> 2); - } -+ -+ if (glyphslot->bitmap.pixel_mode == FT_PIXEL_MODE_BGRA) -+ xftg->picture = _create_glyph_bgra_picture(dpy, font->format, -+ local.width, local.rows, -+ bufBitmap); -+ else - XRenderAddGlyphs (dpy, font->glyphset, &glyph, - &xftg->metrics, 1, - (char *) bufBitmap, size); -@@ -744,7 +946,9 @@ - { - if (font->format) - { -- if (font->glyphset) -+ if (xftg->picture) -+ XRenderFreePicture(dpy, xftg->picture); -+ else if (font->glyphset) - { - glyphBuf[nused++] = (Glyph) glyphindex; - if (nused == sizeof (glyphBuf) / sizeof (glyphBuf[0])) -diff '--color=auto' -bur a/src/xftint.h b/src/xftint.h ---- a/src/xftint.h 2022-06-09 11:41:58.673303128 +0700 -+++ b/src/xftint.h 2022-06-09 11:43:47.013299999 +0700 -@@ -85,6 +85,7 @@ - XGlyphInfo metrics; - void *bitmap; - unsigned long glyph_memory; -+ Picture picture; - } XftGlyph; - - /* -@@ -134,6 +135,7 @@ - FT_F26Dot6 xsize, ysize; /* pixel size */ - FcBool antialias; /* doing antialiasing */ - FcBool embolden; /* force emboldening */ -+ FcBool color; /* contains color glyphs */ - int rgba; /* subpixel order */ - int lcd_filter; /* lcd filter */ - FT_Matrix matrix; /* glyph transformation matrix */ -diff '--color=auto' -bur a/src/xftrender.c b/src/xftrender.c ---- a/src/xftrender.c 2022-06-09 11:41:58.673303128 +0700 -+++ b/src/xftrender.c 2022-06-09 11:55:55.976612399 +0700 -@@ -26,6 +26,47 @@ - #define NUM_ELT_LOCAL 128 - - /* -+ * Dispatch glyph drawing to the correct XRenderCompositeString function -+ */ -+static void -+_XftCompositeString (Display *dpy, -+ int op, -+ Picture src, -+ Picture dst, -+ XRenderPictFormat *format, -+ GlyphSet glyphset, -+ int srcx, -+ int srcy, -+ int dstx, -+ int dsty, -+ int charwidth, -+ unsigned int *chars, -+ int nchars) -+{ -+ if (nchars == 0) -+ return; -+ -+ switch (charwidth) { -+ case 1: -+ default: -+ XRenderCompositeString8 (dpy, op, -+ src, dst, format, glyphset, -+ srcx, srcy, dstx, dsty, (char*)chars, nchars); -+ break; -+ case 2: -+ XRenderCompositeString16(dpy, op, -+ src, dst, format, glyphset, -+ srcx, srcy, dstx, dsty, (unsigned short*)chars, nchars); -+ break; -+ case 4: -+ XRenderCompositeString32(dpy, op, -+ src, dst, format, glyphset, -+ srcx, srcy, dstx, dsty, (unsigned int*)chars, nchars); -+ break; -+ } -+} -+ -+/* - * Use the Render extension to draw the glyphs - */ - -@@ -43,12 +84,14 @@ - int nglyphs) - { - XftFontInt *font = (XftFontInt *) pub; -- int i; -+ int i, j; - FT_UInt missing[XFT_NMISSING]; - int nmissing; - FT_UInt g, max; - int size, width; -+ int dstx, dsty; - Glyph wire; -+ XftGlyph* glyph; - char *char8; - unsigned short *char16; - unsigned int *char32; -@@ -100,43 +143,94 @@ - if (!chars) - goto bail1; - } -+ dstx = x; -+ dsty = y; - char8 = (char *) chars; - char16 = (unsigned short *) chars; - char32 = (unsigned int *) chars; -- for (i = 0; i < nglyphs; i++) -+ for (i = 0, j = 0; i < nglyphs; i++) - { - wire = (Glyph) glyphs[i]; - if (wire >= (Glyph) font->num_glyphs || !font->glyphs[wire]) - wire = 0; -+ glyph = font->glyphs[wire]; -+ if (glyph->picture) -+ { -+ _XftCompositeString(dpy, op, src, dst, font->format, font->glyphset, -+ srcx, srcy, x, y, width, chars, j); -+ XRenderComposite(dpy, PictOpOver, glyph->picture, None, -+ dst, 0, 0, 0, 0, dstx, dsty - glyph->metrics.y, -+ glyph->metrics.width, glyph->metrics.height); -+ -+ dstx += glyph->metrics.xOff; -+ dsty += glyph->metrics.yOff; -+ -+ x = dstx; -+ y = dsty; -+ j = 0; -+ } -+ else -+ { - switch (width) { -- case 1: char8[i] = (char) wire; break; -- case 2: char16[i] = (unsigned short) wire; break; -- case 4: char32[i] = (unsigned int) wire; break; -+ case 1: char8[j] = (char) wire; break; -+ case 2: char16[j] = (unsigned short) wire; break; -+ case 4: char32[j] = (unsigned int) wire; break; - } -+ dstx += glyph->metrics.xOff; -+ dsty += glyph->metrics.yOff; -+ ++j; - } -- switch (width) { -+ } -+ _XftCompositeString(dpy, op, src, dst, font->format, font->glyphset, -+ srcx, srcy, x, y, width, chars, j); -+ if (chars != char_local) -+ free (chars); -+bail1: -+ if (glyphs_loaded) -+ _XftFontManageMemory (dpy, pub); -+} -+ -+/* -+ * Dispatch glyph drawing to the correct XRenderCompositeText function -+ */ -+static void -+_XftCompositeText (Display *dpy, -+ int op, -+ Picture src, -+ Picture dst, -+ XRenderPictFormat *format, -+ int srcx, -+ int srcy, -+ int dstx, -+ int dsty, -+ int eltwidth, -+ XGlyphElt8 *elts, -+ int nelt) -+{ -+ if (nelt == 0) -+ return; -+ -+ switch (eltwidth) { - case 1: - default: -- XRenderCompositeString8 (dpy, op, -- src, dst, font->format, font->glyphset, -- srcx, srcy, x, y, char8, nglyphs); -+ XRenderCompositeText8 (dpy, op, -+ src, dst, format, -+ srcx, srcy, dstx, dsty, -+ (XGlyphElt8*)elts, nelt); - break; - case 2: -- XRenderCompositeString16(dpy, op, -- src, dst, font->format, font->glyphset, -- srcx, srcy, x, y, char16, nglyphs); -+ XRenderCompositeText16(dpy, op, -+ src, dst, format, -+ srcx, srcy, dstx, dsty, -+ (XGlyphElt16*)elts, nelt); - break; - case 4: -- XRenderCompositeString32(dpy, op, -- src, dst, font->format, font->glyphset, -- srcx, srcy, x, y, char32, nglyphs); -+ XRenderCompositeText32(dpy, op, -+ src, dst, format, -+ srcx, srcy, dstx, dsty, -+ (XGlyphElt32*)elts, nelt); - break; - } -- if (chars != char_local) -- free (chars); --bail1: -- if (glyphs_loaded) -- _XftFontManageMemory (dpy, pub); - } - - _X_EXPORT void -@@ -251,9 +345,10 @@ - g = 0; - /* - * check to see if the glyph is placed where it would -- * fall using the normal spacing -+ * fall using the normal spacing and if it would render -+ * as a XRender glyph - */ -- if ((glyph = font->glyphs[g])) -+ if ((glyph = font->glyphs[g]) && !glyph->picture) - { - if (x != glyphs[i].x || y != glyphs[i].y) - { -@@ -267,7 +362,7 @@ - } - - elts = elts_local; -- if (nelt > NUM_ELT_LOCAL) -+ if (!font->info.color && nelt > NUM_ELT_LOCAL) - { - elts = malloc ((size_t)nelt * sizeof (XGlyphElt8)); - if (!elts) -@@ -275,7 +370,7 @@ - } - - /* -- * Generate the list of glyph elts -+ * Generate the list of glyph elts or render color glyphs - */ - nelt = 0; - x = y = 0; -@@ -289,6 +384,14 @@ - g = 0; - if ((glyph = font->glyphs[g])) - { -+ if (glyph->picture) -+ { -+ XRenderComposite(dpy, PictOpOver, glyph->picture, None, -+ dst, 0, 0, 0, 0, -+ glyphs[i].x, glyphs[i].y - glyph->metrics.y, -+ glyph->metrics.width, glyph->metrics.height); -+ continue; -+ } - if (!i || x != glyphs[i].x || y != glyphs[i].y) - { - if (n) -@@ -320,23 +423,9 @@ - elts[nelt].nchars = n; - nelt++; - } -- switch (width) { -- case 1: -- XRenderCompositeText8 (dpy, op, src, dst, font->format, -- srcx, srcy, glyphs[0].x, glyphs[0].y, -- elts, nelt); -- break; -- case 2: -- XRenderCompositeText16 (dpy, op, src, dst, font->format, -+ _XftCompositeText(dpy, op, src, dst, font->format, - srcx, srcy, glyphs[0].x, glyphs[0].y, -- (XGlyphElt16 *) elts, nelt); -- break; -- case 4: -- XRenderCompositeText32 (dpy, op, src, dst, font->format, -- srcx, srcy, glyphs[0].x, glyphs[0].y, -- (XGlyphElt32 *) elts, nelt); -- break; -- } -+ width, elts, nelt); - - if (elts != elts_local) - free (elts); -@@ -538,7 +627,7 @@ - * check to see if the glyph is placed where it would - * fall using the normal spacing - */ -- if ((glyph = font->glyphs[g])) -+ if ((glyph = font->glyphs[g]) && !glyph->picture) - { - if (pub != prevPublic || x != glyphs[i].x || y != glyphs[i].y) - { -@@ -563,7 +652,7 @@ - } - - /* -- * Generate the list of glyph elts -+ * Generate the list of glyph elts and render color glyphs - */ - nelt = 0; - x = y = 0; -@@ -581,6 +670,14 @@ - g = 0; - if ((glyph = font->glyphs[g])) - { -+ if (glyph->picture) -+ { -+ XRenderComposite(dpy, PictOpOver, glyph->picture, None, -+ dst, 0, 0, 0, 0, -+ glyphs[i].x, glyphs[i].y - glyph->metrics.y, -+ glyph->metrics.width, glyph->metrics.height); -+ continue; -+ } - if (!i || pub != prevPublic || x != glyphs[i].x || y != glyphs[i].y) - { - if (n) -@@ -613,23 +710,9 @@ - elts[nelt].nchars = n; - nelt++; - } -- switch (width) { -- case 1: -- XRenderCompositeText8 (dpy, op, src, dst, format, -- srcx, srcy, glyphs[0].x, glyphs[0].y, -- elts, nelt); -- break; -- case 2: -- XRenderCompositeText16 (dpy, op, src, dst, format, -+ _XftCompositeText(dpy, op, src, dst, format, - srcx, srcy, glyphs[0].x, glyphs[0].y, -- (XGlyphElt16 *) elts, nelt); -- break; -- case 4: -- XRenderCompositeText32 (dpy, op, src, dst, format, -- srcx, srcy, glyphs[0].x, glyphs[0].y, -- (XGlyphElt32 *) elts, nelt); -- break; -- } -+ width, elts, nelt); - - if (elts != elts_local) - free (elts); -Only in b/src: xftrender.c.rej @@ -1,6 +1,6 @@ pkgname=libxft-bgra-git _dir=libxft -pkgver=2.3.4.r147.42c6616 +pkgver=2.3.4.r169.4356b58 pkgrel=1 pkgdesc="libXft with BGRA glyph (color emoji) rendering & scaling patches by Maxime Coste" arch=('x86_64') @@ -10,9 +10,9 @@ provides=('libxft') conflicts=('libxft') url="https://gitlab.freedesktop.org/xorg/lib/libxft.git" depends=('fontconfig' 'libxrender') -makedepends=('git' 'pkgconf' 'automake' 'xorg-util-macros' 'autoconf' 'patch' 'make' 'libtool' 'gcc') -source=("git+$url" '1.patch') -md5sums=('SKIP' '49c10bb362132e2c0e37296ae95db279') +makedepends=('git' 'pkgconf' 'automake' 'xorg-util-macros' 'autoconf' 'make' 'libtool' 'gcc') +source=("git+$url") +md5sums=('SKIP') pkgver() { cd "${_dir}" @@ -21,7 +21,6 @@ pkgver() { build() { cd "${_dir}" - patch -p1 < ../1.patch sh autogen.sh --sysconfdir=/etc --prefix=/usr --mandir=/usr/share/man make } |