rpms/RasmusDSP/F-11 RasmusDSP-Makefile.patch, NONE, 1.1 RasmusDSP-build.patch, NONE, 1.1 RasmusDSP-editor.desktop, NONE, 1.1 RasmusDSP-editor.sh, NONE, 1.1 RasmusDSP-snapshot.sh, NONE, 1.1 RasmusDSP-tester.desktop, NONE, 1.1 RasmusDSP-tester.sh, NONE, 1.1 RasmusDSP.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

[Orcan Ogetbil]

Author: oget

Update of /cvs/pkgs/rpms/RasmusDSP/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25464/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	RasmusDSP-Makefile.patch RasmusDSP-build.patch 
	RasmusDSP-editor.desktop RasmusDSP-editor.sh 
	RasmusDSP-snapshot.sh RasmusDSP-tester.desktop 
	RasmusDSP-tester.sh RasmusDSP.spec import.log 
Log Message:
* Thu May 28 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.1-2.20090321cvs
- Remove unneeded BR: jack-audio-connection-kit-devel

* Mon Mar 23 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.1-1.20090321cvs
- Initial build


RasmusDSP-Makefile.patch:

--- NEW FILE RasmusDSP-Makefile.patch ---
diff -rupN RasmusDSP.old/cpp/fftw/Makefile RasmusDSP/cpp/fftw/Makefile
--- RasmusDSP.old/cpp/fftw/Makefile	2007-01-15 18:48:40.000000000 -0500
+++ RasmusDSP/cpp/fftw/Makefile	2009-03-22 04:27:41.000000000 -0400
@@ -1,12 +1,7 @@
 # Compile commands (replace the include paths corresponding to your own)
 #JDK_HOME=/usr/lib/jvm/java-1.5.0-sun
 
-CLASSPATH=../../bin
-
-# I am not sure where this is meant to live.
-# If you have not got it you will need to install fftw
-#
-FFTW_LIB=/usr/lib/libfftw3.a 
+CLASSPATH=../../build
 
 # Note that the Makefile doesn't support building other platforms than your current
 
@@ -18,8 +13,10 @@ FFTW_LIB=/usr/lib/libfftw3.a 
 #    ARCH=i386
 # endif 
 
+FFTW_LIB=`pkg-config --libs fftw3`
+FFTW_INC=`pkg-config --variable=includedir fftw3`
 
-all : jfftw3.h libjfftw.so 
+all : jfftw3.h libjfftw3.so 
 
 
 jfftw3.h: ${CLASSPATH}/rasmus/fft/fftw/FFTW.class
@@ -27,18 +24,18 @@ jfftw3.h: ${CLASSPATH}/rasmus/fft/fftw/F
 
 
 jfftw3.o : jfftw3.h jfftw3.cpp
-	g++ -fPIC -I $(JDK_HOME)/include/ -I $(JDK_HOME)/include/linux -c jfftw3.cpp
+	g++ $(CPPFLAGS) -I $(JDK_HOME)/include/ -I $(JDK_HOME)/include/linux -I $(FFTW_INC) -c jfftw3.cpp
 
-libjfftw.so : jfftw3.o
-	g++ -shared -fPIC -o libjfftw.so jfftw3.o ${FFTW_LIB} 
+libjfftw3.so : jfftw3.o
+	g++ -shared $(CPPFLAGS) -o libjfftw3.so jfftw3.o $(FFTW_LIB)
 
 # TODO
 # Copies to the src folder - since the Java build uses the src folder to build the jar file
 # and copy to the bin directory in case you forget to hit refresh.
-install: libjfftw.so
+install: libjfftw3.so
 #	cp libjfftw.so ../../src/lib/$(ARCH)/linux/libjfftw.so
 #	cp libjfftw.so ../../bin/lib/$(ARCH)/linux/libjfftw.so
-	cp libjfftw.so /usr/lib/libjfftw.so
+	cp libjfftw3.so $(LIBDIR)/libjfftw3.so
 
 clean:
-	rm -f jfftw3.o jfftw3.h libjfftw.so 
+	rm -f jfftw3.o jfftw3.h libjfftw3.so 

RasmusDSP-build.patch:

--- NEW FILE RasmusDSP-build.patch ---
--- RasmusDSP.old/build.xml	2006-12-14 07:54:21.000000000 -0500
+++ RasmusDSP/build.xml	2009-03-23 00:49:24.000000000 -0400
@@ -30,7 +30,7 @@
  
 <!-- run javac to compile the source files --> 
 <target name="compile" depends="init"> 
