Compare commits

..

1 commit

Author SHA1 Message Date
Than Ngo
457e1c4ecd fixed bz#1529207 - enable MP3 support 2018-06-07 11:14:46 +02:00
8 changed files with 45 additions and 486 deletions

View file

@ -1,24 +0,0 @@
diff -Nrup a/acinclude.m4 b/acinclude.m4
--- a/acinclude.m4 2020-01-21 10:45:14.027264269 -0700
+++ b/acinclude.m4 2020-01-21 13:18:07.723051119 -0700
@@ -10337,7 +10337,7 @@ sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
symxfrm='\1 \2\3 \3'
# Transform an extracted symbol line into a proper C declaration
-lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
+lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$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 -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
diff -Nrup a/libltdl/ltdl.m4 b/libltdl/ltdl.m4
--- a/libltdl/ltdl.m4 2020-01-21 10:45:13.688265229 -0700
+++ b/libltdl/ltdl.m4 2020-01-21 13:18:34.959974842 -0700
@@ -249,7 +249,7 @@ ac_sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
ac_symxfrm='\1 \2\3 \3'
# Transform an extracted symbol line into a proper C declaration
-ac_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern char \1;/p'"
+ac_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
# Define system-specific variables.
case "$host_os" in

View file

@ -1,9 +1,8 @@
diff -up arts-1.5.10/mcop/dispatcher.cc.debug arts-1.5.10/mcop/dispatcher.cc
--- arts-1.5.10/mcop/dispatcher.cc.debug 2008-02-13 10:35:23.000000000 +0100
+++ arts-1.5.10/mcop/dispatcher.cc 2022-11-24 09:29:26.445273664 +0100
@@ -216,8 +216,7 @@ Dispatcher::Dispatcher(IOManager *ioMana
--- arts-1.1.4/mcop/dispatcher.cc.orig 2003-09-29 22:34:19.000000000 +0200
+++ arts-1.1.4/mcop/dispatcher.cc 2003-09-29 22:36:50.000000000 +0200
@@ -214,8 +214,7 @@
orig_sigpipe = signal(SIGPIPE,SIG_IGN);
if((orig_sigpipe != SIG_DFL) && (orig_sigpipe != SIG_IGN))
if(orig_sigpipe != SIG_DFL)
{
- cerr << "mcop warning: user defined signal handler found for"
- " SIG_PIPE, overriding" << endl;

View file

@ -1,21 +0,0 @@
diff -up arts-1.5.10/admin/cvs.sh.autoconf2.7x arts-1.5.10/admin/cvs.sh
--- arts-1.5.10/admin/cvs.sh.autoconf2.7x 2008-08-19 22:18:41.000000000 +0200
+++ arts-1.5.10/admin/cvs.sh 2021-08-31 15:15:42.907835119 +0200
@@ -32,7 +32,7 @@ check_autotool_versions()
required_autoconf_version="2.53 or newer"
AUTOCONF_VERSION=`$AUTOCONF --version | head -n 1`
case $AUTOCONF_VERSION in
- Autoconf*2.5* | autoconf*2.5* | autoconf*2.6* ) : ;;
+ Autoconf*2.5* | autoconf*2.5* | autoconf*2.6* | autoconf*2.7*) : ;;
"" )
echo "*** AUTOCONF NOT FOUND!."
echo "*** KDE requires autoconf $required_autoconf_version"
@@ -47,7 +47,7 @@ esac
AUTOHEADER_VERSION=`$AUTOHEADER --version | head -n 1`
case $AUTOHEADER_VERSION in
- Autoconf*2.5* | autoheader*2.5* | autoheader*2.6* ) : ;;
+ Autoconf*2.5* | autoheader*2.5* | autoheader*2.6* | autoheader*2.7*) : ;;
"" )
echo "*** AUTOHEADER NOT FOUND!."
echo "*** KDE requires autoheader $required_autoconf_version"

View file

