head 1.11; access; symbols netbsd-10-2-RELEASE:1.8 netbsd-9-5-RELEASE:1.6 netbsd-11-0-RELEASE:1.10.4.1 netbsd-11-0-RC7:1.10.4.1 netbsd-11-0-RC6:1.10.4.1 netbsd-11-0-RC5:1.10 netbsd-11-0-RC4:1.10 netbsd-11-0-RC3:1.10 netbsd-11-0-RC2:1.10 netbsd-11-0-RC1:1.10 perseant-exfatfs-base-20250801:1.10 netbsd-11:1.10.0.4 netbsd-11-base:1.10 netbsd-10-1-RELEASE:1.8 perseant-exfatfs-base-20240630:1.10 perseant-exfatfs:1.10.0.2 perseant-exfatfs-base:1.10 netbsd-8-3-RELEASE:1.1 netbsd-9-4-RELEASE:1.6 netbsd-10-0-RELEASE:1.8 netbsd-10-0-RC6:1.8 netbsd-10-0-RC5:1.8 netbsd-10-0-RC4:1.8 netbsd-10-0-RC3:1.8 netbsd-10-0-RC2:1.8 netbsd-10-0-RC1:1.8 netbsd-10:1.8.0.2 netbsd-10-base:1.8 netbsd-9-3-RELEASE:1.6 cjep_sun2x-base1:1.7 cjep_sun2x:1.7.0.6 cjep_sun2x-base:1.7 cjep_staticlib_x-base1:1.7 netbsd-9-2-RELEASE:1.6 cjep_staticlib_x:1.7.0.4 cjep_staticlib_x-base:1.7 netbsd-9-1-RELEASE:1.6 phil-wifi-20200421:1.7 phil-wifi-20200411:1.7 is-mlppp:1.7.0.2 is-mlppp-base:1.7 phil-wifi-20200406:1.7 netbsd-8-2-RELEASE:1.1 netbsd-9-0-RELEASE:1.6 netbsd-9-0-RC2:1.6 netbsd-9-0-RC1:1.6 phil-wifi-20191119:1.7 netbsd-9:1.6.0.2 netbsd-9-base:1.6 phil-wifi-20190609:1.6 netbsd-8-1-RELEASE:1.1 netbsd-8-1-RC1:1.1 pgoyette-compat-merge-20190127:1.1 pgoyette-compat-20190127:1.1 pgoyette-compat-20190118:1.1 pgoyette-compat-1226:1.1 pgoyette-compat-1126:1.1 pgoyette-compat-1020:1.1 pgoyette-compat-0930:1.1 pgoyette-compat-0906:1.1 pgoyette-compat-0728:1.1 netbsd-8-0-RELEASE:1.1 phil-wifi:1.1.0.16 phil-wifi-base:1.1 pgoyette-compat-0625:1.1 netbsd-8-0-RC2:1.1 pgoyette-compat-0521:1.1 pgoyette-compat-0502:1.1 pgoyette-compat-0422:1.1 netbsd-8-0-RC1:1.1 pgoyette-compat-0415:1.1 pgoyette-compat-0407:1.1 pgoyette-compat-0330:1.1 pgoyette-compat-0322:1.1 pgoyette-compat-0315:1.1 pgoyette-compat:1.1.0.14 pgoyette-compat-base:1.1 matt-nb8-mediatek:1.1.0.12 matt-nb8-mediatek-base:1.1 perseant-stdc-iso10646:1.1.0.10 perseant-stdc-iso10646-base:1.1 netbsd-8:1.1.0.8 netbsd-8-base:1.1 prg-localcount2-base3:1.1 prg-localcount2-base2:1.1 prg-localcount2-base1:1.1 prg-localcount2:1.1.0.6 prg-localcount2-base:1.1 pgoyette-localcount-20170426:1.1 bouyer-socketcan-base1:1.1 pgoyette-localcount-20170320:1.1 bouyer-socketcan:1.1.0.4 bouyer-socketcan-base:1.1 pgoyette-localcount-20170107:1.1 pgoyette-localcount-20161104:1.1 localcount-20160914:1.1 pgoyette-localcount-20160806:1.1 pgoyette-localcount-20160726:1.1 pgoyette-localcount:1.1.0.2 pgoyette-localcount-base:1.1; locks; strict; comment @# @; 1.11 date 2026.07.05.08.42.40; author mrg; state Exp; branches; next 1.10; commitid bon5MZghisGMtrMG; 1.10 date 2023.11.22.17.48.35; author rjs; state Exp; branches 1.10.4.1; next 1.9; commitid x9BrqGtxElCbeDNE; 1.9 date 2023.07.16.22.20.54; author rjs; state Exp; branches; next 1.8; commitid LwwVfBPl8CeDS4xE; 1.8 date 2021.07.11.20.52.06; author mrg; state Exp; branches; next 1.7; commitid imHWyN1cvxi41C0D; 1.7 date 2019.09.24.19.29.42; author maya; state Exp; branches; next 1.6; commitid rMw7xnt9djCGDiEB; 1.6 date 2019.04.25.09.03.54; author maya; state Exp; branches; next 1.5; commitid wW3ZHBF8N9Om4IkB; 1.5 date 2019.04.20.17.31.22; author maya; state Exp; branches; next 1.4; commitid o6aSL2A8Ekfg27kB; 1.4 date 2019.04.16.21.20.51; author mrg; state Exp; branches; next 1.3; commitid FPq8xjcETpiJqCjB; 1.3 date 2019.03.10.10.51.58; author mrg; state Exp; branches; next 1.2; commitid gGHPV4SpzxwU8OeB; 1.2 date 2019.03.10.02.29.53; author mrg; state Exp; branches; next 1.1; commitid v9cy21Je6lIUmLeB; 1.1 date 2015.02.23.00.09.30; author jmcneill; state Exp; branches 1.1.16.1; next ; commitid 7dMTq8Nr6mZ124by; 1.10.4.1 date 2026.07.05.19.54.11; author martin; state Exp; branches; next ; commitid PAVZdX3ECUmdcvMG; 1.1.16.1 date 2019.06.10.22.02.41; author christos; state Exp; branches; next 1.1.16.2; commitid jtc8rnCzWiEEHGqB; 1.1.16.2 date 2020.04.13.08.02.32; author martin; state Exp; branches; next ; commitid X01YhRUPVUDaec4C; desc @@ 1.11 log @ensure HAVE_NOATEXIT is properly set for all that need it. XXX: pullup-11 @ text @# $NetBSD: Makefile,v 1.10 2023/11/22 17:48:35 rjs Exp $ .include .include "../mesa-which.mk" LIB= gbm .PATH: ${X11SRCDIR.Mesa}/src/gbm/main SRCS.main= \ backend.c \ gbm.c .PATH: ${X11SRCDIR.Mesa}/src/gbm/backends/dri SRCS.dri= \ gbm_dri.c BUILDSYMLINKS+= ${X11SRCDIR.Mesa}/src/util/debug.c UTILdebug.c SRCS.util= \ UTILdebug.c \ ralloc.c \ mesa-sha1.c \ os_file.c \ u_printf.cpp \ u_process.c CPPFLAGS.UTILdebug.c+= -I${X11SRCDIR.Mesa}/src/util \ -I${X11SRCDIR.Mesa}/src/mesa \ -I${X11SRCDIR.Mesa}/src \ -I${X11SRCDIR.Mesa}/src/gallium/include SRCS= ${SRCS.main} ${SRCS.dri} ${SRCS.util} CPPFLAGS+= -D_OS_UNIX=1 CPPFLAGS+= -DHAVE_PTHREAD=1 -DHAVE_TIMESPEC_GET CPPFLAGS+= -DHAVE_NOATEXIT CPPFLAGS+= -DDEFAULT_BACKENDS_PATH=\"${X11USRLIBDIR}/modules/dri\" CPPFLAGS+= -DMODULEDIR=\"${X11USRLIBDIR}/gbm\" CPPFLAGS+= -I${X11SRCDIR.Mesa}/include CPPFLAGS+= -I${X11SRCDIR.Mesa}/src CPPFLAGS+= -I${X11SRCDIR.Mesa}/src/loader CPPFLAGS+= -I${X11SRCDIR.Mesa}/src/gbm/main CPPFLAGS+= -I${X11SRCDIR.Mesa}/src/mapi CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/libdrm CFLAGS+= -fno-strict-aliasing -fexceptions COPTS.gbm_dri.c+= -Wno-error .include "../libloader.mk" .PATH: ${X11SRCDIR.Mesa}/src/gbm/main .PATH: ${X11SRCDIR.Mesa}/src/gbm/backends/dri INCS= gbm.h INCSDIR= ${X11INCDIR} LIBDPLIBS= glapi ${.CURDIR}/../libglapi${OLD_SUFFIX} LIBDPLIBS+= drm ${.CURDIR}/../libdrm LIBDPLIBS+= expat ${NETBSDSRCDIR}/external/mit/expat/lib/libexpat PKGCONFIG= gbm PKGDIST.gbm= ${X11SRCDIR.Mesa}/../src/pkgconfig .include "${.CURDIR}/../libGL/mesa-ver.mk" PKGCONFIG_VERSION.gbm= ${MESA_VER} .include "../libdrm/Makefile.defines" .include .include @ 1.10 log @Include some more files. Add a build-id note to gallium. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.9 2023/07/16 22:20:54 rjs Exp $ d35 1 @ 1.10.4.1 log @Pull up following revision(s) (requested by mrg in ticket #372): external/mit/xorg/lib/libEGL/Makefile: revision 1.10 external/mit/xorg/lib/driver.mk: revision 1.9 external/mit/xorg/lib/libgbm/Makefile: revision 1.11 external/mit/xorg/lib/libGL/Makefile: revision 1.36 ensure HAVE_NOATEXIT is properly set for all that need it. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.10 2023/11/22 17:48:35 rjs Exp $ a34 1 CPPFLAGS+= -DHAVE_NOATEXIT @ 1.9 log @Make most of MesaLib build. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.8 2021/07/11 20:52:06 mrg Exp $ d21 4 @ 1.8 log @xorg/lib stuff to enable mesa.old, prepare for new mesa - rename OLD_PREFIX to OLD_SUFFIX, since it is - include mesa-which.mk and use ${OLD_SUFFIX} in several places - remove mesa < 18 support @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.7 2019/09/24 19:29:42 maya Exp $ d31 1 a31 1 CPPFLAGS+= -DDEFAULT_DRIVER_DIR=\"${X11USRLIBDIR}/modules/dri\" @ 1.7 log @Update build logic for mesa 19.1.7. A lot of files are now living outside of dist, since they're not in the distributed sources: they're generated, usually by python/meson. The remaining changes are due to files being moved around. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.6 2019/04/25 09:03:54 maya Exp $ d5 2 d50 1 a50 1 LIBDPLIBS= glapi ${.CURDIR}/../libglapi @ 1.6 log @Link against expat. Helps us pass a qt5-qtbase gbm configure check, and avoid PLIST issues. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.5 2019/04/20 17:31:22 maya Exp $ d53 1 a53 1 PKGDIST.gbm= ${X11SRCDIR.Mesa}/src/gbm/main @ 1.5 log @Add missing file. Allows linking webkit-gtk (which has a process link against libEGL/libgbm). Thanks leot@@ for the report! @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.4 2019/04/16 21:20:51 mrg Exp $ d50 1 @ 1.4 log @enable EGL and glamor. partly from maya@@. for x86 and evbarm: - install headers and libEGL - install xorg-server glamoregl component - link xorg drivers against gbm/egl bonus fix: - fix some wrongly marked compatx11file files build tested on shark, sgimips, evbarm64-el, amd64 and i386. run tested on radeon, intel and nvidia on amd64, including 'modesetting' driver on amd64. however, my systems disable it due to llvmpipe so i'm not sure what is happening. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.3 2019/03/10 10:51:58 mrg Exp $ d18 2 a19 1 UTILdebug.c @ 1.3 log @pull across most of the new build infrastruture for mesa18 from maya's git tree. this includes may of the changes from the changes below: commit 52d85e74a1197aace38cc7acb705509e969120e6 Author: coypu Date: Mon Mar 4 12:25:33 2019 +0200 Make 32bit archs happier. except i386, which now suffers from locked atomics because we don't have clever ifunc tricks in libc. commit ee9b4c19c58127934ed3548ad0d68934cc95ccc7 Author: coypu Date: Mon Mar 4 09:08:35 2019 +0200 Adjust includes, append rather than replace, appease clang ppc builds commit a5341a3ad42572c78b6a2e6e5545bd323d7f2e4c Author: coypu Date: Sun Mar 3 11:52:19 2019 +0200 Resolve i386 atomic issue and set lists. XXX libGL in i386 is still causing issues XXX pkgconfig file for vdpau XXX set lists for arm32 commit 27bffc20bc15186c92cc5b8d5cc08d7299966b34 Author: coypu Date: Sat Mar 2 21:52:45 2019 +0200 make llvm sources x86 specific hopefully not breaking non-x86 clang builds, which have MKLLVM set. commit f9d34922619cc8f2a224c0138a73985e50daf87f Author: coypu Date: Sat Mar 2 21:33:31 2019 +0200 move hack to build llvm libraries soon enough. add u_process.c to libGL specifically (dri, gallium and libGL all need it). Add some missing includes for pipe-loader when it moved to gallium commit 2b1083d0d538bb5d5dd88ab2ca0ca6c331e5dd5b Author: coypu Date: Sat Mar 2 16:47:58 2019 +0200 shuffle around: some files move from shared driver.mk/loader.mk into gallium. others move to shared. add i915 files. now i965 glxgears works (amd64). commit 1897a90569b30b294bcbedadb3745092eca0bb33 Author: Maya Rashish Date: Sun Feb 24 23:36:26 2019 +0200 Progress towards glxgears on i915 commit 28c9c99a236404de41ae74e88ea6d9578c088b92 Author: Maya Rashish Date: Sun Feb 24 21:55:56 2019 +0200 rototill i965/i915 causing it to no longer startx. Now missing sw_screen_create in the dri driver. commit 48eb746983a5a7967fba221e7b167808af36f44a Author: Maya Rashish Date: Sun Feb 24 09:31:22 2019 +0200 More of vdpau. Cogs spin. commit d9fbba8f61a43648d32f160c5fa62626788566ff Author: Maya Rashish Date: Sat Feb 23 22:36:37 2019 +0200 Adjust for MesaLib 18. Build llvmpipe driver on x86 (the driver itself is x86-only). build llvm on all x86, even on GCC builds. galahad driver removed (upstream). Don't build mesa 7 at all. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.2 2019/03/10 02:29:53 mrg Exp $ d43 1 @ 1.2 log @move mesa10 build into .old scheme: - add ${X11SRCDIR.MesaLib.old} and introduce ${X11SRCDIR.Mesa} as an alias for either the former or the non old. this allows many of the makefiles to simply use ${X11SRCDIR.Mesa} (but does not really enable much sharing of makefiles, but reduces their diffs.) - use mesa-which.mk to define ${OLD_PREFIX} to either "" or ".old", and to know if to build 'dri7' (.old only.) ${OLD_PREFIX} is used by other code (eg, LIBDPLIBS) to pick the right subdir. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.1 2015/02/23 00:09:30 jmcneill Exp $ d16 9 a24 1 SRCS= ${SRCS.main} ${SRCS.dri} d27 1 a27 1 CPPFLAGS+= -DHAVE_PTHREAD=1 d31 1 d46 2 a47 2 LIBDPLIBS= glapi ${.CURDIR}/../libglapi LIBDPLIBS= drm ${.CURDIR}/../libdrm @ 1.1 log @Build and install Mesa GBM buffer management library (libgbm). @ text @d1 1 a1 1 # $NetBSD$ d7 1 a7 1 .PATH: ${X11SRCDIR.MesaLib}/src/gbm/main d12 1 a12 1 .PATH: ${X11SRCDIR.MesaLib}/src/gbm/backends/dri d22 4 a25 4 CPPFLAGS+= -I${X11SRCDIR.MesaLib}/include CPPFLAGS+= -I${X11SRCDIR.MesaLib}/src/loader CPPFLAGS+= -I${X11SRCDIR.MesaLib}/src/gbm/main CPPFLAGS+= -I${X11SRCDIR.MesaLib}/src/mapi d33 1 a33 1 .PATH: ${X11SRCDIR.MesaLib}/src/gbm/main d41 1 a41 1 PKGDIST.gbm= ${X11SRCDIR.MesaLib}/src/gbm/main @ 1.1.16.1 log @Sync with HEAD @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.6 2019/04/25 09:03:54 maya Exp $ d7 1 a7 1 .PATH: ${X11SRCDIR.Mesa}/src/gbm/main d12 1 a12 1 .PATH: ${X11SRCDIR.Mesa}/src/gbm/backends/dri d16 1 a16 10 BUILDSYMLINKS+= ${X11SRCDIR.Mesa}/src/util/debug.c UTILdebug.c SRCS.util= \ UTILdebug.c \ u_process.c CPPFLAGS.UTILdebug.c+= -I${X11SRCDIR.Mesa}/src/util \ -I${X11SRCDIR.Mesa}/src/mesa \ -I${X11SRCDIR.Mesa}/src \ -I${X11SRCDIR.Mesa}/src/gallium/include SRCS= ${SRCS.main} ${SRCS.dri} ${SRCS.util} d19 1 a19 1 CPPFLAGS+= -DHAVE_PTHREAD=1 -DHAVE_TIMESPEC_GET d22 4 a25 5 CPPFLAGS+= -I${X11SRCDIR.Mesa}/include CPPFLAGS+= -I${X11SRCDIR.Mesa}/src CPPFLAGS+= -I${X11SRCDIR.Mesa}/src/loader CPPFLAGS+= -I${X11SRCDIR.Mesa}/src/gbm/main CPPFLAGS+= -I${X11SRCDIR.Mesa}/src/mapi d33 1 a33 2 .PATH: ${X11SRCDIR.Mesa}/src/gbm/main .PATH: ${X11SRCDIR.Mesa}/src/gbm/backends/dri d37 2 a38 3 LIBDPLIBS= glapi ${.CURDIR}/../libglapi LIBDPLIBS+= drm ${.CURDIR}/../libdrm LIBDPLIBS+= expat ${NETBSDSRCDIR}/external/mit/expat/lib/libexpat d41 1 a41 1 PKGDIST.gbm= ${X11SRCDIR.Mesa}/src/gbm/main @ 1.1.16.2 log @Mostly merge changes from HEAD upto 20200411 @ text @d1 1 a1 1 # $NetBSD$ d53 1 a53 1 PKGDIST.gbm= ${X11SRCDIR.Mesa}/../src/pkgconfig @