Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 251167 Details for
Bug 90614
media-libs/portmidi (new ebuild)
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
portmidi-217-Makefile.patch
portmidi-217-Makefile.patch (text/plain), 3.40 KB, created by
Alex Barker
on 2010-10-18 20:22:45 UTC
(
hide
)
Description:
portmidi-217-Makefile.patch
Filename:
MIME Type:
Creator:
Alex Barker
Created:
2010-10-18 20:22:45 UTC
Size:
3.40 KB
patch
obsolete
>diff -Naur portmidi/CMakeLists.txt portmidi_patched/CMakeLists.txt >--- portmidi/CMakeLists.txt 2010-09-20 12:57:48.000000000 -0700 >+++ portmidi_patched/CMakeLists.txt 2010-10-18 11:56:28.000000000 -0700 >@@ -73,5 +73,4 @@ > add_subdirectory(pm_dylib) > > # Cannot figure out how to make an xcode Java application with CMake >-add_subdirectory(pm_java) > >diff -Naur portmidi/pm_common/CMakeLists.txt portmidi_patched/pm_common/CMakeLists.txt >--- portmidi/pm_common/CMakeLists.txt 2010-09-20 12:57:48.000000000 -0700 >+++ portmidi_patched/pm_common/CMakeLists.txt 2010-10-18 11:57:21.000000000 -0700 >@@ -67,14 +67,6 @@ > message(STATUS "SYSROOT: " ${CMAKE_OSX_SYSROOT}) > else(APPLE) > # LINUX settings... >- include(FindJNI) >- message(STATUS "JAVA_JVM_LIB_PATH is " ${JAVA_JVM_LIB_PATH}) >- message(STATUS "JAVA_INCLUDE_PATH is " ${JAVA_INCLUDE_PATH}) >- message(STATUS "JAVA_INCLUDE_PATH2 is " ${JAVA_INCLUDE_PATH2}) >- message(STATUS "JAVA_JVM_LIBRARY is " ${JAVA_JVM_LIBRARY}) >- set(JAVA_INCLUDE_PATHS ${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH2}) >- # libjvm.so is found relative to JAVA_INCLUDE_PATH: >- set(JAVAVM_LIB ${JAVA_JVM_LIBRARY}/libjvm.so) > > set(LINUXSRC pmlinuxalsa pmlinux finddefault) > prepend_path(LIBSRC ../pm_linux/ ${LINUXSRC}) >@@ -99,7 +91,6 @@ > set(PM_NEEDED_LIBS winmm.lib) > endif(WIN32) > endif(UNIX) >-set(JNI_EXTRA_LIBS ${PM_NEEDED_LIBS} ${JAVA_JVM_LIBRARY}) > > # this completes the list of library sources by adding shared code > list(APPEND LIBSRC pmutil portmidi) >@@ -110,18 +101,10 @@ > target_link_libraries(portmidi-static ${PM_NEEDED_LIBS}) > > # define the jni library >-include_directories(${JAVA_INCLUDE_PATHS}) > >-set(JNISRC ${LIBSRC} ../pm_java/pmjni/pmjni.c) >-add_library(pmjni SHARED ${JNISRC}) >-target_link_libraries(pmjni ${JNI_EXTRA_LIBS}) >-set_target_properties(pmjni PROPERTIES EXECUTABLE_EXTENSION "jnilib") > > # install the libraries (Linux and Mac OS X command line) > if(UNIX) >- INSTALL(TARGETS portmidi-static pmjni >- LIBRARY DESTINATION /usr/local/lib >- ARCHIVE DESTINATION /usr/local/lib) > # .h files installed by pm_dylib/CMakeLists.txt, so don't need them here > # INSTALL(FILES portmidi.h ../porttime/porttime.h > # DESTINATION /usr/local/include) >diff -Naur portmidi/pm_dylib/CMakeLists.txt portmidi_patched/pm_dylib/CMakeLists.txt >--- portmidi/pm_dylib/CMakeLists.txt 2009-11-19 21:41:09.000000000 -0800 >+++ portmidi_patched/pm_dylib/CMakeLists.txt 2010-10-18 11:58:16.000000000 -0700 >@@ -63,7 +63,6 @@ > message(STATUS "SYSROOT: " ${CMAKE_OSX_SYSROOT}) > else(APPLE) > # LINUX settings... >- include(FindJNI) > # message(STATUS "JAVA_JVM_LIB_PATH is " ${JAVA_JVM_LIB_PATH}) > # message(STATUS "JAVA_INCLUDE_PATH is " ${JAVA_INCLUDE_PATH}) > # note: should use JAVA_JVM_LIB_PATH, but it is not set properly >@@ -75,11 +74,7 @@ > # JAVA_INCLUDE_PATH2; if no, then we need to make both JAVA_INCLUDE_PATH > # and JAVA_INCLUDE_PATH2 set by user (will need clear documentation > # because JAVA_INCLUDE_PATH2 is pretty obscure) >- set(JAVA_INCLUDE_PATH ${JAVA_INCLUDE_PATH-UNKNOWN} >- CACHE STRING "where to find Java SDK include directory") >- set(JAVA_INCLUDE_PATHS ${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH}/linux) > # libjvm.so is found relative to JAVA_INCLUDE_PATH: >- set(JAVAVM_LIB ${JAVA_INCLUDE_PATH}/../jre/lib/i386/client/libjvm.so) > > set(LINUXSRC pmlinuxalsa pmlinux finddefault) > prepend_path(LIBSRC ../pm_linux/ ${LINUXSRC})
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 90614
:
57388
|
57409
|
95807
|
100760
|
100761
|
101587
|
101588
|
214074
|
214075
|
218907
|
218909
|
218915
|
218917
|
224827
|
224829
|
225995
|
226031
|
226033
|
226035
|
226047
|
226335
|
226337
|
226339
|
228581
|
228585
|
251163
|
251165
|
251167
|
251211
|
251213
|
251309
|
253397
|
253399
|
253401
|
268205
|
289943
|
289945
|
290041
|
297469