ffmpeg: improve changelog, targeting user audience

Simplicity comes with framework improvements Depends on #3592 and #3595
SynoCommunity · Feb 4, 2019 · e817b4c · e817b4c
1 parent 9fa3c0b
commit e817b4c
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 20 deletions.
diff --git a/cross/gnutls/Makefile b/cross/gnutls/Makefile
@@ -14,6 +14,6 @@ LICENSE  = LGPL
 
 GNU_CONFIGURE = 1
 CONFIGURE_ARGS = --disable-doc --without-p11-kit --disable-nls gl_cv_func_gettimeofday_clobber=no gl_cv_func_signbit_gcc=no
-CONFIGURE_ARGS += --prefix=$(INSTALL_PREFIX) --libdir=$(STAGING_INSTALL_PREFIX)/lib --includedir=$(STAGING_INSTALL_PREFIX)/include
+CONFIGURE_ARGS += --prefix=$(INSTALL_PREFIX)
 
 include ../../mk/spksrc.cross-cc.mk
diff --git a/cross/intel-vaapi-driver/Makefile b/cross/intel-vaapi-driver/Makefile
@@ -18,6 +18,9 @@ GNU_CONFIGURE = 1
 
 include ../../mk/spksrc.cross-cc.mk
 
+# Enforce install prefix because of make install DESTDIR
+ENV += LIBVA_DRIVERS_PATH=$(INSTALL_PREFIX)/lib/dri
+
 .PHONY: intel_vaapi_driver_configure
 intel_vaapi_driver_configure:
 	$(RUN) ./autogen.sh
diff --git a/cross/nettle/Makefile b/cross/nettle/Makefile
@@ -32,4 +32,4 @@ endif
 ifeq ($(findstring $(ARCH), $(x64_ARCHES)),$(ARCH))
 CONFIGURE_ARGS = --target=x86_64-pc-linux-gnu --host=x86_64-pc-linux-gnu
 endif
-CONFIGURE_ARGS += --prefix=$(INSTALL_PREFIX) --with-include-path=$(STAGING_INSTALL_PREFIX)/include --with-lib-path=$(STAGING_INSTALL_PREFIX)/lib --enable-shared
+CONFIGURE_ARGS += --prefix=$(INSTALL_PREFIX) --enable-shared
diff --git a/cross/soxr/Makefile b/cross/soxr/Makefile
@@ -11,9 +11,9 @@ HOMEPAGE = https://sourceforge.net/projects/soxr/
 COMMENT  = The SoX Resampler library 'libsoxr' performs one-dimensional sample-rate conversion—it may be used, for example, to resample PCM-encoded audio.
 LICENSE  = GPL & LGPL v2
 
-CONFIGURE_TARGET = myConfigure
+CONFIGURE_TARGET = soxr_custom_configure
 
-CMAKE_ARGS = -DCMAKE_INSTALL_PREFIX=$(STAGING_INSTALL_PREFIX)
+CMAKE_ARGS = -DCMAKE_INSTALL_PREFIX=$(INSTALL_PREFIX)
 CMAKE_ARGS += -DEXTRA_LINK_FLAGS="-ldl"
 CMAKE_ARGS += -DWITH_OPENMP=OFF
 CMAKE_ARGS += -DBUILD_TESTS=OFF
@@ -24,6 +24,6 @@ ifeq ($(ARCH)-$(TCVERSION),ppc853x-4.3)
 CMAKE_ARGS += -DVISIBILITY_HIDDEN=OFF
 endif
 
-.PHONY: myConfigure
-myConfigure:
+.PHONY: soxr_custom_configure
+soxr_custom_configure:
 	$(RUN) cmake $(CMAKE_ARGS)
diff --git a/cross/x265/Makefile b/cross/x265/Makefile
@@ -12,7 +12,6 @@ COMMENT  = x265 is an open source HEVC encoder.
 LICENSE  = GPL
 
 CONFIGURE_TARGET = x265_custom_configure
-INSTALL_TARGET = x265_custom_install
 
 NASM_PATH = $(WORK_DIR)/../../../native/nasm/work-native/install/usr/local/bin
 
@@ -31,6 +30,8 @@ include ../../mk/spksrc.cross-cc.mk
 ifeq ($(findstring $(TCVERSION), "6.0.2,6.1"),$(TCVERSION))
 ifneq ($(findstring $(ARCH), $(ARM5_ARCHES)),$(ARCH))
 CMAKE_ARGS += -DENABLE_HDR10_PLUS=ON
+else
+PLIST_TRANSFORM = sed -e '/:lib\/libhdr10plus.so/d'
 endif
 endif
 
@@ -73,7 +74,7 @@ CMAKE_ARGS += -DCMAKE_CXX_FLAGS="-DSPKSRC_FIX_PPC853X_4_3"
 endif
 
 
-.PHONY: $(PKG_DIR)/libx265_main12.a $(PKG_DIR)/libx265_main10.a x265_custom_configure x265_custom_install
+.PHONY: $(PKG_DIR)/libx265_main12.a $(PKG_DIR)/libx265_main10.a x265_custom_configure
 
 # First create specific static libraries with build options for 12 and 10 bit depth
 PKG_WORK_DIR = $(WORK_DIR)/$(PKG_NAME)_$(PKG_VERS)
@@ -101,6 +102,3 @@ CMAKE_MULTILIB_ARGS += -DLINKED_10BIT=ON -DLINKED_12BIT=ON -DENABLE_SHARED=ON
 
 x265_custom_configure: $(PKG_DIR)/libx265_main12.a $(PKG_DIR)/libx265_main10.a
 	$(RUN) cmake $(CMAKE_ARGS) $(CMAKE_MULTILIB_ARGS) .
-
-x265_custom_install:
-	$(RUN) $(MAKE) install DESTDIR=$(INSTALL_DIR)
diff --git a/spk/ffmpeg/Makefile b/spk/ffmpeg/Makefile
@@ -2,23 +2,16 @@ SPK_NAME = ffmpeg
 SPK_VERS = 4.1
 SPK_REV = 11
 SPK_ICON = src/ffmpeg.png
-CHANGELOG = "1. Update ffmpeg to 4.1 (latest release) 2. Update ffmpeg dependencies to latest release and fix associated compilation issues 3. Fix HDR10Plus support in x265 4. Fix x265 support for ppc platforms with recent releases"
+CHANGELOG = "1. Update ffmpeg to 4.1<br/>2. Update ffmpeg dependencies<br/>3. Add VAAPI for intel x64 processors<br/>4. Fix HDR10Plus support in x265<br/>5. Fix x265 support for ppc platforms"
 
 DEPENDS = cross/$(SPK_NAME)
 
-MAINTAINER = cytec
+MAINTAINER = m4tt075
 DESCRIPTION = FFmpeg is a complete, cross-platform solution to record, convert and stream audio and video. It includes libavcodec - the leading audio/video codec library.
 DISPLAY_NAME = ffmpeg
 STARTABLE = no
 
 HOMEPAGE = http://www.ffmpeg.org/
 LICENSE  = GPLv3
 
-PRE_COPY_TARGET = ffmpeg_custom_pre_copy
-
 include ../../mk/spksrc.spk.mk
-
-.PHONY: ffmpeg_custom_pre_copy
-ffmpeg_custom_pre_copy: $(INSTALL_PLIST)
-	# Remove libhdr10plus reference from PLIST if it isn't available on the platform (e.g. 88f6281)
-	test -f $(INSTALL_DIR)$(INSTALL_PREFIX)/lib/libhdr10plus.so || sed -i -e '/:lib\/libhdr10plus.so/d' $(INSTALL_PLIST)