From 0775cacdc5d753cd43a203714d526ddca894ef10 Mon Sep 17 00:00:00 2001
From: Heinz Wiesinger <pprkut@slackbuilds.org>
Date: Fri, 1 Apr 2011 12:49:31 +0200
Subject: multimedia/ffmpeg: Script cleanup

Signed-off-by: Heinz Wiesinger <pprkut@slackbuilds.org>
---
 multimedia/ffmpeg/ffmpeg.SlackBuild | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'multimedia/ffmpeg')

diff --git a/multimedia/ffmpeg/ffmpeg.SlackBuild b/multimedia/ffmpeg/ffmpeg.SlackBuild
index 8164687adb..a81ebfcdc1 100644
--- a/multimedia/ffmpeg/ffmpeg.SlackBuild
+++ b/multimedia/ffmpeg/ffmpeg.SlackBuild
@@ -8,7 +8,7 @@
 
 PRGNAM=ffmpeg
 VERSION=${VERSION:-0.6.1}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -41,7 +41,7 @@ fi
 # --enable-runtime-cpu is meant for libswscale only and
 # has no influence on the other parts of ffmpeg so there's
 # not really a point in bothering
-PKGARCH=custom
+PKGARCH=$(uname -m)_custom
 
 # Configure ffmpeg features not autodetected by default
 # Unfortunately ffmpeg's configure doesn't support --enable-feature=yes
@@ -88,7 +88,7 @@ if [ "${JP2:-no}" = "no" ]; then
   openjpeg=""
 else
   openjpeg="--enable-libopenjpeg"
-  SLKCFLAGS="$SLKCFLAGS -I/usr/include/openjpeg"
+  SLKCFLAGS="$SLKCFLAGS -I/usr/include/openjpeg-1.4"
 fi
 
 if [ "${OPENCORE:-no}" = "no" ]; then
@@ -183,6 +183,7 @@ CXXFLAGS="$SLKCFLAGS" \
 
 make
 make install DESTDIR=$PKG
+make install-man DESTDIR=$PKG
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
@@ -192,6 +193,7 @@ find $PKG/usr/man -type f -exec gzip -9 {} \;
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a Changelog* COPYING* CREDITS* INSTALL* MAINTAINERS* \
   README* doc/TODO* doc/*.txt $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a doc/*.html $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
-- 
cgit v1.2.3