Smalltalk › Squeak › Squeak VM

[OpenSmalltalk/opensmalltalk-vm] 61faab: Try and rescue macos libpng builds for Pharo

‹ Previous Topic Next Topic ›
 
classic Classic list List threaded Threaded
♦
♦
 1 message Options
Eliot Miranda-3
Reply | Threaded
Open this post in threaded view
♦
♦
|

[OpenSmalltalk/opensmalltalk-vm] 61faab: Try and rescue macos libpng builds for Pharo

Eliot Miranda-3
 
  Branch: refs/heads/Cog
  Home:   https://github.com/OpenSmalltalk/opensmalltalk-vm
  Commit: 61faabba1f68c1b5ba6b161f8571020b0ce755ec
      https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/61faabba1f68c1b5ba6b161f8571020b0ce755ec
  Author: Nicolas Cellier <[hidden email]>
  Date:   2021-01-03 (Sun, 03 Jan 2021)

  Changed paths:
    M build.macos32x86/pharo.cog.spur.lowcode/Makefile
    M build.macos32x86/pharo.cog.spur.minheadless/Makefile
    M build.macos32x86/pharo.cog.spur/Makefile
    M build.macos32x86/pharo.cog.v3/Makefile
    M build.macos32x86/pharo.sista.spur/Makefile
    M build.macos32x86/pharo.stack.spur.lowcode/Makefile
    M build.macos32x86/pharo.stack.spur/Makefile
    M build.macos32x86/third-party/Makefile.libpng
    A build.macos32x86/third-party/Makefile.zlib
    M build.macos64x64/pharo.cog.spur.lowcode/Makefile
    M build.macos64x64/pharo.cog.spur/Makefile
    M build.macos64x64/pharo.sista.spur/Makefile
    M build.macos64x64/pharo.stack.spur.lowcode/Makefile
    M build.macos64x64/pharo.stack.spur/Makefile
    M build.macos64x64/squeak.stack.spur/Makefile
    M build.macos64x64/third-party/Makefile.cairo
    M build.macos64x64/third-party/Makefile.freetype2
    M build.macos64x64/third-party/Makefile.libpng
    A build.macos64x64/third-party/Makefile.zlib
    M platforms/iOS/plugins/FT2Plugin/Makefile
    M third-party/libpng.spec
    M third-party/zlib.spec

  Log Message:
  -----------
  Try and rescue macos libpng builds for Pharo

On macosx, zlib is a pre-requisite of libpng, so it has to be compiled
While at it, upgrade libpng to 1.16.37 due to CVE-2019-7317 - see http://www.libpng.org/pub/png/libpng.html


  Commit: afe4f5abdc7cc2e6a8a7ab2d74237f0b6e3a8326
      https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/afe4f5abdc7cc2e6a8a7ab2d74237f0b6e3a8326
  Author: Nicolas Cellier <[hidden email]>
  Date:   2021-01-03 (Sun, 03 Jan 2021)

  Changed paths:
    M third-party/pixman.spec

  Log Message:
  -----------
  also upgrade pixman to 0.40.0

This is required on macos because newer version of clang do not anymore provide a `__builtin_shuffle`


  Commit: 8c26fc240e4e50f3a84fb1d3e1ebb734802e0b48
      https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/8c26fc240e4e50f3a84fb1d3e1ebb734802e0b48
  Author: Nicolas Cellier <[hidden email]>
  Date:   2021-01-03 (Sun, 03 Jan 2021)

  Changed paths:
    M build.macos32x86/common/Makefile.lib.extra

  Log Message:
  -----------
  And let 32 bits builds pollute their own cache (x86 rather than x86_64)


  Commit: 6c33c2bb3f54acf1f0d302349dcee2e82bb4122c
      https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/6c33c2bb3f54acf1f0d302349dcee2e82bb4122c
  Author: Nicolas Cellier <[hidden email]>
  Date:   2021-01-03 (Sun, 03 Jan 2021)

  Changed paths:
    M third-party/cairo.spec

  Log Message:
  -----------
  And also upgrade cairo to 1.15.14


  Commit: 8eb93486803c5fcef43fa088c433a053eaa8515b
      https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/8eb93486803c5fcef43fa088c433a053eaa8515b
  Author: Nicolas Cellier <[hidden email]>
  Date:   2021-01-03 (Sun, 03 Jan 2021)

  Changed paths:
    M build.win32x86/third-party/Makefile.libpng
    M build.win64x64/third-party/Makefile.libpng
    R third-party/libpng.spec.win

  Log Message:
  -----------
  Nuke win specific libpng.spec


  Commit: 3abac662759b8cd7bc54ea94b016da83b280b9bc
      https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/3abac662759b8cd7bc54ea94b016da83b280b9bc
  Author: Nicolas Cellier <[hidden email]>
  Date:   2021-01-03 (Sun, 03 Jan 2021)

  Changed paths:
    R third-party/pixman.clang.patch

  Log Message:
  -----------
  Nuke pixman patch, the upgrade solved the thing


  Commit: d22281a16078ce42efca185db3520f87910359c4
      https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/d22281a16078ce42efca185db3520f87910359c4
  Author: Nicolas Cellier <[hidden email]>
  Date:   2021-01-04 (Mon, 04 Jan 2021)

  Changed paths:
    M build.macos32x86/third-party/Makefile.zlib

  Log Message:
  -----------
  Workaround zlib configure bug for 32bits macos

