October 2024 - openSUSE Commits - openSUSE Mailing Lists

commit glassfish-activation for openSUSE:Factory
by Source-Sync 03 Oct '24

03 Oct '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package glassfish-activation for openSUSE:Factory checked in at 2024-10-03 18:00:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/glassfish-activation (Old) and /work/SRC/openSUSE:Factory/.glassfish-activation.new.19354 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "glassfish-activation" Thu Oct 3 18:00:17 2024 rev:5 rq:1205250 version:1.2.0 Changes: -------- --- /work/SRC/openSUSE:Factory/glassfish-activation/glassfish-activation.changes 2022-07-18 18:33:02.821681502 +0200 +++ /work/SRC/openSUSE:Factory/.glassfish-activation.new.19354/glassfish-activation.changes 2024-10-03 18:00:24.078240307 +0200 @@ -1,0 +2,5 @@ +Wed Oct 2 15:39:44 UTC 2024 - Fridrich Strba <fstrba(a)suse.com> + +- Spec file cleanup + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ glassfish-activation.spec ++++++ --- /var/tmp/diff_new_pack.t0tw53/_old 2024-10-03 18:00:24.862272949 +0200 +++ /var/tmp/diff_new_pack.t0tw53/_new 2024-10-03 18:00:24.866273115 +0200 @@ -1,7 +1,7 @@ # # spec file for package glassfish-activation # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -27,7 +27,7 @@ Source1: activation-build.xml BuildRequires: ant BuildRequires: fdupes -BuildRequires: javapackages-local +BuildRequires: javapackages-local >= 6 Obsoletes: gnu-jaf < %{version} Obsoletes: jaf BuildArch: noarch @@ -70,9 +70,6 @@ # maven-dependency-plugin doesn't work correctly without access to remote repos %pom_remove_plugin :maven-dependency-plugin activationapi -%pom_remove_parent activation activationapi -%pom_xpath_inject pom:project "<version>%{version}</version>" activation activationapi - %pom_remove_plugin org.codehaus.mojo:build-helper-maven-plugin %pom_remove_plugin -r :maven-javadoc-plugin %pom_remove_plugin -r :maven-source-plugin @@ -88,21 +85,21 @@ %install # jar -install -d -m 755 %{buildroot}%{_javadir}/ -install -m 644 activation/target/javax.activation-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar -install -m 644 activation/target/javax.activation-api-%{version}.jar %{buildroot}%{_javadir}/%{name}-api.jar +install -d -m 0755 %{buildroot}%{_javadir}/ +install -m 0644 activation/target/javax.activation-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar +install -m 0644 activation/target/javax.activation-api-%{version}.jar %{buildroot}%{_javadir}/%{name}-api.jar ln -sf %{name}-api.jar %{buildroot}%{_javadir}/activation.jar ln -sf %{name}-api.jar %{buildroot}%{_javadir}/jaf.jar # pom -install -d -m 755 %{buildroot}%{_mavenpomdir}/%{name} -install -pm 644 activation/pom.xml %{buildroot}%{_mavenpomdir}/%{name}.pom -install -pm 644 activationapi/pom.xml %{buildroot}%{_mavenpomdir}/%{name}-api.pom +install -d -m 0755 %{buildroot}%{_mavenpomdir}/%{name} +%{mvn_install_pom} activation/pom.xml %{buildroot}%{_mavenpomdir}/%{name}.pom +%{mvn_install_pom} activationapi/pom.xml %{buildroot}%{_mavenpomdir}/%{name}-api.pom %add_maven_depmap %{name}.pom %{name}.jar %add_maven_depmap %{name}-api.pom %{name}-api.jar -a javax.activation:activation -f api # javadoc -install -d -m 755 %{buildroot}%{_javadocdir}/%{name} +install -d -m 0755 %{buildroot}%{_javadocdir}/%{name} cp -r activation/target/site/apidocs/* %{buildroot}/%{_javadocdir}/%{name} %fdupes -s %{buildroot}%{_javadocdir}

1 0

commit libgsf for openSUSE:Factory
by Source-Sync 03 Oct '24

03 Oct '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package libgsf for openSUSE:Factory checked in at 2024-10-03 18:00:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libgsf (Old) and /work/SRC/openSUSE:Factory/.libgsf.new.19354 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libgsf" Thu Oct 3 18:00:06 2024 rev:76 rq:1205221 version:1.14.53 Changes: -------- --- /work/SRC/openSUSE:Factory/libgsf/libgsf.changes 2024-02-06 16:33:00.695701974 +0100 +++ /work/SRC/openSUSE:Factory/.libgsf.new.19354/libgsf.changes 2024-10-03 18:00:09.381628442 +0200 @@ -1,0 +2,11 @@ +Tue Oct 1 13:54:13 UTC 2024 - Bjørn Lie <bjorn.lie(a)gmail.com> + +- Update to version 1.14.53: + + Compilation fixes for libxml 2.13 + + Fix ABR in gsf-vba-dump. + + Teach gsf (the tool) to handle odf properties. + + Fix integer overflows affecting memory allocation. + + Add missing "DocumentStatus" ole2 property. + + Avoid some undefined C behaviour in overflow checks. + +------------------------------------------------------------------- Old: ---- libgsf-1.14.52.tar.xz New: ---- libgsf-1.14.53.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libgsf.spec ++++++ --- /var/tmp/diff_new_pack.2ZJKsO/_old 2024-10-03 18:00:11.133701386 +0200 +++ /var/tmp/diff_new_pack.2ZJKsO/_new 2024-10-03 18:00:11.137701552 +0200 @@ -17,7 +17,7 @@ Name: libgsf -Version: 1.14.52 +Version: 1.14.53 Release: 0 Summary: I/O library for dealing with structured file formats License: GPL-2.0-or-later AND LGPL-2.1-or-later ++++++ libgsf-1.14.52.tar.xz -> libgsf-1.14.53.tar.xz ++++++ ++++ 6543 lines of diff (skipped)

1 0

commit liboqs for openSUSE:Factory
by Source-Sync 03 Oct '24

03 Oct '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package liboqs for openSUSE:Factory checked in at 2024-10-03 18:00:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/liboqs (Old) and /work/SRC/openSUSE:Factory/.liboqs.new.19354 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "liboqs" Thu Oct 3 18:00:05 2024 rev:14 rq:1205214 version:0.11.0 Changes: -------- --- /work/SRC/openSUSE:Factory/liboqs/liboqs.changes 2024-06-11 18:32:52.080708767 +0200 +++ /work/SRC/openSUSE:Factory/.liboqs.new.19354/liboqs.changes 2024-10-03 18:00:07.833563991 +0200 @@ -1,0 +2,47 @@ +Sun Sep 29 09:48:19 UTC 2024 - Marcus Meissner <meissner(a)suse.com> + +- Updated to 0.11.0: + * This release updates ML-KEM implementations to their final FIPS 203 + https://csrc.nist.gov/pubs/fips/203/final versions . + * This release still includes the NIST Round 3 version of Kyber for + interoperability purposes, but we plan to remove Kyber Round 3 in a + future release. + * Additionally, this release adds support for MAYO and CROSS + digital signature schemes from [NIST Additional Signatures Round 1 + https://csrc.nist.gov/Projects/pqc-dig-sig/round-1-additional-signatures + along with stateful hash-based signature schemes XMSS + https://datatracker.ietf.org/doc/html/rfc8391 and LMS + https://datatracker.ietf.org/doc/html/rfc8554. + * Finally, this release provides formally verified + implementations of Kyber-512 and Kyber-768 from libjade + https://github.com/formosa-crypto/libjade/releases/tag/release%2F2023.05-2 + + * LMS and XMSS are disabled by default due to the security risks associated with their use in software. + See the note on stateful hash-based signatures in CONFIGURE.md + + * Key encapsulation mechanisms: + + - Kyber: Added formally-verified portable C and AVX2 implementations + of Kyber-512 and Kyber-768 from libjade. + - ML-KEM: Updated portable C and AVX2 implementations of ML-KEM-512, + ML-KEM-768, and ML-KEM-1024 to FIP 203 version. + - Kyber: Patched ARM64 implementations of Kyber-512, Kyber-768, and + Kyber-1024 to work with AddressSanitizer. + + * Digital signature schemes: + + - LMS/XMSS: Added implementations of stateful hash-based signature + schemes: XMSS and LMS + - MAYO: Added portable C and AVX2 implementations of MAYO signature + scheme from NIST Additional Signatures Round 1. + - CROSS: Added portable C and AVX2 implementations of CROSS signature + scheme from NIST Additional Signatures Round 1. + + * Other changes: + + - Added callback API to use custom implementations of AES, SHA2, and SHA3. + - Refactor SHA3 implementation to use OpenSSL's EVP_DigestSqueeze() API. + +- new library major version 6 + +------------------------------------------------------------------- Old: ---- 0.10.1.tar.gz New: ---- 0.11.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ liboqs.spec ++++++ --- /var/tmp/diff_new_pack.NDXDvv/_old 2024-10-03 18:00:08.881607624 +0200 +++ /var/tmp/diff_new_pack.NDXDvv/_new 2024-10-03 18:00:08.881607624 +0200 @@ -17,7 +17,7 @@ Name: liboqs -Version: 0.10.1 +Version: 0.11.0 Release: 0 Summary: C library for quantum-resistant cryptographic algorithms License: MIT @@ -35,18 +35,18 @@ liboqs is a C library for quantum-resistant cryptographic algorithms. See the bundled README.md for particular limitations on intended use. -%package -n liboqs5 +%package -n liboqs6 Summary: C library for quantum-resistant cryptographic algorithms Group: System/Libraries -%description -n liboqs5 +%description -n liboqs6 liboqs is a C library for quantum-resistant cryptographic algorithms. See the bundled README.md for particular limitations on intended use. %package devel Summary: Headers for liboqs, a library for quantum-resistant cryptography Group: Development/Languages/C and C++ -Requires: liboqs5 = %{version} +Requires: liboqs6 = %{version} %description devel liboqs is a C library for quantum-resistant cryptographic algorithms. @@ -78,13 +78,13 @@ rmdir %{buildroot}%{_prefix}/local/ -%post -n liboqs5 -p /sbin/ldconfig -%postun -n liboqs5 -p /sbin/ldconfig +%post -n liboqs6 -p /sbin/ldconfig +%postun -n liboqs6 -p /sbin/ldconfig -%files -n liboqs5 +%files -n liboqs6 %license LICENSE.txt %{_libdir}/liboqs.so.%version -%{_libdir}/liboqs.so.5 +%{_libdir}/liboqs.so.6 %doc README.md %files devel ++++++ 0.10.1.tar.gz -> 0.11.0.tar.gz ++++++ /work/SRC/openSUSE:Factory/liboqs/0.10.1.tar.gz /work/SRC/openSUSE:Factory/.liboqs.new.19354/0.11.0.tar.gz differ: char 13, line 1 ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.NDXDvv/_old 2024-10-03 18:00:08.933609789 +0200 +++ /var/tmp/diff_new_pack.NDXDvv/_new 2024-10-03 18:00:08.937609956 +0200 @@ -1,3 +1,3 @@ -liboqs5 +liboqs6 liboqs-devel

1 0

commit audit for openSUSE:Factory
by Source-Sync 03 Oct '24

