- Move graphics/osg to graphics/osg34 in preparation for update to 3.6

PR:		230442

10 files changed, 210 insertions, 0 deletions

diff --git a/graphics/osg34/files/patch-CMakeLists.txt b/graphics/osg34/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..d495019fab71
--- /dev/null
+++ b/graphics/osg34/files/patch-CMakeLists.txt
@@ -0,0 +1,30 @@
+--- CMakeLists.txt.orig	2017-08-28 16:50:49 UTC
++++ CMakeLists.txt
+@@ -252,6 +252,9 @@ ENDIF()
+ 
+ INCLUDE_DIRECTORIES(
+     ${OpenSceneGraph_SOURCE_DIR}/include
++)
++
++INCLUDE_DIRECTORIES(SYSTEM
+     ${OPENGL_INCLUDE_DIR}
+ )
+ 
+@@ -846,7 +849,7 @@ ENDIF()
+ 
+ IF(UNIX AND NOT WIN32 AND NOT APPLE)
+   IF(CMAKE_SIZEOF_VOID_P MATCHES "8")
+-      SET(LIB_POSTFIX "64" CACHE STRING "suffix for 32/64 dir placement")
++      SET(LIB_POSTFIX "" CACHE STRING "suffix for 32/64 dir placement")
+       MARK_AS_ADVANCED(LIB_POSTFIX)
+   ENDIF()
+ ENDIF()
+@@ -1275,7 +1278,7 @@ FOREACH(PKGCONFIG_FILE ${PKGCONFIG_FILES
+     ${PROJECT_BINARY_DIR}/packaging/pkgconfig/${PKGCONFIG_FILE}.pc
+     @ONLY
+     )
+-  INSTALL(FILES ${PROJECT_BINARY_DIR}/packaging/pkgconfig/${PKGCONFIG_FILE}.pc DESTINATION lib${LIB_POSTFIX}/pkgconfig COMPONENT libopenscenegraph-dev)
++  INSTALL(FILES ${PROJECT_BINARY_DIR}/packaging/pkgconfig/${PKGCONFIG_FILE}.pc DESTINATION libdata/pkgconfig COMPONENT libopenscenegraph-dev)
+ ENDFOREACH(PKGCONFIG_FILE)
+ 
+ 
diff --git a/graphics/osg34/files/patch-CMakeModules-FindGTA.cmake b/graphics/osg34/files/patch-CMakeModules-FindGTA.cmake
new file mode 100644
index 000000000000..8a648a5ac524
--- /dev/null
+++ b/graphics/osg34/files/patch-CMakeModules-FindGTA.cmake
@@ -0,0 +1,25 @@
+--- CMakeModules/FindGTA.cmake.orig	2014-01-19 17:46:13.693927259 +0400
++++ CMakeModules/FindGTA.cmake	2014-01-19 18:38:17.868997891 +0400
+@@ -8,16 +8,6 @@
+ # correspond to the ./configure --prefix=$GTA_DIR
+ # used in building libgta.
+ 
+-INCLUDE(FindPkgConfig OPTIONAL)
+-
+-IF(PKG_CONFIG_FOUND)
+-
+-    INCLUDE(FindPkgConfig)
+-
+-    PKG_CHECK_MODULES(GTA gta)
+-
+-ELSE(PKG_CONFIG_FOUND)
+-
+ FIND_PATH(GTA_INCLUDE_DIRS gta/gta.hpp
+     $ENV{GTA_DIR}/include
+     $ENV{GTA_DIR}
+@@ -52,5 +42,3 @@
+ IF(GTA_LIBRARIES AND GTA_INCLUDE_DIRS)
+     SET(GTA_FOUND "YES")
+ ENDIF(GTA_LIBRARIES AND GTA_INCLUDE_DIRS)
+-
+-ENDIF(PKG_CONFIG_FOUND)
diff --git a/graphics/osg34/files/patch-CMakeModules_FindGStreamer.cmake b/graphics/osg34/files/patch-CMakeModules_FindGStreamer.cmake
new file mode 100644
index 000000000000..7b3259726d4b
--- /dev/null
+++ b/graphics/osg34/files/patch-CMakeModules_FindGStreamer.cmake
@@ -0,0 +1,32 @@
+--- CMakeModules/FindGStreamer.cmake	2015-07-17 21:31:19.000000000 +0300
++++ CMakeModules/FindGStreamer.cmake	2015-02-25 22:25:34.000000000 +0300
+@@ -83,18 +83,18 @@
+     find_package(PkgConfig)    
+ 
+     macro(FIND_GSTREAMER_COMPONENT _component_prefix _pkgconfig_name _header _library)
+-        pkg_check_modules(${_component_prefix} QUIET ${_pkgconfig_name})
++        pkg_check_modules(PC_${_component_prefix} QUIET ${_pkgconfig_name})
+ 
+-#        find_path(${_component_prefix}_INCLUDE_DIRS
+-#            NAMES ${_header}
+-#            HINTS ${PC_${_component_prefix}_INCLUDE_DIRS} ${PC_${_component_prefix}_INCLUDEDIR}
+-#            PATH_SUFFIXES gstreamer-1.0
+-#        )
+-
+-#        find_library(${_component_prefix}_LIBRARIES
+-#            NAMES ${_library}
+-#            HINTS ${PC_${_component_prefix}_LIBRARY_DIRS} ${PC_${_component_prefix}_LIBDIR}
+-#        )
++        find_path(${_component_prefix}_INCLUDE_DIRS
++            NAMES ${_header}
++            HINTS ${PC_${_component_prefix}_INCLUDE_DIRS} ${PC_${_component_prefix}_INCLUDEDIR}
++            PATH_SUFFIXES gstreamer-1.0
++        )
++
++        find_library(${_component_prefix}_LIBRARIES
++            NAMES ${_library}
++            HINTS ${PC_${_component_prefix}_LIBRARY_DIRS} ${PC_${_component_prefix}_LIBDIR}
++        )
+     endmacro()
+ endif ()
+ 
diff --git a/graphics/osg34/files/patch-shift-key-fix b/graphics/osg34/files/patch-shift-key-fix
new file mode 100644
index 000000000000..87d9003ae693
--- /dev/null
+++ b/graphics/osg34/files/patch-shift-key-fix
@@ -0,0 +1,23 @@
+# Shift key not released if group switch is something other than Control-Shift:
+# https://www.mail-archive.com/debian-bugs-dist@lists.debian.org/msg1218650.html
+
+--- src/osgGA/EventQueue.cpp.orig
++++ src/osgGA/EventQueue.cpp
+@@ -337,7 +337,7 @@ void EventQueue::mouseButtonRelease(floa
+ 
+ void EventQueue::keyPress(int key, double time, int unmodifiedKey)
+ {
+-    switch(key)
++    switch(unmodifiedKey)
+     {
+         case(GUIEventAdapter::KEY_Shift_L):      _accumulateEventState->setModKeyMask(GUIEventAdapter::MODKEY_LEFT_SHIFT | _accumulateEventState->getModKeyMask()); break;
+         case(GUIEventAdapter::KEY_Shift_R):      _accumulateEventState->setModKeyMask(GUIEventAdapter::MODKEY_RIGHT_SHIFT | _accumulateEventState->getModKeyMask()); break;
+@@ -381,7 +381,7 @@ void EventQueue::keyPress(int key, doubl
+ 
+ void EventQueue::keyRelease(int key, double time, int unmodifiedKey)
+ {
+-    switch(key)
++    switch(unmodifiedKey)
+     {
+         case(GUIEventAdapter::KEY_Shift_L):      _accumulateEventState->setModKeyMask(~GUIEventAdapter::MODKEY_LEFT_SHIFT & _accumulateEventState->getModKeyMask()); break;
+         case(GUIEventAdapter::KEY_Shift_R):      _accumulateEventState->setModKeyMask(~GUIEventAdapter::MODKEY_RIGHT_SHIFT & _accumulateEventState->getModKeyMask()); break;
diff --git a/graphics/osg34/files/patch-src-OpenThreads-CMakeLists.txt b/graphics/osg34/files/patch-src-OpenThreads-CMakeLists.txt
new file mode 100644
index 000000000000..675ef5a726a0
--- /dev/null
+++ b/graphics/osg34/files/patch-src-OpenThreads-CMakeLists.txt
@@ -0,0 +1,8 @@
+--- src/OpenThreads/CMakeLists.txt.orig	2009-01-27 18:34:57.000000000 +0300
++++ src/OpenThreads/CMakeLists.txt	2009-02-05 17:54:57.000000000 +0300
+@@ -94,4 +94,4 @@
+     @ONLY
+     )
+ 
+-INSTALL(FILES ${PROJECT_BINARY_DIR}/packaging/pkgconfig/openthreads.pc DESTINATION lib${LIB_POSTFIX}/pkgconfig)
++INSTALL(FILES ${PROJECT_BINARY_DIR}/packaging/pkgconfig/openthreads.pc DESTINATION libdata/pkgconfig)
diff --git a/graphics/osg34/files/patch-src-OpenThreads-pthreads-PThread.cpp b/graphics/osg34/files/patch-src-OpenThreads-pthreads-PThread.cpp
new file mode 100644
index 000000000000..eeaba23f077d
--- /dev/null
+++ b/graphics/osg34/files/patch-src-OpenThreads-pthreads-PThread.cpp
@@ -0,0 +1,37 @@
+--- src/OpenThreads/pthreads/PThread.cpp.orig	2011-06-24 00:09:26.000000000 +0400
++++ src/OpenThreads/pthreads/PThread.cpp	2012-03-05 05:57:02.886704932 +0400
+@@ -21,6 +21,7 @@
+ #include <sys/types.h>
+ #include <unistd.h>
+ #include <pthread.h>
++#include <pthread_np.h>
+ #include <limits.h>
+ 
+ #if defined __linux || defined __sun || defined __APPLE__ || ANDROID
+@@ -136,7 +137,7 @@
+ #if defined(__sgi)
+             pthread_setrunon_np( pd->cpunum );
+ #elif defined(HAVE_PTHREAD_SETAFFINITY_NP) || defined(HAVE_THREE_PARAM_SCHED_SETAFFINITY) || defined(HAVE_TWO_PARAM_SCHED_SETAFFINITY)
+-            cpu_set_t cpumask;
++            cpuset_t cpumask;
+             CPU_ZERO( &cpumask );
+             CPU_SET( pd->cpunum, &cpumask );
+ 
+@@ -569,7 +570,7 @@
+ 
+     if (pd->isRunning && Thread::CurrentThread()==this)
+     {
+-        cpu_set_t cpumask;
++        cpuset_t cpumask;
+         CPU_ZERO( &cpumask );
+         CPU_SET( pd->cpunum, &cpumask );
+ #if defined(HAVE_PTHREAD_SETAFFINITY_NP)
+@@ -1031,7 +1032,7 @@
+     else
+     {
+ #if defined(HAVE_PTHREAD_SETAFFINITY_NP) || defined(HAVE_THREE_PARAM_SCHED_SETAFFINITY) || defined(HAVE_TWO_PARAM_SCHED_SETAFFINITY)
+-        cpu_set_t cpumask;
++        cpuset_t cpumask;
+         CPU_ZERO( &cpumask );
+         CPU_SET( cpunum, &cpumask );
+ #if defined(HAVE_PTHREAD_SETAFFINITY_NP)
diff --git a/graphics/osg34/files/patch-src_osgPlugins_ffmpeg_CMakeLists.txt b/graphics/osg34/files/patch-src_osgPlugins_ffmpeg_CMakeLists.txt
new file mode 100644
index 000000000000..426b4f3145b3
--- /dev/null
+++ b/graphics/osg34/files/patch-src_osgPlugins_ffmpeg_CMakeLists.txt
@@ -0,0 +1,31 @@
+--- src/osgPlugins/ffmpeg/CMakeLists.txt.orig	2015-01-07 14:14:55 UTC
++++ src/osgPlugins/ffmpeg/CMakeLists.txt
+@@ -1,9 +1,9 @@
+-INCLUDE_DIRECTORIES( ${FFMPEG_INCLUDE_DIRS} )
++INCLUDE_DIRECTORIES(SYSTEM ${FFMPEG_INCLUDE_DIRS})
+ LINK_DIRECTORIES(${FFMPEG_LIBRARY_DIRS})
+ 
+ IF(FFMPEG_LIBSWSCALE_FOUND)
+ 
+-    INCLUDE_DIRECTORIES( ${FFMPEG_LIBSWSCALE_INCLUDE_DIRS} ${FFMPEG_LIBSWSCALE_INCLUDE_DIRS}/libswscale )
++    INCLUDE_DIRECTORIES(SYSTEM ${FFMPEG_LIBSWSCALE_INCLUDE_DIRS} ${FFMPEG_LIBSWSCALE_INCLUDE_DIRS}/libswscale)
+ 
+     ADD_DEFINITIONS(-DUSE_SWSCALE)
+ 
+@@ -12,14 +12,14 @@ IF(FFMPEG_LIBSWSCALE_FOUND)
+ ENDIF()
+ 
+ IF(FFMPEG_LIBSWRESAMPLE_FOUND)
+-    INCLUDE_DIRECTORIES( ${FFMPEG_LIBSWRESAMPLE_INCLUDE_DIRS} ${FFMPEG_LIBSWRESAMPLE_INCLUDE_DIRS}/libswresample )
++    INCLUDE_DIRECTORIES(SYSTEM ${FFMPEG_LIBSWRESAMPLE_INCLUDE_DIRS} ${FFMPEG_LIBSWRESAMPLE_INCLUDE_DIRS}/libswresample)
+ 
+     ADD_DEFINITIONS(-DUSE_SWRESAMPLE)
+ 
+     SET(FFMPEG_LIBRARIES ${FFMPEG_LIBRARIES} ${FFMPEG_LIBSWRESAMPLE_LIBRARIES})
+ ENDIF()
+ IF(FFMPEG_LIBAVRESAMPLE_FOUND)
+-    INCLUDE_DIRECTORIES( ${FFMPEG_LIBAVRESAMPLE_INCLUDE_DIRS} ${FFMPEG_LIBAVRESAMPLE_INCLUDE_DIRS}/libavresample )
++    INCLUDE_DIRECTORIES(SYSTEM ${FFMPEG_LIBAVRESAMPLE_INCLUDE_DIRS} ${FFMPEG_LIBAVRESAMPLE_INCLUDE_DIRS}/libavresample)
+ 
+     ADD_DEFINITIONS(-DUSE_AVRESAMPLE)
+ 
diff --git a/graphics/osg34/files/patch-src_osgPlugins_gdal_CMakeLists.txt b/graphics/osg34/files/patch-src_osgPlugins_gdal_CMakeLists.txt
new file mode 100644
index 000000000000..acdc497a60b1
--- /dev/null
+++ b/graphics/osg34/files/patch-src_osgPlugins_gdal_CMakeLists.txt
@@ -0,0 +1,8 @@
+--- ./src/osgPlugins/gdal/CMakeLists.txt.orig	2015-07-02 11:58:49 UTC
++++ ./src/osgPlugins/gdal/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-INCLUDE_DIRECTORIES( ${GDAL_INCLUDE_DIR} )
++INCLUDE_DIRECTORIES(SYSTEM ${GDAL_INCLUDE_DIR})
+ 
+ SET(TARGET_SRC
+     ReaderWriterGDAL.cpp
diff --git a/graphics/osg34/files/patch-src_osgPlugins_nvtt_CMakeLists.txt b/graphics/osg34/files/patch-src_osgPlugins_nvtt_CMakeLists.txt
new file mode 100644
index 000000000000..40902a58bb5c
--- /dev/null
+++ b/graphics/osg34/files/patch-src_osgPlugins_nvtt_CMakeLists.txt
@@ -0,0 +1,8 @@
+--- src/osgPlugins/nvtt/CMakeLists.txt.orig	2011-04-19 11:40:22 UTC
++++ src/osgPlugins/nvtt/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-INCLUDE_DIRECTORIES( ${NVTT_INCLUDE_DIR} )
++INCLUDE_DIRECTORIES(SYSTEM ${NVTT_INCLUDE_DIR})
+ 
+ 
+ SET(TARGET_SRC
diff --git a/graphics/osg34/files/patch-src_osgPlugins_ogr_CMakeLists.txt b/graphics/osg34/files/patch-src_osgPlugins_ogr_CMakeLists.txt
new file mode 100644
index 000000000000..73fd9c93c2ec
--- /dev/null
+++ b/graphics/osg34/files/patch-src_osgPlugins_ogr_CMakeLists.txt
@@ -0,0 +1,8 @@
+--- ./src/osgPlugins/ogr/CMakeLists.txt.orig	2011-04-19 11:40:22 UTC
++++ ./src/osgPlugins/ogr/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-INCLUDE_DIRECTORIES( ${GDAL_INCLUDE_DIR} )
++INCLUDE_DIRECTORIES(SYSTEM ${GDAL_INCLUDE_DIR})
+ 
+ SET(TARGET_SRC ReaderWriterOGR.cpp)
+