SliTaz Repositories

     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/portmidi/stuff/portmidi-217-Makefile.patch	Sun Jan 09 19:14:20 2011 +0000
     1.3 @@ -0,0 +1,77 @@
     1.4 +diff -Naur portmidi/CMakeLists.txt portmidi_patched/CMakeLists.txt
     1.5 +--- portmidi/CMakeLists.txt	2010-09-20 12:57:48.000000000 -0700
     1.6 ++++ portmidi_patched/CMakeLists.txt	2010-10-18 11:56:28.000000000 -0700
     1.7 +@@ -73,5 +73,4 @@
     1.8 + add_subdirectory(pm_dylib)
     1.9 + 
    1.10 + # Cannot figure out how to make an xcode Java application with CMake
    1.11 +-add_subdirectory(pm_java)
    1.12 + 
    1.13 +diff -Naur portmidi/pm_common/CMakeLists.txt portmidi_patched/pm_common/CMakeLists.txt
    1.14 +--- portmidi/pm_common/CMakeLists.txt	2010-09-20 12:57:48.000000000 -0700
    1.15 ++++ portmidi_patched/pm_common/CMakeLists.txt	2010-10-18 11:57:21.000000000 -0700
    1.16 +@@ -67,14 +67,6 @@
    1.17 +     message(STATUS "SYSROOT: " ${CMAKE_OSX_SYSROOT})
    1.18 +   else(APPLE)
    1.19 +     # LINUX settings...
    1.20 +-    include(FindJNI)
    1.21 +-    message(STATUS "JAVA_JVM_LIB_PATH is " ${JAVA_JVM_LIB_PATH})
    1.22 +-    message(STATUS "JAVA_INCLUDE_PATH is " ${JAVA_INCLUDE_PATH})
    1.23 +-    message(STATUS "JAVA_INCLUDE_PATH2 is " ${JAVA_INCLUDE_PATH2})
    1.24 +-    message(STATUS "JAVA_JVM_LIBRARY is " ${JAVA_JVM_LIBRARY})
    1.25 +-    set(JAVA_INCLUDE_PATHS ${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH2})
    1.26 +-    # libjvm.so is found relative to JAVA_INCLUDE_PATH:
    1.27 +-    set(JAVAVM_LIB ${JAVA_JVM_LIBRARY}/libjvm.so)
    1.28 + 
    1.29 +     set(LINUXSRC pmlinuxalsa pmlinux finddefault)
    1.30 +     prepend_path(LIBSRC ../pm_linux/ ${LINUXSRC})
    1.31 +@@ -99,7 +91,6 @@
    1.32 +     set(PM_NEEDED_LIBS winmm.lib)
    1.33 +   endif(WIN32)
    1.34 + endif(UNIX)
    1.35 +-set(JNI_EXTRA_LIBS ${PM_NEEDED_LIBS} ${JAVA_JVM_LIBRARY})
    1.36 + 
    1.37 + # this completes the list of library sources by adding shared code
    1.38 + list(APPEND LIBSRC pmutil portmidi)
    1.39 +@@ -110,18 +101,10 @@
    1.40 + target_link_libraries(portmidi-static ${PM_NEEDED_LIBS})
    1.41 + 
    1.42 + # define the jni library
    1.43 +-include_directories(${JAVA_INCLUDE_PATHS})
    1.44 + 
    1.45 +-set(JNISRC ${LIBSRC} ../pm_java/pmjni/pmjni.c)
    1.46 +-add_library(pmjni SHARED ${JNISRC})
    1.47 +-target_link_libraries(pmjni ${JNI_EXTRA_LIBS})
    1.48 +-set_target_properties(pmjni PROPERTIES EXECUTABLE_EXTENSION "jnilib")
    1.49 + 
    1.50 + # install the libraries (Linux and Mac OS X command line)
    1.51 + if(UNIX)
    1.52 +-  INSTALL(TARGETS portmidi-static pmjni
    1.53 +-    LIBRARY DESTINATION /usr/local/lib
    1.54 +-    ARCHIVE DESTINATION /usr/local/lib)
    1.55 + # .h files installed by pm_dylib/CMakeLists.txt, so don't need them here
    1.56 + #  INSTALL(FILES portmidi.h ../porttime/porttime.h
    1.57 + #    DESTINATION /usr/local/include)
    1.58 +diff -Naur portmidi/pm_dylib/CMakeLists.txt portmidi_patched/pm_dylib/CMakeLists.txt
    1.59 +--- portmidi/pm_dylib/CMakeLists.txt	2009-11-19 21:41:09.000000000 -0800
    1.60 ++++ portmidi_patched/pm_dylib/CMakeLists.txt	2010-10-18 11:58:16.000000000 -0700
    1.61 +@@ -63,7 +63,6 @@
    1.62 +     message(STATUS "SYSROOT: " ${CMAKE_OSX_SYSROOT})
    1.63 +   else(APPLE)
    1.64 +     # LINUX settings...
    1.65 +-    include(FindJNI)
    1.66 +     # message(STATUS "JAVA_JVM_LIB_PATH is " ${JAVA_JVM_LIB_PATH})
    1.67 +     # message(STATUS "JAVA_INCLUDE_PATH is " ${JAVA_INCLUDE_PATH})
    1.68 +     # note: should use JAVA_JVM_LIB_PATH, but it is not set properly
    1.69 +@@ -75,11 +74,7 @@
    1.70 +     # JAVA_INCLUDE_PATH2; if no, then we need to make both JAVA_INCLUDE_PATH
    1.71 +     # and JAVA_INCLUDE_PATH2 set by user (will need clear documentation
    1.72 +     # because JAVA_INCLUDE_PATH2 is pretty obscure)
    1.73 +-    set(JAVA_INCLUDE_PATH  ${JAVA_INCLUDE_PATH-UNKNOWN}
    1.74 +-        CACHE STRING "where to find Java SDK include directory")
    1.75 +-    set(JAVA_INCLUDE_PATHS ${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH}/linux)
    1.76 +     # libjvm.so is found relative to JAVA_INCLUDE_PATH:
    1.77 +-    set(JAVAVM_LIB ${JAVA_INCLUDE_PATH}/../jre/lib/i386/client/libjvm.so)
    1.78 + 
    1.79 +     set(LINUXSRC pmlinuxalsa pmlinux finddefault)
    1.80 +     prepend_path(LIBSRC ../pm_linux/ ${LINUXSRC})