diff options
| author | Kubilay Kocak <koobs@FreeBSD.org> | 2015-07-03 07:02:44 +0000 |
|---|---|---|
| committer | Kubilay Kocak <koobs@FreeBSD.org> | 2015-07-03 07:02:44 +0000 |
| commit | 9b08af5e1a546b78fe93f99c39a534eeca7acf11 (patch) | |
| tree | fb62b3412f4fbbccc19b38b48e8e04f5e9d1afda /multimedia | |
| parent | 7c97fd5e9ed54c83aaac42b71df97d2f26b31c61 (diff) | |
| download | ports-9b08af5e1a546b78fe93f99c39a534eeca7acf11.tar.gz ports-9b08af5e1a546b78fe93f99c39a534eeca7acf11.zip | |
Notes
Diffstat (limited to 'multimedia')
34 files changed, 107 insertions, 1634 deletions
diff --git a/multimedia/avidemux/Makefile b/multimedia/avidemux/Makefile index d7973c818836..b136f8d02bdb 100644 --- a/multimedia/avidemux/Makefile +++ b/multimedia/avidemux/Makefile @@ -6,7 +6,7 @@ PORTNAME= avidemux PORTVERSION= ${AVIDEMUX_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia MAINTAINER= multimedia@FreeBSD.org diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile index 76cd5fe4cad1..0a0f0130d234 100644 --- a/multimedia/ffmpeg/Makefile +++ b/multimedia/ffmpeg/Makefile @@ -3,6 +3,7 @@ PORTNAME= ffmpeg PORTVERSION= 2.7.1 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= multimedia audio ipv6 net MASTER_SITES= http://ffmpeg.org/releases/ diff --git a/multimedia/ffmpeg0/Makefile b/multimedia/ffmpeg0/Makefile index 6d526029aecd..37b570e745d7 100644 --- a/multimedia/ffmpeg0/Makefile +++ b/multimedia/ffmpeg0/Makefile @@ -3,7 +3,7 @@ PORTNAME= ffmpeg PORTVERSION= 0.7.16 -PORTREVISION= 8 +PORTREVISION= 9 PORTEPOCH= 1 CATEGORIES= multimedia audio ipv6 net MASTER_SITES= http://ffmpeg.org/releases/ diff --git a/multimedia/ffmpeg23/Makefile b/multimedia/ffmpeg23/Makefile index db23e1e1c384..aacb1810ffb4 100644 --- a/multimedia/ffmpeg23/Makefile +++ b/multimedia/ffmpeg23/Makefile @@ -3,6 +3,7 @@ PORTNAME= ffmpeg PORTVERSION= 2.3.6 +PORTREVISION= 1 CATEGORIES= multimedia audio ipv6 net MASTER_SITES= http://ffmpeg.org/releases/ PKGNAMESUFFIX= 23 diff --git a/multimedia/ffmpeg26/Makefile b/multimedia/ffmpeg26/Makefile index 2a2fe93d251f..0321e57ce13e 100644 --- a/multimedia/ffmpeg26/Makefile +++ b/multimedia/ffmpeg26/Makefile @@ -3,7 +3,7 @@ PORTNAME= ffmpeg PORTVERSION= 2.6.3 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= multimedia audio ipv6 net MASTER_SITES= http://ffmpeg.org/releases/ PKGNAMESUFFIX= 26 diff --git a/multimedia/gstreamer-plugins-x264/Makefile b/multimedia/gstreamer-plugins-x264/Makefile index bcb2d8919cae..d8f6e0de58d7 100644 --- a/multimedia/gstreamer-plugins-x264/Makefile +++ b/multimedia/gstreamer-plugins-x264/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ # $MCom: ports/multimedia/gstreamer-plugins-x264/Makefile,v 1.3 2008/03/19 14:05:37 ahze Exp $ -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= multimedia COMMENT= Gstreamer x264 plugin diff --git a/multimedia/gstreamer1-plugins-x264/Makefile b/multimedia/gstreamer1-plugins-x264/Makefile index 66ac4f231644..bbdf10e0afcc 100644 --- a/multimedia/gstreamer1-plugins-x264/Makefile +++ b/multimedia/gstreamer1-plugins-x264/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= multimedia COMMENT= Gstreamer x264 plugin diff --git a/multimedia/handbrake/Makefile b/multimedia/handbrake/Makefile index edfdbcc13298..128dfba17da4 100644 --- a/multimedia/handbrake/Makefile +++ b/multimedia/handbrake/Makefile @@ -3,6 +3,7 @@ PORTNAME= handbrake PORTVERSION= 0.10.2 +PORTREVISION= 1 CATEGORIES= multimedia MASTER_SITES= http://download.handbrake.fr/releases/${PORTVERSION}/ \ http://download.handbrake.fr/handbrake/contrib/:contrib \ diff --git a/multimedia/libav/Makefile b/multimedia/libav/Makefile index 7ab389bae15c..bad344924546 100644 --- a/multimedia/libav/Makefile +++ b/multimedia/libav/Makefile @@ -2,7 +2,7 @@ PORTNAME= libav PORTVERSION= 11.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia audio ipv6 net MASTER_SITES= http://libav.org/releases/ diff --git a/multimedia/libquicktime/Makefile b/multimedia/libquicktime/Makefile index 68e6bc57795c..81b9d2f1f3cd 100644 --- a/multimedia/libquicktime/Makefile +++ b/multimedia/libquicktime/Makefile @@ -3,7 +3,7 @@ PORTNAME= libquicktime PORTVERSION= 1.2.4 -PORTREVISION?= 10 +PORTREVISION?= 11 CATEGORIES= multimedia MASTER_SITES= SF diff --git a/multimedia/libx264/Makefile b/multimedia/libx264/Makefile index ff71c2da0121..918dccc2de1d 100644 --- a/multimedia/libx264/Makefile +++ b/multimedia/libx264/Makefile @@ -3,95 +3,28 @@ # # Updating notes: see multimedia/x264/Makefile. -PORTNAME= libx264 -PORTVERSION= 0.${X264_BUILD}.${X264_REV} -PORTREVISION= 3 -CATEGORIES= multimedia -MASTER_SITES= ftp://ftp.videolan.org/pub/videolan/x264/snapshots/ \ - http://samples.mplayerhq.hu/yuv4mpeg2/:pgo -DISTNAME= x264-snapshot-${X264_SNAPSHOT}-2245-stable -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} -DIST_SUBDIR= x264 -EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} - -MAINTAINER= koobs@FreeBSD.org -COMMENT= Library for encoding H.264/MPEG-4 AVC video - -LICENSE= GPLv2 -LICENSE_FILE= ${WRKSRC}/COPYING - -BUILD_DEPENDS= yasm>=1.2.0:${PORTSDIR}/devel/yasm \ - bash:${PORTSDIR}/shells/bash - -X264_BUILD= 142 -X264_REV= 2455 -X264_COMMIT= 021c0dc6c95c1bc239c9db78a80dd85fc856a4dd -X264_GITVER= ${X264_COMMIT:C/^(.......).*$/\1/g} -X264_SNAPSHOT= 20140827 +PKGNAMEPREFIX= lib +COMMENT= H.264/MPEG-4 AVC Video Encoding (Library) +MASTERDIR= ${.CURDIR}/../x264 +PLIST= ${.CURDIR}/pkg-plist USES= gmake pathfix tar:bzip2 -USE_LDCONFIG= yes -HAS_CONFIGURE= yes OPTIONS_DEFINE= ASM DEBUG GCC HI10P PGO -OPTIONS_DEFAULT= ASM +OPTIONS_EXCLUDE= GPAC LAV -ASM_DESC= Enable Assembly Optimizations -DEBUG_DESC= Generate Debugging Symbols -GCC_DESC= Use current GCC -HI10P_DESC= Enable High 10 Profile 10-bit encoding +DEBUG_CONFIGURE_OFF= --enable-strip -ASM_CONFIGURE_OFF= --disable-asm -DEBUG_CONFIGURE_ON= --enable-debug +HI10P_DESC= Enable High 10 Profile 10-bit encoding HI10P_CONFIGURE_ON= --bit-depth=10 -CONFIGURE_ARGS+= --extra-cflags="-I${LOCALBASE}/include" \ - --extra-ldflags="-L${LOCALBASE}/lib" \ - --enable-static --enable-shared \ - --disable-opencl -CFLAGS_armv6+= -mcpu=arm1136jf-s +CONFIGURE_ARGS= ${CONFIGURE_COMMON_ARGS} \ + --enable-static \ + --enable-shared \ + --disable-cli PATHFIX_MAKEFILEIN= Makefile -PLIST_SUB+= X264_BUILD=${X264_BUILD} - -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MGCC} -USE_GCC= yes -.elif ${PORT_OPTIONS:MPGO} -USE_GCC= any -.endif - -.if ${PORT_OPTIONS:MPGO} -# y4m sample video -Y4M_VIDEO= example.y4m -Y4M_VIDEO_DISTFILE= example.y4m.bz2 - -DISTFILES+= ${Y4M_VIDEO_DISTFILE}:pgo -ALL_TARGET= fprofiled -MAKE_ENV+= VIDS="${WRKDIR}/${Y4M_VIDEO}" - -RESTRICTED= ${Y4M_VIDEO_DISTFILE} file may not be mirrored -RESTRICTED_FILES= ${Y4M_VIDEO_DISTFILE} -.endif - -post-extract: -.if ${PORT_OPTIONS:MPGO} - @( cd ${WRKDIR} && ${BZIP2_CMD} -dc ${DISTDIR}/${DIST_SUBDIR}/${Y4M_VIDEO_DISTFILE} > ${Y4M_VIDEO} ) -.endif - -post-patch: - @${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|; \ - s|/bin/bash|${LOCALBASE}/bin/bash|; \ - s|gpac_static|gpac|g' \ - ${WRKSRC}/configure - @${REINPLACE_CMD} -e 's|bash|sh|; \ - s|VER="x"|VER="${X264_REV} ${X264_GITVER}"|; \ - s|VERSION=""|VERSION=" r${X264_REV} ${X264_GITVER}"|' \ - ${WRKSRC}/version.sh -post-install: - ${RM} ${STAGEDIR}${PREFIX}/bin/x264 - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libx264.so.* +PLIST_SUB+= X264_BUILD=${X264_BUILD} -.include <bsd.port.mk> +.include "${MASTERDIR}/Makefile" diff --git a/multimedia/libx264/files/patch-Makefile b/multimedia/libx264/files/patch-Makefile deleted file mode 100644 index 52084c1fe529..000000000000 --- a/multimedia/libx264/files/patch-Makefile +++ /dev/null @@ -1,42 +0,0 @@ ---- Makefile.orig 2014-12-31 01:23:15 UTC -+++ Makefile -@@ -85,12 +85,12 @@ X86SRC0 += sad-a.asm - endif - X86SRC = $(X86SRC0:%=common/x86/%) - --ifeq ($(ARCH),X86) -+ifeq ($(ARCH),i386) - ARCH_X86 = yes - ASMSRC = $(X86SRC) common/x86/pixel-32.asm - endif - --ifeq ($(ARCH),X86_64) -+ifeq ($(ARCH),amd64) - ARCH_X86 = yes - ASMSRC = $(X86SRC:-32.asm=-64.asm) common/x86/trellis-64.asm - endif -@@ -104,7 +104,14 @@ endif - endif - - # AltiVec optims --ifeq ($(ARCH),PPC) -+ifeq ($(ARCH),powerpc) -+ARCH_PPC = yes -+endif -+ifeq ($(ARCH),powerpc64) -+ARCH_PPC = yes -+endif -+ -+ifdef ARCH_PPC - ifneq ($(AS),) - SRCS += common/ppc/mc.c common/ppc/pixel.c common/ppc/dct.c \ - common/ppc/quant.c common/ppc/deblock.c \ -@@ -113,7 +120,7 @@ endif - endif - - # NEON optims --ifeq ($(ARCH),ARM) -+ifeq ($(ARCH),armv6) - ifneq ($(AS),) - ASMSRC += common/arm/cpu-a.S common/arm/pixel-a.S common/arm/mc-a.S \ - common/arm/dct-a.S common/arm/quant-a.S common/arm/deblock-a.S \ diff --git a/multimedia/libx264/files/patch-common_arm_asm.S b/multimedia/libx264/files/patch-common_arm_asm.S deleted file mode 100644 index 2cb3b35ad178..000000000000 --- a/multimedia/libx264/files/patch-common_arm_asm.S +++ /dev/null @@ -1,40 +0,0 @@ ---- common/arm/asm.S.orig 2014-08-27 20:45:08 UTC -+++ common/arm/asm.S -@@ -40,6 +40,12 @@ - # define ELF @ - #endif - -+#if HAVE_AS_FUNC -+# define FUNC -+#else -+# define FUNC @ -+#endif -+ - .macro require8, val=1 - ELF .eabi_attribute 24, \val - .endm -@@ -49,17 +55,22 @@ ELF .eabi_attribute 25, \val - .endm - - .macro function name, export=1 -+ .macro endfunc -+ELF .size \name, . - \name -+FUNC .endfunc -+ .purgem endfunc -+ .endm - .align 2 - .if \export == 1 - .global EXTERN_ASM\name - ELF .hidden EXTERN_ASM\name - ELF .type EXTERN_ASM\name, %function -- .func EXTERN_ASM\name -+FUNC .func EXTERN_ASM\name - EXTERN_ASM\name: - .else - ELF .hidden \name - ELF .type \name, %function -- .func \name -+FUNC .func \name - \name: - .endif - .endm diff --git a/multimedia/libx264/files/patch-common_arm_cpu-a.S b/multimedia/libx264/files/patch-common_arm_cpu-a.S deleted file mode 100644 index 5a477bc17607..000000000000 --- a/multimedia/libx264/files/patch-common_arm_cpu-a.S +++ /dev/null @@ -1,34 +0,0 @@ ---- common/arm/cpu-a.S.orig 2014-08-27 20:45:08 UTC -+++ common/arm/cpu-a.S -@@ -33,7 +33,7 @@ - function x264_cpu_neon_test - vadd.i16 q0, q0, q0 - bx lr --.endfunc -+endfunc - - // return: 0 on success - // 1 if counters were already enabled -@@ -49,14 +49,14 @@ function x264_cpu_enable_armv7_counter, - mov r2, #1 << 31 // enable cycle counter - mcr p15, 0, r2, c9, c12, 1 // write CNTENS - bx lr --.endfunc -+endfunc - - function x264_cpu_disable_armv7_counter, export=0 - mrc p15, 0, r0, c9, c12, 0 // read PMNC - bic r0, r0, #1 // disable counters - mcr p15, 0, r0, c9, c12, 0 // write PMNC - bx lr --.endfunc -+endfunc - - - .macro READ_TIME r -@@ -106,4 +106,4 @@ average_loop: - cmp r0, #10 - movgt r0, #0 - pop {r4-r6,pc} --.endfunc -+endfunc diff --git a/multimedia/libx264/files/patch-common_arm_dct-a.S b/multimedia/libx264/files/patch-common_arm_dct-a.S deleted file mode 100644 index 0ac5e5e8b28b..000000000000 --- a/multimedia/libx264/files/patch-common_arm_dct-a.S +++ /dev/null @@ -1,161 +0,0 @@ ---- common/arm/dct-a.S.orig 2014-08-27 20:45:08 UTC -+++ common/arm/dct-a.S -@@ -82,7 +82,7 @@ function x264_dct4x4dc_neon - vrhadd.s16 d3, d6, d7 - vst1.64 {d0-d3}, [r0,:128] - bx lr --.endfunc -+endfunc - - function x264_idct4x4dc_neon - vld1.64 {d0-d3}, [r0,:128] -@@ -94,7 +94,7 @@ function x264_idct4x4dc_neon - HADAMARD 2, sumsub, d3, d2, d6, d7 - vst1.64 {d0-d3}, [r0,:128] - bx lr --.endfunc -+endfunc - - - .macro DCT_1D d0 d1 d2 d3 d4 d5 d6 d7 -@@ -129,7 +129,7 @@ function x264_sub4x4_dct_neon - DCT_1D d4, d5, d6, d7, d0, d1, d2, d3 - vst1.64 {d4-d7}, [r0,:128] - bx lr --.endfunc -+endfunc - - function x264_sub8x4_dct_neon, export=0 - vld1.64 {d0}, [r1,:64], r3 -@@ -165,7 +165,7 @@ function x264_sub8x4_dct_neon, export=0 - vst1.64 {d4-d5}, [r0,:128]! - vst1.64 {d6-d7}, [r0,:128]! - bx lr --.endfunc -+endfunc - - function x264_sub8x8_dct_neon - push {lr} -@@ -174,7 +174,7 @@ function x264_sub8x8_dct_neon - bl x264_sub8x4_dct_neon - pop {lr} - b x264_sub8x4_dct_neon --.endfunc -+endfunc - - function x264_sub16x16_dct_neon - push {lr} -@@ -195,7 +195,7 @@ function x264_sub16x16_dct_neon - bl x264_sub8x4_dct_neon - pop {lr} - b x264_sub8x4_dct_neon --.endfunc -+endfunc - - - .macro DCT8_1D type -@@ -279,7 +279,7 @@ function x264_sub8x8_dct8_neon - vst1.64 {d24-d27}, [r0,:128]! - vst1.64 {d28-d31}, [r0,:128]! - bx lr --.endfunc -+endfunc - - function x264_sub16x16_dct8_neon - push {lr} -@@ -294,7 +294,7 @@ function x264_sub16x16_dct8_neon - sub r1, r1, #FENC_STRIDE*8 - 8 - sub r2, r2, #FDEC_STRIDE*8 - 8 - b X(x264_sub8x8_dct8_neon) --.endfunc -+endfunc - - - // First part of IDCT (minus final SUMSUB_BA) -@@ -336,7 +336,7 @@ function x264_add4x4_idct_neon - vst1.32 {d2[1]}, [r0,:32], r2 - vst1.32 {d2[0]}, [r0,:32], r2 - bx lr --.endfunc -+endfunc - - function x264_add8x4_idct_neon, export=0 - vld1.64 {d0-d3}, [r1,:128]! -@@ -376,7 +376,7 @@ function x264_add8x4_idct_neon, export=0 - vst1.32 {d2}, [r0,:64], r2 - vst1.32 {d3}, [r0,:64], r2 - bx lr --.endfunc -+endfunc - - function x264_add8x8_idct_neon - mov r2, #FDEC_STRIDE -@@ -384,7 +384,7 @@ function x264_add8x8_idct_neon - bl x264_add8x4_idct_neon - mov lr, ip - b x264_add8x4_idct_neon --.endfunc -+endfunc - - function x264_add16x16_idct_neon - mov r2, #FDEC_STRIDE -@@ -401,7 +401,7 @@ function x264_add16x16_idct_neon - bl x264_add8x4_idct_neon - mov lr, ip - b x264_add8x4_idct_neon --.endfunc -+endfunc - - - .macro IDCT8_1D type -@@ -498,7 +498,7 @@ function x264_add8x8_idct8_neon - vst1.64 {d6}, [r0,:64], r2 - vst1.64 {d7}, [r0,:64], r2 - bx lr --.endfunc -+endfunc - - function x264_add16x16_idct8_neon - mov ip, lr -@@ -510,7 +510,7 @@ function x264_add16x16_idct8_neon - sub r0, r0, #8*FDEC_STRIDE-8 - mov lr, ip - b X(x264_add8x8_idct8_neon) --.endfunc -+endfunc - - - function x264_add8x8_idct_dc_neon -@@ -562,7 +562,7 @@ function x264_add8x8_idct_dc_neon - vst1.64 {d6}, [r0,:64], r2 - vst1.64 {d7}, [r0,:64], r2 - bx lr --.endfunc -+endfunc - - .macro ADD16x4_IDCT_DC dc - vld1.64 {d16-d17}, [r0,:128], r3 -@@ -610,7 +610,7 @@ function x264_add16x16_idct_dc_neon - ADD16x4_IDCT_DC d2 - ADD16x4_IDCT_DC d3 - bx lr --.endfunc -+endfunc - - function x264_sub8x8_dct_dc_neon - mov r3, #FENC_STRIDE -@@ -658,7 +658,7 @@ function x264_sub8x8_dct_dc_neon - vpadd.s16 d0, d0, d1 - vst1.64 {d0}, [r0,:64] - bx lr --.endfunc -+endfunc - - - function x264_zigzag_scan_4x4_frame_neon -@@ -671,4 +671,4 @@ function x264_zigzag_scan_4x4_frame_neon - vtbl.8 d7, {d2-d3}, d19 - vst1.64 {d4-d7}, [r0,:128] - bx lr --.endfunc -+endfunc diff --git a/multimedia/libx264/files/patch-common_arm_deblock-a.S b/multimedia/libx264/files/patch-common_arm_deblock-a.S deleted file mode 100644 index 7f1e183c1925..000000000000 --- a/multimedia/libx264/files/patch-common_arm_deblock-a.S +++ /dev/null @@ -1,44 +0,0 @@ ---- common/arm/deblock-a.S.orig 2014-08-27 20:45:08 UTC -+++ common/arm/deblock-a.S -@@ -142,7 +142,7 @@ function x264_deblock_v_luma_neon - - align_pop_regs - bx lr --.endfunc -+endfunc - - function x264_deblock_h_luma_neon - h264_loop_filter_start -@@ -194,7 +194,7 @@ function x264_deblock_h_luma_neon - - align_pop_regs - bx lr --.endfunc -+endfunc - - .macro h264_loop_filter_chroma - vdup.8 q11, r2 // alpha -@@ -255,7 +255,7 @@ function x264_deblock_v_chroma_neon - vst2.8 {d0, d1}, [r0,:128], r1 - - bx lr --.endfunc -+endfunc - - function x264_deblock_h_chroma_neon - h264_loop_filter_start -@@ -303,7 +303,7 @@ function x264_deblock_h_chroma_neon - vst1.8 {d3}, [r0], r1 - - bx lr --.endfunc -+endfunc - - function x264_deblock_strength_neon - ldr ip, [sp] -@@ -409,4 +409,4 @@ lists: - - vst1.8 {q8}, [r3,:128] @ bs[0] - bx lr --.endfunc -+endfunc diff --git a/multimedia/libx264/files/patch-common_arm_mc-a.S b/multimedia/libx264/files/patch-common_arm_mc-a.S deleted file mode 100644 index b630cef68e35..000000000000 --- a/multimedia/libx264/files/patch-common_arm_mc-a.S +++ /dev/null @@ -1,386 +0,0 @@ ---- common/arm/mc-a.S.orig 2014-08-27 20:45:08 UTC -+++ common/arm/mc-a.S -@@ -50,7 +50,7 @@ function x264_prefetch_ref_arm - pld [r3, r1, lsl #1] - pld [r3, r2] - bx lr --.endfunc -+endfunc - - // void prefetch_fenc( uint8_t *pix_y, intptr_t stride_y, - // uint8_t *pix_uv, intptr_t stride_uv, int mb_x ) -@@ -76,7 +76,7 @@ function x264_prefetch_fenc_arm - pld [ip] - pld [ip, r3] - pop {pc} --.endfunc -+endfunc - - - // void *x264_memcpy_aligned( void *dst, const void *src, size_t n ) -@@ -85,7 +85,7 @@ function x264_memcpy_aligned_neon - movrel ip, memcpy_table - and r3, r3, #0xc - ldr pc, [ip, r3] --.endfunc -+endfunc - - .macro MEMCPY_ALIGNED srcalign dstalign - function memcpy_aligned_\dstalign\()_\srcalign\()_neon, export=0 -@@ -127,7 +127,7 @@ function memcpy_aligned_\dstalign\()_\sr - vst1.64 {d0}, [r3,:64]! - .endif - bx lr --.endfunc -+endfunc - .endm - - MEMCPY_ALIGNED 16, 16 -@@ -156,7 +156,7 @@ memzero_loop: - .endr - bgt memzero_loop - bx lr --.endfunc -+endfunc - - - // void pixel_avg( uint8_t *dst, intptr_t dst_stride, -@@ -175,7 +175,7 @@ function x264_pixel_avg_\w\()x\h\()_neon - cmp ip, #0 - bge x264_pixel_avg_weight_w\w\()_add_add_neon - b x264_pixel_avg_weight_w\w\()_sub_add_neon // weight < 0 --.endfunc -+endfunc - .endm - - AVGH 4, 2 -@@ -253,7 +253,7 @@ function x264_pixel_avg_weight_w4_\ext\( - vst1.32 {d1[0]}, [r0,:32], r1 - bgt 1b - pop {r4-r6,pc} --.endfunc -+endfunc - - function x264_pixel_avg_weight_w8_\ext\()_neon, export=0 - load_weights_\ext -@@ -277,7 +277,7 @@ function x264_pixel_avg_weight_w8_\ext\( - vst1.64 {d3}, [r0,:64], r1 - bgt 1b - pop {r4-r6,pc} --.endfunc -+endfunc - - function x264_pixel_avg_weight_w16_\ext\()_neon, export=0 - load_weights_\ext -@@ -297,7 +297,7 @@ function x264_pixel_avg_weight_w16_\ext\ - vst1.64 {d2-d3}, [r0,:128], r1 - bgt 1b - pop {r4-r6,pc} --.endfunc -+endfunc - .endm - - AVG_WEIGHT add_add -@@ -316,7 +316,7 @@ function x264_pixel_avg_w4_neon, export= - vst1.32 {d1[0]}, [r0,:32], r1 - bgt x264_pixel_avg_w4_neon - pop {r4-r6,pc} --.endfunc -+endfunc - - function x264_pixel_avg_w8_neon, export=0 - subs lr, lr, #4 -@@ -338,7 +338,7 @@ function x264_pixel_avg_w8_neon, export= - vst1.64 {d3}, [r0,:64], r1 - bgt x264_pixel_avg_w8_neon - pop {r4-r6,pc} --.endfunc -+endfunc - - function x264_pixel_avg_w16_neon, export=0 - subs lr, lr, #4 -@@ -360,7 +360,7 @@ function x264_pixel_avg_w16_neon, export - vst1.64 {d6-d7}, [r0,:128], r1 - bgt x264_pixel_avg_w16_neon - pop {r4-r6,pc} --.endfunc -+endfunc - - - function x264_pixel_avg2_w4_neon -@@ -379,7 +379,7 @@ avg2_w4_loop: - vst1.32 {d1[0]}, [r0,:32], r1 - bgt avg2_w4_loop - pop {pc} --.endfunc -+endfunc - - function x264_pixel_avg2_w8_neon - ldr ip, [sp, #4] -@@ -397,7 +397,7 @@ avg2_w8_loop: - vst1.64 {d1}, [r0,:64], r1 - bgt avg2_w8_loop - pop {pc} --.endfunc -+endfunc - - function x264_pixel_avg2_w16_neon - ldr ip, [sp, #4] -@@ -415,7 +415,7 @@ avg2_w16_loop: - vst1.64 {d4-d5}, [r0,:128], r1 - bgt avg2_w16_loop - pop {pc} --.endfunc -+endfunc - - function x264_pixel_avg2_w20_neon - ldr ip, [sp, #4] -@@ -438,7 +438,7 @@ avg2_w20_loop: - vst1.32 {d6[0]}, [r0,:32], r1 - bgt avg2_w20_loop - pop {pc} --.endfunc -+endfunc - - - .macro weight_prologue type -@@ -499,7 +499,7 @@ weight20_loop: - vst1.32 {d20[1]}, [r0,:32], r1 - bgt weight20_loop - pop {r4-r5,pc} --.endfunc -+endfunc - - function x264_mc_weight_w16_neon - weight_prologue full -@@ -531,7 +531,7 @@ weight16_loop: - vst1.8 {d18-d19}, [r0,:128], r1 - bgt weight16_loop - pop {r4-r5,pc} --.endfunc -+endfunc - - function x264_mc_weight_w8_neon - weight_prologue full -@@ -553,7 +553,7 @@ weight8_loop: - vst1.8 {d18}, [r0,:64], r1 - bgt weight8_loop - pop {r4-r5,pc} --.endfunc -+endfunc - - function x264_mc_weight_w4_neon - weight_prologue full -@@ -572,7 +572,7 @@ weight4_loop: - vst1.32 {d16[1]}, [r0,:32], r1 - bgt weight4_loop - pop {r4-r5,pc} --.endfunc -+endfunc - - function x264_mc_weight_w20_nodenom_neon - weight_prologue nodenom -@@ -609,7 +609,7 @@ weight20_nodenom_loop: - vst1.32 {d20[1]}, [r0,:32], r1 - bgt weight20_nodenom_loop - pop {r4-r5,pc} --.endfunc -+endfunc - - function x264_mc_weight_w16_nodenom_neon - weight_prologue nodenom -@@ -637,7 +637,7 @@ weight16_nodenom_loop: - vst1.8 {d18-d19}, [r0,:128], r1 - bgt weight16_nodenom_loop - pop {r4-r5,pc} --.endfunc -+endfunc - - function x264_mc_weight_w8_nodenom_neon - weight_prologue nodenom -@@ -657,7 +657,7 @@ weight8_nodenom_loop: - vst1.8 {d17}, [r0,:64], r1 - bgt weight8_nodenom_loop - pop {r4-r5,pc} --.endfunc -+endfunc - - function x264_mc_weight_w4_nodenom_neon - weight_prologue nodenom -@@ -675,7 +675,7 @@ weight4_nodenom_loop: - vst1.32 {d16[1]}, [r0,:32], r1 - bgt weight4_nodenom_loop - pop {r4-r5,pc} --.endfunc -+endfunc - - .macro weight_simple_prologue - push {lr} -@@ -699,7 +699,7 @@ weight20_\name\()_loop: - vst1.8 {d19-d21}, [r0,:64], r1 - bgt weight20_\name\()_loop - pop {pc} --.endfunc -+endfunc - - function x264_mc_weight_w16_\name\()_neon - weight_simple_prologue -@@ -713,7 +713,7 @@ weight16_\name\()_loop: - vst1.8 {d18-d19}, [r0,:128], r1 - bgt weight16_\name\()_loop - pop {pc} --.endfunc -+endfunc - - function x264_mc_weight_w8_\name\()_neon - weight_simple_prologue -@@ -726,7 +726,7 @@ weight8_\name\()_loop: - vst1.8 {d17}, [r0,:64], r1 - bgt weight8_\name\()_loop - pop {pc} --.endfunc -+endfunc - - function x264_mc_weight_w4_\name\()_neon - weight_simple_prologue -@@ -739,7 +739,7 @@ weight4_\name\()_loop: - vst1.32 {d17[0]}, [r0,:32], r1 - bgt weight4_\name\()_loop - pop {pc} --.endfunc -+endfunc - .endm - - weight_simple offsetadd, vqadd.u8 -@@ -761,7 +761,7 @@ copy_w4_loop: - vst1.32 {d3[0]}, [r0,:32], r1 - bgt copy_w4_loop - bx lr --.endfunc -+endfunc - - function x264_mc_copy_w8_neon - ldr ip, [sp] -@@ -777,7 +777,7 @@ copy_w8_loop: - vst1.32 {d3}, [r0,:64], r1 - bgt copy_w8_loop - bx lr --.endfunc -+endfunc - - function x264_mc_copy_w16_neon - ldr ip, [sp] -@@ -793,7 +793,7 @@ copy_w16_loop: - vst1.32 {d6-d7}, [r0,:128], r1 - bgt copy_w16_loop - bx lr --.endfunc -+endfunc - - function x264_mc_copy_w16_aligned_neon - ldr ip, [sp] -@@ -809,7 +809,7 @@ copy_w16_aligned_loop: - vst1.32 {d6-d7}, [r0,:128], r1 - bgt copy_w16_aligned_loop - bx lr --.endfunc -+endfunc - - - // void x264_mc_chroma_neon( uint8_t *dst, intptr_t i_dst_stride, -@@ -1159,7 +1159,7 @@ mc_chroma_w8: - vpop {d8-d11} - pop {r4-r8, pc} - --.endfunc -+endfunc - - - // hpel_filter_v( uint8_t *dst, uint8_t *src, int16_t *buf, intptr_t stride, int width ) -@@ -1200,7 +1200,7 @@ filter_v_loop: - vst1.64 {d0-d1}, [r0,:128]! - bgt filter_v_loop - pop {pc} --.endfunc -+endfunc - - // hpel_filter_c( uint8_t *dst, int16_t *buf, int width ); - function x264_hpel_filter_c_neon -@@ -1285,7 +1285,7 @@ filter_c_loop: - vst1.64 {d30-d31}, [r0,:128]! - bgt filter_c_loop - bx lr --.endfunc -+endfunc - - // hpel_filter_h( uint8_t *dst, uint8_t *src, int width ); - function x264_hpel_filter_h_neon -@@ -1372,7 +1372,7 @@ filter_h_loop: - vst1.64 {d6-d7}, [r0,:128]! - bgt filter_h_loop - bx lr --.endfunc -+endfunc - - - // frame_init_lowres_core( uint8_t *src0, uint8_t *dst0, uint8_t *dsth, uint8_t *dstv, -@@ -1464,7 +1464,7 @@ lowres_xloop_end: - - vpop {d8-d15} - pop {r4-r10,pc} --.endfunc -+endfunc - - function x264_load_deinterleave_chroma_fdec_neon - mov ip, #FDEC_STRIDE/2 -@@ -1477,7 +1477,7 @@ function x264_load_deinterleave_chroma_f - bgt 1b - - bx lr --.endfunc -+endfunc - - function x264_load_deinterleave_chroma_fenc_neon - mov ip, #FENC_STRIDE/2 -@@ -1490,7 +1490,7 @@ function x264_load_deinterleave_chroma_f - bgt 1b - - bx lr --.endfunc -+endfunc - - function x264_plane_copy_deinterleave_neon - push {r4-r7, lr} -@@ -1516,7 +1516,7 @@ block: - bgt block - - pop {r4-r7, pc} --.endfunc -+endfunc - - function x264_plane_copy_deinterleave_rgb_neon - push {r4-r8, r10, r11, lr} -@@ -1568,7 +1568,7 @@ block4: - bgt block4 - - pop {r4-r8, r10, r11, pc} --.endfunc -+endfunc - - function x264_plane_copy_interleave_neon - push {r4-r7, lr} -@@ -1595,7 +1595,7 @@ blocki: - bgt blocki - - pop {r4-r7, pc} --.endfunc -+endfunc - - function x264_store_interleave_chroma_neon - push {lr} -@@ -1609,4 +1609,4 @@ function x264_store_interleave_chroma_ne - bgt 1b - - pop {pc} --.endfunc -+endfunc diff --git a/multimedia/libx264/files/patch-common_arm_pixel-a.S b/multimedia/libx264/files/patch-common_arm_pixel-a.S deleted file mode 100644 index 35cc46e0f854..000000000000 --- a/multimedia/libx264/files/patch-common_arm_pixel-a.S +++ /dev/null @@ -1,275 +0,0 @@ ---- common/arm/pixel-a.S.orig 2014-08-27 20:45:08 UTC -+++ common/arm/pixel-a.S -@@ -29,10 +29,12 @@ - .section .rodata - .align 4 - --.rept 16 .byte 0xff -+.rept 16 -+ .byte 0xff - .endr - mask_ff: --.rept 16 .byte 0 -+.rept 16 -+ .byte 0 - .endr - - mask_ac4: -@@ -60,7 +62,7 @@ function x264_pixel_sad_4x\h\()_armv6 - .endr - usada8 r0, r6, lr, ip - pop {r4-r6,pc} --.endfunc -+endfunc - .endm - - SAD4_ARMV6 4 -@@ -137,7 +139,7 @@ function x264_pixel_sad\name\()_\w\()x\h - vpaddl.u16 d0, d0 - vmov.u32 r0, d0[0] - bx lr --.endfunc -+endfunc - .endm - - SAD_FUNC 4, 4 -@@ -222,7 +224,7 @@ function x264_pixel_sad_aligned_\w\()x\h - vpaddl.u16 d0, d0 - vmov.u32 r0, d0[0] - bx lr --.endfunc -+endfunc - .endm - - SAD_FUNC_DUAL 8, 4 -@@ -368,7 +370,7 @@ function x264_pixel_sad_x\x\()_\w\()x\h\ - vst1.32 {d0-d1}, [r7] - .endif - pop {r6-r7,pc} --.endfunc -+endfunc - .endm - - SAD_X_FUNC 3, 4, 4 -@@ -477,7 +479,7 @@ function x264_pixel_ssd_\w\()x\h\()_neon - vpadd.s32 d0, d0, d0 - vmov.32 r0, d0[0] - bx lr --.endfunc -+endfunc - .endm - - SSD_FUNC 4, 4 -@@ -517,7 +519,7 @@ function x264_pixel_var_8x8_neon - vld1.64 {d26}, [r0,:64], r1 - VAR_SQR_SUM q2, q10, q15, d26 - b x264_var_end --.endfunc -+endfunc - - function x264_pixel_var_8x16_neon - vld1.64 {d16}, [r0,:64], r1 -@@ -549,7 +551,7 @@ function x264_pixel_var_8x16_neon - 2: - VAR_SQR_SUM q2, q13, q15, d22 - b x264_var_end --.endfunc -+endfunc - - function x264_pixel_var_16x16_neon - vld1.64 {d16-d17}, [r0,:128], r1 -@@ -573,7 +575,7 @@ var16_loop: - VAR_SQR_SUM q1, q12, q14, d18 - VAR_SQR_SUM q2, q13, q15, d19 - bgt var16_loop --.endfunc -+endfunc - - function x264_var_end, export=0 - vpaddl.u16 q8, q14 -@@ -588,7 +590,7 @@ function x264_var_end, export=0 - - vmov r0, r1, d0 - bx lr --.endfunc -+endfunc - - .macro DIFF_SUM diff da db lastdiff - vld1.64 {\da}, [r0,:64], r1 -@@ -633,7 +635,7 @@ function x264_pixel_var2_8x8_neon - mul r0, r0, r0 - sub r0, r1, r0, lsr #6 - bx lr --.endfunc -+endfunc - - function x264_pixel_var2_8x16_neon - vld1.64 {d16}, [r0,:64], r1 -@@ -677,7 +679,7 @@ function x264_pixel_var2_8x16_neon - mul r0, r0, r0 - sub r0, r1, r0, lsr #7 - bx lr --.endfunc -+endfunc - - .macro LOAD_DIFF_8x4 q0 q1 q2 q3 - vld1.32 {d1}, [r2], r3 -@@ -714,7 +716,7 @@ function x264_pixel_satd_4x4_neon - HORIZ_ADD d0, d0, d1 - vmov.32 r0, d0[0] - bx lr --.endfunc -+endfunc - - function x264_pixel_satd_4x8_neon - vld1.32 {d1[]}, [r2], r3 -@@ -741,7 +743,7 @@ function x264_pixel_satd_4x8_neon - vsubl.u8 q3, d6, d7 - SUMSUB_AB q10, q11, q2, q3 - b x264_satd_4x8_8x4_end_neon --.endfunc -+endfunc - - function x264_pixel_satd_8x4_neon - vld1.64 {d1}, [r2], r3 -@@ -758,7 +760,7 @@ function x264_pixel_satd_8x4_neon - vld1.64 {d6}, [r0,:64], r1 - vsubl.u8 q3, d6, d7 - SUMSUB_AB q10, q11, q2, q3 --.endfunc -+endfunc - - function x264_satd_4x8_8x4_end_neon, export=0 - vadd.s16 q0, q8, q10 -@@ -785,7 +787,7 @@ function x264_satd_4x8_8x4_end_neon, exp - HORIZ_ADD d0, d0, d1 - vmov.32 r0, d0[0] - bx lr --.endfunc -+endfunc - - function x264_pixel_satd_8x8_neon - mov ip, lr -@@ -799,7 +801,7 @@ function x264_pixel_satd_8x8_neon - mov lr, ip - vmov.32 r0, d0[0] - bx lr --.endfunc -+endfunc - - function x264_pixel_satd_8x16_neon - vpush {d8-d11} -@@ -821,7 +823,7 @@ function x264_pixel_satd_8x16_neon - mov lr, ip - vmov.32 r0, d0[0] - bx lr --.endfunc -+endfunc - - function x264_satd_8x8_neon, export=0 - LOAD_DIFF_8x4 q8, q9, q10, q11 -@@ -841,7 +843,7 @@ function x264_satd_8x8_neon, export=0 - SUMSUB_AB q9, q11, q1, q3 - vld1.64 {d0}, [r0,:64], r1 - vsubl.u8 q15, d0, d1 --.endfunc -+endfunc - - // one vertical hadamard pass and two horizontal - function x264_satd_8x4v_8x8h_neon, export=0 -@@ -870,7 +872,7 @@ function x264_satd_8x4v_8x8h_neon, expor - vmax.s16 q14, q8, q10 - vmax.s16 q15, q9, q11 - bx lr --.endfunc -+endfunc - - function x264_pixel_satd_16x8_neon - vpush {d8-d11} -@@ -892,7 +894,7 @@ function x264_pixel_satd_16x8_neon - mov lr, ip - vmov.32 r0, d0[0] - bx lr --.endfunc -+endfunc - - function x264_pixel_satd_16x16_neon - vpush {d8-d11} -@@ -926,7 +928,7 @@ function x264_pixel_satd_16x16_neon - mov lr, ip - vmov.32 r0, d0[0] - bx lr --.endfunc -+endfunc - - function x264_satd_16x4_neon, export=0 - vld1.64 {d2-d3}, [r2], r3 -@@ -950,7 +952,7 @@ function x264_satd_16x4_neon, export=0 - SUMSUB_AB q2, q3, q10, q11 - SUMSUB_ABCD q8, q10, q9, q11, q0, q2, q1, q3 - b x264_satd_8x4v_8x8h_neon --.endfunc -+endfunc - - - function x264_pixel_sa8d_8x8_neon -@@ -963,7 +965,7 @@ function x264_pixel_sa8d_8x8_neon - add r0, r0, #1 - lsr r0, r0, #1 - bx lr --.endfunc -+endfunc - - function x264_pixel_sa8d_16x16_neon - vpush {d8-d11} -@@ -995,7 +997,7 @@ function x264_pixel_sa8d_16x16_neon - add r0, r0, #1 - lsr r0, r0, #1 - bx lr --.endfunc -+endfunc - - .macro HADAMARD4_V r1, r2, r3, r4, t1, t2, t3, t4 - SUMSUB_ABCD \t1, \t2, \t3, \t4, \r1, \r2, \r3, \r4 -@@ -1058,7 +1060,7 @@ function x264_sa8d_8x8_neon, export=0 - vadd.i16 q8, q8, q9 - vadd.i16 q9, q10, q11 - bx lr --.endfunc -+endfunc - - - .macro HADAMARD_AC w h -@@ -1094,7 +1096,7 @@ function x264_pixel_hadamard_ac_\w\()x\h - lsr r0, r0, #1 - lsr r1, r1, #2 - bx lr --.endfunc -+endfunc - .endm - - HADAMARD_AC 8, 8 -@@ -1189,7 +1191,7 @@ function x264_hadamard_ac_8x8_neon, expo - vadd.s16 q2, q2, q14 - vpadal.u16 q5, q2 - bx lr --.endfunc -+endfunc - - - .macro SSIM_ITER n ssa s12 ssb lastssa lasts12 lastssb da db dnext -@@ -1243,7 +1245,7 @@ function x264_pixel_ssim_4x4x2_core_neon - - vst4.32 {d0-d3}, [ip] - bx lr --.endfunc -+endfunc - - // FIXME: see about doing 16x16 -> 32 bit multiplies for s1/s2 - function x264_pixel_ssim_end4_neon -@@ -1314,4 +1316,4 @@ ssim_skip: - vpadd.f32 d0, d0, d0 - vmov.32 r0, d0[0] - bx lr --.endfunc -+endfunc diff --git a/multimedia/libx264/files/patch-common_arm_predict-a.S b/multimedia/libx264/files/patch-common_arm_predict-a.S deleted file mode 100644 index 8053e8e59f65..000000000000 --- a/multimedia/libx264/files/patch-common_arm_predict-a.S +++ /dev/null @@ -1,242 +0,0 @@ ---- common/arm/predict-a.S.orig 2014-08-27 20:45:08 UTC -+++ common/arm/predict-a.S -@@ -77,7 +77,7 @@ function x264_predict_4x4_h_armv6 - add ip, ip, ip, lsl #16 - str ip, [r0, #3*FDEC_STRIDE] - bx lr --.endfunc -+endfunc - - function x264_predict_4x4_v_armv6 - ldr r1, [r0, #0 - 1 * FDEC_STRIDE] -@@ -86,7 +86,7 @@ function x264_predict_4x4_v_armv6 - str r1, [r0, #0 + 2 * FDEC_STRIDE] - str r1, [r0, #0 + 3 * FDEC_STRIDE] - bx lr --.endfunc -+endfunc - - function x264_predict_4x4_dc_armv6 - mov ip, #0 -@@ -109,7 +109,7 @@ function x264_predict_4x4_dc_armv6 - str r1, [r0, #2*FDEC_STRIDE] - str r1, [r0, #3*FDEC_STRIDE] - bx lr --.endfunc -+endfunc - - function x264_predict_4x4_dc_top_neon - mov r12, #FDEC_STRIDE -@@ -124,7 +124,7 @@ function x264_predict_4x4_dc_top_neon - vst1.32 d1[0], [r0,:32], r12 - vst1.32 d1[0], [r0,:32], r12 - bx lr --.endfunc -+endfunc - - // return a1 = (a1+2*b1+c1+2)>>2 a2 = (a2+2*b2+c2+2)>>2 - .macro PRED4x4_LOWPASS a1 b1 c1 a2 b2 c2 pb_1 -@@ -167,7 +167,7 @@ function x264_predict_4x4_ddr_armv6 - add r5, r5, r4, lsr #8 - str r5, [r0, #3*FDEC_STRIDE] - pop {r4-r6,pc} --.endfunc -+endfunc - - function x264_predict_4x4_ddl_neon - sub r0, #FDEC_STRIDE -@@ -186,7 +186,7 @@ function x264_predict_4x4_ddl_neon - vst1.32 {d2[0]}, [r0,:32], ip - vst1.32 {d3[0]}, [r0,:32], ip - bx lr --.endfunc -+endfunc - - function x264_predict_8x8_dc_neon - mov ip, #0 -@@ -210,7 +210,7 @@ function x264_predict_8x8_dc_neon - vst1.64 {d0}, [r0,:64], ip - .endr - pop {r4-r5,pc} --.endfunc -+endfunc - - function x264_predict_8x8_h_neon - add r1, r1, #7 -@@ -233,7 +233,7 @@ function x264_predict_8x8_h_neon - vst1.64 {d6}, [r0,:64], ip - vst1.64 {d7}, [r0,:64], ip - bx lr --.endfunc -+endfunc - - function x264_predict_8x8_v_neon - add r1, r1, #16 -@@ -243,7 +243,7 @@ function x264_predict_8x8_v_neon - vst1.8 {d0}, [r0,:64], r12 - .endr - bx lr --.endfunc -+endfunc - - function x264_predict_8x8_ddl_neon - add r1, #16 -@@ -271,7 +271,7 @@ function x264_predict_8x8_ddl_neon - vst1.8 d2, [r0,:64], r12 - vst1.8 d1, [r0,:64], r12 - bx lr --.endfunc -+endfunc - - function x264_predict_8x8_ddr_neon - vld1.8 {d0-d3}, [r1,:128] -@@ -301,7 +301,7 @@ function x264_predict_8x8_ddr_neon - vst1.8 {d4}, [r0,:64], r12 - vst1.8 {d5}, [r0,:64], r12 - bx lr --.endfunc -+endfunc - - function x264_predict_8x8_vl_neon - add r1, #16 -@@ -332,7 +332,7 @@ function x264_predict_8x8_vl_neon - vst1.8 {d3}, [r0,:64], r12 - vst1.8 {d2}, [r0,:64], r12 - bx lr --.endfunc -+endfunc - - function x264_predict_8x8_vr_neon - add r1, #8 -@@ -364,7 +364,7 @@ function x264_predict_8x8_vr_neon - vst1.8 {d6}, [r0,:64], r12 - vst1.8 {d3}, [r0,:64], r12 - bx lr --.endfunc -+endfunc - - function x264_predict_8x8_hd_neon - mov r12, #FDEC_STRIDE -@@ -397,7 +397,7 @@ function x264_predict_8x8_hd_neon - vst1.8 {d16}, [r0,:64], r12 - - bx lr --.endfunc -+endfunc - - function x264_predict_8x8_hu_neon - mov r12, #FDEC_STRIDE -@@ -430,7 +430,7 @@ function x264_predict_8x8_hu_neon - vst1.8 {d7}, [r0,:64], r12 - vst1.8 {d17}, [r0,:64] - bx lr --.endfunc -+endfunc - - function x264_predict_8x8c_dc_top_neon - sub r2, r0, #FDEC_STRIDE -@@ -443,7 +443,7 @@ function x264_predict_8x8c_dc_top_neon - vdup.8 d0, d0[0] - vtrn.32 d0, d1 - b pred8x8_dc_end --.endfunc -+endfunc - - function x264_predict_8x8c_dc_left_neon - mov r1, #FDEC_STRIDE -@@ -455,7 +455,7 @@ function x264_predict_8x8c_dc_left_neon - vdup.8 d1, d0[1] - vdup.8 d0, d0[0] - b pred8x8_dc_end --.endfunc -+endfunc - - function x264_predict_8x8c_dc_neon - sub r2, r0, #FDEC_STRIDE -@@ -481,7 +481,7 @@ pred8x8_dc_end: - vst1.8 {d1}, [r2,:64], r1 - .endr - bx lr --.endfunc -+endfunc - - function x264_predict_8x8c_h_neon - sub r1, r0, #1 -@@ -493,7 +493,7 @@ function x264_predict_8x8c_h_neon - vst1.64 {d2}, [r0,:64], ip - .endr - bx lr --.endfunc -+endfunc - - function x264_predict_8x8c_v_neon - sub r0, r0, #FDEC_STRIDE -@@ -503,7 +503,7 @@ function x264_predict_8x8c_v_neon - vst1.64 {d0}, [r0,:64], ip - .endr - bx lr --.endfunc -+endfunc - - function x264_predict_8x8c_p_neon - sub r3, r0, #FDEC_STRIDE -@@ -556,7 +556,7 @@ function x264_predict_8x8c_p_neon - subs r3, r3, #1 - bne 1b - bx lr --.endfunc -+endfunc - - - function x264_predict_16x16_dc_top_neon -@@ -567,7 +567,7 @@ function x264_predict_16x16_dc_top_neon - vrshrn.u16 d0, q0, #4 - vdup.8 q0, d0[0] - b pred16x16_dc_end --.endfunc -+endfunc - - function x264_predict_16x16_dc_left_neon - mov r1, #FDEC_STRIDE -@@ -578,7 +578,7 @@ function x264_predict_16x16_dc_left_neon - vrshrn.u16 d0, q0, #4 - vdup.8 q0, d0[0] - b pred16x16_dc_end --.endfunc -+endfunc - - function x264_predict_16x16_dc_neon - sub r3, r0, #FDEC_STRIDE -@@ -616,7 +616,7 @@ pred16x16_dc_end: - vst1.64 {d0-d1}, [r0,:128], r1 - .endr - bx lr --.endfunc -+endfunc - - function x264_predict_16x16_h_neon - sub r1, r0, #1 -@@ -630,7 +630,7 @@ function x264_predict_16x16_h_neon - vst1.64 {d2-d3}, [r0,:128], ip - .endr - bx lr --.endfunc -+endfunc - - function x264_predict_16x16_v_neon - sub r0, r0, #FDEC_STRIDE -@@ -640,7 +640,7 @@ function x264_predict_16x16_v_neon - vst1.64 {d0-d1}, [r0,:128], ip - .endr - bx lr --.endfunc -+endfunc - - function x264_predict_16x16_p_neon - sub r3, r0, #FDEC_STRIDE -@@ -697,4 +697,4 @@ function x264_predict_16x16_p_neon - subs r3, r3, #1 - bne 1b - bx lr --.endfunc -+endfunc diff --git a/multimedia/libx264/files/patch-common_arm_quant-a.S b/multimedia/libx264/files/patch-common_arm_quant-a.S deleted file mode 100644 index 2eaa3b7dccd6..000000000000 --- a/multimedia/libx264/files/patch-common_arm_quant-a.S +++ /dev/null @@ -1,98 +0,0 @@ ---- common/arm/quant-a.S.orig 2014-08-27 20:45:08 UTC -+++ common/arm/quant-a.S -@@ -80,7 +80,7 @@ function x264_quant_2x2_dc_neon - vsub.s16 d3, d3, d0 - vst1.64 {d3}, [r0,:64] - QUANT_END d3 --.endfunc -+endfunc - - // quant_4x4_dc( int16_t dct[16], int mf, int bias ) - function x264_quant_4x4_dc_neon -@@ -92,7 +92,7 @@ function x264_quant_4x4_dc_neon - QUANT_TWO q0, q0, d4, d5, d4, d5, q0 - vorr d0, d0, d1 - QUANT_END d0 --.endfunc -+endfunc - - // quant_4x4( int16_t dct[16], uint16_t mf[16], uint16_t bias[16] ) - function x264_quant_4x4_neon -@@ -104,7 +104,7 @@ function x264_quant_4x4_neon - QUANT_TWO q0, q1, d4, d5, d6, d7, q0 - vorr d0, d0, d1 - QUANT_END d0 --.endfunc -+endfunc - - // quant_4x4x4( int16_t dct[4][16], uint16_t mf[16], uint16_t bias[16] ) - function x264_quant_4x4x4_neon -@@ -145,7 +145,7 @@ function x264_quant_4x4x4_neon - orrne r0, #8 - vpop {d8-d15} - bx lr --.endfunc -+endfunc - - // quant_8x8( int16_t dct[64], uint16_t mf[64], uint16_t bias[64] ) - function x264_quant_8x8_neon -@@ -165,7 +165,7 @@ function x264_quant_8x8_neon - .endr - vorr d0, d0, d1 - QUANT_END d0 --.endfunc -+endfunc - - .macro DEQUANT_START mf_size offset dc=no - mov r3, #0x2b -@@ -257,7 +257,7 @@ dequant_\size\()_rshift_loop: - bgt dequant_\size\()_rshift_loop - .endif - bx lr --.endfunc -+endfunc - .endm - - DEQUANT 4x4, 4 -@@ -307,7 +307,7 @@ dequant_4x4_dc_rshift: - vmovn.s32 d3, q13 - vst1.16 {d0-d3}, [r0,:128] - bx lr --.endfunc -+endfunc - - - // int coeff_last( int16_t *l ) -@@ -319,7 +319,7 @@ function x264_coeff_last4_arm - lsrs r2, r2, #16 - addne r0, r0, #1 - bx lr --.endfunc -+endfunc - - function x264_coeff_last8_arm - ldrd r2, r3, [r0, #8] -@@ -333,7 +333,7 @@ function x264_coeff_last8_arm - lsrs r2, r2, #16 - addne r0, r0, #1 - bx lr --.endfunc -+endfunc - - .macro COEFF_LAST_1x size - function x264_coeff_last\size\()_neon -@@ -358,7 +358,7 @@ function x264_coeff_last\size\()_neon - subslt r0, r3, r0, lsr #2 - movlt r0, #0 - bx lr --.endfunc -+endfunc - .endm - - COEFF_LAST_1x 15 -@@ -407,4 +407,4 @@ function x264_coeff_last64_neon - subslt r0, ip, r0 - movlt r0, #0 - bx lr --.endfunc -+endfunc diff --git a/multimedia/libx264/files/patch-common_cpu.c b/multimedia/libx264/files/patch-common_cpu.c deleted file mode 100644 index 5d2bd7d4c068..000000000000 --- a/multimedia/libx264/files/patch-common_cpu.c +++ /dev/null @@ -1,29 +0,0 @@ ---- common/cpu.c.orig 2014-08-27 20:45:08 UTC -+++ common/cpu.c -@@ -313,7 +313,7 @@ uint32_t x264_cpu_detect( void ) - - #elif ARCH_PPC - --#if SYS_MACOSX || SYS_OPENBSD -+#if SYS_MACOSX || SYS_OPENBSD || SYS_FREEBSD - #include <sys/sysctl.h> - uint32_t x264_cpu_detect( void ) - { -@@ -321,12 +321,16 @@ uint32_t x264_cpu_detect( void ) - uint32_t cpu = 0; - #if SYS_OPENBSD - int selectors[2] = { CTL_MACHDEP, CPU_ALTIVEC }; --#else -+#elif SYS_MACOSX - int selectors[2] = { CTL_HW, HW_VECTORUNIT }; - #endif - int has_altivec = 0; - size_t length = sizeof( has_altivec ); -+#if SYS_MACOSX || SYS_OPENBSD - int error = sysctl( selectors, 2, &has_altivec, &length, NULL, 0 ); -+#else -+ int error = sysctlbyname("hw.altivec", &has_altivec, &length, NULL, 0 ); -+#endif - - if( error == 0 && has_altivec != 0 ) - cpu |= X264_CPU_ALTIVEC; diff --git a/multimedia/libx264/files/patch-configure b/multimedia/libx264/files/patch-configure deleted file mode 100644 index 907fcefc3687..000000000000 --- a/multimedia/libx264/files/patch-configure +++ /dev/null @@ -1,91 +0,0 @@ ---- configure.orig 2014-08-27 22:45:08.000000000 +0200 -+++ configure 2015-01-07 13:42:20.868702616 +0100 -@@ -197,8 +197,9 @@ - - as_check() { - log_check "whether $AS supports $1" -- echo "$1" > conftest.asm -- if $AS conftest.asm $ASFLAGS $2 -o conftest.o >conftest.log 2>&1; then -+ echo "$1" > conftest$AS_EXT -+ as_cmd="$AS conftest$AS_EXT $ASFLAGS $2 -o conftest.o" -+ if $as_cmd >conftest.log 2>&1; then - res=$? - log_ok - else -@@ -206,12 +207,12 @@ - log_fail - log_msg "Failed commandline was:" - log_msg "--------------------------------------------------" -- log_msg "$AS conftest.asm $ASFLAGS $2 -o conftest.o" -+ log_msg "$as_cmd" - cat conftest.log >> config.log - log_msg "--------------------------------------------------" - log_msg "Failed program was:" - log_msg "--------------------------------------------------" -- cat conftest.asm >> config.log -+ cat conftest$AS_EXT >> config.log - log_msg "--------------------------------------------------" - fi - return $res -@@ -302,10 +303,13 @@ - cross_prefix="" - - EXE="" -+AS_EXT=".S" -+NL=" -+" - - # list of all preprocessor HAVE values we can define - CONFIG_HAVE="MALLOC_H ALTIVEC ALTIVEC_H MMX ARMV6 ARMV6T2 NEON BEOSTHREAD POSIXTHREAD WIN32THREAD THREAD LOG2F SWSCALE \ -- LAVF FFMS GPAC AVS GPL VECTOREXT INTERLACED CPU_COUNT OPENCL THP LSMASH X86_INLINE_ASM" -+ LAVF FFMS GPAC AVS GPL VECTOREXT INTERLACED CPU_COUNT OPENCL THP LSMASH X86_INLINE_ASM AS_FUNC" - - # parse options - -@@ -586,6 +590,7 @@ - i*86) - ARCH="X86" - AS="yasm" -+ AS_EXT=".asm" - ASFLAGS="$ASFLAGS -O2 -DARCH_X86_64=0 -I\$(SRCPATH)/common/x86/" - if [ $compiler = GNU ]; then - if [[ "$asm" == auto && "$CFLAGS" != *-march* ]]; then -@@ -626,6 +631,7 @@ - x86_64) - ARCH="X86_64" - AS="yasm" -+ AS_EXT=".asm" - ASFLAGS="$ASFLAGS -DARCH_X86_64=1 -I\$(SRCPATH)/common/x86/" - [ $compiler = GNU ] && CFLAGS="-m64 $CFLAGS" && LDFLAGS="-m64 $LDFLAGS" - if [ "$SYS" = MACOSX ]; then -@@ -648,7 +654,8 @@ - ARCH="PPC" - if [ $asm = auto ] ; then - define HAVE_ALTIVEC -- AS="${AS-${cross_prefix}gcc}" -+ AS="${AS-${CC}}" -+ AS_EXT=".c" - if [ $SYS = MACOSX ] ; then - CFLAGS="$CFLAGS -faltivec -fastf -mcpu=G4" - else -@@ -674,7 +681,7 @@ - LDFLAGS="$LDFLAGS -arch armv7" - fi - else -- AS="${AS-${cross_prefix}gcc}" -+ AS="${AS-${CC}}" - fi - ;; - s390|s390x) -@@ -760,6 +767,11 @@ - fi - fi - -+if [ $asm = auto -a $ARCH = ARM ] ; then -+ # check if the assembler supports '.func' (clang 3.5 does not) -+ as_check ".func test${NL}.endfunc" && define HAVE_AS_FUNC 1 -+fi -+ - [ $asm = no ] && AS="" - [ "x$AS" = x ] && asm="no" || asm="yes" - diff --git a/multimedia/libx264/pkg-plist b/multimedia/libx264/pkg-plist index cee118b2477b..b90796fd6d0f 100644 --- a/multimedia/libx264/pkg-plist +++ b/multimedia/libx264/pkg-plist @@ -3,5 +3,4 @@ include/x264_config.h lib/libx264.a lib/libx264.so lib/libx264.so.%%X264_BUILD%% -@dir libdata/pkgconfig libdata/pkgconfig/x264.pc diff --git a/multimedia/mpeg4ip/Makefile b/multimedia/mpeg4ip/Makefile index df94278a8812..a3495f0d1622 100644 --- a/multimedia/mpeg4ip/Makefile +++ b/multimedia/mpeg4ip/Makefile @@ -3,7 +3,7 @@ PORTNAME= mpeg4ip PORTVERSION= 1.6.1 -PORTREVISION= 32 +PORTREVISION= 33 CATEGORIES= multimedia audio ipv6 net MASTER_SITES= LOCAL/ahze # http://sourceforge.net/forum/forum.php?thread_id=1839453&forum_id=59136 diff --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile index 1e21b77708b6..85d1c13f6e7b 100644 --- a/multimedia/mplayer/Makefile +++ b/multimedia/mplayer/Makefile @@ -3,7 +3,7 @@ PORTNAME= mplayer PORTVERSION= ${MPLAYER_PORT_VERSION} -PORTREVISION= 2 +PORTREVISION= 3 COMMENT= High performance media player supporting many formats diff --git a/multimedia/msx264/Makefile b/multimedia/msx264/Makefile index c840ba94a31c..f48d4a7feef7 100644 --- a/multimedia/msx264/Makefile +++ b/multimedia/msx264/Makefile @@ -2,6 +2,7 @@ PORTNAME= msx264 PORTVERSION= 1.5.1 +PORTREVISION= 1 CATEGORIES= multimedia net MASTER_SITES= SAVANNAH/linphone/plugins/sources/ diff --git a/multimedia/obs-studio/Makefile b/multimedia/obs-studio/Makefile index bb364c5ea58e..b3319a1c2d2f 100644 --- a/multimedia/obs-studio/Makefile +++ b/multimedia/obs-studio/Makefile @@ -2,6 +2,7 @@ PORTNAME= obs-studio PORTVERSION= 0.9.1 +PORTREVISION= 1 CATEGORIES= multimedia MAINTAINER= kmoore@FreeBSD.org diff --git a/multimedia/transcode/Makefile b/multimedia/transcode/Makefile index 7673309de50f..92edd5cdd55b 100644 --- a/multimedia/transcode/Makefile +++ b/multimedia/transcode/Makefile @@ -3,7 +3,7 @@ PORTNAME= transcode PORTVERSION= 1.1.7 -PORTREVISION= 22 +PORTREVISION= 23 CATEGORIES= multimedia MASTER_SITES= http://cdn.bitbucket.org/france/transcode-tcforge/downloads/ diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile index 8f38ec92a842..831a2e393705 100644 --- a/multimedia/vlc/Makefile +++ b/multimedia/vlc/Makefile @@ -3,7 +3,7 @@ PORTNAME= vlc DISTVERSION= 2.2.1 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 4 CATEGORIES= multimedia audio ipv6 net www MASTER_SITES= http://download.videolan.org/pub/videolan/${PORTNAME}/${DISTVERSION:S/a$//}/ \ diff --git a/multimedia/x264/Makefile b/multimedia/x264/Makefile index 9c20cf7e2b44..04244b777951 100644 --- a/multimedia/x264/Makefile +++ b/multimedia/x264/Makefile @@ -1,17 +1,17 @@ # Created by: Michael Johnson <ahze@FreeBSD.org> # $FreeBSD$ # -# Updating notes: -# We use the nightly tarballs for the *stable* branch of the git repo. -# X264_BUILD is the "core" number, and can always be found in x264.h. +# NOTES FOR UPDATING PORT: +# +# We use tarballs from the *stable* branch of the upstream git repository. +# +# X264_BUILD is the "core" number, and can be found in x264.h. +# # X264_COMMIT is the commit number, and can be found here: # http://git.videolan.org/?p=x264.git;a=shortlog;h=refs/heads/stable -# To get X264_REV, you must checkout the git revision for the version to -# which you wish to update, and then run version.sh against it. -# Don't forget to update these for multimedia/libx264 as well: -# X264_BUILD, X264_REV, X264_COMMIT, X264_SNAPSHOT # -# distinfo for this port and libx264 should always be *identical*. +# X264_REV requires a checkout the git revision for the version the port +# is being updated to. Then run version.sh against it. # # Bumping PORTREVISION for dependent ports? This is useful: # cd $PORTSDIR; for x in $(find . -name "Makefile*" -print); @@ -19,7 +19,6 @@ PORTNAME= x264 PORTVERSION= 0.${X264_BUILD}.${X264_REV} -PORTREVISION= 1 CATEGORIES= multimedia MASTER_SITES= ftp://ftp.videolan.org/pub/videolan/x264/snapshots/ \ http://samples.mplayerhq.hu/yuv4mpeg2/:pgo @@ -29,54 +28,62 @@ DIST_SUBDIR= x264 EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= koobs@FreeBSD.org -COMMENT= Front-end for encoding H.264/MPEG-4 AVC video +COMMENT?= H.264/MPEG-4 AVC Video Encoding (Front End CLI) LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= yasm>=1.2.0:${PORTSDIR}/devel/yasm \ bash:${PORTSDIR}/shells/bash -LIB_DEPENDS= libx264.so:${PORTSDIR}/multimedia/libx264 -X264_BUILD= 142 -X264_REV= 2455 -X264_COMMIT= 021c0dc6c95c1bc239c9db78a80dd85fc856a4dd +X264_BUILD= 144 +X264_REV= 2533 +X264_COMMIT= c8a773ebfca148ef04f5a60d42cbd7336af0baf6 X264_GITVER= ${X264_COMMIT:C/^(.......).*$/\1/g} -X264_SNAPSHOT= 20140827 +X264_SNAPSHOT= 20150629 -USES= gmake pkgconfig tar:bzip2 +USES?= gmake pkgconfig tar:bzip2 USE_LDCONFIG= yes HAS_CONFIGURE= yes -OPTIONS_DEFINE= ASM DEBUG GCC GPAC LAVF PGO -OPTIONS_DEFAULT= ASM GPAC +OPTIONS_DEFINE?= ASM DEBUG GCC GPAC LAVF PGO +OPTIONS_DEFAULT?= ASM GPAC GCC_DESC= Use current GCC GPAC_DESC= MPEG-4 output support LAVF_DESC= libav* format input/output support (requires FFmpeg) ASM_CONFIGURE_OFF= --disable-asm + DEBUG_CONFIGURE_ON= --enable-debug -GPAC_LIB_DEPENDS= libgpac.so:${PORTSDIR}/multimedia/gpac-libgpac +DEBUG_CONFIGURE_OFF= --enable-strip + GPAC_CONFIGURE_OFF= --disable-gpac +GPAC_LIB_DEPENDS= libgpac.so:${PORTSDIR}/multimedia/gpac-libgpac + +LAVF_CONFIGURE_OFF= --disable-swscale --disable-lavf LAVF_LIB_DEPENDS= libavcodec.so:${PORTSDIR}/multimedia/ffmpeg \ libavformat.so:${PORTSDIR}/multimedia/ffmpeg \ libavutil.so:${PORTSDIR}/multimedia/ffmpeg \ libswscale.so:${PORTSDIR}/multimedia/ffmpeg -LAVF_CONFIGURE_OFF= --disable-swscale --disable-lavf -CONFIGURE_ARGS+= --extra-cflags="-I${LOCALBASE}/include" \ +CONFIGURE_COMMON_ARGS= --prefix=${PREFIX} \ + --extra-cflags="-I${LOCALBASE}/include" \ --extra-ldflags="-L${LOCALBASE}/lib" \ --disable-opencl \ + +CONFIGURE_ARGS?= ${CONFIGURE_COMMON_ARGS} \ --system-libx264 CFLAGS_armv6+= -mcpu=arm1136jf-s -PLIST_FILES= bin/x264 -PLIST_SUB+= X264_BUILD=${X264_BUILD} - .include <bsd.port.options.mk> +.if ${SLAVE_PORT} == "no" +PLIST_FILES= bin/x264 +LIB_DEPENDS= libx264.so:${PORTSDIR}/multimedia/libx264 +.endif + .if ${PORT_OPTIONS:MGCC} USE_GCC= yes .elif ${PORT_OPTIONS:MPGO} @@ -102,19 +109,19 @@ post-extract: .endif post-patch: - @${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|; \ + @${REINPLACE_CMD} -e ' \ s|/bin/bash|${LOCALBASE}/bin/bash|; \ s|gpac_static|gpac|g' \ ${WRKSRC}/configure - @${REINPLACE_CMD} -e 's|bash|sh|; \ + @${REINPLACE_CMD} -e ' \ + s|bash|sh|; \ s|VER="x"|VER="${X264_REV} ${X264_GITVER}"|; \ s|VERSION=""|VERSION=" r${X264_REV} ${X264_GITVER}"|' \ ${WRKSRC}/version.sh +.if ${SLAVE_PORT} == "no" pre-build: @(${RM} ${WRKSRC}/x264_config.h) - -post-install: - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/x264 +.endif .include <bsd.port.mk> diff --git a/multimedia/x264/distinfo b/multimedia/x264/distinfo index 304371397ce8..c334d0cba069 100644 --- a/multimedia/x264/distinfo +++ b/multimedia/x264/distinfo @@ -1,4 +1,2 @@ -SHA256 (x264/x264-snapshot-20140827-2245-stable.tar.bz2) = fb1de3f802a83778527d45e69b552efa73b677ebb3ac633a8720923e71ffc5e3 -SIZE (x264/x264-snapshot-20140827-2245-stable.tar.bz2) = 624939 -SHA256 (x264/example.y4m.bz2) = a5bec9d37362bd9d7773fbd0644643f9ec096d654d20823004e88d5df32bbff7 -SIZE (x264/example.y4m.bz2) = 4910029 +SHA256 (x264/x264-snapshot-20150629-2245-stable.tar.bz2) = 403a1e7178cf9d676d5ffd4641031ae568a501bb3c14fc8ca9bb7c8ac7465340 +SIZE (x264/x264-snapshot-20150629-2245-stable.tar.bz2) = 672453 diff --git a/multimedia/x264/files/patch-Makefile b/multimedia/x264/files/patch-Makefile deleted file mode 100644 index 6c90cc2e7a26..000000000000 --- a/multimedia/x264/files/patch-Makefile +++ /dev/null @@ -1,42 +0,0 @@ ---- Makefile.orig 2014-08-27 20:45:08 UTC -+++ Makefile -@@ -85,12 +85,12 @@ X86SRC0 += sad-a.asm - endif - X86SRC = $(X86SRC0:%=common/x86/%) - --ifeq ($(ARCH),X86) -+ifeq ($(ARCH),i386) - ARCH_X86 = yes - ASMSRC = $(X86SRC) common/x86/pixel-32.asm - endif - --ifeq ($(ARCH),X86_64) -+ifeq ($(ARCH),amd64) - ARCH_X86 = yes - ASMSRC = $(X86SRC:-32.asm=-64.asm) common/x86/trellis-64.asm - endif -@@ -104,7 +104,14 @@ endif - endif - - # AltiVec optims --ifeq ($(ARCH),PPC) -+ifeq ($(ARCH),powerpc) -+ARCH_PPC = yes -+endif -+ifeq ($(ARCH),powerpc64) -+ARCH_PPC = yes -+endif -+ -+ifdef ARCH_PPC - ifneq ($(AS),) - SRCS += common/ppc/mc.c common/ppc/pixel.c common/ppc/dct.c \ - common/ppc/quant.c common/ppc/deblock.c \ -@@ -113,7 +120,7 @@ endif - endif - - # NEON optims --ifeq ($(ARCH),ARM) -+ifeq ($(ARCH),armv6) - ifneq ($(AS),) - ASMSRC += common/arm/cpu-a.S common/arm/pixel-a.S common/arm/mc-a.S \ - common/arm/dct-a.S common/arm/quant-a.S common/arm/deblock-a.S \ diff --git a/multimedia/x264/files/patch-common_cpu.c b/multimedia/x264/files/patch-common_cpu.c index 5d2bd7d4c068..08ddb9e34a07 100644 --- a/multimedia/x264/files/patch-common_cpu.c +++ b/multimedia/x264/files/patch-common_cpu.c @@ -1,6 +1,6 @@ ---- common/cpu.c.orig 2014-08-27 20:45:08 UTC +--- common/cpu.c.orig 2015-06-29 20:45:09 UTC +++ common/cpu.c -@@ -313,7 +313,7 @@ uint32_t x264_cpu_detect( void ) +@@ -316,7 +316,7 @@ uint32_t x264_cpu_detect( void ) #elif ARCH_PPC @@ -9,7 +9,7 @@ #include <sys/sysctl.h> uint32_t x264_cpu_detect( void ) { -@@ -321,12 +321,16 @@ uint32_t x264_cpu_detect( void ) +@@ -324,12 +324,16 @@ uint32_t x264_cpu_detect( void ) uint32_t cpu = 0; #if SYS_OPENBSD int selectors[2] = { CTL_MACHDEP, CPU_ALTIVEC }; diff --git a/multimedia/x264/files/patch-configure b/multimedia/x264/files/patch-configure index 3830d51c01f2..61414cdd63db 100644 --- a/multimedia/x264/files/patch-configure +++ b/multimedia/x264/files/patch-configure @@ -1,25 +1,40 @@ -From 9463ec0004f1bddc49c05ed8e38430a4ce1738fb Mon Sep 17 00:00:00 2001 -From: Janne Grunau <janne-x264@jannau.net> -Date: Sun, 20 Jul 2014 13:40:28 +0200 -Subject: [PATCH] arm/ppc: use $CC as default assembler - ---- configure.orig 2014-08-27 20:45:08 UTC +--- configure.orig 2015-06-29 20:45:09 UTC +++ configure -@@ -648,7 +648,7 @@ case $host_cpu in - ARCH="PPC" - if [ $asm = auto ] ; then - define HAVE_ALTIVEC -- AS="${AS-${cross_prefix}gcc}" -+ AS="${AS-${CC}}" - if [ $SYS = MACOSX ] ; then - CFLAGS="$CFLAGS -faltivec -fastf -mcpu=G4" - else -@@ -674,7 +674,7 @@ case $host_cpu in - LDFLAGS="$LDFLAGS -arch armv7" - fi - else -- AS="${AS-${cross_prefix}gcc}" -+ AS="${AS-${CC}}" +@@ -639,7 +639,7 @@ case $host_cpu in + ASFLAGS="$ASFLAGS -f elf" fi ;; - s390|s390x) +- x86_64) ++ x86_64|amd64) + ARCH="X86_64" + AS="yasm" + AS_EXT=".asm" +@@ -678,7 +678,7 @@ case $host_cpu in + sparc) + ARCH="SPARC" + ;; +- mips|mipsel|mips64|mips64el) ++ mips|mipsel|mips64|mips64el|mipsn32) + ARCH="MIPS" + ;; + arm*) +@@ -695,7 +695,7 @@ case $host_cpu in + AS="${AS-${CC}}" + fi + ;; +- aarch64) ++ aarch64|arm64) + ARCH="AARCH64" + if [ "$SYS" = MACOSX ] ; then + AS="${AS-${SRCPATH}/tools/gas-preprocessor.pl -arch aarch64 -- ${CC}}" +@@ -1089,10 +1089,6 @@ if cc_check '' -Wshadow ; then + CFLAGS="-Wshadow $CFLAGS" + fi + +-if cc_check '' -Wmaybe-uninitialized ; then +- CFLAGS="-Wno-maybe-uninitialized $CFLAGS" +-fi +- + if [ $compiler = ICC -o $compiler = ICL ] ; then + if cc_check 'extras/intel_dispatcher.h' '' 'x264_intel_dispatcher_override();' ; then + define HAVE_INTEL_DISPATCHER |