From: Alexander Ryzhov Date: Mon, 10 Sep 2018 12:19:12 +0000 (+0300) Subject: ffmpeg: pack libpostproc for hard float archs only X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=refs%2Fpull%2F6989%2Fhead;p=feed%2Fpackages.git ffmpeg: pack libpostproc for hard float archs only Signed-off-by: Alexander Ryzhov --- diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile index 390012a654..f627db8f94 100644 --- a/multimedia/ffmpeg/Makefile +++ b/multimedia/ffmpeg/Makefile @@ -656,11 +656,13 @@ define Build/InstallDev/full $(CP) $(PKG_INSTALL_DIR)/usr/include/lib{avcodec,avdevice,avfilter,avformat,avresample,avutil,swresample,swscale} $(1)/usr/include/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{avcodec,avdevice,avfilter,avformat,avresample,avutil,swresample,swscale}.{a,so*} $(1)/usr/lib/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/lib{avcodec,avdevice,avfilter,avformat,avresample,avutil,swresample,swscale}.pc $(1)/usr/lib/pkgconfig/ +ifneq ($(CONFIG_SOFT_FLOAT),y) ifneq ($(CONFIG_PACKAGE_libx264),) $(CP) $(PKG_INSTALL_DIR)/usr/include/libpostproc $(1)/usr/include/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libpostproc.{a,so*} $(1)/usr/lib/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libpostproc.pc $(1)/usr/lib/pkgconfig/ endif +endif endef define Build/InstallDev/mini @@ -722,9 +724,11 @@ endef define Package/libffmpeg-full/install $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{avcodec,avdevice,avfilter,avformat,avresample,avutil,swresample,swscale}.so.* $(1)/usr/lib/ +ifneq ($(CONFIG_SOFT_FLOAT),y) ifneq ($(CONFIG_PACKAGE_libx264),) $(CP) $(PKG_INSTALL_DIR)/usr/lib/libpostproc.so.* $(1)/usr/lib/ endif +endif endef define Package/libffmpeg-mini/install