[Git][xorg-team/lib/libxcvt][debian-unstable] 11 commits: Fix hsync

Timo Aaltonen pushed to branch debian-unstable at X Strike Force / lib / libxcvt

Commits:

26164df0

by nyanpasu64 at 2023-05-02T18:20:29-07:00

Fix hsync_start computation

The CVT v1.2 specification says, in section 3.4.1 "Standard CRT-based
Timing":

> The Horizontal Sync Pulse duration will in all cases be set as closely
> as possible to 8% of the Total Horizontal time, rounded down to the
> nearest cell width.

The previous code achieved this by first setting mode_info->hsync_end to
a multiple of the cell width, then calculating mode_info->hsync_start
and rounding its position up to a cell width. However, if
mode_info->hsync_start was already a multiple of 8 (for example on
640x480@60), the rounding code would erroneously add 8 to it, shortening
the hsync duration by 8 pixels.

This commit fixes the bug by calculating and rounding the sync width
separately, closer to the specification's wording.

Signed-off-by: nyanpasu64 <nyanpasu64@tuta.io>
Closes: https://gitlab.freedesktop.org/xorg/lib/libxcvt/-/issues/6
Reviewed-by: Olivier Fourdan <ofourdan@redhat.com>

e1c7adb0

by nyanpasu64 at 2023-05-05T10:30:45+00:00

Fix too-small back porch at very low resolutions

Previously the code erroneously used CVT_MIN_V_PORCH=3 instead of the
specified CVT_MIN_V_BPORCH=6, when calculating the minimum size of the
back porch in scanlines. As a result, when generating 320x240@60, the
vtotal would be be incorrectly set to 252 instead of 253.

This commit fixes the typo.

Signed-off-by: nyanpasu64 <nyanpasu64@tuta.io>
Closes: https://gitlab.freedesktop.org/xorg/lib/libxcvt/-/issues/7
Reviewed-by: Olivier Fourdan <ofourdan@redhat.com>

55aa4ae7

by nyanpasu64 at 2023-05-05T10:30:45+00:00

Rename constant to CVT_MIN_V_PORCH_RND

Signed-off-by: nyanpasu64 <nyanpasu64@tuta.io>

0adc5fc8

by Peter Hutterer at 2024-07-22T16:23:38+10:00

README: remove double dollar sign

We're not getting paid enough to use that many dollars.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Part-of: <https://gitlab.freedesktop.org/xorg/lib/libxcvt/-/merge_requests/15>

922c7e1f

by Olivier Fourdan at 2024-07-22T07:07:18+00:00

ci: Update CI and enable static analysis

Update the CI to add the template Security/SAST.gitlab-ci.yml as most of
the other xorg projects do.

Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Part-of: <https://gitlab.freedesktop.org/xorg/lib/libxcvt/-/merge_requests/12>

0e3d127e

by Alan Coopersmith at 2024-09-30T13:32:08-07:00

cvt: fix -Wmissing-prototypes warning for cvt_is_standard

../cvt/cvt.c:34:1: warning: no previous prototype for ‘cvt_is_standard’ [-Wmissing-prototypes]
   34 | cvt_is_standard(int hdisplay, int vdisplay, float vrefresh, bool reduced, bool verbose)
      | ^~~~~~~~~~~~~~~

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>

dd8631c6

by Alan Coopersmith at 2024-12-13T17:42:24-08:00

libxcvt 0.1.3

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>

d0e0ef9a

by Timo Aaltonen at 2025-02-06T09:44:02+02:00

Merge branch 'upstream-unstable' into debian-unstable

affea109
by Timo Aaltonen at 2025-02-06T09:44:41+02:00
```
version bump
```
a921eec4
by Timo Aaltonen at 2025-02-06T09:46:14+02:00
```
upstream: Update signing.key.asc.
```
357fabd8
by Timo Aaltonen at 2025-02-06T09:57:46+02:00
```
releasing package libxcvt version 0.1.3-1
```

Changes:

.gitlab-ci.yml

@@ -18,11 +18,13 @@ include:
      file:
        - '/templates/ci-fairy.yml'
        - '/templates/fedora.yml'
 +  - template: Security/SAST.gitlab-ci.yml
  stages:
    - sanity check
    - prep
    - build
 +  - test
  variables:
    FDO_UPSTREAM_REPO: xorg/lib/libxcvt
@@ -91,7 +93,7 @@ check-merge-request:
  .fedora.34:
    variables:
      FDO_DISTRIBUTION_VERSION: '34'
 -    FDO_DISTRIBUTION_TAG: '2021-07-26.0'
 +    FDO_DISTRIBUTION_TAG: '2022-08-03.0'
  prep-fedora-34:
    extends:

