From: Gustavo Zacarias Date: Wed, 23 May 2012 11:36:38 +0000 (-0300) Subject: libmpeg2: move ARM patch to the correct directory X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a3c46e4f17c4381ff526b00f805194fde72b8492;p=buildroot.git libmpeg2: move ARM patch to the correct directory The patch was added after the multimedia category reorganization so it became unreachable. Move it to the final libmpeg2 package directory. Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- diff --git a/package/libmpeg2/libmpeg2-0.5.1-armv4l.patch b/package/libmpeg2/libmpeg2-0.5.1-armv4l.patch new file mode 100644 index 0000000000..70d45ef916 --- /dev/null +++ b/package/libmpeg2/libmpeg2-0.5.1-armv4l.patch @@ -0,0 +1,24 @@ +Patch taken from gentoo. + +Signed-off-by: Gustavo Zacarias + +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-20 19:55:22.000000000 +0100 +@@ -19,6 +19,16 @@ + @ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + ++@ 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 + + @ ---------------------------------------------------------------- diff --git a/package/multimedia/libmpeg2/libmpeg2-0.5.1-armv4l.patch b/package/multimedia/libmpeg2/libmpeg2-0.5.1-armv4l.patch deleted file mode 100644 index 70d45ef916..0000000000 --- a/package/multimedia/libmpeg2/libmpeg2-0.5.1-armv4l.patch +++ /dev/null @@ -1,24 +0,0 @@ -Patch taken from gentoo. - -Signed-off-by: Gustavo Zacarias - -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-20 19:55:22.000000000 +0100 -@@ -19,6 +19,16 @@ - @ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - -+@ 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 - - @ ----------------------------------------------------------------