configure fails to apply $ARCHS flags to $SFLAGS (the compiler options for compiling shared library)
It's a single line patch for configure, but rather than patching, just workaround by forcing CFLAGS and LDFLAGS.


  Commit: 05907a069ffbc3eee22cc9bddb3d8c3811197957
      https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/05907a069ffbc3eee22cc9bddb3d8c3811197957
  Author: Nicolas Cellier <[hidden email]>
  Date:   2021-01-05 (Tue, 05 Jan 2021)

  Changed paths:
    M third-party/libsdl2.spec
    M third-party/openssl.spec
    M third-party/openssl.spec.win64

  Log Message:
  -----------
  SDL 2.0.14 & SSL 1.1.1i


  Commit: e38f6acf530b774cced4fbda2c5f701e8e8493fd
      https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/e38f6acf530b774cced4fbda2c5f701e8e8493fd
  Author: Nicolas Cellier <[hidden email]>
  Date:   2021-01-06 (Wed, 06 Jan 2021)

  Changed paths:
    M cmake/Cairo.cmake
    M cmake/FreeType2.cmake
    M cmake/LibGit2.cmake
    M cmake/LibPNG.cmake
    M cmake/LibSSH2.cmake
    M cmake/Pixman.cmake
    M cmake/PkgConfig.cmake
    M cmake/SDL2.cmake
    M cmake/ThirdPartyDependenciesMacros.cmake

  Log Message:
  -----------
  Also update version of libpng, pixman and cairo in cmake builds

There is no reason why cmake should use a different version.
Use whatever hash is given by hosting sites, this is not necessarily SHA256.
Change the ThirdPartyDependenciesMacros accordingly.


  Commit: 836cba12034fc762b88312723023c60866e10d74
      https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/836cba12034fc762b88312723023c60866e10d74
  Author: Nicolas Cellier <[hidden email]>
  Date:   2021-01-06 (Wed, 06 Jan 2021)

  Changed paths:
    M cmake/SDL2.cmake

  Log Message:
  -----------
  upgrade to SDL 2.10.4 in cmake builds too


  Commit: 07aad2fbc11587faf5f93d0594da15bab12fcf5e
      https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/07aad2fbc11587faf5f93d0594da15bab12fcf5e
  Author: Nicolas Cellier <[hidden email]>
  Date:   2021-01-06 (Wed, 06 Jan 2021)

  Changed paths:
    M build.win32x86/third-party/Makefile.freetype2
    M build.win64x64/third-party/Makefile.freetype2
    M cmake/FreeType2.cmake
    M third-party/freetype2.spec
    R third-party/freetype291.patch

  Log Message:
  -----------
  Ugrade freetype 2.9.1 -> 2.10.4

