summaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
Diffstat (limited to 'main')
-rw-r--r--main/audacious-plugins/APKBUILD8
-rw-r--r--main/audacious-plugins/audacious-plugins-2.5.1-vorbis.patch54
-rw-r--r--main/audacious-plugins/audacious-plugins-3.2.2-fix-build-gmodule.patch31
-rw-r--r--main/audacious/audacious-3.2.2-fix-build-gmodule.patch51
4 files changed, 3 insertions, 141 deletions
diff --git a/main/audacious-plugins/APKBUILD b/main/audacious-plugins/APKBUILD
index d1fc5f7c5..61e3ebe70 100644
--- a/main/audacious-plugins/APKBUILD
+++ b/main/audacious-plugins/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: William Pitcock <nenolod@dereferenced.org>
# Maintainer: William Pitcock <nenolod@dereferenced.org>
pkgname=audacious-plugins
-pkgver=3.2.2
+pkgver=3.2.4
pkgrel=0
pkgdesc="playlist-oriented media player with multiple interfaces (plugins)"
url="http://audacious-media-player.org/"
@@ -49,8 +49,7 @@ makedepends="libmowgli-dev
autoconf"
install=
subpackages="$pkgname-lang"
-source="http://distfiles.audacious-media-player.org/$pkgname-$pkgver.tar.gz
- audacious-plugins-3.2.2-fix-build-gmodule.patch"
+source="http://distfiles.audacious-media-player.org/$pkgname-$pkgver.tar.gz"
_builddir="$srcdir"/$pkgname-$pkgver
@@ -89,5 +88,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-md5sums="a64657173cca404a8f0df51962fee287 audacious-plugins-3.2.2.tar.gz
-1d29a9e4a5e58b5ece4538f30d027279 audacious-plugins-3.2.2-fix-build-gmodule.patch"
+md5sums="47c2e19b1873501243c1158991f0b390 audacious-plugins-3.2.4.tar.gz"
diff --git a/main/audacious-plugins/audacious-plugins-2.5.1-vorbis.patch b/main/audacious-plugins/audacious-plugins-2.5.1-vorbis.patch
deleted file mode 100644
index 0e35adff3..000000000
--- a/main/audacious-plugins/audacious-plugins-2.5.1-vorbis.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 6ed2a39924b29f185e5a87bd8dccffaa0f1011ca Mon Sep 17 00:00:00 2001
-From: John Lindgren <john.lindgren@tds.net>
-Date: Wed, 08 Jun 2011 18:49:57 +0000
-Subject: vorbis: Patch from Michael Schwendt to fix crash on 32-bit systems. Closes: AUDPLUG-369.
-
----
-diff --git a/src/vorbis/vcedit.c b/src/vorbis/vcedit.c
-index 9dd6c01..dc14d2f 100644
---- a/src/vorbis/vcedit.c
-+++ b/src/vorbis/vcedit.c
-@@ -145,7 +145,7 @@ _fetch_next_packet(vcedit_state * s, ogg_packet * p, ogg_page * page)
- {
- int result;
- char *buffer;
-- int bytes;
-+ gint64 bytes;
-
- result = ogg_stream_packetout(s->os, p);
-
-@@ -189,7 +189,7 @@ vcedit_open_callbacks(vcedit_state * state, void *in,
- vcedit_write_func write_func)
- {
- char *buffer;
-- int bytes, i;
-+ gint64 bytes, i;
- ogg_packet *header;
- ogg_packet header_main;
- ogg_packet header_comments;
-@@ -317,7 +317,7 @@ vcedit_write(vcedit_state * state, void *out)
- ogg_int64_t granpos = 0;
- int result;
- char *buffer;
-- int bytes;
-+ gint64 bytes;
- int needflush = 0, needout = 0;
-
- state->eosin = 0;
-diff --git a/src/vorbis/vcedit.h b/src/vorbis/vcedit.h
-index 983a2ee..ea4432f 100644
---- a/src/vorbis/vcedit.h
-+++ b/src/vorbis/vcedit.h
-@@ -19,8 +19,8 @@ extern "C" {
- #include <vorbis/codec.h>
- #include <audacious/plugin.h>
-
--typedef size_t (*vcedit_read_func)(void *, size_t, size_t, void *);
--typedef size_t (*vcedit_write_func)(const void *, size_t, size_t, void *);
-+typedef gint64 (*vcedit_read_func)(void *, gint64, gint64, void *);
-+typedef gint64 (*vcedit_write_func)(const void *, gint64, gint64, void *);
-
- typedef struct {
- ogg_sync_state *oy;
---
-cgit v0.8.3.4
diff --git a/main/audacious-plugins/audacious-plugins-3.2.2-fix-build-gmodule.patch b/main/audacious-plugins/audacious-plugins-3.2.2-fix-build-gmodule.patch
deleted file mode 100644
index 2f06396e8..000000000
--- a/main/audacious-plugins/audacious-plugins-3.2.2-fix-build-gmodule.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-commit a29df1ab4ba9f3964ca475c0c727136357ddfb86
-Author: John Lindgren <john.lindgren@aol.com>
-Date: Mon Apr 2 02:10:32 2012 -0400
-
- Make check for GMODULE_{CFLAGS,LIBS} unconditional; LADSPA plugin needs it also.
-
-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/configure.ac b/configure.ac
-index d976576..358f841 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -757,8 +757,6 @@ fi
-
- if test "x$enable_amidiplug" = "xyes"; then
- INPUT_PLUGINS="$INPUT_PLUGINS amidi-plug"
-- PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.6.0],,)
-- PKG_CHECK_MODULES(GMODULE, [gmodule-2.0 >= 2.6.0],,)
- AMIDIPLUG_BACKEND_DIR=amidi-plug
- AC_SUBST(AMIDIPLUG_BACKEND_DIR)
- if test "x$enable_amidiplug_alsa" = "xauto" -o "x$enable_amidiplug_alsa" = "xyes"; then
diff --git a/main/audacious/audacious-3.2.2-fix-build-gmodule.patch b/main/audacious/audacious-3.2.2-fix-build-gmodule.patch
deleted file mode 100644
index 587b68fa1..000000000
--- a/main/audacious/audacious-3.2.2-fix-build-gmodule.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-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} \