diff options
3 files changed, 49 insertions, 1 deletions
diff --git a/multimedia/mplayer-share/distinfo b/multimedia/mplayer-share/distinfo index 8822fa08bc0..da85295cfc9 100644 --- a/multimedia/mplayer-share/distinfo +++ b/multimedia/mplayer-share/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.86 2014/10/09 14:48:51 martin Exp $ +$NetBSD: distinfo,v 1.87 2015/03/24 14:27:20 joerg Exp $ SHA1 (mplayer/MPlayer-1.1.1.tar.xz) = ba2f3bd1442d04b17b0143680850273d928689c1 RMD160 (mplayer/MPlayer-1.1.1.tar.xz) = 745b3fdf684ba7614dbec2a7143188b7c9cca3a1 @@ -7,6 +7,8 @@ SHA1 (patch-CVE-2014-4610) = 855276c8e301494942a03e13712cc53615d8f4d5 SHA1 (patch-aa) = da461823d0731624de964323ab630f6e295be7b7 SHA1 (patch-ae) = 286f5ac075ea4123a1a6276f97e02a4dda9b3e67 SHA1 (patch-an) = a1d16ce7a4ff5a2071a7bac1b6836dc197b849e4 +SHA1 (patch-ffmpeg_libavcodec_arm_asm.S) = dfe8670bcbb6e6dc17b65bf6459b9550da06f73f +SHA1 (patch-ffmpeg_libavcodec_arm_simple__idct__arm.S) = 7ffa3a0dc52afe28a6c184a72586a1392719d885 SHA1 (patch-ffmpeg_libavutil_x86__cpu.h) = ea2c6e179840c7746930848b751b6fd1dcd67e90 SHA1 (patch-gui_interface.c) = 25ada9d9af1e76ffa7b4b97ee07fa1f5250ac000 SHA1 (patch-libao2_ao_sun.c) = ce7042b394b9b8c051597c734b70290c8bf0a8d5 diff --git a/multimedia/mplayer-share/patches/patch-ffmpeg_libavcodec_arm_asm.S b/multimedia/mplayer-share/patches/patch-ffmpeg_libavcodec_arm_asm.S new file mode 100644 index 00000000000..99d847b9b5d --- /dev/null +++ b/multimedia/mplayer-share/patches/patch-ffmpeg_libavcodec_arm_asm.S @@ -0,0 +1,33 @@ +$NetBSD: patch-ffmpeg_libavcodec_arm_asm.S,v 1.1 2015/03/24 14:27:20 joerg Exp $ + +--- ffmpeg/libavcodec/arm/asm.S.orig 2015-03-23 19:38:11.000000000 +0000 ++++ ffmpeg/libavcodec/arm/asm.S +@@ -64,7 +64,11 @@ ELF .eabi_attribute 25, \val + .macro function name, export=0 + .macro endfunc + ELF .size \name, . - \name ++#ifdef __ARM_DWARF_EH__ ++ .cfi_endproc ++#else + .endfunc ++#endif + .purgem endfunc + .endm + .text +@@ -72,10 +76,15 @@ ELF .size \name, . - \name + .if \export + .global EXTERN_ASM\name + EXTERN_ASM\name: ++ .else ++\name: + .endif + ELF .type \name, %function ++#ifdef __ARM_DWARF_EH__ ++ .cfi_startproc ++#else + .func \name +-\name: ++#endif + .endm + + .macro const name, align=2 diff --git a/multimedia/mplayer-share/patches/patch-ffmpeg_libavcodec_arm_simple__idct__arm.S b/multimedia/mplayer-share/patches/patch-ffmpeg_libavcodec_arm_simple__idct__arm.S new file mode 100644 index 00000000000..8331eff0c09 --- /dev/null +++ b/multimedia/mplayer-share/patches/patch-ffmpeg_libavcodec_arm_simple__idct__arm.S @@ -0,0 +1,13 @@ +$NetBSD: patch-ffmpeg_libavcodec_arm_simple__idct__arm.S,v 1.1 2015/03/24 14:27:20 joerg Exp $ + +--- ffmpeg/libavcodec/arm/simple_idct_arm.S.orig 2015-03-23 19:55:14.000000000 +0000 ++++ ffmpeg/libavcodec/arm/simple_idct_arm.S +@@ -489,7 +489,7 @@ __end_bef_a_evaluation: + sub r4, r6, r11 @ R4=a0-W2*ROWr16[2] (a3) + add r6, r6, r11 @ R6=a0+W2*ROWr16[2] (a0) + bal __end_a_evaluation +- ++endfunc + + .align + __constant_ptr__: @@ see #defines at the beginning of the source code for values. |