Browse Source

package: ffmpeg: Do not mandatory depend on libressl

There is a package choice for libffmpeg to select the SSL backend
library. It was buggy though, the build dependency was not recognized.
Looks like the choice has to use PKG_LIBNAME to be recognized by
depmaker.

Fixes: b076cd3c45c85 ("ffmpeg: add choice for ssl")
Signed-off-by: Phil Sutter <phil@nwl.cc>
Phil Sutter 3 months ago
parent
commit
a923d6c6e4
1 changed files with 4 additions and 4 deletions
  1. 4 4
      package/ffmpeg/Makefile

+ 4 - 4
package/ffmpeg/Makefile

@@ -5,19 +5,19 @@ include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		ffmpeg
 PKG_VERSION:=		6.1.1
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_HASH:=		5e3133939a61ef64ac9b47ffd29a5ea6e337a4023ef0ad972094b4da844e3a20
 PKG_DESCR:=		record, convert and stream audio & video
 PKG_SECTION:=		libs/video
 PKG_NEEDS:=		threads
-PKG_DEPENDS:=		libncurses libressl
-PKG_BUILDDEP:=		ncurses libressl
+PKG_DEPENDS:=		libncurses
+PKG_BUILDDEP:=		ncurses
 PKG_URL:=		http://www.ffmpeg.org/
 PKG_SITES:=		http://www.ffmpeg.org/releases/
 PKG_LIBNAME:=		libffmpeg
 PKG_OPTS:=		dev
 
-PKG_CHOICES_FFMPEG:=	WITH_LIBRESSL WITH_OPENSSL
+PKG_CHOICES_LIBFFMPEG:=	WITH_LIBRESSL WITH_OPENSSL
 PKGCD_WITH_LIBRESSL:=	use libressl for crypto
 PKGCS_WITH_LIBRESSL:=	libressl ca-certificates
 PKGCB_WITH_LIBRESSL:=	libressl