ffmpeg: libvpx fixup

component/ffmpeg/buildout.cfg

@@ -62,10 +62,12 @@ url = http://www.tortall.net/projects/yasm/releases/yasm-1.1.0.tar.gz
 recipe = slapos.recipe.cmmi
 url = https://storage.googleapis.com/downloads.webmproject.org/releases/webm/libvpx-1.5.0.tar.bz2
 md5sum = 49e59dd184caa255886683facea56fca
+location = @@LOCATION@@
 configure-options =
   --enable-shared
 environment =
   PATH=${yasm:location}/bin:%(PATH)s
+  LDFLAGS=-Wl,-rpath=${:location}/lib
 
 [libx264]
 recipe = slapos.recipe.cmmi
@@ -96,6 +98,7 @@ configure-options =
 recipe = slapos.recipe.cmmi
 url = https://ffmpeg.org/releases/ffmpeg-4.1.4.tar.bz2
 md5sum = 611d171e4aee749b85e04d17e2aee71d
+location = @@LOCATION@@
 pkg_config_depends = ${libxcb:location}/lib/pkgconfig:${libxcb:pkg_config_depends}:${libtheora:location}/lib/pkgconfig:${libtheora:pkg_config_depends}:${libvpx:location}/lib/pkgconfig:${libx264:location}/lib/pkgconfig:${opencore-amr:location}/lib/pkgconfig:${zlib:location}/lib/pkgconfig
 configure-options =
  --enable-gpl
@@ -119,5 +122,5 @@ configure-options =
 environment =
   PKG_CONFIG_PATH=${:pkg_config_depends}
   CPPFLAGS=-I${bzip2:location}/include -I${libogg:location}/include -I${libtheora:location}/include -I${opencore-amr:location}/include -I${lame:location}/include
-  LDFLAGS=-Wl,-rpath=${buildout:parts-directory}/${:_buildout_section_name_}/lib -L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -Wl,-rpath=${libxcb:location}/lib -L${libogg:location}/lib -L${libvorbis:location}/lib -Wl,-rpath=${libvorbis:location}/lib -L${libtheora:location}/lib -Wl,-rpath=${libtheora:location}/lib -L${libvpx:location}/lib -Wl,-rpath=${libvpx:location}/lib -L${libx264:location}/lib -Wl,-rpath=${libx264:location}/lib -L${lame:location}/lib -Wl,-rpath=${lame:location}/lib -L${opencore-amr:location}/lib -Wl,-rpath=${opencore-amr:location}/lib -Wl,-rpath=${zlib:location}/lib
+  LDFLAGS=-Wl,-rpath=${:location}/lib -L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -Wl,-rpath=${libxcb:location}/lib -L${libogg:location}/lib -L${libvorbis:location}/lib -Wl,-rpath=${libvorbis:location}/lib -L${libtheora:location}/lib -Wl,-rpath=${libtheora:location}/lib -L${libvpx:location}/lib -Wl,-rpath=${libvpx:location}/lib -L${libx264:location}/lib -Wl,-rpath=${libx264:location}/lib -L${lame:location}/lib -Wl,-rpath=${lame:location}/lib -L${opencore-amr:location}/lib -Wl,-rpath=${opencore-amr:location}/lib -Wl,-rpath=${zlib:location}/lib
   PATH=${pkgconfig:location}/bin:${yasm:location}/bin:%(PATH)s

software/peertube/software.cfg

@@ -21,8 +21,6 @@ extends =
   ../../component/nginx/buildout.cfg
   ../../component/ffmpeg/buildout.cfg
   ../../component/postgresql/buildout.cfg
-  ../../component/openssl/buildout.cfg
-  ../../component/nss/buildout.cfg
   ../../component/nspr/buildout.cfg
   ../../component/gcc/buildout.cfg
   ../../component/libxml2/buildout.cfg
@@ -43,8 +41,6 @@ parts =
   vim
   nodejs
   yarn
-  nss
-  nspr
   openssl
   python3
   nginx
@@ -72,13 +68,15 @@ path = ${peertube:location}
 environment =
   PATH=${unzip:location}/bin:${vim:location}/bin:${nodejs:location}/bin:${yarn:location}/bin:${python3:location}/bin:${nginx:location}/sbin:${postgresql10:location}/bin:${gcc-10.2:location}/bin:${redis:location}/bin:{git:location}/bin:{wget:location}/bin:%(PATH)s
   CPPFLAGS=-I${openssl:location}/include
-  LDFLAGS=-L${curl:location}/lib -Wl,-rpath -Wl,${openssl:location}/lib -Wl, -rpath=${nss:location}/lib,-rpath=${nspr:location}/lib -rpath -Wl
+  LDFLAGS=-L${curl:location}/lib -Wl,-rpath -Wl,${openssl:location}/lib -Wl, -L${libvpx:location}/lib -Wl,-rpath=${libvpx:location}/lib -rpath -Wl
+  LD_LIBRARY_PATH=${libvpx:location}/lib
 pre-configure =
   ${yarn:location}/bin/yarn install --production --pure-lockfile
 configure-command = true
 make-binary = cd ${peertube:location} && ${yarn:location}/bin/yarn
 post-install =
   rm -rf ${buildout:directory}/.cache/yarn/
+  rm -rf ${buildout:directory}/parts/peertube/client/node_modules/chromedriver/
 
 [peertube-postgresql-setup.in]
 recipe  = slapos.recipe.build:download