diff options
Diffstat (limited to 'package/ffmpeg/Makefile')
| -rw-r--r-- | package/ffmpeg/Makefile | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/package/ffmpeg/Makefile b/package/ffmpeg/Makefile index ddb3e72e3..8c00cdef4 100644 --- a/package/ffmpeg/Makefile +++ b/package/ffmpeg/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= ffmpeg -PKG_VERSION:= 3.4.2 -PKG_RELEASE:= 2 -PKG_HASH:= eb0370bf223809b9ebb359fed5318f826ac038ce77933b3afd55ab1a0a21785a +PKG_VERSION:= 6.1.1 +PKG_RELEASE:= 1 +PKG_HASH:= 5e3133939a61ef64ac9b47ffd29a5ea6e337a4023ef0ad972094b4da844e3a20 PKG_DESCR:= record, convert and stream audio & video PKG_SECTION:= libs/video PKG_NEEDS:= threads @@ -17,13 +17,19 @@ PKG_SITES:= http://www.ffmpeg.org/releases/ PKG_LIBNAME:= libffmpeg PKG_OPTS:= dev -PKG_SUBPKGS:= LIBFFMPEG FFSERVER FFPROBE FFMPEG +PKG_CHOICES_FFMPEG:= WITH_LIBRESSL WITH_OPENSSL +PKGCD_WITH_LIBRESSL:= use libressl for crypto +PKGCS_WITH_LIBRESSL:= libressl ca-certificates +PKGCB_WITH_LIBRESSL:= libressl +PKGCD_WITH_OPENSSL:= use libopenssl for crypto +PKGCS_WITH_OPENSSL:= libopenssl ca-certificates +PKGCB_WITH_OPENSSL:= openssl + + +PKG_SUBPKGS:= LIBFFMPEG FFPROBE FFMPEG PKGSD_FFMPEG:= video converter PKGSC_FFMPEG:= mm/video PKGSS_FFMPEG:= libffmpeg -PKGSD_FFSERVER:= streaming server -PKGSC_FFSERVER:= mm/video -PKGSS_FFSERVER:= libffmpeg PKGSD_FFPROBE:= simple multimedia stream analyzer PKGSC_FFPROBE:= mm/video PKGSS_FFPROBE:= libffmpeg @@ -97,7 +103,6 @@ include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,LIBFFMPEG,libffmpeg,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_FDEPENDS),$(PKGSD_LIBFFMPEG),$(PKGSC_LIBFFMPEG),$(PKG_OPTS))) $(eval $(call PKG_template,FFMPEG,ffmpeg,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKGSD_FFMPEG),$(PKGSC_FFMPEG))) -$(eval $(call PKG_template,FFSERVER,ffserver,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKGSD_FFSERVER),$(PKGSC_FFSERVER))) $(eval $(call PKG_template,FFPROBE,ffprobe,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKGSD_FFPROBE),$(PKGSC_FFPROBE))) ifeq ($(ADK_DEBUG),y) @@ -106,6 +111,7 @@ else TARGET_CFLAGS:= $(subst Os,O2,$(TARGET_CFLAGS)) endif TARGET_CPPFLAGS+= -D_POSIX_SOURCE -D_GNU_SOURCE +TARGET_LDFLAGS+= -latomic ifeq ($(ADK_TARGET_CPU_WITH_MMX),y) CONFIGURE_CPU_OPTS+= --enable-mmx @@ -171,6 +177,8 @@ endif ifeq ($(ADK_TARGET_ARCH_ARM_WITH_NEON),y) CONFIGURE_CPU_OPTS+= --enable-neon +else ifeq ($(ADK_TARGET_ARCH_AARCH64),y) +CONFIGURE_CPU_OPTS+= --enable-neon else CONFIGURE_CPU_OPTS+= --disable-neon endif @@ -252,14 +260,6 @@ ffmpeg-install: $(INSTALL_BIN) $(WRKINST)/usr/bin/ffmpeg \ $(IDIR_FFMPEG)/usr/bin -ffserver-install: - $(INSTALL_DIR) $(IDIR_FFSERVER)/etc - $(INSTALL_DATA) $(WRKBUILD)/doc/ffserver.conf \ - $(IDIR_FFSERVER)/etc - $(INSTALL_DIR) $(IDIR_FFSERVER)/usr/bin - $(INSTALL_BIN) $(WRKINST)/usr/bin/ffserver \ - $(IDIR_FFSERVER)/usr/bin - ffprobe-install: $(INSTALL_DIR) $(IDIR_FFPROBE)/usr/bin $(INSTALL_BIN) $(WRKINST)/usr/bin/ffprobe \ |