From 8490da861ad493598332d548a61243da4a41c071 Mon Sep 17 00:00:00 2001 From: CvH Date: Wed, 3 Oct 2018 22:44:56 +0200 Subject: [PATCH] comskip: use ffmpeg instead of ffmpegx --- packages/addons/addon-depends/comskip/package.mk | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/packages/addons/addon-depends/comskip/package.mk b/packages/addons/addon-depends/comskip/package.mk index fa79bd04ef..f224ff665e 100644 --- a/packages/addons/addon-depends/comskip/package.mk +++ b/packages/addons/addon-depends/comskip/package.mk @@ -7,7 +7,7 @@ PKG_SHA256="df0b4b0354aef5acc17e4e94a20a396fa69c474af7579c94aad09dd490e0ee38" PKG_LICENSE="GPL" PKG_SITE="http://www.kaashoek.com/comskip/" PKG_URL="https://github.com/erikkaashoek/Comskip/archive/${PKG_VERSION}.tar.gz" -PKG_DEPENDS_TARGET="toolchain argtable2 ffmpegx" +PKG_DEPENDS_TARGET="toolchain argtable2 ffmpeg" PKG_LONGDESC="Comskip detects commercial breaks from a video stream. It can be used for post-processing recordings" PKG_TOOLCHAIN="autotools" @@ -16,11 +16,6 @@ pre_configure_target() { export argtable2_CFLAGS="-I$(get_build_dir argtable2)/src" export argtable2_LIBS="-L$(get_build_dir argtable2)/src/.libs -largtable2" - -# pass ffmpegx to build - PKG_CONFIG_PATH="$(get_build_dir ffmpegx)/.INSTALL_PKG/usr/local/lib/pkgconfig" - CFLAGS="$CFLAGS -I$(get_build_dir ffmpegx)/.INSTALL_PKG/usr/local/include" - LDFLAGS="$LDFLAGS -L$(get_build_dir ffmpegx)/.INSTALL_PKG/usr/local/lib" } make_target() {