svn commit: r484762 - in head/multimedia/gstreamer1-libav: . files
Jan Beich
jbeich at FreeBSD.org
Sun Nov 11 19:49:23 UTC 2018
Author: jbeich
Date: Sun Nov 11 19:49:22 2018
New Revision: 484762
URL: https://svnweb.freebsd.org/changeset/ports/484762
Log:
multimedia/gstreamer1-libav: unbreak FFMPEG=OFF on aarch64 after r483887
- Drop GNU as(1) dependency as it's no longer required
PR: 233137
Submitted by: Mikaël Urankar (based on)
Added:
head/multimedia/gstreamer1-libav/files/patch-clang-neon (contents, props changed)
Modified:
head/multimedia/gstreamer1-libav/Makefile (contents, props changed)
Modified: head/multimedia/gstreamer1-libav/Makefile
==============================================================================
--- head/multimedia/gstreamer1-libav/Makefile Sun Nov 11 18:53:50 2018 (r484761)
+++ head/multimedia/gstreamer1-libav/Makefile Sun Nov 11 19:49:22 2018 (r484762)
@@ -34,11 +34,9 @@ OPTIONS_DEFAULT=FFMPEG
FFMPEG_DESC?= Use system ffmpeg instead of internal libav
FFMPEG_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg
FFMPEG_CONFIGURE_WITH= system-libav
-FFMPEG_BUILD_DEPENDS_OFF=as:devel/binutils nasm:devel/nasm
-FFMPEG_CONFIGURE_ENV_OFF=${MACHINE:Marm*:C/.+/ASFLAGS=-no-integrated-as/}
+FFMPEG_BUILD_DEPENDS_OFF= nasm:devel/nasm
FFMPEG_MAKE_ENV_OFF= V=1
FFMPEG_VARS_OFF+= NOPRECIOUSMAKEVARS=yes # ARCH
-FFMPEG_VARS_OFF+= LLD_UNSAFE=yes # aarch64
post-patch:
@${REINPLACE_CMD} -e 's|-Werror||g' \
Added: head/multimedia/gstreamer1-libav/files/patch-clang-neon
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/multimedia/gstreamer1-libav/files/patch-clang-neon Sun Nov 11 19:49:22 2018 (r484762)
@@ -0,0 +1,53 @@
+https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/f33f72847043
+
+--- gst-libs/ext/libav/libswscale/arm/rgb2yuv_neon_16.S.orig 2018-10-02 22:10:05 UTC
++++ gst-libs/ext/libav/libswscale/arm/rgb2yuv_neon_16.S
+@@ -18,6 +18,8 @@
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
++#include "config.h"
++#if HAVE_AS_DN_DIRECTIVE
+ #include "rgb2yuv_neon_common.S"
+
+ /* downsampled R16G16B16 x8 */
+@@ -78,3 +80,4 @@ alias_qw c8x8x2, q10
+ .endm
+
+ loop_420sp rgbx, nv12, init, kernel_420_16x2, 16
++#endif
+--- gst-libs/ext/libav/libswscale/arm/rgb2yuv_neon_32.S.orig 2018-10-02 22:10:05 UTC
++++ gst-libs/ext/libav/libswscale/arm/rgb2yuv_neon_32.S
+@@ -18,6 +18,8 @@
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
++#include "config.h"
++#if HAVE_AS_DN_DIRECTIVE
+ #include "rgb2yuv_neon_common.S"
+
+ /* downsampled R16G16B16 x8 */
+@@ -117,3 +119,4 @@ alias_qw c8x8x2, q10
+
+
+ loop_420sp rgbx, nv12, init, kernel_420_16x2, 32
++#endif
+--- gst-libs/ext/libav/libswscale/arm/swscale_unscaled.c.orig 2018-10-02 22:10:05 UTC
++++ gst-libs/ext/libav/libswscale/arm/swscale_unscaled.c
+@@ -23,6 +23,7 @@
+ #include "libswscale/swscale_internal.h"
+ #include "libavutil/arm/cpu.h"
+
++#if HAVE_AS_DN_DIRECTIVE
+ extern void rgbx_to_nv12_neon_32(const uint8_t *src, uint8_t *y, uint8_t *chroma,
+ int width, int height,
+ int y_stride, int c_stride, int src_stride,
+@@ -178,3 +179,8 @@ void ff_get_unscaled_swscale_arm(SwsContext *c)
+ if (have_neon(cpu_flags))
+ get_unscaled_swscale_neon(c);
+ }
++#else
++void ff_get_unscaled_swscale_arm(SwsContext *c)
++{
++}
++#endif
More information about the svn-ports-all
mailing list