Index: head/audio/xmms2/Makefile =================================================================== --- head/audio/xmms2/Makefile (revision 159188) +++ head/audio/xmms2/Makefile (revision 159189) @@ -1,198 +1,202 @@ # New ports collection makefile for: xmms2 # Date created: 20 May 2005 # Whom: Alexander Botero-Lowry # # $FreeBSD$ # PORTNAME= xmms2 PORTVERSION= 0.2.d.4 -PORTREVISION= 2 +PORTREVISION= 3 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 .if !defined(XMMS2_SLAVE) LIB_DEPENDS= mad.2:${PORTSDIR}/audio/libmad \ vorbis.3:${PORTSDIR}/audio/libvorbis .endif WRKSRC= ${WRKDIR}/${DISTNAME} USE_PYTHON_BUILD= yes USE_BZIP2= yes .if !defined(XMMS2_SLAVE) USE_GNOME= glib20 USE_SQLITE= 3 INSTALLS_SHLIB= yes .endif .if !defined(XMMS2_SLAVE) MAN1= xmms2.1 MAN8= xmms2d.8 MANCOMPRESSED= yes .endif -DATADIR= share/xmms2 - SCONS_TARGET?= .if defined(WITH_CURL) LIB_DEPENDS+= curl.3:${PORTSDIR}/ftp/curl PLIST_SUB+= CURL="" .else EXCLUDE+= curl PLIST_SUB+= CURL="@comment " .endif .if defined(WITH_SID) LIB_DEPENDS+= resid.[0-9]:${PORTSDIR}/audio/resid \ sidplay2.[0-9]:${PORTSDIR}/audio/libsidplay2 PLIST_SUB+= SID="" .else EXCLUDE+= sid PLIST_SUB+= SID="@comment " .endif .if defined(XMMS2_SLAVE) && ${XMMS2_SLAVE} == "python" EXCLUDE+= ruby java .elif defined(XMMS2_SLAVE) && ${XMMS2_SLAVE} == "ruby" EXCLUDE+= python java .elif defined(XMMS2_SLAVE) && ${XMMS2_SLAVE} == "java" EXCLUDE+= ruby python .elif !defined(XMMS2_SLAVE) EXCLUDE+= python ruby java .endif .if defined(WITH_ECORE) LIB_DEPENDS+= lecore.1:${PORTSDIR}/x11/ecore PLIST_SUB+= ECORE="" .else EXCLUDE+= xmmsclient-ecore PLIST_SUB+= ECORE="@comment " .endif .if defined(WITH_FLAC) LIB_DEPENDS+= FLAC.7:${PORTSDIR}/audio/flac PLIST_SUB+= FLAC="" .else EXCLUDE+= flac PLIST_SUB+= FLAC="@comment " .endif .if defined(WITH_FAAD) LIB_DEPENDS+= faad.0:${PORTSDIR}/audio/faad PLIST_SUB+= FAAD="" #EXTRA_PATCHES+= ${FILESDIR}/extraPatch-src::clients::faad::Plugin .else EXCLUDE+= faad PLIST_SUB+= FAAD="@comment " .endif .if defined(WITH_SDL) USE_SDL= sdl ttf PLIST_SUB+= SDL="" #EXTRA_PATCHES+= ${FILESDIR}/extraPatch-src::clients::sdl-vis::Program .else EXCLUDE+= sdl-vis PLIST_SUB+= SDL="@comment " .endif .if defined(WITH_MUSEPACK) LIB_DEPENDS+= mpcdec.3:${PORTSDIR}/audio/libmpcdec PLIST_SUB+= MUSEPACK="" .else EXCLUDE+= musepack PLIST_SUB+= MUSEPACK="@comment " .endif .if defined(WITH_JACK) LIB_DEPENDS+= jack.0:${PORTSDIR}/audio/jack PLIST_SUB+= JACK="" .else EXCLUDE+= jack PLIST_SUB+= JACK="@comment " .endif .if defined(WITH_MODPLUG) LIB_DEPENDS+= modplug.0:${PORTSDIR}/audio/libmodplug PLIST_SUB+= MODPLUG="" .else EXCLUDE+= modplug PLIST_SUB+= MODPLUG="@comment " .endif .if defined(WITH_SAMBA) LIB_DEPENDS+= smbclient.0:${PORTSDIR}/net/samba-libsmbclient PLIST_SUB+= SAMBA="" .else EXCLUDE+= samba PLIST_SUB+= SAMBA="@comment " .endif .if defined(WITH_GNOMEVFS) USE_GNOME+= gnomevfs2 PLIST_SUB+= GNOMEVFS="" .else EXCLUDE+= gnomevfs PLIST_SUB+= GNOMEVFS="@comment " .endif .if defined(WITH_FAM) USE_FAM= yes WANT_FAM_SYSTEM=gamin PLIST_SUB+= FAM="" .else EXCLUDE+= medialib-updater PLIST_SUB+= FAM="@comment " .endif .if defined(WITH_MDNS) LIB_DEPENDS+= avahi-core:${PORTSDIR}/net/avahi PLIST_SUB+= MDNS="" .else EXCLUDE+= mdns PLIST_SUB+= MDNS="@comment " .endif .include + +.if defined(XMMS2_SLAVE) && ${XMMS2_SLAVE} != "java" +.if ${OSVERSION} < 500000 +BROKEN= Broken on FreeBSD 4.x +.endif +.endif 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 Property changes on: head/audio/xmms2/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.7 \ No newline at end of property +1.8 \ No newline at end of property Index: head/audio/xmms2/files/patch-src_clients_lib_java_callbacks.c =================================================================== --- head/audio/xmms2/files/patch-src_clients_lib_java_callbacks.c (nonexistent) +++ head/audio/xmms2/files/patch-src_clients_lib_java_callbacks.c (revision 159189) @@ -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; + Property changes on: head/audio/xmms2/files/patch-src_clients_lib_java_callbacks.c ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/audio/xmms2/files/patch-src_clients_lib_java_include_callbacks.h =================================================================== --- head/audio/xmms2/files/patch-src_clients_lib_java_include_callbacks.h (nonexistent) +++ head/audio/xmms2/files/patch-src_clients_lib_java_include_callbacks.h (revision 159189) @@ -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 + #include + +@@ -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 Property changes on: head/audio/xmms2/files/patch-src_clients_lib_java_include_callbacks.h ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/audio/xmms2/files/patch-src_clients_lib_java_include_misc.h =================================================================== --- head/audio/xmms2/files/patch-src_clients_lib_java_include_misc.h (nonexistent) +++ head/audio/xmms2/files/patch-src_clients_lib_java_include_misc.h (revision 159189) @@ -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 + #include + + extern xmmsc_result_t* getResultFromPointer(jlong val); + extern jlong getPointerToConnection(xmmsc_connection_t *c); ++ ++#ifdef __cplusplus ++} ++#endif ++ ++#endif Property changes on: head/audio/xmms2/files/patch-src_clients_lib_java_include_misc.h ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/audio/xmms2/files/patch-src_clients_lib_java_misc.c =================================================================== --- head/audio/xmms2/files/patch-src_clients_lib_java_misc.c (nonexistent) +++ head/audio/xmms2/files/patch-src_clients_lib_java_misc.c (revision 159189) @@ -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); Property changes on: head/audio/xmms2/files/patch-src_clients_lib_java_misc.c ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property