diff options
| author | Edwin Groothuis <edwin@FreeBSD.org> | 2006-04-02 06:55:41 +0000 |
|---|---|---|
| committer | Edwin Groothuis <edwin@FreeBSD.org> | 2006-04-02 06:55:41 +0000 |
| commit | b77f6c7da9f669e0b1dabfcee8c935cc8d895bef (patch) | |
| tree | c1b1973484f786a34ca1d9c9a0e7f329755d2af2 /audio/xmms2 | |
| parent | [PATCH] audio/libofa: fix expat build issue (diff) | |
[PATCH] audio/xmms2: Lots of cleanup
Lots of general cleanup, especially to unbreak things for the slaveports
- unbreak sdl-vis
- make it so slaves don't need to have the dependencies required for xmm
s2d
Added file(s):
- files/patch-src_clients_sdl-vis_sdl-vis.c
- files/patch-src_xmms_Program
PR: ports/95216
Submitted by: Alexander Botero-Lowry <alex@foxybanana.com>
Diffstat (limited to 'audio/xmms2')
| -rw-r--r-- | audio/xmms2/Makefile | 5 | ||||
| -rw-r--r-- | audio/xmms2/files/patch-src_clients_sdl-vis_sdl-vis.c | 13 | ||||
| -rw-r--r-- | audio/xmms2/files/patch-src_xmms_Program | 17 | ||||
| -rw-r--r-- | audio/xmms2/pkg-plist | 3 |
4 files changed, 34 insertions, 4 deletions
diff --git a/audio/xmms2/Makefile b/audio/xmms2/Makefile index bfd7663fac6e..3cd03ccc8906 100644 --- a/audio/xmms2/Makefile +++ b/audio/xmms2/Makefile @@ -7,15 +7,18 @@ PORTNAME= xmms2 PORTVERSION= 0.2.d.4 +PORTREVISION= 1 CATEGORIES= audio MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} DISTNAME= ${PORTNAME}-0.2DrDolittle MAINTAINER= alex@foxybanana.com +.if !defined(XMMS2_SLAVE) COMMENT= Rewrite of xmms as a client/server system (developer release) +.endif -BUILD_DEPENDS= scons:${PORTSDIR}/devel/scons +BUILD_DEPENDS+= scons:${PORTSDIR}/devel/scons .if !defined(XMMS2_SLAVE) LIB_DEPENDS= mad.2:${PORTSDIR}/audio/libmad \ vorbis.3:${PORTSDIR}/audio/libvorbis diff --git a/audio/xmms2/files/patch-src_clients_sdl-vis_sdl-vis.c b/audio/xmms2/files/patch-src_clients_sdl-vis_sdl-vis.c new file mode 100644 index 000000000000..dacc6daa4095 --- /dev/null +++ b/audio/xmms2/files/patch-src_clients_sdl-vis_sdl-vis.c @@ -0,0 +1,13 @@ +--- src/clients/sdl-vis/sdl-vis.c Mon Mar 27 11:34:45 2006 ++++ src/clients/sdl-vis/sdl-vis.c.orig Sat Apr 1 18:21:01 2006 +@@ -27,8 +27,8 @@ + #define FFT_BITS 10 + #define FFT_LEN (1<<FFT_BITS) + +-#include <SDL/SDL.h> +-#include <SDL/SDL_ttf.h> ++#include <SDL.h> ++#include <SDL_ttf.h> + #include <glib.h> + #include <math.h> + #include <stdlib.h> diff --git a/audio/xmms2/files/patch-src_xmms_Program b/audio/xmms2/files/patch-src_xmms_Program new file mode 100644 index 000000000000..dc34a318ab6d --- /dev/null +++ b/audio/xmms2/files/patch-src_xmms_Program @@ -0,0 +1,17 @@ +--- src/xmms/Program.orig Sat Apr 1 17:55:42 2006 ++++ src/xmms/Program Sat Apr 1 17:55:56 2006 +@@ -29,10 +29,10 @@ + env.Append(LIBS=['xmmsipc']) + env.Append(LIBS=["xmmssocket"]) + env.Append(CPPPATH=["#src/includepriv"]) +- env.pkgconfig("glib-2.0 >= 2.6.0", fail=True) +- env.pkgconfig("gmodule-2.0", fail=True) +- env.pkgconfig("gthread-2.0", fail=True) +- env.pkgconfig("sqlite3", fail=True) ++ env.pkgconfig("glib-2.0 >= 2.6.0") ++ env.pkgconfig("gmodule-2.0") ++ env.pkgconfig("gthread-2.0") ++ env.pkgconfig("sqlite3") + + if env.platform != 'win32': + env.checklib("m", "sin", fail=True) diff --git a/audio/xmms2/pkg-plist b/audio/xmms2/pkg-plist index b9db608da016..26364e97ff3d 100644 --- a/audio/xmms2/pkg-plist +++ b/audio/xmms2/pkg-plist @@ -45,9 +45,6 @@ lib/libxmmsclient-glib.a lib/libxmmsclient-glib.so lib/libxmmsclient.a lib/libxmmsclient.so -%%PYTHON%%%%PYTHON_SITELIBDIR%%/xmmsclient.so -%%RUBY%%%%RUBY_SITELIBDIR%%/xmmsclient_glib.so -%%RUBY%%%%RUBY_SITELIBDIR%%/xmmsclient.so %%CURL%%lib/xmms2/libxmms_curl_http.so lib/xmms2/libxmms_diskwrite.so lib/xmms2/libxmms_eq.so |