-<javac srcdir="${src}" 
+<javac srcdir="${src}" debug="true"
 destdir="${build}"> 
 <classpath> 
 <path refid="lib.path"/> 
@@ -42,9 +42,11 @@ destdir="${build}"> 
 <target name="jar" depends="compile"> 
 <jar jarfile="${lib}/${jarname}" basedir="${build}"> 
 <fileset dir="${src}" includes="**/*.PNG" /> 
-<fileset dir="${src}" includes="icons/**/*.png" /> 
+<fileset dir="${src}" includes="**/*.png" /> 
+<fileset dir="${src}" includes="**/*.properties" />
+<fileset dir="${src}" includes="**/*.r" />
+<fileset dir="${src}" includes="**/*.rasmusdsp" />
 <fileset dir="${src}" includes="*.txt" /> 
-<fileset dir="${src}" includes="**/**/**/*.r" /> 
 <fileset dir="${src}" includes="META-INF/**/*" /> 
 </jar> 
 </target> 


--- NEW FILE RasmusDSP-editor.desktop ---
[Desktop Entry]
Comment=RasmusDSP Editor
Name=RasmusDSP Editor
GenericName=RasmusDSP Editor
Type=Application
Exec=RasmusDSP-editor.sh
Icon=RasmusDSP
Encoding=UTF-8
Categories=AudioVideo;Music;


--- NEW FILE RasmusDSP-editor.sh ---
#!/bin/sh

# source the jpackage helpers
VERBOSE=1
. /usr/share/java-utils/java-functions

# set JAVA_* environment variables
set_javacmd
check_java_env
set_jvm_dirs

LIBRARY_PATH=/usr/lib
for arch in x86_64 ppc64; do
    if [[ $(uname -i) == "$arch" ]]; then
        LIBRARY_PATH=/usr/lib64
    fi
done

CLASSPATH=${LIBRARY_PATH}/RasmusDSP/RasmusDSP.jar

set_options "-Xmx384m -Xincgc -Djava.library.path="${LIBRARY_PATH}/RasmusDSP" -cp ${CLASSPATH}"

MAIN_CLASS="rasmus.editor.RasmusEditor"

run


--- NEW FILE RasmusDSP-snapshot.sh ---
#!/bin/bash

set -e

tmp=$(mktemp -d)

trap cleanup EXIT
cleanup() {
    set +e
    [ -z "$tmp" -o ! -d "$tmp" ] || rm -rf "$tmp"
}

unset CDPATH
pwd=$(pwd)
cvs=$(date +%Y%m%d)cvs
name=RasmusDSP

cd "$tmp"
cvs -z3 -d:pserver:anonymous at rasmusdsp.cvs.sourceforge.net:/cvsroot/rasmusdsp \
    export -D $(date +%Y%m%d) $name
tar jcf "$pwd"/$name-$cvs.tar.bz2 $name
echo "Written: $name-$cvs.tar.bz2"
cd - >/dev/null


--- NEW FILE RasmusDSP-tester.desktop ---
[Desktop Entry]
Comment=RasmusDSP is an embeddable Audio/MIDI processor
Name=RasmusDSP
GenericName=Audio/MIDI processor
Type=Application
Exec=RasmusDSP.sh
Icon=RasmusDSP
Encoding=UTF-8
Categories=AudioVideo;Music;


--- NEW FILE RasmusDSP-tester.sh ---
#!/bin/sh

# source the jpackage helpers
VERBOSE=1
. /usr/share/java-utils/java-functions

# set JAVA_* environment variables
set_javacmd
check_java_env
set_jvm_dirs

LIBRARY_PATH=/usr/lib
for arch in x86_64 ppc64; do
    if [[ $(uname -i) == "$arch" ]]; then
        LIBRARY_PATH=/usr/lib64
    fi
done

CLASSPATH=${LIBRARY_PATH}/RasmusDSP/RasmusDSP.jar

set_options "-Djava.library.path="${LIBRARY_PATH}/RasmusDSP" -cp ${CLASSPATH}"

MAIN_CLASS="rasmus.testing.FFT_Testing"

run


--- NEW FILE RasmusDSP.spec ---
%global cvs_version 20090321cvs

Name:           RasmusDSP
Summary:        Embeddable Audio/MIDI processor
URL:            http://sourceforge.net/projects/rasmusdsp
Group:          Development/Libraries
Version:        0.1
Release:        2.%{cvs_version}%{?dist}
License:        BSD
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0:        %{name}-%{cvs_version}.tar.bz2
# Files for RasmusDSP script editor and tester:
Source1:        %{name}-tester.sh
Source2:        %{name}-tester.desktop
Source3:        %{name}-editor.sh
Source4:        %{name}-editor.desktop

