]> git.pld-linux.org Git - packages/OpenColorIO.git/blob - OpenColorIO-java.patch
- updated to 2.3.2 (new soname)
[packages/OpenColorIO.git] / OpenColorIO-java.patch
1 --- imageworks-OpenColorIO-a16d9ac/CMakeLists.txt.orig  2012-07-28 20:56:34.841655834 +0200
2 +++ imageworks-OpenColorIO-a16d9ac/CMakeLists.txt       2012-07-29 08:42:26.369878509 +0200
3 @@ -278,7 +278,7 @@
4  
5  if(OCIO_BUILD_JNIGLUE)
6      OCIOFindJava()
7 -    if(Java_FOUND)
8 +    if(JAVA_FOUND)
9        add_subdirectory(src/jniglue)
10      else()
11        messageonce("Java bindings will not be built as we can't find Java")
12 --- imageworks-OpenColorIO-a16d9ac/src/jniglue/JNIUtil.h.orig   2012-03-12 20:13:59.000000000 +0100
13 +++ imageworks-OpenColorIO-a16d9ac/src/jniglue/JNIUtil.h        2012-07-29 08:50:30.273191536 +0200
14 @@ -29,6 +29,7 @@
15  #ifndef INCLUDED_OCIO_JNIUTIL_H
16  #define INCLUDED_OCIO_JNIUTIL_H
17  
18 +#include <stdint.h>
19  #include <sstream>
20  #include <vector>
21  #include "OpenColorIOJNI.h"
22 --- imageworks-OpenColorIO-2b12063/src/jniglue/CMakeLists.txt.orig      2013-10-09 00:59:34.000000000 +0200
23 +++ imageworks-OpenColorIO-2b12063/src/jniglue/CMakeLists.txt   2013-11-07 20:11:29.503699385 +0100
24 @@ -71,7 +71,7 @@
25  add_custom_command(OUTPUT ${JNIOCIO_HEADERS}
26                     COMMAND cmake -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/org/OpenColorIO
27                     COMMAND ${Java_JAVAC_EXECUTABLE} -cp ${CMAKE_CURRENT_BINARY_DIR} -d ${CMAKE_CURRENT_BINARY_DIR} ${JNIOCIO_JAVAS}
28 -                   COMMAND ${Java_JAVAH_EXECUTABLE} -jni -force ${JNIOCIO_CLASSES}
29 +                  COMMAND ${Java_JAVAH_EXECUTABLE} -jni -force -classpath ${CMAKE_CURRENT_BINARY_DIR} ${JNIOCIO_CLASSES}
30                     COMMAND ${Java_JAR_EXECUTABLE} vcfm ${JNIOCIO_JAR} Manifest.txt org
31                     IMPLICIT_DEPENDS ${JNIOCIO_JAVAS}
32                     COMMENT "Compiling .java files, packaged .jar and creating jni C headers")
This page took 0.066052 seconds and 3 git commands to generate.