[Lunar-commits] <moonbase> xvidcore: Adjusting the BUILD (consolidation) and fixing the broken

[Dennis `stumbles` Veatch]

commit fc409fb5922d86d6955c6a05095f5d3b2b2b0d6c
Author: Dennis `stumbles` Veatch <stumbles at lunar-linux.org>
Date:   Thu Mar 3 13:31:11 2011 -0500

    xvidcore: Adjusting the BUILD (consolidation) and fixing the broken
    
    symlink.
---
 video/xvidcore/BUILD        |   15 ++++++++++++---
 video/xvidcore/BUILD.x86_64 |   25 -------------------------
 2 files changed, 12 insertions(+), 28 deletions(-)

diff --git a/video/xvidcore/BUILD b/video/xvidcore/BUILD
index e647bbf..a9b2b4d 100644
--- a/video/xvidcore/BUILD
+++ b/video/xvidcore/BUILD
@@ -1,8 +1,17 @@
 (
 
-  export CFLAGS="$CFLAGS -fPIC"
+# yasm causes xvidcore to create some faulty assembly that is not
+# -fPIC friendly, so just changing the detection to use nasm. No
+# x86 box available, so making this a x86_64 thing.
+  if [ `arch` == "x86_64" ]; then
+     if module_installed nasm; then
+       export ac_yasm="nasm"
+     fi
+  fi &&
 
-  cd build/generic
+  export CFLAGS="$CFLAGS -fPIC"  &&
+
+  cd build/generic   &&
 
   ./configure  --prefix=/usr              \
                --infodir=/usr/share/info  \
@@ -13,7 +22,7 @@
 
 # Some apps look for a .so notably transcode, so lets make one. Seems its .so name does not follow the major
 # version name. If anyone has a better way to do this, please adjust.
-  ln -sf /usr/lib/libxvidcore.so.4.2 /usr/lib/libxvidcore.so
+  ln -sf /usr/lib/libxvidcore.so.4.3 /usr/lib/libxvidcore.so
   
 
 ) > $C_FIFO 2>&1
diff --git a/video/xvidcore/BUILD.x86_64 b/video/xvidcore/BUILD.x86_64
deleted file mode 100644
index 9fc016a..0000000
--- a/video/xvidcore/BUILD.x86_64
+++ /dev/null
@@ -1,25 +0,0 @@
-(
-
-# yasm causes xvidcore to create some faulty assembly that is not
-# -fPIC friendly, so just changing the detection to use nasm. No
-# x86 box available, so making this a x86_64 thing.
-  if module_installed yasm ; then
-  export ac_yasm="nasm"
-  fi &&
-
-  CFLAGS="$CFLAGS -fPIC"
-
-  cd build/generic
-
-  ./configure  --prefix=/usr              \
-               --infodir=/usr/share/info  \
-               --mandir=/usr/share/man    \
-               $OPTS                     &&
-
-  default_make &&
-
-# Some apps look for a .so notably transcode, so lets make one. Seems its .so name does not follow the major
-# version name. If anyone has a better way to do this, please adjust.
-  ln -sf /usr/lib/libxvidcore.so.4.2 /usr/lib/libxvidcore.so
-
-) > $C_FIFO 2>&1