From e789688392aa3011b698b802ccb9b58d92444688 Mon Sep 17 00:00:00 2001 From: Peter Michael Green Date: Thu, 15 Aug 2019 03:47:03 +0000 Subject: [PATCH] Don't use system libvpx --- debian/changelog | 1 + debian/control | 1 - debian/control.in | 3 +++ debian/rules | 6 +++--- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1348dc72cd0..7ae9fb70157 100644 --- 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 Wed, 14 Aug 2019 22:49:11 +0000 diff --git a/debian/control b/debian/control index ecf089f132e..f28cf542c7c 100644 --- 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 91d3e57ec70..314530af1c7 100644 --- 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 b1e9cfee4c1..b0890da4529 100755 --- 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 -- 2.30.2