Drm next

ISSUES

@@ -0,0 +1,23 @@
+
+Dec-30-2021 - Klaus Ziegler
+
+Issues left over up from release 2.4.109:
+
+1. This is just the upgrade from libdrm-2.4.75 to 2.4.109, no new functionality
+   of libdrm-2.4.109 has been checked or reflected in any manifest file, this
+   will be done in subsequent #PRs.
+
+2. Implement dynamic creation of the new header file:
+
+   - generated_static_table_fourcc.h
+
+   into the build process of gfx-drm using Python, the regular build process
+   of libdrm uses meson to build this header file. For the moment, the supplied
+   header file was created using a regular meson build of the library on SPARC
+   and Intel platforms to make sure there are no differences.
+
+3. The creation of manual pages has been disabled in usr/src/man/Makefile
+   for subdirectories man3 and man7, because illumos based distributions up to
+   date don't include rst2man(1) command.
+
+4. Get rid of 32bit support.

UPDATE_LIB

@@ -0,0 +1,40 @@
+
+Dec-30-2021 - Klaus Ziegler
+
+To upgrade libdrm:
+
+change LIBDRM_VERS in
+usr/src/common/libdrm/Makefile
+usr/src/common/libdrm/Makefile.drm
+LIBDRM_HASH in
+usr/src/common/libdrm/Makefile
+
+If the file extension of the file to be downloaded has changed, it must be
+changed in usr/src/pkg/manifests/x11-library-libdrm.mf and LIBDRM_ARCHIVE in
+usr/src/common/libdrm/Makefile must be modified accordingly.
+
+# NOTE: if you want to contribute changes to this graphics/DRM gate,
+# please use your own fork of gfx-drm.git and substitute HTTPS/URL below,
+# to match your repository.
+
+After you have setup a build environment as follows:
+git clone https://github.com/illumos/gfx-drm.git
+cd gfx-drm
+export BLDENV=tools/bldenv
+chmod 755 tools/bldenv
+
+edit myenv.sh to suite your needs, and start the first build:
+/usr/bin/env -i $BLDENV myenv.sh "cd usr/src; make install"
+
+most likely this first build will err'out right after unpacking
+the new library archive. At this stage the make target: check
+is run, which checks differences of gfx-drm headers and the
+new library supplied headers, these 5 headers will be checked:
+
+drm.h drm_fourcc.h drm_mode.h drm_sarea.h i915_drm.h
+
+To pass check target, generate patch files for these headers:
+cd usr/src/common/libdrm/libdrm-2.4.<new-version>/include/drm
+gdiff -u drm.h <WS>/usr/src/uts/common/drm/drm.h > /tmp/drm.h.patch
+and the others as well, then apply these patches to headers
+contained in usr/src/uts/common/drm and restart the build.

myenv.sh

@@ -64,7 +64,7 @@ export PKGARCHIVE="${CODEMGR_WS}/packages/${MACH}/nightly"
 # export PKGPUBLISHER_REDIST='on-redist'
 
 # Package manifest format version.
-export PKGFMT_OUTPUT='v1'
+export PKGFMT_OUTPUT='v2'
 
 # Disable shadow compilation.
 export CW_NO_SHADOW='1'

usr/src/Makefile.master

@@ -168,8 +168,8 @@ PERL_VERSION=	5.10.0
 PERL_PKGVERS=	-510
 PERL_ARCH =		i86pc-solaris-64int
 $(SPARC_BLD)PERL_ARCH =	sun4-solaris-64int
-PYTHON_VERSION=	2.7
-PYTHON_PKGVERS=	-27
+PYTHON_VERSION=	3.9
+PYTHON_PKGVERS=	-39
 PYTHON=         /usr/bin/python$(PYTHON_VERSION)
 SORT=		/usr/bin/sort
 TOUCH=		/usr/bin/touch
@@ -179,7 +179,7 @@ ELFEDIT=	/usr/bin/elfedit
 ELFSIGN=	/usr/bin/elfsign
 DTRACE=		/usr/sbin/dtrace -xnolibs
 UNIQ=		/usr/bin/uniq
-TAR=		/usr/bin/tar
+TAR=		/usr/bin/gtar
 ASTBINDIR=	/usr/ast/bin
 MSGCC=		$(ASTBINDIR)/msgcc
 MSGFMT=		/usr/bin/msgfmt -s
@@ -300,7 +300,7 @@ CCABS32=		-Wc,-xcode=abs32
 #
 # generate v9 code which tolerates callers using the v7 ABI, for the sake of
 # system calls.
-CC32BITCALLERS=		-_gcc=-massume-32bit-callers
+CC32BITCALLERS=	
 
 # GCC, especially, is increasingly beginning to auto-inline functions and
 # sadly does so separately not under the general -fno-inline-functions

usr/src/cmd/drm-tests/Makefile

@@ -33,18 +33,18 @@ lint:=		TARGET= lint
 catalog:=       TARGET= catalog
 
 SCRIPT=	Run_all.sh
-ROOTCMD= $(SCRIPT:%=$(ROOTCMDDIR)/%)
+ROOTCMD64= $(SCRIPT:%=$(ROOTCMDDIR)/%)
 
 all clean clobber lint: $(SUBDIRS)
 install: rootdirs .WAIT rootcmd $(SUBDIRS)
 
 # These indirect names (rootdirs, rootcmd) are just so
 # you can make those targets separately from subdirs.
-rootdirs: $(ROOTCMDDIR) $(ROOTCMDDIR64)
-rootcmd: $(ROOTCMD)
+rootdirs: $(ROOTCMDDIR64)
+rootcmd: $(ROOTCMD64)
 
 $(ROOTCMD) := FILEMODE= 755
-$(ROOTCMDDIR)/%.sh: %.sh
+$(ROOTCMDDIR64)/%.sh: %.sh
 	$(INS.file)
 
 $(SUBDIRS): FRC

usr/src/cmd/drm-tests/Makefile.drm

@@ -21,7 +21,7 @@ CPPFLAGS +=	-I$(LIBDRM_CMN_DIR)
 
 ROOTCMDDIR=$(ROOT)/opt/drm-tests
 
-LIBUTIL32=$(SRC)/cmd/drm-tests/util/i386/libutil.a
+#LIBUTIL32=$(SRC)/cmd/drm-tests/util/i386/libutil.a
 LIBUTIL64=$(SRC)/cmd/drm-tests/util/amd64/libutil.a
 
 # We don't really care about warnings in the tests.