summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArwed2007-02-25 19:54:45 +0100
committerArwed2007-02-25 19:56:38 +0100
commitfa36f7407ea6411e43fa8863bdbe7da96e2077f1 (patch)
tree96b2cbbb14d17b9e7534cfa0c0b555259d7e398d
parenta45bedfd87782415d1a38b846d79f30c84c182aa (diff)
x264: depends on yasm on x86_64
-rwxr-xr-xvideo-libs/x264/DEPENDS6
-rw-r--r--video-libs/x264/HISTORY3
2 files changed, 8 insertions, 1 deletions
diff --git a/video-libs/x264/DEPENDS b/video-libs/x264/DEPENDS
index 5197409398..5fedbf123a 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 473c3ab057..5a061023c2 100644
--- a/video-libs/x264/HISTORY
+++ b/video-libs/x264/HISTORY
@@ -1,3 +1,6 @@
+2007-02-25 Arwed v. Merkatz <v.merkatz@gmx.net>
+ * DEPENDS: depends on yasm instead of nasm on x86_64, bug #13566
+
2007-01-01 George Sherwood <george@beernabeer.com>
* DETAILS: Updated to 20070101-2245