[glib] Use meson build system. #11477

vlj · 2020-05-20T19:12:24Z

Describe the pull request

What does your PR fix? Fixes [glib] Upgrade glib and use meson build system. #11476
Which triplets are supported/not supported? Have you updated the CI baseline?
Normally all previous triplets are supported (at least tested x64 and ported arm patches, hopefully mac works out of the box)

About the PR:
It ditches CMakeLists.txt (apparently some files like gfilemonitor were not even included by glib) and use meson instead. To preserve backward compatibility I added some targets.cmake files which are copied after installation, they allow others ports to maintain compatibility.

There is no more config.h.win32.in with meson but several .in files, I think that it's now responsible to handle arm64.

vlj · 2020-05-20T19:14:52Z

I'm using this PR to see if things build with all platforms.

vlj · 2020-05-20T21:21:09Z

How can I fix linux build ? It complains that meson is not installed by apt.

vlj · 2020-05-20T21:41:24Z

arm64 fails because cross compilation is not enabled in meson so far...
#11230

c72578 · 2020-05-22T07:32:26Z

How can I fix linux build ? It complains that meson is not installed by apt.

Meson needs to be installed on the Linux build host.

CMake Error at scripts/cmake/vcpkg_find_acquire_program.cmake:367 (message):
  Could not find meson.  Please install it via your package manager:

      sudo apt-get install meson

JackBoosY · 2020-05-22T08:06:19Z

I think we should fix meson cross compilation first.

MVoz · 2020-05-22T09:20:13Z

sudo apt-get install meson

not latest version

vlj · 2020-05-22T12:16:16Z

Meson needs to be installed on the Linux build host.

But how can I do that ? Is there a script that control what is installed on azure agents ?

vlj · 2020-05-23T18:38:12Z

I changed include pathes, meson build added a glib-2.0/ prefix to very glib file but every packages in vcpkg expected glib includes to be in include/

vlj · 2020-05-23T18:47:32Z

By the way the osx64 build fails but it doesn't tell why ?

MVoz · 2020-05-23T19:17:49Z

https://cmake.org/cmake/help/latest/variable/CMAKE_HOST_UNIX.html
https://cmake.org/cmake/help/latest/module/FindPython3.html

vcpkg/scripts/cmake/vcpkg_find_acquire_program.cmake

Line 225 in c493703

elseif(VAR MATCHES "MESON")

    if(CMAKE_HOST_WIN32 AND CMAKE_HOST_UNIX)
      set(SCRIPTNAME meson.py)
    else()
      set(SCRIPTNAME meson)
    endif()

...

    if(CMAKE_HOST_UNIX)
      find_package(Python3 COMPONENTS Interpreter)
      set(PYTHON3 ${PYTHON3_EXECUTABLE})
    else()

?

Neumann-A · 2020-05-23T21:54:59Z

vlj force-pushed the vlj:glib-meson branch from a2d7b9f to 5254d9b 3 hours ago

ah man ..... and i was just doing that

Building package glib[core]:arm64-windows... done
Installing package glib[core]:arm64-windows...
Installing package glib[core]:arm64-windows... done
Elapsed time for package glib:arm64-windows: 2.114 min

Neumann-A · 2020-05-23T21:57:46Z

https://github.com/Neumann-A/vcpkg/tree/fix_meson_cross

requires
https://github.com/mesonbuild/meson/pull/7190/files

c72578 · 2020-05-24T06:45:14Z

ports/glib/CONTROL

 Homepage: https://developer.gnome.org/glib/
 Description: Portable, general-purpose utility library.
-Build-Depends: zlib, pcre, libffi, gettext, libiconv
+Build-Depends: zlib, pcre, libffi, gettext, libiconv, tool-meson


Could you add dirent to Build-Depends, which removes the following error message in meson-log.txt:

testfile.c(4): fatal error C1189: #error: "Header 'dirent.h' could not be found" Has header "dirent.h" : NO

Neumann-A · 2020-05-24T07:43:10Z

Run-time dependency libpcre found: NO (tried pkgconfig and cmake)
Library pcred found: NO

Run-time dependency libelf found: NO (tried pkgconfig and cmake)
Library elf found: NO

c72578 · 2020-05-24T12:04:28Z

How about adding the following to portfile.cmake:

if(CMAKE_HOST_WIN32)
set(MESON_COMMON_CFLAGS "${MESON_COMMON_CFLAGS} /I${CURRENT_INSTALLED_DIR}/include")
set(MESON_DEBUG_LDFLAGS "${MESON_DEBUG_LDFLAGS} /LIBPATH:${CURRENT_INSTALLED_DIR}/debug/lib")
set(MESON_RELEASE_LDFLAGS "${MESON_RELEASE_LDFLAGS} /LIBPATH:${CURRENT_INSTALLED_DIR}/lib")
endif()

This will enable e.g. the following (see meson-log.txt):

Has header "dirent.h" : YES 
Library pcre found: YES

vlj · 2020-05-24T16:17:41Z

Are these defines not done by vcpkg_configure_meson ?

c72578 · 2020-05-24T16:45:07Z

