packages: portmidi/portmidi-disable_java.patch, portmidi/portmidi-make.patc...
lisu
lisu at pld-linux.org
Thu Jan 21 18:45:54 CET 2010
Author: lisu Date: Thu Jan 21 17:45:54 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- adjusted for 200 version
---- Files affected:
packages/portmidi:
portmidi-disable_java.patch (1.1 -> 1.2) , portmidi-make.patch (1.2 -> 1.3)
---- Diffs:
================================================================
Index: packages/portmidi/portmidi-disable_java.patch
diff -u packages/portmidi/portmidi-disable_java.patch:1.1 packages/portmidi/portmidi-disable_java.patch:1.2
--- packages/portmidi/portmidi-disable_java.patch:1.1 Mon Dec 28 14:36:26 2009
+++ packages/portmidi/portmidi-disable_java.patch Thu Jan 21 18:45:49 2010
@@ -1,5 +1,5 @@
---- portmidi/pm_linux/Makefile~ 2009-12-28 14:28:13.584169477 +0100
-+++ portmidi/pm_linux/Makefile 2009-12-28 14:29:35.887496801 +0100
+--- portmidi/pm_linux/Makefile~ 2010-01-21 18:42:08.000000000 +0000
++++ portmidi/pm_linux/Makefile 2010-01-21 18:44:02.000000000 +0000
@@ -47,8 +47,8 @@
current: all
@@ -9,7 +9,7 @@
+ 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)
+ $(pmlib): pm_linux/Makefile $(pmobjects) $(ptlib)
libtool --tag=CC --mode=link $(CC) -shared -o $(pmlib) $(pmobjects) -rpath $(libdir) $(ptlib) $(ALSALIB)
@@ -96,12 +96,12 @@
================================================================
Index: packages/portmidi/portmidi-make.patch
diff -u packages/portmidi/portmidi-make.patch:1.2 packages/portmidi/portmidi-make.patch:1.3
--- packages/portmidi/portmidi-make.patch:1.2 Mon Dec 28 14:36:06 2009
+++ packages/portmidi/portmidi-make.patch Thu Jan 21 18:45:49 2010
@@ -1,5 +1,5 @@
---- portmidi/pm_linux/Makefile~ 2009-01-20 05:01:54.000000000 +0100
-+++ portmidi/pm_linux/Makefile 2009-12-28 14:20:42.647549089 +0100
+--- portmidi/pm_linux/Makefile~ 2009-01-20 04:01:54.000000000 +0000
++++ portmidi/pm_linux/Makefile 2010-01-21 18:33:13.000000000 +0000
@@ -21,7 +21,7 @@
# PMFLAGS =
@@ -41,12 +41,12 @@
-$(pmlib): pm_linux/Makefile $(pmobjects)
- ar -cr $(pmlib) $(pmobjects)
-+$(pmlib): pm_linux/Makefile $(pmobjects) $(ptlib)
++$(pmlib): pm_linux/Makefile $(pmobjects) $(ptlib)
+ libtool --tag=CC --mode=link $(CC) -shared -o $(pmlib) $(pmobjects) -rpath $(libdir) $(ptlib) $(ALSALIB)
$(ptlib): pm_linux/Makefile $(ptobjects)
- ar -cr $(ptlib) $(ptobjects)
-+ libtool --tag=CC --mode=link $(CC) -shared -o $(ptlib) $(ptobjects) -rpath $(libdir) -lpthread
++ libtool --tag=CC --mode=link $(CC) -shared -o $(ptlib) $(ptobjects) -rpath $(libdir) -lpthread
-pm_linux/pmlinuxalsa.o: pm_linux/Makefile pm_linux/pmlinuxalsa.c pm_linux/pmlinuxalsa.h
- $(CC) -c pm_linux/pmlinuxalsa.c -o pm_linux/pmlinuxalsa.o
@@ -67,27 +67,23 @@
pm_test/midithread: pm_linux/Makefile pm_test/midithread.o $(pmlib) $(ptlib)
- $(CC) pm_test/midithread.o -o pm_test/midithread \
-- $(pmlib) $(ptlib) $(ALSALIB)
+ libtool --mode=link $(CC) pm_test/midithread.o -o pm_test/midithread \
-+ $(pmlib) $(ptlib) $(ALSALIB)
+ $(pmlib) $(ptlib) $(ALSALIB)
pm_test/latency: pm_linux/Makefile $(ptlib) pm_test/latency.o
- $(CC) pm_test/latency.o -o pm_test/latency $(pmlib) $(ptlib) \
-- $(ALSALIB) -lpthread -lm
+ libtool --mode=link $(CC) pm_test/latency.o -o pm_test/latency $(pmlib) $(ptlib) \
-+ $(ALSALIB) -lpthread -lm
+ $(ALSALIB) -lpthread -lm
pm_test/midithru: pm_linux/Makefile $(ptlib) pm_test/midithru.o
- $(CC) pm_test/midithru.o -o pm_test/midithru $(pmlib) $(ptlib) \
-- $(ALSALIB) -lpthread -lm
+ libtool --mode=link $(CC) pm_test/midithru.o -o pm_test/midithru $(pmlib) $(ptlib) \
-+ $(ALSALIB) -lpthread -lm
+ $(ALSALIB) -lpthread -lm
pm_test/mm: pm_linux/Makefile $(ptlib) pm_test/mm.o
- $(CC) pm_test/mm.o -o pm_test/mm $(pmlib) $(ptlib) \
-- $(ALSALIB) -lpthread -lm
+ libtool --mode=link $(CC) pm_test/mm.o -o pm_test/mm $(pmlib) $(ptlib) \
-+ $(ALSALIB) -lpthread -lm
+ $(ALSALIB) -lpthread -lm
-porttime/ptlinux.o: pm_linux/Makefile porttime/ptlinux.c
- $(CC) -c porttime/ptlinux.c -o porttime/ptlinux.o
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/portmidi/portmidi-disable_java.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/portmidi/portmidi-make.patch?r1=1.2&r2=1.3&f=u
More information about the pld-cvs-commit
mailing list