From 3d610ffb6a850b54cbfcb6411ba05cd16edf35a5 Mon Sep 17 00:00:00 2001 From: Mauro Giachero Date: Tue, 29 Jun 2010 11:14:41 -0500 Subject: [PATCH] libraries/opal: Fixed to build with ffmpeg-0.6. Signed-off-by: Robby Workman --- libraries/opal/opal.SlackBuild | 14 ++++++++++---- libraries/opal/opal.info | 2 +- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/libraries/opal/opal.SlackBuild b/libraries/opal/opal.SlackBuild index 4c92c73d88..df06d73f19 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 37db523cce..5e844c9231 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"