mirrors/vlc
0
0
Fork 0
mirror of https://github.com/videolan/vlc.git synced 2024-12-14 04:04:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

contrib: fix libmpeg2 patch

Browse Source 
Disable the ARM pld instruction only on architecture versions that
don't support it.

Thanks to Kirill A. Shutemov!
This commit is contained in:
Pierre Ynard 2009-11-20 20:21:21 +01:00
parent 64ebe1ee52
commit 5e7bc5f267
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
extras/contrib/src/Makefile
View File

@ -565,9 +565,7 @@ libmpeg2-$(LIBMPEG2_VERSION).tar.gz:
libmpeg2: libmpeg2-$(LIBMPEG2_VERSION).tar.gz
$(EXTRACT_GZ)
ifdef HAVE_WINCE
patch -p0 < Patches/libmpeg2-arm-pld.patch
endif
cd libmpeg2 && patch -p0 < ../Patches/libmpeg2-mc-neon.patch
cd libmpeg2 && ./bootstrap

17
extras/contrib/src/Patches/libmpeg2-arm-pld.patch
View File

@ -1,13 +1,20 @@
diff -urNp libmpeg2.orig/libmpeg2/motion_comp_arm_s.S libmpeg2/libmpeg2/motion_comp_arm_s.S
--- libmpeg2.orig/libmpeg2/motion_comp_arm_s.S 2008-07-09 21:16:05.000000000 +0200
+++ libmpeg2/libmpeg2/motion_comp_arm_s.S 2009-11-13 23:09:46.000000000 +0100
@@ -21,6 +21,9 @@
+++ libmpeg2/libmpeg2/motion_comp_arm_s.S 2009-11-20 19:55:22.000000000 +0100
@@ -19,6 +19,16 @@
@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
.text
+@ Data preload is supported only by ARM V5TE and above
+
+#if (defined (__ARM_ARCH_2__) || defined (__ARM_ARCH_3__) \
+ || defined (__ARM_ARCH_3M__) || defined (__ARM_ARCH_4__) \
+ || defined (__ARM_ARCH_4T__) || defined (__ARM_ARCH_5__) \
+ || defined (__ARM_ARCH_5T__))
+.macro pld reg
+.endm
+#endif
+
.text
@ ----------------------------------------------------------------
.align
.global MC_put_o_16_arm