.gitlab-ci/ci.template

@@ -22,11 +22,13 @@ include:
      {% for d in distributions %}
        - '/templates/{{d.name}}.yml'
      {% endfor %}
 +  - template: Security/SAST.gitlab-ci.yml
  stages:
    - sanity check
    - prep
    - build
 +  - test
  variables:
    FDO_UPSTREAM_REPO: xorg/lib/libxcvt

.gitlab-ci/config.yml

 -.default_tag: &default_tag '2021-07-26.0'
 +.default_tag: &default_tag '2022-08-03.0'
  distributions:
    - name: fedora

README.md

@@ -11,7 +11,7 @@ replacement to the version provided by the `Xorg` server.
  An example output is:
  ```
 -$ $ cvt --verbose 1920 1200 75
 +$ cvt --verbose 1920 1200 75
  # 1920x1200 74.93 Hz (CVT 2.30MA) hsync: 94.04 kHz; pclk: 245.25 MHz
  Modeline "1920x1200_75.00"  245.25  1920 2064 2264 2608  1200 1203 1209 1255 -hsync +vsync
  ```

cvt/cvt.c

@@ -30,7 +30,7 @@
  #include <libxcvt/libxcvt.h>
 -bool
 +static bool
  cvt_is_standard(int hdisplay, int vdisplay, float vrefresh, bool reduced, bool verbose)
