Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package babl for openSUSE:Factory checked in at 2021-07-15 23:59:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/babl (Old) and /work/SRC/openSUSE:Factory/.babl.new.2625 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "babl" Thu Jul 15 23:59:05 2021 rev:56 rq:906407 version:0.1.88 Changes: -------- --- /work/SRC/openSUSE:Factory/babl/babl.changes 2021-03-29 18:21:26.354241461 +0200 +++ /work/SRC/openSUSE:Factory/.babl.new.2625/babl.changes 2021-07-15 23:59:20.370011782 +0200 @@ -1,0 +2,7 @@ +Tue Jul 13 14:39:30 UTC 2021 - Dominique Leuenberger <[email protected]> + +- Update to version 0.1.88: + + Consistency fixes to format names, in particular for palettized + formats. + +------------------------------------------------------------------- Old: ---- babl-0.1.86.tar.xz New: ---- babl-0.1.88.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ babl.spec ++++++ --- /var/tmp/diff_new_pack.VpU33G/_old 2021-07-15 23:59:21.054006282 +0200 +++ /var/tmp/diff_new_pack.VpU33G/_new 2021-07-15 23:59:21.058006250 +0200 @@ -19,7 +19,7 @@ %define debug_package_requires libbabl-0_1-0 = %{version}-%{release} Name: babl -Version: 0.1.86 +Version: 0.1.88 Release: 0 Summary: Dynamic Pixel Format Translation Library License: GPL-3.0-or-later AND LGPL-3.0-or-later ++++++ babl-0.1.86.tar.xz -> babl-0.1.88.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/babl-0.1.86/NEWS new/babl-0.1.88/NEWS --- old/babl-0.1.86/NEWS 2021-02-26 13:07:12.675609600 +0100 +++ new/babl-0.1.88/NEWS 2021-07-01 03:32:20.170667600 +0200 @@ -3,6 +3,9 @@ the news section both in the README and the webpage. --> +2021-07-01 babl-0.1.88 </dt><dd> +Consistency fixes to format names, in particular for palettized formats. + 2021-02-26 babl-0.1.86 </dt><dd> input-class (scanner/RGB) ICC profiles are valid for creating RGB spaces. improved thread safety for babl_space_from_icc diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/babl-0.1.86/babl/babl/meson.build new/babl-0.1.88/babl/babl/meson.build --- old/babl-0.1.86/babl/babl/meson.build 1970-01-01 01:00:00.000000000 +0100 +++ new/babl-0.1.88/babl/babl/meson.build 2021-07-01 03:32:20.182668000 +0200 @@ -0,0 +1,9 @@ +# Copy the public headers here for subproject builds. + +foreach _hdr : babl_headers + configure_file( + input: _hdr, + output: '@PLAINNAME@', + copy: true, + ) +endforeach diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/babl-0.1.86/babl/babl-fish-path.c new/babl-0.1.88/babl/babl-fish-path.c --- old/babl-0.1.86/babl/babl-fish-path.c 2021-02-26 13:07:12.679609500 +0100 +++ new/babl-0.1.88/babl/babl-fish-path.c 2021-07-01 03:32:20.174667800 +0200 @@ -406,6 +406,7 @@ babl_remodel_with_space ( (void*)conv->destination, (void*)space), "linear", conv->function.linear, + "data", conv->data, NULL); break; case BABL_CONVERSION_PLANAR: @@ -415,6 +416,7 @@ babl_remodel_with_space ( (void*)conv->destination, (void*)space), "planar", conv->function.planar, + "data", conv->data, NULL); break; case BABL_CONVERSION_PLANE: @@ -424,6 +426,7 @@ babl_remodel_with_space ( (void*)conv->destination, (void*)space), "plane", conv->function.plane, + "data", conv->data, NULL); break; default: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/babl-0.1.86/babl/babl-format.c new/babl-0.1.88/babl/babl-format.c --- old/babl-0.1.86/babl/babl-format.c 2021-02-26 13:07:12.679609500 +0100 +++ new/babl-0.1.88/babl/babl-format.c 2021-07-01 03:32:20.174667800 +0200 @@ -468,16 +468,18 @@ va_end (varg); if (!name) - name = create_name (model, components, component, type); + { + name = create_name (model, components, component, type); - if (space != babl_space ("sRGB")) - { - char *new_name = babl_malloc (strlen (name) + - strlen (babl_get_name ((Babl*)space)) + 1); - sprintf (new_name, "%s-%s", name, babl_get_name ((Babl*)space)); - babl_free (name); - name = new_name; - } + if (space != babl_space ("sRGB")) + { + char *new_name = babl_malloc (strlen (name) + + strlen (babl_get_name ((Babl*)space)) + 1); + sprintf (new_name, "%s-%s", name, babl_get_name ((Babl*)space)); + babl_free (name); + name = new_name; + } + } if (!model) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/babl-0.1.86/babl/babl-palette.c new/babl-0.1.88/babl/babl-palette.c --- old/babl-0.1.86/babl/babl-palette.c 2021-02-26 13:07:12.683609700 +0100 +++ new/babl-0.1.88/babl/babl-palette.c 2021-07-01 03:32:20.178667800 +0200 @@ -831,6 +831,10 @@ *palptr = default_palette ();; cname[0] = 'v'; model_no_alpha = babl_model_new ("name", name, component, NULL); + + babl_set_user_data (model, palptr); + babl_set_user_data (model_no_alpha, palptr); + cname[0] = '\\'; f_pal_a_u8 = (void*) babl_format_new ("name", name, model, space, babl_type ("u8"), @@ -924,9 +928,6 @@ "data", palptr, NULL); - babl_set_user_data (model, palptr); - babl_set_user_data (model_no_alpha, palptr); - if (format_u8) *format_u8 = f_pal_u8; if (format_u8_with_alpha) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/babl-0.1.86/babl/git-version.h new/babl-0.1.88/babl/git-version.h --- old/babl-0.1.86/babl/git-version.h 2021-02-26 13:07:12.859612200 +0100 +++ new/babl-0.1.88/babl/git-version.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,6 +0,0 @@ -#ifndef __GIT_VERSION_H__ -#define __GIT_VERSION_H__ - -#define BABL_GIT_VERSION "BABL_0_1_86" - -#endif /* __GIT_VERSION_H__ */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/babl-0.1.86/babl/git-version.h.in new/babl-0.1.88/babl/git-version.h.in --- old/babl-0.1.86/babl/git-version.h.in 2021-02-26 13:07:12.687609700 +0100 +++ new/babl-0.1.88/babl/git-version.h.in 1970-01-01 01:00:00.000000000 +0100 @@ -1,6 +0,0 @@ -#ifndef __GIT_VERSION_H__ -#define __GIT_VERSION_H__ - -#define BABL_GIT_VERSION "@BABL_GIT_VERSION@" - -#endif /* __GIT_VERSION_H__ */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/babl-0.1.86/babl/meson.build new/babl-0.1.88/babl/meson.build --- old/babl-0.1.86/babl/meson.build 2021-02-26 13:07:12.687609700 +0100 +++ new/babl-0.1.88/babl/meson.build 2021-07-01 03:32:20.182668000 +0200 @@ -54,43 +54,14 @@ babl_link_args += no_undefined endif +# sources babl_version_h = configure_file( input: 'babl-version.h.in', output: 'babl-version.h', configuration: conf, ) -# If git is available, always check if git-version.h should be -# updated. If git is not available, don't do anything if git-version.h -# already exists because then we are probably working with a tarball -# in which case the git-version.h we ship is correct. -if git_bin.found() and run_command( - git_bin, - 'rev-parse', - '--is-inside-work-tree', -).returncode() == 0 - git_version_h = vcs_tag( - input : 'git-version.h.in', - output: 'git-version.h', - replace_string: '@BABL_GIT_VERSION@', - command: [ git_bin.path(), 'describe', '--always' ], - ) - - if env_bin.found() and not meson.is_subproject() - meson.add_dist_script( - [ 'ninja', 'babl/git-version.h', ], - ) - meson.add_dist_script( - [ 'sh', '-c', ' '.join( - [ 'cp', git_version_h.full_path(), '${MESON_DIST_ROOT}/babl' ] - )] - ) - endif -else - git_version_h = files('git-version.h') -endif - -babl_sources = [ +babl_sources = files( 'babl-cache.c', 'babl-component.c', 'babl-conversion.c', @@ -123,25 +94,34 @@ 'babl-util.c', 'babl-version.c', 'babl.c', +) + [ babl_version_h, git_version_h, ] -babl_headers = [ +babl_headers = files( 'babl-introspect.h', 'babl-macros.h', 'babl-types.h', 'babl.h', +) + [ babl_version_h, ] install_headers(babl_headers, - subdir: join_paths(lib_name, 'babl') + subdir: lib_name / 'babl' ) +# copy external headers to babl subdirectory for subproject builds as +# we don't want to expose the project root folder due to potential +# name clashes. +if meson.is_subproject() + subdir('babl') +endif babl_deps = [math, thread, dl, lcms] babl_includes = [rootInclude, bablBaseInclude] +# build library babl = library( lib_name, babl_sources, @@ -155,12 +135,6 @@ install: true, ) -libbabl_dep = declare_dependency( - include_directories: babl_includes, - link_with: babl, - dependencies: babl_deps -) - if build_gir # identity filter, so GIR doesn't choke on the Babl type # (since it has the same name as the Babl namespace) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/babl-0.1.86/docs/meson.build new/babl-0.1.88/docs/meson.build --- old/babl-0.1.86/docs/meson.build 2021-02-26 13:07:12.691609900 +0100 +++ new/babl-0.1.88/docs/meson.build 2021-07-01 03:32:20.186668000 +0200 @@ -1,10 +1,5 @@ subdir('graphics') -host = 'pippin.gimp.org' -location= 'public_html/babl' -scptarget = host + ':' + location + '/' - - xml_insert = find_program( xml_insert_file, native: true @@ -100,12 +95,3 @@ index_html = _tgt endif endforeach - - -run_target('push_web', - command: [ - 'scp', index_html, index_static_html, babl_css, scptarget, - '&&', - 'scp', graphic_files_install, scptarget + 'graphics/' - ], -) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/babl-0.1.86/git-version.h new/babl-0.1.88/git-version.h --- old/babl-0.1.86/git-version.h 1970-01-01 01:00:00.000000000 +0100 +++ new/babl-0.1.88/git-version.h 2021-07-01 03:32:20.550671600 +0200 @@ -0,0 +1,6 @@ +#ifndef __BABL_GIT_VERSION_H__ +#define __BABL_GIT_VERSION_H__ + +#define BABL_GIT_VERSION "BABL_0_1_88" + +#endif /* __BABL_GIT_VERSION_H__ */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/babl-0.1.86/git-version.h.in new/babl-0.1.88/git-version.h.in --- old/babl-0.1.86/git-version.h.in 1970-01-01 01:00:00.000000000 +0100 +++ new/babl-0.1.88/git-version.h.in 2021-07-01 03:32:20.194668000 +0200 @@ -0,0 +1,6 @@ +#ifndef __BABL_GIT_VERSION_H__ +#define __BABL_GIT_VERSION_H__ + +#define BABL_GIT_VERSION "@BABL_GIT_VERSION@" + +#endif /* __BABL_GIT_VERSION_H__ */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/babl-0.1.86/meson.build new/babl-0.1.88/meson.build --- old/babl-0.1.86/meson.build 2021-02-26 13:07:12.695609800 +0100 +++ new/babl-0.1.88/meson.build 2021-07-01 03:32:20.194668000 +0200 @@ -1,6 +1,6 @@ project('babl', 'c', license: 'LGPL3+', - version: '0.1.86', + version: '0.1.88', meson_version: '>=0.54.0', default_options: [ 'buildtype=debugoptimized' @@ -30,6 +30,9 @@ babl_prefix = get_option('prefix') babl_libdir = join_paths(babl_prefix, get_option('libdir')) +project_build_root = meson.current_build_dir() +project_source_root = meson.current_source_dir() + ################################################################################ # Projects infos @@ -409,12 +412,46 @@ ################################################################################ # Configuration files +# This should not be made visible in babl_dep due to possible name clash +# when built as a sub-project. +rootInclude = include_directories('.') + # config.h configure_file( output: 'config.h', configuration: conf ) +# If git is available, always check if git-version.h should be +# updated. If git is not available, don't do anything if git-version.h +# already exists because then we are probably working with a tarball +# in which case the git-version.h we ship is correct. +if git_bin.found() and run_command( + git_bin, + 'rev-parse', + '--is-inside-work-tree', +).returncode() == 0 + git_version_h = vcs_tag( + input : 'git-version.h.in', + output: 'git-version.h', + replace_string: '@BABL_GIT_VERSION@', + command: [ git_bin.path(), 'describe', '--always' ], + ) + + if not meson.is_subproject() + meson.add_dist_script( + [ 'ninja', 'git-version.h', ], + ) + meson.add_dist_script( + [ 'sh', '-c', ' '.join( + [ 'cp', git_version_h.full_path(), '${MESON_DIST_ROOT}' ] + )] + ) + endif +else + git_version_h = files('git-version.h') +endif + ################################################################################ # Global variables @@ -428,8 +465,6 @@ ################################################################################ # Subdirs -rootInclude = include_directories('.') - subdir('babl') subdir('extensions') subdir('tests') @@ -456,17 +491,31 @@ # pkg-config file -pkgconfig.generate(babl, +pkgconfig.generate( + babl, filebase: 'babl', name: 'babl', description: 'Pixel encoding and color space conversion engine.', version: meson.project_version(), - libraries_private: [ - '-lm', + subdirs: lib_name, + uninstalled_variables: [ + 'babl_path=@0@'.format(babl_extensions_build_dir), + 'babl_libdir=@0@'.format(babl_library_build_dir), ], - subdirs: [ - lib_name, +) + +# dependency for wrap builds +babl_dep = declare_dependency( + include_directories: bablInclude, + link_with : babl, + sources: [ + babl_version_h, + is_variable('babl_gir') ? babl_gir : [] ], + variables: { + 'babl_path' : babl_extensions_build_dir, + 'babl_libdir' : babl_library_build_dir, + }, ) ################################################################################
