[pkgsrc/trunk]: pkgsrc/x11/xorg-cf-files xorg-cf-files: Support Darwin/aarch64.

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/x11/xorg-cf-files xorg-cf-files: Support Darwin/aarch64.
From: jperkin <jperkin%pkgsrc.org@localhost>
Date: Thu, 01 Dec 2022 22:30:54 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/0a5521311010
branches:  trunk
changeset: 389179:0a5521311010
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Thu Dec 01 21:14:08 2022 +0000

description:
xorg-cf-files: Support Darwin/aarch64.

diffstat:

 x11/xorg-cf-files/distinfo         |  16 ++++++++--------
 x11/xorg-cf-files/patches/patch-aa |  26 +++++++++++++-------------
 x11/xorg-cf-files/patches/patch-ad |  33 +++++++++++++++++++++++++--------
 x11/xorg-cf-files/patches/patch-ae |  16 ++++++++--------
 x11/xorg-cf-files/patches/patch-af |  18 +++++++++---------
 x11/xorg-cf-files/patches/patch-ag |  33 +++++++++++++++++++++------------
 x11/xorg-cf-files/patches/patch-ai |  12 ++++++------
 x11/xorg-cf-files/patches/patch-ak |  34 +++++++++++++++++-----------------
 8 files changed, 107 insertions(+), 81 deletions(-)

diffs (truncated from 520 to 300 lines):

diff -r 14814870c044 -r 0a5521311010 x11/xorg-cf-files/distinfo
--- a/x11/xorg-cf-files/distinfo        Thu Dec 01 19:27:24 2022 +0000
+++ b/x11/xorg-cf-files/distinfo        Thu Dec 01 21:14:08 2022 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.33 2021/10/26 11:34:54 nia Exp $
+$NetBSD: distinfo,v 1.34 2022/12/01 21:14:08 jperkin Exp $
 
 BLAKE2s (xorg-cf-files-1.0.7.tar.bz2) = 7c971e7951a9369904f766fb5a9e6c78fd07703131e2a042e858e53480f27fd7
 SHA512 (xorg-cf-files-1.0.7.tar.bz2) = 0dd73b9db9fc16bddc94ef23f11434be6ea2f8e0c7bc5ef3c3bfe6749e13843f88d397eed9f980bbbe9e74147172326bd3c3ccb7adedc9150302756e4b07191e
@@ -6,16 +6,16 @@
 SHA1 (patch-OpenBSDLib.rules) = 65b02b660839adb6e9c13287396a794a4586d927
 SHA1 (patch-X11.rules) = 2dac9bcc111f63b2dd887967ea5fab656f52f06b
 SHA1 (patch-X11.tmpl) = 3f0c5b8ad7a60cd0e1e47afcddaace936b9aaeed
-SHA1 (patch-aa) = 795f9f2db4627cbb1ff9e54dfd4e5b7d3cc495f0
+SHA1 (patch-aa) = a5edc4de740bc20f173a8deaa0d0a68f06955a08
 SHA1 (patch-ab) = f8f816409eb233ae4d8430bd9d43b9bf83c5711d
 SHA1 (patch-ac) = 1f977650d9e903a4ea72afc8541b7649cb989ab8
-SHA1 (patch-ad) = 12c918ad85fa44518525d2c4bc628b342b8c0280
-SHA1 (patch-ae) = 7f39d7b26f8b85529af0b9550ee213ed08aaddde
-SHA1 (patch-af) = 27ee42892b9a3f53e43891ca0caec0301c849c85
-SHA1 (patch-ag) = d06e660d887fa457d13ac9e9e9469e20995c95c2
+SHA1 (patch-ad) = fcdddf191f676287b7f42e2b16729ed34afc6786
+SHA1 (patch-ae) = d89ea1af22b3d0fab3cc431e3353c9efe4a92264
+SHA1 (patch-af) = 42c0e0738a5ca20c2f7aa09684630093970c1dee
+SHA1 (patch-ag) = b7c07619141df8d8ae718732343fd185098bdafb
 SHA1 (patch-ah) = 9b64b2e5f419ab190d47dd8156b8f84634fd6a36
-SHA1 (patch-ai) = 455b398bba0d06ded08ed99f1e0e85cc4ff20449
+SHA1 (patch-ai) = fd846dba8f2e90ebf039cba68f35ceb6351c19a6
 SHA1 (patch-aj) = 3be677041b6bff008caa1375d1e6dd5c90d9f501
-SHA1 (patch-ak) = dba7e9f6bd9043e438bf6f309a5dc6f424204fd9
+SHA1 (patch-ak) = ec4e8c30782e3081a84b8c3bd8ab71961a0f13cb
 SHA1 (patch-gnuLib.rules) = 44a39881b4f4b6a10250f7ae4b4508af76cef71d
 SHA1 (patch-sv4Lib.rules) = f7ea2b29a8d3f4e866578fc81d0bbb6a3e598bb3