hence
- remove the now useless patch
- rebuild the win64 dll (same makefile as win32) rather than download from files.pharo.org


  Commit: a5c0f36609c0224e6c9af3f55e4ead706e1d2e8b
      https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/a5c0f36609c0224e6c9af3f55e4ead706e1d2e8b
  Author: Nicolas Cellier <[hidden email]>
  Date:   2021-01-07 (Thu, 07 Jan 2021)

  Changed paths:
    M cmake/LibSSH2.cmake

  Log Message:
  -----------
  Upgrade libssh2 to 1.9.0 in cmake builds too


  Commit: dd2abe328c4c2727aee3ca19ec4166b52f80214a
      https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/dd2abe328c4c2727aee3ca19ec4166b52f80214a
  Author: Nicolas Cellier <[hidden email]>
  Date:   2021-01-09 (Sat, 09 Jan 2021)

  Changed paths:
    M cmake/OpenSSL.cmake

  Log Message:
  -----------
  Upgrade openssl to 1.1.1i in cmake build too


  Commit: e455fe2e4b5581c90567d00c823ba7227fc7c586
      https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/e455fe2e4b5581c90567d00c823ba7227fc7c586
  Author: Nicolas Cellier <[hidden email]>
  Date:   2021-01-11 (Mon, 11 Jan 2021)

  Changed paths:
    M cmake/ThirdPartyDependenciesMacros.cmake

  Log Message:
  -----------
  Accept a pattern for windows_dll spec in cmake builds

This is necessary for OpenSSL library for example because it could be libssl-1.1.dll or libssl-1.1-x64.dll


  Commit: bb567e51fca23cf3310fd9a7d98b1678fa29d6e6
      https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/bb567e51fca23cf3310fd9a7d98b1678fa29d6e6
  Author: Nicolas Cellier <[hidden email]>
  Date:   2021-01-12 (Tue, 12 Jan 2021)

  Changed paths:
    M build.macos32x86/common/Makefile.lib.extra
    M build.macos32x86/pharo.cog.spur.lowcode/Makefile
    M build.macos32x86/pharo.cog.spur.minheadless/Makefile
    M build.macos32x86/pharo.cog.spur/Makefile
    M build.macos32x86/pharo.cog.v3/Makefile
    M build.macos32x86/pharo.sista.spur/Makefile
    M build.macos32x86/pharo.stack.spur.lowcode/Makefile
    M build.macos32x86/pharo.stack.spur/Makefile
    M build.macos32x86/third-party/Makefile.libpng
    A build.macos32x86/third-party/Makefile.zlib
    M build.macos64x64/pharo.cog.spur.lowcode/Makefile
    M build.macos64x64/pharo.cog.spur/Makefile
    M build.macos64x64/pharo.sista.spur/Makefile
    M build.macos64x64/pharo.stack.spur.lowcode/Makefile
    M build.macos64x64/pharo.stack.spur/Makefile
    M build.macos64x64/squeak.stack.spur/Makefile
    M build.macos64x64/third-party/Makefile.cairo
    M build.macos64x64/third-party/Makefile.freetype2
    M build.macos64x64/third-party/Makefile.libpng
    A build.macos64x64/third-party/Makefile.zlib
    M build.win32x86/third-party/Makefile.freetype2
    M build.win32x86/third-party/Makefile.libpng
    M build.win64x64/third-party/Makefile.freetype2
    M build.win64x64/third-party/Makefile.libpng
    M cmake/Cairo.cmake
    M cmake/FreeType2.cmake
    M cmake/LibGit2.cmake
    M cmake/LibPNG.cmake
    M cmake/LibSSH2.cmake
    M cmake/OpenSSL.cmake
    M cmake/Pixman.cmake
    M cmake/PkgConfig.cmake
    M cmake/SDL2.cmake
    M cmake/ThirdPartyDependenciesMacros.cmake
    M platforms/iOS/plugins/FT2Plugin/Makefile
    M third-party/cairo.spec
    M third-party/freetype2.spec
    R third-party/freetype291.patch
    M third-party/libpng.spec
    R third-party/libpng.spec.win
    M third-party/libsdl2.spec
    M third-party/openssl.spec
    M third-party/openssl.spec.win64
    R third-party/pixman.clang.patch
    M third-party/pixman.spec
    M third-party/zlib.spec

  Log Message:
  -----------
  Merge pull request #545 from OpenSmalltalk/upgrade_libpng

Upgrade libpng


Compare: https://github.com/OpenSmalltalk/opensmalltalk-vm/compare/85fc1d429d23...bb567e51fca2
Free forum by Nabble Edit this page