diff options
| author | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2017-04-14 23:48:32 +0700 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2017-04-15 07:50:43 +0700 |
| commit | e245c8cc67c789567bc2f37c9e438703f785d7aa (patch) | |
| tree | 0d71cf965ac5ac03ccd03fae3f4cdaf4d25d53ff /multimedia/cinelerra/cinelerra.SlackBuild | |
| parent | c12a3dcc11a93bd4a8852c4889c371a83cd1cb5d (diff) | |
multimedia/cinelerra: Remove external ffmpeg support.
We are still waiting for fully ffmpeg 3 support.
Until then, we will go with internal ffmpeg only.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'multimedia/cinelerra/cinelerra.SlackBuild')
| -rw-r--r-- | multimedia/cinelerra/cinelerra.SlackBuild | 36 |
1 files changed, 8 insertions, 28 deletions
diff --git a/multimedia/cinelerra/cinelerra.SlackBuild b/multimedia/cinelerra/cinelerra.SlackBuild index de42bbd6b51a..dfc6c9308cda 100644 --- a/multimedia/cinelerra/cinelerra.SlackBuild +++ b/multimedia/cinelerra/cinelerra.SlackBuild @@ -23,13 +23,14 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=cinelerra -VERSION=${VERSION:-cv_2.3} +SRCNAM=CinelerraCV +VERSION=${VERSION:-2.3} 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 @@ -40,8 +41,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" @@ -60,27 +61,14 @@ else mmx="--enable-mmx" fi -# Patches for ffmpeg-2.x exist on the official website. -# While testing, the patches work for the most part, but -# in various cases (like loading multiple DNxHD files) -# they make the program very unstable. -# Defaulting to internal ffmpeg because of this. -EXTERNALFFMPEG=${EXTERNALFFMPEG:-no} - -if [ "$EXTERNALFFMPEG" = "no" ]; then - externalffmpeg="" -elif [ "$EXTERNALFFMPEG" = "yes" ]; then - externalffmpeg="--with-external-ffmpeg" -fi - set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf CinelerraCV-2.3 -tar xvf $CWD/CinelerraCV-2.3.tar.xz -cd CinelerraCV-2.3 +rm -rf $SRCNAM-$VERSION +tar xvf $CWD/$SRCNAM-$VERSION.tar.xz +cd $SRCNAM-$VERSION chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -88,14 +76,7 @@ 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 {} \; -if [ "$EXTERNALFFMPEG" = "yes" ]; then -# Patches (from the official website) for compatibility with ffmpeg-2.x -patch -p1 < $CWD/patches/cinelerra-cv-ffmpeg_api2.2.patch -patch -p1 < $CWD/patches/cinelerra-cv-ffmpeg2.0.patch -fi - ./autogen.sh - LDFLAGS="-ldl" \ CFLAGS="$SLKCFLAGS -D__STDC_CONSTANT_MACROS" \ CXXFLAGS="$SLKCFLAGS -D__STDC_CONSTANT_MACROS" \ @@ -111,7 +92,6 @@ CXXFLAGS="$SLKCFLAGS -D__STDC_CONSTANT_MACROS" \ --with-x \ --enable-opengl \ --build=$ARCH-slackware-linux \ - $externalffmpeg \ $mmx make |