diff -r 14814870c044 -r 0a5521311010 x11/xorg-cf-files/patches/patch-aa
--- a/x11/xorg-cf-files/patches/patch-aa        Thu Dec 01 19:27:24 2022 +0000
+++ b/x11/xorg-cf-files/patches/patch-aa        Thu Dec 01 21:14:08 2022 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.4 2015/12/27 11:31:54 wiz Exp $
+$NetBSD: patch-aa,v 1.5 2022/12/01 21:14:09 jperkin Exp $
 
---- NetBSD.cf.orig     2009-10-16 21:45:42.000000000 +0000
+--- NetBSD.cf.orig     2021-08-02 01:00:38
 +++ NetBSD.cf
-@@ -126,7 +126,7 @@
+@@ -126,7 +126,7 @@ XCOMM operating system:  OSName (OSMajorVersion./**/OS
  # if ((OSMajorVersion == 2 && OSMinorVersion == 99 && OSTeenyVersion < 11) || \
        (OSMajorVersion == 2 && OSMinorVersion < 99) || \
        (OSMajorVersion < 2))
@@ -11,7 +11,7 @@
  # endif
  # define SystemMTDefines      -D_REENTRANT
  # define MTSafeAPIDefines     -DXUSE_MTSAFE_API -DXNO_MTSAFE_PWDAPI
