Attachment #64170 for bug #95496

Lines 7-13 Link Here

(-)/usr/local/tinderbox/portstrees/FreeBSD/ports/audio/xmms2/Makefile (-3 / +7 lines)
7		7
8	PORTNAME= xmms2	8	PORTNAME= xmms2
9	PORTVERSION= 0.2.d.4	9	PORTVERSION= 0.2.d.4
10	PORTREVISION= 2	10	PORTREVISION= 3
11	CATEGORIES= audio	11	CATEGORIES= audio
12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
13	MASTER_SITE_SUBDIR= ${PORTNAME}	13	MASTER_SITE_SUBDIR= ${PORTNAME}
Lines 42-49 Link Here
42	MANCOMPRESSED= yes	42	MANCOMPRESSED= yes
43	.endif	43	.endif
44		44
45	DATADIR= share/xmms2
46
47	SCONS_TARGET?=	45	SCONS_TARGET?=
48		46
49	.if defined(WITH_CURL)	47	.if defined(WITH_CURL)
Lines 165-170 Link Here
165	.endif	163	.endif
166		164
167	.include <bsd.port.pre.mk>	165	.include <bsd.port.pre.mk>
		166
		167	.if defined(XMMS2_SLAVE) && ${XMMS2_SLAVE} != "java"
		168	.if ${OSVERSION} < 500000
		169	BROKEN= Broken on FreeBSD 4.x
		170	.endif
		171	.endif
168		172
169	pre-everything::	173	pre-everything::
170	.if defined(WITH_SAMBA)	174	.if defined(WITH_SAMBA)




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

Return to bug 95496

Line 0 Link Here

