summaryrefslogtreecommitdiffstats
path: root/MPlayer
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2007-03-15 13:32:56 +0000
committer Eric Hameleers <alien@slackware.com>2007-03-15 13:32:56 +0000
commitfa44b28626fccf0ab5c70d4d42b3c6d97e50d0d2 (patch)
tree6d02f11359f0e64d980c9954f52cf392ff398a0e /MPlayer
parentf16116b941d7316ea990b2b13bd0263c922b0d4e (diff)
downloadasb-fa44b28626fccf0ab5c70d4d42b3c6d97e50d0d2.tar.gz
asb-fa44b28626fccf0ab5c70d4d42b3c6d97e50d0d2.tar.xz
Some small polishing fixes
Diffstat (limited to 'MPlayer')
-rwxr-xr-xMPlayer/build/MPlayer.SlackBuild24
1 files changed, 12 insertions, 12 deletions
diff --git a/MPlayer/build/MPlayer.SlackBuild b/MPlayer/build/MPlayer.SlackBuild
index 00b80707..ea938d1a 100755
--- a/MPlayer/build/MPlayer.SlackBuild
+++ b/MPlayer/build/MPlayer.SlackBuild
@@ -183,7 +183,7 @@ chown -R root.root *
chmod -R a-s,u+rw,go+r-w *
# Fix a security problem: read http://www.debian.org/security/2006/dsa-1244
-patch -p0 < ${SOURCE[3]} 2>&1 | tee $OUTPUT/patch-${PRGNAM}.log
+patch -p0 < ${SOURCE[2]} 2>&1 | tee $OUTPUT/patch-${PRGNAM}.log
# Remove potentially illegal dvdcss code (in which case, make sure you have
# libdvdread installed before you start the compile!):
@@ -226,10 +226,11 @@ sed -i -e 's#^Icon=mplayer.xpm$#Icon=/usr/share/pixmaps/mplayer.xpm#' \
$PKG/usr/share/applications/mplayer.desktop
# Install our default skin:
-( cd $PKG/usr/share/mplayer/skins
- tar -xvf ${SOURCE[1]}
- ln -s ${DEFSKIN} default
-)
+cd $PKG/usr/share/mplayer/skins
+tar -xvf ${SOURCE[1]}
+chown -R root:root *
+ln -s ${DEFSKIN} default
+cd -
# Installing a bitmap font is considered deprecated; use a TTF font instead:
# Instead, we try to link to an installed TTF font at install time.
@@ -261,9 +262,9 @@ config() {
if [ ! -f usr/share/mplayer/subfont.ttf ]; then
for font in ${OSDFONTS}; do
if [ -f .${XPREF}/lib/X11/fonts/TTF/\${font} ]; then
- ( cd usr/share/mplayer/
- ln -sf ${XPREF}/lib/X11/fonts/TTF/\${font} subfont.ttf
- )
+ cd usr/share/mplayer/
+ ln -sf ${XPREF}/lib/X11/fonts/TTF/\${font} subfont.ttf
+ cd -
break
fi
done
@@ -300,10 +301,9 @@ for i in `find . -type l -name "*.?"` ; do ln -s $( readlink $i ).gz $i.gz ; rm
cd -
# Strip binaries
-( cd $PKG
- find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
- find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-)
+
+find $PKG | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+ find $PKG | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
# --- OWNERSHIP, RIGHTS ---