pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/x11/modular-xorg-xquartz modular-xorg-xquartz: update ...
details: https://anonhg.NetBSD.org/pkgsrc/rev/77c5111639a2
branches: trunk
changeset: 379192:77c5111639a2
user: tnn <tnn%pkgsrc.org@localhost>
date: Thu May 12 19:39:00 2022 +0000
description:
modular-xorg-xquartz: update to 1.20.99.1.20210408
Unknown changes. Tested on macOS 12.3.1 (arm64) w/ Xcode 13.3.1.
diffstat:
x11/modular-xorg-xquartz/MESSAGE | 11 +-
x11/modular-xorg-xquartz/Makefile | 20 +-
x11/modular-xorg-xquartz/PLIST | 64 +-
x11/modular-xorg-xquartz/distinfo | 23 +-
x11/modular-xorg-xquartz/patches/patch-fb_fb.h | 26 -
x11/modular-xorg-xquartz/patches/patch-fb_fbpict.c | 348 ----------
x11/modular-xorg-xquartz/patches/patch-fb_fbpict.h | 28 -
x11/modular-xorg-xquartz/patches/patch-fb_fbscreen.c | 14 -
x11/modular-xorg-xquartz/patches/patch-fb_fbtrap.c | 97 --
x11/modular-xorg-xquartz/patches/patch-hw_xfree86_Makefile.am | 25 -
x11/modular-xorg-xquartz/patches/patch-hw_xquartz_GL_indirect.c | 65 -
x11/modular-xorg-xquartz/patches/patch-hw_xquartz_X11Application.m | 16 -
x11/modular-xorg-xquartz/patches/patch-hw_xquartz_X11Controller.m | 33 -
x11/modular-xorg-xquartz/patches/patch-hw_xquartz_pbproxy_Makefile.in | 15 -
x11/modular-xorg-xquartz/patches/patch-mi_miexpose.c | 147 ----
x11/modular-xorg-xquartz/patches/patch-render_mipict.c | 17 -
x11/modular-xorg-xquartz/patches/patch-render_mipict.h | 51 -
x11/modular-xorg-xquartz/patches/patch-render_mitrap.c | 128 ---
x11/modular-xorg-xquartz/patches/patch-render_mitri.c | 71 --
19 files changed, 51 insertions(+), 1148 deletions(-)
diffs (truncated from 1381 to 300 lines):
diff -r 1cee08f39ef9 -r 77c5111639a2 x11/modular-xorg-xquartz/MESSAGE
--- a/x11/modular-xorg-xquartz/MESSAGE Thu May 12 19:37:39 2022 +0000
+++ b/x11/modular-xorg-xquartz/MESSAGE Thu May 12 19:39:00 2022 +0000
@@ -1,15 +1,10 @@
===========================================================================
-$NetBSD: MESSAGE,v 1.1 2015/10/01 12:55:09 tnn Exp $
+$NetBSD: MESSAGE,v 1.2 2022/05/12 19:39:00 tnn Exp $
To finish the installation of pkgsrc X11 on your Mac:
-$ sudo mv /Applications/Utilities/X11.app /Applications/Utilities/X11.app.bak
-$ sudo ln -s ${PREFIX}/Applications/Utilities/X11.app /Applications/Utilities
+$ ln -sf ${PREFIX}/Applications/Utilities/X11.app ~/Applications/X11.app
-$ echo "${PREFIX}/bin/xterm &" > ~/.xinitrc
-$ echo ${PREFIX}/bin/quartz-wm >> ~/.xinitrc
-$ ${PREFIX}/bin/startx -- ${PREFIX}/bin/Xquartz
-
-You can also launch X11.app from finder instead of the last step.
+Then click on ~/Applications/X11 in Finder.
===========================================================================
diff -r 1cee08f39ef9 -r 77c5111639a2 x11/modular-xorg-xquartz/Makefile
--- a/x11/modular-xorg-xquartz/Makefile Thu May 12 19:37:39 2022 +0000
+++ b/x11/modular-xorg-xquartz/Makefile Thu May 12 19:39:00 2022 +0000
@@ -1,20 +1,19 @@
-# $NetBSD: Makefile,v 1.15 2022/03/10 10:09:42 jperkin Exp $
+# $NetBSD: Makefile,v 1.16 2022/05/12 19:39:00 tnn Exp $
-DISTNAME= xorg-server-1.17.2
-PKGNAME= ${DISTNAME:S/xorg-server/modular-xorg-xquartz/}
-PKGREVISION= 6
+DISTNAME= modular-xorg-xquartz-1.20.99.1.20210408
CATEGORIES= x11
-MASTER_SITES= https://www.x.org/releases/individual/xserver/
-EXTRACT_SUFX= .tar.bz2
+MASTER_SITES= ${MASTER_SITE_GITHUB:=XQuartz/}
+GITHUB_PROJECT= xorg-server
+GITHUB_TAG= 199f278a1b7570b1cb6e24b8bedb4d721b3c9938
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE= https://www.x.org/releases/individual/xserver/
+HOMEPAGE= https://www.xquartz.org/
COMMENT= X11 server for Mac OS X
LICENSE= mit
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
-USE_TOOLS+= gmake pkg-config
+USE_TOOLS+= gmake pkg-config autoconf automake autoreconf
USE_LANGUAGES= c c++ objc
ONLY_FOR_PLATFORM= Darwin-*-*
@@ -85,6 +84,9 @@
MESSAGE_SUBST+= PREFIX=${PREFIX}
+pre-configure:
+ cd ${WRKSRC} && autoreconf -vif
+
.include "../../devel/ncurses/buildlink3.mk"
.include "../../devel/xorg-util-macros/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
@@ -98,7 +100,7 @@
.include "../../x11/libXaw/buildlink3.mk"
.include "../../x11/libXext/buildlink3.mk"
.include "../../x11/libXfixes/buildlink3.mk"
-.include "../../x11/libXfont/buildlink3.mk"
+.include "../../x11/libXfont2/buildlink3.mk"
.include "../../x11/libXt/buildlink3.mk"
.include "../../x11/libXxf86vm/buildlink3.mk"
.include "../../x11/libXinerama/buildlink3.mk"
diff -r 1cee08f39ef9 -r 77c5111639a2 x11/modular-xorg-xquartz/PLIST
--- a/x11/modular-xorg-xquartz/PLIST Thu May 12 19:37:39 2022 +0000
+++ b/x11/modular-xorg-xquartz/PLIST Thu May 12 19:39:00 2022 +0000
@@ -1,99 +1,100 @@
-@comment $NetBSD: PLIST,v 1.2 2016/02/12 12:34:49 jperkin Exp $
+@comment $NetBSD: PLIST,v 1.3 2022/05/12 19:39:00 tnn Exp $
Applications/Utilities/X11.app/Contents/Info.plist
Applications/Utilities/X11.app/Contents/MacOS/X11
Applications/Utilities/X11.app/Contents/MacOS/X11.bin
+Applications/Utilities/X11.app/Contents/MacOS/X11.sh
Applications/Utilities/X11.app/Contents/PkgInfo
-Applications/Utilities/X11.app/Contents/Resources/Dutch.lproj/InfoPlist.strings
Applications/Utilities/X11.app/Contents/Resources/Dutch.lproj/Localizable.strings
+Applications/Utilities/X11.app/Contents/Resources/Dutch.lproj/main.nib/keyedobjects-110000.nib
Applications/Utilities/X11.app/Contents/Resources/Dutch.lproj/main.nib/keyedobjects.nib
-Applications/Utilities/X11.app/Contents/Resources/English.lproj/InfoPlist.strings
Applications/Utilities/X11.app/Contents/Resources/English.lproj/Localizable.strings
Applications/Utilities/X11.app/Contents/Resources/English.lproj/main.nib/designable.nib
+Applications/Utilities/X11.app/Contents/Resources/English.lproj/main.nib/keyedobjects-110000.nib
Applications/Utilities/X11.app/Contents/Resources/English.lproj/main.nib/keyedobjects.nib
-Applications/Utilities/X11.app/Contents/Resources/French.lproj/InfoPlist.strings
Applications/Utilities/X11.app/Contents/Resources/French.lproj/Localizable.strings
+Applications/Utilities/X11.app/Contents/Resources/French.lproj/main.nib/keyedobjects-110000.nib
Applications/Utilities/X11.app/Contents/Resources/French.lproj/main.nib/keyedobjects.nib
-Applications/Utilities/X11.app/Contents/Resources/German.lproj/InfoPlist.strings
Applications/Utilities/X11.app/Contents/Resources/German.lproj/Localizable.strings
+Applications/Utilities/X11.app/Contents/Resources/German.lproj/main.nib/keyedobjects-110000.nib
Applications/Utilities/X11.app/Contents/Resources/German.lproj/main.nib/keyedobjects.nib
-Applications/Utilities/X11.app/Contents/Resources/Italian.lproj/InfoPlist.strings
Applications/Utilities/X11.app/Contents/Resources/Italian.lproj/Localizable.strings
+Applications/Utilities/X11.app/Contents/Resources/Italian.lproj/main.nib/keyedobjects-110000.nib
Applications/Utilities/X11.app/Contents/Resources/Italian.lproj/main.nib/keyedobjects.nib
-Applications/Utilities/X11.app/Contents/Resources/Japanese.lproj/InfoPlist.strings
Applications/Utilities/X11.app/Contents/Resources/Japanese.lproj/Localizable.strings
+Applications/Utilities/X11.app/Contents/Resources/Japanese.lproj/main.nib/keyedobjects-110000.nib
Applications/Utilities/X11.app/Contents/Resources/Japanese.lproj/main.nib/keyedobjects.nib
-Applications/Utilities/X11.app/Contents/Resources/Spanish.lproj/InfoPlist.strings
Applications/Utilities/X11.app/Contents/Resources/Spanish.lproj/Localizable.strings
+Applications/Utilities/X11.app/Contents/Resources/Spanish.lproj/main.nib/keyedobjects-110000.nib
Applications/Utilities/X11.app/Contents/Resources/Spanish.lproj/main.nib/keyedobjects.nib
Applications/Utilities/X11.app/Contents/Resources/X11.icns
-Applications/Utilities/X11.app/Contents/Resources/ar.lproj/InfoPlist.strings
Applications/Utilities/X11.app/Contents/Resources/ar.lproj/Localizable.strings
+Applications/Utilities/X11.app/Contents/Resources/ar.lproj/main.nib/keyedobjects-110000.nib
Applications/Utilities/X11.app/Contents/Resources/ar.lproj/main.nib/keyedobjects.nib
-Applications/Utilities/X11.app/Contents/Resources/ca.lproj/InfoPlist.strings
Applications/Utilities/X11.app/Contents/Resources/ca.lproj/Localizable.strings
+Applications/Utilities/X11.app/Contents/Resources/ca.lproj/main.nib/keyedobjects-110000.nib
Applications/Utilities/X11.app/Contents/Resources/ca.lproj/main.nib/keyedobjects.nib
-Applications/Utilities/X11.app/Contents/Resources/cs.lproj/InfoPlist.strings
Applications/Utilities/X11.app/Contents/Resources/cs.lproj/Localizable.strings
+Applications/Utilities/X11.app/Contents/Resources/cs.lproj/main.nib/keyedobjects-110000.nib
Applications/Utilities/X11.app/Contents/Resources/cs.lproj/main.nib/keyedobjects.nib
-Applications/Utilities/X11.app/Contents/Resources/da.lproj/InfoPlist.strings
Applications/Utilities/X11.app/Contents/Resources/da.lproj/Localizable.strings
+Applications/Utilities/X11.app/Contents/Resources/da.lproj/main.nib/keyedobjects-110000.nib
Applications/Utilities/X11.app/Contents/Resources/da.lproj/main.nib/keyedobjects.nib
-Applications/Utilities/X11.app/Contents/Resources/el.lproj/InfoPlist.strings
Applications/Utilities/X11.app/Contents/Resources/el.lproj/Localizable.strings
+Applications/Utilities/X11.app/Contents/Resources/el.lproj/main.nib/keyedobjects-110000.nib
Applications/Utilities/X11.app/Contents/Resources/el.lproj/main.nib/keyedobjects.nib
-Applications/Utilities/X11.app/Contents/Resources/fi.lproj/InfoPlist.strings
Applications/Utilities/X11.app/Contents/Resources/fi.lproj/Localizable.strings
+Applications/Utilities/X11.app/Contents/Resources/fi.lproj/main.nib/keyedobjects-110000.nib
Applications/Utilities/X11.app/Contents/Resources/fi.lproj/main.nib/keyedobjects.nib
-Applications/Utilities/X11.app/Contents/Resources/he.lproj/InfoPlist.strings
Applications/Utilities/X11.app/Contents/Resources/he.lproj/Localizable.strings
+Applications/Utilities/X11.app/Contents/Resources/he.lproj/main.nib/keyedobjects-110000.nib
Applications/Utilities/X11.app/Contents/Resources/he.lproj/main.nib/keyedobjects.nib
-Applications/Utilities/X11.app/Contents/Resources/hr.lproj/InfoPlist.strings
Applications/Utilities/X11.app/Contents/Resources/hr.lproj/Localizable.strings
+Applications/Utilities/X11.app/Contents/Resources/hr.lproj/main.nib/keyedobjects-110000.nib
Applications/Utilities/X11.app/Contents/Resources/hr.lproj/main.nib/keyedobjects.nib
-Applications/Utilities/X11.app/Contents/Resources/hu.lproj/InfoPlist.strings
Applications/Utilities/X11.app/Contents/Resources/hu.lproj/Localizable.strings
+Applications/Utilities/X11.app/Contents/Resources/hu.lproj/main.nib/keyedobjects-110000.nib
Applications/Utilities/X11.app/Contents/Resources/hu.lproj/main.nib/keyedobjects.nib
-Applications/Utilities/X11.app/Contents/Resources/ko.lproj/InfoPlist.strings
Applications/Utilities/X11.app/Contents/Resources/ko.lproj/Localizable.strings
+Applications/Utilities/X11.app/Contents/Resources/ko.lproj/main.nib/keyedobjects-110000.nib
Applications/Utilities/X11.app/Contents/Resources/ko.lproj/main.nib/keyedobjects.nib
-Applications/Utilities/X11.app/Contents/Resources/no.lproj/InfoPlist.strings
Applications/Utilities/X11.app/Contents/Resources/no.lproj/Localizable.strings
+Applications/Utilities/X11.app/Contents/Resources/no.lproj/main.nib/keyedobjects-110000.nib
Applications/Utilities/X11.app/Contents/Resources/no.lproj/main.nib/keyedobjects.nib
-Applications/Utilities/X11.app/Contents/Resources/pl.lproj/InfoPlist.strings
Applications/Utilities/X11.app/Contents/Resources/pl.lproj/Localizable.strings
+Applications/Utilities/X11.app/Contents/Resources/pl.lproj/main.nib/keyedobjects-110000.nib
Applications/Utilities/X11.app/Contents/Resources/pl.lproj/main.nib/keyedobjects.nib
-Applications/Utilities/X11.app/Contents/Resources/pt.lproj/InfoPlist.strings
Applications/Utilities/X11.app/Contents/Resources/pt.lproj/Localizable.strings
+Applications/Utilities/X11.app/Contents/Resources/pt.lproj/main.nib/keyedobjects-110000.nib
Applications/Utilities/X11.app/Contents/Resources/pt.lproj/main.nib/keyedobjects.nib
-Applications/Utilities/X11.app/Contents/Resources/pt_PT.lproj/InfoPlist.strings
Applications/Utilities/X11.app/Contents/Resources/pt_PT.lproj/Localizable.strings
+Applications/Utilities/X11.app/Contents/Resources/pt_PT.lproj/main.nib/keyedobjects-110000.nib
Applications/Utilities/X11.app/Contents/Resources/pt_PT.lproj/main.nib/keyedobjects.nib
-Applications/Utilities/X11.app/Contents/Resources/ro.lproj/InfoPlist.strings
Applications/Utilities/X11.app/Contents/Resources/ro.lproj/Localizable.strings
+Applications/Utilities/X11.app/Contents/Resources/ro.lproj/main.nib/keyedobjects-110000.nib
Applications/Utilities/X11.app/Contents/Resources/ro.lproj/main.nib/keyedobjects.nib
-Applications/Utilities/X11.app/Contents/Resources/ru.lproj/InfoPlist.strings
Applications/Utilities/X11.app/Contents/Resources/ru.lproj/Localizable.strings
+Applications/Utilities/X11.app/Contents/Resources/ru.lproj/main.nib/keyedobjects-110000.nib
Applications/Utilities/X11.app/Contents/Resources/ru.lproj/main.nib/keyedobjects.nib
-Applications/Utilities/X11.app/Contents/Resources/sk.lproj/InfoPlist.strings
Applications/Utilities/X11.app/Contents/Resources/sk.lproj/Localizable.strings
+Applications/Utilities/X11.app/Contents/Resources/sk.lproj/main.nib/keyedobjects-110000.nib
Applications/Utilities/X11.app/Contents/Resources/sk.lproj/main.nib/keyedobjects.nib
-Applications/Utilities/X11.app/Contents/Resources/sv.lproj/InfoPlist.strings
Applications/Utilities/X11.app/Contents/Resources/sv.lproj/Localizable.strings
+Applications/Utilities/X11.app/Contents/Resources/sv.lproj/main.nib/keyedobjects-110000.nib
Applications/Utilities/X11.app/Contents/Resources/sv.lproj/main.nib/keyedobjects.nib
-Applications/Utilities/X11.app/Contents/Resources/th.lproj/InfoPlist.strings
Applications/Utilities/X11.app/Contents/Resources/th.lproj/Localizable.strings
+Applications/Utilities/X11.app/Contents/Resources/th.lproj/main.nib/keyedobjects-110000.nib
Applications/Utilities/X11.app/Contents/Resources/th.lproj/main.nib/keyedobjects.nib
-Applications/Utilities/X11.app/Contents/Resources/tr.lproj/InfoPlist.strings
Applications/Utilities/X11.app/Contents/Resources/tr.lproj/Localizable.strings
+Applications/Utilities/X11.app/Contents/Resources/tr.lproj/main.nib/keyedobjects-110000.nib
Applications/Utilities/X11.app/Contents/Resources/tr.lproj/main.nib/keyedobjects.nib
-Applications/Utilities/X11.app/Contents/Resources/uk.lproj/InfoPlist.strings
Applications/Utilities/X11.app/Contents/Resources/uk.lproj/Localizable.strings
+Applications/Utilities/X11.app/Contents/Resources/uk.lproj/main.nib/keyedobjects-110000.nib
Applications/Utilities/X11.app/Contents/Resources/uk.lproj/main.nib/keyedobjects.nib
-Applications/Utilities/X11.app/Contents/Resources/zh_CN.lproj/InfoPlist.strings
Applications/Utilities/X11.app/Contents/Resources/zh_CN.lproj/Localizable.strings
+Applications/Utilities/X11.app/Contents/Resources/zh_CN.lproj/main.nib/keyedobjects-110000.nib
Applications/Utilities/X11.app/Contents/Resources/zh_CN.lproj/main.nib/keyedobjects.nib
-Applications/Utilities/X11.app/Contents/Resources/zh_TW.lproj/InfoPlist.strings
Applications/Utilities/X11.app/Contents/Resources/zh_TW.lproj/Localizable.strings
+Applications/Utilities/X11.app/Contents/Resources/zh_TW.lproj/main.nib/keyedobjects-110000.nib
Applications/Utilities/X11.app/Contents/Resources/zh_TW.lproj/main.nib/keyedobjects.nib
bin/Xquartz
lib/X11/xserver/Xquartz.plist
@@ -101,3 +102,4 @@
man/man1/Xquartz.1
man/man1/Xserver.1
share/doc/xorg-server/Xserver-DTrace.xml
+var/db/xkb/README.compiled
diff -r 1cee08f39ef9 -r 77c5111639a2 x11/modular-xorg-xquartz/distinfo
--- a/x11/modular-xorg-xquartz/distinfo Thu May 12 19:37:39 2022 +0000
+++ b/x11/modular-xorg-xquartz/distinfo Thu May 12 19:39:00 2022 +0000
@@ -1,20 +1,5 @@
-$NetBSD: distinfo,v 1.5 2021/10/26 11:34:15 nia Exp $
+$NetBSD: distinfo,v 1.6 2022/05/12 19:39:00 tnn Exp $
-BLAKE2s (xorg-server-1.17.2.tar.bz2) = ba8a8b288ee5e968ee74b364dbf09a3433a80ed7127540fc0cef2653c17c2495
-SHA512 (xorg-server-1.17.2.tar.bz2) = 7e7b7620890cc8db696695758fa22fa879f9d3c33946663611ec0b37f02116e9c6f08779f9eece59907b430d3df93f0c0548939683ea156b3c4cbe02571b7551
-Size (xorg-server-1.17.2.tar.bz2) = 5767983 bytes
-SHA1 (patch-fb_fb.h) = 82099b0982da0d9d64e3ae8f03393ec0df22f916
-SHA1 (patch-fb_fbpict.c) = 101645f653665c917c0f899b0eb771e7ff1280c4
-SHA1 (patch-fb_fbpict.h) = 686d6634e0cee9b56660787b616435c8134f8c61
-SHA1 (patch-fb_fbscreen.c) = 6bc92e7002f215430e8647337d596bfe99d3d63a
-SHA1 (patch-fb_fbtrap.c) = 60e74d8d6f86dfb24491b17170e02a6040ad9abb
-SHA1 (patch-hw_xfree86_Makefile.am) = 0388fa2a2cb08194def579c014848eaf66f02b24
-SHA1 (patch-hw_xquartz_GL_indirect.c) = f915ce2f6043c21cbaf6a656b7339776156b609e
-SHA1 (patch-hw_xquartz_X11Application.m) = b97759b8e81b582dcf3600a1c3a0b387d2ae24f8
-SHA1 (patch-hw_xquartz_X11Controller.m) = d25fb8915d6ee9b1214a346d3042b47a43ee46f8
-SHA1 (patch-hw_xquartz_pbproxy_Makefile.in) = a877cf56033544b46169757c1ceda5f17fe7a224
-SHA1 (patch-mi_miexpose.c) = e53cbee2330300ef016aae5a5ee9fe8a65efc46b
-SHA1 (patch-render_mipict.c) = fa9058f76d69d9227c41f16094a9ee9926214337
-SHA1 (patch-render_mipict.h) = 11ee673c750ce7860670110ce792ad9f0094d4ad
-SHA1 (patch-render_mitrap.c) = d31fdb56b129b4d5c131dd8caaac41cc37df9f99
-SHA1 (patch-render_mitri.c) = dfb0061cb39bfadea0ac32f77f03e988f958d14c
+BLAKE2s (modular-xorg-xquartz-1.20.99.1.20210408-199f278a1b7570b1cb6e24b8bedb4d721b3c9938.tar.gz) = bbc49d4841aadc00b5a286ae861e2624e55a123094c32d21af2bc2cd196ce566
+SHA512 (modular-xorg-xquartz-1.20.99.1.20210408-199f278a1b7570b1cb6e24b8bedb4d721b3c9938.tar.gz) =
2c543487de54ef94d528efca3263d0a3fd2fc95e20a2d8ae4c7eb4f8adc52f16b072d56024a8ad072bf703c9939bb08e45368c5c7fdc7d27662ba95b4eb9ecb2
+Size (modular-xorg-xquartz-1.20.99.1.20210408-199f278a1b7570b1cb6e24b8bedb4d721b3c9938.tar.gz) = 5849819 bytes
diff -r 1cee08f39ef9 -r 77c5111639a2 x11/modular-xorg-xquartz/patches/patch-fb_fb.h
--- a/x11/modular-xorg-xquartz/patches/patch-fb_fb.h Thu May 12 19:37:39 2022 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-$NetBSD: patch-fb_fb.h,v 1.1 2015/10/01 12:55:09 tnn Exp $
-
-http://cgit.freedesktop.org/~jeremyhu/xserver/log/?h=server-1.17-apple
-
---- fb/fb.h.orig 2014-11-17 05:51:18.000000000 +0000
-+++ fb/fb.h
-@@ -1116,9 +1116,6 @@ extern _X_EXPORT void
- extern _X_EXPORT Bool
- fbPictureInit(ScreenPtr pScreen, PictFormatPtr formats, int nformats);
-
--extern _X_EXPORT void
--fbDestroyGlyphCache(void);
--
- /*
- * fbpixmap.c
- */
-@@ -1326,8 +1323,7 @@ fbFillRegionSolid(DrawablePtr pDrawable,
- RegionPtr pRegion, FbBits and, FbBits xor);
-
- extern _X_EXPORT pixman_image_t *image_from_pict(PicturePtr pict,
-- Bool has_clip,
-- int *xoff, int *yoff);
-+ Bool has_clip);
-
- extern _X_EXPORT void free_pixman_pict(PicturePtr, pixman_image_t *);
-
diff -r 1cee08f39ef9 -r 77c5111639a2 x11/modular-xorg-xquartz/patches/patch-fb_fbpict.c
--- a/x11/modular-xorg-xquartz/patches/patch-fb_fbpict.c Thu May 12 19:37:39 2022 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,348 +0,0 @@
-$NetBSD: patch-fb_fbpict.c,v 1.1 2015/10/01 12:55:09 tnn Exp $
-
-http://cgit.freedesktop.org/~jeremyhu/xserver/log/?h=server-1.17-apple
-
---- fb/fbpict.c.orig 2015-01-17 23:42:52.000000000 +0000
-+++ fb/fbpict.c
-@@ -46,23 +46,18 @@ fbComposite(CARD8 op,
- INT16 yMask, INT16 xDst, INT16 yDst, CARD16 width, CARD16 height)
- {
- pixman_image_t *src, *mask, *dest;
-- int src_xoff, src_yoff;
-- int msk_xoff, msk_yoff;
-- int dst_xoff, dst_yoff;
--
- miCompositeSourceValidate(pSrc);
- if (pMask)
- miCompositeSourceValidate(pMask);
-
-- src = image_from_pict(pSrc, FALSE, &src_xoff, &src_yoff);
-- mask = image_from_pict(pMask, FALSE, &msk_xoff, &msk_yoff);
-- dest = image_from_pict(pDst, TRUE, &dst_xoff, &dst_yoff);
-+ src = image_from_pict(pSrc, TRUE);
-+ mask = image_from_pict(pMask, TRUE);
-+ dest = image_from_pict(pDst, TRUE);
-
- if (src && dest && !(pMask && !mask)) {
Home |
Main Index |
Thread Index |
Old Index