diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2022-02-27 11:57:31 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2022-02-27 11:59:23 +0100 |
| commit | 92ab1f5a9b8413e15b8cc6f5a896354f88a47f87 (patch) | |
| tree | 54e6013ba9d35ad4b1b60eb87be1f90e6741aa98 /package/ffmpeg | |
| parent | 884e156e1db5f92555b04bd150f64392d4c47c1c (diff) | |
kodi: update to Matrix with all dependencies
Diffstat (limited to 'package/ffmpeg')
| -rw-r--r-- | package/ffmpeg/Makefile | 12 | ||||
| -rw-r--r-- | package/ffmpeg/patches/patch-configure | 15 |
2 files changed, 17 insertions, 10 deletions
diff --git a/package/ffmpeg/Makefile b/package/ffmpeg/Makefile index 9a257c385..11ceb7813 100644 --- a/package/ffmpeg/Makefile +++ b/package/ffmpeg/Makefile @@ -17,13 +17,10 @@ PKG_SITES:= http://www.ffmpeg.org/releases/ PKG_LIBNAME:= libffmpeg PKG_OPTS:= dev -PKG_SUBPKGS:= LIBFFMPEG FFSERVER FFPROBE FFMPEG +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 +94,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 +102,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 @@ -254,11 +251,6 @@ ffmpeg-install: $(INSTALL_BIN) $(WRKINST)/usr/bin/ffmpeg \ $(IDIR_FFMPEG)/usr/bin -ffserver-install: - $(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 \ diff --git a/package/ffmpeg/patches/patch-configure b/package/ffmpeg/patches/patch-configure new file mode 100644 index 000000000..645eb4d6a --- /dev/null +++ b/package/ffmpeg/patches/patch-configure @@ -0,0 +1,15 @@ +--- ffmpeg-4.4.1.orig/configure 2021-10-24 22:47:11.000000000 +0200 ++++ ffmpeg-4.4.1/configure 2022-02-25 12:51:17.554887194 +0100 +@@ -4984,9 +4984,10 @@ elif enabled arm; then + fi + } + +- [ "$cpu" = generic ] && cpu=$(probe_arm_arch) +- + case $cpu in ++ generic) ++ subarch=$(probe_arm_arch | sed 's/[^a-z0-9]//g') ++ ;; + armv*) + cpuflags="-march=$cpu" + subarch=$(echo $cpu | sed 's/[^a-z0-9]//g') |