Are these defines not done by vcpkg_configure_meson ?

Not yet ...

vlj · 2020-05-25T22:05:31Z

I reverted the include path to their original location.
There is a header in lib/glib-2.0/include/glibconfig.h, I leave it there too but I don't know if it's the right way to do. I think some others package may expect it there if they are moved to meson.

c72578 · 2020-05-26T06:08:50Z

I reverted the include path to their original location.
There is a header in lib/glib-2.0/include/glibconfig.h, I leave it there too but I don't know if it's the right way to do. I think some others package may expect it there if they are moved to meson.

I found some explanation concerning lib/glib-2.0/include/glibconfig.h here:
libvips/libvips#909 (comment)

vlj · 2020-05-26T21:59:31Z

I fixed most build error except for atkmm for now (it's a msbuild like ports so I need some time to figure out how to fix it)

MVoz · 2020-05-26T22:41:29Z

if do, then the whole GNOME, under MESON

vlj · 2020-05-27T06:49:48Z

?

Neumann-A · 2020-05-27T06:54:45Z

@vlj He is saying to also switch the other ports to meson. But that is a different PR in my opinion

c72578 · 2020-05-30T05:43:09Z

I fixed most build error except for atkmm for now (it's a msbuild like ports so I need some time to figure out how to fix it)

@vlj Here is a workaround for atkmm. Please have a look.
However, I guess in the future we will also switch to meson for atkmm and update it to a newer version ...

diff --git a/ports/atkmm/CONTROL b/ports/atkmm/CONTROL
index caf3abb43..3ffe29ba2 100644
--- a/ports/atkmm/CONTROL
+++ b/ports/atkmm/CONTROL
@@ -1,5 +1,5 @@
 Source: atkmm
-Version: 2.24.2-2
+Version: 2.24.2-3
 Homepage: https://www.gtkmm.org
 Description: atkmm is the official C++ interface for the ATK accessibility toolkit library. It may be used, for instance, by user interfaces implemented with gtkmm.
 Build-Depends: glib, gettext, atk, glibmm
diff --git a/ports/atkmm/fix_properties.patch b/ports/atkmm/fix_properties.patch
index a03924386..d1a18da91 100644
--- a/ports/atkmm/fix_properties.patch
+++ b/ports/atkmm/fix_properties.patch
@@ -16,7 +16,7 @@ index 421f5c3..0275e6e 100644
    <ItemDefinitionGroup>
      <ClCompile>
 -      <AdditionalIncludeDirectories>.\atkmm;..\atk;$(GlibEtcInstallRoot)\include\glibmm-2.4;$(GlibEtcInstallRoot)\lib\glibmm-2.4\include;$(GlibEtcInstallRoot)\include\sigc++-2.0;$(GlibEtcInstallRoot)\lib\sigc++-2.0\include;$(GlibEtcInstallRoot)\include\atk-1.0;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-+      <AdditionalIncludeDirectories>.\atkmm;..\atk;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
++      <AdditionalIncludeDirectories>.\atkmm;..\atk;.;$(CurrentInstalledDir)\include\glib-2.0;$(CurrentInstalledDir)\lib\glib-2.0\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
        <ForcedIncludeFiles>msvc_recommended_pragmas.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
        <MultiProcessorCompilation>true</MultiProcessorCompilation>
        <AdditionalOptions>/d2Zi+ %(AdditionalOptions)</AdditionalOptions>
diff --git a/ports/atkmm/portfile.cmake b/ports/atkmm/portfile.cmake
index f8e9df294..6d9fc541a 100644
--- a/ports/atkmm/portfile.cmake
+++ b/ports/atkmm/portfile.cmake
@@ -1,5 +1,3 @@
-include(vcpkg_common_functions)
-
 vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
 
 vcpkg_download_distfile(ARCHIVE
@@ -26,6 +24,10 @@ vcpkg_build_msbuild(
     PROJECT_PATH ${SOURCE_PATH}/MSVC_Net2013/atkmm.sln
     TARGET atkmm
     PLATFORM ${VS_PLATFORM}
+    OPTIONS
+    # Remark: This is a workaround for now. When updating atkmm to a newer version, meson should be used instead
+    # CurrentInstalledDir is used by fix_properties.patch for glib-2.0 include dirs
+        /p:CurrentInstalledDir=${CURRENT_INSTALLED_DIR}
     USE_VCPKG_INTEGRATION
 )

atkmm_glib_2_patch.zip

vlj · 2020-05-30T15:59:42Z

Sorry for the delay, I added you patch thanks !

vlj · 2020-05-31T00:12:42Z

I needed to fix glib gdbus-codegen because it hardcoded path to package.

vlj · 2020-05-31T19:40:11Z

I fixed gtkmm.

vlj · 2020-05-31T19:57:20Z

It seems like all dependent project are fixed (at least on windows).
Can't wait to get the meson PRs and this one merged so that all project can be switched to meson.

Neumann-A · 2020-08-17T19:20:39Z

mind trying out #12945?

vlj · 2020-08-27T11:26:30Z

What do you mean ?

JackBoosY · 2020-08-31T07:20:05Z

Could you please solve these regressions?

vlj force-pushed the glib-meson branch 6 times, most recently from 4be3ed6 to bba81ce Compare May 20, 2020 21:05

vlj mentioned this pull request May 20, 2020

vcpkg_configure_meson does not support cross-compilation #11230

Open

vlj force-pushed the glib-meson branch from bba81ce to a2d7b9f Compare May 20, 2020 21:56

vlj mentioned this pull request May 20, 2020

[glib] Build using Meson #10389

Closed

PhoebeHui assigned JackBoosY May 20, 2020

JackBoosY added the depends:different-pr This PR or Issue depends on a PR which has been filed label May 22, 2020

vlj force-pushed the glib-meson branch from a2d7b9f to 5254d9b Compare May 23, 2020 18:37

c72578 reviewed May 24, 2020

View reviewed changes

vlj force-pushed the glib-meson branch from 5254d9b to 04fa7e3 Compare May 24, 2020 16:16

vlj force-pushed the glib-meson branch from 1098bcd to b066a1a Compare May 25, 2020 22:03

vlj added 7 commits May 26, 2020 23:05

[glib] Fix libnice build.

a1e7302

[glib] Fix gdb-pixbuf build.

28aec49

[glib] Fix libcroco build.

56fd363

[glib]Fix pango build.

28595c6

[glib] Fix fluidsynth build.

0bd6734

[glib] Fix libxmlpp build.

d153d1d

[glib] Fix gtk build.

c27509e

[glib] Fix atkmm, thanks to c72578.

5e083ea

[glib]Fix gdbus-codegen.

3415773

vlj force-pushed the glib-meson branch from 2317dc6 to 3415773 Compare May 30, 2020 23:40

vlj added 2 commits May 31, 2020 02:32

[glib] Fix pangomm.

2455abf

[glib] Fix gtkmm.

d89f1ed

LilyWangL mentioned this pull request Jun 8, 2020

[<GTK>] update to <3.24.20> #11797

Closed

JackBoosY added the requires:author-response label Aug 31, 2020

vlj closed this Sep 28, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[glib] Use meson build system. #11477

[glib] Use meson build system. #11477

vlj commented May 20, 2020

vlj commented May 20, 2020

vlj commented May 20, 2020

vlj commented May 20, 2020 •

edited

Loading

c72578 commented May 22, 2020

JackBoosY commented May 22, 2020

MVoz commented May 22, 2020

vlj commented May 22, 2020

vlj commented May 23, 2020

vlj commented May 23, 2020

MVoz commented May 23, 2020 •

edited

Loading

Neumann-A commented May 23, 2020 •

edited

Loading

Neumann-A commented May 23, 2020

c72578 May 24, 2020 •

edited

Loading

Neumann-A commented May 24, 2020

c72578 commented May 24, 2020 •

edited

Loading

vlj commented May 24, 2020

c72578 commented May 24, 2020

vlj commented May 25, 2020

c72578 commented May 26, 2020

vlj commented May 26, 2020

MVoz commented May 26, 2020

vlj commented May 27, 2020

Neumann-A commented May 27, 2020

c72578 commented May 30, 2020 •

edited

Loading

vlj commented May 30, 2020

vlj commented May 31, 2020

vlj commented May 31, 2020

vlj commented May 31, 2020

Neumann-A commented Aug 17, 2020

vlj commented Aug 27, 2020

JackBoosY commented Aug 31, 2020

[glib] Use meson build system. #11477

[glib] Use meson build system. #11477

Conversation

vlj commented May 20, 2020

vlj commented May 20, 2020

vlj commented May 20, 2020

vlj commented May 20, 2020 • edited Loading

c72578 commented May 22, 2020

JackBoosY commented May 22, 2020

MVoz commented May 22, 2020

vlj commented May 22, 2020

vlj commented May 23, 2020

vlj commented May 23, 2020

MVoz commented May 23, 2020 • edited Loading

Neumann-A commented May 23, 2020 • edited Loading

Neumann-A commented May 23, 2020

c72578 May 24, 2020 • edited Loading

Choose a reason for hiding this comment

Neumann-A commented May 24, 2020

c72578 commented May 24, 2020 • edited Loading

vlj commented May 24, 2020

c72578 commented May 24, 2020

vlj commented May 25, 2020

c72578 commented May 26, 2020

vlj commented May 26, 2020

MVoz commented May 26, 2020

vlj commented May 27, 2020

Neumann-A commented May 27, 2020

c72578 commented May 30, 2020 • edited Loading

vlj commented May 30, 2020

vlj commented May 31, 2020

vlj commented May 31, 2020

vlj commented May 31, 2020

Neumann-A commented Aug 17, 2020

vlj commented Aug 27, 2020

JackBoosY commented Aug 31, 2020

vlj commented May 20, 2020 •

edited

Loading

MVoz commented May 23, 2020 •

edited

Loading

Neumann-A commented May 23, 2020 •

edited

Loading

c72578 May 24, 2020 •

edited

Loading

c72578 commented May 24, 2020 •

edited

Loading

c72578 commented May 30, 2020 •

edited

Loading