summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHeinz Wiesinger <pprkut@liwjatan.at>2010-06-20 09:32:26 -0400
committerErik Hanson <erik@slackbuilds.org>2010-06-20 15:20:26 -0500
commit57d3aa63798ff10b7a3875464bb86abb6ed6c644 (patch)
tree7e6acd818b7a690b30d94c65bdad754471f8a37c
parent62d3547fb2cffc6f0c25e888ddc29eb63dd536b7 (diff)
downloadslackbuilds-57d3aa63798ff10b7a3875464bb86abb6ed6c644.tar.gz
multimedia/xvidcore: Fix detecting yasm-1.0.x.
Signed-off-by: dsomero <xgizzmo@slackbuilds.org>
-rw-r--r--multimedia/xvidcore/xvidcore.SlackBuild5
-rw-r--r--multimedia/xvidcore/xvidcore.info2
2 files changed, 5 insertions, 2 deletions
diff --git a/multimedia/xvidcore/xvidcore.SlackBuild b/multimedia/xvidcore/xvidcore.SlackBuild
index d327712890..16b767e277 100644
--- a/multimedia/xvidcore/xvidcore.SlackBuild
+++ b/multimedia/xvidcore/xvidcore.SlackBuild
@@ -24,7 +24,7 @@
PRGNAM=xvidcore
VERSION=${VERSION:-1.2.2}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
# Automatically determine the architecture we're building on:
@@ -71,6 +71,9 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
+# Fix detecting yasm - taken from the gentoo ebuild for xvid
+sed -i -e '/^minimum_yasm_minor_version/s:=.*:=0:' build/generic/configure
+
cd build/generic
CFLAGS="$SLKCFLAGS" \
./configure \
diff --git a/multimedia/xvidcore/xvidcore.info b/multimedia/xvidcore/xvidcore.info
index 60b2990ad2..3e9443f7c5 100644
--- a/multimedia/xvidcore/xvidcore.info
+++ b/multimedia/xvidcore/xvidcore.info
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
MAINTAINER="Frank Caraballo"
EMAIL="fecaraballo{at}gmail{dot}com"
-APPROVED="Erik Hanson"
+APPROVED="dsomero"