Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package waffle for openSUSE:Factory checked in at 2023-03-06 18:55:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/waffle (Old) and /work/SRC/openSUSE:Factory/.waffle.new.31432 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "waffle" Mon Mar 6 18:55:15 2023 rev:11 rq:1069489 version:1.7.2 Changes: -------- --- /work/SRC/openSUSE:Factory/waffle/waffle.changes 2023-03-02 23:04:57.056287772 +0100 +++ /work/SRC/openSUSE:Factory/.waffle.new.31432/waffle.changes 2023-03-06 18:55:16.868581983 +0100 @@ -1,0 +2,8 @@ +Sun Mar 5 21:31:46 UTC 2023 - Stefan Dirsch <[email protected]> + +- Update to release 1.7.2 + * all: use format(gnu_printf), enable in mingw + * meson: don't run TLS checks on mingw + * wgl: remove unused dummy wgl_error.[ch] + +------------------------------------------------------------------- Old: ---- waffle-1.7.1.tar.xz New: ---- waffle-1.7.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ waffle.spec ++++++ --- /var/tmp/diff_new_pack.k4bQLe/_old 2023-03-06 18:55:17.436584881 +0100 +++ /var/tmp/diff_new_pack.k4bQLe/_new 2023-03-06 18:55:17.444584922 +0100 @@ -20,7 +20,7 @@ %define _minorVersion 0 %define libname lib%{name}-%{_majorVersion}-%{_minorVersion} Name: waffle -Version: 1.7.1 +Version: 1.7.2 Release: 0 Summary: C library defering selection of GL API and window system until runtime License: BSD-2-Clause ++++++ waffle-1.7.1.tar.xz -> waffle-1.7.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/waffle-1.7.1/Android.mk new/waffle-1.7.2/Android.mk --- old/waffle-1.7.1/Android.mk 2023-03-02 15:22:17.000000000 +0100 +++ new/waffle-1.7.2/Android.mk 2023-03-05 19:43:59.000000000 +0100 @@ -8,7 +8,7 @@ # waffle_major_version := 1 waffle_minor_version := 7 -waffle_patch_version := 1 +waffle_patch_version := 2 waffle_api_version := 0x0107 waffle_android_major_version := $(word 1, $(subst ., , $(PLATFORM_VERSION))) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/waffle-1.7.1/cmake/Modules/WaffleDefineVersion.cmake new/waffle-1.7.2/cmake/Modules/WaffleDefineVersion.cmake --- old/waffle-1.7.1/cmake/Modules/WaffleDefineVersion.cmake 2023-03-02 15:22:17.000000000 +0100 +++ new/waffle-1.7.2/cmake/Modules/WaffleDefineVersion.cmake 2023-03-05 19:43:59.000000000 +0100 @@ -40,7 +40,7 @@ # set(waffle_major_version "1") set(waffle_minor_version "7") -set(waffle_patch_version "1") +set(waffle_patch_version "2") 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.7.1/doc/release-notes/waffle-1.7.2.md new/waffle-1.7.2/doc/release-notes/waffle-1.7.2.md --- old/waffle-1.7.1/doc/release-notes/waffle-1.7.2.md 1970-01-01 01:00:00.000000000 +0100 +++ new/waffle-1.7.2/doc/release-notes/waffle-1.7.2.md 2023-03-05 19:43:59.000000000 +0100 @@ -0,0 +1,25 @@ + +The Waffle bugfix release 1.7.2 is now available. + +What is new in this release: + - all: use format(gnu_printf), enable in mingw + - meson: don't run TLS checks on mingw + - wgl: remove unused dummy wgl_error.[ch] + +The source is available at: + + https://waffle.freedesktop.org/files/release/waffle-1.7.2/waffle-1.7.2.tar.xz + +You can also get the current source directly from the git +repository. See https://waffle.freedesktop.org for details. + +---------------------------------------------------------------- + +Changes since 1.7.1: + +Emil Velikov (4): + meson: don't run TLS checks on mingw + wgl: remove unused dummy wgl_error.[ch] + all: use format(gnu_printf), enable in mingw + waffle: Bump version to 1.7.2 + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/waffle-1.7.1/examples/gl_basic.c new/waffle-1.7.2/examples/gl_basic.c --- old/waffle-1.7.1/examples/gl_basic.c 2023-03-02 15:22:17.000000000 +0100 +++ new/waffle-1.7.2/examples/gl_basic.c 2023-03-05 19:43:59.000000000 +0100 @@ -133,12 +133,15 @@ #endif #if defined(__GNUC__) -#define PRINTFLIKE(f, a) __attribute__((__format__(__printf__, f, a))) +#define PRINTFLIKE(f, a) __attribute__((format(gnu_printf, f, a))) #else #define PRINTFLIKE(f, a) #endif -static void NORETURN PRINTFLIKE(1, 2) error_printf(const char *fmt, ...) +// clang-format off +static void NORETURN PRINTFLIKE(1, 2) +error_printf(const char *fmt, ...) +// clang-format on { va_list ap; @@ -153,7 +156,10 @@ exit(EXIT_FAILURE); } -static void NORETURN PRINTFLIKE(1, 2) usage_error_printf(const char *fmt, ...) +// clang-format off +static void NORETURN PRINTFLIKE(1, 2) +usage_error_printf(const char *fmt, ...) +// clang-format on { fflush(stdout); fprintf(stderr, "gl_basic: usage error"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/waffle-1.7.1/meson.build new/waffle-1.7.2/meson.build --- old/waffle-1.7.1/meson.build 2023-03-02 15:22:17.000000000 +0100 +++ new/waffle-1.7.2/meson.build 2023-03-05 19:43:59.000000000 +0100 @@ -28,7 +28,7 @@ project( 'waffle', ['c'], - version : '1.7.1', + version : '1.7.2', license : 'BSD2', meson_version : '>= 0.51', # ubproject cmocka throws a Wclobbered ... make this a level=2 once it's fixed @@ -185,28 +185,6 @@ endif if cc.get_argument_syntax() == 'gcc' - if cc.compiles(''' - static __thread int x; - int main() { - x = 42; - return x; - }''', - args : '-Werror', - name : 'Thread Local Storage') - add_project_arguments('-DWAFFLE_HAS_TLS', language : ['c', 'cpp']) - - if cc.compiles(''' - static __thread int x __attribute__((tls_model("initial-exec"))); - int main() { - x = 42; - return x; - }''', - args : '-Werror', - name : 'TLS model "Initial Exec"') - add_project_arguments('-DWAFFLE_HAS_TLS_MODEL_INITIAL_EXEC', language : ['c', 'cpp']) - endif - endif - add_project_arguments('-D_XOPEN_SOURCE=700', language : ['c', 'cpp']) if not build_nacl @@ -236,8 +214,31 @@ ]), language : ['c', 'cpp'], ) - - if host_machine.system() == 'windows' + + # Closest thing we can get to a mingw check + if host_machine.system() != 'windows' + if cc.compiles(''' + static __thread int x; + int main() { + x = 42; + return x; + }''', + args : '-Werror', + name : 'Thread Local Storage') + add_project_arguments('-DWAFFLE_HAS_TLS', language : ['c']) + endif + + if cc.compiles(''' + static __thread int x __attribute__((tls_model("initial-exec"))); + int main() { + x = 42; + return x; + }''', + args : '-Werror', + name : 'TLS model "Initial Exec"') + add_project_arguments('-DWAFFLE_HAS_TLS_MODEL_INITIAL_EXEC', language : ['c']) + endif + else if cc.has_argument('-static-libgcc') add_project_link_arguments('-static-libgcc', language : ['c', 'cpp']) endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/waffle-1.7.1/src/utils/wflinfo.c new/waffle-1.7.2/src/utils/wflinfo.c --- old/waffle-1.7.1/src/utils/wflinfo.c 2023-03-02 15:22:17.000000000 +0100 +++ new/waffle-1.7.2/src/utils/wflinfo.c 2023-03-05 19:43:59.000000000 +0100 @@ -140,7 +140,7 @@ #endif #if defined(__GNUC__) -#define PRINTFLIKE(f, a) __attribute__((__format__(__printf__, f, a))) +#define PRINTFLIKE(f, a) __attribute__((format(gnu_printf, f, a))) #else #define PRINTFLIKE(f, a) #endif @@ -173,7 +173,10 @@ exit(exit_code); } -static void NORETURN PRINTFLIKE(1, 2) usage_error_printf(const char *fmt, ...) +// clang-format off +static void NORETURN PRINTFLIKE(1, 2) +usage_error_printf(const char *fmt, ...) +// clang-format on { fprintf(stderr, "Wflinfo usage error: "); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/waffle-1.7.1/src/waffle/CMakeLists.txt new/waffle-1.7.2/src/waffle/CMakeLists.txt --- old/waffle-1.7.1/src/waffle/CMakeLists.txt 2023-03-02 15:22:17.000000000 +0100 +++ new/waffle-1.7.2/src/waffle/CMakeLists.txt 2023-03-05 19:43:59.000000000 +0100 @@ -205,7 +205,6 @@ wgl/wgl_context.c wgl/wgl_display.c wgl/wgl_dl.c - wgl/wgl_error.c wgl/wgl_platform.c wgl/wgl_window.c ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/waffle-1.7.1/src/waffle/core/wcore_error.h new/waffle-1.7.2/src/waffle/core/wcore_error.h --- old/waffle-1.7.1/src/waffle/core/wcore_error.h 2023-03-02 15:22:17.000000000 +0100 +++ new/waffle-1.7.2/src/waffle/core/wcore_error.h 2023-03-05 19:43:59.000000000 +0100 @@ -30,7 +30,7 @@ #include "waffle.h" #if defined(__GNUC__) -#define WCORE_PRINTFLIKE(f, a) __attribute__((__format__(__printf__, f, a))) +#define WCORE_PRINTFLIKE(f, a) __attribute__((format(gnu_printf, f, a))) #else #define WCORE_PRINTFLIKE(f, a) #endif @@ -62,15 +62,20 @@ /// /// @param error is an `enum waffle_error`. /// @param format may be null. +// clang-format off void WCORE_PRINTFLIKE(2, 3) - wcore_errorf(enum waffle_error error, const char *format, ...); +wcore_errorf(enum waffle_error error, const char *format, ...); +// clang-format on /// @brief Emit error for errno. /// /// Set error code to WAFFLE_ERROR_UNKNOWN and place the output of /// strerror() in the error message. If \a format is not null, /// then prepend the strerror() message with "${format}: ". -void WCORE_PRINTFLIKE(1, 2) wcore_error_errno(const char *format, ...); +// clang-format off +void WCORE_PRINTFLIKE(1, 2) +wcore_error_errno(const char *format, ...); +// clang-format on /// @brief Emit WAFFLE_ERROR_BAD_ATTRIBUTE with a default error message. void @@ -96,8 +101,10 @@ const struct waffle_error_info* wcore_error_get_info(void); +// clang-format off void WCORE_PRINTFLIKE(3, 4) - _wcore_error_internal(const char *file, int line, const char *format, ...); +_wcore_error_internal(const char *file, int line, const char *format, ...); +// clang-format on void _wcore_error_enable(void); void _wcore_error_disable(void); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/waffle-1.7.1/src/waffle/meson.build new/waffle-1.7.2/src/waffle/meson.build --- old/waffle-1.7.1/src/waffle/meson.build 2023-03-02 15:22:17.000000000 +0100 +++ new/waffle-1.7.2/src/waffle/meson.build 2023-03-05 19:43:59.000000000 +0100 @@ -172,7 +172,6 @@ 'wgl/wgl_context.c', 'wgl/wgl_display.c', 'wgl/wgl_dl.c', - 'wgl/wgl_error.c', 'wgl/wgl_platform.c', 'wgl/wgl_window.c', ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/waffle-1.7.1/src/waffle/wgl/wgl_config.c new/waffle-1.7.2/src/waffle/wgl/wgl_config.c --- old/waffle-1.7.1/src/waffle/wgl/wgl_config.c 2023-03-02 15:22:17.000000000 +0100 +++ new/waffle-1.7.2/src/waffle/wgl/wgl_config.c 2023-03-05 19:43:59.000000000 +0100 @@ -34,7 +34,6 @@ #include "wgl_config.h" #include "wgl_context.h" #include "wgl_display.h" -#include "wgl_error.h" #include "wgl_platform.h" #include "wgl_window.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/waffle-1.7.1/src/waffle/wgl/wgl_context.c new/waffle-1.7.2/src/waffle/wgl/wgl_context.c --- old/waffle-1.7.1/src/waffle/wgl/wgl_context.c 2023-03-02 15:22:17.000000000 +0100 +++ new/waffle-1.7.2/src/waffle/wgl/wgl_context.c 2023-03-05 19:43:59.000000000 +0100 @@ -32,7 +32,6 @@ #include "wgl_config.h" #include "wgl_context.h" #include "wgl_display.h" -#include "wgl_error.h" #include "wgl_window.h" bool diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/waffle-1.7.1/src/waffle/wgl/wgl_error.c new/waffle-1.7.2/src/waffle/wgl/wgl_error.c --- old/waffle-1.7.1/src/waffle/wgl/wgl_error.c 2023-03-02 15:22:17.000000000 +0100 +++ new/waffle-1.7.2/src/waffle/wgl/wgl_error.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,48 +0,0 @@ -// Copyright 2014 Emil Velikov -// -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are met: -// -// - Redistributions of source code must retain the above copyright notice, this -// list of conditions and the following disclaimer. -// -// - 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. - -#include <assert.h> -#include <stdbool.h> -#include <stdlib.h> - -#include "wcore_error.h" - -#include "wgl_error.h" - -const char* -wgl_error_to_string(int error_code) -{ - return NULL; -} - -void -wgl_error_failed_func(const char *func_name, int error_code) -{ - wcore_errorf(WAFFLE_ERROR_UNKNOWN, - "%s failed with %s: %s", - func_name, - wgl_error_to_string(error_code), - NULL); -} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/waffle-1.7.1/src/waffle/wgl/wgl_error.h new/waffle-1.7.2/src/waffle/wgl/wgl_error.h --- old/waffle-1.7.1/src/waffle/wgl/wgl_error.h 2023-03-02 15:22:17.000000000 +0100 +++ new/waffle-1.7.2/src/waffle/wgl/wgl_error.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,32 +0,0 @@ -// Copyright 2014 Emil Velikov -// -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are met: -// -// - Redistributions of source code must retain the above copyright notice, this -// list of conditions and the following disclaimer. -// -// - 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. - -#pragma once - -const char* -wgl_error_to_string(int error_code); - -void -wgl_error_failed_func(const char *func_name, int error_code); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/waffle-1.7.1/tests/functional/gl_basic_test.c new/waffle-1.7.2/tests/functional/gl_basic_test.c --- old/waffle-1.7.1/tests/functional/gl_basic_test.c 2023-03-02 15:22:17.000000000 +0100 +++ new/waffle-1.7.2/tests/functional/gl_basic_test.c 2023-03-05 19:43:59.000000000 +0100 @@ -1084,7 +1084,7 @@ #endif #if defined(__GNUC__) -#define PRINTFLIKE(f, a) __attribute__((__format__(__printf__, f, a))) +#define PRINTFLIKE(f, a) __attribute__((format(gnu_printf, f, a))) #else #define PRINTFLIKE(f, a) #endif @@ -1106,7 +1106,10 @@ { .name = "help", .has_arg = no_argument, .val = OPT_HELP }, }; -static void NORETURN PRINTFLIKE(1, 2) usage_error_printf(const char *fmt, ...) +// clang-format off +static void NORETURN PRINTFLIKE(1, 2) +usage_error_printf(const char *fmt, ...) +// clang-format on { fprintf(stderr, "gl_basic_test usage error: ");