+ {
      bool is_cvt = true;

debian/changelog

 +libxcvt (0.1.3-1) unstable; urgency=medium
++
 +  * New upstream release.
 +  * upstream: Update signing.key.asc.
++
 + -- Timo Aaltonen <tjaalton@debian.org>  Thu, 06 Feb 2025 09:57:43 +0200
++
  libxcvt (0.1.2-1) unstable; urgency=medium
    * New upstream release. (LP: #1970021)

debian/upstream/signing-key.asc

@@ -225,3 +225,64 @@ FgIDAQIeAQIXgAUCRqPLWAUJGlQd0gAKCRAUcG2+HktFQKczAKDeq33Q9kYEKPAL
 FdFAfX5HOdbMQCgrJ1XMhV5ELa+QYhFTH6TmNfffeg=
  =gHbK
  -----END PGP PUBLIC KEY BLOCK-----
 +-----BEGIN PGP PUBLIC KEY BLOCK-----
++
 +mQGiBEab+moRBACDH5yKqS3wcc5bdxY7PBNuwKvF5TKMfagmSvuRDtZjjIIWaA/n
 +Z1KboV9Gq5g7kP7+Kfu+Qgd8u65eVsWwmPW10fXvj3aCU53glx2EdGdrHcgiyH2g
 +EQfPiyBw+trIppWFRV0IDXSLMA1FNC92t2nSG/VFHaPTVwcgkIRSfcXDvwCglGdE
 +a6f4uLqoNHP+m4yYnzapFuMD/R4+2AJDAvEWKDdYCGZzlawjAmmWyXrmT7/C/mx9
 +8qUR473l4buXjHgDkkXXlHqdzil1vK85PhrKzNJDCCmlHUJNz+QwiAMOLwpD+kwV
 +Pb57RG7y+a5JQ5+jtVw4RlUxZIk/wj2An9YBO3A5vR7PdjM32ZJCN2+aM4dYfNzQ
 +xQKTA/47icvBaBVTl9rztjg2pd2Aqpc1P/GsIYLGj7XjnnJvGAENBHSH1QjpZMJG
 +CTS9oJ+B0/wrIr+pA+MdFgYAb6ojMQJOO6UChjWWSGjMFcs/CeXhxlLBido3DtAE
 +TbNTwO6OEfAvdosvTdhJFnwvZlJ+zZGGy5CrF2Fd9PUe9tmASbQuQWxhbiBDb29w
 +ZXJzbWl0aCA8YWxhbi5jb29wZXJzbWl0aEBvcmFjbGUuY29tPoiCBBMRCgBCAhsD
 +BgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAIZARYhBEoZPAbTXnxnD6TvC6L7nggf
 +LRMOBQJkQs2eBQknDNS0AAoJEKL7nggfLRMO1esAnR4FVD60BpDY/bJp5RC1VXhO
 +Vlo4AKCJgsQeVeGLxDlMuhAmbcCkOjafqbQoQWxhbiBDb29wZXJzbWl0aCA8YWxh
 +bmNAZnJlZWRlc2t0b3Aub3JnPoh/BBMRCgA/AhsDBgsJCAcDAgYVCAIJCgsEFgID
 +AQIeAQIXgBYhBEoZPAbTXnxnD6TvC6L7nggfLRMOBQJkQs2eBQknDNS0AAoJEKL7
 +nggfLRMOUgAAoIyNXuU5kOotpZrKvPrjQATbsPClAJ9wkh/n3IAobV6aDLb1qOt5
 +RT3Pp7QrQWxhbiBDb29wZXJzbWl0aCA8YWxhbi5jb29wZXJzbWl0aEBzdW4uY29t
 +Poh9BBMRCgA9AhsDBgsJCAcDAgQVAggDBBYCAwECHgECF4AWIQRKGTwG0158Zw+k
 +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
 +=awvS
 +-----END PGP PUBLIC KEY BLOCK-----

lib/libxcvt.c

@@ -79,8 +79,8 @@ libxcvt_gen_mode_info(int hdisplay, int vdisplay, float vrefresh, bool reduced,
      /* 2) character cell horizontal granularity (pixels) - default 8 */
  #define CVT_H_GRANULARITY 8
 -    /* 4) Minimum vertical porch (lines) - default 3 */
 -#define CVT_MIN_V_PORCH 3
 +    /* 4) Minimum vertical front porch (lines) - default 3 */
 +#define CVT_MIN_V_PORCH_RND 3
      /* 4) Minimum number of vertical back porch lines - default 6 */
  #define CVT_MIN_V_BPORCH 6
@@ -161,16 +161,16 @@ libxcvt_gen_mode_info(int hdisplay, int vdisplay, float vrefresh, bool reduced,
          float hblank_percentage;
          int vsync_and_back_porch, vback_porch;
 -        int hblank;
 +        int hblank, hsync_w;
          /* 8. Estimated Horizontal period */
          hperiod = ((float) (1000000.0 / vfield_rate - CVT_MIN_VSYNC_BP)) /
 -            (vdisplay_rnd + 2 * vmargin + CVT_MIN_V_PORCH + interlace);
 +            (vdisplay_rnd + 2 * vmargin + CVT_MIN_V_PORCH_RND + interlace);
          /* 9. Find number of lines in sync + backporch */
          if (((int) (CVT_MIN_VSYNC_BP / hperiod) + 1) <
 -            (vsync + CVT_MIN_V_PORCH))
 -            vsync_and_back_porch = vsync + CVT_MIN_V_PORCH;
 +            (vsync + CVT_MIN_V_BPORCH))
 +            vsync_and_back_porch = vsync + CVT_MIN_V_BPORCH;
          else
              vsync_and_back_porch = (int) (CVT_MIN_VSYNC_BP / hperiod) + 1;
@@ -181,7 +181,7 @@ libxcvt_gen_mode_info(int hdisplay, int vdisplay, float vrefresh, bool reduced,
          /* 11. Find total number of lines in vertical field */
          mode_info->vtotal =
              vdisplay_rnd + 2 * vmargin + vsync_and_back_porch + interlace +
 -            CVT_MIN_V_PORCH;
 +            CVT_MIN_V_PORCH_RND;
          /* 5) Definition of Horizontal blanking time limitation */
          /* Gradient (%/kHz) - default 600 */
@@ -216,13 +216,12 @@ libxcvt_gen_mode_info(int hdisplay, int vdisplay, float vrefresh, bool reduced,
          /* Fill in HSync values */
          mode_info->hsync_end = mode_info->hdisplay + hblank / 2;
 -        mode_info->hsync_start = mode_info->hsync_end -
 -            (mode_info->htotal * CVT_HSYNC_PERCENTAGE) / 100;
 -        mode_info->hsync_start += CVT_H_GRANULARITY -
 -            mode_info->hsync_start % CVT_H_GRANULARITY;
 +        hsync_w = (mode_info->htotal * CVT_HSYNC_PERCENTAGE) / 100;
 +        hsync_w -= hsync_w % CVT_H_GRANULARITY;
 +        mode_info->hsync_start = mode_info->hsync_end - hsync_w;
          /* Fill in vsync values */
 -        mode_info->vsync_start = mode_info->vdisplay + CVT_MIN_V_PORCH;
 +        mode_info->vsync_start = mode_info->vdisplay + CVT_MIN_V_PORCH_RND;
          mode_info->vsync_end = mode_info->vsync_start + vsync;
+     }

meson.build

  project('libxcvt', 'c',
 -        version: '0.1.2',
 +        version: '0.1.3',
          meson_version: '>= 0.40.0',
          default_options: ['warning_level=1',
                            'buildtype=debugoptimized'])

[Git][xorg-team/lib/libxcvt][debian-unstable] 11 commits: Fix hsync_start computation

Timo Aaltonen pushed to branch debian-unstable at X Strike Force / lib / libxcvt

Commits:

9 changed files:

Changes: