[Armadeus-commitlog] armadeus branch, master, updated. release-3.2-156-g7453210

[Julien B a. A. <ar...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  745321073e4a650d23720349367cd58321ea5e95 (commit)
      from  5ee7b5a4369a7117289b5176ae62e11db65d7d0e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 745321073e4a650d23720349367cd58321ea5e95
Author: Julien Boibessot <jul...@ar...>
Date:   Tue Feb 2 22:53:09 2010 +0100

    [BUILDROOT] Removes buildroot/package/mplayer/mplayer-1.0rc1-armv4.patch from GIT and replace it by a patch in buildroot/patches/

-----------------------------------------------------------------------

Summary of changes:
 .../package/mplayer/mplayer-1.0rc1-armv4.patch     |   14 ------------
 ...for_pld_asm_instruction_on_non_armv5_arch.patch |   23 ++++++++++++++++++++
 2 files changed, 23 insertions(+), 14 deletions(-)
 delete mode 100644 buildroot/package/mplayer/mplayer-1.0rc1-armv4.patch
 create mode 100644 patches/buildroot/099-mplayer-add_patch_for_pld_asm_instruction_on_non_armv5_arch.patch

diff --git a/buildroot/package/mplayer/mplayer-1.0rc1-armv4.patch b/buildroot/package/mplayer/mplayer-1.0rc1-armv4.patch
deleted file mode 100644
index f2af282..0000000
--- a/buildroot/package/mplayer/mplayer-1.0rc1-armv4.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- MPlayer-1.0rc1/libavcodec/armv4l/dsputil_arm_s.S.ori	2006-10-23 00:32:33.000000000 +0200
-+++ MPlayer-1.0rc1/libavcodec/armv4l/dsputil_arm_s.S	2009-01-08 00:26:45.000000000 +0100
-@@ -19,6 +19,11 @@
- @ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- @
- 
-+#if !defined(HAVE_ARMV5TE) && !defined(HAVE_IWMMXT)
-+.macro pld arg
-+        @
-+.endm
-+#endif
- .macro  ADJ_ALIGN_QUADWORD_D shift, Rd0, Rd1, Rd2, Rd3, Rn0, Rn1, Rn2, Rn3, Rn4
-         mov \Rd0, \Rn0, lsr #(\shift * 8)
-         mov \Rd1, \Rn1, lsr #(\shift * 8)
diff --git a/patches/buildroot/099-mplayer-add_patch_for_pld_asm_instruction_on_non_armv5_arch.patch b/patches/buildroot/099-mplayer-add_patch_for_pld_asm_instruction_on_non_armv5_arch.patch
new file mode 100644
index 0000000..d9092b9
--- /dev/null
+++ b/patches/buildroot/099-mplayer-add_patch_for_pld_asm_instruction_on_non_armv5_arch.patch
@@ -0,0 +1,23 @@
+This patch is needed to have mplayer compile on ARMv4 arch (maybe others...)
+
+Index: buildroot/package/mplayer/mplayer-1.0rc1-add_pld_asm_inst_for_non_armv5_arch.patch
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/mplayer/mplayer-1.0rc1-add_pld_asm_inst_for_non_armv5_arch.patch	2010-02-02 21:39:09.000000000 +0100
+@@ -0,0 +1,16 @@
++pld instruction is only available on ARMv5.
++
++--- MPlayer-1.0rc1/libavcodec/armv4l/dsputil_arm_s.S.ori	2006-10-23 00:32:33.000000000 +0200
+++++ MPlayer-1.0rc1/libavcodec/armv4l/dsputil_arm_s.S	2009-01-08 00:26:45.000000000 +0100
++@@ -19,6 +19,11 @@
++ @ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
++ @
++ 
+++#if !defined(HAVE_ARMV5TE) && !defined(HAVE_IWMMXT)
+++.macro pld arg
+++        @
+++.endm
+++#endif
++ .macro  ADJ_ALIGN_QUADWORD_D shift, Rd0, Rd1, Rd2, Rd3, Rn0, Rn1, Rn2, Rn3, Rn4
++         mov \Rd0, \Rn0, lsr #(\shift * 8)
++         mov \Rd1, \Rn1, lsr #(\shift * 8)


hooks/post-receive
-- 
armadeus