-@@ -150,7 +150,7 @@
+@@ -150,7 +150,7 @@ XCOMM operating system:  OSName (OSMajorVersion./**/OS
  #define MkdirHierCmd          mkdir -p
  
  #undef CcCmd
@@ -20,7 +20,7 @@
  #ifndef DefaultCCOptions
  #if defined(UseInstalled)
  #define DefaultCCOptions      /**/
-@@ -166,7 +166,7 @@
+@@ -166,7 +166,7 @@ XCOMM operating system:  OSName (OSMajorVersion./**/OS
  #endif
  #endif
  
@@ -29,7 +29,7 @@
  #define StandardCppOptions    -traditional
  #define StandardCppDefines    /**/
  #define PreProcessCmd         CcCmd -E
-@@ -199,6 +199,8 @@
+@@ -199,6 +199,8 @@ XCOMM operating system:  OSName (OSMajorVersion./**/OS
  #  ifndef DoLoadableServer
  #  define DoLoadableServer    YES
  #  endif
@@ -38,14 +38,14 @@
  #else
  #  ifndef DoLoadableServer
  #  define DoLoadableServer    NO
-@@ -344,6 +346,10 @@
+@@ -342,6 +344,10 @@ XCOMM operating system:  OSName (OSMajorVersion./**/OS
+  */
+ #ifndef HasPerl
  #define HasPerl                       NO
- #endif
- 
++#endif
++
 +#if defined(AMD64Architecture)
 +# define HasMTRRBuiltin                YES
-+#endif
-+
+ #endif
+ 
  /*
-  * NetBSD doesn't have gperf in default system
-  * you may override this in host.def if you installed perl from the packages
diff -r 14814870c044 -r 0a5521311010 x11/xorg-cf-files/patches/patch-ad
--- a/x11/xorg-cf-files/patches/patch-ad        Thu Dec 01 19:27:24 2022 +0000
+++ b/x11/xorg-cf-files/patches/patch-ad        Thu Dec 01 21:14:08 2022 +0000
@@ -1,8 +1,10 @@
-$NetBSD: patch-ad,v 1.1.1.1 2006/12/19 22:54:51 joerg Exp $
+$NetBSD: patch-ad,v 1.2 2022/12/01 21:14:09 jperkin Exp $
+
+Support aarch64.
 
---- darwin.cf.orig     2005-12-06 11:18:05.000000000 +0100
-+++ darwin.cf  2005-12-06 11:20:10.000000000 +0100
-@@ -97,7 +97,7 @@
+--- darwin.cf.orig     2021-08-02 01:00:38
++++ darwin.cf
+@@ -97,7 +97,7 @@ XCOMM operating system:  OSName (OSMajorVersion./**/OS
   * Turn off to build on raw Darwin systems.
   */
  #ifndef DarwinQuartzSupport
@@ -11,7 +13,7 @@
  #endif
  
  #if DarwinQuartzSupport
-@@ -170,7 +170,7 @@
+@@ -170,7 +170,7 @@ XCOMM operating system:  OSName (OSMajorVersion./**/OS
   * so we use the 3.1-based version in this case.
   */
  #if (GccMajorVersion == 3) && (GccMinorVersion == 3)
@@ -20,7 +22,7 @@
  #else
  # define CppCmd                 /usr/bin/cpp
  #endif
-@@ -184,8 +184,8 @@
+@@ -184,8 +184,8 @@ XCOMM operating system:  OSName (OSMajorVersion./**/OS
  #endif
  
  /* we have a gcc compatible compiler, but its not called gcc */
@@ -31,7 +33,7 @@
  
  /* default flags to pass to cc */
  #ifndef DefaultCCOptions
-@@ -213,7 +213,7 @@
+@@ -213,7 +213,7 @@ XCOMM operating system:  OSName (OSMajorVersion./**/OS
  #ifdef PpcDarwinArchitecture
  # define DarwinMachineDefines   -D__powerpc__
  # if HasGcc3
@@ -40,7 +42,7 @@
  # else
  #  define OptimizedCDebugFlags  -O2
  # endif
-@@ -223,7 +223,7 @@
+@@ -223,13 +223,22 @@ XCOMM operating system:  OSName (OSMajorVersion./**/OS
  #ifdef i386DarwinArchitecture
  # define DarwinMachineDefines   -D__i386__
  # if HasGcc3
@@ -49,3 +51,18 @@
  # else
  #  define OptimizedCDebugFlags  -O2 -fno-strength-reduce
  # endif
+ # define ByteOrder              X_LITTLE_ENDIAN
+ #endif /* i386DarwinArchitecture */
+ 
++#ifdef aarch64DarwinArchitecture
++# define DarwinMachineDefines   -D__aarch64__
++# if HasGcc3
++#  define OptimizedCDebugFlags  @@PKGSRC_CFLAGS@@
++# else
++#  define OptimizedCDebugFlags  -O2 -fno-strength-reduce
++# endif
++# define ByteOrder              X_LITTLE_ENDIAN
++#endif
+ 
+ #ifdef x86_64DarwinArchitecture
+ # define DarwinMachineDefines   -D__x86_64__
diff -r 14814870c044 -r 0a5521311010 x11/xorg-cf-files/patches/patch-ae
--- a/x11/xorg-cf-files/patches/patch-ae        Thu Dec 01 19:27:24 2022 +0000
+++ b/x11/xorg-cf-files/patches/patch-ae        Thu Dec 01 21:14:08 2022 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.4 2015/07/15 17:21:10 dholland Exp $
+$NetBSD: patch-ae,v 1.5 2022/12/01 21:14:09 jperkin Exp $
 
---- DragonFly.cf.orig  2010-05-16 12:38:48.000000000 +0200
-+++ DragonFly.cf       2010-05-16 12:41:18.000000000 +0200
-@@ -96,12 +96,12 @@
+--- DragonFly.cf.orig  2021-08-02 01:00:38
++++ DragonFly.cf
+@@ -96,12 +96,12 @@ XCOMM operating system:  OSName (OSMajorVersion./**/OS
  #define HasFlex                  YES
  
  #ifndef CcCmd
@@ -18,14 +18,14 @@
  #define PreProcessCmd            CppCmd
  #define StandardCppOptions       -traditional
  #define StandardCppDefines       /**/
-@@ -116,10 +116,6 @@
+@@ -115,10 +115,6 @@ XCOMM operating system:  OSName (OSMajorVersion./**/OS
+ #   define NoSystemWarn
  # endif
  # define DefaultCCOptions -ansi NoSystemWarn -Dasm=__asm GccWarningOptions
- #endif
+-#endif
 -#ifndef ExtraLibraries
 -/* support for multi-byte locales is in libxpg4 rather than libc */
 -#define ExtraLibraries          -lxpg4
--#endif
+ #endif
  #define HasSetUserContext       YES
  #define HasGetpeereid           YES
- #define HasMTRRSupport          YES
diff -r 14814870c044 -r 0a5521311010 x11/xorg-cf-files/patches/patch-af
--- a/x11/xorg-cf-files/patches/patch-af        Thu Dec 01 19:27:24 2022 +0000
+++ b/x11/xorg-cf-files/patches/patch-af        Thu Dec 01 21:14:08 2022 +0000
@@ -1,12 +1,12 @@
-$NetBSD: patch-af,v 1.9 2016/09/20 16:37:24 jperkin Exp $
+$NetBSD: patch-af,v 1.10 2022/12/01 21:14:09 jperkin Exp $
 
 - Ensure all programs and libraries have a LOCALBASE rpath.
 - Disable Solaris64bitSubdir, at least until multi-arch is supported.
 - Use pkgsrc CC, CXX, CFLAGS and INSTALL.
 
---- sun.cf.orig        2015-12-22 01:28:02.000000000 +0000
+--- sun.cf.orig        2021-08-02 01:00:39
 +++ sun.cf
-@@ -430,9 +430,9 @@ XCOMM SunPro C++ CplusplusCompilerMajorV
+@@ -430,9 +430,9 @@ XCOMM SunPro C++ CplusplusCompilerMajorVersion./**/Cpl
  #  endif
  # endif
  # if OSMinorVersion > 10
@@ -18,19 +18,19 @@
  # endif
  #ifndef LargefileDefines
  # if (OSMajorVersion > 5) || (OSMajorVersion == 5 && OSMinorVersion >= 6)
-@@ -682,29 +682,29 @@ XCOMM SunPro C++ CplusplusCompilerMajorV
+@@ -682,29 +682,29 @@ XCOMM SunPro C++ CplusplusCompilerMajorVersion./**/Cpl
  # endif
  # if HasGcc2
  #  ifndef CcCmd
 -#   define CcCmd gcc
 +#   define CcCmd @@PKGSRC_CC@@
-+#  endif
+ #  endif
 +#  ifndef CppCmd
 +#   define CppCmd @@PKGSRC_CPP@@
 +#  endif
 +#  ifndef CplusplusCmd
 +#   define CplusplusCmd @@PKGSRC_CXX@@
- #  endif
++#  endif
  #  ifndef AsCmd
  #   define AsCmd CcCmd -c -x assembler
  #  endif
@@ -58,7 +58,7 @@
  #   endif
  #  endif
  # else
-@@ -829,7 +829,7 @@ XCOMM SunPro C++ CplusplusCompilerMajorV
+@@ -829,7 +829,7 @@ XCOMM SunPro C++ CplusplusCompilerMajorVersion./**/Cpl
  # endif
  #endif
  #ifndef Mapfile_NoExData
@@ -67,7 +67,7 @@
  /* SPARC archictecture requires PLT section in .data be executable, so
     we can only make .bss, not all of .data no-exec on SPARC */
  #   define Mapfile_NoExData /**/
-@@ -846,7 +846,7 @@ XCOMM SunPro C++ CplusplusCompilerMajorV
+@@ -846,7 +846,7 @@ MAPFILES_FOR_PROGS = Mapfile_BssAlign Mapfile_NoExStac
  MAPFILES_FOR_PROGS = Mapfile_BssAlign Mapfile_NoExStack
  /* ExtraLoadFlags apply to all binaries - programs & libraries */
  # ifndef ExtraLoadFlags
@@ -76,7 +76,7 @@
  # endif
  /* ExtraLoadOptions only apply to programs */
  # ifndef ExtraLoadOptions
-@@ -863,7 +863,7 @@ MAPFILES_FOR_PROGS = Mapfile_BssAlign Ma
+@@ -863,7 +863,7 @@ MAPFILES_FOR_PROGS = Mapfile_BssAlign Mapfile_NoExStac
  # endif
  #endif
  
diff -r 14814870c044 -r 0a5521311010 x11/xorg-cf-files/patches/patch-ag
--- a/x11/xorg-cf-files/patches/patch-ag        Thu Dec 01 19:27:24 2022 +0000
+++ b/x11/xorg-cf-files/patches/patch-ag        Thu Dec 01 21:14:08 2022 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ag,v 1.7 2017/01/06 21:12:39 tez Exp $
+$NetBSD: patch-ag,v 1.8 2022/12/01 21:14:09 jperkin Exp $
 
 Add __ppc64__ and __arm__
 Recognize __sun as well as sun
@@ -6,9 +6,9 @@
 Also recognize __sparc__ apparently now needed for gcc49 on solaris sparc
 to avoid -M /usr/lib/ld/map.noexdata which in does not work on SPARC
 
---- Imake.cf.orig      2015-12-22 01:28:02.000000000 +0000
+--- Imake.cf.orig      2021-08-02 01:00:38
 +++ Imake.cf
-@@ -25,9 +25,10 @@ XCOMM $XFree86: xc/config/cf/Imake.cf,v
+@@ -25,14 +25,19 @@ XCOMM $XFree86: xc/config/cf/Imake.cf,v 3.88 2003/12/1
  # define MacroIncludeFile <darwin.cf>
  # define MacroFile darwin.cf
  # define DarwinArchitecture
@@ -20,7 +20,16 @@
  # endif
  # ifdef __i386__
  #  define i386DarwinArchitecture
-@@ -255,6 +256,10 @@ XCOMM $XFree86: xc/config/cf/Imake.cf,v
Prev by Date: [pkgsrc/trunk]: pkgsrc/misc/wthrr misc/wthrr: update to 0.6.1
Next by Date: [pkgsrc/trunk]: pkgsrc/doc doc: Added devel/qt6-qt5compat version 6.4.1
Previous by Thread: [pkgsrc/trunk]: pkgsrc/misc/wthrr misc/wthrr: update to 0.6.1
Next by Thread: [pkgsrc/trunk]: pkgsrc/doc doc: Added devel/qt6-qt5compat version 6.4.1
Indexes:
Home | Main Index | Thread Index | Old Index