FreeBSD Bugzilla – Attachment 67812 Details for
Bug 99864
[PATCH] audio/xmms2: update to 0.2DrEvil
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
xmms2-proper.diff
xmms2-proper.diff (text/plain), 21.50 KB, created by
Alexander Botero-Lowry
on 2006-07-07 04:51:34 UTC
(
hide
)
Description:
xmms2-proper.diff
Filename:
MIME Type:
Creator:
Alexander Botero-Lowry
Created:
2006-07-07 04:51:34 UTC
Size:
21.50 KB
patch
obsolete
>Index: Makefile >=================================================================== >RCS file: /home/ncvs/ports/audio/xmms2/Makefile,v >retrieving revision 1.12 >diff -u -r1.12 Makefile >--- Makefile 25 Jun 2006 03:06:20 -0000 1.12 >+++ Makefile 7 Jul 2006 03:49:22 -0000 >@@ -5,20 +5,16 @@ > # $FreeBSD: ports/audio/xmms2/Makefile,v 1.12 2006/06/25 03:06:20 itetcu Exp $ > # > >-PORTNAME= xmms2 >-PORTVERSION= 0.2.d.4 >-PORTREVISION= 5 >-CATEGORIES= audio >+PORTNAME?= xmms2 >+PORTVERSION= 0.2.d.5 >+CATEGORIES?= audio > MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} > MASTER_SITE_SUBDIR= ${PORTNAME} >-DISTNAME= ${PORTNAME}-0.2DrDolittle >+DISTNAME= ${PORTNAME}-0.2DrEvil > > MAINTAINER= alex@foxybanana.com >-.if !defined(XMMS2_SLAVE) >-COMMENT= Rewrite of xmms as a client/server system (developer release) >-.endif >+COMMENT?= Rewrite of xmms as a client/server system (developer release) > >-BUILD_DEPENDS+= scons:${PORTSDIR}/devel/scons > .if !defined(XMMS2_SLAVE) > LIB_DEPENDS= mad.2:${PORTSDIR}/audio/libmad \ > vorbis.3:${PORTSDIR}/audio/libvorbis >@@ -28,23 +24,55 @@ > > USE_PYTHON_BUILD= yes > USE_BZIP2= yes >+USE_SCONS= yes >+SCONS_ARGS= EXCLUDE="${EXCLUDE}" > > .if !defined(XMMS2_SLAVE) > USE_GNOME= glib20 > USE_SQLITE= 3 > >-INSTALLS_SHLIB= yes >+USE_LDCONFIG= yes > .endif > > .if !defined(XMMS2_SLAVE) >-MAN1= xmms2.1 >+MAN1= xmms2.1 xmms2-et.1 > MAN8= xmms2d.8 > MANCOMPRESSED= yes >+ >+OPTIONS= FAAD "Support to playback AAC files" on \ >+ FLAC "Support to playback FLAC files" on \ >+ MODPLUG "Support to playback MOD files" off \ >+ MUSEPACK "Support to playback MPC files" off \ >+ SID "Support to playback SID files" off \ >+ WMA "Support to playback WMA files" off \ >+ CURL "Support to playback files via HTTP" on \ >+ GNOMEVFS "Support to playback files via GnomeVFS" off \ >+ MMS "Support to playback streams via MMS" off \ >+ SAMBA "Support to playback files via SMB" off \ >+ FAM "Support to update Media Library on file change" off \ >+ MDNS "Support to announce XMMS2d via mDNS" off #\ >+# SDL "Support for visualization" on \ >+# JACK "Support to output via the Jack output server" off > .endif > >-SCONS_TARGET?= >+.include <bsd.port.pre.mk> >+ >+.if defined(XMMS2_SLAVE) && ${XMMS2_SLAVE} == "python" >+EXCLUDE+= ruby java xmmsclient-ecore xmmsclient++ xmmsclient++-glib >+.elif defined(XMMS2_SLAVE) && ${XMMS2_SLAVE} == "ruby" >+EXCLUDE+= python java xmmsclient-ecore xmmsclient++ xmmsclient++-glib >+.elif defined(XMMS2_SLAVE) && ${XMMS2_SLAVE} == "ruby-ecore" >+EXCLUDE+= python java xmmsclient++ xmmsclient++-glib >+.elif defined(XMMS2_SLAVE) && ${XMMS2_SLAVE} == "java" >+EXCLUDE+= ruby python xmmsclient-ecore xmmsclient++ xmmsclient++-glib >+.elif defined(XMMS2_SLAVE) && ${XMMS2_SLAVE} == "cpp" >+EXCLUDE+= ruby python java xmmsclient-ecore >+.elif !defined(XMMS2_SLAVE) >+EXCLUDE+= python ruby java xmmsclient-ecore xmmsclient++ xmmsclient++-glib >+.endif > >-.if defined(WITH_CURL) >+.if !defined(XMMS2_SLAVE) >+.if !defined(WITHOUT_CURL) > LIB_DEPENDS+= curl.3:${PORTSDIR}/ftp/curl > PLIST_SUB+= CURL="" > .else >@@ -53,36 +81,14 @@ > .endif > > .if defined(WITH_SID) >-LIB_DEPENDS+= resid.[0-9]:${PORTSDIR}/audio/resid \ >- sidplay2.[0-9]:${PORTSDIR}/audio/libsidplay2 >+LIB_DEPENDS+= 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} == "ruby-ecore" >-EXCLUDE+= python java >-WITH_ECORE= yes >-.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+= ecore.1:${PORTSDIR}/x11/ecore >-PLIST_SUB+= ECORE="" >-.else >-EXCLUDE+= xmmsclient-ecore >-PLIST_SUB+= ECORE="@comment " >-.endif >- >-.if defined(WITH_FLAC) >+.if !defined(WITHOUT_FLAC) > LIB_DEPENDS+= FLAC.7:${PORTSDIR}/audio/flac > PLIST_SUB+= FLAC="" > .else >@@ -90,16 +96,24 @@ > PLIST_SUB+= FLAC="@comment " > .endif > >-.if defined(WITH_FAAD) >+.if !defined(WITHOUT_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) >+.if defined(WITH_WMA) >+LIB_DEPENDS+= avutil.1:${PORTSDIR}/multimedia/ffmpeg-devel >+PLIST_SUB+= WMA="" >+.else >+EXCLUDE+= wma >+PLIST_SUB+= WMA="@comment " >+.endif >+ >+.if !defined(WITHOUT_SDL) && defined(UNDEFINED) >+IGNORE= visualization has not been updated to the Transforms API > USE_SDL= sdl ttf > PLIST_SUB+= SDL="" > #EXTRA_PATCHES+= ${FILESDIR}/extraPatch-src::clients::sdl-vis::Program >@@ -117,6 +131,7 @@ > .endif > > .if defined(WITH_JACK) >+IGNORE= the Jack plugin has not been updated to the Transforms API > LIB_DEPENDS+= jack.0:${PORTSDIR}/audio/jack > PLIST_SUB+= JACK="" > .else >@@ -148,6 +163,14 @@ > PLIST_SUB+= GNOMEVFS="@comment " > .endif > >+.if defined(WITH_MMS) >+LIB_DEPENDS+= mms.0:${PORTSDIR}/net/libmms >+PLIST_SUB+= MMS="" >+.else >+EXCLUDE+= mms >+PLIST_SUB+= MMS="@comment " >+.endif >+ > .if defined(WITH_FAM) > USE_FAM= yes > WANT_FAM_SYSTEM=gamin >@@ -164,42 +187,12 @@ > EXCLUDE+= mdns > PLIST_SUB+= MDNS="@comment " > .endif >- >-.include <bsd.port.pre.mk> >+.endif > > .if defined(XMMS2_SLAVE) && ${XMMS2_SLAVE} != "java" > .if ${OSVERSION} < 500000 >-BROKEN= Broken on FreeBSD 4.x >+IGNORE= 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 <bsd.port.post.mk> >Index: distinfo >=================================================================== >RCS file: /home/ncvs/ports/audio/xmms2/distinfo,v >retrieving revision 1.4 >diff -u -r1.4 distinfo >--- distinfo 1 Apr 2006 03:48:17 -0000 1.4 >+++ distinfo 7 Jul 2006 03:49:22 -0000 >@@ -1,3 +1,3 @@ >-SHA256 (xmms2-0.2DrDolittle.tar.bz2) = 896b3a63a2c0141c278a8ab0203f11ce8594e64e3bea9129db52388c00672535 >-MD5 (xmms2-0.2DrDolittle.tar.bz2) = 93daf53d21d198d8e05bf4de37976d7a >-SIZE (xmms2-0.2DrDolittle.tar.bz2) = 965031 >+MD5 (xmms2-0.2DrEvil.tar.bz2) = 110e1b5d3d5d89e64c2099cec4d0402b >+SHA256 (xmms2-0.2DrEvil.tar.bz2) = 1059fe1b6a03a40f8b680055c64e6475d769298983804f88ff6d38d88d514f28 >+SIZE (xmms2-0.2DrEvil.tar.bz2) = 1012538 >Index: pkg-plist >=================================================================== >RCS file: /home/ncvs/ports/audio/xmms2/pkg-plist,v >retrieving revision 1.6 >diff -u -r1.6 pkg-plist >--- pkg-plist 5 Apr 2006 02:50:22 -0000 1.6 >+++ pkg-plist 7 Jul 2006 03:49:22 -0000 >@@ -5,8 +5,6 @@ > %%MDNS%%bin/xmms2-mdns-avahi > bin/xmms2d > include/xmms2/xmms/xmms_config.h >-include/xmms2/xmms/xmms_decoder.h >-include/xmms2/xmms/xmms_decoderplugin.h > include/xmms2/xmms/xmms_defs.h > include/xmms2/xmms/xmms_effect.h > include/xmms2/xmms/xmms_effectplugin.h >@@ -15,13 +13,12 @@ > include/xmms2/xmms/xmms_log.h > include/xmms2/xmms/xmms_medialib.h > include/xmms2/xmms/xmms_object.h >-include/xmms2/xmms/xmms_output.h > include/xmms2/xmms/xmms_outputplugin.h > include/xmms2/xmms/xmms_plsplugins.h > include/xmms2/xmms/xmms_plugin.h > include/xmms2/xmms/xmms_sample.h >-include/xmms2/xmms/xmms_transport.h >-include/xmms2/xmms/xmms_transportplugin.h >+include/xmms2/xmms/xmms_streamtype.h >+include/xmms2/xmms/xmms_xformplugin.h > include/xmms2/xmmsc/xmmsc_asyncns.h > include/xmms2/xmmsc/xmmsc_errorcodes.h > include/xmms2/xmmsc/xmmsc_idnumbers.h >@@ -34,39 +31,56 @@ > include/xmms2/xmmsc/xmmsc_stringport.h > include/xmms2/xmmsc/xmmsc_unistd.h > include/xmms2/xmmsc/xmmsc_util.h >+include/xmms2/xmmsclient/xmmsclient++/client.h >+include/xmms2/xmmsclient/xmmsclient++/config.h >+include/xmms2/xmmsclient/xmmsclient++/dict.h >+include/xmms2/xmmsclient/xmmsclient++/exceptions.h >+include/xmms2/xmmsclient/xmmsclient++/helpers.h >+include/xmms2/xmmsclient/xmmsclient++/list.h >+include/xmms2/xmmsclient/xmmsclient++/listener.h >+include/xmms2/xmmsclient/xmmsclient++/mainloop.h >+include/xmms2/xmmsclient/xmmsclient++/medialib.h >+include/xmms2/xmmsclient/xmmsclient++/playback.h >+include/xmms2/xmmsclient/xmmsclient++/playlist.h >+include/xmms2/xmmsclient/xmmsclient++/signal.h >+include/xmms2/xmmsclient/xmmsclient++/stats.h >+include/xmms2/xmmsclient/xmmsclient++/typedefs.h >+include/xmms2/xmmsclient/xmmsclient++-glib.h >+include/xmms2/xmmsclient/xmmsclient++.h > include/xmms2/xmmsclient/xmmsclient-cf.h > include/xmms2/xmmsclient/xmmsclient-ecore.h > include/xmms2/xmmsclient/xmmsclient-glib.h > include/xmms2/xmmsclient/xmmsclient-qt.h > include/xmms2/xmmsclient/xmmsclient.h >-%%ECORE%%lib/libxmmsclient-ecore.a >-%%ECORE%%lib/libxmmsclient-ecore.so > lib/libxmmsclient-glib.a > lib/libxmmsclient-glib.so > lib/libxmmsclient.a > lib/libxmmsclient.so > %%CURL%%lib/xmms2/libxmms_curl_http.so > lib/xmms2/libxmms_diskwrite.so >-lib/xmms2/libxmms_eq.so >+lib/xmms2/libxmms_equalizer.so > %%FAAD%%lib/xmms2/libxmms_faad.so > %%FLAC%%lib/xmms2/libxmms_flac.so > lib/xmms2/libxmms_file.so > %%GNOMEVFS%%lib/xmms2/libxmms_gnomevfs.so >-lib/xmms2/libxmms_html.so >+lib/xmms2/libxmms_icymetaint.so >+lib/xmms2/libxmms_id3v2.so > %%JACK%%lib/xmms2/libxmms_jack.so >-lib/xmms2/libxmms_m3u.so > lib/xmms2/libxmms_mad.so >+%%MMS%%lib/xmms2/libxmms_mms.so > %%MODPLUG%%lib/xmms2/libxmms_modplug.so > %%MUSEPACK%%lib/xmms2/libxmms_musepack.so > lib/xmms2/libxmms_null.so >+lib/xmms2/libxmms_nulstripper.so > lib/xmms2/libxmms_oss.so >-lib/xmms2/libxmms_pls.so > lib/xmms2/libxmms_replaygain.so > %%SAMBA%%lib/xmms2/libxmms_samba.so > %%SID%%lib/xmms2/libxmms_sid.so > lib/xmms2/libxmms_vorbisfile.so > lib/xmms2/libxmms_wave.so >+%%WMA%%lib/xmms2/libxmms_wma.so > libdata/pkgconfig/xmms2-client-cpp.pc >+libdata/pkgconfig/xmms2-client-cpp-glib.pc > libdata/pkgconfig/xmms2-client-ecore.pc > libdata/pkgconfig/xmms2-client-glib.pc > libdata/pkgconfig/xmms2-client.pc >@@ -78,6 +92,7 @@ > @dirrm %%DATADIR%%/scripts > @dirrm %%DATADIR%% > @dirrm lib/xmms2 >+@dirrm include/xmms2/xmmsclient/xmmsclient++ > @dirrm include/xmms2/xmmsclient > @dirrm include/xmms2/xmmsc > @dirrm include/xmms2/xmms >Index: files/patch-src_clients_lib_java_callbacks.c >=================================================================== >RCS file: files/patch-src_clients_lib_java_callbacks.c >diff -N files/patch-src_clients_lib_java_callbacks.c >--- files/patch-src_clients_lib_java_callbacks.c 9 Apr 2006 11:02:32 -0000 1.1 >+++ /dev/null 1 Jan 1970 00:00:00 -0000 >@@ -1,77 +0,0 @@ >---- 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; >- >Index: files/patch-src_clients_lib_java_include_callbacks.h >=================================================================== >RCS file: files/patch-src_clients_lib_java_include_callbacks.h >diff -N files/patch-src_clients_lib_java_include_callbacks.h >--- files/patch-src_clients_lib_java_include_callbacks.h 9 Apr 2006 11:02:32 -0000 1.1 >+++ /dev/null 1 Jan 1970 00:00:00 -0000 >@@ -1,25 +0,0 @@ >---- 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 >Index: files/patch-src_clients_lib_java_include_misc.h >=================================================================== >RCS file: files/patch-src_clients_lib_java_include_misc.h >diff -N files/patch-src_clients_lib_java_include_misc.h >--- files/patch-src_clients_lib_java_include_misc.h 9 Apr 2006 11:02:32 -0000 1.1 >+++ /dev/null 1 Jan 1970 00:00:00 -0000 >@@ -1,24 +0,0 @@ >---- 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 >Index: files/patch-src_clients_lib_java_misc.c >=================================================================== >RCS file: files/patch-src_clients_lib_java_misc.c >diff -N files/patch-src_clients_lib_java_misc.c >--- files/patch-src_clients_lib_java_misc.c 9 Apr 2006 11:02:32 -0000 1.1 >+++ /dev/null 1 Jan 1970 00:00:00 -0000 >@@ -1,32 +0,0 @@ >---- 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); >Index: files/patch-src_clients_lib_python_xmmsclient.pyx >=================================================================== >RCS file: files/patch-src_clients_lib_python_xmmsclient.pyx >diff -N files/patch-src_clients_lib_python_xmmsclient.pyx >--- files/patch-src_clients_lib_python_xmmsclient.pyx 24 May 2006 22:07:58 -0000 1.1 >+++ /dev/null 1 Jan 1970 00:00:00 -0000 >@@ -1,12 +0,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 >Index: files/patch-src_clients_sdl-vis_sdl-vis.c >=================================================================== >RCS file: files/patch-src_clients_sdl-vis_sdl-vis.c >diff -N files/patch-src_clients_sdl-vis_sdl-vis.c >--- files/patch-src_clients_sdl-vis_sdl-vis.c 2 Apr 2006 06:55:41 -0000 1.1 >+++ /dev/null 1 Jan 1970 00:00:00 -0000 >@@ -1,13 +0,0 @@ >---- 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> >Index: files/patch-src_plugins_faad_Plugin >=================================================================== >RCS file: files/patch-src_plugins_faad_Plugin >diff -N files/patch-src_plugins_faad_Plugin >--- files/patch-src_plugins_faad_Plugin 21 Dec 2005 09:50:39 -0000 1.1 >+++ /dev/null 1 Jan 1970 00:00:00 -0000 >@@ -1,16 +0,0 @@ >---- 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') >- >Index: files/patch-src_plugins_sid_Plugin >=================================================================== >RCS file: files/patch-src_plugins_sid_Plugin >diff -N files/patch-src_plugins_sid_Plugin >--- /dev/null 1 Jan 1970 00:00:00 -0000 >+++ files/patch-src_plugins_sid_Plugin 7 Jul 2006 03:49:22 -0000 >@@ -0,0 +1,9 @@ >+--- src/plugins/sid/Plugin.orig Thu Jul 6 22:25:16 2006 >++++ src/plugins/sid/Plugin Thu Jul 6 22:27:29 2006 >+@@ -6,4 +6,5 @@ >+ builder_path = env.run("pkg-config libsidplay2 --variable=builders").strip() >+ if builder_path: >+ env.Append(LIBPATH=["-L%s" % builder_path]) >+- env.checklib("resid-builder", "resid_version_string") >++ env.Append(LINKFLAGS=['-rpath=%s' % builder_path]) >++ env.Append(LIBS=["resid-builder"]) >Index: files/patch-src_xmms_Program >=================================================================== >RCS file: /home/ncvs/ports/audio/xmms2/files/patch-src_xmms_Program,v >retrieving revision 1.1 >diff -u -r1.1 patch-src_xmms_Program >--- files/patch-src_xmms_Program 2 Apr 2006 06:55:41 -0000 1.1 >+++ files/patch-src_xmms_Program 7 Jul 2006 03:49:22 -0000 >@@ -1,5 +1,5 @@ >---- src/xmms/Program.orig Sat Apr 1 17:55:42 2006 >-+++ src/xmms/Program Sat Apr 1 17:55:56 2006 >+--- src/xmms/Program.orig Thu Jul 6 15:35:55 2006 >++++ src/xmms/Program Thu Jul 6 17:36:50 2006 > @@ -29,10 +29,10 @@ > env.Append(LIBS=['xmmsipc']) > env.Append(LIBS=["xmmssocket"]) >@@ -12,6 +12,6 @@ > + env.pkgconfig("gmodule-2.0") > + env.pkgconfig("gthread-2.0") > + env.pkgconfig("sqlite3") >- >+ > if env.platform != 'win32': > env.checklib("m", "sin", fail=True) >Index: files/patch-src_xmms_ipc.c >=================================================================== >RCS file: files/patch-src_xmms_ipc.c >diff -N files/patch-src_xmms_ipc.c >--- files/patch-src_xmms_ipc.c 5 Apr 2006 02:50:22 -0000 1.1 >+++ /dev/null 1 Jan 1970 00:00:00 -0000 >@@ -1,12 +0,0 @@ >---- 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);
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=67812">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 99864
:
67811
| 67812