aboutsummaryrefslogtreecommitdiff
path: root/media/libs
diff options
context:
space:
mode:
authorrhatto <rhatto@370017ae-e619-0410-ac65-c121f96126d4>2009-04-25 18:18:20 +0000
committerrhatto <rhatto@370017ae-e619-0410-ac65-c121f96126d4>2009-04-25 18:18:20 +0000
commitd31e9dd698f3287d6b972113047781339921851e (patch)
tree70b26dbd3f40cf2e0c0a8dbc28d997cd893dbc64 /media/libs
parentef039a84dfd7c5de2f77e47f135948119e8ef161 (diff)
downloadslackbuilds-d31e9dd698f3287d6b972113047781339921851e.tar.gz
slackbuilds-d31e9dd698f3287d6b972113047781339921851e.tar.bz2
vlc: updating vlc, dependencies and other stuff
git-svn-id: svn+slack://slack.fluxo.info/var/svn/slackbuilds@2157 370017ae-e619-0410-ac65-c121f96126d4
Diffstat (limited to 'media/libs')
-rw-r--r--media/libs/faac/Manifest24
-rwxr-xr-xmedia/libs/faac/faac.SlackBuild72
-rw-r--r--media/libs/faad2/Manifest24
-rwxr-xr-xmedia/libs/faad2/faad2.SlackBuild72
-rw-r--r--media/libs/liba52/Manifest23
-rwxr-xr-xmedia/libs/liba52/liba52.SlackBuild91
-rw-r--r--media/libs/libdc1394/Manifest24
-rwxr-xr-xmedia/libs/libdc1394/libdc1394.SlackBuild82
-rw-r--r--media/libs/libshout/Manifest23
-rwxr-xr-xmedia/libs/libshout/libshout.SlackBuild91
-rw-r--r--media/libs/libx264/Manifest24
-rwxr-xr-xmedia/libs/libx264/libx264.SlackBuild95
12 files changed, 595 insertions, 50 deletions
diff --git a/media/libs/faac/Manifest b/media/libs/faac/Manifest
index 968d1223..5bc68e81 100644
--- a/media/libs/faac/Manifest
+++ b/media/libs/faac/Manifest
@@ -1,5 +1,25 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
DIST faac-1.28.tar.gz 678891 MD5 80763728d392c7d789cde25614c878f6 RMD160 03902393488f04223aabdc804bfe77bb32a61c94 SHA1 d00b023a3642f81bb1fb13d962a65079121396ee SHA256 c5141199f4cfb17d749c36ba8cfe4b25f838da67c22f0fec40228b6b9c3d19df SHA512 0ef721ad28835e95cad41afc0cb6130e1ebb634cb6dd4b40f649bc2269b7bb5bf2887f6d8f023c74628d521f8bdf55b4dd070f972ecff162a5fe0384e026235b
-MKBUILD faac.mkbuild 2720 MD5 474f7bcc06eb4396f983efce7fd0bf54 RMD160 984af43577bd7ab29ae42972c1378617650d529d SHA1 2920ddcd948f218a29d8494b86a804581904175b SHA256 8d41b2907bd6c2e64ff4d21c7a829ebad32f55a0f74238dee2b5a50895dfb6a2 SHA512 6f0dd4faed330a442b6be046f2edeae356c934bc5b31bcc336a9ab7d6778d2b589c6068d90b88ba24e6d1c5a7abeef2f373130db603e58173dd94a910a6b695f
+MKBUILD faac.mkbuild 2740 MD5 d9aad599bdfa701f89007bada08fa424 RMD160 6a3e472c29f4d5a84588ff14800e0a2bfd619eb8 SHA1 23b9bb5e5e1854357cd3f6ffb48e403b5654fa8a SHA256 46b946ba90b27fab0e32760fdf69ac3d21eedc499c8c15dc1d8f1b9335544daa SHA512 8e8b4b27cb5a51aa12eaf57b2fe81c191e96add30e411b043b2e89dcacd4e4d97d4e0ff04b2e56080664e3471982f5a914b9abf8780aaf46c1a2e03c8a9c5b39
PATCH faac-1.24.diff.gz 296212 MD5 5f53b4ee031873dffb1101b59aa05bcf RMD160 9b16bd34aa810661fb69674d76191df8507264a0 SHA1 6e66751f8eecd1e0bc439482879a93d26de97470 SHA256 ffd125a90ffb2f7767329a6b4ab682864abc9bb498032044e775a3c8b33eb7bf SHA512 5344c57f2ecee2edecbbb6c5593d6891f03e19c96efdbeb37950826d7000746fd2e0cd613d2b2922ded21587dce884f0740bf3edea6966c58e5dd6db86d31a3e
PATCH faac-1.25.diff.gz 290557 MD5 4ab74a1aef1353319e1c9090759f254b RMD160 e950088ed15b0e57b7d9ec580cdd4c76b3b23842 SHA1 a99184f42e8ce9d4e77c8df9769029b12a416c37 SHA256 55f1ebd31ca692c0531ea169582d8ffaefc7662cb4291bfd91ad16be42093c3d SHA512 3139d989036faaf214977ec32d3048aac5d294a27abe1bf8b87cb5f7bf35b900e9bc3b7b2966dbafc12c89c3551f0a71d97812c5c41b568e17767bda8db396d8
-SLACKBUILD faac.SlackBuild 5789 MD5 c12494a2af257be2082804f6cdd72f20 RMD160 87e24a0453d83624034ffea0057873e501403dc8 SHA1 1b7887d6713199e90fa7807c7e5d64b8ab7e21ec SHA256 d1b23a2d57f5bf0d0dad8c29d3acd2f75240ecd1f9c084aed47c708e7042813c SHA512 1f02365fc37356a06be3d9a25fc954e7dea9fe87fba13f73f74ac5df10dc02ff99a4f34dfea75ce39a6d0f86a22445a1632faaf15bb8ae476f505b2df422ed08
+SLACKBUILD faac.SlackBuild 7938 MD5 e7a19e32fa2d6c913b047b45396f74bf RMD160 70262122ce53a71349e23d8fbb17209ff4e532cc SHA1 7c7c5205d9042e352f121fd21e946a53b1138bd2 SHA256 eb2de9ae2e3ba745cc05936de95167c28479d328ec8fbc4377e9d543db5519cb SHA512 e64a82ee1e3600feeb1276066961deaa0031854312da635eb010898037871e3b6057c5ce04f92b14a0cbc7d687242fb5f176439d4dc41feb974bafb50cee72e4
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iQIcBAEBAgAGBQJJ80d6AAoJEEHL93ESzgeiY0MQALVO37obEa60Xe4mbnJjXrqJ
+qluIG0Ade2/E8cvydgXpUmCXS/ZeYOFkqzKIr+cUIImBhvfqynuw5ytt7nQNjxbS
+Bw/JXqIH18TqaStAZfTDN8kMRkHHLOFW7vRCUwai5kyQg+CsfDr+wlLPnQqCDBxI
+f+eZ6FyQRnX5oBC+KIs4Zmcv380jwZE70bJwBfv6UiXotnUx/ej4ZBq8gYqz9/sK
+fumWF/W9nZ8R/PQUhWKDXShqS+J4TqjUyV/mtVJ3Xj49Pj/yh887A6878AfrzQgo
+JAYDNuamFPnTF9BUO8EPZexJoxnAcKT3nz158k0uFZ0TxaTS6ncgt7WcbifGrB6d
+QNoG0ZhpgxBWrGbe16u4aPcemc1/bQZqxoOAhmvWSz0d4xBXb3N/XpzGhABD4lzc
+CofFTQ1qDzNhMCbrrkpvYaSHSd1U9pXjSHDgwDZNJzbow04m/GLr/+bF7sQkZB5w
+4usQjyoF49i/WkBl7HWF1xQ4Knod7pXa2DtmF2K/HAfOuMWI0BG1OfEBaSF1RcCZ
+R5/SV8RwqOuUQvE2x37gSiEvQLOh3wQHGML+0CGJrUgd9GgJ2o8Mv3QciVyz7ER3
+rVfiOuOAvdg9m/hNlBGYZZc58BNE4ewGmAq2FkNJBLvDuYSH4qIj2WXPH/cVxbp3
+QFTcffEuuNH0hf+cWS5A
+=TL7r
+-----END PGP SIGNATURE-----
diff --git a/media/libs/faac/faac.SlackBuild b/media/libs/faac/faac.SlackBuild
index 48d1d78b..a3801db7 100755
--- a/media/libs/faac/faac.SlackBuild
+++ b/media/libs/faac/faac.SlackBuild
@@ -17,7 +17,7 @@
# slackbuild for faac, by Silvio Rhatto
# requires:
# tested: faac-1.28
-# model: generic.mkSlackBuild $Rev: 784 $
+# model: generic.mkSlackBuild $Rev: 805 $
#
# Look for slackbuildrc
@@ -39,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/faac"}
PREFIX=${PREFIX:=/usr}
PKG_WORK="$TMP/$SRC_NAME"
CONF_OPTIONS=${CONF_OPTIONS:="--sysconfdir=/etc --with-docdir=/usr/doc/$PKG_NAME-$PKG_VERSION"}
@@ -86,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
@@ -174,7 +241,8 @@ 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" ] || [ "$1" = "--cleanup" ]; then
diff --git a/media/libs/faad2/Manifest b/media/libs/faad2/Manifest
index e6a384e6..f8a229c9 100644
--- a/media/libs/faad2/Manifest
+++ b/media/libs/faad2/Manifest
@@ -1,5 +1,25 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
DIST faad2-2.7.tar.gz 1137407 MD5 ee1b4d67ea2d76ee52c5621bc6dbf61e RMD160 3f0ca461e2953014d5b17edccb3337767d478b8d SHA1 80eaaa5cc576c35dd28863767b795c50cbcc0511 SHA256 ee26ed1e177c0cd8fa8458a481b14a0b24ca0b51468c8b4c8b676fd3ceccd330 SHA512 8135370497dfcfee09094a03a4a9545ebc58b9e532b89c5d6e5037042549e12ddb75f8903aa05866afac9fa28df96320f1ed2eebffc0660578e54392a51c1161
-MKBUILD faad2.mkbuild 2685 MD5 a1e2b4fe726f44081eb2300bb9d39fb8 RMD160 639d4826d52f9e9eb9341c63010e586cd59becf1 SHA1 b59ba2e8f2a799e1a17b43089bb90832660c28ef SHA256 6ce23d8be649519ea4a341413cdb8fc60cc1c363fe8bf24b05df494006bfd771 SHA512 40b6e0a84dcdf4f9bec19fe615f8a866567ee464ccfb1ec777e323fbf54bfb1f8444c897d6390601630e138fef5a187872fd0cb2b132459813505dcbc0dfd03a
+MKBUILD faad2.mkbuild 2705 MD5 5c05f52cc2e131c3b8676a2e049feba3 RMD160 8080d30fa5ac5807b6406758d0d33ed1113921fb SHA1 ca63d4afe9b215b049ed230575dcfc44391c5bc8 SHA256 e210d14bab6532bb041bff35448b38698d9aaf157e3a783749a841067be7bb5a SHA512 53e874b5575fc571e1385b694beba7d4244f30485551f3af821c881587938ea35c7de30a85cae326569d93a765226387ad08104e17cb34fdfe85bf395fcec384
PATCH faad2-2.0.diff 882 MD5 4ae96f9e2b691e0be30f24caddb5d472 RMD160 3276b3d5dd4c12f2a3ff6270a1213931818adfbd SHA1 e9f0cf5413a96e3542c2b953d52169ff8de2858b SHA256 c9c7d972ae805544afe787abfcaa771fb0afdc3fa9a30e18940e3e7ca38e6adb SHA512 a1b92dd556d85cee0c612b1ef8692758d38e61f5a7e37dfb9b9f9f96c148076e22e9b70ed23bd504a975183be4083b93c88c2116a4ee6de93fca118d30161d14
PATCH faad2-2.6.1.diff 39665 MD5 75a75ed4e71ba5c2514b6bdaa63b21a5 RMD160 ad96d242f174e38d8890a1ba17e946569550bd38 SHA1 32279d11038786612741fef5332f2f0997a07319 SHA256 2d3ab5b8672bab2fbc59373fe60048e10f557b7606fd731e299b21c544fe6925 SHA512 75401e04d9db0446eac11256d1c70a5c16101e3eec84ef2a9619a58b0e1db62af4b2d50d88c7b2b2584867891b71bdf2b784533be31eb48d89ef44faf51da0ec
-SLACKBUILD faad2.SlackBuild 5727 MD5 6fe6c282ebcf58094ec50707e8aa72c9 RMD160 524437a8a9ce01f1060ea2b638a5a29d015b629b SHA1 240130a580a356e3c0217a723899297d0d3922d2 SHA256 be401735f08fe0c1de8f162c11563d52475d6e81d2b88c7a39498d6f50e2407a SHA512 9d68d2468619ba06bbf932c21787b9a3d7ac9c4da9b8822849b9798bc229e48c0685d61c54c35523ec502acd7b9b1ed69f0025cff4fd6e4a71060d9b9df1f9da
+SLACKBUILD faad2.SlackBuild 7877 MD5 d06c7d8b9fbe42027178b01990050d40 RMD160 78aa9db8675f160976792068caee880722e622da SHA1 d091e5b4f667fe967a756c7b80ca5b50c286afd7 SHA256 fc5e9faf69e04fc217808f7b1c80d2e51bfaf93b472e9bce75e82e232c9b9fca SHA512 54a018f53940888d1f435b8c4368447d67dadaa3d0f11a226fb5ffa0a45c89a0633bfb916149709b49d561036012539f80b6372423792cf5c39c2a0857ed7e6a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iQIcBAEBAgAGBQJJ806TAAoJEEHL93ESzgeieXEP/0lahK8zfA4F2Xq2VTOFQYsr
+Ma3FbVXDJgpZR2yvHE1Qz1eYYjXbKBRM1Hde2v+EV9LTVIy6WICrsQBo6AIf+8YO
++YISoD3aBmpg74Ob+1mOObs+QT6Aq+gJb9urWX0eq+By/R3Xtt+J0AiRuEiNZTcp
+dbW3oEoFuH1rmCqphtsv8ocIGfW6ZsT21dmccIuc9eZEjQb5wB7Cb5y7ThgW+VBR
+tk8T/lEhuaudFxTy4Rsb1WLip2txTm2YNeW2bum+qNdox/Bj++2nipqde9ditm1a
+fWyKO3WD1uZOmJvr52NhLP5ZAHLY+H8LKLwpHNLDUvkDQFJ8uYeu+ccAhKqbzKbr
+0vDrFFDJMtIg3dxB6I+u43cW9ni1uOZBcFgC0qyIyKjluCMyBGlJE0loejQ4vp5d
+B3HEU7onXg53woz6oWjkUSTemcsI6Ul9MbsId/CLgZ4Vm87GMKSrmGc8rr8uab9e
+TWXz3l0a3ZAZ3F7awrkJaYaJ5u+7dMCD9LG91PuEyTRGhx7Hs50tJzQisrgCnVEN
+l5B4fu2VGYPubQ0TFoPvxY/dLXPahQeCHBcHHfpA+YtNE47Q7tV7KOJA6FrHFVWZ
+mKZUp3RwPewwUl7JTLqa9oathSJ5VPrisp2hEIIebw0Z9V1UiW6k4bKCJ8XwCCgv
+cQy2uhoSbUMCGfCnwxLO
+=u4Rx
+-----END PGP SIGNATURE-----
diff --git a/media/libs/faad2/faad2.SlackBuild b/media/libs/faad2/faad2.SlackBuild
index 5839e97f..b981bcdc 100755
--- a/media/libs/faad2/faad2.SlackBuild
+++ b/media/libs/faad2/faad2.SlackBuild
@@ -17,7 +17,7 @@
# slackbuild for faad2, by Silvio Rhatto
# requires:
# tested: faad2-2.7
-# model: generic.mkSlackBuild $Rev: 784 $
+# model: generic.mkSlackBuild $Rev: 805 $
#
# Look for slackbuildrc
@@ -39,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/faad2"}
PREFIX=${PREFIX:=/usr}
PKG_WORK="$TMP/$SRC_NAME"
CONF_OPTIONS=${CONF_OPTIONS:="--with-docdir=/usr/doc/$PKG_NAME-$VERSION"}
@@ -86,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
@@ -173,7 +240,8 @@ 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" ] || [ "$1" = "--cleanup" ]; then
diff --git a/media/libs/liba52/Manifest b/media/libs/liba52/Manifest
new file mode 100644
index 00000000..0d06a40a
--- /dev/null
+++ b/media/libs/liba52/Manifest
@@ -0,0 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+DIST a52dec-0.7.4.tar.gz 241507 MD5 caa9f5bc44232dc8aeea773fea56be80 RMD160 5b63b34c5840e7182b733cad41e916a8d4875eb1 SHA1 79b33bd8d89dad7436f85b9154ad35667aa37321 SHA256 a21d724ab3b3933330194353687df82c475b5dfb997513eef4c25de6c865ec33 SHA512 4b26fe9492f218b775fb190b76ecf06edaeb656adfe6dcbd24d0a0f86871c3ba917edb88a398eb12dccedaa1605b6f0a0be06b09f9fddd9a46e457b7dd244848
+MKBUILD liba52.mkbuild 2816 MD5 1f9e544517faabed40f0ba43a4225ad7 RMD160 ff5e2baa3173299aeb1d3db79f42671d0e51d9ff SHA1 8626bd483ee5802ae41716c932b5a675df9a3964 SHA256 1a7bf1a6ab507a92b988161b1816cfa3d4a7297c25be42a4375c37e259bcbaee SHA512 9ec980939f192f72daa7279dbf3fb7f9d65724dfb21f16dcdee4e4bf97f6f19a1c0fb07df48adc1a010afed9a4cfda3e2c71d4380b4a4f683c263ab424fb5aca
+SLACKBUILD liba52.SlackBuild 7056 MD5 527081899482aee8b974d5860c461aa5 RMD160 172c2bb5b16ed045409da47c34a6d14259208154 SHA1 de2fafd83dafc9d1cf0c32527ad02487cd81c45e SHA256 87a2dec42d5b483e4fe12c53ce2184ed6497f21e9bbb3a13a32ba4db2261cb68 SHA512 4e654f0938ea7c38a30d147d7f6e1235e0e67bebc22162503f28f77132119d3912c8480ba85d55145d15baeb3c8443e480bf9de1c86a687964b46034a91fbb5d
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iQIcBAEBAgAGBQJJ80ZXAAoJEEHL93ESzgeiF28P/2IszvIm1b9ryYCIxmv9pzXm
+dpnEB+AaUMvfhhiAzzJtiJkvwiadqC7aEvZ61OL4JZpBSauXFfGHhKB6n0rXFgb6
+SQOHCfc8k9epjjNh5CZnoqWsPDY01v3GQRf++ZeHawU/ae1AFo67ALTMB1GHR5Nt
+V5f6Y4YeAnT54CIa/YCMBP3sRTls+55cDzLNdNbyailG1MfUflnt5nMWJud5Xcgl
+RCjD/CYT6QlYJwSu1mMmECQE4SFyzSa/gmXCftT8BjMdP8mFOKb6EBDjsGxlIf1k
+8JqzZZwFDCm+6jsO+osHrm9eF+iWHnC4OF2NvQGaA4o1ueIMjHB9t0177kicOcUa
+B5uYsJpDd3Yz3oylhWhtX00Vn392eT9kyqAIwpe7umo0gtHo2uYmh2JuKM8R/edX
+8u7L1kgW6keTDg0H3qmTDOyDiOPv6sgsZJDNymUY93Mv7+AhfMaPUEP4B+3fwPa/
+Z/XIVNIGP9Z7TffDCJXJpJY85B4kQAjDr391bYfrRVhbVVhyIhVZeDYgfwa36oWY
+sPdN12nn3ov7lkYLbmoNLFPEv0SG6LkxrATHQn9dAG9mTuVsk+HqRBBY17q6Vb1H
+Ck+7EIRcn9vihQo2upPskBarUWgJGzUxMWJsok40z6DRQs+0aFklBd0TFxDLkaDt
+IK+e7xvZG2j8910W0Gh8
+=ddIC
+-----END PGP SIGNATURE-----
diff --git a/media/libs/liba52/liba52.SlackBuild b/media/libs/liba52/liba52.SlackBuild
index 97214320..93acb267 100755
--- a/media/libs/liba52/liba52.SlackBuild
+++ b/media/libs/liba52/liba52.SlackBuild
@@ -10,13 +10,14 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
# Public License for more details.
#
-# You should have received a copy of the GNU General Public License along with
-# this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place - Suite 330, Boston, MA 02111-1307, USA
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
#
# slackbuild for liba52, by Silvio Rhatto
# requires:
# tested: liba52-0.7.4
+# 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/liba52"}
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
@@ -57,6 +59,7 @@ elif [ "$ARCH" = "s390" ]; then
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
LIBDIR="$PREFIX/lib64"
+ LDFLAGS="-L/lib64 -L/usr/lib64"
fi
# Set error codes (used by createpkg)
@@ -64,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
@@ -83,10 +87,76 @@ 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
-PKG_SRC="$PWD/`ls -l | awk '/^d/ { print $8 }'`"
+PKG_SRC="$PWD/`ls -l | awk '/^d/ { print $NF }'`"
cd "$PKG_SRC"
# Configure
@@ -122,9 +192,9 @@ done
mkdir -p "$PKG/install" || exit $ERROR_MKDIR
cat << EODESC > "$PKG/install/slack-desc"
# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
+# The "handy ruler" below makes it easier to edit a package description. Line
# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
+# on the right side marks the last column you can put a character in. You must
# make exactly 11 lines for the formatting to be correct. It's also
# customary to leave one space after the ':'.
@@ -144,9 +214,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/libdc1394/Manifest b/media/libs/libdc1394/Manifest
new file mode 100644
index 00000000..ef901df3
--- /dev/null
+++ b/media/libs/libdc1394/Manifest
@@ -0,0 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+DIST libdc1394-2.1.0.tar.gz 579429 MD5 51909785c8c3da6881dd983c98c0c6d6 RMD160 a9f98f142304444b71c0446127622bd375643c85 SHA1 a588d8802b555e45358435c48a399571532a817d SHA256 7175fd261aeb8f7ad991f6da38a1818a59ce6a14a70d4b8d754965aca6f77278 SHA512 bdfeeff69b39d99951ffb22c9cef28d01a5cec4dd6807f9c98ae343ade255e9772ce31f1a11c616357126ffaac534dce1a9d7c57cd33b001ff43150c27bfa234
+MKBUILD libdc1394.mkbuild 3182 MD5 17f8fac42fcb79d7ec14ffdc34f77f7d RMD160 0a627220e87ae98bf1a62429a2eed45eadf93e0f SHA1 e5658442599b82740a07e470ebda9ba39241e723 SHA256 59de1aa172dead2641b6261dca43b325583ab5679465043095c2d305ce51468d SHA512 920b55ec295151d8e3041b63fd0e1d667f9b7d4335e7460e4e7d6cff96561a854dee3405185fd471957cd79859dff6b2d80fcd3f40bf45439a3bbabba176eaee
+SLACK-REQUIRED slack-required 84 MD5 2bf54a3046d172dfe314b6b1155a5086 RMD160 cfc31f861f765314440c711c43c32f38fc946405 SHA1 3cc9c98cfbc817b4b4d4f16c5a4d9c73b996a7af SHA256 4c67224a017934876911b9c321fd0ea39d5ed35d648bbc0e1b00d5c673117e28 SHA512 2c02c477ff39195d304e3cce5aaf8ade0fb99c8235a3f85d429939ff28c9a3c7808cb69183d185efa9267aef84cbd2ab778e3f9cc3887c7e47e103f636d381cc
+SLACKBUILD libdc1394.SlackBuild 7314 MD5 58cd804c0194bc6b36d549aa306b63cd RMD160 53475fdd6c935b22d679f367ca5b24eb2b3d0408 SHA1 7247274be4079e01fc04b24d1fee0d84ee1525d0 SHA256 98bb665d300e4a4ede924c6f6ea58c1cee3e073191bb70c3044285c9abb7985a SHA512 0d18c557e2287721ef9bb090104010f0c24aee64f470459ae45f4bcf5c463834afa365ef0abfe7b74e66a742326d0b83ed3cd37a7906a4d84b41dcbe06351096
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iQIcBAEBAgAGBQJJ80D7AAoJEEHL93ESzgei1vUP/Aloiw6yJGsi17wBkrNzRUn0
+rUAppFis4csKbtm7p+2SKBa9vAX38zmMsYSMHgpFlNOSHI/TJ8tEhXXk6aPZqueC
+FpO3851TvWrp4bN55y55NQxp5FKJMJLpf4gCP3y3h2oilLXBcsezFkmo/OxjBDBz
+K5xsFL0znzmHDPg4FIjF+DD1uoWdO96hJjjDSwCc5bjGZXs5PD4j2+hzYxI/J0fN
+3sk905mGkOx6Saoj1EMEnPIWAPVanHyF7xzDw4iI3+YpncpiFAyzKkfftFwqbtFq
+Hgbc4g6qBJHvXie3OjkbXe76HG3z4PYZsBl4bi2QrllyhizYdhIerbQjpj9xPJTB
+0VOW+AdyrLABgIb0UiqKtpd2ldFT9fXnugJKwsXhmEeAzwBsLsv3+WNIQMvFujeS
+Mf748i/ngOpqX0v7rIOA+8LPlpnRUUe1108KpVm1GDnvV7t9mlhrPX+ctTtcCtTf
+DJIo/v2t6X/4UKk8QLDt7JEXTYL+lJXEPhUfHDjy9tSAzFSfo+4eQxk6WcTt+kHl
+UaYBjfLA5bg8YS9H3rSwv0qPJipyv4+bOZHgeYiNgvjvchP3grwW31eX2FvCQQQ9
+94OsICnv+LOfIjUkRrPyUSlbqI9ympe8nmhM2Qk6cq5A6B4xMaAC+5FtG9EAwuIR
+NjTcYuEUuvrd1vvsQ5OC
+=mD31
+-----END PGP SIGNATURE-----
diff --git a/media/libs/libdc1394/libdc1394.SlackBuild b/media/libs/libdc1394/libdc1394.SlackBuild
index 578551d5..f7d1ef08 100755
--- a/media/libs/libdc1394/libdc1394.SlackBuild
+++ b/media/libs/libdc1394/libdc1394.SlackBuild
@@ -15,8 +15,9 @@
# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
#
# slackbuild for libdc1394, by Silvio Rhatto
-# requires: libraw1394
-# tested: libdc1394-1.2.2
+# requires:
+# tested: libdc1394-2.1.0
+# model: generic.mkSlackBuild $Rev: 805 $
#
# Look for slackbuildrc
@@ -31,13 +32,14 @@ CWD="$(pwd)"
SRC_NAME="libdc1394"
PKG_NAME="libdc1394"
ARCH=${ARCH:=i486}
-SRC_VERSION=${VERSION:=1.2.2}
+SRC_VERSION=${VERSION:=2.1.0}
PKG_VERSION="$(echo "$SRC_VERSION" | tr '[[:blank:]-]' '_')"
BUILD=${BUILD:=1rha}
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/libdc1394"}
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
@@ -151,7 +220,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/libs/libshout/Manifest b/media/libs/libshout/Manifest
new file mode 100644
index 00000000..e383151f
--- /dev/null
+++ b/media/libs/libshout/Manifest
@@ -0,0 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+DIST libshout-2.2.2.tar.gz 476564 MD5 4f75fc9901c724b712c371c9a1e782d3 RMD160 7ea5bc197953cfae6aff53876865909b2f6ac5f1 SHA1 cabc409e63f55383f4d85fac26d3056bf0365aac SHA256 912a1fdb12d31af757e7881db49321e5b5240bd8bd4199e9fb0ce16d66568160 SHA512 f6ebe556ab10cc67201d35f1172127a411ebb28494a7873474c9f33077e2f097244b0fb94d861ff258a2b887a17afbe4c6916283cc234ead6d0981d85fe45ee5
+MKBUILD libshout.mkbuild 2626 MD5 e51c352f9f1a285f22efb2e65da83bab RMD160 1bbe97608110ab6fed912066ab71d4b8b2059056 SHA1 dd132ea490cf9af52e935d943339db5a10a211a4 SHA256 836b9293d1bd5bd1ec6d77b4f5b04db669e95993ded1b67995be95711d5eeda8 SHA512 528eff0e3aa83515122e97c005e193fbf8994c89a6f9380a77f0456433bb1dc39b8eec1c8112ec473c5bcd5446bb9a7e02e7274ad3572a7c78a1e76e1c53bf6a
+SLACKBUILD libshout.SlackBuild 6867 MD5 14a6facb1adc8b48ae15b7bb0c55f40c RMD160 59d061e56ea64cdb4f5abd9c8867b891b87a5411 SHA1 2ab822678c3628e41b06729d75477299fc30f8db SHA256 2ed6984be0e08d930842d8de407194df67d7dc5ec88f8a154fde0dec4e06ec5f SHA512 e69a29784c20da9084bd3627a6650b8d04ce7c051b8f00b203b9b7f082fc7ea88d50afba25ebfa29b8eae1758069b33cad3b176195b97bcaf8eb7bb81ee24a12
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iQIcBAEBAgAGBQJJ80kiAAoJEEHL93ESzgeiHhsP/0AvCRYcY4BhK9gtkGix89JN
+bkrwU/pT4ir75tXhqDBex+DVNTahXSKC/sfuicMdCypCbVvvqM+eoFDIoIEX0hNS
+xsvzLsrApChtjPatpwG33Vj4SqH+TGK8YhD9ttkbpQZ1kaOe0CfdC5BvYuISqpo0
+Xp6YfPYBlL4uCHgXHOhNlOS6AyKJqS9GOwHPz4PjD0HGpkoEXVfvkzQO9z11Vc13
++fayhelQNxIt8ve5xHygHMdXb56lcsF61PEPprtFgz9ZTVAtrMTqtwy8ojAtnc0J
++ClqxPKtq1Doi1vyL4JyJaGFYFXwzBmqohmdmkojFUj0yq2tc8aO6dCVxJRwNDIu
+i3hclhqQ19xTFDNf1lsqjT06K7UF+pminul7ox+RS2KKik+Bqkf12oIHQBv3ozP5
+UlDCHX0t6rK5gdhCLFyZ6ZRw/ngKSRpR2BEHzYOtLq6M0eC+QJolvIFzqhsH9X8W
+9XOFOU8+zCKPPObYmE2udp1bri4ZH/S9LtmW4YYTd60fucaRJKUtn4rH0SPOHw+t
+TQZpUNGKWyqr+WVrW/aIXW6VXTfUNQYCTZ6z6L9/ZfLHt2lU0Civxh5TJIGsJlpo
+bvyOxcwgvcD7Qt8wP/tVnz3H4co69aQGTJ9lQgVv2/jh+hdxuCsUa8nV5QT1B6uf
+OpcDTK2IY3N3hAhupMY/
+=vl2m
+-----END PGP SIGNATURE-----
diff --git a/media/libs/libshout/libshout.SlackBuild b/media/libs/libshout/libshout.SlackBuild
index b7b95591..1a3c9165 100755
--- a/media/libs/libshout/libshout.SlackBuild
+++ b/media/libs/libshout/libshout.SlackBuild
@@ -10,13 +10,14 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
# Public License for more details.
#
-# You should have received a copy of the GNU General Public License along with
-# this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place - Suite 330, Boston, MA 02111-1307, USA
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
#
# slackbuild for libshout, by Silvio Rhatto
# requires:
# tested: libshout-2.2.2
+# 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/libshout"}
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
@@ -57,6 +59,7 @@ elif [ "$ARCH" = "s390" ]; then
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
LIBDIR="$PREFIX/lib64"
+ LDFLAGS="-L/lib64 -L/usr/lib64"
fi
# Set error codes (used by createpkg)
@@ -64,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
@@ -83,10 +87,76 @@ 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
-PKG_SRC="$PWD/`ls -l | awk '/^d/ { print $8 }'`"
+PKG_SRC="$PWD/`ls -l | awk '/^d/ { print $NF }'`"
cd "$PKG_SRC"
# Configure
@@ -122,9 +192,9 @@ done
mkdir -p "$PKG/install" || exit $ERROR_MKDIR
cat << EODESC > "$PKG/install/slack-desc"
# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
+# The "handy ruler" below makes it easier to edit a package description. Line
# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
+# on the right side marks the last column you can put a character in. You must
# make exactly 11 lines for the formatting to be correct. It's also
# customary to leave one space after the ':'.
@@ -144,9 +214,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/libx264/Manifest b/media/libs/libx264/Manifest
new file mode 100644
index 00000000..61378108
--- /dev/null
+++ b/media/libs/libx264/Manifest
@@ -0,0 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+DIST x264-snapshot-20081210-2245.tar.bz2 2311508 MD5 be6b87d61f9be1dbd4f4700dde63c67f RMD160 1300867575625ccf89ebf0d1331d133f3bfbb23e SHA1 ad04776b76ae10766bbc960150f46113d8a0040c SHA256 ba470b1a000bcfbfd2c35741e5d34ee0707b99880fffd43f9f01b6abf270753f SHA512 146cff7aa837de961b27b5f418e68c4ccf0af469cd913382496bced47c54204dae85ee8db79f065676ceb6f73dcf11dd598b142d51653bcb0d4c29cffb0fbef1
+MKBUILD libx264.mkbuild 3775 MD5 75196f1bd90d1d743859e495554ab081 RMD160 441d093972890e5cc4a457d81c3ebb87c7845163 SHA1 ea1d7d5279a31e0ba889bb8095d2367d8c001227 SHA256 a34b35b12a82de59100fcc6889cdbba530fd66f8520b1aa2e5e372bbd12e46a3 SHA512 9a15dd3aa5311c8d0b110881276f0f191b02cd8f4a234a21f608d9406fb77eab88b487a0f59294799228ea99ad8cf42b91d6d01b3c98d08c0f87ad6f19b9dec9
+SLACK-REQUIRED slack-required 76 MD5 ad8c1451ea436596f42bff4fea1c11c6 RMD160 00db8daf6bda0b325f355885a3123aa53bdd9020 SHA1 828db9eeb230a118861bd0d72b9096fc5ac98724 SHA256 22a138cf8ee3e079b0e5ef132b1c80c7ee97bd74300844cbbf766e8cab8ad767 SHA512 5c432e36803a22b522cf33d525b9e532835cc9caa79da0672732037cbc02c9878624a28464ad0211b1976d0a6a7a1dc01514d7ac5539976dccf1cedec538cf82
+SLACKBUILD libx264.SlackBuild 8360 MD5 29623e84022a969f7e2a15e8f3ab81b5 RMD160 849965da76db2e4771ed471000672436aa298e38 SHA1 5725a762316e6fbd588f35bb7a0514d8f2282f51 SHA256 da470cb7c5d177039ecee66bb8db3c4b0e41c68684d74f0689ae51eceb930c14 SHA512 adfe9390ab7ea46e3a904ad7c6ab3112fc888439dc5b9d1d1f1d42b388e01f6eb1f09ea250f79a0559987cf141e79de9b1bd5cca10d289f75ea6627922fc6f3c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iQIcBAEBAgAGBQJJ80w4AAoJEEHL93ESzgeilVMQALNg+PZ96PnyJrmXn3pZCx/v
+2U9tpZm+OAc8FjcegIoYb12aAaZJr0xlJL5MbCFUTqkogmAsS5GJSqSn+F8DAL5O
+rkwioYIqklBpnkj2RDJdrIvxOIrjsaFKEdsa9O3peT1Ynl42liygWTqcOfy/AeAA
+CMZTAm5Smix6/YvGnYLFvzAI2FDXRQBYiLlIWEyCM+BX2CwWQ9RbnPK/YMSUC1G8
+6sVnGtFbpOwiYX8J+l08VZX5bWLXzVd8xCnrD/rTK0ukxkU4QxihIHSkgGXOys2s
+1RZlbnPJ1P+wWjyD4DLHMNd03NCDSI8P1XUX6rMoaj22OxMPKnXSCvZv8r5SiM4H
+aApfu7oTTWRO3J32C1T1o/uDhwWT+xsVIT0LjdsgI90xZ7EEED8S1XSjYNT1mziK
+o3CMsK08+7J2vN+UuiLz8To7wjhJDIe75XtAPUG0zqCRCCVuuTmxt275+SNr4LG9
+ZLADjj7d2J2+mekFkoninnE1NIZjPScQFZLaUyPuiby6O4UFzGM5ngyOIbuSxdnp
+jNTYVYCvh8cGeD3bqRTRPvb04OUMj/sLLzdKs9oX47nIPoNSOcvE7e+iFicRoZCA
+eN+x1I6ZnksNQnVqyedijv9ocbF0WZoW3QkjmknPaxNGR0e219Z+D40uYFJYrhWJ
+vPMKMxiaIc6G5D1ezfLQ
+=AgFz
+-----END PGP SIGNATURE-----
diff --git a/media/libs/libx264/libx264.SlackBuild b/media/libs/libx264/libx264.SlackBuild
index 6e9c39eb..f3a9690a 100755
--- a/media/libs/libx264/libx264.SlackBuild
+++ b/media/libs/libx264/libx264.SlackBuild
@@ -15,8 +15,9 @@
# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
#
# slackbuild for libx264, by Silvio Rhatto
-# requires: yasm
+# requires:
# tested: libx264-20081210
+# 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/libx264"}
PREFIX=${PREFIX:=/usr}
PKG_WORK="$TMP/$SRC_NAME"
CONF_OPTIONS=${CONF_OPTIONS:="--enable-shared --enable-visualize --enable-pic"}
@@ -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" ] || ! bunzip2 -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