From 84fb3a7ce4a1831cf1321ed8aaf6363e3d7f7673 Mon Sep 17 00:00:00 2001 From: Eugene Wissner Date: Thu, 13 May 2010 00:40:26 +0200 Subject: system/gkrellm-volume: Updated for version 2.1.13 --- system/gkrellm-volume/Makefile.diff | 32 ++++++---------- system/gkrellm-volume/README | 9 ++--- system/gkrellm-volume/gkrellm-volume.SlackBuild | 51 +++++++++++++++++-------- system/gkrellm-volume/gkrellm-volume.info | 8 ++-- 4 files changed, 56 insertions(+), 44 deletions(-) (limited to 'system/gkrellm-volume') diff --git a/system/gkrellm-volume/Makefile.diff b/system/gkrellm-volume/Makefile.diff index d93b0202e7..806ae79be3 100644 --- a/system/gkrellm-volume/Makefile.diff +++ b/system/gkrellm-volume/Makefile.diff @@ -1,25 +1,15 @@ -diff -Naur gkrellm-volume.orig/Makefile gkrellm-volume/Makefile +diff -Nur gkrellm-volume.orig/Makefile gkrellm-volume/Makefile --- gkrellm-volume.orig/Makefile 2004-08-19 15:07:27.000000000 -0500 -+++ gkrellm-volume/Makefile 2006-10-29 21:57:34.000000000 -0600 -@@ -1,15 +1,15 @@ - # Makefile for GKrellM volume plugin - - PACKAGE ?= gkrellm-volume --LOCALEDIR ?= /usr/local/share/locale -+LOCALEDIR ?= /usr/share/locale - - FLAGS += -DPACKAGE="\"$(PACKAGE)\"" - export PACKAGE LOCALEDIR - - GTK_CONFIG = pkg-config gtk+-2.0 - --PLUGIN_DIR ?= /usr/local/lib/gkrellm2/plugins --GKRELLM_INCLUDE = -I/usr/local/include -+PLUGIN_DIR ?= /usr/lib/gkrellm2/plugins -+GKRELLM_INCLUDE = -I/usr/include - ++++ gkrellm-volume/Makefile 2009-11-30 00:48:22.746711831 -0600 +@@ -14,7 +14,7 @@ GTK_CFLAGS = `$(GTK_CONFIG) --cflags` GTK_LIB = `$(GTK_CONFIG) --libs` + +-FLAGS = -O2 -Wall -fPIC $(GTK_CFLAGS) $(GKRELLM_INCLUDE) ++FLAGS = -Wall -fPIC $(GTK_CFLAGS) $(GKRELLM_INCLUDE) + LIBS = $(GTK_LIB) + LFLAGS = -shared + @@ -33,6 +33,7 @@ CC = gcc $(CFLAGS) $(FLAGS) @@ -38,9 +28,9 @@ diff -Naur gkrellm-volume.orig/Makefile gkrellm-volume/Makefile %.c.o: %.c -diff -Naur gkrellm-volume.orig/po/Makefile gkrellm-volume/po/Makefile +diff -Nur gkrellm-volume.orig/po/Makefile gkrellm-volume/po/Makefile --- gkrellm-volume.orig/po/Makefile 2004-08-19 15:07:27.000000000 -0500 -+++ gkrellm-volume/po/Makefile 2006-10-29 21:55:33.000000000 -0600 ++++ gkrellm-volume/po/Makefile 2009-11-30 00:47:52.124675094 -0600 @@ -14,8 +14,8 @@ install: $(MAKE) all diff --git a/system/gkrellm-volume/README b/system/gkrellm-volume/README index ebb6dc9931..9f5fdc1cc0 100644 --- a/system/gkrellm-volume/README +++ b/system/gkrellm-volume/README @@ -1,6 +1,5 @@ -gkrellm-volume is a plugin for gkrellm 2.0 that lets you control your -sound mixer.. +gkrellm-volume is a plugin for gkrellm-2 that lets you control +your sound mixer.. -This plugin also supports gkrellm's plugin theming possibilities; it's even -included in the default gkrellm theme :) The keyword for the plugin is -"volume". +This plugin also supports gkrellm's plugin theming possibilities; +it's even included in the default gkrellm theme :). diff --git a/system/gkrellm-volume/gkrellm-volume.SlackBuild b/system/gkrellm-volume/gkrellm-volume.SlackBuild index ef680d37f9..524d2c3dcd 100644 --- a/system/gkrellm-volume/gkrellm-volume.SlackBuild +++ b/system/gkrellm-volume/gkrellm-volume.SlackBuild @@ -17,47 +17,68 @@ # Modifed by the SlackBuilds.org project -PKGNAME=gkrellm-volume +PRGNAM=gkrellm-volume VERSION=2.1.13 ARCH=${ARCH:-i486} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} + CWD=$(pwd) TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PKGNAME -OUTPUT=${OUTPUT:-/tmp} # Final location of package +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} 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 -rm -rf $PKGNAME-$VERSION -tar -xvzf $CWD/$PKGNAME-$VERSION.tar.gz || exit 1 -cd $PKGNAME || exit 1 +cd $TMP +rm -rf $PRGNAM +tar xvf $CWD/$PRGNAM-$VERSION.tar.gz +cd $PRGNAM chown -R root:root . chmod -R a-s,u+w,go+r-w . # Patch the Makefile and po/Makefile to support DESTDIR patch -p1 < $CWD/Makefile.diff || exit 1 -make enable_nls=1 enable_alsa=1 || exit 1 -make enable_nls=1 enable_alsa=1 install DESTDIR=$PKG || exit 1 +make \ + CFLAGS="$SLKCFLAGS" \ + LOCALEDIR=/usr/share/locale \ + PLUGIN_DIR=/usr/lib${LIBDIRSUFFIX}/gkrellm2/plugins \ + GKRELLM_INCLUDE="-I/usr/include" \ + enable_nls=1 \ + enable_alsa=1 + +make install \ + LOCALEDIR=/usr/share/locale \ + PLUGIN_DIR=/usr/lib${LIBDIRSUFFIX}/gkrellm2/plugins \ + GKRELLM_INCLUDE="-I/usr/include" \ + enable_nls=1 \ + enable_alsa=1 \ + DESTDIR=$PKG # Strip the .so file -strip --strip-unneeded $PKG/usr/lib/gkrellm2/plugins/volume.so +strip --strip-unneeded $PKG/usr/lib${LIBDIRSUFFIX}/gkrellm2/plugins/volume.so -mkdir -p $PKG/usr/doc/$PKGNAME-$VERSION -cp -a COPYRIGHT Changelog README THEMING $PKG/usr/doc/$PKGNAME-$VERSION -cp -a po/README $PKG/usr/doc/$PKGNAME-$VERSION/README.po -cat $CWD/$PKGNAME.SlackBuild > $PKG/usr/doc/$PKGNAME-$VERSION/$PKGNAME.SlackBuild +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a COPYRIGHT Changelog README THEMING $PKG/usr/doc/$PRGNAM-$VERSION +cp -a po/README $PKG/usr/doc/$PRGNAM-$VERSION/README.po +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PKGNAME-$VERSION-$ARCH-$BUILD$TAG.tgz +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/system/gkrellm-volume/gkrellm-volume.info b/system/gkrellm-volume/gkrellm-volume.info index 026318e45b..2e702bf48d 100644 --- a/system/gkrellm-volume/gkrellm-volume.info +++ b/system/gkrellm-volume/gkrellm-volume.info @@ -1,8 +1,10 @@ PRGNAM="gkrellm-volume" VERSION="2.1.13" -HOMEPAGE="http://gkrellm.luon.net/volume.phtml" +HOMEPAGE="http://gkrellm.luon.net/volume.php" DOWNLOAD="http://gkrellm.luon.net/files/gkrellm-volume-2.1.13.tar.gz" MD5SUM="d9f4c36d7fdf9c9f755c99f742b573c4" -MAINTAINER="paul wisehart" -EMAIL="wise@lupulin.net" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +MAINTAINER="Eugene Wissner" +EMAIL="belka.ew@gmail.com" APPROVED="rworkman" -- cgit v1.2.3