03 Oct '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package audit for openSUSE:Factory checked in at 2024-10-03 17:59:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/audit (Old) and /work/SRC/openSUSE:Factory/.audit.new.19354 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "audit" Thu Oct 3 17:59:59 2024 rev:107 rq:1205295 version:4.0 Changes: -------- --- /work/SRC/openSUSE:Factory/audit/audit-secondary.changes 2024-09-30 15:35:06.179791045 +0200 +++ /work/SRC/openSUSE:Factory/.audit.new.19354/audit-secondary.changes 2024-10-03 18:00:00.849273424 +0200 @@ -1,0 +2,11 @@ +Wed Oct 2 11:15:07 UTC 2024 - Enzo Matsumiya <ematsumiya(a)suse.com> + +- Readd audit-allow-manual-stop.patch (removed by mistake) + +------------------------------------------------------------------- +Tue Oct 1 14:43:13 UTC 2024 - Enzo Matsumiya <ematsumiya(a)suse.com> + +- Fix plugin termination when using systemd service units (bsc#1215377) + * add auditd.service-fix-plugin-termination.patch + +------------------------------------------------------------------- New: ---- audit-allow-manual-stop.patch auditd.service-fix-plugin-termination.patch BETA DEBUG BEGIN: New:/work/SRC/openSUSE:Factory/.audit.new.19354/audit-secondary.changes- /work/SRC/openSUSE:Factory/.audit.new.19354/audit-secondary.changes:- Readd audit-allow-manual-stop.patch (removed by mistake) /work/SRC/openSUSE:Factory/.audit.new.19354/audit-secondary.changes- -- /work/SRC/openSUSE:Factory/.audit.new.19354/audit.changes-- Refresh patches (context adjusment): /work/SRC/openSUSE:Factory/.audit.new.19354/audit.changes: * audit-allow-manual-stop.patch /work/SRC/openSUSE:Factory/.audit.new.19354/audit.changes- * audit-ausearch-do-not-require-tclass.patch New:/work/SRC/openSUSE:Factory/.audit.new.19354/audit-secondary.changes-- Fix plugin termination when using systemd service units (bsc#1215377) /work/SRC/openSUSE:Factory/.audit.new.19354/audit-secondary.changes: * add auditd.service-fix-plugin-termination.patch /work/SRC/openSUSE:Factory/.audit.new.19354/audit-secondary.changes- BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ audit-secondary.spec ++++++ --- /var/tmp/diff_new_pack.yMbfRG/_old 2024-10-03 18:00:01.889316513 +0200 +++ /var/tmp/diff_new_pack.yMbfRG/_new 2024-10-03 18:00:01.893316680 +0200 @@ -39,6 +39,8 @@ Patch7: fix-hardened-service.patch Patch8: enable-stop-rules.patch Patch9: fix-auparse-test.patch +Patch10: auditd.service-fix-plugin-termination.patch +Patch11: audit-allow-manual-stop.patch BuildRequires: audit-devel = %{version} BuildRequires: autoconf >= 2.12 BuildRequires: kernel-headers >= 2.6.30 ++++++ audit-allow-manual-stop.patch ++++++ From: Tony Jones <tonyj(a)suse.de> Subject: allow service stop References: https://lists.fedoraproject.org/pipermail/devel/2012-June/169411.html References: https://www.redhat.com/archives/linux-audit/2013-July/msg00048.html --- legacy-actions is Fedora specific, so blocking manual stop won't work for SUSE since we lack the ability to use a custom stop/restart init.d/auditd.service | 1 - 1 file changed, 1 deletion(-) --- a/init.d/auditd.service +++ b/init.d/auditd.service @@ -14,7 +14,6 @@ After=local-fs.target systemd-tmpfiles-s Before=sysinit.target shutdown.target ##Before=shutdown.target Conflicts=shutdown.target -RefuseManualStop=yes Documentation=man:auditd(8) https://github.com/linux-audit/audit-documentation ++++++ auditd.service-fix-plugin-termination.patch ++++++ --- init.d/auditd.service | 1 + 1 file changed, 1 insertion(+) --- a/init.d/auditd.service +++ b/init.d/auditd.service @@ -29,6 +29,7 @@ ExecStopPost=/sbin/auditctl -R /etc/audi Restart=on-failure # Do not restart for intentional exits. See EXIT CODES section in auditd(8). RestartPreventExitStatus=2 4 6 +KillMode=mixed ### Security Settings ### MemoryDenyWriteExecute=true

1 0

commit libeconf for openSUSE:Factory
by Source-Sync 03 Oct '24

03 Oct '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package libeconf for openSUSE:Factory checked in at 2024-10-03 17:59:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libeconf (Old) and /work/SRC/openSUSE:Factory/.libeconf.new.19354 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libeconf" Thu Oct 3 17:59:23 2024 rev:30 rq:1205077 version:0.7.4 Changes: -------- --- /work/SRC/openSUSE:Factory/libeconf/libeconf.changes 2024-09-27 17:10:39.748578177 +0200 +++ /work/SRC/openSUSE:Factory/.libeconf.new.19354/libeconf.changes 2024-10-03 17:59:25.623815454 +0200 @@ -1,0 +2,5 @@ +Wed Oct 2 07:08:25 UTC 2024 - Stefan Schubert <schubi(a)suse.com> + +- Updated license in the spec file to MIT. + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/libeconf/python-libeconf.changes 2024-09-27 17:10:39.768579010 +0200 +++ /work/SRC/openSUSE:Factory/.libeconf.new.19354/python-libeconf.changes 2024-10-03 17:59:25.683817937 +0200 @@ -1,0 +2,5 @@ +Wed Oct 2 07:09:19 UTC 2024 - Stefan Schubert <schubi(a)suse.com> + +- Updated license in the spec file to MIT. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libeconf.spec ++++++ --- /var/tmp/diff_new_pack.il0UYL/_old 2024-10-03 17:59:26.239840951 +0200 +++ /var/tmp/diff_new_pack.il0UYL/_new 2024-10-03 17:59:26.239840951 +0200 @@ -21,7 +21,7 @@ Version: 0.7.4 Release: 0 Summary: Enhanced config file parser ala systemd -License: LGPL-2.1-or-later +License: MIT Group: Development/Libraries/C and C++ URL: https://github.com/openSUSE/libeconf Source: libeconf-%{version}.tar.xz ++++++ python-libeconf.spec ++++++ --- /var/tmp/diff_new_pack.il0UYL/_old 2024-10-03 17:59:26.271842276 +0200 +++ /var/tmp/diff_new_pack.il0UYL/_new 2024-10-03 17:59:26.275842441 +0200 @@ -22,7 +22,7 @@ Version: 0.7.4 Release: 0 Summary: Python bindings for libeconf -License: LGPL-2.1-or-later +License: MIT Group: Development/Languages/Python URL: https://github.com/openSUSE/libeconf Source: libeconf-%{version}.tar.xz

1 0

commit filesystem for openSUSE:Factory
by Source-Sync 03 Oct '24

03 Oct '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package filesystem for openSUSE:Factory checked in at 2024-10-03 17:59:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/filesystem (Old) and /work/SRC/openSUSE:Factory/.filesystem.new.19354 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "filesystem" Thu Oct 3 17:59:18 2024 rev:173 rq:1204628 version:84.87 Changes: -------- --- /work/SRC/openSUSE:Factory/filesystem/filesystem.changes 2023-12-10 19:39:29.954631657 +0100 +++ /work/SRC/openSUSE:Factory/.filesystem.new.19354/filesystem.changes 2024-10-03 17:59:19.599566113 +0200 @@ -1,0 +2,6 @@ +Wed Sep 25 19:10:06 UTC 2024 - Thorsten Kukuk <kukuk(a)suse.com> + +- Move /srv/www hierachy to the packages which use them + [bsc#1231027] + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ filesystem.spec ++++++ --- /var/tmp/diff_new_pack.u0mpBg/_old 2024-10-03 17:59:20.591607173 +0200 +++ /var/tmp/diff_new_pack.u0mpBg/_new 2024-10-03 17:59:20.599607505 +0200 @@ -1,7 +1,7 @@ # # spec file for package filesystem # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed ++++++ ghost.list ++++++ --- /var/tmp/diff_new_pack.u0mpBg/_old 2024-10-03 17:59:20.707611974 +0200 +++ /var/tmp/diff_new_pack.u0mpBg/_new 2024-10-03 17:59:20.711612140 +0200 @@ -4,9 +4,6 @@ 0555 root root /opt 0555 root root /proc 0555 root root /srv -0755 root root /srv/www -0755 root root /srv/www/cgi-bin -0755 root root /srv/www/htdocs 0755 root root /run/lock 0555 root root /sys 0755 root root /usr/local

1 0

commit tomcat for openSUSE:Factory
by Source-Sync 03 Oct '24

03 Oct '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package tomcat for openSUSE:Factory checked in at 2024-10-03 17:40:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/tomcat (Old) and /work/SRC/openSUSE:Factory/.tomcat.new.19354 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "tomcat" Thu Oct 3 17:40:54 2024 rev:110 rq:1205527 version:9.0.91 Changes: -------- --- /work/SRC/openSUSE:Factory/tomcat/tomcat.changes 2024-09-30 15:40:15.908681891 +0200 +++ /work/SRC/openSUSE:Factory/.tomcat.new.19354/tomcat.changes 2024-10-03 17:41:54.600060032 +0200 @@ -1,0 +2,5 @@ +Thu Oct 3 13:17:03 UTC 2024 - Fridrich Strba <fstrba(a)suse.com> + +- Adapt the scripts to run also with javapackages-tools >= 6.3 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tomcat-9.0-digest.script ++++++ --- /var/tmp/diff_new_pack.Ji12xw/_old 2024-10-03 17:41:55.564100210 +0200 +++ /var/tmp/diff_new_pack.Ji12xw/_new 2024-10-03 17:41:55.568100377 +0200 @@ -3,6 +3,9 @@ # tomcat-digest script # JPackage Project <http://www.jpackage.org/> +# Set default JAVA_HOME +export JAVA_HOME="${JAVA_HOME:-%{?java_home}}" + # Source functions library if [ -f /usr/share/java-utils/java-functions ] ; then . /usr/share/java-utils/java-functions ++++++ tomcat-9.0-tool-wrapper.script ++++++ --- /var/tmp/diff_new_pack.Ji12xw/_old 2024-10-03 17:41:55.624102710 +0200 +++ /var/tmp/diff_new_pack.Ji12xw/_new 2024-10-03 17:41:55.628102877 +0200 @@ -3,6 +3,9 @@ # tomcat-digest script # JPackage Project <http://www.jpackage.org/> +# Set default JAVA_HOME +export JAVA_HOME="${JAVA_HOME:-%{?java_home}}" + # Source functions library if [ -f /usr/share/java-utils/java-functions ] ; then . /usr/share/java-utils/java-functions

1 0

commit mosquitto for openSUSE:Factory
by Source-Sync 03 Oct '24

