October 2021 - crux-commits

ports/contrib (3.6): pandoc-bin: 2.15 -> 2.16
by crux＠crux.nu 31 Oct '21

31 Oct '21

commit 9012b47ca1bfec40ee54fb3e3bdb4332818a5bf6 Author: Tim Biermann <tbier(a)posteo.de> Date: Sun Oct 31 22:29:12 2021 +0100 pandoc-bin: 2.15 -> 2.16 diff --git a/pandoc-bin/.signature b/pandoc-bin/.signature index 28f49446f..5674ece3f 100644 --- a/pandoc-bin/.signature +++ b/pandoc-bin/.signature @@ -1,6 +1,6 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3wVA0p6u+iQUc/Xj+hSbqPNT4Fi8A6u/rAEdcKDmOwJEIn2zDf9T50XDNxmFBIF3O80mrFm67S1zMR1+/vA/Cw4= -SHA256 (Pkgfile) = 741cfe70ae2b7aaf5095d25fa567abe78f647ac1cb0ce634c808f7e3190f5b91 +RWSagIOpLGJF34WjdGICj0obIK838xwXQI9/RiInlItOscRVY0dvQw1Old5yMsh+aJHw3jcx8gC3nnZeu8M6xvs4uhDcoMz+/QU= +SHA256 (Pkgfile) = 43ce15cffcbf8d2d0011226482d21cf8e2c06ef1b08dae776415900beda74447 SHA256 (.footprint) = 5545f3c8e7dfdbac04daaf50c7608591f45e6e06e36da14eeb0ed5a3f099b070 -SHA256 (pandoc-2.15-linux-amd64.tar.gz) = 31074d3a6a62c22ef53d0ebfed2a4798f2b95034863cce215bf84e4601ad17c4 -SHA256 (pandoc-2.15.tar.gz) = 70ac946140fc2069421c659613f554bb8943b9c41cd179b50af38d52d630045e +SHA256 (pandoc-2.16-linux-amd64.tar.gz) = d3961adc1805641bf11dcd36ed5f5ed168c84f67e6d7b920ed981cc4ac1e0b07 +SHA256 (pandoc-2.16.tar.gz) = 1ba3adfd7bdbbd8ce30690abd789e09db9e8bb7c97df74f955a23a9c1fcdf562 diff --git a/pandoc-bin/Pkgfile b/pandoc-bin/Pkgfile index 349b6ad3b..378e8e097 100644 --- a/pandoc-bin/Pkgfile +++ b/pandoc-bin/Pkgfile @@ -5,7 +5,7 @@ # Optional: texlive name=pandoc-bin -version=2.15 +version=2.16 release=1 source=(https://github.com/jgm/pandoc/releases/download/$version/pandoc-$ve… https://github.com/jgm/pandoc/archive/$version/pandoc-$version.tar.gz)

1 0

ports/opt (3.6): shared-mime-info: patched for meson 0.60
by crux＠crux.nu 31 Oct '21

31 Oct '21