# Fetch script:
Source99:       %{name}-snapshot.sh

# For linking to the system fftw library dynamically:
Patch0:         %{name}-Makefile.patch
# Include some additional useful files in the jar file. Also
# add a debug flag to javac:
Patch1:         %{name}-build.patch

BuildRequires:  ant
BuildRequires:  desktop-file-utils
BuildRequires:  fftw-devel
BuildRequires:  java-devel >= 1.7
BuildRequires:  jpackage-utils

Requires:       jpackage-utils
Requires:       java >= 1.7

%description
RasmusDSP is an embeddable Audio/MIDI processor. It contains various filters
and generators (including SoundFont 2.0 compatible synthesizer); also has a 
script interpreter which is used to describe instruments and to route 
Audio/MIDI signal between processor units.

%package javadoc
Summary:        Javadocs for %{name}
Group:          Documentation
Requires:       %{name} = %{version}-%{release}
Requires:       jpackage-utils

%description javadoc
This package contains the API documentation for %{name}.

%package editor
Summary:        Editor and tester for %{name} scripts
Group:          Development/Tools
Requires:       %{name} = %{version}-%{release}
Requires:       hicolor-icon-theme

%description editor
This package contains an editor and a tester for %{name} scripts.

%prep
%setup -q -n %{name}

%patch0 -p1
%patch1 -p1

# Remove precompiled binaries
rm -f cpp/fftw/jfftw3.dll src/rasmus/Thumbs.db

# Load the library correctly
sed -i 's|loadLibrary( "jfftw3" )|load( "%{_libdir}/%{name}/libjfftw3.so" )|' \
   src/rasmus/fft/fftw/FFTW.java

%build
%ant jar javadocs
pushd cpp/fftw/
   make %{?_smp_flags} CPPFLAGS="%{optflags} -fPIC" JDK_HOME="%{java_home}"
popd


%install
rm -rf %{buildroot}
# jars
install -dm 755 %{buildroot}%{_libdir}/%{name}
install -pm 644 lib/%{name}.jar \
        %{buildroot}%{_libdir}/%{name}/%{name}-%{version}.jar
ln -s %{name}-%{version}.jar %{buildroot}%{_libdir}/%{name}/%{name}.jar

# native lib
install -pm 755 cpp/fftw/libjfftw3.so %{buildroot}%{_libdir}/%{name}

# javadoc
install -dm 755 %{buildroot}%{_javadocdir}/%{name}
cp -pr docs/* \
        %{buildroot}%{_javadocdir}/%{name}

# editor and tester
install -dm 755 %{buildroot}%{_bindir}
install -pm 755 %{SOURCE1} \
        %{buildroot}%{_bindir}/%{name}-tester
install -pm 755 %{SOURCE3} \
        %{buildroot}%{_bindir}/%{name}-editor

# icon
install -dm 755 %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/
install -m 644 src/rasmus/rasmusdsp.PNG \
        %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/%{name}.png

# desktop files
desktop-file-install                               \
        --dir=%{buildroot}%{_datadir}/applications \
        %{SOURCE2}

desktop-file-install                               \
        --dir=%{buildroot}%{_datadir}/applications \
        %{SOURCE4}


%clean
rm -rf %{buildroot}

%post editor
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :

%postun editor
if [ $1 -eq 0 ] ; then
    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi

%posttrans editor
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :

%files
%defattr(-,root,root,-)
%doc *.txt
%{_libdir}/%{name}/

%files javadoc
%defattr(-,root,root,-)
%{_javadocdir}/%{name}

%files editor
%defattr(-,root,root,-)
%{_bindir}/%{name}-*
%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
%{_datadir}/applications/%{name}*.desktop

%changelog
* Thu May 28 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.1-2.20090321cvs
- Remove unneeded BR: jack-audio-connection-kit-devel

* Mon Mar 23 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.1-1.20090321cvs
- Initial build


--- NEW FILE import.log ---
RasmusDSP-0_1-2_20090321cvs_fc10:F-11:RasmusDSP-0.1-2.20090321cvs.fc10.src.rpm:1243576252


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/RasmusDSP/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 May 2009 04:53:45 -0000	1.1
+++ .cvsignore	29 May 2009 05:51:22 -0000	1.2
@@ -0,0 +1 @@
+RasmusDSP-20090321cvs.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/RasmusDSP/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 May 2009 04:53:45 -0000	1.1
+++ sources	29 May 2009 05:51:22 -0000	1.2
@@ -0,0 +1 @@
+2f4d312127b0077dd7ed33949ee3d489  RasmusDSP-20090321cvs.tar.bz2