Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package libwpe for openSUSE:Factory checked in at 2021-05-12 19:31:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libwpe (Old) and /work/SRC/openSUSE:Factory/.libwpe.new.2988 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libwpe" Wed May 12 19:31:43 2021 rev:5 rq:892065 version:1.10.0 Changes: -------- --- /work/SRC/openSUSE:Factory/libwpe/libwpe.changes 2020-10-26 16:12:03.514702165 +0100 +++ /work/SRC/openSUSE:Factory/.libwpe.new.2988/libwpe.changes 2021-05-12 19:32:10.099052915 +0200 @@ -1,0 +2,8 @@ +Sat May 8 18:31:50 UTC 2021 - Dirk M??ller <[email protected]> + +- update to 1.10.0: + - New API to explicitly deinitialize an EGL renderer target, which allows + implementors of the wpe_renderer_backend_egl_target_interface + - build system improvements + +------------------------------------------------------------------- Old: ---- libwpe-1.8.0.tar.xz New: ---- libwpe-1.10.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libwpe.spec ++++++ --- /var/tmp/diff_new_pack.ddhnSL/_old 2021-05-12 19:32:10.531051189 +0200 +++ /var/tmp/diff_new_pack.ddhnSL/_new 2021-05-12 19:32:10.535051173 +0200 @@ -1,7 +1,7 @@ # # spec file for package libwpe # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,7 +21,7 @@ %define sover 1_0-1 Name: libwpe -Version: 1.8.0 +Version: 1.10.0 Release: 0 Summary: General-purpose library for the WPE-flavored port of WebKit License: BSD-2-Clause ++++++ libwpe-1.8.0.tar.xz -> libwpe-1.10.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwpe-1.8.0/CMakeLists.txt new/libwpe-1.10.0/CMakeLists.txt --- old/libwpe-1.8.0/CMakeLists.txt 2020-09-11 14:06:36.887286700 +0200 +++ new/libwpe-1.10.0/CMakeLists.txt 2021-03-26 22:38:58.871184600 +0100 @@ -4,7 +4,8 @@ set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake") include(VersioningUtils) -SET_PROJECT_VERSION(1 8 0) +READ_VERSION_HEADER("" "WPE_[A-Z]+_VERSION" "${CMAKE_SOURCE_DIR}/include/wpe/libwpe-version.h") +SET_PROJECT_VERSION(${WPE_MAJOR_VERSION} ${WPE_MINOR_VERSION} ${WPE_MICRO_VERSION}) set(WPE_API_VERSION "1.0") # Before making a release, the LT_VERSION string should be modified. @@ -14,7 +15,7 @@ # - If binary compatibility has been broken (eg removed or changed interfaces) # change to C+1:0:0 # - If the interface is the same as the previous version, change to C:R+1:A -CALCULATE_LIBRARY_VERSIONS_FROM_LIBTOOL_TRIPLE(LIBWPE 5 3 4) +CALCULATE_LIBRARY_VERSIONS_FROM_LIBTOOL_TRIPLE(LIBWPE 6 1 5) project(libwpe VERSION "${PROJECT_VERSION}") @@ -41,10 +42,6 @@ endif () endforeach () -set(DERIVED_SOURCES_DIR "${CMAKE_BINARY_DIR}/DerivedSources/wpe") -configure_file(include/wpe/version.h.cmake ${DERIVED_SOURCES_DIR}/version.h @ONLY) -configure_file(include/wpe/version-deprecated.h.cmake ${DERIVED_SOURCES_DIR}/version-deprecated.h @ONLY) - include(DistTargets) include(GNUInstallDirs) @@ -52,8 +49,9 @@ find_package(Libxkbcommon REQUIRED) set(WPE_PUBLIC_HEADERS - ${DERIVED_SOURCES_DIR}/version.h - ${DERIVED_SOURCES_DIR}/version-deprecated.h + include/wpe/libwpe-version.h + include/wpe/version.h + include/wpe/version-deprecated.h include/wpe/export.h include/wpe/input.h include/wpe/keysyms.h @@ -81,7 +79,6 @@ target_include_directories(wpe PRIVATE "include" "src" - ${DERIVED_SOURCES_DIR} $<TARGET_PROPERTY:GL::egl,INTERFACE_INCLUDE_DIRECTORIES> ) target_compile_definitions(wpe PRIVATE @@ -145,10 +142,8 @@ --sitemap=${CMAKE_SOURCE_DIR}/docs/sitemap.txt --output=${CMAKE_CURRENT_BINARY_DIR}/Documentation/ --c-sources "${CMAKE_SOURCE_DIR}/include/wpe/*.h" - "${DERIVED_SOURCES_DIR}/version.h" - "${DERIVED_SOURCES_DIR}/version-deprecated.h" --extra-c-flags=-DWPE_COMPILATION=1 - --c-include-directories ${CMAKE_SOURCE_DIR}/include ${DERIVED_SOURCES_DIR} + --c-include-directories ${CMAKE_SOURCE_DIR}/include --c-smart-index ) ELSE() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwpe-1.8.0/NEWS new/libwpe-1.10.0/NEWS --- old/libwpe-1.8.0/NEWS 2020-09-11 14:06:36.887286700 +0200 +++ new/libwpe-1.10.0/NEWS 2021-03-26 22:38:58.871184600 +0100 @@ -1,14 +1,29 @@ -========================== -1.8.0 - September 11, 2020 -========================== +======================= +1.10.0 - March 26, 2021 +======================= -- This release does not contain changes over the 1.7.90 development release +- This release does not contain changes over the 1.9.91 development release. -========================== -1.7.90 - September 4, 2020 -========================== +======================= +1.9.91 - March 15, 2021 +======================= -- This release does not contain changes over the 1.7.1 development release +- New API to explicitly deinitialize an EGL renderer target, which allows + implementors of the wpe_renderer_backend_egl_target_interface to + differentiate between destruction and deinitialization. + +====================== +1.9.90 - March 6, 2021 +====================== + +- Improve build system reliability by avoiding generated headers. +- Fix usage of libwpe as a Meson subproject. + +======================== +1.9.1 - January 18, 2021 +======================== + +- Improve the Meson build system to allow using libwpe as a subproject. ===================== 1.7.1 - July 29, 2020 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwpe-1.8.0/cmake/VersioningUtils.cmake new/libwpe-1.10.0/cmake/VersioningUtils.cmake --- old/libwpe-1.8.0/cmake/VersioningUtils.cmake 2020-09-11 14:06:36.887286700 +0200 +++ new/libwpe-1.10.0/cmake/VersioningUtils.cmake 2021-03-26 22:38:58.871184600 +0100 @@ -1,3 +1,12 @@ +function(READ_VERSION_HEADER var_prefix def_regex file_path) + file(STRINGS "${file_path}" lines) + foreach (line ${lines}) + if (line MATCHES "^#define[ \t]+(${def_regex})[ \t]+([0-9]+)$") + set("${var_prefix}${CMAKE_MATCH_1}" "${CMAKE_MATCH_2}" PARENT_SCOPE) + endif() + endforeach() +endfunction() + macro(SET_PROJECT_VERSION major minor micro) set(PROJECT_VERSION_MAJOR "${major}") set(PROJECT_VERSION_MINOR "${minor}") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwpe-1.8.0/include/meson.build new/libwpe-1.10.0/include/meson.build --- old/libwpe-1.8.0/include/meson.build 1970-01-01 01:00:00.000000000 +0100 +++ new/libwpe-1.10.0/include/meson.build 2021-03-26 22:38:58.871184600 +0100 @@ -0,0 +1 @@ +subdir('wpe') \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwpe-1.8.0/include/wpe/input.h new/libwpe-1.10.0/include/wpe/input.h --- old/libwpe-1.8.0/include/wpe/input.h 2020-09-11 14:06:36.887286700 +0200 +++ new/libwpe-1.10.0/include/wpe/input.h 2021-03-26 22:38:58.871184600 +0100 @@ -38,7 +38,7 @@ */ #if defined(WPE_COMPILATION) -#include <wpe/export.h> +#include "export.h" #endif #include <stdbool.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwpe-1.8.0/include/wpe/libwpe-version.h new/libwpe-1.10.0/include/wpe/libwpe-version.h --- old/libwpe-1.8.0/include/wpe/libwpe-version.h 1970-01-01 01:00:00.000000000 +0100 +++ new/libwpe-1.10.0/include/wpe/libwpe-version.h 2021-03-26 22:38:58.871184600 +0100 @@ -0,0 +1,15 @@ +/* + * libwpe-version.h + * Copyright (C) 2021 Adrian Perez de Castro <[email protected]> + * + * Distributed under terms of the MIT license. + */ + +#ifndef LIBWPE_VERSION_H +#define LIBWPE_VERSION_H + +#define WPE_MAJOR_VERSION 1 +#define WPE_MINOR_VERSION 10 +#define WPE_MICRO_VERSION 0 + +#endif /* !LIBWPE_VERSION_H */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwpe-1.8.0/include/wpe/loader.h new/libwpe-1.10.0/include/wpe/loader.h --- old/libwpe-1.8.0/include/wpe/loader.h 2020-09-11 14:06:36.890620000 +0200 +++ new/libwpe-1.10.0/include/wpe/loader.h 2021-03-26 22:38:58.871184600 +0100 @@ -38,7 +38,7 @@ */ #if defined(WPE_COMPILATION) -#include <wpe/export.h> +#include "export.h" #endif #include <stdbool.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwpe-1.8.0/include/wpe/meson.build new/libwpe-1.10.0/include/wpe/meson.build --- old/libwpe-1.8.0/include/wpe/meson.build 1970-01-01 01:00:00.000000000 +0100 +++ new/libwpe-1.10.0/include/wpe/meson.build 2021-03-26 22:38:58.871184600 +0100 @@ -0,0 +1,18 @@ +api_headers = [ + 'export.h', + 'input.h', + 'keysyms.h', + 'libwpe-version.h', + 'loader.h', + 'pasteboard.h', + 'renderer-backend-egl.h', + 'renderer-host.h', + 'version.h', + 'version-deprecated.h', + 'view-backend.h', + 'wpe-egl.h', + 'wpe.h', +] +install_headers(api_headers, + subdir: join_paths('wpe-' + api_version, 'wpe'), +) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwpe-1.8.0/include/wpe/pasteboard.h new/libwpe-1.10.0/include/wpe/pasteboard.h --- old/libwpe-1.8.0/include/wpe/pasteboard.h 2020-09-11 14:06:36.890620000 +0200 +++ new/libwpe-1.10.0/include/wpe/pasteboard.h 2021-03-26 22:38:58.871184600 +0100 @@ -38,7 +38,7 @@ */ #if defined(WPE_COMPILATION) -#include <wpe/export.h> +#include "export.h" #endif #include <stdint.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwpe-1.8.0/include/wpe/renderer-backend-egl.h new/libwpe-1.10.0/include/wpe/renderer-backend-egl.h --- old/libwpe-1.8.0/include/wpe/renderer-backend-egl.h 2020-09-11 14:06:36.890620000 +0200 +++ new/libwpe-1.10.0/include/wpe/renderer-backend-egl.h 2021-03-26 22:38:58.871184600 +0100 @@ -38,7 +38,7 @@ */ #if defined(WPE_COMPILATION) -#include <wpe/export.h> +#include "export.h" #endif #include <EGL/eglplatform.h> @@ -81,9 +81,9 @@ void (*resize)(void*, uint32_t, uint32_t); void (*frame_will_render)(void*); void (*frame_rendered)(void*); + void (*deinitialize)(void*); /*< private >*/ - void (*_wpe_reserved0)(void); void (*_wpe_reserved1)(void); void (*_wpe_reserved2)(void); void (*_wpe_reserved3)(void); @@ -163,6 +163,10 @@ wpe_renderer_backend_egl_target_frame_rendered(struct wpe_renderer_backend_egl_target*); WPE_EXPORT +void +wpe_renderer_backend_egl_target_deinitialize(struct wpe_renderer_backend_egl_target*); + +WPE_EXPORT struct wpe_renderer_backend_egl_offscreen_target* wpe_renderer_backend_egl_offscreen_target_create(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwpe-1.8.0/include/wpe/renderer-host.h new/libwpe-1.10.0/include/wpe/renderer-host.h --- old/libwpe-1.8.0/include/wpe/renderer-host.h 2020-09-11 14:06:36.890620000 +0200 +++ new/libwpe-1.10.0/include/wpe/renderer-host.h 2021-03-26 22:38:58.871184600 +0100 @@ -38,7 +38,7 @@ */ #if defined(WPE_COMPILATION) -#include <wpe/export.h> +#include "export.h" #endif #ifdef __cplusplus diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwpe-1.8.0/include/wpe/version-deprecated.h new/libwpe-1.10.0/include/wpe/version-deprecated.h --- old/libwpe-1.8.0/include/wpe/version-deprecated.h 1970-01-01 01:00:00.000000000 +0100 +++ new/libwpe-1.10.0/include/wpe/version-deprecated.h 2021-03-26 22:38:58.871184600 +0100 @@ -0,0 +1,88 @@ +/* + * Copyright (C) 2018 Igalia S.L. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A + * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#if !defined(__WPE_H_INSIDE__) && !defined(WPE_COMPILATION) +#error "Only <wpe/wpe.h> can be included directly." +#endif + +#ifndef wpe_version_deprecated_h +#define wpe_version_deprecated_h + +#if defined(WPE_COMPILATION) +#include "export.h" +#endif + +#include "libwpe-version.h" + +#ifdef __cplusplus +extern "C" { +#endif + +#define WPE_BACKEND_MAJOR_VERSION WPE_MAJOR_VERSION +#define WPE_BACKEND_MINOR_VERSION WPE_MINOR_VERSION +#define WPE_BACKEND_MICRO_VERSION WPE_MICRO_VERSION + +#define WPE_BACKEND_CHECK_VERSION(major, minor, micro) \ + (WPE_BACKEND_MAJOR_VERSION > (major) || \ + (WPE_BACKEND_MAJOR_VERSION == (major) && WPE_BACKEND_MINOR_VERSION > (minor)) || \ + (WPE_BACKEND_MAJOR_VERSION == (major) && WPE_BACKEND_MINOR_VERSION == (minor) && \ + WPE_BACKEND_MICRO_VERSION >= (micro))) + +/** + * wpe_backend_get_major_version: + * + * Returns: Major version of the `libwpe` library. + * + * Deprecated: Since `libwpe` version 1.0.0, use wpe_get_major_version() + * instead. + */ +WPE_EXPORT unsigned wpe_backend_get_major_version(void); + +/** + * wpe_backend_get_minor_version: + * + * Returns: Minor version of the `libwpe` library. + * + * Deprecated: Since `libwpe` version 1.0.0, use wpe_get_minor_version() + * instead. + */ +WPE_EXPORT unsigned wpe_backend_get_minor_version(void); + +/** + * wpe_backend_get_micro_version: + * + * Returns: Micro version of the `libwpe` library. + * + * Deprecated: Since `libwpe` version 1.0.0, use wpe_get_micro_version() + * instead. + */ +WPE_EXPORT unsigned wpe_backend_get_micro_version(void); + +#ifdef __cplusplus +} +#endif + +#endif /* wpe_version_deprecated_h */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwpe-1.8.0/include/wpe/version-deprecated.h.cmake new/libwpe-1.10.0/include/wpe/version-deprecated.h.cmake --- old/libwpe-1.8.0/include/wpe/version-deprecated.h.cmake 2020-09-11 14:06:36.890620000 +0200 +++ new/libwpe-1.10.0/include/wpe/version-deprecated.h.cmake 1970-01-01 01:00:00.000000000 +0100 @@ -1,86 +0,0 @@ -/* - * Copyright (C) 2018 Igalia S.L. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A - * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#if !defined(__WPE_H_INSIDE__) && !defined(WPE_COMPILATION) -#error "Only <wpe/wpe.h> can be included directly." -#endif - -#ifndef wpe_version_deprecated_h -#define wpe_version_deprecated_h - -#if defined(WPE_COMPILATION) -#include <wpe/export.h> -#endif - -#ifdef __cplusplus -extern "C" { -#endif - -#define WPE_BACKEND_MAJOR_VERSION (@PROJECT_VERSION_MAJOR@) -#define WPE_BACKEND_MINOR_VERSION (@PROJECT_VERSION_MINOR@) -#define WPE_BACKEND_MICRO_VERSION (@PROJECT_VERSION_PATCH@) - -#define WPE_BACKEND_CHECK_VERSION(major, minor, micro) \ - (WPE_BACKEND_MAJOR_VERSION > (major) || \ - (WPE_BACKEND_MAJOR_VERSION == (major) && WPE_BACKEND_MINOR_VERSION > (minor)) || \ - (WPE_BACKEND_MAJOR_VERSION == (major) && WPE_BACKEND_MINOR_VERSION == (minor) && \ - WPE_BACKEND_MICRO_VERSION >= (micro))) - -/** - * wpe_backend_get_major_version: - * - * Returns: Major version of the `libwpe` library. - * - * Deprecated: Since `libwpe` version 1.0.0, use wpe_get_major_version() - * instead. - */ -WPE_EXPORT unsigned wpe_backend_get_major_version(void); - -/** - * wpe_backend_get_minor_version: - * - * Returns: Minor version of the `libwpe` library. - * - * Deprecated: Since `libwpe` version 1.0.0, use wpe_get_minor_version() - * instead. - */ -WPE_EXPORT unsigned wpe_backend_get_minor_version(void); - -/** - * wpe_backend_get_micro_version: - * - * Returns: Micro version of the `libwpe` library. - * - * Deprecated: Since `libwpe` version 1.0.0, use wpe_get_micro_version() - * instead. - */ -WPE_EXPORT unsigned wpe_backend_get_micro_version(void); - -#ifdef __cplusplus -} -#endif - -#endif /* wpe_version_deprecated_h */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwpe-1.8.0/include/wpe/version.h new/libwpe-1.10.0/include/wpe/version.h --- old/libwpe-1.8.0/include/wpe/version.h 1970-01-01 01:00:00.000000000 +0100 +++ new/libwpe-1.10.0/include/wpe/version.h 2021-03-26 22:38:58.871184600 +0100 @@ -0,0 +1,85 @@ +/* + * Copyright (C) 2018 Igalia S.L. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A + * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#if !defined(__WPE_H_INSIDE__) && !defined(WPE_COMPILATION) +#error "Only <wpe/wpe.h> can be included directly." +#endif + +#ifndef wpe_version_h +#define wpe_version_h + +/** + * SECTION:version + * @short_description: Library Version + * @title: Version + * @symbols: + * - wpe_backend_get_major_version + * - wpe_backend_get_minor_version + * - wpe_backend_get_micro_version + */ + +#if defined(WPE_COMPILATION) +#include "export.h" +#endif + +#include "libwpe-version.h" + +#ifdef __cplusplus +extern "C" { +#endif + +#define WPE_CHECK_VERSION(major, minor, micro) \ + (WPE_MAJOR_VERSION > (major) || \ + (WPE_MAJOR_VERSION == (major) && WPE_MINOR_VERSION > (minor)) || \ + (WPE_MAJOR_VERSION == (major) && WPE_MINOR_VERSION == (minor) && \ + WPE_MICRO_VERSION >= (micro))) + +/** + * wpe_get_major_version: + * + * Returns: Major version of the `libwpe` library. + */ +WPE_EXPORT unsigned wpe_get_major_version(void); + +/** + * wpe_get_minor_version: + * + * Returns: Minor version of the `libwpe` library. + */ +WPE_EXPORT unsigned wpe_get_minor_version(void); + +/** + * wpe_get_micro_version: + * + * Returns: Micro version of the `libwpe` library. + */ +WPE_EXPORT unsigned wpe_get_micro_version(void); + +#ifdef __cplusplus +} +#endif + +#endif /* wpe_version_h */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwpe-1.8.0/include/wpe/version.h.cmake new/libwpe-1.10.0/include/wpe/version.h.cmake --- old/libwpe-1.8.0/include/wpe/version.h.cmake 2020-09-11 14:06:36.890620000 +0200 +++ new/libwpe-1.10.0/include/wpe/version.h.cmake 1970-01-01 01:00:00.000000000 +0100 @@ -1,87 +0,0 @@ -/* - * Copyright (C) 2018 Igalia S.L. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A - * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#if !defined(__WPE_H_INSIDE__) && !defined(WPE_COMPILATION) -#error "Only <wpe/wpe.h> can be included directly." -#endif - -#ifndef wpe_version_h -#define wpe_version_h - -/** - * SECTION:version - * @short_description: Library Version - * @title: Version - * @symbols: - * - wpe_backend_get_major_version - * - wpe_backend_get_minor_version - * - wpe_backend_get_micro_version - */ - -#if defined(WPE_COMPILATION) -#include <wpe/export.h> -#endif - -#ifdef __cplusplus -extern "C" { -#endif - -#define WPE_MAJOR_VERSION (@PROJECT_VERSION_MAJOR@) -#define WPE_MINOR_VERSION (@PROJECT_VERSION_MINOR@) -#define WPE_MICRO_VERSION (@PROJECT_VERSION_PATCH@) - -#define WPE_CHECK_VERSION(major, minor, micro) \ - (WPE_MAJOR_VERSION > (major) || \ - (WPE_MAJOR_VERSION == (major) && WPE_MINOR_VERSION > (minor)) || \ - (WPE_MAJOR_VERSION == (major) && WPE_MINOR_VERSION == (minor) && \ - WPE_MICRO_VERSION >= (micro))) - -/** - * wpe_get_major_version: - * - * Returns: Major version of the `libwpe` library. - */ -WPE_EXPORT unsigned wpe_get_major_version(void); - -/** - * wpe_get_minor_version: - * - * Returns: Minor version of the `libwpe` library. - */ -WPE_EXPORT unsigned wpe_get_minor_version(void); - -/** - * wpe_get_micro_version: - * - * Returns: Micro version of the `libwpe` library. - */ -WPE_EXPORT unsigned wpe_get_micro_version(void); - -#ifdef __cplusplus -} -#endif - -#endif /* wpe_version_h */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwpe-1.8.0/include/wpe/view-backend.h new/libwpe-1.10.0/include/wpe/view-backend.h --- old/libwpe-1.8.0/include/wpe/view-backend.h 2020-09-11 14:06:36.890620000 +0200 +++ new/libwpe-1.10.0/include/wpe/view-backend.h 2021-03-26 22:38:58.871184600 +0100 @@ -38,7 +38,7 @@ */ #if defined(WPE_COMPILATION) -#include <wpe/export.h> +#include "export.h" #endif #ifdef __cplusplus diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwpe-1.8.0/include/wpe/wpe-egl.h new/libwpe-1.10.0/include/wpe/wpe-egl.h --- old/libwpe-1.8.0/include/wpe/wpe-egl.h 2020-09-11 14:06:36.890620000 +0200 +++ new/libwpe-1.10.0/include/wpe/wpe-egl.h 2021-03-26 22:38:58.871184600 +0100 @@ -34,8 +34,8 @@ #define __WPE_EGL_H_INSIDE__ -#include <wpe/wpe.h> -#include <wpe/renderer-backend-egl.h> +#include "wpe.h" +#include "renderer-backend-egl.h" #undef __WPE_EGL_H_INSIDE__ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwpe-1.8.0/include/wpe/wpe.h new/libwpe-1.10.0/include/wpe/wpe.h --- old/libwpe-1.8.0/include/wpe/wpe.h 2020-09-11 14:06:36.890620000 +0200 +++ new/libwpe-1.10.0/include/wpe/wpe.h 2021-03-26 22:38:58.874518000 +0100 @@ -40,9 +40,10 @@ #include "loader.h" #include "pasteboard.h" #include "renderer-host.h" +#include "view-backend.h" +#include "libwpe-version.h" #include "version.h" #include "version-deprecated.h" -#include "view-backend.h" #undef __WPE_H_INSIDE__ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwpe-1.8.0/meson.build new/libwpe-1.10.0/meson.build --- old/libwpe-1.8.0/meson.build 2020-09-11 14:06:36.890620000 +0200 +++ new/libwpe-1.10.0/meson.build 2021-03-26 22:38:58.874518000 +0100 @@ -7,7 +7,7 @@ 'cpp_std=c++11', ], license: 'BSD-2-Clause', - version: '1.8.0', + version: run_command(join_paths('scripts', 'version.py')).stdout().strip(), ) # This refers to the API level provided. This is modified only with major, @@ -22,15 +22,7 @@ # - If binary compatibility has been broken (eg removed or changed interfaces) # change to [C+1, 0, 0] # - If the interface is the same as the previous version, use [C, R+1, A]. -soversion = [5, 3, 4] - -# Split the *project* version into its components. -version_info = meson.project_version().split('.') -version_info = { - 'PROJECT_VERSION_MAJOR': version_info[0], - 'PROJECT_VERSION_MINOR': version_info[1], - 'PROJECT_VERSION_PATCH': version_info[2], -} +soversion = [6, 1, 5] # Mangle [C, R, A] into an actual usable *soversion*. soversion_major = soversion[0] - soversion[2] # Current-Age @@ -57,8 +49,16 @@ ] cc = meson.get_compiler('c') -if not cc.has_header('EGL/eglplatform.h') - dependencies += dependency('egl') +egl_dep = dependency('egl', required: false) +if egl_dep.found() + dependencies += egl_dep.partial_dependency( + compile_args: true, + includes: true, + ) +else + assert(cc.has_header('EGL/eglplatform.h'), + 'Required header <EGL/eglplatform.h> not found' + ) endif if not cc.has_function('dlopen') @@ -80,38 +80,11 @@ dependencies: dependencies, version: soversion, soversion: soversion_major, - include_directories: 'include', gnu_symbol_visibility: 'hidden', + include_directories: include_directories('include'), ) -api_headers = [ - 'include/wpe/export.h', - 'include/wpe/input.h', - 'include/wpe/keysyms.h', - 'include/wpe/loader.h', - 'include/wpe/pasteboard.h', - 'include/wpe/renderer-backend-egl.h', - 'include/wpe/renderer-host.h', - 'include/wpe/view-backend.h', - 'include/wpe/wpe-egl.h', - 'include/wpe/wpe.h', - - # Generated API headers. - configure_file( - input: 'include/wpe/version.h.cmake', - output: 'version.h', - configuration: version_info, - ), - configure_file( - input: 'include/wpe/version-deprecated.h.cmake', - output: 'version-deprecated.h', - configuration: version_info, - ), -] -install_headers(api_headers, - subdir: join_paths('wpe-' + api_version, 'wpe'), -) - +subdir('include') import('pkgconfig').generate( description: 'The wpe library', name: 'wpe-' + api_version, @@ -144,3 +117,8 @@ extra_c_flags: [' -DWPE_COMPILATION=1'], ) endif + +libwpe_dep = declare_dependency(link_with : libwpe, + include_directories : include_directories('include'), + dependencies : dependencies, +) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwpe-1.8.0/scripts/version.py new/libwpe-1.10.0/scripts/version.py --- old/libwpe-1.8.0/scripts/version.py 1970-01-01 01:00:00.000000000 +0100 +++ new/libwpe-1.10.0/scripts/version.py 2021-03-26 22:38:58.874518000 +0100 @@ -0,0 +1,23 @@ +#! /usr/bin/env python3 +# -*- coding: utf-8 -*- +# vim:fenc=utf-8 +# +# Copyright ?? 2021 Igalia S.L. +# +# Distributed under terms of the MIT license. + +from os import environ, path +import re + +version = {} +version_re = re.compile(r"^#define\s+WPE_([A-Z]+)_VERSION\s+(\d+)$") +version_file = path.join(environ["MESON_SOURCE_ROOT"], environ["MESON_SUBDIR"], + "include", "wpe", "libwpe-version.h") + +with open(version_file, "r") as f: + for line in f.readlines(): + m = version_re.match(line) + if m: + version[m[1]] = m[2] + +print("{}.{}.{}".format(version["MAJOR"], version["MINOR"], version["MICRO"])) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwpe-1.8.0/src/input.c new/libwpe-1.10.0/src/input.c --- old/libwpe-1.8.0/src/input.c 2020-09-11 14:06:36.890620000 +0200 +++ new/libwpe-1.10.0/src/input.c 2021-03-26 22:38:58.874518000 +0100 @@ -24,7 +24,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <wpe/input.h> +#include "../include/wpe/input.h" #include <locale.h> #include <stdlib.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwpe-1.8.0/src/key-unicode.c new/libwpe-1.10.0/src/key-unicode.c --- old/libwpe-1.8.0/src/key-unicode.c 2020-09-11 14:06:36.890620000 +0200 +++ new/libwpe-1.10.0/src/key-unicode.c 2021-03-26 22:38:58.874518000 +0100 @@ -17,8 +17,8 @@ /* This file is based on gdkkeyuni.c adapted to WPE */ -#include <wpe/input.h> -#include <wpe/keysyms.h> +#include "../include/wpe/input.h" +#include "../include/wpe/keysyms.h" /* Thanks to Markus G. Kuhn <[email protected]> for the ksysym<->Unicode * mapping functions, from the xterm sources. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwpe-1.8.0/src/loader-private.h new/libwpe-1.10.0/src/loader-private.h --- old/libwpe-1.8.0/src/loader-private.h 2020-09-11 14:06:36.890620000 +0200 +++ new/libwpe-1.10.0/src/loader-private.h 2021-03-26 22:38:58.874518000 +0100 @@ -27,7 +27,7 @@ #ifndef wpe_loader_private_h #define wpe_loader_private_h -#include <wpe/loader.h> +#include "../include/wpe/loader.h" void* wpe_load_object(const char*); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwpe-1.8.0/src/pasteboard-private.h new/libwpe-1.10.0/src/pasteboard-private.h --- old/libwpe-1.8.0/src/pasteboard-private.h 2020-09-11 14:06:36.890620000 +0200 +++ new/libwpe-1.10.0/src/pasteboard-private.h 2021-03-26 22:38:58.874518000 +0100 @@ -31,7 +31,7 @@ extern "C" { #endif -#include <wpe/pasteboard.h> +#include "../include/wpe/pasteboard.h" struct wpe_pasteboard { struct wpe_pasteboard_interface* interface; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwpe-1.8.0/src/renderer-backend-egl.c new/libwpe-1.10.0/src/renderer-backend-egl.c --- old/libwpe-1.8.0/src/renderer-backend-egl.c 2020-09-11 14:06:36.890620000 +0200 +++ new/libwpe-1.10.0/src/renderer-backend-egl.c 2021-03-26 22:38:58.874518000 +0100 @@ -24,7 +24,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <wpe/renderer-backend-egl.h> +#include "../include/wpe/renderer-backend-egl.h" #include "loader-private.h" #include "renderer-backend-egl-private.h" @@ -138,6 +138,13 @@ target->base.interface->frame_rendered(target->base.interface_data); } +void +wpe_renderer_backend_egl_target_deinitialize(struct wpe_renderer_backend_egl_target* target) +{ + if (target->base.interface->deinitialize) + target->base.interface->deinitialize(target->base.interface_data); +} + struct wpe_renderer_backend_egl_offscreen_target* wpe_renderer_backend_egl_offscreen_target_create() { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwpe-1.8.0/src/renderer-host-private.h new/libwpe-1.10.0/src/renderer-host-private.h --- old/libwpe-1.8.0/src/renderer-host-private.h 2020-09-11 14:06:36.890620000 +0200 +++ new/libwpe-1.10.0/src/renderer-host-private.h 2021-03-26 22:38:58.874518000 +0100 @@ -27,7 +27,7 @@ #ifndef wpe_renderer_host_private_h #define wpe_renderer_host_private_h -#include <wpe/renderer-host.h> +#include "../include/wpe/renderer-host.h" #ifdef __cplusplus extern "C" { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwpe-1.8.0/src/version.c new/libwpe-1.10.0/src/version.c --- old/libwpe-1.8.0/src/version.c 2020-09-11 14:06:36.890620000 +0200 +++ new/libwpe-1.10.0/src/version.c 2021-03-26 22:38:58.874518000 +0100 @@ -24,8 +24,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "version.h" -#include "version-deprecated.h" +#include "../include/wpe/version.h" +#include "../include/wpe/version-deprecated.h" unsigned wpe_get_major_version(void) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwpe-1.8.0/src/view-backend-private.h new/libwpe-1.10.0/src/view-backend-private.h --- old/libwpe-1.8.0/src/view-backend-private.h 2020-09-11 14:06:36.890620000 +0200 +++ new/libwpe-1.10.0/src/view-backend-private.h 2021-03-26 22:38:58.874518000 +0100 @@ -27,7 +27,7 @@ #ifndef wpe_view_backend_private_h #define wpe_view_backend_private_h -#include <wpe/view-backend.h> +#include "../include/wpe/view-backend.h" #ifdef __cplusplus extern "C" {
