From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2119.outbound.protection.outlook.com [40.107.237.119]) by sourceware.org (Postfix) with ESMTPS id 11638385DC32 for ; Mon, 25 May 2020 22:18:55 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 11638385DC32 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CjmEqWkMWrxPFnW/V7CfeXz4HUWh/1hzjRKv0mggdIv6lpgRU9+S0Qjfao7wm9YjU7tq0dM7GsPYyokJFy8bDRi2ulWWWeB4BZOZ4gYTcIXvPEOBfeH+Pbo5a3ZffcdGgc9di3Bp2WfmsLb4SL897BMTqfZJkrxaiyRPzxKcmQbjQrSC2R/ueffqK6x7p5xY/tarjeNiwvDHlzu2AEdMjlQPSScRInjGOzidBny6An2Rm/7Ebc8MKXC8dTbErADkmg1UFNeTzLcQx2CEJMW1i436TlK5lgGhLa/cZHFCwgYn3F2v5eznTgwXciYs0FHVwvUj3pyijKchvyD1MIduTQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=fhK+Ngh4oQda1Jffwu2iF20G0grSmhIEa5k9v96BNEM=; b=mm5QhW1f1jJr25SHswaKstgZcHwA1p4QRbh8bW6LmpLp7ftG7Lj96ars959FkabkbjUYki4XeFjCUhRyBcvKWQ7WOpjoXB8ggIiZBV3H5TB1CGJ0U89NTUubPUXNqOlUiT6YzgsAKqOT8s7Xfbxy8kPMP4p1OlWAj8mB4zGvuygX+O+KyRu4mRojJIxCO+cw6rV1H6TTh4WjyF7RXxpVvt2cI0KE4O2nH6qZvCKRy6K2u+iKXIY8MdE5bvK8o1ce9suXeOD0qvL45XcQm6kyAFqNko16P3c6P7Njk9TK/Whsp2AfxGqJa4YQ0qcJc+mJa4gZ4nclQK8n7MQzNYyWAA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=cornell.edu; dmarc=pass action=none header.from=cornell.edu; dkim=pass header.d=cornell.edu; arc=none Received: from DM6PR04MB6075.namprd04.prod.outlook.com (2603:10b6:5:127::31) by DM6PR04MB6234.namprd04.prod.outlook.com (2603:10b6:5:124::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3021.23; Mon, 25 May 2020 22:18:54 +0000 Received: from DM6PR04MB6075.namprd04.prod.outlook.com ([fe80::f48b:4e13:94d7:f7c4]) by DM6PR04MB6075.namprd04.prod.outlook.com ([fe80::f48b:4e13:94d7:f7c4%4]) with mapi id 15.20.3021.029; Mon, 25 May 2020 22:18:53 +0000 To: cygwin-apps From: Ken Brown Subject: [ITA] babl Message-ID: Date: Mon, 25 May 2020 18:18:49 -0400 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:68.0) Gecko/20100101 Thunderbird/68.8.0 Content-Type: multipart/mixed; boundary="------------6253C8A226E18E1CF37B5FA0" Content-Language: en-US X-ClientProxiedBy: CH2PR14CA0042.namprd14.prod.outlook.com (2603:10b6:610:56::22) To DM6PR04MB6075.namprd04.prod.outlook.com (2603:10b6:5:127::31) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from [IPv6:2604:6000:b407:7f00:9913:c4af:7e68:7968] (2604:6000:b407:7f00:9913:c4af:7e68:7968) by CH2PR14CA0042.namprd14.prod.outlook.com (2603:10b6:610:56::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3021.25 via Frontend Transport; Mon, 25 May 2020 22:18:53 +0000 X-Originating-IP: [2604:6000:b407:7f00:9913:c4af:7e68:7968] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: edae6564-7632-450a-d7f5-08d800f99bfb X-MS-TrafficTypeDiagnostic: DM6PR04MB6234: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:10000; X-Forefront-PRVS: 0414DF926F X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 6kUJSA9VvOABN5oWTvxBTYpcl/KlWEofAGFozmDWtHFemTpAhQhG+JHJ8z1z6jlOJmgOv2hjM/SdmqWNcbgLRmXR+/+uPSIoCGq64M5XomP9+pqMNfeg9kYQlP2yuPD/b7S5UrqUshRnb5oelMdaK6DyYLHAP1R3hinTui0D/l6uefyPyB9CG809QzHlfd6Gn4knOVqiyJ3oW2adv7vCspJAvZHPveINnNGdNFhFkv/Rpvj1d0caPlEzvgLe0lCW74NjtfFVOifHIHDYWgsTjBn45rsqM8EcCtCNCN6zhPZXLTNGbDja0t4fKJHe5tJ+uWxf9zpaY8m4FSgU3QAHDhG/IXiLXm3d8I5d5zixH3TC77tvFO1j7n0zgroFn2MhfOE0Aho5xZI8YUs/JoxswXzo6noQ85Ot7YuQpkVpfXhhRU33DRl/1h7cPNR2VQYRM4J87nQIUCmoiPaXbJTVLw== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DM6PR04MB6075.namprd04.prod.outlook.com; PTR:; CAT:NONE; SFTY:; SFS:(4636009)(396003)(136003)(366004)(39860400002)(346002)(376002)(52116002)(966005)(86362001)(316002)(786003)(478600001)(8676002)(6916009)(31696002)(33964004)(6486002)(8936002)(186003)(16526019)(2906002)(2616005)(66946007)(66576008)(66556008)(31686004)(75432002)(6666004)(36756003)(66476007)(5660300002)(235185007)(43740500002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: GMzAnaYQFhGhkNJ2FgjOUijtlA94bGgwb+tIpyJDiqHSYnJ1jEzw8efZj8Q8TM7skRK1Dm6qjwCvvQC1yHqaEucLdb9ECWKLvyJYhlTIeEERir1/rA6of0scE0htEkiU0UiC8Qiie2cZ0+5UVx5TRnMakt6blk6AT8fKh2652FLEFWykbn9jO2a5daf+bQJpF/jPnYEBS+jM6/5x5Gpy/HMp9us4ifgPZbYM4492SsDMFEAf3XTaEZLWPtINrKwASkNQZLE+DG6sHq5g6svyyO0NzhKFaB8CPVlwmkBW1pH2WZL1Btj2KuriGdxyYEh8CfFY8XY+csfcuDN4G2L0MHyrViVaKv2RIVZbf8kiCVStgboDrigDIAVnd/XcfF75evhVkUR0mL8E9IXbvihUyAFvkE5ArgFAmbQ263ul6Aj98kAcda4vYWEcvLjPKZqn7sTAacoG9r1mTmxypokcoF2fn7+RIZXEKBKXWG/FMQ+qCwHgU/dirYGWRDVVLPhVXxX6cTMq5M57xsOueKQj0IFCtgZNCj9yFwulNiUE5LM= X-OriginatorOrg: cornell.edu X-MS-Exchange-CrossTenant-Network-Message-Id: edae6564-7632-450a-d7f5-08d800f99bfb X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 May 2020 22:18:53.8334 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 5d7e4366-1b9b-45cf-8e79-b14b27df46e1 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: oQ8YDGA1oYOQ5A89Z5tDAi0FrNoy27SZOQ5xD5NIgm/EtN/j70lRtAm0NI9aojush1AjpUeegcMxlFZS1oKiGw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR04MB6234 X-Spam-Status: No, score=-3.2 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, MSGID_FROM_MTA_HEADER, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_PASS, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: cygwin-apps@cygwin.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Cygwin package maintainer discussion list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 May 2020 22:18:57 -0000 --------------6253C8A226E18E1CF37B5FA0 Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit cygport file and patches attached. The build system has changed from autotools to meson. The former is no longer supported. I have disabled gobject introspection for reasons explained here: https://sourceware.org/pipermail/cygwin-apps/2020-May/040093.html This represents no change, because Yaakov disabled it (for different reasons) several years ago. I'm hoping to be able to re-enable it at some point. I went to some trouble, with the help of Jon Turney, to make the html docs build, so I packaged them in a (new) libbabl-doc package. Is there any reason not to do this? Fedora packages the docs also, in babl-devel-docs. Ken --------------6253C8A226E18E1CF37B5FA0 Content-Type: text/plain; charset=UTF-8; name="0.1.74-cygwin.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0.1.74-cygwin.patch" --- origsrc/babl-0.1.74/babl/meson.build 2020-01-12 18:26:51.000000000 -0500 +++ src/babl-0.1.74/babl/meson.build 2020-05-25 10:05:54.387799000 -0400 @@ -38,7 +38,7 @@ elif host_machine.system() == 'darwin' a else error('Linker doesn\'t support --version-script or -exported_symbols_list') endif -if platform_win32 +if platform_win32 or platform_cygwin babl_link_args += '-Wl,--no-undefined' endif --- origsrc/babl-0.1.74/extensions/meson.build 2020-01-12 18:26:51.000000000 -0500 +++ src/babl-0.1.74/extensions/meson.build 2020-05-25 10:05:54.391822000 -0400 @@ -15,7 +15,7 @@ babl_ext_inc = [ # Linker arguments babl_ext_link_args = [ ] -if platform_win32 +if platform_win32 or platform_cygwin babl_ext_link_args += '-Wl,--no-undefined' endif --- origsrc/babl-0.1.74/meson.build 2020-01-12 18:26:51.000000000 -0500 +++ src/babl-0.1.74/meson.build 2020-05-25 10:08:03.005964600 -0400 @@ -79,6 +79,7 @@ conf.set_quoted('BABL_LIBRARY', platform_android = false platform_osx = false platform_win32 = false +platform_cygwin = false host_cpu_family = host_machine.cpu_family() message('Host machine cpu family: ' + host_cpu_family) @@ -104,9 +105,10 @@ host_os = host_machine.system() message('Host os: ' + host_os) platform_win32 = (host_os.startswith('mingw') or - host_os.startswith('cygwin') or host_os.startswith('windows')) +platform_cygwin = host_os.startswith('cygwin') + platform_osx = host_os.startswith('darwin') if platform_osx if cc.get_id() != 'clang' @@ -118,7 +120,7 @@ platform_android = host_os.contains('and path_sep = ( platform_win32 ? ';' : ':' ) dirs_sep = ( platform_win32 ? '\\\\' : '/' ) -if platform_win32 +if platform_win32 or platform_cygwin lib_ext = '.dll' elif platform_osx lib_ext = '.dylib' @@ -145,7 +147,6 @@ build_os = build_machine.system() message('Build os: ' + build_os) build_platform_win32 = (build_os.startswith('mingw') or - build_os.startswith('cygwin') or build_os.startswith('windows')) # Only run cross compile objects if we have exe wrapper --------------6253C8A226E18E1CF37B5FA0 Content-Type: text/plain; charset=UTF-8; name="0.1.74-docs.patch" Content-Transfer-Encoding: 8bit Content-Disposition: attachment; filename="0.1.74-docs.patch" --- origsrc/babl-0.1.74/docs/meson.build 2020-01-12 18:26:51.000000000 -0500 +++ src/babl-0.1.74/docs/meson.build 2020-05-24 22:10:24.081359400 -0400 @@ -54,22 +54,26 @@ index_html = custom_target('index.html', build_by_default: true, ) -Reference_html = custom_target('Reference.html', +Reference_html_tmp = custom_target('Reference.html.tmp', input : [ 'Reference-static.html', 'toc', - index_html_tmp, ], - output: [ 'Reference.html', ], + output: [ 'Reference.html.tmp', ], command: [ env_bin, 'cp', '@INPUT0@', '@OUTPUT@', '&&', xml_insert, '@OUTPUT@', 'TOC', '@INPUT1@', - '&&', xml_insert, '@OUTPUT@', 'BablBase', '@INPUT2@', ], - build_by_default: true, ) +Reference_html = custom_target('Reference.html', + input : [ Reference_html_tmp, index_html_tmp, ], + output: [ 'Reference.html', ], + command: [ xml_insert, '@INPUT0@', 'BablBase', '@INPUT1@', 'cat_result' ], + build_by_default: true, + capture: true, +) CMYK_html = custom_target('CMYK.html', input : [ --- origsrc/babl-0.1.74/docs/tools/xml_insert.sh 2020-01-12 18:26:51.000000000 -0500 +++ src/babl-0.1.74/docs/tools/xml_insert.sh 2020-05-25 07:54:31.875472500 -0400 @@ -7,6 +7,9 @@ # # xml_insert.sh bar.xml foo foo.inc # +# If there's a fourth argument, cat the final result. +# +# # 2005 © Øyvind Kolås # # FIXME: add argument checking / error handling @@ -97,6 +100,9 @@ tailno=`expr $numlines - $splitno` head -$splitno $tmp_file > $1 cat $3 >> $1 tail -$tailno $tmp_file >> $1 +if test -n "$4"; then + cat $1 +fi rm -rf $tmp_dir --------------6253C8A226E18E1CF37B5FA0 Content-Type: text/plain; charset=UTF-8; name="babl.cygport" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="babl.cygport" inherit meson NAME=3D"babl" VERSION=3D0.1.74 RELEASE=3D1 CATEGORY=3D"Libs" SUMMARY=3D"Any-to-any pixel format conversion library" DESCRIPTION=3D"Babl is a dynamic, any to any, pixel format conversion libra= ry. It provides conversions between the myriad of buffer types images can be stored in. Babl doesn't only help with existing pixel formats, but also facilitates creation of new and uncommon ones." HOMEPAGE=3D"http://www.gegl.org/babl/" SRC_URI=3D"http://download.gimp.org/pub/babl/${VERSION%.*}/babl-${VERSION}.= tar.xz" PATCH_URI=3D"0.1.74-cygwin.patch 0.1.74-docs.patch" PKG_NAMES=3D"libbabl0.1_0 libbabl-devel" # girepository-Babl0.1 vala-babl0.= 1" PKG_NAMES+=3D" libbabl-doc" libbabl0_1_0_SUMMARY=3D"${SUMMARY} (runtime)" libbabl0_1_0_CONTENTS=3D"--exclude=3Dusr/share/doc/babl/html usr/bin/*-0.1-0.dll usr/lib/babl-0.1/ usr/share/doc/" libbabl_devel_SUMMARY=3D"${SUMMARY} (development)" libbabl_devel_CONTENTS=3D"usr/include/ usr/lib/lib* usr/lib/pkgconfig/" libbabl_devel_SUMMARY=3D"${SUMMARY} (development)" libbabl_devel_CONTENTS=3D"usr/include/ usr/lib/lib* usr/lib/pkgconfig/" libbabl_doc_SUMMARY=3D"${SUMMARY} (documentation)" libbabl_doc_CONTENTS=3D"usr/share/doc/babl/html/" girepository_Babl0_1_SUMMARY=3D"${SUMMARY} (GObject Introspection)" girepository_Babl0_1_CONTENTS=3D"usr/*/gir*/Babl-0.1.*" vala_babl0_1_SUMMARY=3D"${SUMMARY} (Vala bindings)" vala_babl0_1_CONTENTS=3D"usr/share/vala/" src_install() { cd ${S} meson_install docinto html cd ${CHOST}/docs dodoc graphics *.html *.css rm ${D}/usr/share/doc/babl/html/index-static.html } CYGMESON_ARGS=3D"-Denable-gir=3Dfalse" # Attempting to build with gobject-introspection fails as follows: # FAILED: babl/Babl-0.1.gir # /usr/bin/g-ir-scanner -I/usr/include/gobject-introspection-1.0 -I/usr/inc= lude/glib-2.0 -I/usr/lib/glib-2.0/include -D_REENTRANT --no-libtool --names= pace=3DBabl --nsversion=3D0.1 --warn-all --output babl/Babl-0.1.gir --c-inc= lude=3Dbabl.h '--identifier-filter-cmd=3D/usr/bin/python3 /home/kbrown/src/= cygpackages/babl/babl-0.1.74-1.x86_64/src/babl-0.1.74/babl/identfilter.py' = -DBABL_IS_BEING_COMPILED -I/home/kbrown/src/cygpackages/babl/babl-0.1.74-1.= x86_64/src/babl-0.1.74/babl -I/home/kbrown/src/cygpackages/babl/babl-0.1.74= -1.x86_64/src/babl-0.1.74/x86_64-pc-cygwin/babl -I./. -I../. -I./babl/base/= . -I../babl/base/. --filelist=3D/home/kbrown/src/cygpackages/babl/babl-0.1.= 74-1.x86_64/src/babl-0.1.74/x86_64-pc-cygwin/babl/4170c83@@babl-0.1@sha/Bab= l_0.1_gir_filelist --cflags-begin -fno-unsafe-math-optimizations -Wdeclarat= ion-after-statement -Winit-self -Wmissing-declarations -Wmissing-prototypes= -Wold-style-definition -Wpointer-arith -mmmx -msse -mfpmath=3Dsse -I./. -I= ../. -I./babl/base/. -I../babl/base/. --cflags-end --library babl-0.1 -L/ho= me/kbrown/src/cygpackages/babl/babl-0.1.74-1.x86_64/src/babl-0.1.74/x86_64-= pc-cygwin/babl --extra-library=3Dm --extra-library=3Ddl --extra-library=3Dl= cms2 # g-ir-scanner: link: gcc -o /home/kbrown/src/cygpackages/babl/babl-0.1.74-= 1.x86_64/src/babl-0.1.74/x86_64-pc-cygwin/tmp-introspectG0o9nF/Babl-0.1.exe= -ggdb -O2 -pipe -Wall -Werror=3Dformat-security -Wp,-D_FORTIFY_SOURCE=3D2 = -fstack-protector-strong --param=3Dssp-buffer-size=3D4 -fdebug-prefix-map= =3D/home/kbrown/src/cygpackages/babl/babl-0.1.74-1.x86_64/build=3D/usr/src/= debug/babl-0.1.74-1 -fdebug-prefix-map=3D/home/kbrown/src/cygpackages/babl/= babl-0.1.74-1.x86_64/src/babl-0.1.74=3D/usr/src/debug/babl-0.1.74-1 /home/k= brown/src/cygpackages/babl/babl-0.1.74-1.x86_64/src/babl-0.1.74/x86_64-pc-c= ygwin/tmp-introspectG0o9nF/Babl-0.1.o -L. -lbabl-0.1 -lm -ldl -llcms2 -L/ho= me/kbrown/src/cygpackages/babl/babl-0.1.74-1.x86_64/src/babl-0.1.74/x86_64-= pc-cygwin/babl -Wl,-rpath,/home/kbrown/src/cygpackages/babl/babl-0.1.74-1.x= 86_64/src/babl-0.1.74/x86_64-pc-cygwin/babl -lgio-2.0 -lgobject-2.0 -Wl,--e= xport-all-symbols -lgmodule-2.0 -lglib-2.0 -lintl # ERROR: can't resolve libraries to shared libraries: babl-0.1 # The problem is that the executable generated by the above link # command doesn't depend on the cygbabl DLL b/c the babl library # doesn't contain any GObject-based types. See # # https://github.com/mesonbuild/meson/pull/2880/commits/8a27c08b05e4537d5= 061d30ddd8aad9dc52cf1c4 --------------6253C8A226E18E1CF37B5FA0--