(-)/usr/local/tinderbox/portstrees/FreeBSD/ports/audio/xmms2/files/patch-src_clients_lib_java_callbacks.c (+77 lines)
		1	--- src/clients/lib/java/callbacks.c.orig Mon Mar 27 11:34:45 2006
		2	+++ src/clients/lib/java/callbacks.c Sat Apr 8 00:27:56 2006
		3	@@ -38,11 +38,12 @@
		4	}
		5
		6	void io_want_out_callback(int val, void *error){
		7	+ jobject callbackObject;
		8	JNIEnv *environment = checkEnv();
		9	if (environment == NULL)
		10	return;
		11
		12	- jobject callbackObject = (*environment)->NewLocalRef(environment, globalMainloopObj);
		13	+ callbackObject = (*environment)->NewLocalRef(environment, globalMainloopObj);
		14	if (io_want_out_mid == 0)
		15	return;
		16
		17	@@ -117,6 +118,7 @@
		18	void callback_dict_foreach_function(const void key, xmmsc_result_value_type_t type, const void value, void *user_data){
		19	jint jres_val = 0;
		20	jstring jkey, jvalue;
		21	+ jobject callbackObject;
		22	JNIEnv *environment = checkEnv();
		23
		24	if (key == NULL \|\| value == NULL) return;
		25	@@ -124,7 +126,7 @@
		26	if (environment == NULL)
		27	return;
		28
		29	- jobject callbackObject = (*environment)->NewLocalRef(environment, globalObj);
		30	+ callbackObject = (*environment)->NewLocalRef(environment, globalObj);
		31	if (dict_foreach_mid == 0)
		32	return;
		33
		34	@@ -138,13 +140,14 @@
		35	void callback_propdict_foreach_function(const void key, xmmsc_result_value_type_t type, const void value, const char source, void user_data){
		36	jint jres_val = 0;
		37	jstring jkey, jvalue, jsource;
		38	+ jobject callbackObject;
		39	JNIEnv *environment = checkEnv();
		40	if (environment == NULL)
		41	return;
		42
		43	if (key == NULL \|\| value == NULL) return;
		44
		45	- jobject callbackObject = (*environment)->NewLocalRef(environment, globalObj);
		46	+ callbackObject = (*environment)->NewLocalRef(environment, globalObj);
		47	if (propdict_foreach_mid == 0)
		48	return;
		49
		50	@@ -173,12 +176,13 @@
		51
		52	void run_java_callback_result_void(xmmsc_result_t res, jmethodID mid, void user_data){
		53	jlong jresult = 0;
		54	+ jobject callbackObject;
		55	JNIEnv *environment = checkEnv();
		56
		57	if (environment == NULL)
		58	return;
		59
		60	- jobject callbackObject = (*environment)->NewLocalRef(environment, globalObj);
		61	+ callbackObject = (*environment)->NewLocalRef(environment, globalObj);
		62	if (mid == 0)
		63	return;
		64
65	@@ -188,10 +192,11 @@
66
67	void run_java_callback_void(void *v, jmethodID mid){
68	JNIEnv *environment = checkEnv();
69	+ jobject callbackObject;
70	if (environment == NULL)
71	return;
72
73	- jobject callbackObject = (*environment)->NewLocalRef(environment, globalObj);
74	+ callbackObject = (*environment)->NewLocalRef(environment, globalObj);
75	if (mid == 0)
76	return;
77

Line 0 Link Here

(-)/usr/local/tinderbox/portstrees/FreeBSD/ports/audio/xmms2/files/patch-src_clients_lib_java_include_callbacks.h (+25 lines)
	1	--- src/clients/lib/java/include/callbacks.h.orig Mon Mar 27 11:34:45 2006
	2	+++ src/clients/lib/java/include/callbacks.h Sat Apr 8 00:27:56 2006
	3	@@ -14,6 +14,13 @@
	4	* Lesser General Public License for more details.
	5	*/
	6
	7	+#ifndef __CALLBACKS_H__
	8	+#define __CALLBACKS_H__
	9	+
	10	+#ifdef __cplusplus
	11	+{
	12	+#endif
	13	+
	14	#include <xmmsclient/xmmsclient.h>
	15	#include <jni.h>
	16
	17	@@ -67,3 +74,8 @@
	18	extern void callback_dict_foreach_function(const void key, xmmsc_result_value_type_t type, const void value, void *user_data);
	19	extern void callback_propdict_foreach_function(const void key, xmmsc_result_value_type_t type, const void value, const char source, void user_data);
	20
	21	+#ifdef __cplusplus
	22	+}
	23	+#endif
	24	+
	25	+#endif

Line 0 Link Here

(-)/usr/local/tinderbox/portstrees/FreeBSD/ports/audio/xmms2/files/patch-src_clients_lib_java_include_misc.h (+24 lines)
	1	--- src/clients/lib/java/include/misc.h.orig Mon Mar 27 11:34:45 2006
	2	+++ src/clients/lib/java/include/misc.h Sat Apr 8 00:27:56 2006
	3	@@ -14,8 +14,21 @@
	4	* Lesser General Public License for more details.
	5	*/
	6
	7	+#ifndef __MISC_H__
	8	+#define __MISC_H__
	9	+
	10	+#ifdef __cplusplus
	11	+{
	12	+#endif
	13	+
	14	#include <xmmsclient/xmmsclient.h>
	15	#include <jni.h>
	16
	17	extern xmmsc_result_t* getResultFromPointer(jlong val);
	18	extern jlong getPointerToConnection(xmmsc_connection_t *c);
	19	+
	20	+#ifdef __cplusplus
	21	+}
	22	+#endif
	23	+
	24	+#endif

Line 0 Link Here

(-)/usr/local/tinderbox/portstrees/FreeBSD/ports/audio/xmms2/files/patch-src_clients_lib_java_misc.c (+32 lines)
	1	--- src/clients/lib/java/misc.c.orig Mon Mar 27 11:34:45 2006
	2	+++ src/clients/lib/java/misc.c Sat Apr 8 00:27:56 2006
	3	@@ -37,11 +37,12 @@
	4	}
	5
	6	JNIEXPORT void JNICALL Java_org_xmms2_SpecialJNI_setENV(JNIEnv *jenv, jclass cls, jobject myobject){
	7	+ jclass clazz;
	8	globalObj = (*jenv)->NewGlobalRef(jenv, myobject);
	9	if (jvm == NULL)
	10	(*jenv)->GetJavaVM(jenv,&jvm);
	11
	12	- jclass clazz = (*jenv)->GetObjectClass(jenv, myobject);
	13	+ clazz = (*jenv)->GetObjectClass(jenv, myobject);
	14	disconnect_mid = get_method_id("callbackDisconnect", "(I)V", jenv, clazz);
	15	lock_mid = get_method_id("lockFunction", "(I)V", jenv, clazz);
	16	unlock_mid = get_method_id("unlockFunction", "(I)V", jenv, clazz);
	17	@@ -71,13 +72,14 @@
	18
	19	JNIEXPORT void JNICALL Java_org_xmms2_SpecialJNI_setupMainloop(JNIEnv *jenv, jclass cls, jobject myobject, jlong jarg1){
	20	xmmsc_connection_t conn_ptr = (xmmsc_connection_t ) 0;
	21	+ jclass clazz;
	22	conn_ptr = (xmmsc_connection_t )(void )&jarg1;
	23	globalMainloopObj = (*jenv)->NewGlobalRef(jenv, myobject);
	24
	25	if (jvm == NULL)
	26	(*jenv)->GetJavaVM(jenv,&jvm);
	27
	28	- jclass clazz = (*jenv)->GetObjectClass(jenv, myobject);
	29	+ clazz = (*jenv)->GetObjectClass(jenv, myobject);
	30	io_want_out_mid = get_method_id("callbackIOWantOut", "(II)V", jenv, clazz);
	31
	32	//xmmsc_io_need_out_callback_set(conn_ptr, io_want_out_callback, 0);