diff --git a/ports/libepoxy/CONTROL b/ports/libepoxy/CONTROL index 1ef7749ebf4..7e6b7e53256 100644 --- a/ports/libepoxy/CONTROL +++ b/ports/libepoxy/CONTROL @@ -1,6 +1,5 @@ Source: libepoxy -Version: 1.5.4 -Port-Version: 2 +Version: 1.5.5 Homepage: https://github.com/anholt/libepoxy Description: Epoxy is a library for handling OpenGL function pointer management for you Build-Depends: tool-meson diff --git a/ports/libepoxy/libepoxy-1.5.4_Add_call_convention_to_mock_function.patch b/ports/libepoxy/libepoxy-1.5.4_Add_call_convention_to_mock_function.patch deleted file mode 100644 index d6ddd92e476..00000000000 --- a/ports/libepoxy/libepoxy-1.5.4_Add_call_convention_to_mock_function.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 81d758d025089d6b3b5309205ff4cb75789e6205 Mon Sep 17 00:00:00 2001 -From: crziter -Date: Tue, 25 Feb 2020 11:33:56 +0700 -Subject: [PATCH] Add call convention to mock function - ---- - test/gl_version.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/test/gl_version.c b/test/gl_version.c -index 9ab0080..9fe1bba 100644 ---- a/test/gl_version.c -+++ b/test/gl_version.c -@@ -29,7 +29,7 @@ GLenum mock_enum; - const char *mock_gl_version; - const char *mock_glsl_version; - --static const GLubyte *override_glGetString(GLenum name) -+static const GLubyte * EPOXY_CALLSPEC override_glGetString(GLenum name) - { - switch (name) { - case GL_VERSION: diff --git a/ports/libepoxy/libepoxy-1.5.4_meson_c_std.patch b/ports/libepoxy/libepoxy-1.5.4_meson_c_std.patch deleted file mode 100644 index 850bbe01bea..00000000000 --- a/ports/libepoxy/libepoxy-1.5.4_meson_c_std.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/meson.build 2019-11-06 00:08:06.000000000 +0100 -+++ b/meson.build 2020-11-03 20:02:08.201459200 +0100 -@@ -1,7 +1,7 @@ - project('libepoxy', 'c', version: '1.5.4', - default_options: [ - 'buildtype=debugoptimized', -- 'c_std=gnu99', -+ 'c_std=c99', - 'warning_level=1', - ], - license: 'MIT', diff --git a/ports/libepoxy/portfile.cmake b/ports/libepoxy/portfile.cmake index 07f81a7b715..90290b5a083 100644 --- a/ports/libepoxy/portfile.cmake +++ b/ports/libepoxy/portfile.cmake @@ -1,75 +1,34 @@ -vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) +if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) +endif() + +if(VCPKG_TARGET_IS_LINUX AND NOT EXISTS "/usr/share/doc/libgles2/copyright") + message(STATUS "libgles2-mesa-dev must be installed before libepoxy can build. Install it with \"apt-get install libgles2-mesa-dev\".") +endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO anholt/libepoxy - REF 1.5.4 - SHA512 c8b03f0a39df320fdd163a34c35f9ffbed51bc0174fd89a7dc4b3ab2439413087e1e1a2fe57418520074abd435051cbf03eb2a7bf8897da1712bbbc69cf27cc5 + REF 1.5.5 + SHA512 9056840d887f06c6422f61e65ea02511ed37b866a234d49bf78dc5f2f46e8dd9f029405387da14dced639e6a5740b5c56ab6d88ca23ea3270fc6db6a570b0c45 HEAD_REF master - PATCHES - # https://github.com/anholt/libepoxy/pull/220 - libepoxy-1.5.4_Add_call_convention_to_mock_function.patch - libepoxy-1.5.4_meson_c_std.patch ) if (VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_OSX) - vcpkg_configure_meson(SOURCE_PATH ${SOURCE_PATH} - OPTIONS - -Denable-glx=no - -Denable-egl=no) - vcpkg_install_meson() - vcpkg_copy_pdbs() + set(OPTIONS -Dglx=no -Degl=no -Dx11=false) else() - find_program(autoreconf autoreconf) - if (NOT autoreconf OR NOT EXISTS "/usr/share/doc/libgles2/copyright") - message(FATAL_ERROR "autoreconf and libgles2-mesa-dev must be installed before libepoxy can build. Install them with \"apt-get install dh-autoreconf libgles2-mesa-dev\".") - endif() - - find_program(MAKE make) - if (NOT MAKE) - message(FATAL_ERROR "MAKE not found") - endif() - - file(REMOVE_RECURSE ${SOURCE_PATH}/m4) - file(MAKE_DIRECTORY ${SOURCE_PATH}/m4) - - set(LIBEPOXY_CONFIG_ARGS "--enable-x11=yes --enable-glx=yes --enable-egl=yes") - - vcpkg_execute_required_process( - COMMAND "autoreconf" -v --install - WORKING_DIRECTORY ${SOURCE_PATH} - LOGNAME autoreconf-${TARGET_TRIPLET} - ) - - message(STATUS "Configuring ${TARGET_TRIPLET}") - set(OUT_PATH_RELEASE ${CURRENT_BUILDTREES_DIR}/make-build-${TARGET_TRIPLET}-release) - - file(REMOVE_RECURSE ${OUT_PATH_RELEASE}) - file(MAKE_DIRECTORY ${OUT_PATH_RELEASE}) - - vcpkg_execute_required_process( - COMMAND "./configure" --prefix=${OUT_PATH_RELEASE} "${LIBEPOXY_CONFIG_ARGS}" - WORKING_DIRECTORY ${SOURCE_PATH} - LOGNAME config-${TARGET_TRIPLET} - ) - - message(STATUS "Building ${TARGET_TRIPLET}") - vcpkg_execute_required_process( - COMMAND make - WORKING_DIRECTORY ${SOURCE_PATH} - LOGNAME build-${TARGET_TRIPLET}-release - ) - - message(STATUS "Installing ${TARGET_TRIPLET}") - vcpkg_execute_required_process( - COMMAND make install - WORKING_DIRECTORY ${SOURCE_PATH} - LOGNAME install-${TARGET_TRIPLET}-release - ) - file(COPY ${OUT_PATH_RELEASE}/include DESTINATION ${CURRENT_PACKAGES_DIR}) - file(COPY ${OUT_PATH_RELEASE}/lib DESTINATION ${CURRENT_PACKAGES_DIR}) - file(RENAME ${CURRENT_PACKAGES_DIR}/lib ${CURRENT_PACKAGES_DIR}/bin) + set(OPTIONS -Dglx=yes -Degl=yes -Dx11=true) endif() +if(VCPKG_TARGET_IS_WINDOWS) + list(APPEND OPTIONS -Dc_std=c99) +endif() + +vcpkg_configure_meson( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS ${OPTIONS} -Dtests=false +) +vcpkg_install_meson() +vcpkg_copy_pdbs() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/pkgconfig) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share/pkgconfig)