xf86-video-nv: 3 commits - configure.ac .gitlab-ci.yml README.md src/nv_driver.c src/nv_hw.c

[GitLab Mirror]

 .gitlab-ci.yml  |   98 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 README.md       |    2 -
 configure.ac    |    2 -
 src/nv_driver.c |    2 -
 src/nv_hw.c     |    4 +-
 5 files changed, 103 insertions(+), 5 deletions(-)

New commits:
commit 9e33c6327fa161cca684f6894044810fbe96e84f
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Sat Jan 22 14:03:42 2022 -0800

    gitlab CI: add a basic build test
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 0000000..d07c517
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,98 @@
+# vim: set expandtab shiftwidth=2 tabstop=8 textwidth=0 filetype=yaml:
+#
+# This CI uses the freedesktop.org ci-templates.
+# Please see the ci-templates documentation for details:
+# https://freedesktop.pages.freedesktop.org/ci-templates/
+
+.templates_sha: &template_sha 34f4ade99434043f88e164933f570301fd18b125 # see https://docs.gitlab.com/ee/ci/yaml/#includefile
+
+
+include:
+  # Arch container builder template
+  - project: 'freedesktop/ci-templates'
+    ref: *template_sha
+    file: '/templates/arch.yml'
+  - project: 'freedesktop/ci-templates'
+    ref: *template_sha
+    file: '/templates/ci-fairy.yml'
+  - template: Security/SAST.gitlab-ci.yml
+
+
+stages:
+  - prep             # prep work like rebuilding the container images if there is a change
+  - build            # for actually building and testing things in a container
+  - test
+  - deploy
+
+
+variables:
+  FDO_UPSTREAM_REPO: 'xorg/driver/xf86-video-nv'
+  # The tag should be updated each time the list of packages is updated.
+  # Changing a tag forces the associated image to be rebuilt.
+  # Note: the tag has no meaning, we use a date format purely for readability
+  FDO_DISTRIBUTION_TAG:  '2022-01-22.0'
+  FDO_DISTRIBUTION_PACKAGES:  'git gcc pkgconf autoconf automake make xorg-util-macros xorgproto xorg-server-devel libpciaccess pixman'
+
+
+#
+# Verify that commit messages are as expected, signed-off, etc.
+#
+check-commits:
+  extends:
+    - .fdo.ci-fairy
+  stage: prep
+  script:
+    - ci-fairy check-commits --signed-off-by --junit-xml=results.xml
+  except:
+    - master at xorg/driver/xf86-video-nv
+  variables:
+    GIT_DEPTH: 100
+  artifacts:
+    reports:
+      junit: results.xml
+
+#
+# Verify that the merge request has the allow-collaboration checkbox ticked
+#
+check-merge-request:
+  extends:
+    - .fdo.ci-fairy
+  stage: deploy
+  script:
+    - ci-fairy check-merge-request --require-allow-collaboration --junit-xml=results.xml
+  artifacts:
+    when: on_failure
+    reports:
+      junit: results.xml
+  allow_failure: true
+
+
+#
+# Build a container with the given tag and the packages pre-installed.
+# This only happens if the tag changes, otherwise the existing image is
+# re-used.
+#
+container-prep:
+  extends:
+    - .fdo.container-build at arch
+  stage: prep
+  variables:
+    GIT_STRATEGY: none
+
+
+#
+# The default build, runs on the image built above.
+#
+build:
+  stage: build
+  extends:
+    - .fdo.distribution-image at arch
+  script:
+    - autoreconf -ivf
+    - mkdir _builddir
+    - pushd _builddir > /dev/null
+    - ../configure --disable-silent-rules
+    - make
+    - make check
+    - make distcheck
+    - popd > /dev/null
commit 6168d934890e1066cf34f5bd97fd8c17b9dff548
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Sat Jan 22 14:02:12 2022 -0800

    Fix spelling/wording issues
    
    Found by using:
        codespell --builtin clear,rare,usage,informal,code,names
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>

diff --git a/README.md b/README.md
index 3fc4c9a..97cd20b 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@ Xorg mailing list:
 
   https://lists.x.org/mailman/listinfo/xorg
 
-The master development code repository can be found at:
+The primary development code repository can be found at:
 
   https://gitlab.freedesktop.org/xorg/driver/xf86-video-nv
 
diff --git a/src/nv_driver.c b/src/nv_driver.c
index 3a74038..b7188e3 100644
--- a/src/nv_driver.c
+++ b/src/nv_driver.c
@@ -100,7 +100,7 @@ static const struct pci_id_match NVPciIdMatchList[] = {
 /*
  * This contains the functions needed by the server after loading the
  * driver module.  It must be supplied, and gets added the driver list by
- * the Module Setup funtion in the dynamic case.  In the static case a
+ * the Module Setup function in the dynamic case.  In the static case a
  * reference to this is compiled in, and this requires that the name of
  * this DriverRec be an upper-case version of the driver name.
  */
diff --git a/src/nv_hw.c b/src/nv_hw.c
index 9291912..6fcadc0 100644
--- a/src/nv_hw.c
+++ b/src/nv_hw.c
@@ -234,12 +234,12 @@ static void nv4CalcArbitration (
     nv4_sim_state *arb
 )
 {
-    int data, pagemiss, cas,width, video_enable, bpp;
+    int data, pagemiss, cas, width, video_enable, bpp;
     int nvclks, mclks, pclks, vpagemiss, crtpagemiss, vbs;
     int found, mclk_extra, mclk_loop, cbs, m1, p1;
     int mclk_freq, pclk_freq, nvclk_freq, mp_enable;
     int us_m, us_n, us_p, video_drain_rate, crtc_drain_rate;
-    int vpm_us, us_video, vlwm, video_fill_us, cpm_us, us_crt,clwm;
+    int vpm_us, us_video, vlwm, video_fill_us, cpm_us, us_crt, clwm;
 
     fifo->valid = 1;
     pclk_freq = arb->pclk_khz;
commit ec6c1e02f91ad84577543a0a3bb24c27ca3bca23
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Sat Jan 22 13:59:51 2022 -0800

    Build xz tarballs instead of bzip2
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>

diff --git a/configure.ac b/configure.ac
index 4c6f3a6..0115555 100644
--- a/configure.ac
+++ b/configure.ac
@@ -38,7 +38,7 @@ XORG_DEFAULT_OPTIONS
 AC_CONFIG_AUX_DIR(.)
 
 # Initialize Automake
-AM_INIT_AUTOMAKE([foreign dist-bzip2])
+AM_INIT_AUTOMAKE([foreign dist-xz])
 
 # Initialize libtool
 AC_DISABLE_STATIC