Date: Sat, 8 Apr 2006 20:40:23 GMT From: Alexander Botero-Lowry <alex@foxybanana.com> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/95496: [PATCH] audio/xmms2: mark slave ports BROKEN; general cleanup Message-ID: <200604082040.k38KeNrD025234@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/95496; it has been noted by GNATS.
From: Alexander Botero-Lowry <alex@foxybanana.com>
To: freebsd-ports-bugs@FreeBSD.org, FreeBSD-gnats-submit@FreeBSD.org,
alex@foxybanana.com
Cc:
Subject: Re: ports/95496: [PATCH] audio/xmms2: mark slave ports BROKEN;
general cleanup
Date: Sat, 08 Apr 2006 13:29:34 -0700
This is a multi-part message in MIME format.
--=_44381d2e.q+vlBUyWGo6/uUvgSrT++2naPmCObcFY6imzeejCffuV5tvm
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
Attached are two patches, they should go instead of the patch included in the inital PR.
The first patch goes against audio/java-xmms2 and makes it use INSTALL_DATA for the jar file
the second patch goes against audio/xmms2 and includes the patches needed to make the java bindings compiler on 4.x
FreeBSD-gnats-submit@FreeBSD.org wrote:
> Thank you very much for your problem report.
> It has the internal identification `ports/95496'.
> The individual assigned to look at your
> report is: freebsd-ports-bugs.
>
> You can access the state of your problem report at any time
> via this link:
>
> http://www.freebsd.org/cgi/query-pr.cgi?pr=95496
>
> >Category: ports
> >Responsible: freebsd-ports-bugs
> >Synopsis: [PATCH] audio/xmms2: mark slave ports BROKEN; general cleanup
> >Arrival-Date: Fri Apr 07 22:50:11 GMT 2006
>
> !DSPAM:4,4436ecac220991682211466!
>
--=_44381d2e.q+vlBUyWGo6/uUvgSrT++2naPmCObcFY6imzeejCffuV5tvm
Content-Type: text/plain;
charset=us-ascii
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
filename="java-diff.patch"
===> Generating patch
===> Viewing diff with more
diff -ruN --exclude=CVS /usr/ports/audio/java-xmms2/Makefile /usr/local/tinderbox/portstrees/FreeBSD/ports/audio/java-xmms2/Makefile
--- /usr/ports/audio/java-xmms2/Makefile Tue Apr 4 18:28:39 2006
+++ /usr/local/tinderbox/portstrees/FreeBSD/ports/audio/java-xmms2/Makefile Sat Apr 8 13:17:38 2006
@@ -27,7 +27,7 @@
XMMS2_SLAVE= java
do-install:
- @cd ${WRKSRC} && ${INSTALL_PROGRAM} src/clients/lib/java/xmms2java.jar \
+ @cd ${WRKSRC} && ${INSTALL_DATA} src/clients/lib/java/xmms2java.jar \
${JAVAJARDIR}/xmms2java.jar
.include "${MASTERDIR}/Makefile"
===> Done
--=_44381d2e.q+vlBUyWGo6/uUvgSrT++2naPmCObcFY6imzeejCffuV5tvm
Content-Type: text/plain;
charset=us-ascii
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
filename="xmms2-0.2.d.4_3.patch"
diff -ruN --exclude=CVS /usr/ports/audio/xmms2/Makefile /usr/local/tinderbox/portstrees/FreeBSD/ports/audio/xmms2/Makefile
--- /usr/ports/audio/xmms2/Makefile Fri Apr 7 02:40:18 2006
+++ /usr/local/tinderbox/portstrees/FreeBSD/ports/audio/xmms2/Makefile Sat Apr 8 02:55:56 2006
@@ -7,7 +7,7 @@
PORTNAME= xmms2
PORTVERSION= 0.2.d.4
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -42,8 +42,6 @@
MANCOMPRESSED= yes
.endif
-DATADIR= share/xmms2
-
SCONS_TARGET?=
.if defined(WITH_CURL)
@@ -165,6 +163,12 @@
.endif
.include <bsd.port.pre.mk>
+
+.if defined(XMMS2_SLAVE) && ${XMMS2_SLAVE} != "java"
+.if ${OSVERSION} < 500000
+BROKEN= Broken on FreeBSD 4.x
+.endif
+.endif
pre-everything::
.if defined(WITH_SAMBA)
diff -ruN --exclude=CVS /usr/ports/audio/xmms2/files/patch-src_clients_lib_java_callbacks.c /usr/local/tinderbox/portstrees/FreeBSD/ports/audio/xmms2/files/patch-src_clients_lib_java_callbacks.c
--- /usr/ports/audio/xmms2/files/patch-src_clients_lib_java_callbacks.c Wed Dec 31 16:00:00 1969
+++ /usr/local/tinderbox/portstrees/FreeBSD/ports/audio/xmms2/files/patch-src_clients_lib_java_callbacks.c Sat Apr 8 00:35:42 2006
@@ -0,0 +1,77 @@
+--- 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;
+
diff -ruN --exclude=CVS /usr/ports/audio/xmms2/files/patch-src_clients_lib_java_include_callbacks.h /usr/local/tinderbox/portstrees/FreeBSD/ports/audio/xmms2/files/patch-src_clients_lib_java_include_callbacks.h
--- /usr/ports/audio/xmms2/files/patch-src_clients_lib_java_include_callbacks.h Wed Dec 31 16:00:00 1969
+++ /usr/local/tinderbox/portstrees/FreeBSD/ports/audio/xmms2/files/patch-src_clients_lib_java_include_callbacks.h Sat Apr 8 00:35:42 2006
@@ -0,0 +1,25 @@
+--- 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
diff -ruN --exclude=CVS /usr/ports/audio/xmms2/files/patch-src_clients_lib_java_include_misc.h /usr/local/tinderbox/portstrees/FreeBSD/ports/audio/xmms2/files/patch-src_clients_lib_java_include_misc.h
--- /usr/ports/audio/xmms2/files/patch-src_clients_lib_java_include_misc.h Wed Dec 31 16:00:00 1969
+++ /usr/local/tinderbox/portstrees/FreeBSD/ports/audio/xmms2/files/patch-src_clients_lib_java_include_misc.h Sat Apr 8 00:35:42 2006
@@ -0,0 +1,24 @@
+--- 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
diff -ruN --exclude=CVS /usr/ports/audio/xmms2/files/patch-src_clients_lib_java_misc.c /usr/local/tinderbox/portstrees/FreeBSD/ports/audio/xmms2/files/patch-src_clients_lib_java_misc.c
--- /usr/ports/audio/xmms2/files/patch-src_clients_lib_java_misc.c Wed Dec 31 16:00:00 1969
+++ /usr/local/tinderbox/portstrees/FreeBSD/ports/audio/xmms2/files/patch-src_clients_lib_java_misc.c Sat Apr 8 00:35:42 2006
@@ -0,0 +1,32 @@
+--- 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);
--=_44381d2e.q+vlBUyWGo6/uUvgSrT++2naPmCObcFY6imzeejCffuV5tvm--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200604082040.k38KeNrD025234>