@ -1,104 +0,0 @@
Avoid implicit declaration of exit and implicit ints.
Also fix the return type of the va_copy probe function.
The libtool change is in libtool upstream already, via:
commit 4eca607f697f0c264476436913b9720d3d069e87
Author: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Mon Aug 11 22:36:42 2008 +0200
Remove use of exit in configure test sources.
* libltdl/m4/libtool.m4 (_LT_TRY_DLOPEN_SELF): Return from main,
to avoid using undeclared exit.
Report against OpenMPI from Coverity via Jeff Squyres.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
diff --git a/admin/libtool.m4.in b/admin/libtool.m4.in
index 7f5eed6d83a973fa..70703d6c1f1bf71e 100644
--- a/admin/libtool.m4.in
+++ b/admin/libtool.m4.in
@@ -777,7 +777,7 @@ int main ()
/* dlclose (self); */
}
- exit (status);
+ return status;
}]
EOF
if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
diff --git a/configure b/configure
index 649739b168ae8dc3..00fc221e124a2703 100755
--- a/configure
+++ b/configure
@@ -42024,7 +42024,7 @@ cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <stdarg.h>
- void f (int i, ...) {
+ int f (int i, ...) {
va_list args1, args2;
va_start (args1, i);
va_copy (args2, args1);
diff --git a/flow/gsl/configure.in.in b/flow/gsl/configure.in.in
index 3b147b9265085e28..b8274808a88ebfba 100644
--- a/flow/gsl/configure.in.in
+++ b/flow/gsl/configure.in.in
@@ -23,12 +23,12 @@ AC_CACHE_CHECK([size of $2], glib_Sizeof,
#include <stddef.h>
#endif
$1
-main()
+int main()
{
FILE *f=fopen("conftestval", "w");
- if (!f) exit(1);
+ if (!f) return 1;
fprintf(f, "%d\n", sizeof($2));
- exit(0);
+ return 0;
}],
[glib_Sizeof=`cat conftestval` dnl''
],
@@ -160,12 +160,12 @@ dnl all results in config.log for bug reports.
AC_CACHE_CHECK([for an implementation of va_copy()],glib_cv_va_copy,[
AC_TRY_RUN([
#include <stdarg.h>
- void f (int i, ...) {
+ int f (int i, ...) {
va_list args1, args2;
va_start (args1, i);
va_copy (args2, args1);
if (va_arg (args2, int) != 42 || va_arg (args1, int) != 42)
- exit (1);
+ return 1;
va_end (args1); va_end (args2);
}
int main() {
@@ -179,12 +179,12 @@ AC_CACHE_CHECK([for an implementation of va_copy()],glib_cv_va_copy,[
AC_CACHE_CHECK([for an implementation of __va_copy()],glib_cv___va_copy,[
AC_TRY_RUN([
#include <stdarg.h>
- void f (int i, ...) {
+ int f (int i, ...) {
va_list args1, args2;
va_start (args1, i);
__va_copy (args2, args1);
if (va_arg (args2, int) != 42 || va_arg (args1, int) != 42)
- exit (1);
+ return 1;
va_end (args1); va_end (args2);
}
int main() {
diff --git a/flow/gsl/gslglib.c b/flow/gsl/gslglib.c
index f913df2101efb3c1..781ad77dfbd476dc 100644
--- a/flow/gsl/gslglib.c
+++ b/flow/gsl/gslglib.c
@@ -1,3 +1,5 @@
+#define _GNU_SOURCE /* for vasprintf */
+
#include "gsl/gslglib.h"
#include "gsl/gsldefs.h"

178
arts.spec
View file

@ -1,16 +1,16 @@
%define _default_patch_fuzz 2
%define multilib_arches %{ix86} x86_64 ppc ppc64 s390 s390x sparcv9 sparc64
# This package ships .la files
%global __brp_remove_la_files %nil
# Disable LTO because it breaks ALSA versioned symbol use, crashing (#1910437)
%global _lto_cflags %nil
Name: arts
Summary: aRts (analog realtime synthesizer) - the KDE sound system
Group: System Environment/Daemons
Epoch: 8
Version: 1.5.10
Release: 69%{?dist}
Release: 39%{?dist}
License: LGPL-2.0-or-later
License: LGPLv2+
Url: http://www.kde.org
Source0: ftp://ftp.kde.org/pub/kde/stable/3.5.10/src/%{name}-%{version}.tar.bz2
Source1: gslconfig-wrapper.h
@ -30,9 +30,6 @@ Patch11: arts-1.5.10-alsa11.patch
Patch50: arts-1.5.4-dlopenext.patch
Patch51: kde-3.5-libtool-shlibext.patch
Patch52: arts-1.5.8-glibc-libio.patch
Patch53: arts-autoconf-2.7x.patch
Patch54: arts-c99.patch
Patch55: kde3-autoconf-2.72.patch
# upstream patches
@ -53,17 +50,10 @@ Patch301: kde3-automake-version.patch
# fix build failure with automake 1.13: add the --add-missing --copy flags
# also add --force-missing to get aarch64 support (#925029/#925627)
Patch302: kde3-automake-add-missing.patch
# fix aarch64 FTBFS due to libtool not liking the file output on *.so files
Patch303: kde3-libtool-aarch64.patch
Patch304: args-1.5.8-configure.patch
# Don't use __FILE__ like a string literal
Patch305: file-literal.patch
# used in artsdsp
Requires: which
BuildRequires: gcc-c++
BuildRequires: qt3-devel >= 3.3.8
BuildRequires: alsa-lib-devel
BuildRequires: audiofile-devel
@ -74,7 +64,6 @@ BuildRequires: libvorbis-devel
BuildRequires: pkgconfig
BuildRequires: chrpath
BuildRequires: libmad-devel
BuildRequires: make
%description
arts (analog real-time synthesizer) is the sound system of KDE 3.
@ -89,6 +78,7 @@ tasks like simulating a mixer, generating an instrument or things like
playing a wave file with some effects.
%package devel
Group: Development/Libraries
Summary: Development files for the aRts sound server
Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release}
Requires: qt3-devel
@ -100,37 +90,31 @@ Install %{name}-devel if you intend to write applications using aRts.
%prep
%setup -q
%patch -P1 -p1 -b .debug
%patch -P2 -p1 -b .glib
%patch -P5 -p1 -b .alsa
%patch -P6 -p1 -b .glibc
%patch -P8 -p1 -b .multilib
%patch -P9 -p1 -b .cpu-overload-quiet
%patch -P10 -p1 -b .assertion-failure
%patch -P11 -p1 -b .alsa11
%patch1 -p1 -b .debug
%patch2 -p1 -b .glib
%patch5 -p1 -b .alsa
%patch6 -p1 -b .glibc
%patch8 -p1 -b .multilib
%patch9 -p1 -b .cpu-overload-quiet
%patch10 -p1 -b .assertion-failure
%patch11 -p1 -b .alsa11
%patch -P50 -p1 -b .dlopenext
%patch -P51 -p1 -b .libtool-shlibext
%patch -P52 -p1 -b .glibc-libio
%patch -P53 -p1 -b .autoconf2.7x
%patch -P54 -p1 -b .c99
%patch -P55 -p1 -b .autoconf-2.72
%patch50 -p1 -b .dlopenext
%patch51 -p1 -b .libtool-shlibext
%patch52 -p1 -b .glibc-libio
%patch -P200 -p1 -b .CVE-2009-3736
%patch -P201 -p1 -b .CVE-2015-7543
%patch200 -p1 -b .CVE-2009-3736
%patch201 -p1 -b .CVE-2015-7543
%patch -P300 -p1 -b .acinclude
%patch -P301 -p1 -b .automake-version
%patch -P302 -p1 -b .automake-add-missing
%patch -P303 -p1 -b .libtool-aarch64
%patch -P304 -p1 -b .configure
%patch -P305 -p1 -b .file-literal
%patch300 -p1 -b .acinclude
%patch301 -p1 -b .automake-version
%patch302 -p1 -b .automake-add-missing
make -f admin/Makefile.common cvs
%build
unset QTDIR && . /etc/profile.d/qt.sh
export CXXFLAGS="%{optflags} -Wno-error=narrowing --std=gnu++17"
export CXXFLAGS="%{optflags} -Wno-error=narrowing"
%configure \
--includedir=%{_includedir}/kde \
@ -148,13 +132,14 @@ sed -i -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' libtool
## hack for artsdsp (see http://bugzilla.redhat.com/329671)
#make %{?_smp_mflags} -k || \
# sed -i -e "s|-Wp,-D_FORTIFY_SOURCE=2||" artsc/Makefile && \
%make_build
make %{?_smp_mflags}
%install
export PATH=`pwd`:$PATH
rm -rf %{buildroot}
%make_install
export PATH=`pwd`:$PATH
make install DESTDIR=%{buildroot}
%ifarch %{multilib_arches}
# Ugly hack to allow parallel installation of 32-bit and 64-bit arts-devel
@ -192,10 +177,15 @@ find $RPM_BUILD_ROOT%{_libdir} -name "*.la" | xargs \
test -z "$(chrpath --list %{buildroot}%{_bindir}/artsd 2>/dev/null | grep RPATH=)"
%ldconfig_scriptlets
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%files
%license COPYING.LIB
%defattr(-,root,root,-)
%doc COPYING.LIB
%dir %{_libdir}/mcop
%dir %{_libdir}/mcop/Arts
%{_libdir}/mcop/Arts/*
@ -212,6 +202,7 @@ test -z "$(chrpath --list %{buildroot}%{_bindir}/artsd 2>/dev/null | grep RPATH=
%{_bindir}/artswrapper
%files devel
%defattr(-,root,root,-)
%{_bindir}/mcopidl
%dir %{_includedir}/kde
%{_includedir}/kde/arts/
@ -222,103 +213,10 @@ test -z "$(chrpath --list %{buildroot}%{_bindir}/artsd 2>/dev/null | grep RPATH=
%changelog
* Wed Jul 15 2026 Fedora Release Engineering <releng@fedoraproject.org> - 8:1.5.10-69
- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
* Fri Feb 06 2026 Than Ngo <than@redhat.com> - 8:1.5.10-68
- Fix rhbz#2433872 - FTBFS
* Fri Jan 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 8:1.5.10-67
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
* Fri Jan 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 8:1.5.10-66
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
* Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 8:1.5.10-65
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
* Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 8:1.5.10-64
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
* Mon Oct 21 2024 Than Ngo <than@redhat.com> - 8:1.5.10-63
- Fix rhbz#2300566, FTBFS
* Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 8:1.5.10-62
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
* Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 8:1.5.10-61
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 8:1.5.10-60
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Wed Nov 22 2023 Florian Weimer <fweimer@redhat.com> - 8:1.5.10-59
- Update C99 patch
* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 8:1.5.10-58
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Mon Jun 12 2023 Than Ngo <than@redhat.com> - 1.5.10-57
- migrated to SPDX license
* Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 8:1.5.10-56
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Thu Nov 24 2022 Florian Weimer <fweimer@redhat.com> - 8:1.5.10-55
- Port to C99 (#2147552)
* Tue Nov 08 2022 Kevin Kofler <Kevin@tigcc.ticalc.org> - 8:1.5.10-54
- Disable LTO because it breaks ALSA versioned symbol use, crashing (#1910437)
* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 8:1.5.10-53
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Mon Jan 24 2022 Timm Bäder <tbaeder@redhat.com> - 8:1.5.10-52
- Opt out of .la file removal
- https://fedoraproject.org/wiki/Changes/RemoveLaFiles
* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 8:1.5.10-51
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Tue Aug 31 2021 Than Ngo <than@redhat.com> - 8:1.5.10-50
- Fixed bz#1999495, FTBFS against autoconf-2.7x
* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 8:1.5.10-49
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 8:1.5.10-48
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 8:1.5.10-47
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 8:1.5.10-46
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Tue Jan 21 2020 Jeff Law <law@redhat.com> - 8:1.5.10-45
- Fix configure tests compromised by LTO
* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 8:1.5.10-44
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 8:1.5.10-43
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Sat Jan 05 2019 Kevin Kofler <Kevin@tigcc.ticalc.org> - 8:1.5.10-42
- fix aarch64 FTBFS due to libtool not liking the file output on *.so files
* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 8:1.5.10-41
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Thu Jun 28 2018 Rex Dieter <rdieter@fedoraproject.org> - 8:1.5.10-40
- .spec cleanup
- drop Group:, %%defattr
- use %%make_build %%make_install %%license %%ldconfig_scriptlets
* Thu Jun 07 2018 Than Ngo <than@redhat.com> - 8:1.5.10-39
* Thu Jun 07 2018 Than Ngo <than@redhat.com> - 1.5.10-39
- fixed bz#1529207 - enable MP3 support
* Thu Jun 07 2018 Than Ngo <than@redhat.com> - 8:1.5.10-38
* Thu Jun 07 2018 Than Ngo <than@redhat.com> - 1.5.10-38
- fixed bz#1582764, FTBFS
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 8:1.5.10-37

View file

@ -1,24 +0,0 @@
diff -ruN arts-1.5.10.orig/soundserver/gslplayobject_impl.cc arts-1.5.10/soundserver/gslplayobject_impl.cc
--- arts-1.5.10.orig/soundserver/gslplayobject_impl.cc 2005-09-10 10:13:31.000000000 +0200
+++ arts-1.5.10/soundserver/gslplayobject_impl.cc 2020-12-02 11:51:56.830633446 +0100
@@ -134,7 +134,7 @@
*/
std::string description()
{
- return "no description available (see "__FILE__")";
+ return "no description available (see gslplayobject_impl.cc)";
}
poTime currentTime()
diff -ruN arts-1.5.10.orig/soundserver/wavplayobject_impl.cc arts-1.5.10/soundserver/wavplayobject_impl.cc
--- arts-1.5.10.orig/soundserver/wavplayobject_impl.cc 2005-09-10 10:13:31.000000000 +0200
+++ arts-1.5.10/soundserver/wavplayobject_impl.cc 2020-12-02 11:52:22.896555247 +0100
@@ -74,7 +74,7 @@
* KMedia2 interface
*/
string description() {
- return "no description (see "__FILE__")";
+ return "no description (see wavplayobject_impl.cc)";
}
poTime currentTime() {

View file

@ -1,153 +0,0 @@
diff -up kdebase-3.5.10/admin/acinclude.m4.in.me kdebase-3.5.10/admin/acinclude.m4.in
--- kdebase-3.5.10/admin/acinclude.m4.in.me 2024-04-22 16:33:28.286459023 +0200
+++ kdebase-3.5.10/admin/acinclude.m4.in 2024-04-22 23:11:19.667504254 +0200
@@ -2629,8 +2629,8 @@ AC_TRY_LINK(
LIBS="$ac_save_LIBS"
CXXFLAGS="$ac_save_CXXFLAGS"
AC_LANG_RESTORE
-fi
])
+fi
if eval "test ! \"`echo $kde_cv_qt_jpeg`\" = no"; then
AC_MSG_RESULT(yes)
@@ -2744,68 +2744,69 @@ KDE_TRY_TIFFLIB(tiff, [],
AC_SUBST(LIBTIFF)
])
-AC_DEFUN([KDE_FIND_LIBEXR],
-[
+AC_DEFUN([KDE_FIND_LIBEXR],
+[
AC_REQUIRE([KDE_CHECK_EXTRA_LIBS])
-AC_REQUIRE([AC_FIND_ZLIB])
-AC_CACHE_VAL(ac_cv_libexr,
-[
+AC_REQUIRE([AC_FIND_ZLIB])
+AC_CACHE_VAL(ac_cv_libexr,
+[
if test -z "$PKG_CONFIG"; then
AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
- fi
-
+ fi
+
AC_MSG_CHECKING([for OpenEXR libraries])
-
+
if test "$PKG_CONFIG" = "no" ; then
- AC_MSG_RESULT(no)
+ AC_MSG_RESULT(no)
echo "*** The pkg-config script could not be found. Make sure it is"
echo "*** in your path, or set the PKG_CONFIG environment variable"
echo "*** to the full path to pkg-config."
echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
- else
+ else
if ! $PKG_CONFIG --exists OpenEXR ; then
- AC_MSG_RESULT(no)
+ AC_MSG_RESULT(no)
EXRSTATUS=no
- else
+ else
if ! $PKG_CONFIG --atleast-version="1.1.1" OpenEXR ; then
- AC_MSG_RESULT(no)
+ AC_MSG_RESULT(no)
EXRSTATUS=old
else
kde_save_LIBS="$LIBS"
LIBS="$LIBS $all_libraries $USER_LDFLAGS `pkg-config --libs OpenEXR` $LIBZ"
- AC_LANG_SAVE
- AC_LANG_CPLUSPLUS
+ AC_LANG_SAVE
+ AC_LANG_CPLUSPLUS
kde_save_CXXFLAGS="$CXXFLAGS"
EXR_FLAGS=`$PKG_CONFIG --cflags OpenEXR`
CXXFLAGS="$CXXFLAGS $all_includes $USER_INCLUDES $EXR_FLAGS"
+ fi
+ fi
+ fi
+ AC_TRY_LINK(
+ [
+ #include <ImfRgbaFile.h>
+ ],
+ [
+ using namespace Imf;
+ RgbaInputFile file ("dummy");
+ return 0;
+ ],
+ eval "ac_cv_libexr='`pkg-config --libs OpenEXR`'",
+ eval "ac_cv_libexr=no"
+ )
+ LIBS="$kde_save_LIBS"
+ CXXFLAGS="$kde_save_CXXFLAGS"
+ AC_LANG_RESTORE
+ ])
- AC_TRY_LINK(dnl
- [
- #include <ImfRgbaFile.h>
- ],
- [
- using namespace Imf;
- RgbaInputFile file ("dummy");
- return 0;
- ],
- eval "ac_cv_libexr='`pkg-config --libs OpenEXR`'",
- eval "ac_cv_libexr=no"
- )
- LIBS="$kde_save_LIBS"
- CXXFLAGS="$kde_save_CXXFLAGS"
- AC_LANG_RESTORE
- ])dnl
- if eval "test ! \"`echo $ac_cv_libexr`\" = no"; then
- AC_DEFINE_UNQUOTED(HAVE_EXR, 1, [Define if you have OpenEXR])
- LIB_EXR="$ac_cv_libexr"
- AC_MSG_RESULT($ac_cv_libexr)
- else
- AC_MSG_RESULT(no)
- LIB_EXR=""
- fi
- fi
- fi
+ if eval "test ! \"`echo $ac_cv_libexr`\" = no"; then
+ AC_DEFINE_UNQUOTED(HAVE_EXR, 1, [Define if you have OpenEXR])
+ LIB_EXR="$ac_cv_libexr"
+ AC_MSG_RESULT($ac_cv_libexr)
+ else
+ AC_MSG_RESULT(no)
+ LIB_EXR=""
fi
+
AC_SUBST(LIB_EXR)
AC_SUBST(EXR_FLAGS)
])
@@ -2828,7 +2829,7 @@ fi
kde_save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $all_includes $USER_INCLUDES"
-AC_TRY_LINK(dnl
+AC_TRY_LINK(
[
#include<png.h>
],
@@ -2842,7 +2843,7 @@ AC_TRY_LINK(dnl
)
LIBS="$kde_save_LIBS"
CFLAGS="$kde_save_CFLAGS"
-])dnl
+])
if eval "test ! \"`echo $ac_cv_lib_png`\" = no"; then
AC_DEFINE_UNQUOTED(HAVE_LIBPNG, 1, [Define if you have libpng])
LIBPNG="$ac_cv_lib_png"
@@ -5926,10 +5927,6 @@ We need perl to generate some code.])
AC_DEFUN([KDE_CHECK_LARGEFILE],
[
AC_SYS_LARGEFILE
-if test "$ac_cv_sys_file_offset_bits" != no; then
- CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits"
-fi
-
if test "x$ac_cv_sys_large_files" != "xno"; then
CPPFLAGS="$CPPFLAGS -D_LARGE_FILES=1"
fi

View file

@ -1,12 +0,0 @@
diff -ur arts-1.5.10/admin/libtool.m4.in arts-1.5.10-libtool-aarch64/admin/libtool.m4.in
--- arts-1.5.10/admin/libtool.m4.in 2008-08-19 22:18:41.000000000 +0200
+++ arts-1.5.10-libtool-aarch64/admin/libtool.m4.in 2019-01-05 15:49:34.392485082 +0100
@@ -2181,7 +2181,7 @@
# This must be Linux ELF.
linux*)
case $host_cpu in
- alpha* | hppa* | i*86 | ia64* | m68* | mips* | powerpc* | sparc* | s390* | sh* | x86_64* )
+ alpha* | hppa* | i*86 | ia64* | m68* | mips* | powerpc* | sparc* | s390* | sh* | x86_64* | aarch64* )
lt_cv_deplibs_check_method=pass_all ;;
# the debian people say, arm and glibc 2.3.1 works for them with pass_all
arm* )