BUILD_DEPENDS+=	scons:${PORTSDIR}/devel/scons

#EXTRA_PATCHES+=	${FILESDIR}/extraPatch-src::clients::faad::Plugin

pre-everything::

.if defined(WITH_SAMBA)

	@${ECHO_MSG} "WARNING: Samba plugin is experimental and not fully working"

	@${ECHO_MSG} ""

.endif

.if defined(WITH_GNOMEVFS)

	@${ECHO_MSG} "WARNING: Gnome VFS plugin is experimental and not fully working"

	@${ECHO_MSG} ""

.endif

.if defined(WITH_FAM)

	@${ECHO_MSG} "WARNING: Fam plugin is experimental and not fully working"

	@${ECHO_MSG} ""

.endif

# Nasty fulhack here to deal with java port. We're dealing with this issue

# in xmms2 upstream land, so it hopefully won't be a problem next release.

do-build:

	cd ${WRKSRC} && \

		${SETENV} JAVA_HOME=${JAVA_HOME} scons CC=${CC} LINKFLAGS="${LDFLAGS}" CCFLAGS="${CFLAGS}" \

		LIBPATH=${LOCALBASE}/lib CPPPATH=${LOCALBASE}/include \

		PKGCONFIGDIR=${PREFIX}/libdata/pkgconfig EXCLUDE="${EXCLUDE}" \

		PREFIX="${PREFIX}" ${SCONS_TARGET}

.if !defined(XMMS2_SLAVE)

do-install:

	@cd ${WRKSRC} && scons install

.endif

include/xmms2/xmms/xmms_decoder.h

include/xmms2/xmms/xmms_decoderplugin.h

include/xmms2/xmms/xmms_output.h

%%ECORE%%lib/libxmmsclient-ecore.a

%%ECORE%%lib/libxmmsclient-ecore.so

lib/xmms2/libxmms_m3u.so

lib/xmms2/libxmms_pls.so

--- src/clients/lib/java/callbacks.c.orig	Mon Mar 27 11:34:45 2006

+++ src/clients/lib/java/callbacks.c	Sat Apr  8 00:27:56 2006

