From 1e756a835e2fddd883b8475fe3b8f87230781163 Mon Sep 17 00:00:00 2001 From: Pierre Ynard Date: Sat, 14 Nov 2009 03:42:26 +0100 Subject: [PATCH] contrib: crappy patch to build libmpeg2 on WinCE Devices running WinCE don't necessarily support the pld ARM instruction, which prevents libmpeg2 from building. This patch unconditionally removes that instruction on WinCE. --- extras/contrib/src/Makefile | 3 +++ extras/contrib/src/Patches/libmpeg2-arm-pld.patch | 13 +++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 extras/contrib/src/Patches/libmpeg2-arm-pld.patch diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile index a6d1828c4c..66b2ed7f92 100644 --- a/extras/contrib/src/Makefile +++ b/extras/contrib/src/Makefile @@ -561,6 +561,9 @@ 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 diff --git a/extras/contrib/src/Patches/libmpeg2-arm-pld.patch b/extras/contrib/src/Patches/libmpeg2-arm-pld.patch new file mode 100644 index 0000000000..6a89fe6674 --- /dev/null +++ b/extras/contrib/src/Patches/libmpeg2-arm-pld.patch @@ -0,0 +1,13 @@ +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 @@ + + .text + ++.macro pld reg ++.endm ++ + @ ---------------------------------------------------------------- + .align + .global MC_put_o_16_arm -- 2.39.2