From 5a03574e4dfdec05537ef3fc5dead58ec5417552 Mon Sep 17 00:00:00 2001 From: Phillip Warner Date: Thu, 13 May 2010 00:34:47 +0200 Subject: multimedia/gnome-mplayer: Updated for version 0.9.8 --- multimedia/gnome-mplayer/GTK2_14.patch | 15 +++ multimedia/gnome-mplayer/README | 22 +++-- multimedia/gnome-mplayer/doinst.sh | 10 +- multimedia/gnome-mplayer/gnome-mplayer.SlackBuild | 112 ++++++++-------------- multimedia/gnome-mplayer/gnome-mplayer.info | 14 +-- multimedia/gnome-mplayer/slack-desc | 18 ++-- 6 files changed, 94 insertions(+), 97 deletions(-) create mode 100644 multimedia/gnome-mplayer/GTK2_14.patch (limited to 'multimedia/gnome-mplayer') diff --git a/multimedia/gnome-mplayer/GTK2_14.patch b/multimedia/gnome-mplayer/GTK2_14.patch new file mode 100644 index 0000000000..87485d87c8 --- /dev/null +++ b/multimedia/gnome-mplayer/GTK2_14.patch @@ -0,0 +1,15 @@ +Original patch by Kevin DeKorte +Recreated by Phillip Warner + +--- 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 3203a598bc..ced806b590 100644 --- a/multimedia/gnome-mplayer/README +++ b/multimedia/gnome-mplayer/README @@ -1,8 +1,18 @@ -GNOME MPlayer is a simple GUI for MPlayer. It is intended to be a -nice tight player and provide a simple and clean interface to MPlayer. -GNOME MPlayer has a rich API that is exposed via DBus. Using DBus you -can control a single or multiple instances of GNOME MPlayer from a +A GTK2 interface to MPlayer. The power of MPlayer combined with a +friendly interface for your desktop; You can play all your multimedia +(audio, video, CD, DVDs, and VCDs, streams etc.), organize, sort and +create playlists, take screenshots while playing videos, be notified +about media changes. Full DVD and MKV chapter support, when supported by +Mplayer. Subtitle support with the ability to specify preferred audio +and subtitle languages if the media supports it. Support for cover art +retrieval from Amazon.com for audio media files with artist and/or album +information contained in the file. + +Gnome MPlayer has a rich API that is exposed via DBus. Using DBus you +can control a single or multiple instances of GNOME MPlayer from a single command. -MPlayer is required to run GNOME MPlayer. GConf, libnotify, and -libmusicbrainz3 are optional build time dependencies. +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. diff --git a/multimedia/gnome-mplayer/doinst.sh b/multimedia/gnome-mplayer/doinst.sh index 3dddce9865..1f8ff67ded 100644 --- a/multimedia/gnome-mplayer/doinst.sh +++ b/multimedia/gnome-mplayer/doinst.sh @@ -1,4 +1,10 @@ -if [ -x usr/bin/update-desktop-database ]; then - /usr/bin/update-desktop-database -q usr/share/applications +if [ -x /usr/bin/update-desktop-database ]; then + /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 +fi + +if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then + if [ -x /usr/bin/gtk-update-icon-cache ]; then + /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1 + fi fi diff --git a/multimedia/gnome-mplayer/gnome-mplayer.SlackBuild b/multimedia/gnome-mplayer/gnome-mplayer.SlackBuild index d82a8efbd3..597eac70be 100644 --- a/multimedia/gnome-mplayer/gnome-mplayer.SlackBuild +++ b/multimedia/gnome-mplayer/gnome-mplayer.SlackBuild @@ -1,29 +1,10 @@ #!/bin/sh -# Slackware build script for GNOME MPlayer - -# Copyright 2008, 2009 Frank Caraballo -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# Slackware build script for gnome-mplayer +# Written by Phillip Warner PRGNAM=gnome-mplayer -VERSION=${VERSION:-0.9.5} +VERSION=${VERSION:-0.9.8} ARCH=${ARCH:-i486} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -33,82 +14,65 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -GCONF=${GCONF:-no} - -if [ "$GCONF" = "no" ]; then - do_schemas="--disable-schemas-install" - do_gconf="--without-gconf" -else - do_schemas="" - do_gconf="" -fi - if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" fi +set -e + rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT -cd $TMP || exit 1 +cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.?z* || exit 1 -cd $PRGNAM-$VERSION || exit 1 +tar xvf $CWD/$PRGNAM-$VERSION.tar.gz +cd $PRGNAM-$VERSION chown -R root:root . find . \ - \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \; -o \ + \( -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 \ --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --enable-static=no \ - --build=$ARCH-slackware-linux \ - $do_schemas \ - $do_gconf \ - || exit 1 + --mandir=/usr/man \ + --docdir=/usr/doc/$PRGNAM-$VERSION \ + --disable-nautilus \ + --without-gconf \ + --disable-schemas-install \ + --build=$ARCH-slackware-linux + +make +make install DESTDIR=$PKG + +( cd $PKG + find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \ + xargs strip --strip-unneeded 2> /dev/null || true + find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | \ + xargs strip --strip-unneeded 2> /dev/null || true +) -make || exit 1 -make install-strip DESTDIR=$PKG || exit 1 +( 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 +) -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild -mv $PKG/usr/share/doc/$PRGNAM/* $PKG/usr/doc/$PRGNAM-$VERSION -rm -rf $PKG/usr/share/doc mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cat $CWD/doinst.sh > $PKG/install/doinst.sh -if [ "$GCONF" != "no" ]; then -# Handle the schemas and such (hopefully) properly -GCONF_CONFIG_SOURCE="xml::etc/gconf/gconf.xml.defaults" -for RAWNAME in $(find $PKG/etc/gconf/schemas -name "*.schemas") ; do - SCHEMA=$(basename $RAWNAME) - cat << EOF >> $PKG/install/doinst.sh -GCONF_CONFIG_SOURCE="xml::etc/gconf/gconf.xml.defaults" \ -chroot . gconftool-2 --makefile-install-rule /etc/gconf/schemas/$SCHEMA 1>/dev/null -EOF -done -for RAWNAME in $(find $PKG/etc/gconf/schemas -name "*.entries") ; do - ENTRY=$(basename $RAWNAME) - cat << EOF >> $PKG/install/doinst.sh -GCONF_CONFIG_SOURCE="xml::etc/gconf/gconf.xml.defaults" \ -chroot . gconftool-2 --direct \ - --config-source=$GCONF_CONFIG_SOURCE \ - --load /etc/gconf/schemas/$ENTRY 1>/dev/null -EOF -done -unset GCONF_CONFIG_SOURCE -fi - cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/multimedia/gnome-mplayer/gnome-mplayer.info b/multimedia/gnome-mplayer/gnome-mplayer.info index 88fc5884de..765b5865d2 100644 --- a/multimedia/gnome-mplayer/gnome-mplayer.info +++ b/multimedia/gnome-mplayer/gnome-mplayer.info @@ -1,8 +1,10 @@ PRGNAM="gnome-mplayer" -VERSION="0.9.5" -HOMEPAGE="http://kdekorte.googlepages.com/" -DOWNLOAD="http://gnome-mplayer.googlecode.com/files/gnome-mplayer-0.9.5.tar.gz" -MD5SUM="02d01f1cca7ff3af511c59198f3c35a7" -MAINTAINER="Frank Caraballo" -EMAIL="fecaraballo{at}gmail{dot}com" +VERSION="0.9.8" +HOMEPAGE="http://kdekorte.googlepages.com/gnomemplayer" +DOWNLOAD="http://gnome-mplayer.googlecode.com/files/gnome-mplayer-0.9.8.tar.gz" +MD5SUM="540630654db044198c435f32c04b1b53" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +MAINTAINER="Phillip Warner" +EMAIL="pc_warner@yahoo.com" APPROVED="rworkman" diff --git a/multimedia/gnome-mplayer/slack-desc b/multimedia/gnome-mplayer/slack-desc index 72e42ac9de..6cc935b36b 100644 --- a/multimedia/gnome-mplayer/slack-desc +++ b/multimedia/gnome-mplayer/slack-desc @@ -1,19 +1,19 @@ # HOW TO EDIT THIS FILE: # 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 make +# 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 ':'. - |-----handy-ruler-------------------------------------------------------| -gnome-mplayer: GNOME MPlayer (GUI for MPlayer) + |-----handy-ruler-----------------------------------------------------| +gnome-mplayer: gnome-mplayer (GTK2 MPlayer frontend) +gnome-mplayer: +gnome-mplayer: A GTK2 interface to MPlayer. +gnome-mplayer: +gnome-mplayer: http://kdekorte.googlepages.com/gnomemplayer +gnome-mplayer: +gnome-mplayer: gnome-mplayer: -gnome-mplayer: GNOME MPlayer is a simple GUI for MPlayer. It is intended to be a -gnome-mplayer: nice tight player and provide a simple and clean interface to MPlayer. -gnome-mplayer: GNOME MPlayer has a rich API that is exposed via DBus. Using DBus you -gnome-mplayer: can control a single or multiple instances of GNOME MPlayer from a -gnome-mplayer: single command. gnome-mplayer: -gnome-mplayer: Homepage: http://kdekorte.googlepages.com/ gnome-mplayer: gnome-mplayer: -- cgit v1.2.3-65-gdbad