diff --git a/component/ffmpeg/buildout.cfg b/component/ffmpeg/buildout.cfg index 434308bd1d66b876bd8d90006c48c34b9ed1bb63..dd302ee6f049e763ac93cf5e8129ebdcedbcb546 100644 --- a/component/ffmpeg/buildout.cfg +++ b/component/ffmpeg/buildout.cfg @@ -5,12 +5,13 @@ extends = ../patch/buildout.cfg ../pkgconfig/buildout.cfg ../zlib/buildout.cfg + ../xorg/buildout.cfg parts = ffmpeg [ffmpeg] -<= ffmpeg-0.8 +<= ffmpeg-4.1 [libogg] recipe = slapos.recipe.cmmi @@ -25,9 +26,11 @@ url = http://downloads.xiph.org/releases/vorbis/libvorbis-1.3.2.tar.bz2 md5sum = 798a4211221073c1409f26eac4567e8b configure-options = --disable-static +pkg_config_depends = ${libogg:location}/lib/pkgconfig environment = PATH=${pkgconfig:location}/bin:%(PATH)s - PKG_CONFIG_PATH=${libogg:location}/lib/pkgconfig + PKG_CONFIG_PATH=${:pkg_config_depends} + LDFLAGS=-Wl,-rpath=${libogg:location}/lib [libtheora] recipe = slapos.recipe.cmmi @@ -39,9 +42,16 @@ patches = patch-options = -p1 configure-options = --disable-static +pkg_config_depends = ${libpng:location}/lib/pkgconfig:${libvorbis:location}/lib/pkgconfig:${libvorbis:pkg_config_depends} environment = PATH=${patch:location}/bin:${pkgconfig:location}/bin:%(PATH)s - PKG_CONFIG_PATH=${libogg:location}/lib/pkgconfig:${libpng:location}/lib/pkgconfig:${libvorbis:location}/lib/pkgconfig + PKG_CONFIG_PATH=${:pkg_config_depends} + LDFLAGS=-Wl,-rpath=${libvorbis:location}/lib + +[nasm] +recipe = slapos.recipe.cmmi +url = https://www.nasm.us/pub/nasm/releasebuilds/2.14.02/nasm-2.14.02.tar.bz2 +md5sum = 3f489aa48ad2aa1f967dc5e293bbd06f [yasm] recipe = slapos.recipe.cmmi @@ -49,22 +59,22 @@ url = http://www.tortall.net/projects/yasm/releases/yasm-1.1.0.tar.gz [libvpx] recipe = slapos.recipe.cmmi -url = http://webm.googlecode.com/files/libvpx-v0.9.6.tar.bz2 -md5sum = 383f3f07a76099682abb43f79b692b72 +url = https://storage.googleapis.com/downloads.webmproject.org/releases/webm/libvpx-1.5.0.tar.bz2 +md5sum = 49e59dd184caa255886683facea56fca configure-options = - --enable-shared + --enable-shared environment = PATH=${yasm:location}/bin:%(PATH)s [libx264] recipe = slapos.recipe.cmmi -url = ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-20111005-2245-stable.tar.bz2 -md5sum = f86260b2ea6d6cb5186937c9363891d7 +url = ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-20190214-2245.tar.bz2 +md5sum = 37109ae11d37e4a8963954b53041d43a configure-options = --enable-shared --enable-pic environment = - PATH=${yasm:location}/bin:%(PATH)s + PATH=${yasm:location}/bin:${nasm:location}/bin:%(PATH)s [lame] recipe = slapos.recipe.cmmi @@ -81,10 +91,11 @@ md5sum = 8e8b8b253eb046340ff7b6bf7a6ccd3e configure-options = --disable-static -[ffmpeg-0.8] +[ffmpeg-4.1] recipe = slapos.recipe.cmmi -url = http://ffmpeg.org/releases/ffmpeg-0.8.5.tar.bz2 -md5sum = 726877b19ece7ea64def8b7e6727e182 +url = https://ffmpeg.org/releases/ffmpeg-4.1.4.tar.bz2 +md5sum = 611d171e4aee749b85e04d17e2aee71d +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 --enable-version3 @@ -99,9 +110,13 @@ configure-options = --enable-libopencore-amrwb --enable-shared --enable-zlib + --enable-libxcb + --enable-libxcb-shm + --enable-libxcb-xfixes + --enable-libxcb-shape --disable-static - --extra-ldflags="-Wl,-rpath=${buildout:parts-directory}/${:_buildout_section_name_}/lib" environment = - CPPFLAGS=-I${bzip2:location}/include -I${libogg:location}/include -I${libvorbis:location}/include -I${libtheora:location}/include -I${libvpx:location}/include -I${libx264:location}/include -I${lame:location}/include -I${opencore-amr:location}/include -I${zlib:location}/include - LDFLAGS=-L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -L${libogg:location}/lib -Wl,-rpath=${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 -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib - PATH=${yasm:location}/bin:%(PATH)s + 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 + PATH=${pkgconfig:location}/bin:${yasm:location}/bin:%(PATH)s \ No newline at end of file diff --git a/component/xorg/buildout.cfg b/component/xorg/buildout.cfg index aba3bd946add183b116ce790de75fc0b1ac18c00..85f6811d2f23b832c8d3f84fc57e459be446c8f7 100644 --- a/component/xorg/buildout.cfg +++ b/component/xorg/buildout.cfg @@ -116,8 +116,9 @@ patch-options = -p1 configure-options = --disable-static --disable-build-docs +pkg_config_depends = ${libXau:location}/lib/pkgconfig:${xcbproto:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig environment = - PKG_CONFIG_PATH=${libXau:location}/lib/pkgconfig:${xcbproto:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig + PKG_CONFIG_PATH=${:pkg_config_depends} PATH=${patch:location}/bin:${pkgconfig:location}/bin:${libxslt:location}/bin:%(PATH)s PYTHON=${buildout:executable} # Python note: libxcb requires python with ElementTree. In case of appliance