multimedia/rosa-media-player: Fix 15.0 build.

Signed-off-by: B. Watson <yalhcru@gmail.com>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

2 files changed, 24 insertions, 27 deletions

diff --git a/multimedia/rosa-media-player/README b/multimedia/rosa-media-player/README
index 73016cb31f..d6427816af 100644
--- a/multimedia/rosa-media-player/README
+++ b/multimedia/rosa-media-player/README
@@ -1,16 +1,15 @@
 ROMP (ROSA Media Player)
 
 Rosa Media Player (ROMP) - multimedia player that supports most of
-audio and video formats such as Audio CD, DVD, Video CD,
-multimedia files in AVi, ASF/WMV/WMA, MOV/MP4, RealMedia, Ogg Vorbis,
-NUT, NSV, VIVO, FLI, NuppelVideo, yuv4mpeg, FILM (.cpk),
-RoQ, PVA and Matroska  formats recorded with video codecs - DivX ,
-MPEG-1, MPEG-2, MPEG-4, Sorenson, WMV, RealVideo, x264
-and audio codecs MP3, Musepack, Vorbis, RealAudio, AC3/A52 (Dolby Digital),
-AAC (MPEG-4 audio), QuickTime, VIVO audio and WMA
-and many other less widespread video and audio codecs.
-It also supports streaming via HTTP/FTP, RTP/RTSP, MMS/MMST, MPST,
-SDP, capture and record (via mencoder) of television signal.
+audio and video formats such as Audio CD, DVD, Video CD, multimedia
+files in AVi, ASF/WMV/WMA, MOV/MP4, RealMedia, Ogg Vorbis, NUT, NSV,
+VIVO, FLI, NuppelVideo, yuv4mpeg, FILM (.cpk), RoQ, PVA and Matroska
+formats recorded with video codecs - DivX , MPEG-1, MPEG-2, MPEG-4,
+Sorenson, WMV, RealVideo, x264 and audio codecs MP3, Musepack, Vorbis,
+RealAudio, AC3/A52 (Dolby Digital), AAC (MPEG-4 audio), QuickTime,
+VIVO audio and WMA and many other less widespread video and audio
+codecs. It also supports streaming via HTTP/FTP, RTP/RTSP, MMS/MMST,
+MPST, SDP, capture and record (via mencoder) of television signal.
 ROMP allows you to trim a particular piece of video, extract audio
-from multimedia files and record screen presentations and
-many other things.
+from multimedia files and record screen presentations and many other
+things.
diff --git a/multimedia/rosa-media-player/rosa-media-player.SlackBuild b/multimedia/rosa-media-player/rosa-media-player.SlackBuild
index cea23e00fc..4081a0db72 100644
--- a/multimedia/rosa-media-player/rosa-media-player.SlackBuild
+++ b/multimedia/rosa-media-player/rosa-media-player.SlackBuild
@@ -13,15 +13,12 @@ PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
 if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
   echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
   exit 0
@@ -31,8 +28,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"
@@ -56,22 +53,23 @@ cd $PRGNAM
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
-make PREFIX=/usr \
-DOC_PATH=\\\"/usr/doc/$PRGNAM-$VERSION\\\"
+  make PREFIX=/usr \
+    DOC_PATH=\\\"/usr/doc/$PRGNAM-$VERSION\\\" \
+    QMAKE=qmake-qt4 \
+    LRELEASE=lrelease-qt4
 
 make \
-PREFIX=/usr \
-DOC_PATH=/usr/doc/$PRGNAM-$VERSION \
-DESTDIR=$PKG install
+  PREFIX=/usr \
+  DOC_PATH=/usr/doc/$PRGNAM-$VERSION \
+  DESTDIR=$PKG install
 
-find $PKG | xargs file | grep -e "executable" -e "shared object"| grep ELF | \
-  cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+strip $PKG/usr/bin/$PRGNAM
 
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild