Author: lisu Date: Mon Dec 28 13:36:31 2009 GMT Module: packages Tag: HEAD ---- Log message: - disable java stuff
---- Files affected: packages/portmidi: portmidi-disable_java.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/portmidi/portmidi-disable_java.patch diff -u /dev/null packages/portmidi/portmidi-disable_java.patch:1.1 --- /dev/null Mon Dec 28 14:36:31 2009 +++ packages/portmidi/portmidi-disable_java.patch Mon Dec 28 14:36:26 2009 @@ -0,0 +1,117 @@ +--- portmidi/pm_linux/Makefile~ 2009-12-28 14:28:13.584169477 +0100 ++++ portmidi/pm_linux/Makefile 2009-12-28 14:29:35.887496801 +0100 +@@ -47,8 +47,8 @@ + current: all + + all: $(pmlib) $(ptlib) pm_test/test pm_test/sysex pm_test/midithread \ +- pm_test/latency pm_test/midithru pm_test/qtest pm_test/mm \ +- pm_java/pmjni/libpmjni.so pm_java/pmdefaults/pmdefaults.jar ++ pm_test/latency pm_test/midithru pm_test/qtest pm_test/mm ++# pm_java/pmjni/libpmjni.so pm_java/pmdefaults/pmdefaults.jar + + $(pmlib): pm_linux/Makefile $(pmobjects) $(ptlib) + libtool --tag=CC --mode=link $(CC) -shared -o $(pmlib) $(pmobjects) -rpath $(libdir) $(ptlib) $(ALSALIB) +@@ -96,12 +96,12 @@ + + #------------ Java stuff here -------------- + +-pm_java/pmjni/libpmjni.so: pm_java/pmjni/pmjni.c \ +- pm_java/pmjni/jportmidi_JportMidiApi.h +- gcc -o $@ -shared -Wl,-soname,libpmjni.so \ +- -lgcj -fPIC \ +- -Ipm_common -Iporttime -Ipm_java/pmjni \ +- pm_java/pmjni/pmjni.c -static -lc $(pmlib) $(ptlib) $(ALSALIB) ++#pm_java/pmjni/libpmjni.so: pm_java/pmjni/pmjni.c \ ++# pm_java/pmjni/jportmidi_JportMidiApi.h ++# gcc -o $@ -shared -Wl,-soname,libpmjni.so \ ++# -lgcj -fPIC \ ++# -Ipm_common -Iporttime -Ipm_java/pmjni \ ++# pm_java/pmjni/pmjni.c -static -lc $(pmlib) $(ptlib) $(ALSALIB) + + #pm_java/pmjni/pmjni.so: pm_java/pmjni/pmjni.o \ + # pm_java/pmjni/jportmidi_JportMidiApi.h +@@ -109,54 +109,54 @@ + # -Wl,--whole-archive,-soname,pmjni.so \ + # pmjni.o -lgcj -Wl,--no-whole-archive + +-JAVASRC = pm_java/jportmidi/JPortMidi.java \ +- pm_java/jportmidi/JPortMidiException.java \ +- pm_java/jportmidi/JPortMidiApi.java ++#JAVASRC = pm_java/jportmidi/JPortMidi.java \ ++# pm_java/jportmidi/JPortMidiException.java \ ++# pm_java/jportmidi/JPortMidiApi.java + +-pm_java/jportmidi/JPortMidi.class: $(JAVASRC) +- javac pm_java/jportmidi/*.java ++#pm_java/jportmidi/JPortMidi.class: $(JAVASRC) ++# javac pm_java/jportmidi/*.java + +-pm_java/jportmidi/JPortMidiException.class: $(JAVASRC) +- javac pm_java/jportmidi/*.java ++#pm_java/jportmidi/JPortMidiException.class: $(JAVASRC) ++# javac pm_java/jportmidi/*.java + +-pm_java/jportmidi/JPortMidiApi.class: $(JAVASRC) +- javac pm_java/jportmidi/*.java ++#pm_java/jportmidi/JPortMidiApi.class: $(JAVASRC) ++# javac pm_java/jportmidi/*.java + +-DEFAULTSSRC = pm_java/pmdefaults/PmDefaultsFrame.java \ +- pm_java/pmdefaults/PmDefaults.java ++#DEFAULTSSRC = pm_java/pmdefaults/PmDefaultsFrame.java \ ++# pm_java/pmdefaults/PmDefaults.java + +-pm_java/pmdefaults/PmDefaultsFrame.class: $(DEFAULTSRC) +- cd pm_java; javac -classpath . pmdefaults/*.java ++#pm_java/pmdefaults/PmDefaultsFrame.class: $(DEFAULTSRC) ++# cd pm_java; javac -classpath . pmdefaults/*.java + +-pm_java/pmdefaults/PmDefaults.class: $(DEFAULTSRC) +- cd pm_java; javac -classpath . pmdefaults/*.java ++#pm_java/pmdefaults/PmDefaults.class: $(DEFAULTSRC) ++# cd pm_java; javac -classpath . pmdefaults/*.java + + +-DEFAULTCLASS = pm_java/jportmidi/JPortMidi.class \ +- pm_java/jportmidi/JPortMidiException.class \ +- pm_java/jportmidi/JPortMidiApi.class \ +- pm_java/pmdefaults/PmDefaultsFrame.class \ +- pm_java/pmdefaults/PmDefaults.class ++#DEFAULTCLASS = pm_java/jportmidi/JPortMidi.class \ ++# pm_java/jportmidi/JPortMidiException.class \ ++# pm_java/jportmidi/JPortMidiApi.class \ ++# pm_java/pmdefaults/PmDefaultsFrame.class \ ++# pm_java/pmdefaults/PmDefaults.class + + + # make the jar file: + # work in pm_java directory + # temporarily copy logo image to current directory + # copy the interface library to the +-pm_java/pmdefaults/pmdefaults.jar: $(DEFAULTCLASS) +- cd pm_java; cp pmdefaults/portmusic_logo.png . +- cd pm_java; jar cmf pmdefaults/manifest.txt pmdefaults.jar \ +- pmdefaults/*.class portmusic_logo.png \ +- jportmidi/*.class +- cd pm_java; rm portmusic_logo.png ++#pm_java/pmdefaults/pmdefaults.jar: $(DEFAULTCLASS) ++# cd pm_java; cp pmdefaults/portmusic_logo.png . ++# cd pm_java; jar cmf pmdefaults/manifest.txt pmdefaults.jar \ ++# pmdefaults/*.class portmusic_logo.png \ ++# jportmidi/*.class ++# cd pm_java; rm portmusic_logo.png + # just in case, make it executable +- cd pm_java; chmod +x pmdefaults/pmdefaults ++# cd pm_java; chmod +x pmdefaults/pmdefaults + + install: +- cp pm_java/pmjni/libpmjni.so /usr/local/lib +- cp pm_java/pmdefaults.jar /usr/share/java ++# cp pm_java/pmjni/libpmjni.so /usr/local/lib ++# cp pm_java/pmdefaults.jar /usr/share/java + # do not chmod +x here since we are probably root +- cp pm_java/pmdefaults/pmdefaults /usr/local/bin ++# cp pm_java/pmdefaults/pmdefaults /usr/local/bin + install -d $(DESTDIR)$(libdir) $(DESTDIR)$(includedir) + libtool --mode=install install $(ptlib) $(DESTDIR)$(libdir) + libtool --mode=install install $(pmlib) $(DESTDIR)$(libdir) ================================================================ _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
