Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package waffle for openSUSE:Factory checked in at 2021-02-25 18:30:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/waffle (Old) and /work/SRC/openSUSE:Factory/.waffle.new.2378 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "waffle" Thu Feb 25 18:30:09 2021 rev:7 rq:875071 version:1.6.3 Changes: -------- --- /work/SRC/openSUSE:Factory/waffle/waffle.changes 2021-01-19 16:04:50.447619042 +0100 +++ /work/SRC/openSUSE:Factory/.waffle.new.2378/waffle.changes 2021-02-25 18:30:14.914290039 +0100 @@ -1,0 +2,16 @@ +Thu Feb 25 10:27:35 UTC 2021 - Stefan Dirsch <[email protected]> + +- bugfix release 1.6.3 (changes since 1.6.1) + * docs: Add waffle 1.6.3 release notes + * docs: Add waffle 1.6.2 release notes + * meson: Fix meson build if bash-completion not found + * meson: always install bash-completion file + * meson: do not replace datadir for bash completion + * wflinfo: use glGetStringi() only when available + * gitlab-ci: update to latest ci-template + * apple: hide GL deprecation warnings + * tests/gl_basic_test: fix SURFACELESS_EGL only build + * gbm: don't pass invalid arguments to gbm_surface_create_with_modifiers + * cmocka: don't require librt, when it's not unavailable + +------------------------------------------------------------------- Old: ---- waffle-1.6.1.tar.xz waffle-1.6.1.tar.xz.asc New: ---- waffle-1.6.3.tar.xz waffle-1.6.3.tar.xz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ waffle.spec ++++++ --- /var/tmp/diff_new_pack.wBpIYp/_old 2021-02-25 18:30:16.802291265 +0100 +++ /var/tmp/diff_new_pack.wBpIYp/_new 2021-02-25 18:30:16.806291269 +0100 @@ -20,7 +20,7 @@ %define _minorVersion 0 %define libname lib%{name}-%{_majorVersion}-%{_minorVersion} Name: waffle -Version: 1.6.1 +Version: 1.6.3 Release: 0 Summary: C library defering selection of GL API and window system until runtime License: BSD-2-Clause ++++++ waffle-1.6.1.tar.xz -> waffle-1.6.3.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/waffle-1.6.1/.gitlab-ci.yml new/waffle-1.6.3/.gitlab-ci.yml --- old/waffle-1.6.1/.gitlab-ci.yml 2020-03-31 13:47:39.000000000 +0200 +++ new/waffle-1.6.3/.gitlab-ci.yml 2021-02-24 12:48:58.000000000 +0100 @@ -1,16 +1,17 @@ variables: - UPSTREAM_REPO: mesa/waffle + FDO_UPSTREAM_REPO: mesa/waffle + FDO_DISTRIBUTION_TAG: '2020-07-28' + FDO_DISTRIBUTION_VERSION: 'buster-slim' include: - - project: 'wayland/ci-templates' - ref: f69acac60d5dde0410124fd5674764600821b7a6 + - project: 'freedesktop/ci-templates' + ref: &ci-templates-sha 52dd4a94044449c8481d18dcdc221a3c636366d2 file: '/templates/debian.yml' stages: - container - build - # When to automatically run the CI .ci-run-policy: retry: @@ -20,20 +21,16 @@ # Cancel CI run if a newer commit is pushed to the same branch interruptible: true - -# Debian 10 based x86 build image -x86_build: +container: stage: container extends: - - .debian@container-ifnot-exists + - .fdo.container-build@debian - .ci-run-policy variables: - DEBIAN_VERSION: buster-slim - REPO_SUFFIX: $CI_JOB_NAME # no need to pull the whole repo to build the container image GIT_STRATEGY: none - DEBIAN_TAG: &x86_build "2019-11-22" - DEBIAN_DEBS: >- + + FDO_DISTRIBUTION_PACKAGES: > bash-completion ca-certificates cmake @@ -54,26 +51,23 @@ xauth xsltproc xvfb -.use-x86_build: - variables: - TAG: *x86_build - image: "$CI_REGISTRY_IMAGE/debian/x86_build:$TAG" - needs: - - x86_build - # BUILD - .build: - extends: .ci-run-policy + extends: + - .ci-run-policy + - .fdo.container-build@debian stage: build variables: GIT_DEPTH: 100 + image: "$CI_REGISTRY_IMAGE/debian/$FDO_DISTRIBUTION_VERSION:$FDO_DISTRIBUTION_TAG" + needs: + - container + meson: extends: - .build - - .use-x86_build script: - bash .gitlab-ci/build-meson.sh x11 - bash .gitlab-ci/build-meson.sh wayland @@ -87,7 +81,6 @@ cmake: extends: - .build - - .use-x86_build script: - cmake -G Ninja diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/waffle-1.6.1/Android.mk new/waffle-1.6.3/Android.mk --- old/waffle-1.6.1/Android.mk 2020-03-31 13:47:39.000000000 +0200 +++ new/waffle-1.6.3/Android.mk 2021-02-24 12:48:58.000000000 +0100 @@ -8,7 +8,7 @@ # waffle_major_version := 1 waffle_minor_version := 6 -waffle_patch_version := 1 +waffle_patch_version := 3 waffle_api_version := 0x0106 waffle_android_major_version := $(word 1, $(subst ., , $(PLATFORM_VERSION))) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/waffle-1.6.1/cmake/Modules/WaffleDefineCompilerFlags.cmake new/waffle-1.6.3/cmake/Modules/WaffleDefineCompilerFlags.cmake --- old/waffle-1.6.1/cmake/Modules/WaffleDefineCompilerFlags.cmake 2020-03-31 13:47:39.000000000 +0200 +++ new/waffle-1.6.3/cmake/Modules/WaffleDefineCompilerFlags.cmake 2021-02-24 12:48:58.000000000 +0100 @@ -104,7 +104,7 @@ endif() if(waffle_on_mac) - add_definitions(-DWAFFLE_HAS_CGL) + add_definitions(-DWAFFLE_HAS_CGL -DGL_SILENCE_DEPRECATION) endif() if(waffle_on_linux) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/waffle-1.6.1/cmake/Modules/WaffleDefineVersion.cmake new/waffle-1.6.3/cmake/Modules/WaffleDefineVersion.cmake --- old/waffle-1.6.1/cmake/Modules/WaffleDefineVersion.cmake 2020-03-31 13:47:39.000000000 +0200 +++ new/waffle-1.6.3/cmake/Modules/WaffleDefineVersion.cmake 2021-02-24 12:48:58.000000000 +0100 @@ -40,7 +40,7 @@ # set(waffle_major_version "1") set(waffle_minor_version "6") -set(waffle_patch_version "1") +set(waffle_patch_version "3") set(waffle_version "${waffle_major_version}.${waffle_minor_version}.${waffle_patch_version}") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/waffle-1.6.1/doc/release-notes/waffle-1.6.2.md new/waffle-1.6.3/doc/release-notes/waffle-1.6.2.md --- old/waffle-1.6.1/doc/release-notes/waffle-1.6.2.md 1970-01-01 01:00:00.000000000 +0100 +++ new/waffle-1.6.3/doc/release-notes/waffle-1.6.2.md 2021-02-24 12:48:58.000000000 +0100 @@ -0,0 +1,42 @@ +# Waffle 1.6.2 Release Notes + +## Fixes since 1.6.1 + +* apple: Silence deprecation warnings +* apple: cmocka: include librt only when present + +* gbm: pass valid arguments to gbm_surface_create_with_modifiers + +* wflinfo: window: use glGetStringi() when available +* wflinfo: meson: Install bash-completion file to correct location +* wflinfo: meson: Always install bash-completion file + + +## Features since 1.6.1 + +None. + + +## Changes since 1.6.1 + +Alexey Brodkin (1): + tests/gl_basic_test: fix SURFACELESS_EGL only build + +Emil Velikov (4): + apple: hide GL deprecation warnings + wflinfo: use glGetStringi() only when available + meson: do not replace datadir for bash completion + meson: always install bash-completion file + +Jesse Natalie (1): + meson: Fix meson build if bash-completion not found + +Marek Ol????k (1): + gbm: don't pass invalid arguments to gbm_surface_create_with_modifiers + +Simon Zeni (1): + gitlab-ci: update to latest ci-template + +Yurii Kolesnykov (1): + cmocka: don't require librt, when it's not unavailable + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/waffle-1.6.1/doc/release-notes/waffle-1.6.3.md new/waffle-1.6.3/doc/release-notes/waffle-1.6.3.md --- old/waffle-1.6.1/doc/release-notes/waffle-1.6.3.md 1970-01-01 01:00:00.000000000 +0100 +++ new/waffle-1.6.3/doc/release-notes/waffle-1.6.3.md 2021-02-24 12:48:58.000000000 +0100 @@ -0,0 +1,17 @@ +# Waffle 1.6.3 Release Notes + +## Fixes since 1.6.2 + +* Recreate release tarballs from tag + + +## Features since 1.6.2 + +None. + + +## Changes since 1.6.2 + +Emil Velikov (1): + bump version for 1.6.3 release + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/waffle-1.6.1/meson.build new/waffle-1.6.3/meson.build --- old/waffle-1.6.1/meson.build 2020-03-31 13:47:39.000000000 +0200 +++ new/waffle-1.6.3/meson.build 2021-02-24 12:48:58.000000000 +0100 @@ -27,7 +27,7 @@ project( 'waffle', ['c'], - version : '1.6.1', + version : '1.6.3', license : 'BSD2', meson_version : '>= 0.49', default_options : ['c_std=c99', 'buildtype=debugoptimized'], @@ -109,19 +109,17 @@ dep_bash = dependency('bash-completion', required : false) if dep_bash.found() - install_data( - 'shell-completion/bash/wflinfo', - install_dir : dep_bash.get_pkgconfig_variable( - 'completionsdir', - define_variable : ['datadir', get_option('datadir')]), - ) + bashcompletiondir = dep_bash.get_pkgconfig_variable('completionsdir') +else + bashcompletiondir = join_paths(get_option('datadir'), 'bash-completion/completions') endif +install_data('shell-completion/bash/wflinfo', install_dir : bashcompletiondir) # Set pre-processor flags if build_wgl add_project_arguments('-DWAFFLE_HAS_WGL', language : ['c', 'cpp']) elif build_cgl - add_project_arguments('-DWAFFLE_HAS_CGL', language : ['c', 'obj']) + add_project_arguments('-DWAFFLE_HAS_CGL -DGL_SILENCE_DEPRECATION', language : ['c', 'obj']) else if build_x11_egl add_project_arguments('-DWAFFLE_HAS_X11_EGL', language : ['c', 'cpp']) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/waffle-1.6.1/src/utils/wflinfo.c new/waffle-1.6.3/src/utils/wflinfo.c --- old/waffle-1.6.1/src/utils/wflinfo.c 2020-03-31 13:47:39.000000000 +0200 +++ new/waffle-1.6.3/src/utils/wflinfo.c 2021-02-24 12:48:58.000000000 +0100 @@ -994,7 +994,11 @@ static bool gl_has_extension(const char *name) { - if (gl_get_version() >= 30) { + // Use the new glGetStringi when possible. + // + // Due to the funky semantics of obtaining the function pointer, we can + // get here, even when it is NULL. + if (glGetStringi && gl_get_version() >= 30) { return gl_has_extension_GetStringi(name); } else { return gl_has_extension_GetString(name); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/waffle-1.6.1/src/waffle/gbm/wgbm_window.c new/waffle-1.6.3/src/waffle/gbm/wgbm_window.c --- old/waffle-1.6.1/src/waffle/gbm/wgbm_window.c 2020-03-31 13:47:39.000000000 +0200 +++ new/waffle-1.6.3/src/waffle/gbm/wgbm_window.c 2021-02-24 12:48:58.000000000 +0100 @@ -83,7 +83,7 @@ if (dpy->wegl.EXT_image_dma_buf_import_modifiers && plat->gbm_surface_create_with_modifiers) { EGLint num_modifiers = 0; - uint64_t *modifiers; + uint64_t *modifiers = NULL; if (!plat->wegl.eglQueryDmaBufModifiersEXT(dpy->wegl.egl, format, 0, NULL, @@ -93,14 +93,17 @@ return false; } - modifiers = wcore_calloc(num_modifiers * sizeof(*modifiers)); - if (!plat->wegl.eglQueryDmaBufModifiersEXT(dpy->wegl.egl, format, - num_modifiers, modifiers, - NULL, &num_modifiers)) { - wcore_errorf(WAFFLE_ERROR_UNKNOWN, - "eglQueryDmaBufModifiersEXT failed"); - free(modifiers); - return false; + if (num_modifiers) { + modifiers = wcore_calloc(num_modifiers * sizeof(*modifiers)); + + if (!plat->wegl.eglQueryDmaBufModifiersEXT(dpy->wegl.egl, format, + num_modifiers, modifiers, + NULL, &num_modifiers)) { + wcore_errorf(WAFFLE_ERROR_UNKNOWN, + "eglQueryDmaBufModifiersEXT failed"); + free(modifiers); + return false; + } } self->gbm_surface = diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/waffle-1.6.1/tests/functional/gl_basic_test.c new/waffle-1.6.3/tests/functional/gl_basic_test.c --- old/waffle-1.6.1/tests/functional/gl_basic_test.c 2020-03-31 13:47:39.000000000 +0200 +++ new/waffle-1.6.3/tests/functional/gl_basic_test.c 2021-02-24 12:48:58.000000000 +0100 @@ -802,6 +802,7 @@ #if defined(WAFFLE_HAS_GBM) || \ defined(WAFFLE_HAS_GLX) || \ + defined(WAFFLE_HAS_SURFACELESS_EGL) || \ defined(WAFFLE_HAS_WAYLAND) || \ defined(WAFFLE_HAS_X11_EGL) || \ defined(WAFFLE_HAS_WGL) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/waffle-1.6.1/third_party/cmocka/ConfigureChecks.cmake new/waffle-1.6.3/third_party/cmocka/ConfigureChecks.cmake --- old/waffle-1.6.1/third_party/cmocka/ConfigureChecks.cmake 2020-03-31 13:47:39.000000000 +0200 +++ new/waffle-1.6.3/third_party/cmocka/ConfigureChecks.cmake 2021-02-24 12:48:58.000000000 +0100 @@ -120,7 +120,9 @@ endif(WIN32) if (HAVE_TIME_H AND HAVE_STRUCT_TIMESPEC AND HAVE_CLOCK_GETTIME) - set(CMAKE_REQUIRED_LIBRARIES ${RT_LIBRARY}) + if (RT_LIBRARY) + set(CMAKE_REQUIRED_LIBRARIES ${RT_LIBRARY}) + endif() message(STATUS "CMAKE_REQUIRED_INCLUDES=${CMAKE_REQUIRED_INCLUDES} CMAKE_REQUIRED_LIBRARIES=${CMAKE_REQUIRED_LIBRARIES}") check_c_source_compiles("
