diff options
| author |   Willy Sudiarto Raharjo | 2017-04-07 13:05:12 +0200 |
|---|---|---|
| committer | Willy Sudiarto Raharjo | 2017-04-15 02:17:58 +0200 |
| commit | ce82387125be27158cd3aed6f5e403847ced9b51 (patch) | |
| tree | af294fc5be30c0e3ec5e8300ec76f9b074791064 /libraries/OpenSceneGraph/OpenSceneGraph.SlackBuild | |
| parent | e619aa872fa6a53938be85e4888fab8eaece4ac9 (diff) | |
| download | slackbuilds-ce82387125be27158cd3aed6f5e403847ced9b51.tar.gz | |
libraries/OpenSceneGraph: Patched to fix build with ffmpeg 3.x.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'libraries/OpenSceneGraph/OpenSceneGraph.SlackBuild')
| -rw-r--r-- | libraries/OpenSceneGraph/OpenSceneGraph.SlackBuild | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/libraries/OpenSceneGraph/OpenSceneGraph.SlackBuild b/libraries/OpenSceneGraph/OpenSceneGraph.SlackBuild index 1696730c23..ba5dcda856 100644 --- a/libraries/OpenSceneGraph/OpenSceneGraph.SlackBuild +++ b/libraries/OpenSceneGraph/OpenSceneGraph.SlackBuild @@ -7,12 +7,12 @@ PRGNAM=OpenSceneGraph VERSION=${VERSION:-3.4.0} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -23,8 +23,8 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" @@ -52,6 +52,9 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +# Thanks to ARCH +patch -p2 < $CWD/ffmpeg3.patch + mkdir -p build cd build cmake \ @@ -65,13 +68,11 @@ cd build make install DESTDIR=$PKG cd .. -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ +find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a \ - AUTHORS.txt ChangeLog LICENSE.txt NEWS.txt README.txt \ - $PKG/usr/doc/$PRGNAM-$VERSION +cp -a AUTHORS.txt ChangeLog LICENSE.txt NEWS.txt README.txt $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install |