Ticket #62203: mesa-glx-apple-dir.diff

File mesa-glx-apple-dir.diff, 28.3 KB (added by kencu (Ken), 3 years ago)

  • .6/src/glx/apple/Makefile 

    diff -ur /opt/SnowLeopardPorts/x11/mesa/work/mesa-17.1.6/src/glx/apple/Makefile /opt/macports-ports/x11/mesa/work/mesa-18.3.6/src/glx/apple/Makefile
    old new  
    9191target_triplet = x86_64-apple-darwin10.8.0
    9292subdir = src/glx/apple
    9393ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
    94 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_gnu_make.m4 \
     94am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_compile_flag.m4 \
     95        $(top_srcdir)/m4/ax_check_gnu_make.m4 \
    9596        $(top_srcdir)/m4/ax_check_python_mako_module.m4 \
    9697        $(top_srcdir)/m4/ax_gcc_builtin.m4 \
    9798        $(top_srcdir)/m4/ax_gcc_func_attribute.m4 \
    … …  
    197198CTAGS = ctags
    198199am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/bin/depcomp TODO
    199200DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
    200 ACLOCAL = ${SHELL} '/opt/local/var/macports/build/_opt_SnowLeopardPorts_x11_mesa/mesa/work/mesa-17.1.6/bin/missing' aclocal-1.16
     201ACLOCAL = ${SHELL} '/opt/local/var/macports/build/_opt_macports-ports_x11_mesa/mesa/work/mesa-18.3.6/bin/missing' aclocal-1.16
    201202AMDGPU_CFLAGS =
    202203AMDGPU_LIBS =
    203204AMTAR = $${TAR-tar}
    … …  
    205206ANDROID_CFLAGS =
    206207ANDROID_LIBS =
    207208AR = ar
    208 AUTOCONF = ${SHELL} '/opt/local/var/macports/build/_opt_SnowLeopardPorts_x11_mesa/mesa/work/mesa-17.1.6/bin/missing' autoconf
    209 AUTOHEADER = ${SHELL} '/opt/local/var/macports/build/_opt_SnowLeopardPorts_x11_mesa/mesa/work/mesa-17.1.6/bin/missing' autoheader
    210 AUTOMAKE = ${SHELL} '/opt/local/var/macports/build/_opt_SnowLeopardPorts_x11_mesa/mesa/work/mesa-17.1.6/bin/missing' automake-1.16
     209AUTOCONF = ${SHELL} '/opt/local/var/macports/build/_opt_macports-ports_x11_mesa/mesa/work/mesa-18.3.6/bin/missing' autoconf
     210AUTOHEADER = ${SHELL} '/opt/local/var/macports/build/_opt_macports-ports_x11_mesa/mesa/work/mesa-18.3.6/bin/missing' autoheader
     211AUTOMAKE = ${SHELL} '/opt/local/var/macports/build/_opt_macports-ports_x11_mesa/mesa/work/mesa-18.3.6/bin/missing' automake-1.16
    211212AWK = gawk
     213BACKTRACE_CFLAGS =
     214BACKTRACE_LIBS =
    212215BSYMBOLIC =
    213216CC = /opt/local/bin/clang-mp-9.0
    214217CCAS = /opt/local/bin/clang-mp-9.0
    215218CCASDEPMODE = depmode=gcc3
    216219CCASFLAGS = -pipe -Os -I/opt/local/include/LegacySupport -arch x86_64
    217220CCDEPMODE = depmode=gcc3
    218 CFLAGS = -pipe -Os -I/opt/local/include/LegacySupport -arch x86_64 -Wall -std=c99 -Werror=implicit-function-declaration -Werror=missing-prototypes -fno-math-errno -fno-trapping-math -Qunused-arguments
     221CFLAGS = -pipe -Os -I/opt/local/include/LegacySupport -arch x86_64 -std=c99 -Qunused-arguments
    219222CLANG_RESOURCE_DIR =
    220223CLOCK_LIB =
    221224CLOVER_STD_OVERRIDE =
    222225CPP = /opt/local/bin/clang-mp-9.0 -E
    223226CPPFLAGS = -I/opt/local/include/LegacySupport
    224227CXX = /opt/local/bin/clang++-mp-9.0
     228CXX11_CXXFLAGS =
    225229CXXCPP = /opt/local/bin/clang++-mp-9.0 -E
    226230CXXDEPMODE = depmode=gcc3
    227 CXXFLAGS = -pipe -Os -stdlib=libc++ -arch x86_64 -Wall -fno-math-errno -fno-trapping-math -Qunused-arguments
     231CXXFLAGS = -pipe -Os -stdlib=libc++ -arch x86_64 -Wall -fno-math-errno -fno-trapping-math -Wno-missing-field-initializers -Qunused-arguments
    228232CYGPATH_W = echo
    229233D3D_DRIVER_INSTALL_DIR = ${exec_prefix}/lib/d3d
    230 DEFINES = -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -DUSE_SSE41 -DUSE_GCC_ATOMIC_BUILTINS -DNDEBUG -DHAVE_XLOCALE_H -DHAVE_SYS_SYSCTL_H -DHAVE_STRTOF -DHAVE_DLOPEN -DHAVE_POSIX_MEMALIGN -DGLX_USE_APPLEGL -DGLX_INDIRECT_RENDERING -DGLX_DIRECT_RENDERING -DHAVE_X11_PLATFORM -DBUILDING_MESA
    231 DEFS = -DPACKAGE_NAME=\"Mesa\" -DPACKAGE_TARNAME=\"mesa\" -DPACKAGE_VERSION=\"17.1.6\" -DPACKAGE_STRING=\"Mesa\ 17.1.6\" -DPACKAGE_BUGREPORT=\"https://bugs.freedesktop.org/enter_bug.cgi\?product=Mesa\" -DPACKAGE_URL=\"\" -DPACKAGE=\"mesa\" -DVERSION=\"17.1.6\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1 -DLT_OBJDIR=\".libs/\" -DYYTEXT_POINTER=1 -DHAVE___BUILTIN_BSWAP32=1 -DHAVE___BUILTIN_BSWAP64=1 -DHAVE___BUILTIN_CLZ=1 -DHAVE___BUILTIN_CLZLL=1 -DHAVE___BUILTIN_CTZ=1 -DHAVE___BUILTIN_EXPECT=1 -DHAVE___BUILTIN_FFS=1 -DHAVE___BUILTIN_FFSLL=1 -DHAVE___BUILTIN_POPCOUNT=1 -DHAVE___BUILTIN_POPCOUNTLL=1 -DHAVE___BUILTIN_UNREACHABLE=1 -DHAVE_FUNC_ATTRIBUTE_CONST=1 -DHAVE_FUNC_ATTRIBUTE_FLATTEN=1 -DHAVE_FUNC_ATTRIBUTE_FORMAT=1 -DHAVE_FUNC_ATTRIBUTE_MALLOC=1 -DHAVE_FUNC_ATTRIBUTE_PACKED=1 -DHAVE_FUNC_ATTRIBUTE_PURE=1 -DHAVE_FUNC_ATTRIBUTE_RETURNS_NONNULL=1 -DHAVE_FUNC_ATTRIBUTE_UNUSED=1 -DHAVE_FUNC_ATTRIBUTE_WARN_UNUSED_RESULT=1 -DHAVE_FUNC_ATTRIBUTE_WEAK=1 -DHAVE_DLADDR=1 -DHAVE_PTHREAD_PRIO_INHERIT=1 -DHAVE_PTHREAD=1
     234DEFINES = -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -DUSE_SSE41 -DUSE_GCC_ATOMIC_BUILTINS -DNDEBUG -DHAVE_XLOCALE_H -DHAVE_SYS_SYSCTL_H -DHAVE_DLFCN_H -DHAVE_STRTOF -DHAVE_POSIX_MEMALIGN -DHAVE_ZLIB -DGLX_USE_APPLEGL -DGLX_INDIRECT_RENDERING -DGLX_DIRECT_RENDERING -DHAVE_X11_PLATFORM -DBUILDING_MESA
     235DEFS = -DPACKAGE_NAME=\"Mesa\" -DPACKAGE_TARNAME=\"mesa\" -DPACKAGE_VERSION=\"18.3.6\" -DPACKAGE_STRING=\"Mesa\ 18.3.6\" -DPACKAGE_BUGREPORT=\"https://bugs.freedesktop.org/enter_bug.cgi\?product=Mesa\" -DPACKAGE_URL=\"\" -DPACKAGE=\"mesa\" -DVERSION=\"18.3.6\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1 -DLT_OBJDIR=\".libs/\" -DYYTEXT_POINTER=1 -DHAVE___BUILTIN_BSWAP32=1 -DHAVE___BUILTIN_BSWAP64=1 -DHAVE___BUILTIN_CLZ=1 -DHAVE___BUILTIN_CLZLL=1 -DHAVE___BUILTIN_CTZ=1 -DHAVE___BUILTIN_EXPECT=1 -DHAVE___BUILTIN_FFS=1 -DHAVE___BUILTIN_FFSLL=1 -DHAVE___BUILTIN_POPCOUNT=1 -DHAVE___BUILTIN_POPCOUNTLL=1 -DHAVE___BUILTIN_UNREACHABLE=1 -DHAVE_FUNC_ATTRIBUTE_CONST=1 -DHAVE_FUNC_ATTRIBUTE_FLATTEN=1 -DHAVE_FUNC_ATTRIBUTE_FORMAT=1 -DHAVE_FUNC_ATTRIBUTE_MALLOC=1 -DHAVE_FUNC_ATTRIBUTE_PACKED=1 -DHAVE_FUNC_ATTRIBUTE_PURE=1 -DHAVE_FUNC_ATTRIBUTE_RETURNS_NONNULL=1 -DHAVE_FUNC_ATTRIBUTE_UNUSED=1 -DHAVE_FUNC_ATTRIBUTE_WARN_UNUSED_RESULT=1 -DHAVE_FUNC_ATTRIBUTE_WEAK=1 -DHAVE_FUNC_ATTRIBUTE_NORETURN=1 -DHAVE_DLADDR=1 -DHAVE_PTHREAD_PRIO_INHERIT=1 -DHAVE_PTHREAD=1 -DENABLE_ST_OMX_BELLAGIO=0 -DENABLE_ST_OMX_TIZONIA=0
    232236DEPDIR = .deps
    233237DLLTOOL = false
    234238DLOPEN_LIBS =
    235239DRI2PROTO_CFLAGS =
    236240DRI2PROTO_LIBS =
    237241DRIGL_CFLAGS =
    238 DRIGL_LIBS = -L/opt/local/lib -lXext -lXdamage -lXfixes -lX11-xcb -lX11 -lxcb -lxcb-glx -lXxf86vm
     242DRIGL_LIBS = -L/opt/local/lib -lXext -lXdamage -lXfixes -lX11-xcb -lX11 -lxcb -lxcb-glx
    239243DRI_DRIVER_INSTALL_DIR = ${libdir}/dri
    240244DRI_DRIVER_SEARCH_DIR = ${DRI_DRIVER_INSTALL_DIR}
    241245DRI_LIB_DEPS =    -L/opt/local/lib -lexpat -lm -lpthread -pthread
    … …  
    255259EXPAT_CFLAGS =
    256260EXPAT_LIBS = -L/opt/local/lib -lexpat
    257261FGREP = /opt/local/bin/ggrep -F
    258 FREEDRENO_CFLAGS =
    259 FREEDRENO_LIBS =
    260262GALLIUM_PIPE_LOADER_DEFINES =  -DHAVE_PIPE_LOADER_DRI
    261263GBM_PC_LIB_PRIV =
    262264GBM_PC_REQ_PRIV =
    … …  
    271273GLVND_LIBS =
    272274GLX_TLS = no
    273275GL_LIB = GL
    274 GL_LIB_DEPS = -L/opt/local/lib -lXext -lXdamage -lXfixes -lX11-xcb -lX11 -lxcb -lxcb-glx -lXxf86vm -lm -lpthread -pthread
     276GL_LIB_DEPS = -L/opt/local/lib -lXext -lXdamage -lXfixes -lX11-xcb -lX11 -lxcb -lxcb-glx -lm -lpthread -pthread
    275277GL_PC_CFLAGS =
    276278GL_PC_LIB_PRIV = -lm -lpthread -pthread
    277 GL_PC_REQ_PRIV =  x11 xext xdamage >= 1.1 xfixes x11-xcb xcb xcb-glx >= 1.8.1 xxf86vm
     279GL_PC_REQ_PRIV =  x11 xext xdamage >= 1.1 xfixes x11-xcb xcb xcb-glx >= 1.8.1
     280GL_PKGCONF_LIB = GL
    278281GREP = /opt/local/bin/ggrep
    279 HAVE_XF86VIDMODE = yes
     282I915_CFLAGS =
     283I915_LIBS =
    280284INDENT = cat
    281285INDENT_FLAGS =
    282286INSTALL = /usr/bin/install -c
    … …  
    284288INSTALL_PROGRAM = ${INSTALL}
    285289INSTALL_SCRIPT = ${INSTALL}
    286290INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
    287 INTEL_CFLAGS =
    288 INTEL_LIBS =
    289291LD = /opt/local/libexec/llvm-9.0/bin/ld
    290292LDFLAGS = -L/opt/local/lib -Wl,-headerpad_max_install_names -lMacportsLegacySupport -arch x86_64
     293LD_BUILD_ID =
    291294LD_NO_UNDEFINED =
    292295LEX = flex
    293296LEXLIB = -lfl
    294297LEX_OUTPUT_ROOT = lex.yy
     298LIBATOMIC_LIBS =
    295299LIBCLC_INCLUDEDIR =
    296300LIBCLC_LIBEXECDIR =
    297301LIBDRM_CFLAGS =
    … …  
    317321LN_S = ln -s
    318322LTLIBOBJS =
    319323LT_SYS_LIBRARY_PATH =
    320 MAKEINFO = ${SHELL} '/opt/local/var/macports/build/_opt_SnowLeopardPorts_x11_mesa/mesa/work/mesa-17.1.6/bin/missing' makeinfo
     324MAKEINFO = ${SHELL} '/opt/local/var/macports/build/_opt_macports-ports_x11_mesa/mesa/work/mesa-18.3.6/bin/missing' makeinfo
    321325MANIFEST_TOOL = :
    322326MKDIR_P = /opt/local/bin/gmkdir -p
    323 MSVC2013_COMPAT_CFLAGS = -Werror=pointer-arith -Werror=vla
    324 MSVC2013_COMPAT_CXXFLAGS = -Werror=pointer-arith -Werror=vla
     327MSVC2013_COMPAT_CFLAGS =  -Werror=pointer-arith -Werror=vla
     328MSVC2013_COMPAT_CXXFLAGS =  -Werror=pointer-arith -Werror=vla
    325329NINE_MAJOR = 1
    326330NINE_MINOR = 0
    327 NINE_TINY = 0
     331NINE_PATCH = 0
    328332NINE_VERSION = 1.0.0
    329333NM = /opt/local/bin/nm
    330334NMEDIT = nmedit
    … …  
    334338NVVIEUX_LIBS =
    335339OBJDUMP = false
    336340OBJEXT = o
    337 OMX_CFLAGS =
    338 OMX_LIBS =
    339 OMX_LIB_INSTALL_DIR =
     341OMX_BELLAGIO_CFLAGS =
     342OMX_BELLAGIO_LIBS =
     343OMX_BELLAGIO_LIB_INSTALL_DIR =
     344OMX_TIZONIA_CFLAGS =
     345OMX_TIZONIA_LIBS =
     346OMX_TIZONIA_LIB_INSTALL_DIR =
    340347OPENCL_LIBNAME =
    341348OPENCL_VERSION = 1
    342349OSMESA_LIB = OSMesa
    … …  
    349356PACKAGE = mesa
    350357PACKAGE_BUGREPORT = https://bugs.freedesktop.org/enter_bug.cgi?product=Mesa
    351358PACKAGE_NAME = Mesa
    352 PACKAGE_STRING = Mesa 17.1.6
     359PACKAGE_STRING = Mesa 18.3.6
    353360PACKAGE_TARNAME = mesa
    354361PACKAGE_URL =
    355 PACKAGE_VERSION = 17.1.6
     362PACKAGE_VERSION = 18.3.6
    356363PATH_SEPARATOR = :
    357364PKG_CONFIG = /opt/local/bin/pkg-config
    358365PKG_CONFIG_LIBDIR =
    … …  
    364371PTHREAD_CFLAGS = -D_THREAD_SAFE -pthread
    365372PTHREAD_LIBS = -lpthread -pthread
    366373PWR8_CFLAGS =
    367 PYTHON2 = /opt/local/bin/python2.7
     374PYTHON = /opt/local/bin/python3.9
     375PYTHON_EXEC_PREFIX = ${exec_prefix}
     376PYTHON_PLATFORM = darwin
     377PYTHON_PREFIX = ${prefix}
     378PYTHON_VERSION = 3.9
    368379RADEON_CFLAGS =
    369380RADEON_LIBS =
    370381RANLIB = ranlib
    371382RM = rm -f
     383SCANNER_ARG =
    372384SED = /opt/local/bin/gsed
    373385SELINUX_CFLAGS =
    374386SELINUX_LIBS =
    … …  
    380392STRIP = strip
    381393SWR_AVX2_CXXFLAGS =
    382394SWR_AVX_CXXFLAGS =
    383 SWR_CXX11_CXXFLAGS =
     395SWR_KNL_CXXFLAGS =
     396SWR_SKX_CXXFLAGS =
     397V3D_SIMULATOR_CFLAGS =
     398V3D_SIMULATOR_LIBS =
    384399VALGRIND_CFLAGS =
    385400VALGRIND_LIBS =
    386401VA_CFLAGS =
    … …  
    395410VDPAU_LIB_INSTALL_DIR = ${libdir}/vdpau
    396411VDPAU_MAJOR = 1
    397412VDPAU_MINOR = 0
    398 VERSION = 17.1.6
     413VERSION = 18.3.6
    399414VISIBILITY_CFLAGS = -fvisibility=hidden
    400415VISIBILITY_CXXFLAGS = -fvisibility=hidden
    401416VL_CFLAGS =
    402417VL_LIBS =
    403418VULKAN_ICD_INSTALL_DIR = ${datarootdir}/vulkan/icd.d
    404 WAYLAND_CFLAGS =
    405 WAYLAND_LIBS =
    406 WAYLAND_SCANNER = :
     419WAYLAND_CLIENT_CFLAGS =
     420WAYLAND_CLIENT_LIBS =
     421WAYLAND_EGL_CFLAGS =
     422WAYLAND_EGL_LIBS =
     423WAYLAND_PROTOCOLS_CFLAGS =
     424WAYLAND_PROTOCOLS_DATADIR =
     425WAYLAND_PROTOCOLS_LIBS =
     426WAYLAND_SCANNER =
    407427WAYLAND_SCANNER_CFLAGS =
    408428WAYLAND_SCANNER_LIBS =
     429WAYLAND_SERVER_CFLAGS =
     430WAYLAND_SERVER_LIBS =
     431WNO_OVERRIDE_INIT =  -Wno-override-init -Wno-initializer-overrides
    409432X11_INCLUDES = 
    410433XA_MAJOR = 2
    411 XA_MINOR = 3
    412 XA_TINY = 0
    413 XA_VERSION = 2.3.0
     434XA_MINOR = 4
     435XA_PATCH = 0
     436XA_VERSION = 2.4.0
    414437XCB_DRI2_CFLAGS =
    415438XCB_DRI2_LIBS = -L/opt/local/lib -lX11-xcb -lX11 -lxcb -lxcb-dri2 -lxcb-xfixes
    416439XCB_DRI3_CFLAGS =
    417440XCB_DRI3_LIBS =
    418 XF86VIDMODE_CFLAGS =
    419 XF86VIDMODE_LIBS = -L/opt/local/lib -lXxf86vm
     441XCB_DRI3_MODIFIERS_CFLAGS =
     442XCB_DRI3_MODIFIERS_LIBS =
     443XCB_RANDR_CFLAGS =
     444XCB_RANDR_LIBS =
    420445XLIBGL_CFLAGS =
    421446XLIBGL_LIBS =
     447XLIB_RANDR_CFLAGS =
     448XLIB_RANDR_LIBS =
    422449XVMC_CFLAGS =
    423450XVMC_LIBS =
    424451XVMC_LIB_INSTALL_DIR = ${libdir}
    … …  
    428455YFLAGS =
    429456ZLIB_CFLAGS =
    430457ZLIB_LIBS = -L/opt/local/lib -lz
    431 abs_builddir = /opt/local/var/macports/build/_opt_SnowLeopardPorts_x11_mesa/mesa/work/mesa-17.1.6/src/glx/apple
    432 abs_srcdir = /opt/local/var/macports/build/_opt_SnowLeopardPorts_x11_mesa/mesa/work/mesa-17.1.6/src/glx/apple
    433 abs_top_builddir = /opt/local/var/macports/build/_opt_SnowLeopardPorts_x11_mesa/mesa/work/mesa-17.1.6
    434 abs_top_srcdir = /opt/local/var/macports/build/_opt_SnowLeopardPorts_x11_mesa/mesa/work/mesa-17.1.6
     458abs_builddir = /opt/local/var/macports/build/_opt_macports-ports_x11_mesa/mesa/work/mesa-18.3.6/src/glx/apple
     459abs_srcdir = /opt/local/var/macports/build/_opt_macports-ports_x11_mesa/mesa/work/mesa-18.3.6/src/glx/apple
     460abs_top_builddir = /opt/local/var/macports/build/_opt_macports-ports_x11_mesa/mesa/work/mesa-18.3.6
     461abs_top_srcdir = /opt/local/var/macports/build/_opt_macports-ports_x11_mesa/mesa/work/mesa-18.3.6
    435462ac_ct_AR = ar
    436463ac_ct_CC = /opt/local/bin/clang-mp-9.0
    437464ac_ct_CXX =
    … …  
    464491ifGNUmake =
    465492includedir = ${prefix}/include
    466493infodir = ${datarootdir}/info
    467 install_sh = ${SHELL} /opt/local/var/macports/build/_opt_SnowLeopardPorts_x11_mesa/mesa/work/mesa-17.1.6/bin/install-sh
     494install_sh = ${SHELL} /opt/local/var/macports/build/_opt_macports-ports_x11_mesa/mesa/work/mesa-18.3.6/bin/install-sh
    468495libdir = ${exec_prefix}/lib
    469496libexecdir = ${exec_prefix}/libexec
    470497localedir = ${datarootdir}/locale
    … …  
    473500mkdir_p = $(MKDIR_P)
    474501oldincludedir = /usr/include
    475502pdfdir = ${docdir}
     503pkgpyexecdir = ${pyexecdir}/mesa
     504pkgpythondir = ${pythondir}/mesa
    476505prefix = /opt/local
    477506program_transform_name = s,x,x,
    478507psdir = ${docdir}
     508pyexecdir = ${exec_prefix}/Library/Frameworks/Python.framework/Versions/3.9/lib/python3.9/site-packages
     509pythondir = ${prefix}/Library/Frameworks/Python.framework/Versions/3.9/lib/python3.9/site-packages
    479510sbindir = ${exec_prefix}/sbin
    480511sharedstatedir = ${prefix}/com
    481512srcdir = .
    … …  
    488519top_build_prefix = ../../../
    489520top_builddir = ../../..
    490521top_srcdir = ../../..
    491 EXTRA_DIST = RELEASE_NOTES
     522EXTRA_DIST = \
     523        RELEASE_NOTES \
     524        meson.build
     525
    492526noinst_LTLIBRARIES = libappleglx.la
    493527AM_CFLAGS = \
    494528        -I$(top_srcdir)/src \
    … …  
    500534        -I$(top_builddir)/src/mapi/glapi \
    501535        -I$(top_srcdir)/src/mapi/glapi \
    502536        $(VISIBILITY_CFLAGS) \
    503         $(SHARED_GLAPI_CFLAGS) \
    504537        $(DEFINES) \
    505538        $(X11_INCLUDES)
    506539

  • .6/src/glx/apple/Makefile.am 

    diff -ur /opt/SnowLeopardPorts/x11/mesa/work/mesa-17.1.6/src/glx/apple/Makefile.am /opt/macports-ports/x11/mesa/work/mesa-18.3.6/src/glx/apple/Makefile.am
    old new  
    1 EXTRA_DIST = RELEASE_NOTES
     1EXTRA_DIST = \
     2        RELEASE_NOTES \
     3        meson.build
    24
    35noinst_LTLIBRARIES = libappleglx.la
    46
    … …  
    1214        -I$(top_builddir)/src/mapi/glapi \
    1315        -I$(top_srcdir)/src/mapi/glapi \
    1416        $(VISIBILITY_CFLAGS) \
    15         $(SHARED_GLAPI_CFLAGS) \
    1617        $(DEFINES) \
    1718        $(X11_INCLUDES)
    1819

  • .6/src/glx/apple/Makefile.in 

    diff -ur /opt/SnowLeopardPorts/x11/mesa/work/mesa-17.1.6/src/glx/apple/Makefile.in /opt/macports-ports/x11/mesa/work/mesa-18.3.6/src/glx/apple/Makefile.in
    old new  
    9191target_triplet = @target@
    9292subdir = src/glx/apple
    9393ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
    94 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_gnu_make.m4 \
     94am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_compile_flag.m4 \
     95        $(top_srcdir)/m4/ax_check_gnu_make.m4 \
    9596        $(top_srcdir)/m4/ax_check_python_mako_module.m4 \
    9697        $(top_srcdir)/m4/ax_gcc_builtin.m4 \
    9798        $(top_srcdir)/m4/ax_gcc_func_attribute.m4 \
    … …  
    209210AUTOHEADER = @AUTOHEADER@
    210211AUTOMAKE = @AUTOMAKE@
    211212AWK = @AWK@
     213BACKTRACE_CFLAGS = @BACKTRACE_CFLAGS@
     214BACKTRACE_LIBS = @BACKTRACE_LIBS@
    212215BSYMBOLIC = @BSYMBOLIC@
    213216CC = @CC@
    214217CCAS = @CCAS@
    … …  
    222225CPP = @CPP@
    223226CPPFLAGS = @CPPFLAGS@
    224227CXX = @CXX@
     228CXX11_CXXFLAGS = @CXX11_CXXFLAGS@
    225229CXXCPP = @CXXCPP@
    226230CXXDEPMODE = @CXXDEPMODE@
    227231CXXFLAGS = @CXXFLAGS@
    … …  
    255259EXPAT_CFLAGS = @EXPAT_CFLAGS@
    256260EXPAT_LIBS = @EXPAT_LIBS@
    257261FGREP = @FGREP@
    258 FREEDRENO_CFLAGS = @FREEDRENO_CFLAGS@
    259 FREEDRENO_LIBS = @FREEDRENO_LIBS@
    260262GALLIUM_PIPE_LOADER_DEFINES = @GALLIUM_PIPE_LOADER_DEFINES@
    261263GBM_PC_LIB_PRIV = @GBM_PC_LIB_PRIV@
    262264GBM_PC_REQ_PRIV = @GBM_PC_REQ_PRIV@
    … …  
    275277GL_PC_CFLAGS = @GL_PC_CFLAGS@
    276278GL_PC_LIB_PRIV = @GL_PC_LIB_PRIV@
    277279GL_PC_REQ_PRIV = @GL_PC_REQ_PRIV@
     280GL_PKGCONF_LIB = @GL_PKGCONF_LIB@
    278281GREP = @GREP@
    279 HAVE_XF86VIDMODE = @HAVE_XF86VIDMODE@
     282I915_CFLAGS = @I915_CFLAGS@
     283I915_LIBS = @I915_LIBS@
    280284INDENT = @INDENT@
    281285INDENT_FLAGS = @INDENT_FLAGS@
    282286INSTALL = @INSTALL@
    … …  
    284288INSTALL_PROGRAM = @INSTALL_PROGRAM@
    285289INSTALL_SCRIPT = @INSTALL_SCRIPT@
    286290INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
    287 INTEL_CFLAGS = @INTEL_CFLAGS@
    288 INTEL_LIBS = @INTEL_LIBS@
    289291LD = @LD@
    290292LDFLAGS = @LDFLAGS@
     293LD_BUILD_ID = @LD_BUILD_ID@
    291294LD_NO_UNDEFINED = @LD_NO_UNDEFINED@
    292295LEX = @LEX@
    293296LEXLIB = @LEXLIB@
    294297LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
     298LIBATOMIC_LIBS = @LIBATOMIC_LIBS@
    295299LIBCLC_INCLUDEDIR = @LIBCLC_INCLUDEDIR@
    296300LIBCLC_LIBEXECDIR = @LIBCLC_LIBEXECDIR@
    297301LIBDRM_CFLAGS = @LIBDRM_CFLAGS@
    … …  
    324328MSVC2013_COMPAT_CXXFLAGS = @MSVC2013_COMPAT_CXXFLAGS@
    325329NINE_MAJOR = @NINE_MAJOR@
    326330NINE_MINOR = @NINE_MINOR@
    327 NINE_TINY = @NINE_TINY@
     331NINE_PATCH = @NINE_PATCH@
    328332NINE_VERSION = @NINE_VERSION@
    329333NM = @NM@
    330334NMEDIT = @NMEDIT@
    … …  
    334338NVVIEUX_LIBS = @NVVIEUX_LIBS@
    335339OBJDUMP = @OBJDUMP@
    336340OBJEXT = @OBJEXT@
    337 OMX_CFLAGS = @OMX_CFLAGS@
    338 OMX_LIBS = @OMX_LIBS@
    339 OMX_LIB_INSTALL_DIR = @OMX_LIB_INSTALL_DIR@
     341OMX_BELLAGIO_CFLAGS = @OMX_BELLAGIO_CFLAGS@
     342OMX_BELLAGIO_LIBS = @OMX_BELLAGIO_LIBS@
     343OMX_BELLAGIO_LIB_INSTALL_DIR = @OMX_BELLAGIO_LIB_INSTALL_DIR@
     344OMX_TIZONIA_CFLAGS = @OMX_TIZONIA_CFLAGS@
     345OMX_TIZONIA_LIBS = @OMX_TIZONIA_LIBS@
     346OMX_TIZONIA_LIB_INSTALL_DIR = @OMX_TIZONIA_LIB_INSTALL_DIR@
    340347OPENCL_LIBNAME = @OPENCL_LIBNAME@
    341348OPENCL_VERSION = @OPENCL_VERSION@
    342349OSMESA_LIB = @OSMESA_LIB@
    … …  
    364371PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
    365372PTHREAD_LIBS = @PTHREAD_LIBS@
    366373PWR8_CFLAGS = @PWR8_CFLAGS@
    367 PYTHON2 = @PYTHON2@
     374PYTHON = @PYTHON@
     375PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
     376PYTHON_PLATFORM = @PYTHON_PLATFORM@
     377PYTHON_PREFIX = @PYTHON_PREFIX@
     378PYTHON_VERSION = @PYTHON_VERSION@
    368379RADEON_CFLAGS = @RADEON_CFLAGS@
    369380RADEON_LIBS = @RADEON_LIBS@
    370381RANLIB = @RANLIB@
    371382RM = @RM@
     383SCANNER_ARG = @SCANNER_ARG@
    372384SED = @SED@
    373385SELINUX_CFLAGS = @SELINUX_CFLAGS@
    374386SELINUX_LIBS = @SELINUX_LIBS@
    … …  
    380392STRIP = @STRIP@
    381393SWR_AVX2_CXXFLAGS = @SWR_AVX2_CXXFLAGS@
    382394SWR_AVX_CXXFLAGS = @SWR_AVX_CXXFLAGS@
    383 SWR_CXX11_CXXFLAGS = @SWR_CXX11_CXXFLAGS@
     395SWR_KNL_CXXFLAGS = @SWR_KNL_CXXFLAGS@
     396SWR_SKX_CXXFLAGS = @SWR_SKX_CXXFLAGS@
     397V3D_SIMULATOR_CFLAGS = @V3D_SIMULATOR_CFLAGS@
     398V3D_SIMULATOR_LIBS = @V3D_SIMULATOR_LIBS@
    384399VALGRIND_CFLAGS = @VALGRIND_CFLAGS@
    385400VALGRIND_LIBS = @VALGRIND_LIBS@
    386401VA_CFLAGS = @VA_CFLAGS@
    … …  
    401416VL_CFLAGS = @VL_CFLAGS@
    402417VL_LIBS = @VL_LIBS@
    403418VULKAN_ICD_INSTALL_DIR = @VULKAN_ICD_INSTALL_DIR@
    404 WAYLAND_CFLAGS = @WAYLAND_CFLAGS@
    405 WAYLAND_LIBS = @WAYLAND_LIBS@
     419WAYLAND_CLIENT_CFLAGS = @WAYLAND_CLIENT_CFLAGS@
     420WAYLAND_CLIENT_LIBS = @WAYLAND_CLIENT_LIBS@
     421WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@
     422WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@
     423WAYLAND_PROTOCOLS_CFLAGS = @WAYLAND_PROTOCOLS_CFLAGS@
     424WAYLAND_PROTOCOLS_DATADIR = @WAYLAND_PROTOCOLS_DATADIR@
     425WAYLAND_PROTOCOLS_LIBS = @WAYLAND_PROTOCOLS_LIBS@
    406426WAYLAND_SCANNER = @WAYLAND_SCANNER@
    407427WAYLAND_SCANNER_CFLAGS = @WAYLAND_SCANNER_CFLAGS@
    408428WAYLAND_SCANNER_LIBS = @WAYLAND_SCANNER_LIBS@
     429WAYLAND_SERVER_CFLAGS = @WAYLAND_SERVER_CFLAGS@
     430WAYLAND_SERVER_LIBS = @WAYLAND_SERVER_LIBS@
     431WNO_OVERRIDE_INIT = @WNO_OVERRIDE_INIT@
    409432X11_INCLUDES = @X11_INCLUDES@
    410433XA_MAJOR = @XA_MAJOR@
    411434XA_MINOR = @XA_MINOR@
    412 XA_TINY = @XA_TINY@
     435XA_PATCH = @XA_PATCH@
    413436XA_VERSION = @XA_VERSION@
    414437XCB_DRI2_CFLAGS = @XCB_DRI2_CFLAGS@
    415438XCB_DRI2_LIBS = @XCB_DRI2_LIBS@
    416439XCB_DRI3_CFLAGS = @XCB_DRI3_CFLAGS@
    417440XCB_DRI3_LIBS = @XCB_DRI3_LIBS@
    418 XF86VIDMODE_CFLAGS = @XF86VIDMODE_CFLAGS@
    419 XF86VIDMODE_LIBS = @XF86VIDMODE_LIBS@
     441XCB_DRI3_MODIFIERS_CFLAGS = @XCB_DRI3_MODIFIERS_CFLAGS@
     442XCB_DRI3_MODIFIERS_LIBS = @XCB_DRI3_MODIFIERS_LIBS@
     443XCB_RANDR_CFLAGS = @XCB_RANDR_CFLAGS@
     444XCB_RANDR_LIBS = @XCB_RANDR_LIBS@
    420445XLIBGL_CFLAGS = @XLIBGL_CFLAGS@
    421446XLIBGL_LIBS = @XLIBGL_LIBS@
     447XLIB_RANDR_CFLAGS = @XLIB_RANDR_CFLAGS@
     448XLIB_RANDR_LIBS = @XLIB_RANDR_LIBS@
    422449XVMC_CFLAGS = @XVMC_CFLAGS@
    423450XVMC_LIBS = @XVMC_LIBS@
    424451XVMC_LIB_INSTALL_DIR = @XVMC_LIB_INSTALL_DIR@
    … …  
    473500mkdir_p = @mkdir_p@
    474501oldincludedir = @oldincludedir@
    475502pdfdir = @pdfdir@
     503pkgpyexecdir = @pkgpyexecdir@
     504pkgpythondir = @pkgpythondir@
    476505prefix = @prefix@
    477506program_transform_name = @program_transform_name@
    478507psdir = @psdir@
     508pyexecdir = @pyexecdir@
     509pythondir = @pythondir@
    479510sbindir = @sbindir@
    480511sharedstatedir = @sharedstatedir@
    481512srcdir = @srcdir@
    … …  
    488519top_build_prefix = @top_build_prefix@
    489520top_builddir = @top_builddir@
    490521top_srcdir = @top_srcdir@
    491 EXTRA_DIST = RELEASE_NOTES
     522EXTRA_DIST = \
     523        RELEASE_NOTES \
     524        meson.build
     525
    492526noinst_LTLIBRARIES = libappleglx.la
    493527AM_CFLAGS = \
    494528        -I$(top_srcdir)/src \
    … …  
    500534        -I$(top_builddir)/src/mapi/glapi \
    501535        -I$(top_srcdir)/src/mapi/glapi \
    502536        $(VISIBILITY_CFLAGS) \
    503         $(SHARED_GLAPI_CFLAGS) \
    504537        $(DEFINES) \
    505538        $(X11_INCLUDES)
    506539

  • .6/src/glx/apple/apple_glapi.c 

    diff -ur /opt/SnowLeopardPorts/x11/mesa/work/mesa-17.1.6/src/glx/apple/apple_glapi.c /opt/macports-ports/x11/mesa/work/mesa-18.3.6/src/glx/apple/apple_glapi.c
    old new  
    4242#include "main/remap.h"
    4343#include "glapi.h"
    4444#include "glapitable.h"
    45 #include "main/dispatch.h"
    4645
    4746#include "apple_glx.h"
    4847#include "apple_xgl_api.h"
    … …  
    6463    assert(__applegl_api);
    6564    memcpy(__applegl_api, __ogl_framework_api, sizeof(struct _glapi_table));
    6665
    67     SET_ReadPixels(__applegl_api, __applegl_glReadPixels);
    68     SET_CopyPixels(__applegl_api, __applegl_glCopyPixels);
    69     SET_CopyColorTable(__applegl_api, __applegl_glCopyColorTable);
    70     SET_DrawBuffer(__applegl_api, __applegl_glDrawBuffer);
    71     SET_DrawBuffers(__applegl_api, __applegl_glDrawBuffers);
    72     SET_Viewport(__applegl_api, __applegl_glViewport);
     66    _glapi_table_patch(__applegl_api, "ReadPixels", __applegl_glReadPixels);
     67    _glapi_table_patch(__applegl_api, "CopyPixels", __applegl_glCopyPixels);
     68    _glapi_table_patch(__applegl_api, "CopyColorTable", __applegl_glCopyColorTable);
     69    _glapi_table_patch(__applegl_api, "DrawBuffers", __applegl_glDrawBuffer);
     70    _glapi_table_patch(__applegl_api, "Viewport", __applegl_glViewport);
    7371}
    7472
    7573void apple_glapi_set_dispatch(void) {

  • .6/src/glx/apple/apple_glx_context.c 

    diff -ur /opt/SnowLeopardPorts/x11/mesa/work/mesa-17.1.6/src/glx/apple/apple_glx_context.c /opt/macports-ports/x11/mesa/work/mesa-18.3.6/src/glx/apple/apple_glx_context.c
    old new  
    5555#include "apple_cgl.h"
    5656#include "apple_glx_drawable.h"
    5757
     58#include "util/debug.h"
     59
    5860static pthread_mutex_t context_lock = PTHREAD_MUTEX_INITIALIZER;
    5961
    6062/*
    … …  
    181183         *x11errorptr = false;
    182184      }
    183185
    184       if (getenv("LIBGL_DIAGNOSTIC"))
     186      if (env_var_as_boolean("LIBGL_DIAGNOSTIC", false))
    185187         fprintf(stderr, "error: %s\n", apple_cgl.error_string(error));
    186188
    187189      return true;

  • .6/src/glx/apple/apple_glx_log.c 

    diff -ur /opt/SnowLeopardPorts/x11/mesa/work/mesa-17.1.6/src/glx/apple/apple_glx_log.c /opt/macports-ports/x11/mesa/work/mesa-18.3.6/src/glx/apple/apple_glx_log.c
    old new  
    3636#include <inttypes.h>
    3737#include <pthread.h>
    3838#include "apple_glx_log.h"
     39#include "util/debug.h"
    3940
    4041static bool diagnostic = false;
    4142static aslclient aslc;
    4243
    4344void apple_glx_log_init(void) {
    44     if (getenv("LIBGL_DIAGNOSTIC")) {
     45    if (env_var_as_boolean("LIBGL_DIAGNOSTIC", false)) {
    4546        diagnostic = true;
    4647    }
    4748
    … …  
    9697        fprintf(stderr, "%-9s %24s:%-4d %s(%"PRIu64"): ",
    9798                _asl_level_string(level), file, line, function, thread);
    9899        vfprintf(stderr, fmt, args2);
     100        va_end(args2);
    99101    }
    100102
    101103    msg = asl_new(ASL_TYPE_MSG);

  • .6/src/glx/apple/apple_glx_pbuffer.c 

    diff -ur /opt/SnowLeopardPorts/x11/mesa/work/mesa-17.1.6/src/glx/apple/apple_glx_pbuffer.c /opt/macports-ports/x11/mesa/work/mesa-18.3.6/src/glx/apple/apple_glx_pbuffer.c
    old new  
    4040#include "apple_glx_context.h"
    4141#include "apple_glx_drawable.h"
    4242
     43#include <stdbool.h>
    4344#include <stdlib.h>
    4445#include <pthread.h>
    4546#include <assert.h>
    4647#include "apple_glx.h"
    4748#include "glxconfig.h"
    4849#include "apple_cgl.h"
     50#include "util/debug.h"
    4951
    5052/* mesa defines in glew.h, Apple in glext.h.
    5153 * Due to namespace nightmares, just do it here.
    … …  
    208210
    209211      err = apple_cgl.choose_pixel_format(attr, &pfobj, &vsref);
    210212      if (kCGLNoError != err) {
    211          if (getenv("LIBGL_DIAGNOSTIC")) {
     213         if (env_var_as_boolean("LIBGL_DIAGNOSTIC", false)) {
    212214            printf("choose_pixel_format error in %s: %s\n", __func__,
    213215                   apple_cgl.error_string(err));
    214216         }
    … …  
    220222      err = apple_cgl.create_context(pfobj, NULL, &newcontext);
    221223
    222224      if (kCGLNoError != err) {
    223          if (getenv("LIBGL_DIAGNOSTIC")) {
     225         if (env_var_as_boolean("LIBGL_DIAGNOSTIC", false)) {
    224226            printf("create_context error in %s: %s\n", __func__,
    225227                   apple_cgl.error_string(err));
    226228         }

  • .6/src/glx/apple/apple_visual.c 

    diff -ur /opt/SnowLeopardPorts/x11/mesa/work/mesa-17.1.6/src/glx/apple/apple_visual.c /opt/macports-ports/x11/mesa/work/mesa-18.3.6/src/glx/apple/apple_visual.c
    old new  
    3232#include <stdlib.h>
    3333#include <assert.h>
    3434#include <GL/gl.h>
     35#include <util/debug.h>
    3536
    3637/* <rdar://problem/6953344> */
    3738#define glTexImage1D glTexImage1D_OSX
    … …  
    8283   int numattr = 0;
    8384   GLint vsref = 0;
    8485   CGLError error = 0;
    85    bool use_core_profile = getenv("LIBGL_PROFILE_CORE");
     86   bool use_core_profile = env_var_as_boolean("LIBGL_PROFILE_CORE", false);
    8687
    8788   if (offscreen) {
    8889      apple_glx_diagnostic
    … …  
    9091
    9192      attr[numattr++] = kCGLPFAOffScreen;
    9293   }
    93    else if (getenv("LIBGL_ALWAYS_SOFTWARE") != NULL) {
     94   else if (env_var_as_boolean("LIBGL_ALWAYS_SOFTWARE", false)) {
    9495      apple_glx_diagnostic
    9596         ("Software rendering requested.  Using kCGLRendererGenericFloatID.\n");
    9697      attr[numattr++] = kCGLPFARendererID;
    9798      attr[numattr++] = kCGLRendererGenericFloatID;
    9899   }
    99    else if (getenv("LIBGL_ALLOW_SOFTWARE") != NULL) {
     100   else if (env_var_as_boolean("LIBGL_ALLOW_SOFTWARE", false)) {
    100101      apple_glx_diagnostic
    101102         ("Software rendering is not being excluded.  Not using kCGLPFAAccelerated.\n");
    102103   }
    … …  
    190191
    191192   if (!*pfobj) {
    192193      snprintf(__crashreporter_info_buff__, sizeof(__crashreporter_info_buff__),
    193                "No matching pixelformats found, perhaps try using LIBGL_ALLOW_SOFTWARE\n");
     194               "No matching pixelformats found, perhaps try setting LIBGL_ALLOW_SOFTWARE=true\n");
    194195      fprintf(stderr, "%s", __crashreporter_info_buff__);
    195196      abort();
    196197   }

  • .6/src/glx/apple/glx_empty.c 

    diff -ur /opt/SnowLeopardPorts/x11/mesa/work/mesa-17.1.6/src/glx/apple/glx_empty.c /opt/macports-ports/x11/mesa/work/mesa-18.3.6/src/glx/apple/glx_empty.c
    old new  
    5050
    5151
    5252/*
    53 ** GLX_SGIX_swap_group
    54 */
    55 void
    56 glXJoinSwapGroupSGIX(Display * dpy, GLXDrawable drawable, GLXDrawable member)
    57 {
    58    (void) dpy;
    59    (void) drawable;
    60    (void) member;
    61 }
    62 
    63 
    64 /*
    65 ** GLX_SGIX_swap_barrier
    66 */
    67 void
    68 glXBindSwapBarrierSGIX(Display * dpy, GLXDrawable drawable, int barrier)
    69 {
    70    (void) dpy;
    71    (void) drawable;
    72    (void) barrier;
    73 }
    74 
    75 Bool
    76 glXQueryMaxSwapBarriersSGIX(Display * dpy, int screen, int *max)
    77 {
    78    (void) dpy;
    79    (void) screen;
    80    (void) max;
    81    return False;
    82 }
    83 
    84 
    85 /*
    8653** GLX_OML_sync_control
    8754*/
    8855Bool