[Git][freetype/freetype][master] 2 commits: [meson] Change Zlib configuration option.

[Werner Lemberg (@wl)]

Werner Lemberg pushed to branch master at FreeType / FreeType

Commits:

• 0d343863
  by David Turner at 2022-01-09T21:38:29+01:00

  [meson] Change Zlib configuration option.
  
  * meson_options.txt, meson.build: Change the format of the 'zlib' meson
  build configuration option to be a combo with the following choices:
  
    - none: Do not support gzip-compressed streams at all.
  
    - internal: Support gzip-compressed streams using the copy of the gzip
      sources under `src/gzip/`; this should only be used during development
      to ensure these work properly.
  
    - external: Support gzip-compressed streams using the 'zlib' Meson
      subproject, linked as a static library.
  
    - system: Support gzip-compressed streams using a system-installed version
      of zlib.
  
    - auto: Support gzip-compressed streams using a system-installed version
      of zlib, if available, or using the 'zlib' subproject otherwise.  This
      is the default.
  
    - disabled: Backward-compatible alias for 'none'.
  
    - enabled: Backward-compatible alias for 'auto'.
  

• a25e85ed
  by David Turner at 2022-01-09T23:16:00+01:00

  [gzip] Update sources to zlib 1.2.11
  
  This can be tested by building with the Unix development build
  
    make setup devel
    make
  
  or by building the freetype-demos programs with
  
    meson setup build -Dfreetype2:zlib=internal
    meson compile -C out
  
  and trying to run `ftview` with a `.pcf.gz` font file.
  
  * src/gzip/ftgzip.c, src/gzip/rules.mk: Update for new zlib sources.  Also
  remove the temporary fix introduced in commit 6a431038 to work around the
  fact that the internal sources were too old.
  
  * src/gzip/README.freetype: New file describing the origin of the sources
  and how they were modified.
  
  * src/gzip/patches/*: Patch files applied to original sources.
  
  * src/gzip/*: Updated zlib sources with the patch file(s) from
  `src/gzip/patches/` applied, followed by a conversion with zlib's
  `zlib2ansi` script.
  

15 changed files:

• meson.build
• meson_options.txt
• + src/gzip/README.freetype
• src/gzip/adler32.c
• + src/gzip/crc32.c
• + src/gzip/crc32.h
• src/gzip/ftgzip.c
• src/gzip/ftzconf.h
• + src/gzip/gzguts.h
• + src/gzip/infback.c
• − src/gzip/infblock.c
• − src/gzip/infblock.h
• − src/gzip/infcodes.c
• + src/gzip/inffast.c
• src/gzip/infcodes.h → src/gzip/inffast.h

The diff was not included because it is too large.

—
View it on GitLab.
You're receiving this email because of your account on gitlab.freedesktop.org. If you'd like to receive fewer emails, you can adjust your notification settings.