diff options
| author | Ted Hess <thess@kitschensync.net> | 2018-09-11 10:51:40 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-11 10:51:40 -0400 |
| commit | 1545eb2194a558def90396296a24a8fb9eef7a1b (patch) | |
| tree | c39bb3fc0a62aa70818a9b183a52da1452da695c | |
| parent | 8064761a2d85588e76a8b29ceb50dd9cd307d165 (diff) | |
| parent | eff80c5fa311b3db469f2e2d531281e203456ce1 (diff) | |
Merge pull request #6989 from ryzhovau/ffmpeg-libpostproc
ffmpeg: pack libpostproc for hard float archs only
| -rw-r--r-- | multimedia/ffmpeg/Makefile | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile index 390012a65..f627db8f9 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 |