commit a52336f6e89452b58741193841da2280d0a1c9e2
Author: Jan Palus <[email protected]>
Date: Wed Aug 26 19:27:53 2020 +0200
add/fix/toggle building with more system libs
thunderbird.spec | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/thunderbird.spec b/thunderbird.spec
index 35dc629..f080a67 100644
--- a/thunderbird.spec
+++ b/thunderbird.spec
@@ -12,7 +12,7 @@
%bcond_with shared_js # shared libmozjs library [broken]
%bcond_without system_icu # build without system ICU
%bcond_with system_cairo # build with system cairo (not supported in
60.0)
-%bcond_with system_libvpx # build with system libvpx (60.7.0 does not
build with libvpx 1.8)
+%bcond_without system_libvpx # build with system libvpx
%bcond_with clang # build using Clang/LLVM
%bcond_with lowmem # lower memory requirements
@@ -192,7 +192,8 @@ BuildRequires: libjpeg-devel >= 6b
BuildRequires: libjpeg-turbo-devel
BuildRequires: libpng-devel >= 2:1.6.25
BuildRequires: libstdc++-devel >= 6:4.8.1
-%{?with_system_libvpx:BuildRequires: libvpx-devel >= 1.5.0}
+BuildRequires: libwebp-devel >= 1.0.2
+%{?with_system_libvpx:BuildRequires: libvpx-devel >= 1.8.0}
BuildRequires: llvm-devel
BuildRequires: mozldap-devel
BuildRequires: nodejs >= 8.11
@@ -227,7 +228,8 @@ Requires: glibc >= 6:2.17
Requires: gtk+3 >= 3.14.0
Requires: libpng >= 2:1.6.25
Requires: libstdc++ >= 6:4.8.1
-%{?with_system_libvpx:Requires: libvpx >= 1.5.0}
+Requires: libwebp >= 1.0.2
+%{?with_system_libvpx:Requires: libvpx >= 1.8.0}
Requires: myspell-common
Requires: nspr >= 1:%{nspr_ver}
Requires: nss >= 1:%{nss_ver}
@@ -1320,8 +1322,9 @@ ac_add_options --enable-default-toolkit=cairo-gtk3
%{?with_gold:ac_add_options --enable-linker=gold}
%{?with_shared_js:ac_add_options --enable-shared-js}
%{?with_system_cairo:ac_add_options --enable-system-cairo}
-ac_add_options --enable-system-ffi
+ac_add_options --enable-system-pixman
ac_add_options --with-distribution-id=org.pld-linux
+ac_add_options --with-system-ffi
ac_add_options --with%{!?with_system_icu:out}-system-icu
ac_add_options --with-system-jpeg
ac_add_options --with-system-libevent
@@ -1329,6 +1332,7 @@ ac_add_options
--with%{!?with_system_libvpx:out}-system-libvpx
ac_add_options --with-system-nspr
ac_add_options --with-system-nss
ac_add_options --with-system-png
+ac_add_options --with-system-webp
ac_add_options --with-system-zlib
EOF
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/thunderbird.git/commitdiff/6204873ce402fcca669c03f523f764c48e33c3a1
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
