rpms/tritonus/devel tritonus-src-lib-alsa-cast.patch, NONE, 1.1 tritonus.spec, 1.2, 1.3

[Orcan Ogetbil]

Author: oget

Update of /cvs/pkgs/rpms/tritonus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16470

Modified Files:
	tritonus.spec 
Added Files:
	tritonus-src-lib-alsa-cast.patch 
Log Message:
* Wed Jul 08 2009 Orcan Ogetbil <oget[dot]fedora[at]gmail[dot]com> - 0.3.7-0.4.20090419cvs
- Fix alsa midi crash RHBZ #510063
- No more rebuilding in %install


tritonus-src-lib-alsa-cast.patch:

--- NEW FILE tritonus-src-lib-alsa-cast.patch ---
diff -rupN tritonus-0.3.7.old/src/lib/common/HandleFieldHandler.h tritonus-0.3.7/src/lib/common/HandleFieldHandler.h
--- tritonus-0.3.7.old/src/lib/common/HandleFieldHandler.h	2002-12-15 06:15:25.000000000 -0500
+++ tritonus-0.3.7/src/lib/common/HandleFieldHandler.h	2009-07-08 03:53:51.000000000 -0400
@@ -56,14 +56,14 @@ static void                             
 setHandle(JNIEnv *env, jobject obj, _type handle)                      \
 {                                                                      \
 	jfieldID	fieldID = getNativeHandleFieldID(env, obj);    \
-	(*env)->SetLongField(env, obj, fieldID, (jlong) (int) handle);       \
+	(*env)->SetLongField(env, obj, fieldID, (jlong) (long) handle);       \
 }                                                                      \
                                                                        \
 static _type                                                           \
 getHandle(JNIEnv *env, jobject obj)                                    \
 {                                                                      \
 	jfieldID	fieldID = getNativeHandleFieldID(env, obj);    \
-	_type	handle = (_type) (int) (*env)->GetLongField(env, obj, fieldID); \
+	_type	handle = (_type) (long) (*env)->GetLongField(env, obj, fieldID); \
 	return handle;                                                 \
 }
 


Index: tritonus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tritonus/devel/tritonus.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- tritonus.spec	29 May 2009 05:32:14 -0000	1.2
+++ tritonus.spec	8 Jul 2009 08:14:15 -0000	1.3
@@ -5,7 +5,7 @@ Summary:	Java Sound API Implementation
 URL:		http://www.tritonus.org/
 Group:		System Environment/Libraries
 Version:	0.3.7
-Release:	0.3.%{cvs_version}%{?dist}
+Release:	0.4.%{cvs_version}%{?dist}
 License:	LGPLv2+
 Source0:	%{name}-%{version}-%{cvs_version}.tar.bz2
 Source9:	%{name}-snapshot.sh
@@ -16,6 +16,8 @@ Patch1:		%{name}-src-lib-fluidsynth.Make
 Patch2:		%{name}-src-lib-alsa-Makefile.in.diff
 Patch3:		%{name}-src-lib-alsa-constants_check.h.diff
 Patch4:		%{name}-removed-code.diff
+# Fix alsa midi crash RHBZ #510063
+Patch5:		%{name}-src-lib-alsa-cast.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires:	alsa-lib-devel
 BuildRequires:	ant
@@ -229,6 +231,7 @@ on the native vorbis libraries.
 %patch2 -p0 -b .oldapi
 %patch3 -p0 -b .oldapi
 %patch4 -p1 -b .oldapi
+%patch5 -p1 -b .cast
 
 # Fix encoding issues
 for file in doc/{compression.txt,TODO-matthias.txt,tritonusfaq.sgml}; do
@@ -251,6 +254,9 @@ sed -i -e 's|-Werror||g' \
 	-e 's|-Wl,-rpath,/home/matthias/java/tritonus/src/lib/common||g' \
 	`find . -name Makefile.in`
 
+# Prevent a rebuild in %%install
+sed -i 's|install: all|install:|' Makefile.in
+
 autoreconf -fi
 
 
@@ -267,8 +273,7 @@ sed -i -e '/timestampgranularity/d' -e '
 export CLASSPATH=`build-classpath jorbis`
 %ant
 
-#make %{?_smp_mflags} JAVADIR=%{_jvmdir}/java
-make JAVADIR=%{_jvmdir}/java
+make %{?_smp_mflags} JAVADIR=%{_jvmdir}/java
 
 # javadoc doesn't want to process these two files:
 rm -f src/classes/org/tritonus/debug/AJDebug*
@@ -389,6 +394,10 @@ rm -rf %{buildroot}
 %{_libdir}/%{name}/lib%{name}vorbis.so
 
 %changelog
+* Wed Jul 08 2009 Orcan Ogetbil <oget[dot]fedora[at]gmail[dot]com> - 0.3.7-0.4.20090419cvs
+- Fix alsa midi crash RHBZ #510063
+- No more rebuilding in %%install
+
 * Fri May 29 2009 Orcan Ogetbil <oget[dot]fedora[at]gmail[dot]com> - 0.3.7-0.3.20090419cvs
 - Add disttag