From fa0a8f2971827c5848e9fe505287480768f58d90 Mon Sep 17 00:00:00 2001
From: Hugo Villeneuve <hugo@hugovil.com>
Date: Thu, 27 Jun 2013 08:22:55 -0400
Subject: [PATCH] Move yasm from stage5 to stage3

---
 config/dependencies    | 4 ++++
 stage3/hv-install-1    | 2 ++
 stage3/packages-update | 2 ++
 stage5/hv-install-1    | 4 ++--
 stage5/packages-update | 2 --
 5 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/config/dependencies b/config/dependencies
index 4df6cc6..53a5347 100644
--- a/config/dependencies
+++ b/config/dependencies
@@ -169,3 +169,7 @@ ${MIDORI}: ${WEBKIT} ${VALA} ${LIBNOTIFY} ${LIBRSVG}
 
 ${CMAKE}: ${LIBARCHIVE}
 ${MYSQL}: ${CMAKE}
+
+${LIBX264}: ${YASM}
+
+${GST_FFMPEG}: ${YASM}
diff --git a/stage3/hv-install-1 b/stage3/hv-install-1
index 27a3589..a3a10da 100755
--- a/stage3/hv-install-1
+++ b/stage3/hv-install-1
@@ -166,6 +166,8 @@ fi
 ipkg ${GNUPG} "--libexecdir=/usr/lib"
 ipkg ${MUTT} "--enable-imap --with-ssl --with-sasl --enable-hcache"
 
+ipkg ${YASM}
+
 # Audio
 if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; then
     if [ "x${SOUND_CARD}" = "xyes" ]; then
diff --git a/stage3/packages-update b/stage3/packages-update
index 0cb4041..6b09287 100755
--- a/stage3/packages-update
+++ b/stage3/packages-update
@@ -152,6 +152,8 @@ fi
 fpkg -s "gnupg" ${GNUPG} "ftp://ftp.gnupg.org/gcrypt"
 fpkg -m sf ${MUTT}
 
+fpkg -e "tar.gz" ${YASM} "http://www.tortall.net/projects/yasm/releases"
+
 # Audio
 if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; then
     if [ "x${SOUND_CARD}" = "xyes" ]; then
diff --git a/stage5/hv-install-1 b/stage5/hv-install-1
index 8c049cd..f78c14a 100755
--- a/stage5/hv-install-1
+++ b/stage5/hv-install-1
@@ -142,7 +142,8 @@ if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; the
         ipkg ${GST_PLUGINS_GOOD}
         ipkg ${GST_PLUGINS_BAD}
         ipkg ${GST_PLUGINS_UGLY}
-        ipkg -m acnb ${GST_FFMPEG} "--with-ffmpeg-extra-configure=--disable-yasm"
+        ipkg -m acnb ${GST_FFMPEG}
+
         ipkg ${GNOME_MEDIA} # Pour gstreamer-properties et gnome-volume-control
 
         ipkg ${WXGTK} "--enable-unicode --disable-compat26"
@@ -152,7 +153,6 @@ if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; the
 
     ipkg ${SYLPHEED} "--enable-ssl --enable-ldap"
     ipkg ${LIBNOTIFY}
-    ipkg ${YASM}
     ipkg ${LIBVPX} "--enable-shared"
 
     ipkg -m acnb -t -j ${WEBKIT} "\
diff --git a/stage5/packages-update b/stage5/packages-update
index a58186b..6da4eb0 100755
--- a/stage5/packages-update
+++ b/stage5/packages-update
@@ -128,8 +128,6 @@ fpkg ${SYLPHEED} \
 
 fpkg -m gnome ${LIBNOTIFY}
 
-fpkg -e "tar.gz" ${YASM} "http://www.tortall.net/projects/yasm/releases"
-
 fpkg ${LIBVPX} "http://webm.googlecode.com/files"
 
 fpkg -e "tar.xz" ${WEBKIT} "http://webkitgtk.org/releases"
-- 
2.20.1