03 Oct '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package mosquitto for openSUSE:Factory checked in at 2024-10-03 17:40:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mosquitto (Old) and /work/SRC/openSUSE:Factory/.mosquitto.new.19354 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "mosquitto" Thu Oct 3 17:40:44 2024 rev:31 rq:1205507 version:2.0.19 Changes: -------- --- /work/SRC/openSUSE:Factory/mosquitto/mosquitto.changes 2024-03-25 21:17:59.146982330 +0100 +++ /work/SRC/openSUSE:Factory/.mosquitto.new.19354/mosquitto.changes 2024-10-03 17:41:51.783942668 +0200 @@ -1,0 +2,24 @@ +Thu Oct 3 12:22:10 UTC 2024 - Martin Hauke <mardnh(a)gmx.de> + +- Update to version 2.0.19 + Security: + * Fix mismatched subscribe/unsubscribe with normal/shared topics. + * Fix crash on bridge using remapped topic being sent a crafted + packet. + Broker: + * Fix assert failure when loading a persistence file that + contains subscriptions with no client id. + * Fix local bridges being incorrectly expired when + persistent_client_expiration is in use. + * Fix use of CLOCK_BOOTTIME for getting time. + * Fix mismatched subscribe/unsubscribe with normal/shared topics. + * Fix crash on bridge using remapped topic being sent a crafted + packet. + Client library: + * Fix some error codes being converted to string as "unknown". + * Clear SSL error state to avoid spurious error reporting. + * Fix "payload format invalid" not being allowed as a PUBREC + reason code. + * Don't allow SUBACK with missing reason codes. + +------------------------------------------------------------------- Old: ---- mosquitto-2.0.18.tar.gz mosquitto-2.0.18.tar.gz.sig New: ---- mosquitto-2.0.19.tar.gz mosquitto-2.0.19.tar.gz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mosquitto.spec ++++++ --- /var/tmp/diff_new_pack.LoqW9k/_old 2024-10-03 17:41:52.303964341 +0200 +++ /var/tmp/diff_new_pack.LoqW9k/_new 2024-10-03 17:41:52.303964341 +0200 @@ -20,7 +20,7 @@ %define c_lib libmosquitto1 %define cpp_lib libmosquittopp1 Name: mosquitto -Version: 2.0.18 +Version: 2.0.19 Release: 0 Summary: A MQTT v3.1/v3.1.1 Broker License: EPL-1.0 ++++++ mosquitto-2.0.18.tar.gz -> mosquitto-2.0.19.tar.gz ++++++ ++++ 1611 lines of diff (skipped)

1 0

commit accerciser for openSUSE:Factory
by Source-Sync 03 Oct '24

03 Oct '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package accerciser for openSUSE:Factory checked in at 2024-10-03 17:40:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/accerciser (Old) and /work/SRC/openSUSE:Factory/.accerciser.new.19354 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "accerciser" Thu Oct 3 17:40:38 2024 rev:76 rq:1205409 version:3.44.1 Changes: -------- --- /work/SRC/openSUSE:Factory/accerciser/accerciser.changes 2023-10-12 11:36:17.728406630 +0200 +++ /work/SRC/openSUSE:Factory/.accerciser.new.19354/accerciser.changes 2024-10-03 17:41:49.383842642 +0200 @@ -1,0 +2,56 @@ +Mon Sep 30 05:18:26 UTC 2024 - jun wang <jgwang(a)suse.com> + +- Update to version 3.44.1 + * Replace intltool dep with gettext + * Add meson build support + * Drop autotools build + * Add CI + * plugins: Port from imp to importlib + * Drop last occurrence of importing imp + * Drop using deprecated gtk features + * Don't add when cancelling "New Bookmark" dialog + * event_monitor: Port "Clear Selection" button from "stock" + * event_monitor: Fix saving to file + * event_monitor: Fix jumping to object on click + * node: Calculate screen coords for gtk4 apps + * node: More reliably detect the right gtk4 window + * Move retrieval of window stacking order to WindowManager + * Only consider windows in current workspace for "Inspect under + mouse" + * WindowInfo: Add stacking order + * WindowInfo: Add info whether on current workspace + * Unify WindowManager implementations further, consider size + * win manager: Add more infos to WindowInfo + * window_manager: Extract helper method to get toolkit name and + version + * window_manager: Escape special chars in window title regex + * Wnck: Use frame geometry when client geometry includes CSD + * Support "Inspect under mouse" for Gtk 4 apps + * GNOME: Use gtk and sandboxed app ID to retrieve app icon + * GnomeShellWindowManager: Retrieve mouse pos from Mutter + * GNOME Shell: Add extension and win manager using Mutter win pos + * GNOME Shell: Add info whether on current workspace + * GNOME Shell/Mutter: Use client/frame geometry except for GTK 3 + * GNOME Shell/Mutter: Support GNOME 47 + * GNOME Shell: Install the GNOME Shell extension + * Add a window manager that retrieves screen coords from KWin + * KWinWindowManager: Support KWin 6 as well + * KWinWindowManager: Don't fail on win title containing quotes + * KWinWindowManager: Get mouse position via KWin API + * KWinWindowManager: Get window stacking order from KWin + * KWin: Use 'console.info' instead of 'print' in KWin script + * KWin 6: Use client/frame geometry instead of buffer geometry + except for GTK 3 + * Kwin: Drop extra KWin 5 win title suffix right away + * KWin: Retrieve app/window icon via desktop entry + * interface_view: Add help text + * interface_view: Update acc description when it changes + * interface_view: Update help text when it changes + * interface_view: Show infos for Hyperlink iface + * ipython_view: Handle more color-related ANSI escape codes + * ipython_view: Use raw string for regex + * Add project_license tag to AppStream metadata file + * Updated translations. +- Add meson BuildRequires and macros following upstreams port to it + +------------------------------------------------------------------- Old: ---- accerciser-3.42.0.tar.xz New: ---- accerciser-3.44.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ accerciser.spec ++++++ --- /var/tmp/diff_new_pack.09ln1n/_old 2024-10-03 17:41:50.059870816 +0200 +++ /var/tmp/diff_new_pack.09ln1n/_new 2024-10-03 17:41:50.063870983 +0200 @@ -1,7 +1,7 @@ # # spec file for package accerciser # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,16 +17,17 @@ Name: accerciser -Version: 3.42.0 +Version: 3.44.1 Release: 0 Summary: Accessibility debugging tool License: BSD-3-Clause Group: Development/Tools/Other URL: https://wiki.gnome.org/Apps/Accerciser -Source0: https://download.gnome.org/sources/accerciser/3.42/%{name}-%{version}.tar.xz +Source0: https://download.gnome.org/sources/accerciser/3.44/%{name}-%{version}.tar.xz BuildRequires: fdupes BuildRequires: gobject-introspection +BuildRequires: meson BuildRequires: pkgconfig # py3atspi is a virtual name that is provided by the default at-spi stack BuildRequires: py3atspi @@ -72,12 +73,11 @@ %autosetup -p1 %build -%configure \ - %{nil} -%make_build +%meson +%meson_build %install -%make_install +%meson_install %suse_update_desktop_file -r -N "Accerciser" -G "Accesibility Debugger" accerciser Utility GNOME Accessibility %find_lang %{name} %{?no_lang_C} %python3_fix_shebang @@ -87,10 +87,15 @@ %license COPYING %doc AUTHORS NEWS README.md %doc %{_datadir}/help/C/%{name}/ +%dir %{_datadir}/gnome-shell/ +%dir %{_datadir}/gnome-shell/extensions/ +%dir %{_datadir}/gnome-shell/extensions/accerciser(a)accerciser.gnome.org/ +%{_datadir}/gnome-shell/extensions/accerciser(a)accerciser.gnome.org/extension.js +%{_datadir}/gnome-shell/extensions/accerciser(a)accerciser.gnome.org/metadata.json %{_bindir}/%{name} %{_datadir}/%{name}/ %exclude %{_datadir}/%{name}/plugins/ipython_view.py -%{_datadir}/metainfo/accerciser.appdata.xml +%{_datadir}/metainfo/org.gtk.accerciser.metainfo.xml %{_datadir}/glib-2.0/schemas/org.a11y.Accerciser.gschema.xml %{_datadir}/icons/hicolor/*/apps/%{name}* %{_datadir}/applications/%{name}.desktop ++++++ accerciser-3.42.0.tar.xz -> accerciser-3.44.1.tar.xz ++++++ ++++ 88758 lines of diff (skipped)

1 0

commit wxsvg for openSUSE:Factory
by Source-Sync 03 Oct '24

