diff options
| author | oliver <oliver@FreeBSD.org> | 2014-06-21 15:09:24 +0000 |
|---|---|---|
| committer | oliver <oliver@FreeBSD.org> | 2014-06-21 15:09:24 +0000 |
| commit | af7410e2d474af6ea4cc106677d1ec19ef14b351 (patch) | |
| tree | 19ae13b84216379f341c91cc5367458bdb02ab30 /multimedia/audacious/files | |
| parent | 892d2a00a6224b995d1bff8449893e95dc6ca882 (diff) | |
| download | FreeBSD-ports-af7410e2d474af6ea4cc106677d1ec19ef14b351.zip FreeBSD-ports-af7410e2d474af6ea4cc106677d1ec19ef14b351.tar.gz | |
update audacious to 3.5
audclient got removed upstream so this breaks some ports
Diffstat (limited to 'multimedia/audacious/files')
4 files changed, 44 insertions, 36 deletions
diff --git a/multimedia/audacious/files/patch-extra.mk.in b/multimedia/audacious/files/patch-extra.mk.in index 552b765..4030d20 100644 --- a/multimedia/audacious/files/patch-extra.mk.in +++ b/multimedia/audacious/files/patch-extra.mk.in @@ -1,7 +1,7 @@ ---- extra.mk.in.orig 2012-10-28 10:46:45.000000000 +0100 -+++ extra.mk.in 2012-10-28 10:47:04.000000000 +0100 -@@ -31,3 +31,4 @@ +--- extra.mk.in.orig 2014-06-19 16:24:45.729557751 +0200 ++++ extra.mk.in 2014-06-19 16:24:25.930403218 +0200 +@@ -12,3 +12,4 @@ + GTK_LIBS ?= @GTK_LIBS@ + LIBGUESS_CFLAGS ?= @LIBGUESS_CFLAGS@ LIBGUESS_LIBS ?= @LIBGUESS_LIBS@ - REGEX_CFLAGS ?= @REGEX_CFLAGS@ - REGEX_LIBS ?= @REGEX_LIBS@ +LIBINTL ?= @LIBINTL@ diff --git a/multimedia/audacious/files/patch-src-audacious-output.c b/multimedia/audacious/files/patch-src-audacious-output.c deleted file mode 100644 index 0809686..0000000 --- a/multimedia/audacious/files/patch-src-audacious-output.c +++ /dev/null @@ -1,10 +0,0 @@ ---- src/audacious/output.c.orig 2012-10-28 10:48:02.000000000 +0100 -+++ src/audacious/output.c 2012-10-28 10:48:15.000000000 +0100 -@@ -24,6 +24,7 @@ - #include <unistd.h> - - #include <libaudcore/hook.h> -+#include <libaudcore/audio.h> - - #include "debug.h" - #include "effect.h" diff --git a/multimedia/audacious/files/patch-src-audacious-util.c b/multimedia/audacious/files/patch-src-audacious-util.c index 8394976..8e01741 100644 --- a/multimedia/audacious/files/patch-src-audacious-util.c +++ b/multimedia/audacious/files/patch-src-audacious-util.c @@ -1,14 +1,33 @@ ---- src/audacious/util.c.orig 2011-11-08 17:37:12.000000000 +0100 -+++ src/audacious/util.c 2011-11-23 20:49:18.000000000 +0100 -@@ -142,9 +142,9 @@ +--- src/audacious/util.c.orig 2014-04-23 04:36:33.000000000 +0200 ++++ src/audacious/util.c 2014-06-19 23:47:29.000000000 +0200 +@@ -35,6 +35,9 @@ + + #include <libaudcore/audstrings.h> + ++#include <sys/types.h> ++#include <sys/sysctl.h> ++ + #include "debug.h" + #include "i18n.h" + #include "misc.h" +@@ -212,7 +215,19 @@ return NULL; - } + } #else -- if ((len = readlink ("/proc/self/exe", buf, size)) < 0) -+ if ((len = readlink ("/proc/curproc/file", buf, size)) < 0) - { -- fprintf (stderr, "Cannot access /proc/self/exe: %s.\n", strerror (errno)); -+ fprintf (stderr, "Cannot access /proc/curproc/file: %s.\n", strerror (errno)); - g_free (buf); - return NULL; - } +- return NULL; ++ char path[PATH_MAX + 1]; ++ size_t len = PATH_MAX + 1; ++ int mib[4]; ++ ++ mib[0] = CTL_KERN; ++ mib[1] = KERN_PROC; ++ mib[2] = KERN_PROC_PATHNAME; ++ mib[3] = -1; ++ ++ if (sysctl(mib, 4, &path, &len, NULL, 0) != 0) ++ return NULL; ++ ++ return str_get (path); + #endif + } + diff --git a/multimedia/audacious/files/patch-src_audtool_Makefile b/multimedia/audacious/files/patch-src_audtool_Makefile index f5ccdf7..a73a26e 100644 --- a/multimedia/audacious/files/patch-src_audtool_Makefile +++ b/multimedia/audacious/files/patch-src_audtool_Makefile @@ -1,9 +1,8 @@ ---- src/audtool/Makefile.orig 2012-05-07 10:04:29.639672532 +0300 -+++ src/audtool/Makefile 2012-05-07 10:04:45.691668909 +0300 -@@ -20,4 +20,5 @@ CPPFLAGS := -I.. -I../.. \ - LIBS := -L../libaudclient -laudclient \ - ${LIBS} \ - ${DBUS_LIBS} \ -- ${GTK_LIBS} -+ ${GTK_LIBS} \ -+ ${LIBINTL} +--- src/audtool/Makefile.orig 2014-06-19 16:33:05.570367015 +0200 ++++ src/audtool/Makefile 2014-06-19 16:33:24.317364894 +0200 +@@ -15,4 +15,4 @@ + include ../../extra.mk + + CPPFLAGS := -I../.. -I../dbus ${CPPFLAGS} ${GLIB_CFLAGS} ${GIO_CFLAGS} +-LIBS := ../dbus/aud-dbus.a ${LIBS} ${GLIB_LIBS} ${GIO_LIBS} ++LIBS := ../dbus/aud-dbus.a ${LIBS} ${GLIB_LIBS} ${GIO_LIBS} ${LIBINTL} |
