aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMauro Giachero <mauro dot giachero at gmail dot com>2010-06-29 11:14:41 -0500
committerRobby Workman <rworkman@slackbuilds.org>2010-06-29 11:14:41 -0500
commit3d610ffb6a850b54cbfcb6411ba05cd16edf35a5 (patch)
treeb22ba1c5ff1381936ad328ccb58b7c2e8f0055b6
parent7b509b71c45795a6b06d10619da1e66f556b9e14 (diff)
libraries/opal: Fixed to build with ffmpeg-0.6.
Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
-rw-r--r--libraries/opal/opal.SlackBuild14
-rw-r--r--libraries/opal/opal.info2
2 files changed, 11 insertions, 5 deletions
diff --git a/libraries/opal/opal.SlackBuild b/libraries/opal/opal.SlackBuild
index 4c92c73d8845..df06d73f19d2 100644
--- a/libraries/opal/opal.SlackBuild
+++ b/libraries/opal/opal.SlackBuild
@@ -42,17 +42,22 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
+# The -D__STDC_CONSTANT_MACROS thing is required to build
+# against ffmpeg 0.6
+# Retrieved from
+# http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/net-libs/opal/opal-3.6.7.ebuild?r1=1.3&r2=1.4
+# Thanks to the Gentoo folks for coming up with this fix!
if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+ SLKCFLAGS="-O2 -march=i486 -mtune=i686 -D__STDC_CONSTANT_MACROS"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+ SLKCFLAGS="-O2 -march=i686 -mtune=i686 -D__STDC_CONSTANT_MACROS"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
+ SLKCFLAGS="-O2 -fPIC -D__STDC_CONSTANT_MACROS"
LIBDIRSUFFIX="64"
else
- SLKCFLAGS="-O2"
+ SLKCFLAGS="-O2 -D__STDC_CONSTANT_MACROS"
LIBDIRSUFFIX=""
fi
@@ -94,6 +99,7 @@ CXXFLAGS="$SLKCFLAGS" \
make
make install DESTDIR=$PKG
+
# Remove static library
rm $PKG/usr/lib${LIBDIRSUFFIX}/libopal_s.a
diff --git a/libraries/opal/opal.info b/libraries/opal/opal.info
index 37db523cce97..5e844c92317a 100644
--- a/libraries/opal/opal.info
+++ b/libraries/opal/opal.info
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
MAINTAINER="Mauro Giachero"
EMAIL="mauro dot giachero at gmail dot com"
-APPROVED="dsomero"
+APPROVED="rworkman"