aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--media/libs/ilmbase/Manifest23
-rwxr-xr-xmedia/libs/ilmbase/ilmbase.SlackBuild95
-rw-r--r--media/libs/libdv/Manifest24
-rwxr-xr-xmedia/libs/libdv/libdv.SlackBuild95
-rw-r--r--media/libs/openexr/Manifest24
-rwxr-xr-xmedia/libs/openexr/openexr.SlackBuild95
-rw-r--r--media/video/cinelerra/Manifest27
-rw-r--r--media/video/cinelerra/cinelerra-git_version.diff35
-rwxr-xr-xmedia/video/cinelerra/cinelerra.SlackBuild15
-rw-r--r--media/video/cinelerra/slack-required1
10 files changed, 370 insertions, 64 deletions
diff --git a/media/libs/ilmbase/Manifest b/media/libs/ilmbase/Manifest
new file mode 100644
index 00000000..d6d8e96d
--- /dev/null
+++ b/media/libs/ilmbase/Manifest
@@ -0,0 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+DIST ilmbase-1.0.1.tar.gz 463275 MD5 f76f094e69a6079b0beb93d97e2a217e RMD160 124f10b6f4ebefc9bb5dba7715d8897c7d71b947 SHA1 143adc547be83c6df75831ae957eef4b2706c9c0 SHA256 4f14fc7b26a37a391ec5f979697148e6774bc36bc052de26e40ffabe401e397d SHA512 32aab1cfa6faa821d3a98709d669d6d8cfcce2af335deea148eed33da7dda71a01db28405ab58e3951d388efdbbe16a57ffbb1a66b6bd997f399cfe4e33c0fb0
+MKBUILD ilmbase.mkbuild 2515 MD5 84400b3327600e90ed49635329c57569 RMD160 67be3eb03f48903a8ab265595d9bd1a5c680622b SHA1 5c683480b2cc5a8399e9b9298621e537a42179db SHA256 bd6d61a7a1102658ccb841f48dcffbb001512bc3442eccd1885bcb60a979f041 SHA512 7596cd03e337f76fbfbfa9a5ee6e172838490e7abd533dfb89b11999f3be8cb02e015f455c6d593eaaf1094ecfdb1ebd410112229dac849a1dd0251928bc9e70
+SLACKBUILD ilmbase.SlackBuild 7782 MD5 895df9b9e589bc999b18ea9ee6b478e6 RMD160 2005e1b754e561dfeea0f856d167c0034cb64f66 SHA1 45b737cb4e91a39f550d21c7fba27903a6f83333 SHA256 f6a01b83188b9730b4c30574a45dc5b8af2a54f77919e6bcab424684425fdc6a SHA512 82b533c1d51ed2f2a010f3e31d0e98888276a788fc08e055bb10ebe7e0a71d428629a48d0bafc431650e14edce661b13333a67117b40f80105e2bb7e81745d98
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iQIcBAEBAgAGBQJJ/ej0AAoJEEHL93ESzgeiG+sP/0yMurSaSuuaJXnYSjatcXXP
+g/9ZrXI63nDSd9bdoRAkc+7i9LuoyQ2uibKk8Wu2RDOKSJd7rC1UnsWMSykHWGQs
+bL6geetsN98nBws0VD6n2BA7FwPFfWj55fyjMq66628n+c9TksyzxMJ4RDZaVaEQ
+ttYGmuLpnqmnj+rC7iI6mt862UdZvYYCw27jO2DAPp1mPYLNDXaR+tC67vUzmw1N
+atS7nXKwJKozwC+X0Lxf8JVXbE+rLweqQKYYxAzRKRV3mAkOoCjMYu5qIhrzWEaT
+u5AcWVCmFH3wXa0USfxvKKDEDjIOZ5rrzPHAtGWtud868+HSftn2pNxHOAu8RREq
+T5T8MgOHn5CZ9b9z/bQzxMrMrPtx6CmOELaMnsTjx0oTy/ZtJgNuYLsLZOvq4BMo
+GyAOVgOBlmhFRDmTXc9CYepxYW6hAMrykGDapNVkXwoV2pgQhE+C/OGJbB26Eae4
+Zh1lTIPR0Zv63Gnt/kTE73QLh5+UUas6xsEI1fXcpn+l2Pu5FMHLODqk5CE/EazN
+sq5ORQ/l47ocYPDzsbUkongDT4wU0RbE35vDezxMWKYVKJeUE4BEczma5z+5KB3S
+DIX8g2YReEleikiz143b0b1yom4dy9gd9CWywjyxd/LXNusJ/u4tlNqy5pw4H/P6
+nNJr6vwjLt0aowKArvnb
+=kRuk
+-----END PGP SIGNATURE-----
diff --git a/media/libs/ilmbase/ilmbase.SlackBuild b/media/libs/ilmbase/ilmbase.SlackBuild
index d391f141..a6a50042 100755
--- a/media/libs/ilmbase/ilmbase.SlackBuild
+++ b/media/libs/ilmbase/ilmbase.SlackBuild
@@ -17,6 +17,7 @@
# slackbuild for ilmbase, by Silvio Rhatto
# requires:
# tested: ilmbase-1.0.1
+# model: generic.mkSlackBuild $Rev: 805 $
#
# Look for slackbuildrc
@@ -38,6 +39,7 @@ SRC_DIR=${SRC_DIR:=$CWD}/$PKG_NAME
TMP=${TMP:=/tmp}
PKG=${PKG:=$TMP/package-$PKG_NAME}
REPOS=${REPOS:=$TMP}
+SLACKBUILD_PATH=${SLACKBUILD_PATH:="media/libs/ilmbase"}
PREFIX=${PREFIX:=/usr}
PKG_WORK="$TMP/$SRC_NAME"
CONF_OPTIONS=${CONF_OPTIONS:=""}
@@ -47,9 +49,9 @@ NUMJOBS=${NUMJOBS:=""}
LIBDIR="$PREFIX/lib"
if [ "$ARCH" = "i386" ]; then
- SLKCFLAGS="-O2 -march=i386 -mcpu=i686"
+ SLKCFLAGS="-O2 -march=i386 -mtune=i686"
elif [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mcpu=i686"
+ SLKCFLAGS="-O2 -march=i486 -mtune=i686"
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686"
elif [ "$ARCH" = "s390" ]; then
@@ -65,6 +67,7 @@ ERROR_WGET=31; ERROR_MAKE=32; ERROR_INSTALL=33
ERROR_MD5=34; ERROR_CONF=35; ERROR_HELP=36
ERROR_TAR=37; ERROR_MKPKG=38; ERROR_GPG=39
ERROR_PATCH=40; ERROR_VCS=41; ERROR_MKDIR=42
+ERROR_MANIFEST=43;
# Clean up any leftovers of previous builds
rm -rf "$PKG_WORK" 2> /dev/null
@@ -84,6 +87,72 @@ if [ ! -s "$SRC_DIR/$SRC" ] || ! gunzip -t "$SRC_DIR/$SRC" 2> /dev/null; then
wget "$URL" -O "$SRC_DIR/$SRC" || exit $ERROR_WGET
fi
+# Check Manifest file
+if [ -e "$CWD/Manifest" ]; then
+
+ # Manifest signature checking
+ if grep -q -- "-----BEGIN PGP SIGNED MESSAGE-----" $CWD/Manifest; then
+ echo "Checking Manifest signature..."
+ gpg --verify $CWD/Manifest
+ if [ "$?" != "0" ]; then
+ exit $ERROR_MANIFEST
+ fi
+ fi
+
+ MANIFEST_LINES="`grep -E -v "^(MKBUILD|SLACKBUILD)" $CWD/Manifest | wc -l`"
+
+ for ((MANIFEST_COUNT=1; MANIFEST_COUNT <= $MANIFEST_LINES; MANIFEST_COUNT++)); do
+
+ MANIFEST_LINE="`grep -E -v "^(MKBUILD|SLACKBUILD)" $CWD/Manifest | head -n $MANIFEST_COUNT | tail -n 1`"
+ MANIFEST_FILE="`echo $MANIFEST_LINE | awk '{ print $2 }'`"
+ MANIFEST_FILE_TYPE="`echo $MANIFEST_LINE | awk '{ print $1 }'`"
+
+ if [ -e "$SRC_DIR/$MANIFEST_FILE" ]; then
+ MANIFEST_FILE="$SRC_DIR/$MANIFEST_FILE"
+ else
+ MANIFEST_FILE="`find $CWD -name $MANIFEST_FILE`"
+ fi
+
+ if [ ! -e "$MANIFEST_FILE" ] || [ -d "$MANIFEST_FILE" ]; then
+ continue
+ fi
+
+ echo "Checking Manifest for $MANIFEST_FILE_TYPE $MANIFEST_FILE integrity..."
+
+ SIZE_SRC="`wc -c $MANIFEST_FILE | awk '{ print $1 }'`"
+ SIZE_MANIFEST="`echo $MANIFEST_LINE | awk '{ print $3 }'`"
+
+ # Check source code size
+ if [ "$SIZE_SRC" != "$SIZE_MANIFEST" ]; then
+ echo "SIZE Manifest: $SIZE_MANIFEST; SIZE $SRC: $SIZE_SRC"
+ exit $ERROR_MANIFEST
+ else
+ echo "Size match."
+ fi
+
+ # Check source code integrity
+ for ALGO in md5 rmd160 sha1 sha256 sha512; do
+ if [ $ALGO = "rmd160" ]; then
+ ALGO_SRC="`openssl rmd160 $MANIFEST_FILE | awk '{ print $2 }'`"
+ else
+ ALGO_SRC="`"$ALGO"sum $MANIFEST_FILE | awk '{ print $1 }'`"
+ fi
+ ALGO="`echo $ALGO | tr '[:lower:]' '[:upper:]'`"
+ ALGO_MANIFEST=$(echo $MANIFEST_LINE | sed "s/.* $ALGO //" | awk '{ print $1 }')
+ if [ "$ALGO_SRC" != "$ALGO_MANIFEST" ]; then
+ echo "$ALGO Manifest: $ALGO_MANIFEST; $ALGO $SRC: $ALGO_SRC"
+ exit $ERROR_MANIFEST
+ else
+ echo "$ALGO match."
+ fi
+ done
+
+ done
+
+else
+ exit $ERROR_MANIFEST
+fi
+
# Untar
cd "$PKG_WORK"
tar --no-same-owner --no-same-permissions -xvf "$SRC_DIR/$SRC" || exit $ERROR_TAR
@@ -91,10 +160,11 @@ PKG_SRC="$PWD/`ls -l | awk '/^d/ { print $NF }'`"
cd "$PKG_SRC"
# Patch source
-patches="
+patches=" [[PATCH URLS]]
$PKG_NAME.diff $PKG_NAME-$PKG_VERSION.diff
$PKG_NAME-$PKG_VERSION-$ARCH.diff $PKG_NAME-$ARCH.diff"
for patch in $patches; do
+ patch="`basename $patch`"
if [ -f "$CWD/$patch" ]; then
patch -Np1 < "$CWD/$patch" || exit $ERROR_PATCH
elif [ -f "$CWD/patches/$patch" ]; then
@@ -103,15 +173,7 @@ for patch in $patches; do
gzip -dc "$CWD/$patch.gz" | patch -Np1 || exit $ERROR_PATCH
elif [ -f "$CWD/patches/$patch.gz" ]; then
gzip -dc "$CWD/patches/$patch.gz" | patch -Np1 || exit $ERROR_PATCH
- fi
-done
-
-if echo [[PATCH URLS]] | grep -q -v "PATCH URLS"; then
- for patch_url in [[PATCH URLS]]; do
- patch="`basename $patch_url`"
- if [ ! -s "$SRC_DIR/$patch" ]; then
- wget "$patch_url" -O "$SRC_DIR/$patch" || exit $ERROR_WGET
- fi
+ elif [ -f "$SRC_DIR/$patch" ]; then
if [ "`basename $patch .gz`" != "$patch" ]; then
gzip -dc $SRC_DIR/$patch | patch -Np1 || exit $ERROR_PATCH
elif [ "`basename $patch .bz2`" != "$patch" ]; then
@@ -119,8 +181,8 @@ if echo [[PATCH URLS]] | grep -q -v "PATCH URLS"; then
else
patch -Np1 < "$SRC_DIR/$patch" || exit $ERROR_PATCH
fi
- done
-fi
+ fi
+done
# Configure
CFLAGS="$SLKCFLAGS" \
@@ -177,9 +239,10 @@ EODESC
# Build the package
cd "$PKG"
-makepkg -l y -c n "$REPOS/$PKG_NAME-$PKG_VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG
+mkdir -p $REPOS/$SLACKBUILD_PATH
+makepkg -l y -c n "$REPOS/$SLACKBUILD_PATH/$PKG_NAME-$PKG_VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG
# Delete source and build directories if requested
-if [ "$CLEANUP" == "yes" ]; then
+if [ "$CLEANUP" == "yes" ] || [ "$1" = "--cleanup" ]; then
rm -rf "$PKG_WORK" "$PKG"
fi
diff --git a/media/libs/libdv/Manifest b/media/libs/libdv/Manifest
new file mode 100644
index 00000000..95034451
--- /dev/null
+++ b/media/libs/libdv/Manifest
@@ -0,0 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+DIST libdv-1.0.0.tar.gz 574565 MD5 f895162161cfa4bb4a94c070a7caa6c7 RMD160 a8d3ae083340cec411d5294db7197ea72c8b3c4f SHA1 2e5ba0e95f665d60e72cbebcf1c4989e0d6c92c8 SHA256 a305734033a9c25541a59e8dd1c254409953269ea7c710c39e540bd8853389ba SHA512 19887a6f452fa7da8924901ad841f5c4a434a3bde56c932ddb43717592aa744281e3a8ad220231e11d7e6bc3b0e704952a8324e5f85d4e088675edceeeca7dc8
+MKBUILD libdv.mkbuild 2853 MD5 c39369750c55d3043fcbf9baf27b1d0b RMD160 b1136489d5ab72b936536e9fff792e1f570a06ca SHA1 98d6dfec3010905c8e573815d912cc24388a2e85 SHA256 cd53627bbcd8346f7cf83ab5cdf53eb5f5ce896ed20d0fcd0204713312d54ca7 SHA512 1d85e7d8bfa44c53c24b494808eda2d5c618be53380e0ae1affa9d56faa6e0059ed05b8d906db92bbdd28260547117912cc7e8224d89245ea8d2b87c398e386a
+PATCH libdv-0.104.diff 46434 MD5 02d0baa2e679c151c2789e6ed65f0f1e RMD160 4810fc9bea0444c94e779fd4a2b37dbd9bb62153 SHA1 65f8e50f44196579df2976e5b1731e90e4357001 SHA256 1e0658656985c8ffb131ecdf25dad11723d5dd5951181cccd0f0f5388e5ac8b0 SHA512 f5189a11c29b2b97706a1dc94f0116bf4934741c2a874b54f3e8d278449131a3a23644fe090231df23216642500fe940baf0dcca134f9790c6cb0cdaf9ea0312
+SLACKBUILD libdv.SlackBuild 8110 MD5 122f990ea9c3cd1b910f56b16826b9fd RMD160 591f9ce46b389cf63989ad01079692bd1d7536da SHA1 435c6ef6f7f5c9cdbf8f8e18067a758b3607a34f SHA256 bb7e277a62b46ee86f2d13ffb15808c3abae832a256b72e1a8da72dbc43a3a0d SHA512 cc4759a027c60fc6c7a96711263ace52ee63a5af1c60e452527a94d1f348d1bedb7221f3afc1b921ae6872f80e35331886ed5557f5e2e5ae6cc1c10e414ae186
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iQIcBAEBAgAGBQJJ/gH5AAoJEEHL93ESzgei1YUP+QHSxFw6jiEtHESQ4piESlQp
+1SC8k89r6im5IKhGcAFOXgPFAOjvOSH83gi7s3+GqZQ5Uygj6A7dskBLZJRmvxMc
+VZY6NMYaxub/2MjXA0udZfQ0tEIGQsqD9RXrbCCmntLoBcuo7rXPcde/yc0D3+2A
+FCv8toK6coeUeS++AWdo/IKgcuFFh1R7TRsdFLLhIQFjhotak9L3/gpEMJoeP8sq
+WSxGDcVtlQ81BHmlDdS9JbEv7JyWnHTcX5Nf8ZyPRqNUJM21ER36OsxUmUUpD8h6
+/n8IP7rv0Rf/ZRqTXwP/hOBjcIQ+8s2e3EOHk6QTI6xrmdJ+dQQ5ArOytGhRtXPU
+hd7Ck64pNwnlXU0sLZ1ngThVAUga1SCZalC6ulXvYpZBt0oBgISEJJxuDE5vr4BA
+62wkNc8zMhR4dFY2QtoDWcMQ9t+vC62isRkhMarNFuomkwz1Vf5isVuRnF1dOXm1
+oJ/X0/MxRHev8o4qwIbX4q6ssYxLkvv+wSMTEO9PZyz+d2RXuZn4mYAn83ZAFOKa
+yVkJN2RZKKkWbUzH7IgSdc4uCgi03PFTqIH9SmC+mFWJCswUuNLh+WwweGbA7jwe
+BiKC4LNnVstcBOpEBzJIh2DF6DK3WFl0jPZ/Qeh5l0dlU8SLlq1yR6GTMsoi406o
+px+LiLSkW0AfpRRYwfWn
+=1Z0l
+-----END PGP SIGNATURE-----
diff --git a/media/libs/libdv/libdv.SlackBuild b/media/libs/libdv/libdv.SlackBuild
index 75b76578..8230df67 100755
--- a/media/libs/libdv/libdv.SlackBuild
+++ b/media/libs/libdv/libdv.SlackBuild
@@ -17,6 +17,7 @@
# slackbuild for libdv, by Silvio Rhatto
# requires:
# tested: libdv-1.0.0
+# model: generic.mkSlackBuild $Rev: 805 $
#
# Look for slackbuildrc
@@ -38,6 +39,7 @@ SRC_DIR=${SRC_DIR:=$CWD}/$PKG_NAME
TMP=${TMP:=/tmp}
PKG=${PKG:=$TMP/package-$PKG_NAME}
REPOS=${REPOS:=$TMP}
+SLACKBUILD_PATH=${SLACKBUILD_PATH:="media/libs/libdv"}
PREFIX=${PREFIX:=/usr}
PKG_WORK="$TMP/$SRC_NAME"
CONF_OPTIONS=${CONF_OPTIONS:=""}
@@ -47,9 +49,9 @@ NUMJOBS=${NUMJOBS:=""}
LIBDIR="$PREFIX/lib"
if [ "$ARCH" = "i386" ]; then
- SLKCFLAGS="-O2 -march=i386 -mcpu=i686"
+ SLKCFLAGS="-O2 -march=i386 -mtune=i686"
elif [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mcpu=i686"
+ SLKCFLAGS="-O2 -march=i486 -mtune=i686"
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686"
elif [ "$ARCH" = "s390" ]; then
@@ -65,6 +67,7 @@ ERROR_WGET=31; ERROR_MAKE=32; ERROR_INSTALL=33
ERROR_MD5=34; ERROR_CONF=35; ERROR_HELP=36
ERROR_TAR=37; ERROR_MKPKG=38; ERROR_GPG=39
ERROR_PATCH=40; ERROR_VCS=41; ERROR_MKDIR=42
+ERROR_MANIFEST=43;
# Clean up any leftovers of previous builds
rm -rf "$PKG_WORK" 2> /dev/null
@@ -84,6 +87,72 @@ if [ ! -s "$SRC_DIR/$SRC" ] || ! gunzip -t "$SRC_DIR/$SRC" 2> /dev/null; then
wget "$URL" -O "$SRC_DIR/$SRC" || exit $ERROR_WGET
fi
+# Check Manifest file
+if [ -e "$CWD/Manifest" ]; then
+
+ # Manifest signature checking
+ if grep -q -- "-----BEGIN PGP SIGNED MESSAGE-----" $CWD/Manifest; then
+ echo "Checking Manifest signature..."
+ gpg --verify $CWD/Manifest
+ if [ "$?" != "0" ]; then
+ exit $ERROR_MANIFEST
+ fi
+ fi
+
+ MANIFEST_LINES="`grep -E -v "^(MKBUILD|SLACKBUILD)" $CWD/Manifest | wc -l`"
+
+ for ((MANIFEST_COUNT=1; MANIFEST_COUNT <= $MANIFEST_LINES; MANIFEST_COUNT++)); do
+
+ MANIFEST_LINE="`grep -E -v "^(MKBUILD|SLACKBUILD)" $CWD/Manifest | head -n $MANIFEST_COUNT | tail -n 1`"
+ MANIFEST_FILE="`echo $MANIFEST_LINE | awk '{ print $2 }'`"
+ MANIFEST_FILE_TYPE="`echo $MANIFEST_LINE | awk '{ print $1 }'`"
+
+ if [ -e "$SRC_DIR/$MANIFEST_FILE" ]; then
+ MANIFEST_FILE="$SRC_DIR/$MANIFEST_FILE"
+ else
+ MANIFEST_FILE="`find $CWD -name $MANIFEST_FILE`"
+ fi
+
+ if [ ! -e "$MANIFEST_FILE" ] || [ -d "$MANIFEST_FILE" ]; then
+ continue
+ fi
+
+ echo "Checking Manifest for $MANIFEST_FILE_TYPE $MANIFEST_FILE integrity..."
+
+ SIZE_SRC="`wc -c $MANIFEST_FILE | awk '{ print $1 }'`"
+ SIZE_MANIFEST="`echo $MANIFEST_LINE | awk '{ print $3 }'`"
+
+ # Check source code size
+ if [ "$SIZE_SRC" != "$SIZE_MANIFEST" ]; then
+ echo "SIZE Manifest: $SIZE_MANIFEST; SIZE $SRC: $SIZE_SRC"
+ exit $ERROR_MANIFEST
+ else
+ echo "Size match."
+ fi
+
+ # Check source code integrity
+ for ALGO in md5 rmd160 sha1 sha256 sha512; do
+ if [ $ALGO = "rmd160" ]; then
+ ALGO_SRC="`openssl rmd160 $MANIFEST_FILE | awk '{ print $2 }'`"
+ else
+ ALGO_SRC="`"$ALGO"sum $MANIFEST_FILE | awk '{ print $1 }'`"
+ fi
+ ALGO="`echo $ALGO | tr '[:lower:]' '[:upper:]'`"
+ ALGO_MANIFEST=$(echo $MANIFEST_LINE | sed "s/.* $ALGO //" | awk '{ print $1 }')
+ if [ "$ALGO_SRC" != "$ALGO_MANIFEST" ]; then
+ echo "$ALGO Manifest: $ALGO_MANIFEST; $ALGO $SRC: $ALGO_SRC"
+ exit $ERROR_MANIFEST
+ else
+ echo "$ALGO match."
+ fi
+ done
+
+ done
+
+else
+ exit $ERROR_MANIFEST
+fi
+
# Untar
cd "$PKG_WORK"
tar --no-same-owner --no-same-permissions -xvf "$SRC_DIR/$SRC" || exit $ERROR_TAR
@@ -91,10 +160,11 @@ PKG_SRC="$PWD/`ls -l | awk '/^d/ { print $NF }'`"
cd "$PKG_SRC"
# Patch source
-patches="
+patches=" [[PATCH URLS]]
$PKG_NAME.diff $PKG_NAME-$PKG_VERSION.diff
$PKG_NAME-$PKG_VERSION-$ARCH.diff $PKG_NAME-$ARCH.diff"
for patch in $patches; do
+ patch="`basename $patch`"
if [ -f "$CWD/$patch" ]; then
patch -Np1 < "$CWD/$patch" || exit $ERROR_PATCH
elif [ -f "$CWD/patches/$patch" ]; then
@@ -103,15 +173,7 @@ for patch in $patches; do
gzip -dc "$CWD/$patch.gz" | patch -Np1 || exit $ERROR_PATCH
elif [ -f "$CWD/patches/$patch.gz" ]; then
gzip -dc "$CWD/patches/$patch.gz" | patch -Np1 || exit $ERROR_PATCH
- fi
-done
-
-if echo [[PATCH URLS]] | grep -q -v "PATCH URLS"; then
- for patch_url in [[PATCH URLS]]; do
- patch="`basename $patch_url`"
- if [ ! -s "$SRC_DIR/$patch" ]; then
- wget "$patch_url" -O "$SRC_DIR/$patch" || exit $ERROR_WGET
- fi
+ elif [ -f "$SRC_DIR/$patch" ]; then
if [ "`basename $patch .gz`" != "$patch" ]; then
gzip -dc $SRC_DIR/$patch | patch -Np1 || exit $ERROR_PATCH
elif [ "`basename $patch .bz2`" != "$patch" ]; then
@@ -119,8 +181,8 @@ if echo [[PATCH URLS]] | grep -q -v "PATCH URLS"; then
else
patch -Np1 < "$SRC_DIR/$patch" || exit $ERROR_PATCH
fi
- done
-fi
+ fi
+done
# Configure
CFLAGS="$SLKCFLAGS" \
@@ -177,9 +239,10 @@ EODESC
# Build the package
cd "$PKG"
-makepkg -l y -c n "$REPOS/$PKG_NAME-$PKG_VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG
+mkdir -p $REPOS/$SLACKBUILD_PATH
+makepkg -l y -c n "$REPOS/$SLACKBUILD_PATH/$PKG_NAME-$PKG_VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG
# Delete source and build directories if requested
-if [ "$CLEANUP" == "yes" ]; then
+if [ "$CLEANUP" == "yes" ] || [ "$1" = "--cleanup" ]; then
rm -rf "$PKG_WORK" "$PKG"
fi
diff --git a/media/libs/openexr/Manifest b/media/libs/openexr/Manifest
new file mode 100644
index 00000000..e8c88225
--- /dev/null
+++ b/media/libs/openexr/Manifest
@@ -0,0 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+DIST openexr-1.6.1.tar.gz 13632660 MD5 11951f164f9c872b183df75e66de145a RMD160 3670633be841628e9d4c11981661e9d94a9b2711 SHA1 b3650e6542f0e09daadb2d467425530bc8eec333 SHA256 c616906ab958de9c37bb86ca7547cfedbdfbad5e1ca2a4ab98983c9afa6a5950 SHA512 876a5140a1e443e4ba59f84c07fbdb475d7674c00dacf661769c77a275b54cd220c7999d47f96bfb421caf31ca8b65abb01531ac3467b6769ca1fbe92ad32bbe
+MKBUILD openexr.mkbuild 2972 MD5 a610f70fe1c3d16646f90b98d32a9d76 RMD160 2ec567339b13e4b9f3103f48386bc56e8ac781da SHA1 273239ad7dbe430f0fbb7278325c8532901baa8f SHA256 916b83a2758fec49bc2bf643c265c6decd7cc9dafe882948380427a455417a8f SHA512 20889b511c2cec12c996ac6408119b66c98a9143630230dbd684d21cc8d5f3173b50f694e370bdc7cec450b3587ed28c9ddd599f30f70e94027a2bd5912cbf2f
+SLACK-REQUIRED slack-required 79 MD5 8536769ab1d45563cc13d0c45f56f3a9 RMD160 92317a4feff72d01c6fd64e7ec376b2c4c77fe26 SHA1 736dbb7237f333ac0619a7544f8af27e55b8060f SHA256 837a9a41c24dee76ba47c502ed2fefe511a4a6ad6b3ed408a824385d13563f9b SHA512 b6bcc0ee5206cc8a37ed901b3464d35decfbfc6ecc7e698f4a53eebf1d1d70137d6da1dfd949f6068eb606d382d26452beb20b69507e8fe9d518364737f830a4
+SLACKBUILD openexr.SlackBuild 8281 MD5 86342a6dbd4225975cc84b3e979fbac3 RMD160 c392980559c58da98a4c0944fa30bd5f66b8d7a1 SHA1 921c8adff89b86fb8175c83f5465db3e74067dcc SHA256 2fceae05cd6eaf8be8f3b25582b2a36100f16b0817e0063901807278aa903f3e SHA512 c82329501f6f06cb8ececff0e578e48a6635652dd45f22f0cf89e1d494d44ee73a2d0c37b3195e86a6cfa479ef02563694a879b230471ffb1810eaa4bfcf8f50
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iQIcBAEBAgAGBQJJ/f0iAAoJEEHL93ESzgeiGkwP/0882Pu5kxRbmausOA0bNCwU
+2/YJ9lsQbg17l7EUT1c0Hhjl1bGsaGM6aSw+yooATitMqj9Vu8lHJ2LXssS5gIZT
+iaHq3QbXcnhz3Ic8JAcZVuSJw/ZoEAcrQEzg/Xq+aePaPkt+yT4WlJvKP7leHF6d
+WPdlbxrMWrmCtlH4UD0i5NUMHtYMVx8DOdvEiuBK12P3qLwCzQ0V2HNrhKakv4Aw
+V/RGcGLrDUjd1CyDK8g6Q50r9J3yoYqw044fn6C9XhQ+MCWew+oUvwfbj9Gajqak
+IA/cY5QrBkAT9dCIKf1Y5q/dRxbnK9XIkumv1vizm1pAMXIjR/l1jcRgbqfbunZf
+YlgDkWqdbLPqpFE6P6FjSMTOv+sa/tR0olS8j7euPnPb+rEr75Jub+1LlAI/S3yl
+R7Rs+Tb7z/8hIVOU1SXBDMfxoofytXXEfhuQK2idkD55xamdmTMhaTUCAuvDqtc3
+lq2en85GyJdOzq99kkjJGaWCpExv/5NT4FylG0zQHgCT/WxiAaRKeqAPh/F7KLWK
+KRNdpjZTPzq/3FwDsGsUZ0VhGZE5V4pRO/NUyRxKdZP1mhSNMfo9i+b7wJeN1S3U
+ukGHKF6vnUmSRcogE5IvJi4+bTXvUFu3fMNTlK8nh66PzuBg+iITWNPFf17z12U9
+fuqeFU5pQHuGaSpumyfc
+=lOJh
+-----END PGP SIGNATURE-----
diff --git a/media/libs/openexr/openexr.SlackBuild b/media/libs/openexr/openexr.SlackBuild
index d5bde31e..9736a026 100755
--- a/media/libs/openexr/openexr.SlackBuild
+++ b/media/libs/openexr/openexr.SlackBuild
@@ -15,8 +15,9 @@
# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
#
# slackbuild for openexr, by Silvio Rhatto
-# requires: ilmbase
+# requires:
# tested: openexr-1.6.1
+# model: generic.mkSlackBuild $Rev: 805 $
#
# Look for slackbuildrc
@@ -38,6 +39,7 @@ SRC_DIR=${SRC_DIR:=$CWD}/$PKG_NAME
TMP=${TMP:=/tmp}
PKG=${PKG:=$TMP/package-$PKG_NAME}
REPOS=${REPOS:=$TMP}
+SLACKBUILD_PATH=${SLACKBUILD_PATH:="media/libs/openexr"}
PREFIX=${PREFIX:=/usr}
PKG_WORK="$TMP/$SRC_NAME"
CONF_OPTIONS=${CONF_OPTIONS:="--with-docdir=/usr/doc/$PKG_NAME-$PKG_VERSION"}
@@ -47,9 +49,9 @@ NUMJOBS=${NUMJOBS:=""}
LIBDIR="$PREFIX/lib"
if [ "$ARCH" = "i386" ]; then
- SLKCFLAGS="-O2 -march=i386 -mcpu=i686"
+ SLKCFLAGS="-O2 -march=i386 -mtune=i686"
elif [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mcpu=i686"
+ SLKCFLAGS="-O2 -march=i486 -mtune=i686"
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686"
elif [ "$ARCH" = "s390" ]; then
@@ -65,6 +67,7 @@ ERROR_WGET=31; ERROR_MAKE=32; ERROR_INSTALL=33
ERROR_MD5=34; ERROR_CONF=35; ERROR_HELP=36
ERROR_TAR=37; ERROR_MKPKG=38; ERROR_GPG=39
ERROR_PATCH=40; ERROR_VCS=41; ERROR_MKDIR=42
+ERROR_MANIFEST=43;
# Clean up any leftovers of previous builds
rm -rf "$PKG_WORK" 2> /dev/null
@@ -84,6 +87,72 @@ if [ ! -s "$SRC_DIR/$SRC" ] || ! gunzip -t "$SRC_DIR/$SRC" 2> /dev/null; then
wget "$URL" -O "$SRC_DIR/$SRC" || exit $ERROR_WGET
fi
+# Check Manifest file
+if [ -e "$CWD/Manifest" ]; then
+
+ # Manifest signature checking
+ if grep -q -- "-----BEGIN PGP SIGNED MESSAGE-----" $CWD/Manifest; then
+ echo "Checking Manifest signature..."
+ gpg --verify $CWD/Manifest
+ if [ "$?" != "0" ]; then
+ exit $ERROR_MANIFEST
+ fi
+ fi
+
+ MANIFEST_LINES="`grep -E -v "^(MKBUILD|SLACKBUILD)" $CWD/Manifest | wc -l`"
+
+ for ((MANIFEST_COUNT=1; MANIFEST_COUNT <= $MANIFEST_LINES; MANIFEST_COUNT++)); do
+
+ MANIFEST_LINE="`grep -E -v "^(MKBUILD|SLACKBUILD)" $CWD/Manifest | head -n $MANIFEST_COUNT | tail -n 1`"
+ MANIFEST_FILE="`echo $MANIFEST_LINE | awk '{ print $2 }'`"
+ MANIFEST_FILE_TYPE="`echo $MANIFEST_LINE | awk '{ print $1 }'`"
+
+ if [ -e "$SRC_DIR/$MANIFEST_FILE" ]; then
+ MANIFEST_FILE="$SRC_DIR/$MANIFEST_FILE"
+ else
+ MANIFEST_FILE="`find $CWD -name $MANIFEST_FILE`"
+ fi
+
+ if [ ! -e "$MANIFEST_FILE" ] || [ -d "$MANIFEST_FILE" ]; then
+ continue
+ fi
+
+ echo "Checking Manifest for $MANIFEST_FILE_TYPE $MANIFEST_FILE integrity..."
+
+ SIZE_SRC="`wc -c $MANIFEST_FILE | awk '{ print $1 }'`"
+ SIZE_MANIFEST="`echo $MANIFEST_LINE | awk '{ print $3 }'`"
+
+ # Check source code size
+ if [ "$SIZE_SRC" != "$SIZE_MANIFEST" ]; then
+ echo "SIZE Manifest: $SIZE_MANIFEST; SIZE $SRC: $SIZE_SRC"
+ exit $ERROR_MANIFEST
+ else
+ echo "Size match."
+ fi
+
+ # Check source code integrity
+ for ALGO in md5 rmd160 sha1 sha256 sha512; do
+ if [ $ALGO = "rmd160" ]; then
+ ALGO_SRC="`openssl rmd160 $MANIFEST_FILE | awk '{ print $2 }'`"
+ else
+ ALGO_SRC="`"$ALGO"sum $MANIFEST_FILE | awk '{ print $1 }'`"
+ fi
+ ALGO="`echo $ALGO | tr '[:lower:]' '[:upper:]'`"
+ ALGO_MANIFEST=$(echo $MANIFEST_LINE | sed "s/.* $ALGO //" | awk '{ print $1 }')
+ if [ "$ALGO_SRC" != "$ALGO_MANIFEST" ]; then
+ echo "$ALGO Manifest: $ALGO_MANIFEST; $ALGO $SRC: $ALGO_SRC"
+ exit $ERROR_MANIFEST
+ else
+ echo "$ALGO match."
+ fi
+ done
+
+ done
+
+else
+ exit $ERROR_MANIFEST
+fi
+
# Untar
cd "$PKG_WORK"
tar --no-same-owner --no-same-permissions -xvf "$SRC_DIR/$SRC" || exit $ERROR_TAR
@@ -91,10 +160,11 @@ PKG_SRC="$PWD/`ls -l | awk '/^d/ { print $NF }'`"
cd "$PKG_SRC"
# Patch source
-patches="
+patches=" [[PATCH URLS]]
$PKG_NAME.diff $PKG_NAME-$PKG_VERSION.diff
$PKG_NAME-$PKG_VERSION-$ARCH.diff $PKG_NAME-$ARCH.diff"
for patch in $patches; do
+ patch="`basename $patch`"
if [ -f "$CWD/$patch" ]; then
patch -Np1 < "$CWD/$patch" || exit $ERROR_PATCH
elif [ -f "$CWD/patches/$patch" ]; then
@@ -103,15 +173,7 @@ for patch in $patches; do
gzip -dc "$CWD/$patch.gz" | patch -Np1 || exit $ERROR_PATCH
elif [ -f "$CWD/patches/$patch.gz" ]; then
gzip -dc "$CWD/patches/$patch.gz" | patch -Np1 || exit $ERROR_PATCH
- fi
-done
-
-if echo [[PATCH URLS]] | grep -q -v "PATCH URLS"; then
- for patch_url in [[PATCH URLS]]; do
- patch="`basename $patch_url`"
- if [ ! -s "$SRC_DIR/$patch" ]; then
- wget "$patch_url" -O "$SRC_DIR/$patch" || exit $ERROR_WGET
- fi
+ elif [ -f "$SRC_DIR/$patch" ]; then
if [ "`basename $patch .gz`" != "$patch" ]; then
gzip -dc $SRC_DIR/$patch | patch -Np1 || exit $ERROR_PATCH
elif [ "`basename $patch .bz2`" != "$patch" ]; then
@@ -119,8 +181,8 @@ if echo [[PATCH URLS]] | grep -q -v "PATCH URLS"; then
else
patch -Np1 < "$SRC_DIR/$patch" || exit $ERROR_PATCH
fi
- done
-fi
+ fi
+done
# Configure
CFLAGS="$SLKCFLAGS" \
@@ -183,7 +245,8 @@ fi
# Build the package
cd "$PKG"
-makepkg -l y -c n "$REPOS/$PKG_NAME-$PKG_VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG
+mkdir -p $REPOS/$SLACKBUILD_PATH
+makepkg -l y -c n "$REPOS/$SLACKBUILD_PATH/$PKG_NAME-$PKG_VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG
# Delete source and build directories if requested
if [ "$CLEANUP" == "yes" ] || [ "$1" = "--cleanup" ]; then
diff --git a/media/video/cinelerra/Manifest b/media/video/cinelerra/Manifest
index 40b22b60..22772614 100644
--- a/media/video/cinelerra/Manifest
+++ b/media/video/cinelerra/Manifest
@@ -1,4 +1,25 @@
-MKBUILD cinelerra.mkbuild 3808 MD5 f8dbbdec4bb2346886ce25cffa3b0736 RMD160 2aa96f89fd9419f22f7dba7bd8f9cf2256235f93 SHA1 c9bcf52b141b1bbaed027884314fe190d9e6cf05 SHA256 e07135e5653af22bfb4b17b7989f2b106856f1130d0454ed8d51cd3650802afe SHA512 7817f8b281efab8fed2ffba7ba2dc3b058dcf07b9da9f11047e9224e717180092ad79be8007751c1de511e2daddbc90509d554e12b8df28b7aec56a81ace6655
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MKBUILD cinelerra.mkbuild 3573 MD5 b64de9891e6996d109e84339ad8a432a RMD160 ce9030a5093579b32e4de4e06b2d3efc48679a04 SHA1 7107c8a737d527239df4c87b2ea9fc6cc5e325e3 SHA256 c957b705d6514eba4bfb5c957f3f17b2ac7b4011c3d34061019dcd2efcf80c58 SHA512 a7d5e5dbfa092481deed02abe560fbeacc76afa1dae4bd325098926b8f9c053af00585cb49f7b77518ae1f2098f313c66cd8e22ad86243a622f292f53e945cee
PATCH cinelerra-altivec.diff 1512 MD5 4d355626b69e0a5ec80ffe7b0d67a04a RMD160 1aa86330043b309e2ae8bb0ebcd84112a16aa096 SHA1 078b15b78fbbf1abe61c33360ebf09915570dc98 SHA256 6ea5e62dce887178e0af5664034a10561c804f5b09c47fae16263c6cc40ac3ef SHA512 2c979f10e4a6d047ba1a7d18d62552da946e9ac5e5089edcae44b3817bd5f0f15216c63788e0cd00e4feb5cb3d20d0506f22a838b02598d6d51dacff06e75e56
-SLACK-REQUIRED slack-required 227 MD5 fc6187d24f2cc8adfc9cbd6153700277 RMD160 62a787c2a1e700d9c2c2f97e3dd62fdd3eb7bfde SHA1 aa816f2a6da9d17c3fa7d207ef4c4398b6666adf SHA256 f3819a9a0ad71dfaece8761c14ac792a94c4427358a12342be38f1f727d6568f SHA512 452508047b803de064498f10166a0df18a9767e20951375587e7562476555ff32adaec628dae1f9b533f389dc5230040a7ae25d574a549de9286523849a226f5
-SLACKBUILD cinelerra.SlackBuild 6786 MD5 9053e59a656cff046c4ea9c2a1e67382 RMD160 468b7bff776ab6422c5c19295b2963fbaf3d0820 SHA1 f50d9ee316f3b17065bc5b64be28df2b79be908a SHA256 70634623522c4996f4f689c9c1bc260ba208aff9829d9fd1da879debccf576c6 SHA512 20119239bd36b8a46228e463dbf0c773a843ad3ba9c1f4441f07ac569227ed38914ab24a7a53467109a15a5e7cce206256866d04632c7332575ad7e4f53174b6
+PATCH cinelerra-git_version.diff 386 MD5 4edab9c08f9aa2a000e8ad2448df3a2f RMD160 d9a5b10836435fce72bc4b3ba0dc169f43b00878 SHA1 fe42ed01fa441d57978f8b3ae08b3375a23411af SHA256 3718f88e955c0f019c506528ea72f02c65cb0e24642e256f8544dfd1d99c4d50 SHA512 aec168d4b79f6d901c75b65e7acb1877678b29fcbcff3136257e3e3ea74d704f7aaba93beb0d9da9ad4223f44c44e482258bf12f6835ca23a601e247badcc905
+SLACK-REQUIRED slack-required 238 MD5 6f4bb0514f34bbdbf57ccccec8e43dde RMD160 501a2205f942d6b3af700fa71527f6fa49fbb9b5 SHA1 62124d02edd9cd533d71e48fbd3ddf931391b837 SHA256 d66761e5d0949530f2acdea4436ee4eb25ae07ab1446b739d97d9add3ef557e6 SHA512 3e9b81f07e31d2d2b1ae75ececfb7baf35d54a94e51efe971d3a95f22cb63bf700751584c8abdfa81bece961651c1d3514b2088ba19d36606ea4b1cab85164ce
+SLACKBUILD cinelerra.SlackBuild 6391 MD5 ce32b2915aa1375a98428064542c60d3 RMD160 c8310b229f7acc7cbc5b8dd9d742bf3b2ce8f5a9 SHA1 d52ca7d86a0ff9553dc280f03eae0baf7abeb1cd SHA256 91770999949e6c1164429e9262d69e87e503ee16930cf0d53cfa5bce1975b542 SHA512 cf3bd370090ac652abbaf32b7122540a6e4616d3b99467aae2cb8e7b78a6d804cbeafa7324aeb34c98e38d219c84722b01583f333dbe8018f6ede8a55d9a6b99
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iQIcBAEBAgAGBQJJ/er8AAoJEEHL93ESzgeipa4QALOR4yDPRBiMSZ3KuNz4bhgy
+eeKrRLXyHDHWOL1q/SPq93fcDF7a4tmFi6M+fVUEzQA/AHeGh0N/Ip7Yu1gl3CVw
+aoIuYQdG5KWwoyDu5sBxjmVcyNAwsTaV+QcyCmBnoLKJ/32en8ftqnFDmSIJ2GU1
+sZtk2IJF7df9RWL8CRcCBHj/sgi6lWLaw9BOj0LdPorpRKx6aSEEuiU5U3A00jsW
+wUnC03tAEQUZQDREat0fJftu1r5iHieNe7XuE7vTQ259UDooDf7VYlSX1+UsMhpl
+mlOR33T15862IEYo0Avj/ueb/XAxyg0PkRMkBKKgV0OjXwuv9GB3eZpDqslmhGfW
+ukKJRevw7AhW5a5KtJ1lapfWbPe1E7V1E3Newm/fxcM5zNtBm8OWfHSi1uR9xnKO
+/K6r/6mRP4xP8NuGgOEqPbAGYpdO+U8v+9LeRB5QuOoRS5HyXmF6n4dT3mpEAYWp
+MZAwLoVYigdpSrZd0jOawGkaUQrLHAg1yu9nhKaYuRPFtefoj5P0pWFL47M6haJL
+A1v6aW3BeXXwRWEWgrsGoNrDj1KkgQWwm//0MdmH4kF3RFEEvVvlqgHZy4lK1859
+yaQm2zTK9bllRpiTcc2zOcxUmSzPvpY7h2EEQ78Fhp7WL8qUPHCdI9/bejaJtbym
+NXl2ZNCBPUWjhRoRXWUg
+=zt52
+-----END PGP SIGNATURE-----
diff --git a/media/video/cinelerra/cinelerra-git_version.diff b/media/video/cinelerra/cinelerra-git_version.diff
new file mode 100644
index 00000000..04352db7
--- /dev/null
+++ b/media/video/cinelerra/cinelerra-git_version.diff
@@ -0,0 +1,35 @@
+diff --git a/cinelerra/ffmpeg.C b/cinelerra/ffmpeg.C
+index 85e5614..6cea249 100644
+--- a/cinelerra/ffmpeg.C
++++ b/cinelerra/ffmpeg.C
+@@ -6,6 +6,13 @@ extern "C" {
+ }
+ #endif
+
++/* fix for newer ffmpeg */
++#ifndef PIX_FMT_YUV422
++#define PIX_FMT_YUV422 PIX_FMT_YUYV422
++#endif
++#ifndef PIX_FMT_RGBA32
++#define PIX_FMT_RGBA32 PIX_FMT_RGB32
++#endif
+
+ #include "filebase.h"
+ #include "quicktime.h"
+diff --git a/quicktime/qtffmpeg.c b/quicktime/qtffmpeg.c
+index 594a213..a6d272c 100644
+--- a/quicktime/qtffmpeg.c
++++ b/quicktime/qtffmpeg.c
+@@ -8,8 +8,10 @@
+ // FFMPEG front end for quicktime.
+
+
+-
+-
++// fix for newer ffmpeg, don't break w/ older ones...
++#ifndef PIX_FMT_YUV422
++#define PIX_FMT_YUV422 PIX_FMT_YUYV422
++#endif
+
+
+
diff --git a/media/video/cinelerra/cinelerra.SlackBuild b/media/video/cinelerra/cinelerra.SlackBuild
index 78c50cec..511fd10d 100755
--- a/media/video/cinelerra/cinelerra.SlackBuild
+++ b/media/video/cinelerra/cinelerra.SlackBuild
@@ -15,7 +15,7 @@
# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
#
# slackbuild for cinelerra, by Silvio Rhatto
-# requires: openexr libdv libx264 mjpegtools fftw liba52 lame libsndfile faac faad2 libraw1394 libiec61883 libavc1394
+# requires:
# tested: cinelerra-git_version
# model: generic.mkSlackBuild $Rev: 805 $
#
@@ -42,7 +42,7 @@ REPOS=${REPOS:=$TMP}
SLACKBUILD_PATH=${SLACKBUILD_PATH:="media/video/cinelerra"}
PREFIX=${PREFIX:=/usr}
PKG_WORK="$TMP/$SRC_NAME"
-CONF_OPTIONS=${CONF_OPTIONS:=""}
+CONF_OPTIONS=${CONF_OPTIONS:="--with-external-ffmpeg"}
NUMJOBS=${NUMJOBS:=""}
# Set system libraries' path and optmization flags based on $ARCH
@@ -125,17 +125,6 @@ for patch in $patches; do
done
# Configure
-if [ "$ARCH" == "i586" ] || [ "$ARCH" == "i686" ]; then
- CONF_OPTIONS="$CONF_OPTIONS --enable-mmx"
-fi
-
-if [ "$HAVE_ALTIVEC" == "true" ]; then
- CONF_OPTIONS="$CONF_OPTIONS --enable-altivec"
- if [ -f "$CWD/$PACKAGE-altivec.diff" ]; then
- patch -p0 < $CWD/$PACKAGE-altivec.diff || exit $ERROR_PATCH
- fi
-fi
-
./autogen.sh || exit $ERROR_CONF
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
diff --git a/media/video/cinelerra/slack-required b/media/video/cinelerra/slack-required
index 8b10b8d6..d565a2a4 100644
--- a/media/video/cinelerra/slack-required
+++ b/media/video/cinelerra/slack-required
@@ -14,3 +14,4 @@ faad2
libraw1394
libiec61883
libavc1394
+ffmpeg
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-25 15:30:27 +0000