[arch-commits] CVS update of extra/multimedia/muine (4 files)
Jan de Groot
jgc at archlinux.org
Sun Oct 28 21:17:27 UTC 2007
Date: Sunday, October 28, 2007 @ 17:17:27
Author: jgc
Path: /home/cvs-extra/extra/multimedia/muine
Modified: PKGBUILD (1.17 -> 1.18) muine.install (1.9 -> 1.10)
Removed: muine-0.8.7-64bit.patch (1.1) muine-0.8.7-flac-1.1.3.patch (1.1)
upgpkg: muine 0.8.8-1
------------------------------+
PKGBUILD | 20 ++++----------
muine-0.8.7-64bit.patch | 11 --------
muine-0.8.7-flac-1.1.3.patch | 56 -----------------------------------------
muine.install | 14 +---------
4 files changed, 8 insertions(+), 93 deletions(-)
Index: extra/multimedia/muine/PKGBUILD
diff -u extra/multimedia/muine/PKGBUILD:1.17 extra/multimedia/muine/PKGBUILD:1.18
--- extra/multimedia/muine/PKGBUILD:1.17 Sun Apr 22 14:01:05 2007
+++ extra/multimedia/muine/PKGBUILD Sun Oct 28 17:17:26 2007
@@ -1,36 +1,28 @@
-# $Id: PKGBUILD,v 1.17 2007/04/22 18:01:05 jgc Exp $
+# $Id: PKGBUILD,v 1.18 2007/10/28 21:17:26 jgc Exp $
# Maintainer: Jan de Groot <jgc at archlinux.org>
# Contributor: Ben Mazer <blm at groknil.org>
pkgname=muine
-pkgver=0.8.7
-pkgrel=3
+pkgver=0.8.8
+pkgrel=1
pkgdesc="A music player written in C#"
arch=(i686 x86_64)
license=('GPL')
url="http://www.muine-player.org/"
depends=('gnome-sharp' 'gstreamer0.10-faad>=0.10.4-2' 'desktop-file-utils'
'gstreamer0.10-vorbis' 'gstreamer0.10-mad' 'gstreamer0.10-flac>=0.10.5-2'
- 'gstreamer0.10-gnomevfs' 'gstreamer0.10-gconf' 'libgnomeui>=2.18.1-2')
+ 'gstreamer0.10-gnomevfs' 'gstreamer0.10-gconf' 'libgnomeui>=2.20.1')
makedepends=('perlxml' 'pkgconfig')
-options=('nolibtool')
+options=('!libtool' '!emptydirs')
install=muine.install
-source=(http://muine-player.org/releases/muine-${pkgver}.tar.gz
- muine-0.8.7-flac-1.1.3.patch
- muine-0.8.7-64bit.patch)
-md5sums=('19f5aa148a7bd3c18cf1c3244813aa88' '9bbe9df2bc3860bb1ca82de3ff57e64e'\
- 'f4f136f97b4e447725e36ed441c08033')
+source=(http://muine-player.org/releases/muine-${pkgver}.tar.gz)
build() {
- if [ "${CARCH}" = "x86_64" ]; then
- patch -Np0 -i ../muine-0.8.7-64bit.patch || return 1
- fi
export MONO_SHARED_DIR=${startdir}/src/.wabi
mkdir -p "${MONO_SHARED_DIR}"
cd ${startdir}/src/${pkgname}-${pkgver}
- patch -Np1 -i ${startdir}/src/muine-0.8.7-flac-1.1.3.patch || return 1
./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
--disable-static --enable-gstreamer
make || return 1
Index: extra/multimedia/muine/muine-0.8.7-64bit.patch
diff -u extra/multimedia/muine/muine-0.8.7-64bit.patch:1.1 extra/multimedia/muine/muine-0.8.7-64bit.patch:removed
--- extra/multimedia/muine/muine-0.8.7-64bit.patch:1.1 Wed Mar 21 16:57:56 2007
+++ extra/multimedia/muine/muine-0.8.7-64bit.patch Sun Oct 28 17:17:27 2007
@@ -1,11 +0,0 @@
---- muine-0.8.7/libmuine/metadata.c.64bit 2007-01-22 16:14:39.000000000 +0100
-+++ muine-0.8.7/libmuine/metadata.c 2007-01-22 16:14:52.000000000 +0100
-@@ -747,7 +747,7 @@
- } CallbackData;
-
- static FLAC__StreamDecoderReadStatus
--FLAC_read_callback (const FLAC__StreamDecoder *UNUSED(decoder), FLAC__byte buffer[], unsigned *bytes, void *client_data)
-+FLAC_read_callback (const FLAC__StreamDecoder *UNUSED(decoder), FLAC__byte buffer[], size_t *bytes, void *client_data)
- {
- CallbackData *data = (CallbackData *) client_data;
- GnomeVFSFileSize read;
Index: extra/multimedia/muine/muine-0.8.7-flac-1.1.3.patch
diff -u extra/multimedia/muine/muine-0.8.7-flac-1.1.3.patch:1.1 extra/multimedia/muine/muine-0.8.7-flac-1.1.3.patch:removed
--- extra/multimedia/muine/muine-0.8.7-flac-1.1.3.patch:1.1 Sun Mar 11 16:12:00 2007
+++ extra/multimedia/muine/muine-0.8.7-flac-1.1.3.patch Sun Oct 28 17:17:27 2007
@@ -1,56 +0,0 @@
---- muine-0.8.7/libmuine/metadata.c.flac 2007-01-19 23:14:07.000000000 +0100
-+++ muine-0.8.7/libmuine/metadata.c 2007-01-22 13:52:05.000000000 +0100
-@@ -41,6 +41,12 @@
- #include "metadata.h"
- #include "macros.h"
-
-+#if !defined(FLAC_API_VERSION_CURRENT) || FLAC_API_VERSION_CURRENT < 8
-+#define LEGACY_FLAC
-+#else
-+#undef LEGACY_FLAC
-+#endif
-+
- struct _Metadata {
- char *title;
-
-@@ -829,22 +835,40 @@
-
- flac_decoder = FLAC__stream_decoder_new ();
-
-+#if defined(LEGACY_FLAC)
- FLAC__stream_decoder_set_read_callback (flac_decoder, FLAC_read_callback);
- FLAC__stream_decoder_set_write_callback (flac_decoder, FLAC_write_callback);
- FLAC__stream_decoder_set_metadata_callback (flac_decoder, FLAC_metadata_callback);
- FLAC__stream_decoder_set_error_callback (flac_decoder, FLAC_error_callback);
-+#endif
-
- callback_data = g_new0 (CallbackData, 1);
- callback_data->handle = handle;
- callback_data->comment = comment;
-+#if defined(LEGACY_FLAC)
- FLAC__stream_decoder_set_client_data (flac_decoder, callback_data);
-+#endif
-
- /* by default, only the STREAMINFO block is parsed and passed to
- * the metadata callback. Here we instruct the decoder to also
- * pass us the VORBISCOMMENT block if there is one. */
- FLAC__stream_decoder_set_metadata_respond (flac_decoder, FLAC__METADATA_TYPE_VORBIS_COMMENT);
-
-+#if defined(LEGACY_FLAC)
- FLAC__stream_decoder_init (flac_decoder);
-+#else
-+ FLAC__stream_decoder_init_stream (flac_decoder,
-+ FLAC_read_callback,
-+ NULL,
-+ NULL,
-+ NULL,
-+ NULL,
-+ FLAC_write_callback,
-+ FLAC_metadata_callback,
-+ FLAC_error_callback,
-+ callback_data
-+ );
-+#endif
-
- /* this runs the decoding process, calling the callbacks as appropriate */
- if (FLAC__stream_decoder_process_until_end_of_metadata (flac_decoder) == 0) {
Index: extra/multimedia/muine/muine.install
diff -u extra/multimedia/muine/muine.install:1.9 extra/multimedia/muine/muine.install:1.10
--- extra/multimedia/muine/muine.install:1.9 Sun Apr 22 14:01:05 2007
+++ extra/multimedia/muine/muine.install Sun Oct 28 17:17:27 2007
@@ -1,9 +1,7 @@
pkgname=muine
post_install() {
- GCONF_CONFIG_SOURCE=`usr/bin/gconftool-2 --get-default-source` \
- usr/bin/gconftool-2 --makefile-install-rule usr/share/gconf/schemas/${pkgname}.schemas >/dev/null
-
+ usr/sbin/gconfpkg --install ${pkgname}
update-desktop-database -q
gtk-update-icon-cache -f -t -q usr/share/icons/hicolor
@@ -26,15 +24,7 @@
}
pre_remove() {
- if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then
- schemas=(usr/share/gconf/schemas/${pkgname}.schemas)
- elif [ -f opt/gnome/share/gconf/schemas/${pkgname}.schemas ]; then
- schemas=(opt/gnome/share/gconf/schemas/${pkgname}.schemas)
- else
- schemas=(`pacman -Ql $pkgname | grep 'gconf/schemas/.*schemas$' | awk '{ print $2 }'`)
- fi
- GCONF_CONFIG_SOURCE=`usr/bin/gconftool-2 --get-default-source` \
- usr/bin/gconftool-2 --makefile-uninstall-rule ${schemas[@]} >/dev/null
+ usr/sbin/gconfpkg --uninstall ${pkgname}
}
post_remove() {
More information about the arch-commits
mailing list