@@ -38,11 +38,12 @@

 }

 void io_want_out_callback(int val, void *error){

+	jobject callbackObject;

 	JNIEnv *environment = checkEnv();  

 	if (environment == NULL)

 		return;

-	jobject callbackObject = (*environment)->NewLocalRef(environment, globalMainloopObj);

+	callbackObject = (*environment)->NewLocalRef(environment, globalMainloopObj);

 	if (io_want_out_mid == 0)

 		return;

@@ -117,6 +118,7 @@

 void callback_dict_foreach_function(const void *key, xmmsc_result_value_type_t type, const void *value, void *user_data){

 	jint jres_val = 0;

 	jstring jkey, jvalue;

+	jobject callbackObject;

 	JNIEnv *environment = checkEnv();

 	if (key == NULL || value == NULL) return;

@@ -124,7 +126,7 @@

 	if (environment == NULL)

 		return;

-	jobject callbackObject = (*environment)->NewLocalRef(environment, globalObj);

+	callbackObject = (*environment)->NewLocalRef(environment, globalObj);

 	if (dict_foreach_mid == 0)

 	        return;

@@ -138,13 +140,14 @@

 void callback_propdict_foreach_function(const void *key, xmmsc_result_value_type_t type, const void *value, const char *source, void *user_data){

 	jint jres_val = 0;

 	jstring jkey, jvalue, jsource;

+	jobject callbackObject;

 	JNIEnv *environment = checkEnv();

 	if (environment == NULL)

 		return;

 	if (key == NULL || value == NULL) return;

-	jobject callbackObject = (*environment)->NewLocalRef(environment, globalObj);   

+	callbackObject = (*environment)->NewLocalRef(environment, globalObj);   

 	if (propdict_foreach_mid == 0)

 	        return;

@@ -173,12 +176,13 @@

 void run_java_callback_result_void(xmmsc_result_t *res, jmethodID mid, void *user_data){

 	jlong jresult = 0;

+	jobject callbackObject;

 	JNIEnv *environment = checkEnv();

 	if (environment == NULL)

 		return;

-	jobject callbackObject = (*environment)->NewLocalRef(environment, globalObj);   

+	callbackObject = (*environment)->NewLocalRef(environment, globalObj);   

 	if (mid == 0)

 	        return;

@@ -188,10 +192,11 @@

 void run_java_callback_void(void *v, jmethodID mid){

 	JNIEnv *environment = checkEnv();

+	jobject callbackObject;

 	if (environment == NULL)

 		return;

-	jobject callbackObject = (*environment)->NewLocalRef(environment, globalObj);   

+	callbackObject = (*environment)->NewLocalRef(environment, globalObj);   

 	if (mid == 0)

         	return;

--- src/clients/lib/java/include/callbacks.h.orig	Mon Mar 27 11:34:45 2006

+++ src/clients/lib/java/include/callbacks.h	Sat Apr  8 00:27:56 2006

@@ -14,6 +14,13 @@

  *  Lesser General Public License for more details.

  */

+#ifndef __CALLBACKS_H__

+#define __CALLBACKS_H__

+

+#ifdef __cplusplus

+{

+#endif

+

 #include <xmmsclient/xmmsclient.h>

 #include <jni.h>

@@ -67,3 +74,8 @@

 extern void callback_dict_foreach_function(const void *key, xmmsc_result_value_type_t type, const void *value, void *user_data);

 extern void callback_propdict_foreach_function(const void *key, xmmsc_result_value_type_t type, const void *value, const char *source, void *user_data);

+#ifdef __cplusplus

+}

+#endif

+

+#endif

--- src/clients/lib/java/include/misc.h.orig	Mon Mar 27 11:34:45 2006

+++ src/clients/lib/java/include/misc.h	Sat Apr  8 00:27:56 2006

@@ -14,8 +14,21 @@

  *  Lesser General Public License for more details.

  */

+#ifndef __MISC_H__

+#define __MISC_H__

+

+#ifdef __cplusplus

+{

+#endif

+

 #include <xmmsclient/xmmsclient.h>

 #include <jni.h>

 extern xmmsc_result_t* getResultFromPointer(jlong val);

 extern jlong getPointerToConnection(xmmsc_connection_t *c);

+

+#ifdef __cplusplus

+}

+#endif

+

+#endif

--- src/clients/lib/java/misc.c.orig	Mon Mar 27 11:34:45 2006

+++ src/clients/lib/java/misc.c	Sat Apr  8 00:27:56 2006

@@ -37,11 +37,12 @@

 }

 JNIEXPORT void JNICALL Java_org_xmms2_SpecialJNI_setENV(JNIEnv *jenv, jclass cls, jobject myobject){

+	jclass clazz;

 	globalObj = (*jenv)->NewGlobalRef(jenv, myobject);

 	if (jvm == NULL)

 		(*jenv)->GetJavaVM(jenv,&jvm);

-	jclass clazz = (*jenv)->GetObjectClass(jenv, myobject);

+	clazz = (*jenv)->GetObjectClass(jenv, myobject);

 	disconnect_mid = get_method_id("callbackDisconnect", "(I)V", jenv, clazz);

 	lock_mid = get_method_id("lockFunction", "(I)V", jenv, clazz);

 	unlock_mid = get_method_id("unlockFunction", "(I)V", jenv, clazz);

@@ -71,13 +72,14 @@

 JNIEXPORT void JNICALL Java_org_xmms2_SpecialJNI_setupMainloop(JNIEnv *jenv, jclass cls, jobject myobject, jlong jarg1){

 	xmmsc_connection_t *conn_ptr = (xmmsc_connection_t *) 0;

+	jclass clazz;

 	conn_ptr = *(xmmsc_connection_t **)(void *)&jarg1;

 	globalMainloopObj = (*jenv)->NewGlobalRef(jenv, myobject);

 	if (jvm == NULL)

 		(*jenv)->GetJavaVM(jenv,&jvm);

-	jclass clazz = (*jenv)->GetObjectClass(jenv, myobject);

+	clazz = (*jenv)->GetObjectClass(jenv, myobject);

 	io_want_out_mid = get_method_id("callbackIOWantOut", "(II)V", jenv, clazz);

 	//xmmsc_io_need_out_callback_set(conn_ptr, io_want_out_callback, 0);

--- src/clients/lib/python/xmmsclient.pyx.orig	Tue May 23 01:02:46 2006

+++ src/clients/lib/python/xmmsclient.pyx	Tue May 23 01:03:14 2006

@@ -273,7 +273,8 @@

 						if k[1] == item:

 							return v

 				try:

-					return dict.__getitem__(self, (src, item))

+					x = dict.__getitem__(self, (src, item))

+					return x

 				except KeyError:

 					pass

 			raise KeyError, item

--- 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>

--- src/plugins/faad/Plugin.orig	Tue Dec 20 01:09:13 2005

+++ src/plugins/faad/Plugin	Tue Dec 20 01:09:48 2005

@@ -12,12 +12,7 @@

 	This function should return True if this module

 	is to be built otherwise False

 	"""

-	try:

-		env.checklib("faad", "faacDecInit2")

-	except ConfigError:

-		env.checklib("faad", "NeAACDecInit2")

-	except ConfigError:

-		raise ConfigError("Could not find libfaad")

+	env.Append (LIBS=["faad"])

 	env.Append (CCFLAGS = '-DUSE_TAGGING')

--- src/xmms/ipc.c.orig	Sat Apr  1 23:59:54 2006

+++ src/xmms/ipc.c	Sun Apr  2 00:00:09 2006

@@ -795,8 +795,8 @@

 xmms_ipc_shutdown_server(xmms_ipc_t *ipc) 

 {

 	GList *c;

-	if(!ipc) return;

 	xmms_ipc_client_t *co;

+	if(!ipc) return;

 	g_mutex_lock (ipc->mutex_lock);

 	g_source_remove_poll (ipc->source, ipc->pollfd);