diff options
| -rw-r--r-- | multimedia/gnome-mplayer/GTK2_14.patch | 15 | ||||
| -rw-r--r-- | multimedia/gnome-mplayer/README | 2 | ||||
| -rw-r--r-- | multimedia/gnome-mplayer/gnome-mplayer.SlackBuild | 21 |
3 files changed, 15 insertions, 23 deletions
diff --git a/multimedia/gnome-mplayer/GTK2_14.patch b/multimedia/gnome-mplayer/GTK2_14.patch deleted file mode 100644 index 87485d87c8431..0000000000000 --- a/multimedia/gnome-mplayer/GTK2_14.patch +++ /dev/null @@ -1,15 +0,0 @@ -Original patch by Kevin DeKorte <kdekorte at gmail dot com> -Recreated by Phillip Warner <pc_warner@yahoo.com> - ---- src/gui.c.orig 2009-10-16 19:46:09.000000000 -0500 -+++ src/gui.c 2009-10-16 19:47:05.000000000 -0500 -@@ -94,7 +94,9 @@ - * onwards, requesting the native window in a thread causes a BadWindowID, - * so we need to request it now. We could call gdk_window_ensure_native(), - * but that would mean we require GTK+ 2.18, so instead we call this */ -+#ifdef GTK2_14_ENABLED - GDK_WINDOW_XID(gtk_widget_get_window(GTK_WIDGET(widget))); -+#endif - } - - gint get_player_window() diff --git a/multimedia/gnome-mplayer/README b/multimedia/gnome-mplayer/README index ced806b590400..40e60ba5ad356 100644 --- a/multimedia/gnome-mplayer/README +++ b/multimedia/gnome-mplayer/README @@ -15,4 +15,4 @@ single command. Gnome MPlayer is not dependent on any Gnome libraries. However. the look and feel of the application is based on the Gnome HIG. -libnotify and libmusicbrainz3 are optional dependencies. +libmusicbrainz3 is an optional dependency. diff --git a/multimedia/gnome-mplayer/gnome-mplayer.SlackBuild b/multimedia/gnome-mplayer/gnome-mplayer.SlackBuild index a103c4413100b..d1e092396d0d3 100644 --- a/multimedia/gnome-mplayer/gnome-mplayer.SlackBuild +++ b/multimedia/gnome-mplayer/gnome-mplayer.SlackBuild @@ -5,10 +5,19 @@ PRGNAM=gnome-mplayer VERSION=${VERSION:-0.9.8} -ARCH=${ARCH:-i486} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i486 ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + esac +fi + CWD=$(pwd) TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM @@ -23,6 +32,9 @@ elif [ "$ARCH" = "i686" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" fi set -e @@ -40,8 +52,6 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 \ -o -perm 400 \) -exec chmod 644 {} \; -patch -p0 < $CWD/GTK2_14.patch - CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ @@ -59,10 +69,7 @@ make install DESTDIR=$PKG find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true -( cd $PKG/usr/man - find . -type f -exec gzip -9 {} \; - for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done -) +find $PKG/usr/man -type f -exec gzip -9 {} \; cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild |