diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2012-04-26 08:50:58 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2012-04-26 08:50:58 +0000 |
| commit | 180700192ce9edd99c66a7c91adbe2593dedc864 (patch) | |
| tree | 72ff01af626b9414eafa8fd8124a78beb921be83 /main/audacious | |
| parent | d3dd4a4d486766bf565f73bd9410d265fd9de693 (diff) | |
main/audacious: upgrade to 3.2.2
Diffstat (limited to 'main/audacious')
| -rw-r--r-- | main/audacious/APKBUILD | 29 | ||||
| -rw-r--r-- | main/audacious/audacious-3.2.2-fix-build-gmodule.patch | 51 |
2 files changed, 75 insertions, 5 deletions
diff --git a/main/audacious/APKBUILD b/main/audacious/APKBUILD index 93ce5244301..51b8c09cbaa 100644 --- a/main/audacious/APKBUILD +++ b/main/audacious/APKBUILD @@ -1,25 +1,44 @@ # Contributor: William Pitcock <nenolod@dereferenced.org> # Maintainer: William Pitcock <nenolod@dereferenced.org> pkgname=audacious -pkgver=3.2 -pkgrel=1 +pkgver=3.2.2 +pkgrel=0 pkgdesc="playlist-oriented media player with multiple interfaces" url="http://audacious-media-player.org/" arch="all" license="ISC" depends= depends_dev="libmowgli-dev libmcs-dev gtk+-dev dbus-glib-dev" -makedepends="$depends_dev libguess-dev libxml2-dev" +makedepends="$depends_dev libguess-dev libxml2-dev autoconf automake" install= subpackages="$pkgname-dev $pkgname-lang" -source="http://distfiles.audacious-media-player.org/$pkgname-$pkgver.tar.gz" +source="http://distfiles.audacious-media-player.org/$pkgname-$pkgver.tar.gz + audacious-3.2.2-fix-build-gmodule.patch + " source /usr/share/abuildhelper/rules/base.sh +_builddir="$srcdir"/$pkgname-$pkgver +prepare() { + cd "$_builddir" + + for i in $source; do + case $i in + *.patch) + msg "Applying $i..." + patch -s -p1 -N -i "$srcdir"/$i || return 1 + ;; + esac + done + + msg "Rebuilding configure..." + aclocal -I m4 && autoheader && autoconf || return 1 +} using autotools using makeinstall using plugin atheme-buildsys ac_enable_opt chardet -md5sums="7ee79d8314104534cf1c66c8c212515b audacious-3.2.tar.gz" +md5sums="e7b1fc6eaf2acfcceb77ba8c98d113ee audacious-3.2.2.tar.gz +7abde75797b18a2f9a3177027787213f audacious-3.2.2-fix-build-gmodule.patch" diff --git a/main/audacious/audacious-3.2.2-fix-build-gmodule.patch b/main/audacious/audacious-3.2.2-fix-build-gmodule.patch new file mode 100644 index 00000000000..587b68fa1a4 --- /dev/null +++ b/main/audacious/audacious-3.2.2-fix-build-gmodule.patch @@ -0,0 +1,51 @@ +commit 7b68fdab1dbd2ec3e8eeb37a7a0837d4d0e20851 +Author: John Lindgren <john.lindgren@aol.com> +Date: Mon Apr 2 16:50:39 2012 -0400 + + Use GMODULE_{CFLAGS,LIBS}. + +diff --git a/acinclude.m4 b/acinclude.m4 +index 6f6f293..5acb6b7 100644 +--- a/acinclude.m4 ++++ b/acinclude.m4 +@@ -194,6 +194,7 @@ AC_PATH_PROG([WINDRES], [windres]) + dnl Check for Gtk+/GLib and pals + dnl ============================ + AUD_CHECK_MODULE([GLIB], [glib-2.0], [>= 2.16], [Glib2]) ++AUD_CHECK_MODULE([GMODULE], [gmodule-2.0], [>= 2.16], [GModule]) + AUD_CHECK_MODULE([GTHREAD], [gthread-2.0], [>= 2.16], [GThread]) + AUD_CHECK_MODULE([PANGO], [pango], [>= 1.20], [Pango]) + AUD_CHECK_MODULE([CAIRO], [cairo], [>= 1.6], [Cairo]) +diff --git a/extra.mk.in b/extra.mk.in +index 464bbb0..1ff2a08 100644 +--- a/extra.mk.in ++++ b/extra.mk.in +@@ -21,6 +21,8 @@ DBUS_CFLAGS ?= @DBUS_CFLAGS@ + DBUS_LIBS ?= @DBUS_LIBS@ + GLIB_CFLAGS ?= @GLIB_CFLAGS@ + GLIB_LIBS ?= @GLIB_LIBS@ ++GMODULE_CFLAGS ?= @GMODULE_CFLAGS@ ++GMODULE_LIBS ?= @GMODULE_LIBS@ + GTHREAD_CFLAGS ?= @GTHREAD_CFLAGS@ + GTHREAD_LIBS ?= @GTHREAD_LIBS@ + GTK_CFLAGS ?= @GTK_CFLAGS@ +diff --git a/src/audacious/Makefile b/src/audacious/Makefile +index ea95c85..22dad64 100644 +--- a/src/audacious/Makefile ++++ b/src/audacious/Makefile +@@ -99,6 +99,7 @@ pre-depend: ${DBUS_BINDINGS} + CPPFLAGS := -I.. -I../.. \ + ${CPPFLAGS} \ + ${GLIB_CFLAGS} \ ++ ${GMODULE_LIBS} \ + ${GTHREAD_CFLAGS} \ + ${GTK_CFLAGS} \ + ${AUDACIOUS_DEFINES} \ +@@ -119,6 +120,7 @@ LIBS := -L../libaudcore -laudcore \ + ${LIBINTL} \ + ${EGGSM_LIBS} \ + ${GLIB_LIBS} \ ++ ${GMODULE_LIBS} \ + ${GTHREAD_LIBS} \ + ${GTK_LIBS} \ + ${DBUS_LIBS} \ |