Source Mage code commit list

[Arwed <scm AT mail.sourcemage.org>]

GIT changes to master grimoire by Arwed <arwed@Otherland.(none)>:

 video-libs/x264/DEPENDS |    6 +++++-
 video-libs/x264/HISTORY |    3 +++
 2 files changed, 8 insertions(+), 1 deletion(-)

New commits:
commit fa36f7407ea6411e43fa8863bdbe7da96e2077f1
Author: Arwed <arwed@Otherland.(none)>
Commit: Arwed <arwed@Otherland.(none)>

    x264: depends on yasm on x86_64

diff --git a/video-libs/x264/DEPENDS b/video-libs/x264/DEPENDS
index 5197409..5fedbf1 100755
--- a/video-libs/x264/DEPENDS
+++ b/video-libs/x264/DEPENDS
@@ -1,3 +1,7 @@
-depends nasm  &&
+if [[ ${SMGL_COMPAT_ARCHS[1]} = x86_64 ]]; then
+  depends yasm
+else
+  depends nasm
+fi  &&
 optional_depends "gtk+2" "--enable-gtk" "--disable-gtk" "build gui frontend"
 
diff --git a/video-libs/x264/HISTORY b/video-libs/x264/HISTORY
index 473c3ab..5a06102 100644
--- a/video-libs/x264/HISTORY
+++ b/video-libs/x264/HISTORY
@@ -1,3 +1,6 @@
+2007-02-25 Arwed v. Merkatz <v.merkatz AT gmx.net>
+       * DEPENDS: depends on yasm instead of nasm on x86_64, bug #13566
+
 2007-01-01 George Sherwood <george AT beernabeer.com>
        * DETAILS: Updated to 20070101-2245