Don't use system libvpx

diff --git a/debian/changelog b/debian/changelog
index 1348dc72cd0c51265eb2012a2aeb1183016cf55c..7ae9fb70157abca3d1a8cfd66d75aeb184188d64 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ firefox-esr (60.8.0esr-1+rpi1) bullseye-staging; urgency=medium
 
   [changes introduce in 60.8.0esr-1+rpi1 by Peter Michael Green]
   * Use a fake homedir for build (Closes: 933757).
+  * Don't use system libvpx (changes adapted from https://salsa.debian.org/mozilla-team/firefox/commit/f26d0387eea70b2ebceabeb86ec728227199f302 )
 
  -- Peter Michael Green <plugwash@raspbian.org>  Wed, 14 Aug 2019 22:49:11 +0000
 

diff --git a/debian/control b/debian/control
index ecf089f132ef8e9bdeced8592370726b047129a6..f28cf542c7c902334e821cbf2533c7bce6c55921 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -24,7 +24,6 @@ Build-Depends: autotools-dev,
                libnspr4-dev (>= 2:4.19~),
                libnss3-dev (>= 2:3.36.4~),
                libsqlite3-dev (>= 3.22.0),
-               libvpx-dev (>= 1.5.0),
                libhunspell-dev (>= 1.5),
                libdbus-glib-1-dev,
                libffi-dev,

diff --git a/debian/control.in b/debian/control.in
index 91d3e57ec70b492a8709a6f3385109a9fa60cda0..314530af1c79432654e5d15a74c97641adf565a9 100644 (file)
--- a/debian/control.in
+++ b/debian/control.in
@@ -85,6 +85,9 @@ Build-Depends: autotools-dev,
 Build-Conflicts: graphicsmagick-imagemagick-compat,
                  liboss4-salsa-dev,
                  libhildonmime-dev,
+%if USE_SYSTEM_VPX
+                 libvpx-dev (>= 1.8.0),
+%endif
                  libosso-dev
 Standards-Version: 3.9.8.0
 Vcs-Git: https://salsa.debian.org/mozilla-team/firefox.git -b @SHORT_SOURCE_CHANNEL@/master

diff --git a/debian/rules b/debian/rules
index b1e9cfee4c1dae494e74b5b5a9a18c98519e8fba..b0890da4529666867e6d07ba76e2c45c31a6df18 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -25,9 +25,9 @@ SYSTEM_LIBS = zlib bz2 ffi
 ifeq (,$(filter wheezy jessie stretch,$(DIST)))
 SYSTEM_LIBS += hunspell nspr nss sqlite libevent
 endif
-ifeq (,$(filter wheezy jessie,$(DIST)))
-SYSTEM_LIBS += vpx
-endif
+#ifeq (,$(filter wheezy jessie bullseye,$(DIST)))
+#SYSTEM_LIBS += vpx
+#endif
 
 define system_lib
 USE_SYSTEM_$(1) ?= 1