commit f25b6bc6bbb34e89cdfdbf7962ef93d93c5c72b7 Author: Tim Biermann <tbier(a)posteo.de> Date: Sun Oct 31 21:35:58 2021 +0100 shared-mime-info: patched for meson 0.60 diff --git a/shared-mime-info/.signature b/shared-mime-info/.signature index d0593fe8d..bdc4fd1c4 100644 --- a/shared-mime-info/.signature +++ b/shared-mime-info/.signature @@ -1,7 +1,8 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/VEJq9GBF/w8frUj4UhANIHf5UoMtPTMoVxSHiZFeN1wYt0ivM8PWhtMtZ9e3WHE+czjU/4+rq8wJdfz8qUR7Qo= -SHA256 (Pkgfile) = 6fa8dd6cc0797c79d2fc7263e03dff6543fa1955f9fe4d67a0f7d39d17a170a9 +RWSE3ohX2g5d/Rqei6tPEjX5hns+d+8eB5VALO/CxHUQG1KDNA5me2QBstMwZcYY4VyL95N71QjeAbPYz+jLIF3/3anaOjFpgwU= +SHA256 (Pkgfile) = 7e114b5344489e1b447aed6d414c87d9d006d55f5902744c15703a2d10510041 SHA256 (.footprint) = c13123d9ba9dbe629ffe8847ef1a81f6c463800dc6160415e5d81f10c9947ea3 SHA256 (shared-mime-info-2.1.tar.bz2) = 37df6475da31a8b5fc63a54ba0770a3eefa0a708b778cb6366dccee96393cb60 SHA256 (xdgmime-cecafc8cd5cd725444b914d5f6cd17308633afa8.tar.bz2) = fd675b4d63fb2d9724bceaa26e24849ffce1be3d0a5415efd60c758529e717a7 SHA256 (remove-weird-docs.patch) = 651cc9102ae07d1be81b3ef4ebf4f97dca89ce5cc04c3f49edf2986793d77e0f +SHA256 (meson060.patch) = 8da72ccb5fa9f87a5969631fef6e47ff9713affec3464bb25d7e5b3cb945b62e diff --git a/shared-mime-info/Pkgfile b/shared-mime-info/Pkgfile index 92dda6433..103c076b1 100644 --- a/shared-mime-info/Pkgfile +++ b/shared-mime-info/Pkgfile @@ -9,7 +9,7 @@ release=1 _xdgmimever=cecafc8cd5cd725444b914d5f6cd17308633afa8 source=(https://gitlab.freedesktop.org/xdg/shared-mime-info/-/archive/$vers… https://gitlab.freedesktop.org/xdg/xdgmime/-/archive/$_xdgmimever/xdgmime-$… - remove-weird-docs.patch) + remove-weird-docs.patch meson060.patch) build() { # Build mime database @@ -20,6 +20,7 @@ build() { # We don't want to include fancy docs # Deletes references to xmllint and xmlto patch -Np1 -d $name-$version -i $SRC/remove-weird-docs.patch + patch -Np1 -d $name-$version -i $SRC/meson060.patch meson $name-$version build \ --prefix=/usr \ diff --git a/shared-mime-info/meson060.patch b/shared-mime-info/meson060.patch new file mode 100644 index 000000000..4f73f0ad0 --- /dev/null +++ b/shared-mime-info/meson060.patch @@ -0,0 +1,10 @@ +diff --git a/data/freedesktop_generate.sh b/data/freedesktop_generate.sh +index ff13e75..2cb0458 100755 +--- a/data/freedesktop_generate.sh ++++ b/data/freedesktop_generate.sh +@@ -9,4 +9,4 @@ itstool \ + --its "${src_root}/data/its/shared-mime-info.its" \ + --join "${src_root}/data/freedesktop.org.xml.in" \ + -o "${build_root}/data/freedesktop.org.xml" \ +- "${build_root}/po/"*".gmo" ++ "${build_root}/po/"*"/LC_MESSAGES/shared-mime-info.mo"

1 0

ports/opt (3.6): polkit: patched for meson 0.60
by crux＠crux.nu 31 Oct '21

31 Oct '21

commit c1208b887b68ff9e668a6aca9b4f21494145c24d Author: Tim Biermann <tbier(a)posteo.de> Date: Sun Oct 31 18:21:34 2021 +0100 polkit: patched for meson 0.60 diff --git a/polkit/.signature b/polkit/.signature index aab264945..412587642 100644 --- a/polkit/.signature +++ b/polkit/.signature @@ -1,6 +1,7 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/VGO9x9ClZqmxgVMG++XquIKqZiNcPSpw9SzJemsFkD9KvVseYcwzAgGcl8GDxyZRlb7llGTgTEmDc0GrbNL1wc= -SHA256 (Pkgfile) = 8744adebbd84c54feee9e4b1ecb9b1cff20e6396421d724e485db47b4349a8b2 +RWSE3ohX2g5d/Rw84KMLAEMJnMuFubZf34af78qsvRl1zkkTMPDoh9RPPw4TXv70WixN6nNFYeXC+KWjS/EOQ7QnaSN/He6kHQE= +SHA256 (Pkgfile) = c7e291ebf0f1f74582be59faeeabe2b661413b3587e90ff4d219827d0c78c9b4 SHA256 (.footprint) = 7ae3e87d2e0379db60e118c5b79938e87319b3460d1907ef73524cbdad79db15 SHA256 (polkit-0.120.tar.gz) = ee7a599a853117bf273548725719fa92fabd2f136915c7a4906cee98567aee03 SHA256 (polkit-1) = 9045eb2a1e2e403b0144d14a5cfe903dc97cfef979c956815a56777c0eb1bf1a +SHA256 (99.patch) = 9a84b59d38b3f86c70c5fc3a28cbfe8d7a22cf190eb20ff433f7f53f5ff73a9a diff --git a/polkit/99.patch b/polkit/99.patch new file mode 100644 index 000000000..5e144688d --- /dev/null +++ b/polkit/99.patch @@ -0,0 +1,42 @@ +From e7f3d9e8341df64e2abc3910dafb1113a84bff07 Mon Sep 17 00:00:00 2001 +From: Simon McVittie <smcv(a)debian.org> +Date: Mon, 25 Oct 2021 20:21:27 +0100 +Subject: [PATCH] Don't pass positional parameters to i18n.merge_file + +These were always ignored, and Meson 0.60.0 disallowed them. + +Resolves: https://gitlab.freedesktop.org/polkit/polkit/-/issues/160 +Reference: https://github.com/mesonbuild/meson/pull/9445 +Signed-off-by: Simon McVittie <smcv(a)debian.org> +--- + actions/meson.build | 1 - + src/examples/meson.build | 1 - + 2 files changed, 2 deletions(-) + +diff --git a/actions/meson.build b/actions/meson.build +index 2abaaf3..1e3f370 100644 +--- a/actions/meson.build ++++ b/actions/meson.build +@@ -1,7 +1,6 @@ + policy = 'org.freedesktop.policykit.policy' + + i18n.merge_file( +- policy, + input: policy + '.in', + output: '@BASENAME@', + po_dir: po_dir, +diff --git a/src/examples/meson.build b/src/examples/meson.build +index c6305ab..8c18de5 100644 +--- a/src/examples/meson.build ++++ b/src/examples/meson.build +@@ -1,7 +1,6 @@ + policy = 'org.freedesktop.policykit.examples.pkexec.policy' + + i18n.merge_file( +- policy, + input: policy + '.in', + output: '@BASENAME@', + po_dir: po_dir, +-- +GitLab + diff --git a/polkit/Pkgfile b/polkit/Pkgfile index 63c866599..b8bdf9dad 100644 --- a/polkit/Pkgfile +++ b/polkit/Pkgfile @@ -5,11 +5,13 @@ name=polkit version=0.120 -release=1 +release=2 source=(https://freedesktop.org/software/polkit/releases/$name-$version.tar… - polkit-1) + polkit-1 99.patch) build() { + patch -Np1 -d $name-$version -i $SRC/99.patch + meson setup $name-$version build \ --prefix=/usr \ --buildtype=plain \

1 0

ports/opt (3.6): [notify] freetype: switched to meson/ninja, included a bunch of patches for prettier font rendering, compatibility with chromium/electron and more. Checking revdep after updating is a must
by crux＠crux.nu 31 Oct '21

31 Oct '21

commit 0a0506972c45a330511cabee47a3fdcdab9c887e Author: Tim Biermann <tbier(a)posteo.de> Date: Sun Oct 31 17:54:08 2021 +0100 [notify] freetype: switched to meson/ninja, included a bunch of patches for prettier font rendering, compatibility with chromium/electron and more. Checking revdep after updating is a must diff --git a/freetype/.footprint b/freetype/.footprint index 7a5f228d1..17a33138e 100644 --- a/freetype/.footprint +++ b/freetype/.footprint @@ -1,6 +1,7 @@ +drwxr-xr-x root/root etc/ +drwxr-xr-x root/root etc/profile.d/ +-rw-r--r-- root/root etc/profile.d/freetype2.sh drwxr-xr-x root/root usr/ -drwxr-xr-x root/root usr/bin/ --rwxr-xr-x root/root usr/bin/freetype-config drwxr-xr-x root/root usr/include/ drwxr-xr-x root/root usr/include/freetype2/ drwxr-xr-x root/root usr/include/freetype2/freetype/ @@ -35,7 +36,6 @@ drwxr-xr-x root/root usr/include/freetype2/freetype/config/ -rw-r--r-- root/root usr/include/freetype2/freetype/ftincrem.h -rw-r--r-- root/root usr/include/freetype2/freetype/ftlcdfil.h -rw-r--r-- root/root usr/include/freetype2/freetype/ftlist.h --rw-r--r-- root/root usr/include/freetype2/freetype/ftlogging.h -rw-r--r-- root/root usr/include/freetype2/freetype/ftlzw.h -rw-r--r-- root/root usr/include/freetype2/freetype/ftmac.h -rw-r--r-- root/root usr/include/freetype2/freetype/ftmm.h @@ -60,16 +60,8 @@ drwxr-xr-x root/root usr/include/freetype2/freetype/config/ -rw-r--r-- root/root usr/include/freetype2/freetype/tttags.h -rw-r--r-- root/root usr/include/freetype2/ft2build.h drwxr-xr-x root/root usr/lib/ --rw-r--r-- root/root usr/lib/libfreetype.a --rwxr-xr-x root/root usr/lib/libfreetype.la -lrwxrwxrwx root/root usr/lib/libfreetype.so -> libfreetype.so.6.18.0 +lrwxrwxrwx root/root usr/lib/libfreetype.so -> libfreetype.so.6 lrwxrwxrwx root/root usr/lib/libfreetype.so.6 -> libfreetype.so.6.18.0 -rwxr-xr-x root/root usr/lib/libfreetype.so.6.18.0 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/freetype2.pc -drwxr-xr-x root/root usr/share/ -drwxr-xr-x root/root usr/share/aclocal/ --rw-r--r-- root/root usr/share/aclocal/freetype2.m4 -drwxr-xr-x root/root usr/share/man/ -drwxr-xr-x root/root usr/share/man/man1/ --rw-r--r-- root/root usr/share/man/man1/freetype-config.1.gz diff --git a/freetype/.signature b/freetype/.signature index 559975272..1c9eed95c 100644 --- a/freetype/.signature +++ b/freetype/.signature @@ -1,5 +1,16 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/deo7ySSG5FBZa4ZBQyHVHRPYMlAd7XR6EwrVfKKt6S1XUqwd46mJFxwE0Jbcq9UBPHEFXv793pVNtfbShfzPQE= -SHA256 (Pkgfile) = ec010edf50e1fd4181247cdcda18a61b1216f7170c4f6ac85509b41dbe5fe0f8 -SHA256 (.footprint) = 9bcef8a8c4324e32878ae3cd3d28da10201c6b7ae851470269648b6364defbdf +RWSE3ohX2g5d/THnwN6vnoNdeaXWGZRyk/xeSc7NImmauDAqIdjDsVTjJ9rEC4SO3QnpXnQKNXrS2f9Z5POJfjuIxBNXyq9vBw0= +SHA256 (Pkgfile) = 38f3d951de81beb295f3691810a3bfdb3ccc9508606d04d28f64eeecc47e9356 +SHA256 (.footprint) = a8bec42616674a83ffa67823566f97ea9753f385af12a02157efb4a865c10e56 SHA256 (freetype-2.11.0.tar.xz) = 8bee39bd3968c4804b70614a0a3ad597299ad0e824bc8aad5ce8aaf48067bde7 +SHA256 (freetype2.sh) = f7f8e09c44f7552c883846e9a6a1efc50377c4932234e74adc4a8ff750606467 +SHA256 (dlg-0cc0d3eaed28483fc8036d90ac18878ebd83ed87.tar.gz) = 768b226c285698fe8d371b435c99165697c1bebff6463681cff11c4e91c1c557 +SHA256 (0001-Enable-table-validation-modules.patch) = f41df4f336d5e82e58733c7a4594476c9216cfc85c096327745a7e1b559e17e1 +SHA256 (0002-Enable-subpixel-rendering.patch) = dc77c1cfee4bf8e7e0690628c95d211df09e0d0750e4c8f075b78b5f105514f7 +SHA256 (0003-Enable-infinality-subpixel-hinting.patch) = 21a62bc12b848320c686d602d8d4e3bcd51294a9def4dc9c301736e077b59f3f +SHA256 (0004-Enable-long-PCF-family-names.patch) = 266384222f87a02fb02b2179828f6c26fe6d7b1fd09d1f7e3734e7fcb09cda2e +SHA256 (0006-Return_FT_Err_Ok_while_trying_to_render_bitmap.patch) = 2b13b8cc9acc3e56be6b0f8102d648864227bf93637bc956d5052c77c8509782 +SHA256 (0007-Restore_quiet_no-op_rendering_of_bitmap_glyphs.patch) = 21a2d243bc6b44d1cdb88ef29af2bd5ceda8d0faaf928bdc2c078a474ddc61f1 +SHA256 (0008-sfnt-Add-API-for-retrieving-a-COLR-v1-ClipBox-table.patch) = 13aba5006db13522ff0f3ffc85f81058b6cfcc48671285b1a90ac041a6a51952 +SHA256 (0009-src-sfnt-ttcolr.c-tt_face_get_color_glyph_clipbox-Mi.patch) = 09a01b99839fc864db7a2c0748b4703ac5b04897cbd35e0d8969024b4ba89649 +SHA256 (0010-sfnt-Add-missing-blend-mode-plus-to-COLR-v1.patch) = fbabfb745db32e1d90f9798e1018da26578f3bce9714dac8e64c15b691e76f69 diff --git a/freetype/0001-Enable-table-validation-modules.patch b/freetype/0001-Enable-table-validation-modules.patch new file mode 100644 index 000000000..4c469faf6 --- /dev/null +++ b/freetype/0001-Enable-table-validation-modules.patch @@ -0,0 +1,42 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: "Jan Alexander Steffens (heftig)" <jan.steffens(a)gmail.com> +Date: Tue, 23 Jun 2015 08:40:29 +0200 +Subject: [PATCH] Enable table validation modules + +--- + modules.cfg | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/modules.cfg b/modules.cfg +index d6cdbe523..181f91541 100644 +--- a/modules.cfg ++++ b/modules.cfg +@@ -111,26 +111,26 @@ AUX_MODULES += cache + + # TrueType GX/AAT table validation. Needs `ftgxval.c' below. + # +-# AUX_MODULES += gxvalid ++AUX_MODULES += gxvalid + + # Support for streams compressed with gzip (files with suffix .gz). + # + # See include/freetype/ftgzip.h for the API. + AUX_MODULES += gzip + + # Support for streams compressed with LZW (files with suffix .Z). + # + # See include/freetype/ftlzw.h for the API. + AUX_MODULES += lzw + + # Support for streams compressed with bzip2 (files with suffix .bz2). + # + # See include/freetype/ftbzip2.h for the API. + AUX_MODULES += bzip2 + + # OpenType table validation. Needs `ftotval.c' below. + # +-# AUX_MODULES += otvalid ++AUX_MODULES += otvalid + + # Auxiliary PostScript driver component to share common code. + # diff --git a/freetype/0002-Enable-subpixel-rendering.patch b/freetype/0002-Enable-subpixel-rendering.patch new file mode 100644 index 000000000..26360b5c0 --- /dev/null +++ b/freetype/0002-Enable-subpixel-rendering.patch @@ -0,0 +1,22 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: "Jan Alexander Steffens (heftig)" <jan.steffens(a)gmail.com> +Date: Tue, 23 Jun 2015 08:43:07 +0200 +Subject: [PATCH] Enable subpixel rendering + +--- + include/freetype/config/ftoption.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h +index 097f19b8a..e5de62e35 100644 +--- a/include/freetype/config/ftoption.h ++++ b/include/freetype/config/ftoption.h +@@ -124,7 +124,7 @@ FT_BEGIN_HEADER + * When this macro is not defined, FreeType offers alternative LCD + * rendering technology that produces excellent output. + */ +-/* #define FT_CONFIG_OPTION_SUBPIXEL_RENDERING */ ++#define FT_CONFIG_OPTION_SUBPIXEL_RENDERING + + + /************************************************************************** diff --git a/freetype/0003-Enable-infinality-subpixel-hinting.patch b/freetype/0003-Enable-infinality-subpixel-hinting.patch new file mode 100644 index 000000000..d2369893a --- /dev/null +++ b/freetype/0003-Enable-infinality-subpixel-hinting.patch @@ -0,0 +1,24 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: "Jan Alexander Steffens (heftig)" <jan.steffens(a)gmail.com> +Date: Mon, 29 Aug 2016 08:43:10 +0200 +Subject: [PATCH] Enable infinality subpixel hinting + +--- + include/freetype/config/ftoption.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h +index e5de62e35..acb4d6d6a 100644 +--- a/include/freetype/config/ftoption.h ++++ b/include/freetype/config/ftoption.h +@@ -672,8 +672,8 @@ FT_BEGIN_HEADER + * https://www.microsoft.com/typography/cleartype/truetypecleartype.aspx + */ + /* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING 1 */ +-#define TT_CONFIG_OPTION_SUBPIXEL_HINTING 2 +-/* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING ( 1 | 2 ) */ ++/* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING 2 */ ++#define TT_CONFIG_OPTION_SUBPIXEL_HINTING ( 1 | 2 ) + + + /************************************************************************** diff --git a/freetype/0004-Enable-long-PCF-family-names.patch b/freetype/0004-Enable-long-PCF-family-names.patch new file mode 100644 index 000000000..45fb72c4b --- /dev/null +++ b/freetype/0004-Enable-long-PCF-family-names.patch @@ -0,0 +1,22 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: "Jan Alexander Steffens (heftig)" <jan.steffens(a)gmail.com> +Date: Sun, 14 May 2017 18:09:31 +0200 +Subject: [PATCH] Enable long PCF family names + +--- + include/freetype/config/ftoption.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h +index acb4d6d6a..efa13b9c6 100644 +--- a/include/freetype/config/ftoption.h ++++ b/include/freetype/config/ftoption.h +@@ -861,7 +861,7 @@ FT_BEGIN_HEADER + * If this option is activated, it can be controlled with the + * `no-long-family-names` property of the 'pcf' driver module. + */ +-/* #define PCF_CONFIG_OPTION_LONG_FAMILY_NAMES */ ++#define PCF_CONFIG_OPTION_LONG_FAMILY_NAMES + + + /*************************************************************************/ diff --git a/freetype/0006-Return_FT_Err_Ok_while_trying_to_render_bitmap.patch b/freetype/0006-Return_FT_Err_Ok_while_trying_to_render_bitmap.patch new file mode 100644 index 000000000..5e1d8dc52 --- /dev/null +++ b/freetype/0006-Return_FT_Err_Ok_while_trying_to_render_bitmap.patch @@ -0,0 +1,35 @@ +From d7f649f283763af099256eb2d5e326df601c3e76 Mon Sep 17 00:00:00 2001 +From: Anuj Verma <anujv(a)iitbhilai.ac.in> +Date: Mon, 16 Aug 2021 07:48:09 +0530 +Subject: [PATCH] [sdf] Return `FT_Err_Ok` while trying to render bitmap. + + * src/sdf/ftsdfrend.c (ft_bsdf_render): Return OK if the slot is + a bitmap and the render mode is anything other than `FT_RENDER_MODE_SDF`. + This is for compatibility reasons. + + Fixes issue #1076 +--- + src/sdf/ftsdfrend.c | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/src/sdf/ftsdfrend.c b/src/sdf/ftsdfrend.c +index 30f2e62a4..5686c0bf5 100644 +--- a/src/sdf/ftsdfrend.c ++++ b/src/sdf/ftsdfrend.c +@@ -502,8 +502,11 @@ + /* check whether render mode is correct */ + if ( mode != FT_RENDER_MODE_SDF ) + { +- error = FT_THROW( Cannot_Render_Glyph ); +- goto Exit; ++ FT_TRACE0(( "ft_bsdf_render: trying to render bitmap\n" )); ++ ++ /* return OK since the slot is already a bitmap */ ++ error = FT_Err_Ok; ++ return error; + } + + if ( origin ) +-- +GitLab + diff --git a/freetype/0007-Restore_quiet_no-op_rendering_of_bitmap_glyphs.patch b/freetype/0007-Restore_quiet_no-op_rendering_of_bitmap_glyphs.patch new file mode 100644 index 000000000..46206465f --- /dev/null +++ b/freetype/0007-Restore_quiet_no-op_rendering_of_bitmap_glyphs.patch @@ -0,0 +1,41 @@ +From 6e9d8d314ff6ab23177b9162c0b96616460bb84e Mon Sep 17 00:00:00 2001 +From: Alexei Podtelezhnikov <apodtele(a)gmail.com> +Date: Fri, 20 Aug 2021 16:01:32 -0400 +Subject: [PATCH] [base] Restore quiet no-op rendering of bitmap glyphs. + +Fixes #1076. + +* src/base/ftobjs.c (FT_Render_Glyph_Internal): Discard an error when +rendering a bitmap glyph. +--- + src/base/ftobjs.c | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/src/base/ftobjs.c b/src/base/ftobjs.c +index 342ac4a27..7b40c6421 100644 +--- a/src/base/ftobjs.c ++++ b/src/base/ftobjs.c +@@ -4703,7 +4703,7 @@ + else + renderer = FT_Lookup_Renderer( library, slot->format, &node ); + +- error = FT_ERR( Unimplemented_Feature ); ++ error = FT_ERR( Cannot_Render_Glyph ); + while ( renderer ) + { + error = renderer->render( renderer, slot, render_mode, NULL ); +@@ -4719,6 +4719,11 @@ + /* format. */ + renderer = FT_Lookup_Renderer( library, slot->format, &node ); + } ++ ++ /* it is not an error if we cannot render a bitmat glyph */ ++ if ( FT_ERR_EQ( error, Cannot_Render_Glyph ) && ++ slot->format == FT_GLYPH_FORMAT_BITMAP ) ++ error = FT_Err_Ok; + } + } + +-- +GitLab + diff --git a/freetype/0008-sfnt-Add-API-for-retrieving-a-COLR-v1-ClipBox-table.patch b/freetype/0008-sfnt-Add-API-for-retrieving-a-COLR-v1-ClipBox-table.patch new file mode 100644 index 000000000..be0ad6973 --- /dev/null +++ b/freetype/0008-sfnt-Add-API-for-retrieving-a-COLR-v1-ClipBox-table.patch @@ -0,0 +1,474 @@ +From 47cf8ebf4a78ed42da455a98d77a92ce6a180d78 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Dominik=20R=C3=B6ttsches?= <drott(a)chromium.org> +Date: Wed, 28 Jul 2021 17:36:57 +0300 +Subject: [PATCH] [sfnt] Add API for retrieving a 'COLR' v1 'ClipBox' table. + +The optional 'COLR' v1 glyph-specific clip box helps upstream graphics +libraries allocate a sufficiently large bitmap for a glyph without having to +traverse the glyph graph for that. See + + https://github.com/googlefonts/colr-gradients-spec/issues/251 + +for background on the introduction of this specification change. + +* include/freetype/ftcolor.h (FT_ClipBox): New structure. +(FT_Get_Color_Glyph_ClipBox): New function declaration. + +* include/freetype/internal/sfnt.h (TT_Get_Color_Glyph_ClipBox_Func): +New function type. +(SFNT_Interface, FT_DEFINE_SFNT_INTERFACE): Use it. + +* src/base/ftobjs.c (FT_Get_Color_Glyph_ClipBox): New function to link API +with SFNT implementation. + +* src/sfnt/sfdriver.c (sfnt_interface): Updated. +* src/sfnt/ttcolr.c (Colr): New field `clip_list`. +(tt_face_load_colr): Parse global clip list offset. +(tt_face_get_color_glyph_clipbox): New function to find the clip box for a +glyph id from the clip list array. +* src/sfnt/ttcolr.h: Updated. +--- + include/freetype/ftcolor.h | 86 +++++++++++++++++++++ + include/freetype/internal/sfnt.h | 63 +++++++++++++--- + src/base/ftobjs.c | 29 +++++++ + src/sfnt/sfdriver.c | 10 ++- + src/sfnt/ttcolr.c | 125 ++++++++++++++++++++++++++++++- + src/sfnt/ttcolr.h | 5 ++ + 6 files changed, 302 insertions(+), 16 deletions(-) + +diff --git a/include/freetype/ftcolor.h b/include/freetype/ftcolor.h +index a4bd62a26..b98289917 100644 +--- a/include/freetype/ftcolor.h ++++ b/include/freetype/ftcolor.h +@@ -1383,6 +1383,49 @@ FT_BEGIN_HEADER + } FT_Color_Root_Transform; + + ++ /************************************************************************** ++ * ++ * @struct: ++ * FT_ClipBox ++ * ++ * @description: ++ * A structure representing a 'COLR' v1 'ClipBox' table. 'COLR' v1 ++ * glyphs may optionally define a clip box for aiding allocation or ++ * defining a maximum drawable region. Use @FT_Get_Color_Glyph_ClipBox ++ * to retrieve it. ++ * ++ * @fields: ++ * bottom_left :: ++ * The bottom left corner of the clip box as an @FT_Vector with ++ * fixed-point coordinates in 26.6 format. ++ * ++ * top_left :: ++ * The top left corner of the clip box as an @FT_Vector with ++ * fixed-point coordinates in 26.6 format. ++ * ++ * top_right :: ++ * The top right corner of the clip box as an @FT_Vector with ++ * fixed-point coordinates in 26.6 format. ++ * ++ * bottom_right :: ++ * The bottom right corner of the clip box as an @FT_Vector with ++ * fixed-point coordinates in 26.6 format. ++ * ++ * @since: ++ * 2.12 -- **currently experimental only!** There might be changes ++ * without retaining backward compatibility of both the API and ABI. ++ * ++ */ ++ typedef struct FT_ClipBox_ ++ { ++ FT_Vector bottom_left; ++ FT_Vector top_left; ++ FT_Vector top_right; ++ FT_Vector bottom_right; ++ ++ } FT_ClipBox; ++ ++ + /************************************************************************** + * + * @function: +@@ -1475,6 +1518,49 @@ FT_BEGIN_HEADER + FT_OpaquePaint* paint ); + + ++ /************************************************************************** ++ * ++ * @function: ++ * FT_Get_Color_Glyph_ClipBox ++ * ++ * @description: ++ * Search for a 'COLR' v1 clip box for the specified `base_glyph` and ++ * fill the `clip_box` parameter with the 'COLR' v1 'ClipBox' information ++ * if one is found. ++ * ++ * @input: ++ * face :: ++ * A handle to the parent face object. ++ * ++ * base_glyph :: ++ * The glyph index for which to retrieve the clip box. ++ * ++ * @output: ++ * clip_box :: ++ * The clip box for the requested `base_glyph` if one is found. The ++ * clip box is computed taking scale and transformations configured on ++ * the @FT_Face into account. @FT_ClipBox contains @FT_Vector values ++ * in 26.6 format. ++ * ++ * @return: ++ * Value~1 if a clip box is found. If no clip box is found or an error ++ * occured, value~0 is returned. ++ * ++ * @note: ++ * To retrieve the clip box in font units, reset scale to units-per-em ++ * and remove transforms configured using @FT_Set_Transform. ++ * ++ * @since: ++ * 2.12 -- **currently experimental only!** There might be changes ++ * without retaining backward compatibility of both the API and ABI. ++ * ++ */ ++ FT_EXPORT( FT_Bool ) ++ FT_Get_Color_Glyph_ClipBox( FT_Face face, ++ FT_UInt base_glyph, ++ FT_ClipBox* clip_box ); ++ ++ + /************************************************************************** + * + * @function: +diff --git a/include/freetype/internal/sfnt.h b/include/freetype/internal/sfnt.h +index 438ec897e..e8d77e232 100644 +--- a/include/freetype/internal/sfnt.h ++++ b/include/freetype/internal/sfnt.h +@@ -555,6 +555,44 @@ FT_BEGIN_HEADER + FT_OpaquePaint *paint ); + + ++ /************************************************************************** ++ * ++ * @functype: ++ * TT_Get_Color_Glyph_ClipBox_Func ++ * ++ * @description: ++ * Search for a 'COLR' v1 clip box for the specified `base_glyph` and ++ * fill the `clip_box` parameter with the 'COLR' v1 'ClipBox' information ++ * if one is found. ++ * ++ * @input: ++ * face :: ++ * A handle to the parent face object. ++ * ++ * base_glyph :: ++ * The glyph index for which to retrieve the clip box. ++ * ++ * @output: ++ * clip_box :: ++ * The clip box for the requested base_glyph if one is found. The clip ++ * box is computed taking scale and transformations configured on the ++ * @FT_Face into account. @FT_ClipBox contains @FT_Vector values in ++ * 26.6 format. ++ * ++ * @note: ++ * To retrieve the clip box in font units, reset scale to units-per-em ++ * and remove transforms configured using @FT_Set_Transform. ++ * ++ * @return: ++ * Value~1 if a ClipBox is found. If no clip box is found or an ++ * error occured, value~0 is returned. ++ */ ++ typedef FT_Bool ++ ( *TT_Get_Color_Glyph_ClipBox_Func )( TT_Face face, ++ FT_UInt base_glyph, ++ FT_ClipBox* clip_box ); ++ ++ + /************************************************************************** + * + * @functype: +@@ -890,17 +928,18 @@ FT_BEGIN_HEADER + TT_Set_SBit_Strike_Func set_sbit_strike; + TT_Load_Strike_Metrics_Func load_strike_metrics; + +- TT_Load_Table_Func load_cpal; +- TT_Load_Table_Func load_colr; +- TT_Free_Table_Func free_cpal; +- TT_Free_Table_Func free_colr; +- TT_Set_Palette_Func set_palette; +- TT_Get_Colr_Layer_Func get_colr_layer; +- TT_Get_Color_Glyph_Paint_Func get_colr_glyph_paint; +- TT_Get_Paint_Layers_Func get_paint_layers; +- TT_Get_Colorline_Stops_Func get_colorline_stops; +- TT_Get_Paint_Func get_paint; +- TT_Blend_Colr_Func colr_blend; ++ TT_Load_Table_Func load_cpal; ++ TT_Load_Table_Func load_colr; ++ TT_Free_Table_Func free_cpal; ++ TT_Free_Table_Func free_colr; ++ TT_Set_Palette_Func set_palette; ++ TT_Get_Colr_Layer_Func get_colr_layer; ++ TT_Get_Color_Glyph_Paint_Func get_colr_glyph_paint; ++ TT_Get_Color_Glyph_ClipBox_Func get_color_glyph_clipbox; ++ TT_Get_Paint_Layers_Func get_paint_layers; ++ TT_Get_Colorline_Stops_Func get_colorline_stops; ++ TT_Get_Paint_Func get_paint; ++ TT_Blend_Colr_Func colr_blend; + + TT_Get_Metrics_Func get_metrics; + +@@ -951,6 +990,7 @@ FT_BEGIN_HEADER + set_palette_, \ + get_colr_layer_, \ + get_colr_glyph_paint_, \ ++ get_color_glyph_clipbox, \ + get_paint_layers_, \ + get_colorline_stops_, \ + get_paint_, \ +@@ -995,6 +1035,7 @@ FT_BEGIN_HEADER + set_palette_, \ + get_colr_layer_, \ + get_colr_glyph_paint_, \ ++ get_color_glyph_clipbox, \ + get_paint_layers_, \ + get_colorline_stops_, \ + get_paint_, \ +diff --git a/src/base/ftobjs.c b/src/base/ftobjs.c +index 0ded2440f..5c1a4d034 100644 +--- a/src/base/ftobjs.c ++++ b/src/base/ftobjs.c +@@ -5639,6 +5639,35 @@ + } + + ++ /* documentation is in ftcolor.h */ ++ ++ FT_EXPORT_DEF( FT_Bool ) ++ FT_Get_Color_Glyph_ClipBox( FT_Face face, ++ FT_UInt base_glyph, ++ FT_ClipBox* clip_box ) ++ { ++ TT_Face ttface; ++ SFNT_Service sfnt; ++ ++ ++ if ( !face || !clip_box ) ++ return 0; ++ ++ if ( !FT_IS_SFNT( face ) ) ++ return 0; ++ ++ ttface = (TT_Face)face; ++ sfnt = (SFNT_Service)ttface->sfnt; ++ ++ if ( sfnt->get_color_glyph_clipbox ) ++ return sfnt->get_color_glyph_clipbox( ttface, ++ base_glyph, ++ clip_box ); ++ else ++ return 0; ++ } ++ ++ + /* documentation is in freetype.h */ + + FT_EXPORT_DEF( FT_Bool ) +diff --git a/src/sfnt/sfdriver.c b/src/sfnt/sfdriver.c +index 824e709fa..d1d01c99e 100644 +--- a/src/sfnt/sfdriver.c ++++ b/src/sfnt/sfdriver.c +@@ -1292,13 +1292,15 @@ + /* TT_Get_Colr_Layer_Func get_colr_layer */ + + PUT_COLOR_LAYERS_V1( tt_face_get_colr_glyph_paint ), +- /* TT_Get_Colr_Glyph_Paint_Func get_colr_glyph_paint */ ++ /* TT_Get_Color_Glyph_Paint_Func get_colr_glyph_paint */ ++ PUT_COLOR_LAYERS_V1( tt_face_get_color_glyph_clipbox ), ++ /* TT_Get_Color_Glyph_ClipBox_Func get_clipbox */ + PUT_COLOR_LAYERS_V1( tt_face_get_paint_layers ), +- /* TT_Get_Paint_Layers_Func get_paint_layers */ ++ /* TT_Get_Paint_Layers_Func get_paint_layers */ + PUT_COLOR_LAYERS_V1( tt_face_get_colorline_stops ), +- /* TT_Get_Paint get_paint */ ++ /* TT_Get_Paint get_paint */ + PUT_COLOR_LAYERS_V1( tt_face_get_paint ), +- /* TT_Get_Colorline_Stops_Func get_colorline_stops */ ++ /* TT_Get_Colorline_Stops_Func get_colorline_stops */ + + PUT_COLOR_LAYERS( tt_face_colr_blend_layer ), + /* TT_Blend_Colr_Func colr_blend */ +diff --git a/src/sfnt/ttcolr.c b/src/sfnt/ttcolr.c +index b8f4777ed..2f3e8846d 100644 +--- a/src/sfnt/ttcolr.c ++++ b/src/sfnt/ttcolr.c +@@ -94,6 +94,8 @@ + FT_ULong num_layers_v1; + FT_Byte* layers_v1; + ++ FT_Byte* clip_list; ++ + /* + * Paint tables start at the minimum of the end of the LayerList and the + * end of the BaseGlyphList. Record this location in a field here for +@@ -134,7 +136,7 @@ + + FT_ULong base_glyph_offset, layer_offset; + FT_ULong base_glyphs_offset_v1, num_base_glyphs_v1; +- FT_ULong layer_offset_v1, num_layers_v1; ++ FT_ULong layer_offset_v1, num_layers_v1, clip_list_offset; + FT_ULong table_size; + + +@@ -226,6 +228,16 @@ + colr->base_glyphs_v1 + + colr->num_base_glyphs_v1 * BASE_GLYPH_PAINT_RECORD_SIZE; + } ++ ++ clip_list_offset = FT_NEXT_ULONG( p ); ++ ++ if ( clip_list_offset >= table_size ) ++ goto InvalidTable; ++ ++ if ( clip_list_offset ) ++ colr->clip_list = (FT_Byte*)( table + clip_list_offset ); ++ else ++ colr->clip_list = 0; + } + + colr->base_glyphs = (FT_Byte*)( table + base_glyph_offset ); +@@ -796,6 +808,117 @@ + } + + ++ FT_LOCAL_DEF( FT_Bool ) ++ tt_face_get_color_glyph_clipbox( TT_Face face, ++ FT_UInt base_glyph, ++ FT_ClipBox* clip_box ) ++ { ++ Colr* colr; ++ ++ FT_Byte *p, *p1, *clip_base; ++ ++ FT_Byte clip_list_format; ++ FT_ULong num_clip_boxes, i; ++ FT_UShort gid_start, gid_end; ++ FT_UInt32 clip_box_offset; ++ FT_Byte format; ++ ++ const FT_Byte num_corners = 4; ++ FT_Vector corners[4]; ++ FT_Byte j; ++ FT_BBox font_clip_box; ++ ++ ++ colr = (Colr*)face->colr; ++ if ( !colr ) ++ return 0; ++ ++ if ( !colr->clip_list ) ++ return 0; ++ ++ p = colr->clip_list; ++ ++ clip_base = p; ++ clip_list_format = FT_NEXT_BYTE ( p ); ++ ++ /* Format byte used here to be able to upgrade ClipList for >16bit */ ++ /* glyph ids; for now we can expect it to be 0. */ ++ if ( !( clip_list_format == 0 ) ) ++ return 0; ++ ++ num_clip_boxes = FT_NEXT_ULONG( p ); ++ ++ for ( i = 0; i < num_clip_boxes; ++i ) ++ { ++ gid_start = FT_NEXT_USHORT( p ); ++ gid_end = FT_NEXT_USHORT( p ); ++ clip_box_offset = FT_NEXT_UOFF3( p ); ++ ++ if ( base_glyph >= gid_start && base_glyph <= gid_end ) ++ { ++ p1 = (FT_Byte*)( clip_base + clip_box_offset ); ++ ++ if ( p1 >= ( (FT_Byte*)colr->table + colr->table_size ) ) ++ return 0; ++ ++ format = FT_NEXT_BYTE( p1 ); ++ ++ if ( format < 0 || format > 1 ) ++ return 0; ++ ++ /* `face->root.size->metrics.x_scale` and `y_scale` are factors */ ++ /* that scale a font unit value in integers to a 26.6 fixed value */ ++ /* according to the requested size, see for example */ ++ /* `ft_recompute_scaled_metrics`. */ ++ font_clip_box.xMin = FT_MulFix( FT_NEXT_SHORT( p1 ), ++ face->root.size->metrics.x_scale ); ++ font_clip_box.yMin = FT_MulFix( FT_NEXT_SHORT( p1 ), ++ face->root.size->metrics.x_scale ); ++ font_clip_box.xMax = FT_MulFix( FT_NEXT_SHORT( p1 ), ++ face->root.size->metrics.x_scale ); ++ font_clip_box.yMax = FT_MulFix( FT_NEXT_SHORT( p1 ), ++ face->root.size->metrics.x_scale ); ++ ++ /* Make 4 corner points (xMin, yMin), (xMax, yMax) and transform */ ++ /* them. If we we would only transform two corner points and */ ++ /* span a rectangle based on those, the rectangle may become too */ ++ /* small to cover the glyph. */ ++ corners[0].x = font_clip_box.xMin; ++ corners[1].x = font_clip_box.xMin; ++ corners[2].x = font_clip_box.xMax; ++ corners[3].x = font_clip_box.xMax; ++ ++ corners[0].y = font_clip_box.yMin; ++ corners[1].y = font_clip_box.yMax; ++ corners[2].y = font_clip_box.yMax; ++ corners[3].y = font_clip_box.yMin; ++ ++ for ( j = 0; j < num_corners; ++j ) ++ { ++ if ( face->root.internal->transform_flags & 1 ) ++ FT_Vector_Transform( &corners[j], ++ &face->root.internal->transform_matrix ); ++ ++ if ( face->root.internal->transform_flags & 2 ) ++ { ++ corners[j].x += face->root.internal->transform_delta.x; ++ corners[j].y += face->root.internal->transform_delta.y; ++ } ++ } ++ ++ clip_box->bottom_left = corners[0]; ++ clip_box->top_left = corners[1]; ++ clip_box->top_right = corners[2]; ++ clip_box->bottom_right = corners[3]; ++ ++ return 1; ++ } ++ } ++ ++ return 0; ++ } ++ ++ + FT_LOCAL_DEF( FT_Bool ) + tt_face_get_paint_layers( TT_Face face, + FT_LayerIterator* iterator, +diff --git a/src/sfnt/ttcolr.h b/src/sfnt/ttcolr.h +index c91d2b172..b81e4cb95 100644 +--- a/src/sfnt/ttcolr.h ++++ b/src/sfnt/ttcolr.h +@@ -48,6 +48,11 @@ FT_BEGIN_HEADER + FT_Color_Root_Transform root_transform, + FT_OpaquePaint* paint ); + ++ FT_LOCAL( FT_Bool ) ++ tt_face_get_color_glyph_clipbox( TT_Face face, ++ FT_UInt base_glyph, ++ FT_ClipBox* clip_box ); ++ + FT_LOCAL( FT_Bool ) + tt_face_get_paint_layers( TT_Face face, + FT_LayerIterator* iterator, diff --git a/freetype/0009-src-sfnt-ttcolr.c-tt_face_get_color_glyph_clipbox-Mi.patch b/freetype/0009-src-sfnt-ttcolr.c-tt_face_get_color_glyph_clipbox-Mi.patch new file mode 100644 index 000000000..50b05a754 --- /dev/null +++ b/freetype/0009-src-sfnt-ttcolr.c-tt_face_get_color_glyph_clipbox-Mi.patch @@ -0,0 +1,23 @@ +From fed5521016227bf8cc4475f66450a9963568d162 Mon Sep 17 00:00:00 2001 +From: Werner Lemberg <wl(a)gnu.org> +Date: Mon, 9 Aug 2021 19:27:34 +0200 +Subject: [PATCH] * src/sfnt/ttcolr.c (tt_face_get_color_glyph_clipbox): Minor + fix. + +--- + src/sfnt/ttcolr.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/sfnt/ttcolr.c b/src/sfnt/ttcolr.c +index 2f3e8846d..68807127f 100644 +--- a/src/sfnt/ttcolr.c ++++ b/src/sfnt/ttcolr.c +@@ -863,7 +863,7 @@ + + format = FT_NEXT_BYTE( p1 ); + +- if ( format < 0 || format > 1 ) ++ if ( format > 1 ) + return 0; + + /* `face->root.size->metrics.x_scale` and `y_scale` are factors */ diff --git a/freetype/0010-sfnt-Add-missing-blend-mode-plus-to-COLR-v1.patch b/freetype/0010-sfnt-Add-missing-blend-mode-plus-to-COLR-v1.patch new file mode 100644 index 000000000..0307f047a --- /dev/null +++ b/freetype/0010-sfnt-Add-missing-blend-mode-plus-to-COLR-v1.patch @@ -0,0 +1,55 @@ +From e40ae7569aa4ef591f66ff9066df2f91de75bb77 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Dominik=20R=C3=B6ttsches?= <drott(a)chromium.org> +Date: Mon, 9 Aug 2021 13:44:55 +0300 +Subject: [PATCH] [sfnt] Add missing blend mode 'plus' to 'COLR' v1. + +* include/freetype/ftcolor.h (FT_Composite_Mode): Add missing blend mode +'plus' after it was added to the spec. +--- + include/freetype/ftcolor.h | 33 +++++++++++++++++---------------- + 1 file changed, 17 insertions(+), 16 deletions(-) + +diff --git a/include/freetype/ftcolor.h b/include/freetype/ftcolor.h +index b98289917..cbd2d85bb 100644 +--- a/include/freetype/ftcolor.h ++++ b/include/freetype/ftcolor.h +@@ -740,22 +740,23 @@ FT_BEGIN_HEADER + FT_COLR_COMPOSITE_SRC_ATOP = 9, + FT_COLR_COMPOSITE_DEST_ATOP = 10, + FT_COLR_COMPOSITE_XOR = 11, +- FT_COLR_COMPOSITE_SCREEN = 12, +- FT_COLR_COMPOSITE_OVERLAY = 13, +- FT_COLR_COMPOSITE_DARKEN = 14, +- FT_COLR_COMPOSITE_LIGHTEN = 15, +- FT_COLR_COMPOSITE_COLOR_DODGE = 16, +- FT_COLR_COMPOSITE_COLOR_BURN = 17, +- FT_COLR_COMPOSITE_HARD_LIGHT = 18, +- FT_COLR_COMPOSITE_SOFT_LIGHT = 19, +- FT_COLR_COMPOSITE_DIFFERENCE = 20, +- FT_COLR_COMPOSITE_EXCLUSION = 21, +- FT_COLR_COMPOSITE_MULTIPLY = 22, +- FT_COLR_COMPOSITE_HSL_HUE = 23, +- FT_COLR_COMPOSITE_HSL_SATURATION = 24, +- FT_COLR_COMPOSITE_HSL_COLOR = 25, +- FT_COLR_COMPOSITE_HSL_LUMINOSITY = 26, +- FT_COLR_COMPOSITE_MAX = 27 ++ FT_COLR_COMPOSITE_PLUS = 12, ++ FT_COLR_COMPOSITE_SCREEN = 13, ++ FT_COLR_COMPOSITE_OVERLAY = 14, ++ FT_COLR_COMPOSITE_DARKEN = 15, ++ FT_COLR_COMPOSITE_LIGHTEN = 16, ++ FT_COLR_COMPOSITE_COLOR_DODGE = 17, ++ FT_COLR_COMPOSITE_COLOR_BURN = 18, ++ FT_COLR_COMPOSITE_HARD_LIGHT = 19, ++ FT_COLR_COMPOSITE_SOFT_LIGHT = 20, ++ FT_COLR_COMPOSITE_DIFFERENCE = 21, ++ FT_COLR_COMPOSITE_EXCLUSION = 22, ++ FT_COLR_COMPOSITE_MULTIPLY = 23, ++ FT_COLR_COMPOSITE_HSL_HUE = 24, ++ FT_COLR_COMPOSITE_HSL_SATURATION = 25, ++ FT_COLR_COMPOSITE_HSL_COLOR = 26, ++ FT_COLR_COMPOSITE_HSL_LUMINOSITY = 27, ++ FT_COLR_COMPOSITE_MAX = 28 + + } FT_Composite_Mode; + diff --git a/freetype/Pkgfile b/freetype/Pkgfile index dd3f4462d..f73b72db1 100644 --- a/freetype/Pkgfile +++ b/freetype/Pkgfile @@ -1,22 +1,55 @@ # Description: A free and portable TrueType font rendering engine -# URL: https://www.freetype.org -# Maintainer: CRUX System Team, core-ports at crux dot nu -# Depends on: libpng +# URL: https://www.freetype.org +# Maintainer: CRUX System Team, core-ports at crux dot nu +# Depends on: meson ninja libpng +# Optional: brotli harfbuzz libpng name=freetype version=2.11.0 -release=1 -source=(http://download.savannah.gnu.org/releases/$name/$name-$version.tar.xz) +release=2 +_dlgversion=0cc0d3eaed28483fc8036d90ac18878ebd83ed87 + +source=(https://download.savannah.gnu.org/releases/freetype/freetype-2.11.0.tar.xz + freetype2.sh + ## we don't want to depend on git but meson will try to pull this with git + ## installed when we allow downloads, therefor we sideload it using the + ## specific commit + # https://gitlab.freedesktop.org/freetype/freetype/-/tree/master/subprojects + https://github.com/nyorain/dlg/archive/$_dlgversion/dlg-$_dlgversion.tar.gz + # https://github.com/archlinux/svntogit-packages/tree/packages/freetype2/trunk + 0001-Enable-table-validation-modules.patch + 0002-Enable-subpixel-rendering.patch + 0003-Enable-infinality-subpixel-hinting.patch + 0004-Enable-long-PCF-family-names.patch + 0006-Return_FT_Err_Ok_while_trying_to_render_bitmap.patch + 0007-Restore_quiet_no-op_rendering_of_bitmap_glyphs.patch + 0008-sfnt-Add-API-for-retrieving-a-COLR-v1-ClipBox-table.patch + 0009-src-sfnt-ttcolr.c-tt_face_get_color_glyph_clipbox-Mi.patch + 0010-sfnt-Add-missing-blend-mode-plus-to-COLR-v1.patch) build() { - cd $name-$version + mkdir -p $name-$version/subprojects + rsync -aR $SRC/dlg-$_dlgversion/ $name-$version/subprojects/dlg + + patch -Np1 -d $name-$version -i $SRC/0001-Enable-table-validation-modules.patch + patch -Np1 -d $name-$version -i $SRC/0002-Enable-subpixel-rendering.patch + patch -Np1 -d $name-$version -i $SRC/0003-Enable-infinality-subpixel-hinting.patch + patch -Np1 -d $name-$version -i $SRC/0004-Enable-long-PCF-family-names.patch + patch -Np1 -d $name-$version -i $SRC/0006-Return_FT_Err_Ok_while_trying_to_render_bitmap.patch + patch -Np1 -d $name-$version -i $SRC/0007-Restore_quiet_no-op_rendering_of_bitmap_glyphs.patch + patch -Np1 -d $name-$version -i $SRC/0008-sfnt-Add-API-for-retrieving-a-COLR-v1-ClipBox-table.patch + patch -Np1 -d $name-$version -i $SRC/0009-src-sfnt-ttcolr.c-tt_face_get_color_glyph_clipbox-Mi.patch + patch -Np1 -d $name-$version -i $SRC/0010-sfnt-Add-missing-blend-mode-plus-to-COLR-v1.patch - ./configure \ - --prefix=/usr \ - --with-zlib \ - --with-harfbuzz=no \ - --enable-freetype-config # w/o breaks grub2 + meson setup $name-$version build \ + --prefix=/usr \ + --buildtype=plain \ + --wrap-mode=nodownload \ + -D b_lto=true \ + -D b_pie=true \ + -D default_library=shared + meson compile -C build + DESTDIR=$PKG meson install -C build - make - make DESTDIR=$PKG install + install -Dt $PKG/etc/profile.d -m644 $SRC/freetype2.sh } diff --git a/freetype/freetype2.sh b/freetype/freetype2.sh new file mode 100644 index 000000000..93165d30f --- /dev/null +++ b/freetype/freetype2.sh @@ -0,0 +1,12 @@ +# Subpixel hinting mode can be chosen by setting the right TrueType interpreter +# version. The available settings are: +# +# truetype:interpreter-version=35 # Classic mode (default in 2.6) +# truetype:interpreter-version=38 # Infinality mode +# truetype:interpreter-version=40 # Minimal mode (default in 2.7) +# +# There are more properties that can be set, separated by whitespace. Please +# refer to the FreeType documentation for details. + +# Uncomment and configure below +#export FREETYPE_PROPERTIES="truetype:interpreter-version=40"

1 0

ports/xorg (3.6): [notify] xorg-xwayland: changed name of dependency: wayland-egl -> egl-wayland
by crux＠crux.nu 31 Oct '21

31 Oct '21

commit ad7ff8b6e6429a3f27cc19bcb19b5f461938f01d Author: Tim Biermann <tbier(a)posteo.de> Date: Sun Oct 31 17:24:45 2021 +0100 [notify] xorg-xwayland: changed name of dependency: wayland-egl -> egl-wayland diff --git a/xorg-xwayland/.signature b/xorg-xwayland/.signature index a9433208..53bd262e 100644 --- a/xorg-xwayland/.signature +++ b/xorg-xwayland/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/xorg.pub -RWTSGWF5Q7TndONfd+gEC4hdfAl5l/Hb9ARMTKAobxm7fQTWNjyGgrGay26Tm7qSgdoPuIz7+Uyqpp1MobcNskkk2m5Hm2ezFwI= -SHA256 (Pkgfile) = 135f2baf2e4b838f9f3940d9acd90da35f84c1cc38728463ce4a646c0beeae5e +RWTSGWF5Q7TndACinosMH/kZth1ugEUNTtmQFKO/pUfcAhPFz+oeF28/orFK0BPX1pAMu3l9RUx+hHJcOWRREwSWPvQHJJn7hw8= +SHA256 (Pkgfile) = 6d858aed40484b4e2c1f9b0e575befb41ebd1e4a56b23837289457fac6685997 SHA256 (.footprint) = a0f710b525178b1c96a2165cdd68d98915bc2bcecc4cc68be00ff7a105fb25d8 SHA256 (xwayland-21.1.2.tar.xz) = b81cbdd5ad60b8b7ad8c3ecc7ec2a28c9bf021448670735cebb501f08bebd18b diff --git a/xorg-xwayland/Pkgfile b/xorg-xwayland/Pkgfile index ffd684f9..ae4c4ee3 100644 --- a/xorg-xwayland/Pkgfile +++ b/xorg-xwayland/Pkgfile @@ -1,7 +1,7 @@ # Description: X compat server to be used with wayland # URL: https://wayland.freedesktop.org/xserver.html # Maintainer: CRUX Xorg Team, xorg-ports at crux dot nu -# Depends on: dbus pixman wayland-egl xorg-server +# Depends on: dbus egl-wayland pixman xorg-server name=xorg-xwayland version=21.1.2

1 0

ports/contrib (3.6): [notify] waylandpp: changed name of dependency: wayland-egl -> egl-wayland
by crux＠crux.nu 31 Oct '21

31 Oct '21

commit a96dbf5c744309baf74c51e956d3c22dd466e692 Author: Tim Biermann <tbier(a)posteo.de> Date: Sun Oct 31 17:24:04 2021 +0100 [notify] waylandpp: changed name of dependency: wayland-egl -> egl-wayland diff --git a/waylandpp/.signature b/waylandpp/.signature index 438cebd74..76b12b321 100644 --- a/waylandpp/.signature +++ b/waylandpp/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3+7TXWLwZRKjDHgZaBPv19Hlr9Z/+JnkMoiJD7S9Lv8oubkWukZFQAnaIyQpJ7CpvlHt08ipAu2B0Frp3CCD+AQ= -SHA256 (Pkgfile) = 8e78a4e053428d5814a7617628f58ca4b3a7b2200e83618b7e71336aef03b907 +RWSagIOpLGJF3/UwdXSLgAaJyUmlX6MIhXaHvaDterTK2tjT490jFYxaZlfAkYAczNnA3T8TbJYsEjRFqlHI4h1u6SkmHAl49gA= +SHA256 (Pkgfile) = 7081043fb6a7db8699882bb9a4ae0a9e041457175d8f273bb26da2c126fb77c0 SHA256 (.footprint) = e528d3e793c9736053f63b0d095dd223691d776d307cf6c512ee6e58d6622570 SHA256 (waylandpp-0.2.8.zip) = ad63812dcc781135cf1a729a8cdb195c29c07a91ac2776dd6cc737d80a422781 diff --git a/waylandpp/Pkgfile b/waylandpp/Pkgfile index 62a471444..63573a091 100644 --- a/waylandpp/Pkgfile +++ b/waylandpp/Pkgfile @@ -1,7 +1,7 @@ # Description: Wayland C++ bindings # URL: https://github.com/NilsBrause/waylandpp # Maintainer: Tim Biermann, tbier at posteo dot de -# Depends on: pugixml wayland-egl wayland-protocols +# Depends on: egl-wayland pugixml wayland-protocols name=waylandpp version=0.2.8

1 0

ports/contrib (3.6): wayland-egl: renamed
by crux＠crux.nu 31 Oct '21

31 Oct '21

commit 01293cbdc5b5cbb4d1ebe202244cd5fb454fd616 Author: Tim Biermann <tbier(a)posteo.de> Date: Sun Oct 31 17:19:16 2021 +0100 wayland-egl: renamed diff --git a/wayland-egl/.footprint b/wayland-egl/.footprint deleted file mode 100644 index dae0b47aa..000000000 --- a/wayland-egl/.footprint +++ /dev/null @@ -1,13 +0,0 @@ -drwxr-xr-x root/root usr/ -drwxr-xr-x root/root usr/lib/ -lrwxrwxrwx root/root usr/lib/libnvidia-egl-wayland.so -> libnvidia-egl-wayland.so.1 -lrwxrwxrwx root/root usr/lib/libnvidia-egl-wayland.so.1 -> libnvidia-egl-wayland.so.1.1.8 --rwxr-xr-x root/root usr/lib/libnvidia-egl-wayland.so.1.1.8 -drwxr-xr-x root/root usr/lib/pkgconfig/ --rw-r--r-- root/root usr/lib/pkgconfig/wayland-eglstream.pc -drwxr-xr-x root/root usr/share/ -drwxr-xr-x root/root usr/share/pkgconfig/ --rw-r--r-- root/root usr/share/pkgconfig/wayland-eglstream-protocols.pc -drwxr-xr-x root/root usr/share/wayland-eglstream/ --rw-r--r-- root/root usr/share/wayland-eglstream/wayland-eglstream-controller.xml --rw-r--r-- root/root usr/share/wayland-eglstream/wayland-eglstream.xml diff --git a/wayland-egl/.signature b/wayland-egl/.signature deleted file mode 100644 index 452977720..000000000 --- a/wayland-egl/.signature +++ /dev/null @@ -1,6 +0,0 @@ -untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF38WnNmcNFBx3oEbOhkdS+0ITZ2dLdFUcnQ9PTIpujCEIWd/8MdGuVm1Cm3i/0O6hWSI/9aHh64stukVlX1ejSQQ= -SHA256 (Pkgfile) = 723854b1229d0ae8a4146eeff8b4af9ce188932a3ac5cce05b7d942c29f56bb3 -SHA256 (.footprint) = 14dc20c79f1d936e232f83872286dbe5f6035e8a1e1009cd980422381b7a344c -SHA256 (wayland-egl-1.1.8.tar.gz) = 12bee9accf121987b0f0d6fb1a4e3b1fc5855b116c50d8d9e035edd02c82f88c -SHA256 (glvnd.diff) = e6d965551829448ffc2ea0fdf97d7d44c3d35be0b56fc025e6cc343f29f7b9d6 diff --git a/wayland-egl/Pkgfile b/wayland-egl/Pkgfile deleted file mode 100644 index 919616eb5..000000000 --- a/wayland-egl/Pkgfile +++ /dev/null @@ -1,23 +0,0 @@ -# Description: The EGLStream-based Wayland external platform -# URL: https://github.com/NVIDIA/egl-wayland/ -# Maintainer: Tim Biermann, tbier at posteo dot de -# Depends on: eglexternalplatform mesa wayland-protocols - -name=wayland-egl -version=1.1.8 -release=1 -source=(https://github.com/NVIDIA/egl-wayland/archive/$version/$name-$version.tar.gz - glvnd.diff) - -build() { - patch -Np1 -d egl-wayland-$version -i $SRC/glvnd.diff - - meson setup egl-wayland-$version build \ - --prefix=/usr \ - --buildtype=plain \ - --wrap-mode nodownload \ - -D b_lto=true \ - -D b_pie=true - meson compile -C build - DESTDIR=$PKG meson install -C build -} diff --git a/wayland-egl/glvnd.diff b/wayland-egl/glvnd.diff deleted file mode 100644 index 6182b0981..000000000 --- a/wayland-egl/glvnd.diff +++ /dev/null @@ -1,108 +0,0 @@ -diff --git i/include/wayland-egldevice.h w/include/wayland-egldevice.h -index 2b436aa..d32cce6 100644 ---- i/include/wayland-egldevice.h -+++ w/include/wayland-egldevice.h -@@ -25,6 +25,7 @@ - - #include <EGL/egl.h> - #include <EGL/eglext.h> -+#include <EGL/eglmesaext.h> - #include <wayland-client.h> - #include "wayland-external-exports.h" - #include "wayland-eglhandle.h" -diff --git i/include/wayland-egldisplay.h w/include/wayland-egldisplay.h -index ac42e7b..fe11f74 100644 ---- i/include/wayland-egldisplay.h -+++ w/include/wayland-egldisplay.h -@@ -25,6 +25,7 @@ - - #include <EGL/egl.h> - #include <EGL/eglext.h> -+#include <EGL/eglmesaext.h> - #include <wayland-client.h> - #include "wayland-external-exports.h" - #include "wayland-eglhandle.h" -diff --git i/include/wayland-eglhandle.h w/include/wayland-eglhandle.h -index 2697206..01bf11b 100644 ---- i/include/wayland-eglhandle.h -+++ w/include/wayland-eglhandle.h -@@ -25,6 +25,7 @@ - - #include <EGL/egl.h> - #include <EGL/eglext.h> -+#include <EGL/eglmesaext.h> - #include "wayland-external-exports.h" - #include "wayland-egl-ext.h" - #include <pthread.h> -diff --git i/include/wayland-eglstream-server.h w/include/wayland-eglstream-server.h -index 27ab863..359926e 100644 ---- i/include/wayland-eglstream-server.h -+++ w/include/wayland-eglstream-server.h -@@ -26,6 +26,7 @@ - #include <wayland-server-protocol.h> - #include <EGL/egl.h> - #include <EGL/eglext.h> -+#include <EGL/eglmesaext.h> - #include "wayland-eglhandle.h" - - #ifdef __cplusplus -diff --git i/include/wayland-eglstream.h w/include/wayland-eglstream.h -index e8486be..57b5e04 100644 ---- i/include/wayland-eglstream.h -+++ w/include/wayland-eglstream.h -@@ -25,6 +25,7 @@ - - #include <EGL/egl.h> - #include <EGL/eglext.h> -+#include <EGL/eglmesaext.h> - - #ifdef __cplusplus - extern "C" { -diff --git i/include/wayland-eglsurface.h w/include/wayland-eglsurface.h -index 38fcd85..f292812 100644 ---- i/include/wayland-eglsurface.h -+++ w/include/wayland-eglsurface.h -@@ -25,6 +25,7 @@ - - #include <EGL/egl.h> - #include <EGL/eglext.h> -+#include <EGL/eglmesaext.h> - #include <pthread.h> - #include <wayland-client.h> - #include "wayland-egldisplay.h" -diff --git i/include/wayland-eglswap.h w/include/wayland-eglswap.h -index 594f3ce..783ecbe 100644 ---- i/include/wayland-eglswap.h -+++ w/include/wayland-eglswap.h -@@ -25,6 +25,7 @@ - - #include <EGL/egl.h> - #include <EGL/eglext.h> -+#include <EGL/eglmesaext.h> - #include "wayland-eglhandle.h" - #include "wayland-eglsurface.h" - -diff --git i/include/wayland-eglutils.h w/include/wayland-eglutils.h -index ae54fcb..797bee7 100644 ---- i/include/wayland-eglutils.h -+++ w/include/wayland-eglutils.h -@@ -25,6 +25,7 @@ - - #include <EGL/egl.h> - #include <EGL/eglext.h> -+#include <EGL/eglmesaext.h> - #include "wayland-external-exports.h" - #include "wayland-eglhandle.h" - -diff --git i/src/wayland-eglstream-server.c w/src/wayland-eglstream-server.c -index c37f8e6..ef4bcb5 100644 ---- i/src/wayland-eglstream-server.c -+++ w/src/wayland-eglstream-server.c -@@ -34,6 +34,7 @@ - #include <wayland-server.h> - #include <EGL/egl.h> - #include <EGL/eglext.h> -+#include <EGL/eglmesaext.h> - - #include "wayland-eglstream-server.h" - #include "wayland-eglstream-server-protocol.h"

1 0

ports/contrib (3.6): [notify] egl-wayland: -> 1.1.9; name changed to reflect proper upstream name
by crux＠crux.nu 31 Oct '21

31 Oct '21

commit f26ff6a52d057c4b1e9b2b5eee51c1603cdf3f2b Author: Tim Biermann <tbier(a)posteo.de> Date: Sun Oct 31 17:18:56 2021 +0100 [notify] egl-wayland: -> 1.1.9; name changed to reflect proper upstream name diff --git a/egl-wayland/.footprint b/egl-wayland/.footprint new file mode 100644 index 000000000..e2ef51cf9 --- /dev/null +++ b/egl-wayland/.footprint @@ -0,0 +1,14 @@ +drwxr-xr-x root/root usr/ +drwxr-xr-x root/root usr/lib/ +lrwxrwxrwx root/root usr/lib/libnvidia-egl-wayland.so -> libnvidia-egl-wayland.so.1 +lrwxrwxrwx root/root usr/lib/libnvidia-egl-wayland.so.1 -> libnvidia-egl-wayland.so.1.1.9 +-rwxr-xr-x root/root usr/lib/libnvidia-egl-wayland.so.1.1.9 +drwxr-xr-x root/root usr/lib/pkgconfig/ +-rw-r--r-- root/root usr/lib/pkgconfig/wayland-eglstream.pc +drwxr-xr-x root/root usr/share/ +drwxr-xr-x root/root usr/share/pkgconfig/ +-rw-r--r-- root/root usr/share/pkgconfig/wayland-eglstream-protocols.pc +drwxr-xr-x root/root usr/share/wayland-eglstream/ +-rw-r--r-- root/root usr/share/wayland-eglstream/wayland-drm.xml +-rw-r--r-- root/root usr/share/wayland-eglstream/wayland-eglstream-controller.xml +-rw-r--r-- root/root usr/share/wayland-eglstream/wayland-eglstream.xml diff --git a/egl-wayland/.signature b/egl-wayland/.signature new file mode 100644 index 000000000..18ee26913 --- /dev/null +++ b/egl-wayland/.signature @@ -0,0 +1,6 @@ +untrusted comment: verify with /etc/ports/contrib.pub +RWSagIOpLGJF30L0YJlLyKaT4GS+ZEB9eOhL3KOtj74GidvaZ8J/I8E7Zm8WYvbQsJhhp0LUHp+Zzc2h5QX99y2/3cP70UET1w8= +SHA256 (Pkgfile) = b773983589c0aa0a01ad7935c896df2000dd21ac39c56b003e6840fa78b010d3 +SHA256 (.footprint) = ac22e99b3db70ea48b41e39eb20f85f087cb8669b0fef46cfef6b70ac58bdd1f +SHA256 (egl-wayland-1.1.9.tar.gz) = 1317b06beaa5f990894adc31e958fc4575f81b9a7cf0fb907645020915b4da07 +SHA256 (glvnd.diff) = e6d965551829448ffc2ea0fdf97d7d44c3d35be0b56fc025e6cc343f29f7b9d6 diff --git a/egl-wayland/Pkgfile b/egl-wayland/Pkgfile new file mode 100644 index 000000000..7c0727d06 --- /dev/null +++ b/egl-wayland/Pkgfile @@ -0,0 +1,23 @@ +# Description: The EGLStream-based Wayland external platform +# URL: https://github.com/NVIDIA/egl-wayland/ +# Maintainer: Tim Biermann, tbier at posteo dot de +# Depends on: eglexternalplatform mesa wayland-protocols + +name=egl-wayland +version=1.1.9 +release=1 +source=(https://github.com/NVIDIA/egl-wayland/archive/$version/$name-$version.tar.gz + glvnd.diff) + +build() { + patch -Np1 -d $name-$version -i $SRC/glvnd.diff + + meson setup $name-$version build \ + --prefix=/usr \ + --buildtype=plain \ + --wrap-mode nodownload \ + -D b_lto=true \ + -D b_pie=true + meson compile -C build + DESTDIR=$PKG meson install -C build +} diff --git a/egl-wayland/glvnd.diff b/egl-wayland/glvnd.diff new file mode 100644 index 000000000..6182b0981 --- /dev/null +++ b/egl-wayland/glvnd.diff @@ -0,0 +1,108 @@ +diff --git i/include/wayland-egldevice.h w/include/wayland-egldevice.h +index 2b436aa..d32cce6 100644 +--- i/include/wayland-egldevice.h ++++ w/include/wayland-egldevice.h +@@ -25,6 +25,7 @@ + + #include <EGL/egl.h> + #include <EGL/eglext.h> ++#include <EGL/eglmesaext.h> + #include <wayland-client.h> + #include "wayland-external-exports.h" + #include "wayland-eglhandle.h" +diff --git i/include/wayland-egldisplay.h w/include/wayland-egldisplay.h +index ac42e7b..fe11f74 100644 +--- i/include/wayland-egldisplay.h ++++ w/include/wayland-egldisplay.h +@@ -25,6 +25,7 @@ + + #include <EGL/egl.h> + #include <EGL/eglext.h> ++#include <EGL/eglmesaext.h> + #include <wayland-client.h> + #include "wayland-external-exports.h" + #include "wayland-eglhandle.h" +diff --git i/include/wayland-eglhandle.h w/include/wayland-eglhandle.h +index 2697206..01bf11b 100644 +--- i/include/wayland-eglhandle.h ++++ w/include/wayland-eglhandle.h +@@ -25,6 +25,7 @@ + + #include <EGL/egl.h> + #include <EGL/eglext.h> ++#include <EGL/eglmesaext.h> + #include "wayland-external-exports.h" + #include "wayland-egl-ext.h" + #include <pthread.h> +diff --git i/include/wayland-eglstream-server.h w/include/wayland-eglstream-server.h +index 27ab863..359926e 100644 +--- i/include/wayland-eglstream-server.h ++++ w/include/wayland-eglstream-server.h +@@ -26,6 +26,7 @@ + #include <wayland-server-protocol.h> + #include <EGL/egl.h> + #include <EGL/eglext.h> ++#include <EGL/eglmesaext.h> + #include "wayland-eglhandle.h" + + #ifdef __cplusplus +diff --git i/include/wayland-eglstream.h w/include/wayland-eglstream.h +index e8486be..57b5e04 100644 +--- i/include/wayland-eglstream.h ++++ w/include/wayland-eglstream.h +@@ -25,6 +25,7 @@ + + #include <EGL/egl.h> + #include <EGL/eglext.h> ++#include <EGL/eglmesaext.h> + + #ifdef __cplusplus + extern "C" { +diff --git i/include/wayland-eglsurface.h w/include/wayland-eglsurface.h +index 38fcd85..f292812 100644 +--- i/include/wayland-eglsurface.h ++++ w/include/wayland-eglsurface.h +@@ -25,6 +25,7 @@ + + #include <EGL/egl.h> + #include <EGL/eglext.h> ++#include <EGL/eglmesaext.h> + #include <pthread.h> + #include <wayland-client.h> + #include "wayland-egldisplay.h" +diff --git i/include/wayland-eglswap.h w/include/wayland-eglswap.h +index 594f3ce..783ecbe 100644 +--- i/include/wayland-eglswap.h ++++ w/include/wayland-eglswap.h +@@ -25,6 +25,7 @@ + + #include <EGL/egl.h> + #include <EGL/eglext.h> ++#include <EGL/eglmesaext.h> + #include "wayland-eglhandle.h" + #include "wayland-eglsurface.h" + +diff --git i/include/wayland-eglutils.h w/include/wayland-eglutils.h +index ae54fcb..797bee7 100644 +--- i/include/wayland-eglutils.h ++++ w/include/wayland-eglutils.h +@@ -25,6 +25,7 @@ + + #include <EGL/egl.h> + #include <EGL/eglext.h> ++#include <EGL/eglmesaext.h> + #include "wayland-external-exports.h" + #include "wayland-eglhandle.h" + +diff --git i/src/wayland-eglstream-server.c w/src/wayland-eglstream-server.c +index c37f8e6..ef4bcb5 100644 +--- i/src/wayland-eglstream-server.c ++++ w/src/wayland-eglstream-server.c +@@ -34,6 +34,7 @@ + #include <wayland-server.h> + #include <EGL/egl.h> + #include <EGL/eglext.h> ++#include <EGL/eglmesaext.h> + + #include "wayland-eglstream-server.h" + #include "wayland-eglstream-server-protocol.h"

1 0

ports/xorg (3.6): xorg-xwayland: initial commit, version 21.1.2
by crux＠crux.nu 31 Oct '21

31 Oct '21

commit 2962ccfe7345753cfad8863b530256ad5071cd2a Author: Tim Biermann <tbier(a)posteo.de> Date: Sun Oct 31 14:59:45 2021 +0100 xorg-xwayland: initial commit, version 21.1.2 diff --git a/xorg-xwayland/.footprint b/xorg-xwayland/.footprint new file mode 100644 index 00000000..b096d4e4 --- /dev/null +++ b/xorg-xwayland/.footprint @@ -0,0 +1,11 @@ +drwxr-xr-x root/root usr/ +drwxr-xr-x root/root usr/bin/ +-rwxr-xr-x root/root usr/bin/Xwayland +drwxr-xr-x root/root usr/lib/ +drwxr-xr-x root/root usr/lib/pkgconfig/ +-rw-r--r-- root/root usr/lib/pkgconfig/xwayland.pc +drwxr-xr-x root/root usr/lib/xorg/ +drwxr-xr-x root/root usr/share/ +drwxr-xr-x root/root usr/share/man/ +drwxr-xr-x root/root usr/share/man/man1/ +-rw-r--r-- root/root usr/share/man/man1/Xwayland.1.gz diff --git a/xorg-xwayland/.signature b/xorg-xwayland/.signature new file mode 100644 index 00000000..a9433208 --- /dev/null +++ b/xorg-xwayland/.signature @@ -0,0 +1,5 @@ +untrusted comment: verify with /etc/ports/xorg.pub +RWTSGWF5Q7TndONfd+gEC4hdfAl5l/Hb9ARMTKAobxm7fQTWNjyGgrGay26Tm7qSgdoPuIz7+Uyqpp1MobcNskkk2m5Hm2ezFwI= +SHA256 (Pkgfile) = 135f2baf2e4b838f9f3940d9acd90da35f84c1cc38728463ce4a646c0beeae5e +SHA256 (.footprint) = a0f710b525178b1c96a2165cdd68d98915bc2bcecc4cc68be00ff7a105fb25d8 +SHA256 (xwayland-21.1.2.tar.xz) = b81cbdd5ad60b8b7ad8c3ecc7ec2a28c9bf021448670735cebb501f08bebd18b diff --git a/xorg-xwayland/Pkgfile b/xorg-xwayland/Pkgfile new file mode 100644 index 00000000..ffd684f9 --- /dev/null +++ b/xorg-xwayland/Pkgfile @@ -0,0 +1,25 @@ +# Description: X compat server to be used with wayland +# URL: https://wayland.freedesktop.org/xserver.html +# Maintainer: CRUX Xorg Team, xorg-ports at crux dot nu +# Depends on: dbus pixman wayland-egl xorg-server + +name=xorg-xwayland +version=21.1.2 +release=1 +source=(https://xorg.freedesktop.org/releases/individual/xserver/xwayland-$version.tar.xz) + +build() { + meson setup xwayland-$version build \ + --prefix=/usr \ + --buildtype=plain \ + --wrap-mode nodownload \ + -D b_lto=true \ + -D b_pie=true \ + -D xkb_dir=/usr/share/X11/xkb \ + -D xkb_output_dir=/var/lib/xkb + meson compile -C build + DESTDIR=$PKG meson install -C build + + rm -r $PKG/usr/lib/xorg/protocol.txt + rm -r $PKG/usr/share/man/man1/Xserver.1 +}

1 0

ports/xorg (3.6): [notify] xorg-server: 1.20.13 -> 21.1.0; new dependency: xorg-libxcvt
by crux＠crux.nu 31 Oct '21

31 Oct '21

commit e4dc03c70f8f5394a58f9dd6156dd9b5b4d45b6f Author: Tim Biermann <tbier(a)posteo.de> Date: Sun Oct 31 14:47:07 2021 +0100 [notify] xorg-server: 1.20.13 -> 21.1.0; new dependency: xorg-libxcvt diff --git a/xorg-server/.footprint b/xorg-server/.footprint index 0b81ba94..813cff82 100644 --- a/xorg-server/.footprint +++ b/xorg-server/.footprint @@ -8,13 +8,9 @@ lrwxrwxrwx root/root usr/bin/X -> Xorg -rwxr-xr-x root/root usr/bin/Xnest -rwxr-xr-x root/root usr/bin/Xorg -rwxr-xr-x root/root usr/bin/Xvfb --rwxr-xr-x root/root usr/bin/cvt -rwxr-xr-x root/root usr/bin/gtf drwxr-xr-x root/root usr/include/ drwxr-xr-x root/root usr/include/xorg/ --rw-r--r-- root/root usr/include/xorg/BT.h --rw-r--r-- root/root usr/include/xorg/IBM.h --rw-r--r-- root/root usr/include/xorg/TI.h -rw-r--r-- root/root usr/include/xorg/XIstubs.h -rw-r--r-- root/root usr/include/xorg/Xprintf.h -rw-r--r-- root/root usr/include/xorg/callback.h @@ -118,7 +114,6 @@ drwxr-xr-x root/root usr/include/xorg/ -rw-r--r-- root/root usr/include/xorg/shadow.h -rw-r--r-- root/root usr/include/xorg/shadowfb.h -rw-r--r-- root/root usr/include/xorg/shmint.h --rw-r--r-- root/root usr/include/xorg/site.h -rw-r--r-- root/root usr/include/xorg/syncsdk.h -rw-r--r-- root/root usr/include/xorg/validate.h -rw-r--r-- root/root usr/include/xorg/vbe.h @@ -131,6 +126,7 @@ drwxr-xr-x root/root usr/include/xorg/ -rw-r--r-- root/root usr/include/xorg/xaarop.h -rw-r--r-- root/root usr/include/xorg/xace.h -rw-r--r-- root/root usr/include/xorg/xacestr.h +-rw-r--r-- root/root usr/include/xorg/xf86-input-inputtest-protocol.h -rw-r--r-- root/root usr/include/xorg/xf86.h -rw-r--r-- root/root usr/include/xorg/xf86Crtc.h -rw-r--r-- root/root usr/include/xorg/xf86Cursor.h @@ -146,7 +142,6 @@ drwxr-xr-x root/root usr/include/xorg/ -rw-r--r-- root/root usr/include/xorg/xf86PciInfo.h -rw-r--r-- root/root usr/include/xorg/xf86Priv.h -rw-r--r-- root/root usr/include/xorg/xf86Privstr.h --rw-r--r-- root/root usr/include/xorg/xf86RamDac.h -rw-r--r-- root/root usr/include/xorg/xf86RandR12.h -rw-r--r-- root/root usr/include/xorg/xf86VGAarbiter.h -rw-r--r-- root/root usr/include/xorg/xf86Xinput.h @@ -178,21 +173,21 @@ drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/xorg-server.pc drwxr-xr-x root/root usr/lib/xorg-server/ -rwxr-xr-x root/root usr/lib/xorg-server/Xorg --rwsr-xr-x root/root usr/lib/xorg-server/Xorg.wrap +-r-xr-xr-x root/root usr/lib/xorg-server/Xorg.wrap drwxr-xr-x root/root usr/lib/xorg/ drwxr-xr-x root/root usr/lib/xorg/modules/ drwxr-xr-x root/root usr/lib/xorg/modules/drivers/ -rwxr-xr-x root/root usr/lib/xorg/modules/drivers/modesetting_drv.so drwxr-xr-x root/root usr/lib/xorg/modules/extensions/ -rwxr-xr-x root/root usr/lib/xorg/modules/extensions/libglx.so +drwxr-xr-x root/root usr/lib/xorg/modules/input/ +-rwxr-xr-x root/root usr/lib/xorg/modules/input/inputtest_drv.so -rwxr-xr-x root/root usr/lib/xorg/modules/libexa.so --rwxr-xr-x root/root usr/lib/xorg/modules/libfb.so -rwxr-xr-x root/root usr/lib/xorg/modules/libfbdevhw.so -rwxr-xr-x root/root usr/lib/xorg/modules/libglamoregl.so -rwxr-xr-x root/root usr/lib/xorg/modules/libint10.so -rwxr-xr-x root/root usr/lib/xorg/modules/libshadow.so -rwxr-xr-x root/root usr/lib/xorg/modules/libshadowfb.so --rwxr-xr-x root/root usr/lib/xorg/modules/libvbe.so -rwxr-xr-x root/root usr/lib/xorg/modules/libvgahw.so -rwxr-xr-x root/root usr/lib/xorg/modules/libwfb.so -rw-r--r-- root/root usr/lib/xorg/protocol.txt @@ -209,11 +204,11 @@ drwxr-xr-x root/root usr/share/man/man1/ -rw-r--r-- root/root usr/share/man/man1/Xorg.wrap.1.gz -rw-r--r-- root/root usr/share/man/man1/Xserver.1.gz -rw-r--r-- root/root usr/share/man/man1/Xvfb.1.gz --rw-r--r-- root/root usr/share/man/man1/cvt.1.gz -rw-r--r-- root/root usr/share/man/man1/gtf.1.gz drwxr-xr-x root/root usr/share/man/man4/ -rw-r--r-- root/root usr/share/man/man4/exa.4.gz -rw-r--r-- root/root usr/share/man/man4/fbdevhw.4.gz +-rw-r--r-- root/root usr/share/man/man4/inputtestdrv.4.gz -rw-r--r-- root/root usr/share/man/man4/modesetting.4.gz drwxr-xr-x root/root usr/share/man/man5/ -rw-r--r-- root/root usr/share/man/man5/Xwrapper.config.5.gz diff --git a/xorg-server/.signature b/xorg-server/.signature index 163ad934..8d830c6f 100644 --- a/xorg-server/.signature +++ b/xorg-server/.signature @@ -1,8 +1,5 @@ untrusted comment: verify with /etc/ports/xorg.pub -RWTSGWF5Q7TndLhIOH9WW40ag9meVTBT41j2euy+39t6SxJab8pSahrslJVeJhmIieh98DbtnC+NbMiIDZ/S7xZaIu7AkkNb6gE= -SHA256 (Pkgfile) = 1fe0ef5075fc94673aabf5a0bb1d76f8c79e32dd21462c597ae82d00c9f09051 -SHA256 (.footprint) = 55c554708443642282d937bc16b45a93bddece9c8be60df98596b140e6f5ba83 -SHA256 (xorg-server-1.20.13.tar.xz) = 40aa4e96a56a81a301f15a9b10e06a22700f12b42d9e0e453c7f11d354386300 -SHA256 (0001-v2-FS-58644.patch) = 6253fb5cf06cf650539be585d6ca13cfa00217b51ca9825476c8fd55c09341a4 -SHA256 (xserver-autobind-hotplug.patch) = cae1b7f296c18177de38f9b1215a4f916da2288b85f1fcb9e80373a42e2892b8 -SHA256 (0002-fix-libshadow-2.patch) = d07b2fe55828dad61517a80c77f6f183113916f5e1fce30ff43041550d58bd6e +RWTSGWF5Q7TndDA+YSahr9yvaXD0qkVmuwYqPQ7wIBI/ImLm/DPQQVvZ9xBMo+HwPfKXlQr04QAaXckiAyhjjni/K8eu+Phbnwc= +SHA256 (Pkgfile) = d1eedd89e1cb01fe42514c3ee1175c30d8991ef204ee6cf7f89acba35e7a83ff +SHA256 (.footprint) = 6838beebf40c1bc6c7ea5e8863aed234277a59f1a4a1c733c715a89250c16755 +SHA256 (xserver-xorg-server-21.1.0.tar.bz2) = f8fe88731d8bde9b9d889ea9c4c397ffc7e963111b1feba6c4d935dd8a38ec92 diff --git a/xorg-server/Pkgfile b/xorg-server/Pkgfile index 2cd68591..0ae9bcfe 100644 --- a/xorg-server/Pkgfile +++ b/xorg-server/Pkgfile @@ -1,22 +1,15 @@ # Description: X Window System server # URL: http://xorg.freedesktop.org # Maintainer: CRUX Xorg Team, xorg-ports at crux dot nu -# Depends on: libepoxy nettle xorg-bdftopcf xorg-font-util xorg-libdmx xorg-libxaw xorg-libxcomposite xorg-libxcursor xorg-libxfont2 xorg-libxft xorg-libxinerama xorg-libxres xorg-libxtst xorg-libxxf86dga xorg-mkfontscale xorg-xcb-util-keysyms xorg-xkbcomp +# Depends on: libepoxy nettle xorg-bdftopcf xorg-font-util xorg-libdmx xorg-libxaw xorg-libxcomposite xorg-libxcursor xorg-libxcvt xorg-libxfont2 xorg-libxft xorg-libxinerama xorg-libxres xorg-libxtst xorg-libxxf86dga xorg-mkfontscale xorg-xcb-util-keysyms xorg-xkbcomp name=xorg-server -version=1.20.13 -release=4 -source=(https://www.x.org/releases/individual/xserver/$name-$version.tar.xz - 0001-v2-FS-58644.patch xserver-autobind-hotplug.patch - 0002-fix-libshadow-2.patch) +version=21.1.0 +release=1 +source=(https://gitlab.freedesktop.org/xorg/xserver/-/archive/xorg-server-21.1.0/xserver-xorg-server-21.1.0.tar.bz2) build() { - # https://bugs.freedesktop.org/show_bug.cgi?id=106588 - patch -Np1 -d $SRC/$name-$version -i $SRC/0001-v2-FS-58644.patch - patch -Np1 -d $SRC/$name-$version -i $SRC/0002-fix-libshadow-2.patch - patch -Np1 -d $SRC/$name-$version -i $SRC/xserver-autobind-hotplug.patch - - meson setup $name-$version build \ + meson setup xserver-$name-$version build \ --prefix=/usr \ --libexecdir=/usr/lib/$name \ --localstatedir=/var \ @@ -24,7 +17,6 @@ build() { --wrap-mode nodownload \ -D b_lto=true \ -D b_pie=true \ - -D os_vendor="CRUX" \ -D xkb_dir=/usr/share/X11/xkb \ -D xkb_output_dir=/var/lib/xkb \ -D suid_wrapper=true \ @@ -32,7 +24,7 @@ build() { meson compile -C build DESTDIR=$PKG meson install -C build - ln -s Xorg $PKG/usr/bin/X + #ln -s Xorg $PKG/usr/bin/X install -m 755 -d $PKG/etc/X11/xorg.conf.d echo "needs_root_rights = yes" >> $PKG/etc/X11/Xwrapper.config }

1 0