03 Oct '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package wxsvg for openSUSE:Factory checked in at 2024-10-03 17:40:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/wxsvg (Old) and /work/SRC/openSUSE:Factory/.wxsvg.new.19354 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "wxsvg" Thu Oct 3 17:40:36 2024 rev:14 rq:1205390 version:1.5.25 Changes: -------- --- /work/SRC/openSUSE:Factory/wxsvg/wxsvg.changes 2024-08-22 18:11:12.272504684 +0200 +++ /work/SRC/openSUSE:Factory/.wxsvg.new.19354/wxsvg.changes 2024-10-03 17:41:48.239794964 +0200 @@ -1,0 +2,16 @@ +Mon Sep 16 05:53:10 UTC 2024 - ecsos <ecsos(a)opensuse.org> + +- Update to 1.5.25 + * applied ffmpeg7 patch +- Changes from 1.5.24 + * applied ffmpeg5 patch +- Drop ffmpeg5.patch from suse, because now in upstream. +- Drop wxsvg-fix-missing-include.patch, because now in upstream. +- Add wxsvg-fix-version.patch because in configure files are 1.5.24. + +------------------------------------------------------------------- +Mon Sep 16 05:51:10 UTC 2024 - ecsos <ecsos(a)opensuse.org> + +- Upstream does not need ffmpeg-6 to build. Remove it again. + +------------------------------------------------------------------- Old: ---- ffmpeg5.patch wxsvg-1.5.23.tar.bz2 wxsvg-fix-missing-include.patch New: ---- wxsvg-1.5.25.tar.bz2 wxsvg-fix-version.patch BETA DEBUG BEGIN: Old:- Changes from 1.5.24 * applied ffmpeg5 patch - Drop ffmpeg5.patch from suse, because now in upstream. Old:- Drop ffmpeg5.patch from suse, because now in upstream. - Drop wxsvg-fix-missing-include.patch, because now in upstream. - Add wxsvg-fix-version.patch because in configure files are 1.5.24. BETA DEBUG END: BETA DEBUG BEGIN: New:- Drop wxsvg-fix-missing-include.patch, because now in upstream. - Add wxsvg-fix-version.patch because in configure files are 1.5.24. BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wxsvg.spec ++++++ --- /var/tmp/diff_new_pack.l9q2GS/_old 2024-10-03 17:41:48.923823471 +0200 +++ /var/tmp/diff_new_pack.l9q2GS/_new 2024-10-03 17:41:48.927823637 +0200 @@ -20,14 +20,13 @@ %define sover 3 Name: wxsvg -Version: 1.5.23 +Version: 1.5.25 Release: 0 Summary: Library to create, manipulate and render SVG files License: LGPL-2.1-or-later WITH WxWindows-exception-3.1 URL: http://wxsvg.sourceforge.net/ Source: https://prdownloads.sourceforge.net/wxsvg/%{name}-%{version}.tar.bz2 -Patch0: ffmpeg5.patch -Patch1: wxsvg-fix-missing-include.patch +Patch1: %{name}-fix-version.patch BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: wxGTK3-3_2-devel @@ -35,7 +34,7 @@ BuildRequires: pkgconfig(expat) BuildRequires: pkgconfig(pangocairo) # WARNING: needs to build with the same ffmpeg libraries as DVDStyler. -BuildRequires: ffmpeg-6-libavcodec-devel +BuildRequires: pkgconfig(libavcodec) BuildRequires: pkgconfig(libavformat) BuildRequires: pkgconfig(libavutil) BuildRequires: pkgconfig(libexif) ++++++ wxsvg-1.5.23.tar.bz2 -> wxsvg-1.5.25.tar.bz2 ++++++ ++++ 20614 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/wxsvg-1.5.23/.cproject new/wxsvg-1.5.25/.cproject --- old/wxsvg-1.5.23/.cproject 2021-11-02 17:31:39.000000000 +0100 +++ new/wxsvg-1.5.25/.cproject 2024-05-18 14:04:49.000000000 +0200 @@ -1,115 +1,305 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> -<?fileVersion 4.0.0?> - -<cproject> -<storageModule moduleId="org.eclipse.cdt.core.settings"> -<cconfiguration id="org.eclipse.cdt.core.default.config.248320115"> -<storageModule buildSystemId="org.eclipse.cdt.core.defaultConfigDataProvider" id="org.eclipse.cdt.core.default.config.248320115" moduleId="org.eclipse.cdt.core.settings" name="Configuration"> -<externalSettings/> -<extensions> -<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/> -</extensions> -</storageModule> -<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/> - - -<storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings"/> - - - - -<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/> -<storageModule moduleId="org.eclipse.cdt.core.pathentry"> -<pathentry excluding="src/|include/" kind="src" path=""/> -<pathentry kind="src" path="include"/> -<pathentry kind="src" path="src"/> -<pathentry kind="out" path=""/> -<pathentry kind="con" path="org.eclipse.cdt.make.core.DISCOVERED_SCANNER_INFO"/> -<pathentry base-path="wxsvg" include="" kind="inc" path="" system="true"/> -</storageModule> -<storageModule moduleId="scannerConfiguration"> -<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"/> -<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"> -<buildOutputProvider> -<openAction enabled="true" filePath=""/> -<parser enabled="true"/> -</buildOutputProvider> -<scannerInfoProvider id="specsFile"> -<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/> -<parser enabled="true"/> -</scannerInfoProvider> -</profile> -<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile"> -<buildOutputProvider> -<openAction enabled="false" filePath=""/> -<parser enabled="true"/> -</buildOutputProvider> -<scannerInfoProvider id="specsFile"> -<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/> -<parser enabled="false"/> -</scannerInfoProvider> -</profile> -<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP"> -<buildOutputProvider> -<openAction enabled="false" filePath=""/> -<parser enabled="true"/> -</buildOutputProvider> -<scannerInfoProvider id="specsFile"> -<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/> -<parser enabled="false"/> -</scannerInfoProvider> -</profile> -<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC"> -<buildOutputProvider> -<openAction enabled="false" filePath=""/> -<parser enabled="true"/> -</buildOutputProvider> -<scannerInfoProvider id="specsFile"> -<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/> -<parser enabled="false"/> -</scannerInfoProvider> -</profile> -<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile"> -<buildOutputProvider> -<openAction enabled="false" filePath=""/> -<parser enabled="true"/> -</buildOutputProvider> -<scannerInfoProvider id="specsFile"> -<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/> -<parser enabled="false"/> -</scannerInfoProvider> -</profile> -<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP"> -<buildOutputProvider> -<openAction enabled="false" filePath=""/> -<parser enabled="true"/> -</buildOutputProvider> -<scannerInfoProvider id="specsFile"> -<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/> -<parser enabled="false"/> -</scannerInfoProvider> -</profile> -<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC"> -<buildOutputProvider> -<openAction enabled="false" filePath=""/> -<parser enabled="true"/> -</buildOutputProvider> -<scannerInfoProvider id="specsFile"> -<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/> -<parser enabled="false"/> -</scannerInfoProvider> -</profile> -<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile"> -<buildOutputProvider> -<openAction enabled="false" filePath=""/> -<parser enabled="true"/> -</buildOutputProvider> -<scannerInfoProvider id="makefileGenerator"> -<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/> -<parser enabled="false"/> -</scannerInfoProvider> -</profile> -</storageModule> -</cconfiguration> -</storageModule> -</cproject> +<?fileVersion 5.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage2"> + <storageModule moduleId="org.eclipse.cdt.core.settings"> + <cconfiguration id="org.eclipse.linuxtools.cdt.autotools.core.toolChain.956433489"> + <storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="org.eclipse.linuxtools.cdt.autotools.core.toolChain.956433489" moduleId="org.eclipse.cdt.core.settings" name="Build (GNU)"> + <externalSettings/> + <extensions> + <extension id="org.eclipse.cdt.core.MachO64" point="org.eclipse.cdt.core.BinaryParser"/> + <extension id="org.eclipse.cdt.core.PE64" point="org.eclipse.cdt.core.BinaryParser"/> + <extension id="org.eclipse.cdt.core.Cygwin_PE64" point="org.eclipse.cdt.core.BinaryParser"/> + <extension id="org.eclipse.cdt.core.GNU_ELF" point="org.eclipse.cdt.core.BinaryParser"/> + <extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/> + <extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/> + </extensions> + </storageModule> + <storageModule moduleId="cdtBuildSystem" version="4.0.0"> + <configuration buildProperties="" description="" id="org.eclipse.linuxtools.cdt.autotools.core.toolChain.956433489" name="Build (GNU)" parent="org.eclipse.cdt.build.core.emptycfg"> + <folderInfo id="org.eclipse.linuxtools.cdt.autotools.core.toolChain.956433489.1186571592" name="/" resourcePath=""> + <toolChain id="org.eclipse.linuxtools.cdt.autotools.core.toolChain.519033105" name="GNU Autotools Toolchain" superClass="org.eclipse.linuxtools.cdt.autotools.core.toolChain"> + <targetPlatform id="org.eclipse.linuxtools.cdt.autotools.core.toolchain.targetPlatform.832556175" isAbstract="false" name="GNU Autotools Target Platform" superClass="org.eclipse.linuxtools.cdt.autotools.core.toolchain.targetPlatform"/> + <builder id="org.eclipse.linuxtools.cdt.autotools.core.toolchain.builder.505612967" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Autotools Makefile Generator" superClass="org.eclipse.linuxtools.cdt.autotools.core.toolchain.builder"/> + <tool id="org.eclipse.linuxtools.cdt.autotools.core.gnu.toolchain.tool.configure.834671888" name="configure" superClass="org.eclipse.linuxtools.cdt.autotools.core.gnu.toolchain.tool.configure"> + <option id="org.eclipse.linuxtools.cdt.autotools.core.option.configure.name.69488679" name="Name" superClass="org.eclipse.linuxtools.cdt.autotools.core.option.configure.name" value="org.eclipse.linuxtools.cdt.autotools.core.toolChain.956433489" valueType="string"/> + </tool> + <tool id="org.eclipse.linuxtools.cdt.autotools.core.toolchain.tool.autogen.1065302222" name="autogen.sh" superClass="org.eclipse.linuxtools.cdt.autotools.core.toolchain.tool.autogen"/> + <tool id="org.eclipse.linuxtools.cdt.autotools.core.toolchain.tool.gcc.1376719613" name="GCC C Compiler" superClass="org.eclipse.linuxtools.cdt.autotools.core.toolchain.tool.gcc"> + <inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.1990736214" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/> + </tool> + <tool id="org.eclipse.linuxtools.cdt.autotools.core.toolchain.tool.gpp.849364588" name="GCC C++ Compiler" superClass="org.eclipse.linuxtools.cdt.autotools.core.toolchain.tool.gpp"> + <option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="gnu.cpp.compiler.option.include.paths.1845599972" name="Include paths (-I)" superClass="gnu.cpp.compiler.option.include.paths" useByScannerDiscovery="false" valueType="includePath"> + <listOptionValue builtIn="false" value="/usr/include/wx-3.0"/> + <listOptionValue builtIn="false" value="/usr/lib/x86_64-linux-gnu/wx/include/gtk3-unicode-3.0"/> + </option> + <inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.915365229" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/> + </tool> + </toolChain> + </folderInfo> + </configuration> + </storageModule> + <storageModule moduleId="org.eclipse.cdt.core.externalSettings"/> + </cconfiguration> + </storageModule> + <storageModule moduleId="org.eclipse.cdt.core.pathentry"> + <pathentry excluding="src/|include/" kind="src" path=""/> + <pathentry kind="src" path="include"/> + <pathentry kind="src" path="src"/> + <pathentry kind="out" path=""/> + <pathentry kind="con" path="org.eclipse.cdt.make.core.DISCOVERED_SCANNER_INFO"/> + <pathentry base-path="wxsvg" include="" kind="inc" path="" system="true"/> + </storageModule> + <storageModule moduleId="cdtBuildSystem" version="4.0.0"> + <project id="wxsvg.null.953235811" name="wxsvg"/> + </storageModule> + <storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/> + <storageModule moduleId="refreshScope"/> + <storageModule moduleId="scannerConfiguration"> + <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"/> + <profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"> + <buildOutputProvider> + <openAction enabled="true" filePath=""/> + <parser enabled="true"/> + </buildOutputProvider> + <scannerInfoProvider id="specsFile"> + <runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/> + <parser enabled="true"/> + </scannerInfoProvider> + </profile> + <profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile"> + <buildOutputProvider> + <openAction enabled="false" filePath=""/> + <parser enabled="true"/> + </buildOutputProvider> + <scannerInfoProvider id="makefileGenerator"> + <runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/> + <parser enabled="false"/> + </scannerInfoProvider> + </profile> + <profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile"> + <buildOutputProvider> + <openAction enabled="false" filePath=""/> + <parser enabled="true"/> + </buildOutputProvider> + <scannerInfoProvider id="specsFile"> + <runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/> + <parser enabled="false"/> + </scannerInfoProvider> + </profile> + <profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP"> + <buildOutputProvider> + <openAction enabled="false" filePath=""/> + <parser enabled="true"/> + </buildOutputProvider> + <scannerInfoProvider id="specsFile"> + <runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/> + <parser enabled="false"/> + </scannerInfoProvider> + </profile> + <profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC"> + <buildOutputProvider> + <openAction enabled="false" filePath=""/> + <parser enabled="true"/> + </buildOutputProvider> + <scannerInfoProvider id="specsFile"> + <runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/> + <parser enabled="false"/> + </scannerInfoProvider> + </profile> + <profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile"> + <buildOutputProvider> + <openAction enabled="false" filePath=""/> + <parser enabled="true"/> + </buildOutputProvider> + <scannerInfoProvider id="specsFile"> + <runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/> + <parser enabled="false"/> + </scannerInfoProvider> + </profile> + <profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP"> + <buildOutputProvider> + <openAction enabled="false" filePath=""/> + <parser enabled="true"/> + </buildOutputProvider> + <scannerInfoProvider id="specsFile"> + <runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/> + <parser enabled="false"/> + </scannerInfoProvider> + </profile> + <profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC"> + <buildOutputProvider> + <openAction enabled="false" filePath=""/> + <parser enabled="true"/> + </buildOutputProvider> + <scannerInfoProvider id="specsFile"> + <runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/> + <parser enabled="false"/> + </scannerInfoProvider> + </profile> + <scannerConfigBuildInfo instanceId="org.eclipse.linuxtools.cdt.autotools.core.toolChain.956433489;org.eclipse.linuxtools.cdt.autotools.core.toolChain.956433489.1186571592;org.eclipse.linuxtools.cdt.autotools.core.toolchain.tool.gcc.1376719613;cdt.managedbuild.tool.gnu.c.compiler.input.1990736214"> + <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"/> + <profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"> + <buildOutputProvider> + <openAction enabled="true" filePath=""/> + <parser enabled="true"/> + </buildOutputProvider> + <scannerInfoProvider id="specsFile"> + <runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/> + <parser enabled="true"/> + </scannerInfoProvider> + </profile> + <profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile"> + <buildOutputProvider> + <openAction enabled="false" filePath=""/> + <parser enabled="true"/> + </buildOutputProvider> + <scannerInfoProvider id="makefileGenerator"> + <runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/> + <parser enabled="false"/> + </scannerInfoProvider> + </profile> + <profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile"> + <buildOutputProvider> + <openAction enabled="false" filePath=""/> + <parser enabled="true"/> + </buildOutputProvider> + <scannerInfoProvider id="specsFile"> + <runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/> + <parser enabled="false"/> + </scannerInfoProvider> + </profile> + <profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP"> + <buildOutputProvider> + <openAction enabled="false" filePath=""/> + <parser enabled="true"/> + </buildOutputProvider> + <scannerInfoProvider id="specsFile"> + <runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/> + <parser enabled="false"/> + </scannerInfoProvider> + </profile> + <profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC"> + <buildOutputProvider> + <openAction enabled="false" filePath=""/> + <parser enabled="true"/> + </buildOutputProvider> + <scannerInfoProvider id="specsFile"> + <runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/> + <parser enabled="false"/> + </scannerInfoProvider> + </profile> + <profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile"> + <buildOutputProvider> + <openAction enabled="false" filePath=""/> + <parser enabled="true"/> + </buildOutputProvider> + <scannerInfoProvider id="specsFile"> + <runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/> + <parser enabled="false"/> + </scannerInfoProvider> + </profile> + <profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP"> + <buildOutputProvider> + <openAction enabled="false" filePath=""/> + <parser enabled="true"/> + </buildOutputProvider> + <scannerInfoProvider id="specsFile"> + <runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/> + <parser enabled="false"/> + </scannerInfoProvider> + </profile> + <profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC"> + <buildOutputProvider> + <openAction enabled="false" filePath=""/> + <parser enabled="true"/> + </buildOutputProvider> + <scannerInfoProvider id="specsFile"> + <runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/> + <parser enabled="false"/> + </scannerInfoProvider> + </profile> + </scannerConfigBuildInfo> + <scannerConfigBuildInfo instanceId="org.eclipse.linuxtools.cdt.autotools.core.toolChain.956433489;org.eclipse.linuxtools.cdt.autotools.core.toolChain.956433489.1186571592;org.eclipse.linuxtools.cdt.autotools.core.toolchain.tool.gpp.849364588;cdt.managedbuild.tool.gnu.cpp.compiler.input.915365229"> + <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"/> + <profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"> + <buildOutputProvider> + <openAction enabled="true" filePath=""/> + <parser enabled="true"/> + </buildOutputProvider> + <scannerInfoProvider id="specsFile"> + <runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/> + <parser enabled="true"/> + </scannerInfoProvider> + </profile> + <profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile"> + <buildOutputProvider> + <openAction enabled="false" filePath=""/> + <parser enabled="true"/> + </buildOutputProvider> + <scannerInfoProvider id="makefileGenerator"> + <runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/> + <parser enabled="false"/> + </scannerInfoProvider> + </profile> + <profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile"> + <buildOutputProvider> + <openAction enabled="false" filePath=""/> + <parser enabled="true"/> + </buildOutputProvider> + <scannerInfoProvider id="specsFile"> + <runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/> + <parser enabled="false"/> + </scannerInfoProvider> + </profile> + <profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP"> + <buildOutputProvider> + <openAction enabled="false" filePath=""/> + <parser enabled="true"/> + </buildOutputProvider> + <scannerInfoProvider id="specsFile"> + <runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/> + <parser enabled="false"/> + </scannerInfoProvider> + </profile> + <profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC"> + <buildOutputProvider> + <openAction enabled="false" filePath=""/> + <parser enabled="true"/> + </buildOutputProvider> + <scannerInfoProvider id="specsFile"> + <runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/> + <parser enabled="false"/> + </scannerInfoProvider> + </profile> + <profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile"> + <buildOutputProvider> + <openAction enabled="false" filePath=""/> + <parser enabled="true"/> + </buildOutputProvider> + <scannerInfoProvider id="specsFile"> + <runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/> + <parser enabled="false"/> + </scannerInfoProvider> + </profile> + <profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP"> + <buildOutputProvider> + <openAction enabled="false" filePath=""/> + <parser enabled="true"/> + </buildOutputProvider> + <scannerInfoProvider id="specsFile"> + <runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/> + <parser enabled="false"/> + </scannerInfoProvider> + </profile> + <profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC"> + <buildOutputProvider> + <openAction enabled="false" filePath=""/> + <parser enabled="true"/> + </buildOutputProvider> + <scannerInfoProvider id="specsFile"> + <runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/> + <parser enabled="false"/> + </scannerInfoProvider> + </profile> + </scannerConfigBuildInfo> + </storageModule> +</cproject> \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/wxsvg-1.5.23/ChangeLog new/wxsvg-1.5.25/ChangeLog --- old/wxsvg-1.5.23/ChangeLog 2021-11-02 17:31:39.000000000 +0100 +++ new/wxsvg-1.5.25/ChangeLog 2024-05-18 14:04:49.000000000 +0200 @@ -1,3 +1,13 @@ +Version 1.5.25 <2024-05-18> +--------------------------- + + * applied ffmpeg7 patch (thanks to Robert-André Mauchin) + +Version 1.5.24 <2022-08-31> +--------------------------- + + * applied ffmpeg5 patch + Version 1.5.23 <2021-11-02> --------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/wxsvg-1.5.23/autogen.sh new/wxsvg-1.5.25/autogen.sh --- old/wxsvg-1.5.23/autogen.sh 2021-11-02 17:31:39.000000000 +0100 +++ new/wxsvg-1.5.25/autogen.sh 2024-05-18 14:04:49.000000000 +0200 @@ -1,5 +1,8 @@ #!/bin/sh -libtoolize --copy --force || exit 1 +case `uname` in + Darwin*) glibtoolize --copy || exit 1 ;; + *) libtoolize --copy || exit 1 ;; +esac aclocal -I m4 automake --foreign -a -c autoconf diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/wxsvg-1.5.23/compile new/wxsvg-1.5.25/compile --- old/wxsvg-1.5.23/compile 2021-11-02 17:31:42.000000000 +0100 +++ new/wxsvg-1.5.25/compile 2024-05-18 14:04:50.000000000 +0200 @@ -3,7 +3,7 @@ scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1999-2020 Free Software Foundation, Inc. +# Copyright (C) 1999-2021 Free Software Foundation, Inc. # Written by Tom Tromey <tromey(a)cygnus.com>. # # This program is free software; you can redistribute it and/or modify diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/wxsvg-1.5.23/configure.ac new/wxsvg-1.5.25/configure.ac --- old/wxsvg-1.5.23/configure.ac 2021-11-02 17:31:39.000000000 +0100 +++ new/wxsvg-1.5.25/configure.ac 2024-05-18 14:04:49.000000000 +0200 @@ -1,8 +1,8 @@ # Process this file with autoconf to produce a configure script. # initialization -AC_PREREQ(2.59) -AC_INIT([wxsvg], [1.5.23], [http://wxsvg.sourceforge.net/] +AC_PREREQ([2.71]) +AC_INIT([wxsvg],[1.5.24],[http://wxsvg.sourceforge.net/]) AC_CONFIG_MACRO_DIR([m4]) AM_INIT_AUTOMAKE(foreign) AM_MAINTAINER_MODE @@ -15,7 +15,7 @@ # 4. If any interfaces have been added since the last public release, then increment age. # 5. If any interfaces have been removed since the last public release then set age to 0. -LIBRARY_VERSION=15:7:12 # current:revision:age -> libwxsvg.so.(C-A).(A).(R) +LIBRARY_VERSION=15:8:12 # current:revision:age -> libwxsvg.so.(C-A).(A).(R) AC_SUBST(LIBRARY_VERSION) # options @@ -48,7 +48,7 @@ # Checks for programs. -AC_LANG_CPLUSPLUS +AC_LANG([C++]) AC_PROG_INSTALL AC_PROG_LN_S AC_PROG_CC @@ -57,8 +57,8 @@ PKG_PROG_PKG_CONFIG() # Check for libtool -m4_pattern_allow([AC_PROG_LIBTOOL]) -AC_PROG_LIBTOOL +m4_pattern_allow([LT_INIT]) +LT_INIT # debug flags case "$USE_DEBUG" in @@ -137,6 +137,10 @@ # check libexif PKG_CHECK_MODULES(LIBEXIF, libexif, [LIBS="$LIBS $LIBEXIF_LIBS"], [AC_MSG_ERROR([*** missing libexif ***])]) +# check for separate -latomic +AC_SEARCH_LIBS([__atomic_fetch_add_4], [atomic]) +AC_SEARCH_LIBS([__atomic_load_8], [atomic]) + # check ffmpeg AM_CONDITIONAL(USE_LIBAV, [test x$enable_libav = xyes]) if test x$enable_libav = xyes; then diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/wxsvg-1.5.23/include/wxSVG/mediadec_ffmpeg.h new/wxsvg-1.5.25/include/wxSVG/mediadec_ffmpeg.h --- old/wxsvg-1.5.23/include/wxSVG/mediadec_ffmpeg.h 2021-11-02 17:31:39.000000000 +0100 +++ new/wxsvg-1.5.25/include/wxSVG/mediadec_ffmpeg.h 2024-05-18 14:04:49.000000000 +0200 @@ -81,6 +81,7 @@ bool OpenVideoDecoder(); void CloseVideoDecoder(); AVStream* GetVideoStream(); + int64_t m_cur_dts; }; #endif //FFMPEG_MEDIA_DECODER_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/wxsvg-1.5.23/m4/libtool.m4 new/wxsvg-1.5.25/m4/libtool.m4 --- old/wxsvg-1.5.23/m4/libtool.m4 2021-11-02 17:31:40.000000000 +0100 +++ new/wxsvg-1.5.25/m4/libtool.m4 2024-05-18 14:04:49.000000000 +0200 @@ -1,6 +1,7 @@ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- # -# Copyright (C) 1996-2001, 2003-2015 Free Software Foundation, Inc. +# Copyright (C) 1996-2001, 2003-2019, 2021-2022 Free Software +# Foundation, Inc. # Written by Gordon Matzigkeit, 1996 # # This file is free software; the Free Software Foundation gives @@ -31,7 +32,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. ]) -# serial 58 LT_INIT +# serial 59 LT_INIT # LT_PREREQ(VERSION) @@ -181,6 +182,7 @@ m4_require([_LT_CHECK_SHELL_FEATURES])dnl m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl m4_require([_LT_CMD_RELOAD])dnl +m4_require([_LT_DECL_FILECMD])dnl m4_require([_LT_CHECK_MAGIC_METHOD])dnl m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl m4_require([_LT_CMD_OLD_ARCHIVE])dnl @@ -219,8 +221,8 @@ ofile=libtool can_build_shared=yes -# All known linkers require a '.a' archive for static linking (except MSVC, -# which needs '.lib'). +# All known linkers require a '.a' archive for static linking (except MSVC and +# ICC, which need '.lib'). libext=a with_gnu_ld=$lt_cv_prog_gnu_ld @@ -777,7 +779,7 @@ # if finds mixed CR/LF and LF-only lines. Since sed operates in # text mode, it properly converts lines to CR/LF. This bash problem # is reportedly fixed, but why not run on old versions too? - sed '$q' "$ltmain" >> "$cfgfile" \ + $SED '$q' "$ltmain" >> "$cfgfile" \ || (rm -f "$cfgfile"; exit 1) mv -f "$cfgfile" "$ofile" || @@ -1041,8 +1043,8 @@ _LT_EOF echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD - echo "$AR cr libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD - $AR cr libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD + echo "$AR $AR_FLAGS libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD + $AR $AR_FLAGS libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD cat > conftest.c << _LT_EOF @@ -1066,17 +1068,12 @@ _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;; darwin1.*) _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; - darwin*) # darwin 5.x on - # if running on 10.5 or later, the deployment target defaults - # to the OS version, if on x86, and 10.4, the deployment - # target defaults to 10.4. Don't you love it? - case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in - 10.0,*86*-darwin8*|10.0,*-darwin[[912]]*) - _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; - 10.[[012]][[,.]]*) - _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; - 10.*|11.*) - _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; + darwin*) + case $MACOSX_DEPLOYMENT_TARGET,$host in + 10.[[012]],*|,*powerpc*-darwin[[5-8]]*) + _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; + *) + _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; esac ;; esac @@ -1125,12 +1122,12 @@ output_verbose_link_cmd=func_echo_all _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil" _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil" - _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil" - _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil" + _LT_TAGVAR(archive_expsym_cmds, $1)="$SED 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil" + _LT_TAGVAR(module_expsym_cmds, $1)="$SED -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil" m4_if([$1], [CXX], [ if test yes != "$lt_cv_apple_cc_single_mod"; then _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dsymutil" - _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dar_export_syms$_lt_dsymutil" + _LT_TAGVAR(archive_expsym_cmds, $1)="$SED 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dar_export_syms$_lt_dsymutil" fi ],[]) else @@ -1244,7 +1241,8 @@ # _LT_WITH_SYSROOT # ---------------- AC_DEFUN([_LT_WITH_SYSROOT], -[AC_MSG_CHECKING([for sysroot]) +[m4_require([_LT_DECL_SED])dnl +AC_MSG_CHECKING([for sysroot]) AC_ARG_WITH([sysroot], [AS_HELP_STRING([--with-sysroot@<:@=DIR@:>@], [Search for dependent libraries within DIR (or the compiler's sysroot @@ -1261,7 +1259,7 @@ fi ;; #( /*) - lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"` + lt_sysroot=`echo "$with_sysroot" | $SED -e "$sed_quote_subst"` ;; #( no|'') ;; #( @@ -1291,7 +1289,7 @@ # options accordingly. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then - case `/usr/bin/file conftest.$ac_objext` in + case `$FILECMD conftest.$ac_objext` in *ELF-32*) HPUX_IA64_MODE=32 ;; @@ -1308,7 +1306,7 @@ echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then if test yes = "$lt_cv_prog_gnu_ld"; then - case `/usr/bin/file conftest.$ac_objext` in + case `$FILECMD conftest.$ac_objext` in *32-bit*) LD="${LD-ld} -melf32bsmip" ;; @@ -1320,7 +1318,7 @@ ;; esac else - case `/usr/bin/file conftest.$ac_objext` in + case `$FILECMD conftest.$ac_objext` in *32-bit*) LD="${LD-ld} -32" ;; @@ -1342,7 +1340,7 @@ echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then emul=elf - case `/usr/bin/file conftest.$ac_objext` in + case `$FILECMD conftest.$ac_objext` in *32-bit*) emul="${emul}32" ;; @@ -1350,7 +1348,7 @@ emul="${emul}64" ;; esac - case `/usr/bin/file conftest.$ac_objext` in + case `$FILECMD conftest.$ac_objext` in *MSB*) emul="${emul}btsmip" ;; @@ -1358,7 +1356,7 @@ emul="${emul}ltsmip" ;; esac - case `/usr/bin/file conftest.$ac_objext` in + case `$FILECMD conftest.$ac_objext` in *N32*) emul="${emul}n32" ;; @@ -1378,14 +1376,14 @@ # not appear in the list. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then - case `/usr/bin/file conftest.o` in + case `$FILECMD conftest.o` in *32-bit*) case $host in x86_64-*kfreebsd*-gnu) LD="${LD-ld} -m elf_i386_fbsd" ;; x86_64-*linux*) - case `/usr/bin/file conftest.o` in + case `$FILECMD conftest.o` in *x86-64*) LD="${LD-ld} -m elf32_x86_64" ;; @@ -1453,7 +1451,7 @@ # options accordingly. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then - case `/usr/bin/file conftest.o` in + case `$FILECMD conftest.o` in *64-bit*) case $lt_cv_prog_gnu_ld in yes*) @@ -1492,9 +1490,22 @@ m4_defun([_LT_PROG_AR], [AC_CHECK_TOOLS(AR, [ar], false) : ${AR=ar} -: ${AR_FLAGS=cr} _LT_DECL([], [AR], [1], [The archiver]) -_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive]) + +# Use ARFLAGS variable as AR's operation code to sync the variable naming with +# Automake. If both AR_FLAGS and ARFLAGS are specified, AR_FLAGS should have +# higher priority because thats what people were doing historically (setting +# ARFLAGS for automake and AR_FLAGS for libtool). FIXME: Make the AR_FLAGS +# variable obsoleted/removed. + +test ${AR_FLAGS+y} || AR_FLAGS=${ARFLAGS-cr} +lt_ar_flags=$AR_FLAGS +_LT_DECL([], [lt_ar_flags], [0], [Flags to create an archive (by configure)]) + +# Make AR_FLAGS overridable by 'make ARFLAGS='. Don't try to run-time override +# by AR_FLAGS because that was never working and AR_FLAGS is about to die. +_LT_DECL([], [AR_FLAGS], [\@S|@{ARFLAGS-"\@S|@lt_ar_flags"}], + [Flags to create an archive]) AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file], [lt_cv_ar_at_file=no @@ -1713,7 +1724,7 @@ lt_cv_sys_max_cmd_len=8192; ;; - bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*) + bitrig* | darwin* | dragonfly* | freebsd* | midnightbsd* | netbsd* | openbsd*) # This has been around since 386BSD, at least. Likely further. if test -x /sbin/sysctl; then lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` @@ -1756,7 +1767,7 @@ sysv5* | sco5v6* | sysv4.2uw2*) kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` if test -n "$kargmax"; then - lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'` + lt_cv_sys_max_cmd_len=`echo $kargmax | $SED 's/.*[[ ]]//'` else lt_cv_sys_max_cmd_len=32768 fi @@ -2206,26 +2217,35 @@ striplib= old_striplib= AC_MSG_CHECKING([whether stripping libraries is possible]) -if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then - test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" - test -z "$striplib" && striplib="$STRIP --strip-unneeded" - AC_MSG_RESULT([yes]) +if test -z "$STRIP"; then + AC_MSG_RESULT([no]) else -# FIXME - insert some real tests, host_os isn't really good enough - case $host_os in - darwin*) - if test -n "$STRIP"; then + if $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then + old_striplib="$STRIP --strip-debug" + striplib="$STRIP --strip-unneeded" + AC_MSG_RESULT([yes]) + else + case $host_os in + darwin*) + # FIXME - insert some real tests, host_os isn't really good enough striplib="$STRIP -x" old_striplib="$STRIP -S" AC_MSG_RESULT([yes]) - else + ;; + freebsd*) + if $STRIP -V 2>&1 | $GREP "elftoolchain" >/dev/null; then + old_striplib="$STRIP --strip-debug" + striplib="$STRIP --strip-unneeded" + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + fi + ;; + *) AC_MSG_RESULT([no]) - fi - ;; - *) - AC_MSG_RESULT([no]) - ;; - esac + ;; + esac + fi fi _LT_DECL([], [old_striplib], [1], [Commands to strip libraries]) _LT_DECL([], [striplib], [1]) @@ -2548,7 +2568,7 @@ case $host_os in cygwin*) # Cygwin DLLs use 'cyg' prefix rather than 'lib' - soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' + soname_spec='`echo $libname | $SED -e 's/^lib/cyg/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' m4_if([$1], [],[ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"]) ;; @@ -2558,14 +2578,14 @@ ;; pw32*) # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' + library_names_spec='`echo $libname | $SED -e 's/^lib/pw/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' ;; esac dynamic_linker='Win32 ld.exe' ;; - *,cl*) - # Native MSVC + *,cl* | *,icl*) + # Native MSVC or ICC libname_spec='$name' soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' library_names_spec='$libname.dll.lib' @@ -2584,7 +2604,7 @@ done IFS=$lt_save_ifs # Convert to MSYS style. - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \$[[a-zA-Z]]\$:| /\\1|g' -e 's|^ ||'` + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's|\\\\|/|g' -e 's| \$[[a-zA-Z]]\$:| /\\1|g' -e 's|^ ||'` ;; cygwin*) # Convert to unix form, then to dos form, then back to unix form @@ -2621,7 +2641,7 @@ ;; *) - # Assume MSVC wrapper + # Assume MSVC and ICC wrapper library_names_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext $libname.lib' dynamic_linker='Win32 ld.exe' ;; @@ -2654,7 +2674,7 @@ shlibpath_var=LD_LIBRARY_PATH ;; -freebsd* | dragonfly*) +freebsd* | dragonfly* | midnightbsd*) # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. if test -x /usr/bin/objformat; then @@ -3465,7 +3485,7 @@ bsdi[[45]]*) lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)' - lt_cv_file_magic_cmd='/usr/bin/file -L' + lt_cv_file_magic_cmd='$FILECMD -L' lt_cv_file_magic_test_file=/shlib/libc.so ;; @@ -3499,14 +3519,14 @@ lt_cv_deplibs_check_method=pass_all ;; -freebsd* | dragonfly*) +freebsd* | dragonfly* | midnightbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then case $host_cpu in i*86 ) # Not sure whether the presence of OpenBSD here was a mistake. # Let's accept both of them until this is cleared up. lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library' - lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_cmd=$FILECMD lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` ;; esac @@ -3520,7 +3540,7 @@ ;; hpux10.20* | hpux11*) - lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_cmd=$FILECMD case $host_cpu in ia64*) lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64' @@ -3567,7 +3587,7 @@ newos6*) lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)' - lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_cmd=$FILECMD lt_cv_file_magic_test_file=/usr/lib/libnls.so ;; @@ -3694,13 +3714,13 @@ mingw*) lt_bad_file=conftest.nm/nofile ;; *) lt_bad_file=/dev/null ;; esac - case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in + case `"$tmp_nm" -B $lt_bad_file 2>&1 | $SED '1q'` in *$lt_bad_file* | *'Invalid file or object type'*) lt_cv_path_NM="$tmp_nm -B" break 2 ;; *) - case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in + case `"$tmp_nm" -p /dev/null 2>&1 | $SED '1q'` in */dev/null*) lt_cv_path_NM="$tmp_nm -p" break 2 @@ -3726,7 +3746,7 @@ # Let the user override the test. else AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :) - case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in + case `$DUMPBIN -symbols -headers /dev/null 2>&1 | $SED '1q'` in *COFF*) DUMPBIN="$DUMPBIN -symbols -headers" ;; @@ -3966,7 +3986,7 @@ if test "$lt_cv_nm_interface" = "MS dumpbin"; then # Gets list of data symbols to import. - lt_cv_sys_global_symbol_to_import="sed -n -e 's/^I .* $.*$$/\1/p'" + lt_cv_sys_global_symbol_to_import="$SED -n -e 's/^I .* $.*$$/\1/p'" # Adjust the below global symbol transforms to fixup imported variables. lt_cdecl_hook=" -e 's/^I .* $.*$$/extern __declspec(dllimport) char \1;/p'" lt_c_name_hook=" -e 's/^I .* $.*$$/ {\"\1\", (void *) 0},/p'" @@ -3984,20 +4004,20 @@ # Transform an extracted symbol line into a proper C declaration. # Some systems (esp. on ia64) link data and code symbols differently, # so use this general approach. -lt_cv_sys_global_symbol_to_cdecl="sed -n"\ +lt_cv_sys_global_symbol_to_cdecl="$SED -n"\ $lt_cdecl_hook\ " -e 's/^T .* $.*$$/extern int \1();/p'"\ " -e 's/^$symcode$symcode* .* $.*$$/extern char \1;/p'" # Transform an extracted symbol line into symbol name and symbol address -lt_cv_sys_global_symbol_to_c_name_address="sed -n"\ +lt_cv_sys_global_symbol_to_c_name_address="$SED -n"\ $lt_c_name_hook\ " -e 's/^: $.*$ .*$/ {\"\1\", (void *) 0},/p'"\ " -e 's/^$symcode$symcode* .* $.*$$/ {\"\1\", (void *) \&\1},/p'" # Transform an extracted symbol line into symbol name with lib prefix and # symbol address. -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n"\ +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="$SED -n"\ $lt_c_name_lib_hook\ " -e 's/^: $.*$ .*$/ {\"\1\", (void *) 0},/p'"\ " -e 's/^$symcode$symcode* .* $lib.*$$/ {\"\1\", (void *) \&\1},/p'"\ @@ -4021,7 +4041,7 @@ if test "$lt_cv_nm_interface" = "MS dumpbin"; then # Fake it for dumpbin and say T for any non-static function, # D for any global variable and I for any imported variable. - # Also find C++ and __fastcall symbols from MSVC++, + # Also find C++ and __fastcall symbols from MSVC++ or ICC, # which start with @ or ?. lt_cv_sys_global_symbol_pipe="$AWK ['"\ " {last_section=section; section=\$ 3};"\ @@ -4039,9 +4059,9 @@ " s[1]~prfx {split(s[1],t,\"@\"); print f,t[1],substr(t[1],length(prfx))}"\ " ' prfx=^$ac_symprfx]" else - lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]$$symcode$symcode*$[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" + lt_cv_sys_global_symbol_pipe="$SED -n -e 's/^.*[[ ]]$$symcode$symcode*$[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" fi - lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | $SED '/ __gnu_lto/d'" # Check to see that the pipe works correctly. pipe_works=no @@ -4329,7 +4349,7 @@ ;; esac ;; - freebsd* | dragonfly*) + freebsd* | dragonfly* | midnightbsd*) # FreeBSD uses GNU C++ ;; hpux9* | hpux10* | hpux11*) @@ -4412,7 +4432,7 @@ _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' ;; *) - case `$CC -V 2>&1 | sed 5q` in + case `$CC -V 2>&1 | $SED 5q` in *Sun\ C*) # Sun C++ 5.9 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' @@ -4754,7 +4774,7 @@ _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' ;; *) - case `$CC -V 2>&1 | sed 5q` in + case `$CC -V 2>&1 | $SED 5q` in *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*) # Sun Fortran 8.3 passes all unrecognized flags to the linker _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' @@ -4937,7 +4957,7 @@ if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols' else - _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B$[[^B]]*$$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' + _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B$[[^B]]*$$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "L") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' fi ;; pw32*) @@ -4945,7 +4965,7 @@ ;; cygwin* | mingw* | cegcc*) case $cc_basename in - cl*) + cl* | icl*) _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' ;; *) @@ -5005,15 +5025,15 @@ case $host_os in cygwin* | mingw* | pw32* | cegcc*) - # FIXME: the MSVC++ port hasn't been tested in a loooong time + # FIXME: the MSVC++ and ICC port hasn't been tested in a loooong time # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. + # Microsoft Visual C++ or Intel C++ Compiler. if test yes != "$GCC"; then with_gnu_ld=no fi ;; interix*) - # we just hope/assume this is gcc and not c89 (= MSVC++) + # we just hope/assume this is gcc and not c89 (= MSVC++ or ICC) with_gnu_ld=yes ;; openbsd* | bitrig*) @@ -5068,7 +5088,7 @@ _LT_TAGVAR(whole_archive_flag_spec, $1)= fi supports_anon_versioning=no - case `$LD -v | $SED -e 's/([^)]\+)\s\+//' 2>&1` in + case `$LD -v | $SED -e 's/([[^)]]\+)\s\+//' 2>&1` in *GNU\ gold*) supports_anon_versioning=yes ;; *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... @@ -5180,6 +5200,7 @@ emximp -o $lib $output_objdir/$libname.def' _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + _LT_TAGVAR(file_list_spec, $1)='@' ;; interix[[3-9]]*) @@ -5194,7 +5215,7 @@ # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link # time. Moving up from 0x10000000 also allows more sbrk(2) space. _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$SED "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) @@ -5237,7 +5258,7 @@ _LT_TAGVAR(compiler_needs_object, $1)=yes ;; esac - case `$CC -V 2>&1 | sed 5q` in + case `$CC -V 2>&1 | $SED 5q` in *Sun\ C*) # Sun C 5.9 _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' _LT_TAGVAR(compiler_needs_object, $1)=yes @@ -5249,13 +5270,14 @@ if test yes = "$supports_anon_versioning"; then _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~ + cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~ echo "local: *; };" >> $output_objdir/$libname.ver~ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib' fi case $cc_basename in tcc*) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' _LT_TAGVAR(export_dynamic_flag_spec, $1)='-rdynamic' ;; xlf* | bgf* | bgxlf* | mpixlf*) @@ -5265,7 +5287,7 @@ _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' if test yes = "$supports_anon_versioning"; then _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~ + cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~ echo "local: *; };" >> $output_objdir/$libname.ver~ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' fi @@ -5397,7 +5419,7 @@ if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols' else - _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B$[[^B]]*$$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' + _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B$[[^B]]*$$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "L") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' fi aix_use_runtimelinking=no @@ -5580,12 +5602,12 @@ cygwin* | mingw* | pw32* | cegcc*) # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. + # Microsoft Visual C++ or Intel C++ Compiler. # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. case $cc_basename in - cl*) - # Native MSVC + cl* | icl*) + # Native MSVC or ICC _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' _LT_TAGVAR(allow_undefined_flag, $1)=unsupported _LT_TAGVAR(always_export_symbols, $1)=yes @@ -5626,7 +5648,7 @@ fi' ;; *) - # Assume MSVC wrapper + # Assume MSVC and ICC wrapper _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' _LT_TAGVAR(allow_undefined_flag, $1)=unsupported # Tell ltmain to make .lib files, not .a files. @@ -5674,7 +5696,7 @@ ;; # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | dragonfly*) + freebsd* | dragonfly* | midnightbsd*) _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' _LT_TAGVAR(hardcode_direct, $1)=yes @@ -5815,6 +5837,7 @@ # Fabrice Bellard et al's Tiny C Compiler _LT_TAGVAR(ld_shlibs, $1)=yes _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' ;; esac ;; @@ -5886,6 +5909,7 @@ emximp -o $lib $output_objdir/$libname.def' _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + _LT_TAGVAR(file_list_spec, $1)='@' ;; osf3*) @@ -6656,8 +6680,8 @@ cygwin* | mingw* | pw32* | cegcc*) case $GXX,$cc_basename in - ,cl* | no,cl*) - # Native MSVC + ,cl* | no,cl* | ,icl* | no,icl*) + # Native MSVC or ICC # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' @@ -6755,6 +6779,7 @@ emximp -o $lib $output_objdir/$libname.def' _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + _LT_TAGVAR(file_list_spec, $1)='@' ;; dgux*) @@ -6785,7 +6810,7 @@ _LT_TAGVAR(archive_cmds_need_lc, $1)=no ;; - freebsd* | dragonfly*) + freebsd* | dragonfly* | midnightbsd*) # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF # conventions _LT_TAGVAR(ld_shlibs, $1)=yes @@ -6922,7 +6947,7 @@ # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link # time. Moving up from 0x10000000 also allows more sbrk(2) space. _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$SED "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; irix5* | irix6*) case $cc_basename in @@ -7062,13 +7087,13 @@ _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' if test yes = "$supports_anon_versioning"; then _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~ + cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~ echo "local: *; };" >> $output_objdir/$libname.ver~ $CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib' fi ;; *) - case `$CC -V 2>&1 | sed 5q` in + case `$CC -V 2>&1 | $SED 5q` in *Sun\ C*) # Sun C++ 5.9 _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' @@ -8214,6 +8239,14 @@ AC_SUBST([DLLTOOL]) ]) +# _LT_DECL_FILECMD +# ---------------- +# Check for a file(cmd) program that can be used to detect file type and magic +m4_defun([_LT_DECL_FILECMD], +[AC_CHECK_TOOL([FILECMD], [file], [:]) +_LT_DECL([], [FILECMD], [1], [A file(cmd) program that detects file types]) +])# _LD_DECL_FILECMD + # _LT_DECL_SED # ------------ # Check for a fully-functional sed program, that truncates diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/wxsvg-1.5.23/m4/ltversion.m4 new/wxsvg-1.5.25/m4/ltversion.m4 --- old/wxsvg-1.5.23/m4/ltversion.m4 2021-11-02 17:31:40.000000000 +0100 +++ new/wxsvg-1.5.25/m4/ltversion.m4 2024-05-18 14:04:49.000000000 +0200 @@ -1,6 +1,7 @@ # ltversion.m4 -- version numbers -*- Autoconf -*- # -# Copyright (C) 2004, 2011-2015 Free Software Foundation, Inc. +# Copyright (C) 2004, 2011-2019, 2021-2022 Free Software Foundation, +# Inc. # Written by Scott James Remnant, 2004 # # This file is free software; the Free Software Foundation gives @@ -9,15 +10,15 @@ # @configure_input@ -# serial 4179 ltversion.m4 +# serial 4245 ltversion.m4 # This file is part of GNU Libtool -m4_define([LT_PACKAGE_VERSION], [2.4.6]) -m4_define([LT_PACKAGE_REVISION], [2.4.6]) +m4_define([LT_PACKAGE_VERSION], [2.4.7]) +m4_define([LT_PACKAGE_REVISION], [2.4.7]) AC_DEFUN([LTVERSION_VERSION], -[macro_version='2.4.6' -macro_revision='2.4.6' +[macro_version='2.4.7' +macro_revision='2.4.7' _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) _LT_DECL(, macro_revision, 0) ]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/wxsvg-1.5.23/missing new/wxsvg-1.5.25/missing --- old/wxsvg-1.5.23/missing 2021-11-02 17:31:42.000000000 +0100 +++ new/wxsvg-1.5.25/missing 2024-05-18 14:04:49.000000000 +0200 @@ -3,7 +3,7 @@ scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1996-2020 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard <pinard(a)iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/wxsvg-1.5.23/src/cairo/SVGCanvasCairo.cpp new/wxsvg-1.5.25/src/cairo/SVGCanvasCairo.cpp --- old/wxsvg-1.5.23/src/cairo/SVGCanvasCairo.cpp 2021-11-02 17:31:39.000000000 +0100 +++ new/wxsvg-1.5.25/src/cairo/SVGCanvasCairo.cpp 2024-05-18 14:04:49.000000000 +0200 @@ -14,6 +14,7 @@ #include "SVGCanvasImageCairo.h" #include <wx/log.h> #include <wx/file.h> +#include <cstdint> wxSVGCanvasCairo::~wxSVGCanvasCairo() { Destroy(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/wxsvg-1.5.23/src/cairo/SVGCanvasPathCairo.cpp new/wxsvg-1.5.25/src/cairo/SVGCanvasPathCairo.cpp --- old/wxsvg-1.5.23/src/cairo/SVGCanvasPathCairo.cpp 2021-11-02 17:31:39.000000000 +0100 +++ new/wxsvg-1.5.25/src/cairo/SVGCanvasPathCairo.cpp 2024-05-18 14:04:49.000000000 +0200 @@ -125,7 +125,7 @@ dashed[i] = style.GetStrokeDasharray().Item(i).GetFloatValue(); } cairo_set_dash(cr, dashed, style.GetStrokeDasharray().GetLength(), style.GetStrokeDashoffset()); - delete dashed; + delete[] dashed; } else cairo_set_dash(cr, NULL, 0, 0); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/wxsvg-1.5.23/src/mediadec_ffmpeg.cpp new/wxsvg-1.5.25/src/mediadec_ffmpeg.cpp --- old/wxsvg-1.5.23/src/mediadec_ffmpeg.cpp 2021-11-02 17:31:39.000000000 +0100 +++ new/wxsvg-1.5.25/src/mediadec_ffmpeg.cpp 2024-05-18 14:04:49.000000000 +0200 @@ -20,6 +20,7 @@ #define UINT64_C(val) val##ULL #endif extern "C" { +#include <libavcodec/avcodec.h> #include <libavformat/avformat.h> #include <libswscale/swscale.h> #include <libavutil/avutil.h> @@ -36,17 +37,20 @@ #define av_packet_unref av_free_packet #endif +#define HAVE_AVCODEC_FREE_CONTEXT (LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(55, 69, 100)) +#define HAVE_CH_LAYOUT (LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(57, 28, 100)) + wxFfmpegMediaDecoder::wxFfmpegMediaDecoder(): m_formatCtx(NULL), m_videoStream(-1), m_codecCtx(NULL), m_frame(NULL), m_width(0), m_height(0) { // nothing to do } wxFfmpegMediaDecoder::~wxFfmpegMediaDecoder() { - Close(); + Close(); } void wxFfmpegMediaDecoder::Init() { - // nothing to do + // nothing to do #if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(58, 0, 0) av_register_all(); #endif @@ -98,8 +102,8 @@ } wxSize wxFfmpegMediaDecoder::GetVideoSize() { - OpenVideoDecoder(); - return m_codecCtx ? wxSize(m_codecCtx->width, m_codecCtx->height) : wxSize(); + OpenVideoDecoder(); + return m_codecCtx ? wxSize(m_codecCtx->width, m_codecCtx->height) : wxSize(); } AVStream* wxFfmpegMediaDecoder::GetVideoStream() { @@ -153,6 +157,9 @@ } wxString wxFfmpegMediaDecoder::GetCodecName(unsigned int streamIndex) { +#if LIBAVCODEC_VERSION_MAJOR >= 59 + const +#endif AVCodec *codec = avcodec_find_decoder(m_formatCtx->streams[streamIndex]->codecpar->codec_id); if (codec) { return wxString(codec->name, wxConvLocal); @@ -161,7 +168,11 @@ } int wxFfmpegMediaDecoder::GetChannelNumber(unsigned int streamIndex) { +#if HAVE_CH_LAYOUT + return m_formatCtx ? m_formatCtx->streams[streamIndex]->codecpar->ch_layout.nb_channels : -1; +#else return m_formatCtx ? m_formatCtx->streams[streamIndex]->codecpar->channels : -1; +#endif } int wxFfmpegMediaDecoder::GetSampleRate(unsigned int streamIndex) { @@ -193,6 +204,9 @@ // find and open the decoder for the video stream AVStream* stream = m_formatCtx->streams[m_videoStream]; +#if LIBAVCODEC_VERSION_MAJOR >= 59 + const +#endif AVCodec* codec = avcodec_find_decoder(stream->codecpar->codec_id); if (!codec) return false; @@ -206,15 +220,19 @@ } void wxFfmpegMediaDecoder::CloseVideoDecoder() { - if (m_codecCtx) - avcodec_close(m_codecCtx); // close the codec - m_codecCtx = NULL; + if (m_codecCtx) +#if HAVE_AVCODEC_FREE_CONTEXT + avcodec_free_context(&m_codecCtx); +#else + avcodec_close(m_codecCtx); // close the codec +#endif + m_codecCtx = NULL; } bool wxFfmpegMediaDecoder::BeginDecode(int width, int height) { - if (!m_formatCtx || !OpenVideoDecoder()) - return false; - // video size + if (!m_formatCtx || !OpenVideoDecoder()) + return false; + // video size if (width == -1 || height == -1) { m_width = m_codecCtx->width; m_height = m_codecCtx->height; @@ -224,38 +242,46 @@ m_width = w < width ? w : width; m_height = w < width ? height : h; } - // allocate video frame - m_frame = av_frame_alloc(); - if (!m_frame) { - avcodec_close(m_codecCtx); - m_codecCtx = NULL; - return false; - } - return true; + // allocate video frame + m_frame = av_frame_alloc(); + if (!m_frame) { +#if HAVE_AVCODEC_FREE_CONTEXT + avcodec_free_context(&m_codecCtx); +#else + avcodec_close(m_codecCtx); +#endif + m_codecCtx = NULL; + return false; + } + return true; } bool wxFfmpegMediaDecoder::SetPosition(double pos, bool keyFrame, bool seekBackward) { - if (m_formatCtx == NULL) - return false; + if (m_formatCtx == NULL) + return false; if (!m_frame && !BeginDecode()) return false; - int64_t timestamp = (int64_t) (pos * AV_TIME_BASE); - if (m_formatCtx->start_time != (int64_t)AV_NOPTS_VALUE) - timestamp += m_formatCtx->start_time; - avcodec_flush_buffers(m_codecCtx); - int flags = seekBackward ? AVSEEK_FLAG_BACKWARD : 0; - if (!keyFrame) - flags = flags|AVSEEK_FLAG_ANY; - bool res = av_seek_frame(m_formatCtx, -1, timestamp, flags) >= 0; - avcodec_flush_buffers(m_codecCtx); - return res; + int64_t timestamp = (int64_t) (pos * AV_TIME_BASE); + if (m_formatCtx->start_time != (int64_t)AV_NOPTS_VALUE) + timestamp += m_formatCtx->start_time; + avcodec_flush_buffers(m_codecCtx); + int flags = seekBackward ? AVSEEK_FLAG_BACKWARD : 0; + if (!keyFrame) + flags = flags|AVSEEK_FLAG_ANY; + bool res = av_seek_frame(m_formatCtx, -1, timestamp, flags) >= 0; + avcodec_flush_buffers(m_codecCtx); + return res; } double wxFfmpegMediaDecoder::GetPosition() { AVStream *st = GetVideoStream(); if (st == NULL) return -1; +#if LIBAVCODEC_VERSION_MAJOR >= 59 + int64_t timestamp = m_cur_dts; +#else int64_t timestamp = st->cur_dts; +#endif if (timestamp == (int64_t)AV_NOPTS_VALUE) return -1; timestamp = av_rescale(timestamp, AV_TIME_BASE * (int64_t)st->time_base.num, st->time_base.den); @@ -308,6 +334,7 @@ uint8_t *rgbSrc[3] = { img.GetData(), NULL, NULL }; int rgbStride[3] = { 3 * m_width, 0, 0 }; sws_scale(imgConvertCtx, m_frame->data, m_frame->linesize, 0, m_codecCtx->height, rgbSrc, rgbStride); + m_cur_dts = packet.dts; av_packet_unref(&packet); sws_freeContext(imgConvertCtx); return img; @@ -321,7 +348,7 @@ void wxFfmpegMediaDecoder::EndDecode() { av_frame_free(&m_frame); - CloseVideoDecoder(); + CloseVideoDecoder(); } /** Returns a comma separated list of short names for the format. */ ++++++ wxsvg-fix-version.patch ++++++ diff -Pdpru wxsvg-1.5.25.orig/configure wxsvg-1.5.25/configure --- wxsvg-1.5.25.orig/configure 2024-05-18 14:04:51.000000000 +0200 +++ wxsvg-1.5.25/configure 2024-09-16 09:04:44.992447704 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.71 for wxsvg 1.5.24. +# Generated by GNU Autoconf 2.71 for wxsvg 1.5.25. # # Report bugs to <http://wxsvg.sourceforge.net/>. # @@ -621,8 +621,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='wxsvg' PACKAGE_TARNAME='wxsvg' -PACKAGE_VERSION='1.5.24' -PACKAGE_STRING='wxsvg 1.5.24' +PACKAGE_VERSION='1.5.25' +PACKAGE_STRING='wxsvg 1.5.25' PACKAGE_BUGREPORT='http://wxsvg.sourceforge.net/' PACKAGE_URL='' @@ -1421,7 +1421,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures wxsvg 1.5.24 to adapt to many kinds of systems. +\`configure' configures wxsvg 1.5.25 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1492,7 +1492,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of wxsvg 1.5.24:";; + short | recursive ) echo "Configuration of wxsvg 1.5.25:";; esac cat <<\_ACEOF @@ -1639,7 +1639,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -wxsvg configure 1.5.24 +wxsvg configure 1.5.25 generated by GNU Autoconf 2.71 Copyright (C) 2021 Free Software Foundation, Inc. @@ -2014,7 +2014,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by wxsvg $as_me 1.5.24, which was +It was created by wxsvg $as_me 1.5.25, which was generated by GNU Autoconf 2.71. Invocation command line was $ $0$ac_configure_args_raw @@ -3500,7 +3500,7 @@ fi # Define the identity of the package. PACKAGE='wxsvg' - VERSION='1.5.24' + VERSION='1.5.25' printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h @@ -18864,7 +18864,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by wxsvg $as_me 1.5.24, which was +This file was extended by wxsvg $as_me 1.5.25, which was generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -18923,7 +18923,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ -wxsvg config.status 1.5.24 +wxsvg config.status 1.5.25 configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" diff -Pdpru wxsvg-1.5.25.orig/configure.ac wxsvg-1.5.25/configure.ac --- wxsvg-1.5.25.orig/configure.ac 2024-05-18 14:04:49.000000000 +0200 +++ wxsvg-1.5.25/configure.ac 2024-09-16 09:05:02.988893909 +0200 @@ -2,7 +2,7 @@ # initialization AC_PREREQ([2.71]) -AC_INIT([wxsvg],[1.5.24],[http://wxsvg.sourceforge.net/]) +AC_INIT([wxsvg],[1.5.25],[http://wxsvg.sourceforge.net/]) AC_CONFIG_MACRO_DIR([m4]) AM_INIT_AUTOMAKE(foreign) AM_MAINTAINER_MODE

1 0