diff options
Diffstat (limited to 'graphics/osg34/files')
12 files changed, 0 insertions, 243 deletions
diff --git a/graphics/osg34/files/patch-CMakeLists.txt b/graphics/osg34/files/patch-CMakeLists.txt deleted file mode 100644 index d495019fab71..000000000000 --- a/graphics/osg34/files/patch-CMakeLists.txt +++ /dev/null @@ -1,30 +0,0 @@ ---- 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 deleted file mode 100644 index 8a648a5ac524..000000000000 --- a/graphics/osg34/files/patch-CMakeModules-FindGTA.cmake +++ /dev/null @@ -1,25 +0,0 @@ ---- 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_FindFFmpeg.cmake b/graphics/osg34/files/patch-CMakeModules_FindFFmpeg.cmake deleted file mode 100644 index 8877dac1de45..000000000000 --- a/graphics/osg34/files/patch-CMakeModules_FindFFmpeg.cmake +++ /dev/null @@ -1,10 +0,0 @@ ---- CMakeModules/FindFFmpeg.cmake.orig 2023-04-24 09:18:12 UTC -+++ CMakeModules/FindFFmpeg.cmake -@@ -21,6 +21,7 @@ - # (in new version case, use by ffmpeg header) - #and ${FFMPEG_libname_INCLUDE_DIRS/libname} (in new version case, use by osg plugin code) - -+set(CMAKE_PREFIX_PATH "%%LOCALBASE%%/ffmpeg4;%%LOCALBASE%%/ffmpeg4/libexec") - - # Macro to find header and lib directories - # example: FFMPEG_FIND(AVFORMAT avformat avformat.h) diff --git a/graphics/osg34/files/patch-CMakeModules_FindGStreamer.cmake b/graphics/osg34/files/patch-CMakeModules_FindGStreamer.cmake deleted file mode 100644 index 7b3259726d4b..000000000000 --- a/graphics/osg34/files/patch-CMakeModules_FindGStreamer.cmake +++ /dev/null @@ -1,32 +0,0 @@ ---- 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-CMakeModules_FindOpenEXR.cmake b/graphics/osg34/files/patch-CMakeModules_FindOpenEXR.cmake deleted file mode 100644 index e8fb99b70796..000000000000 --- a/graphics/osg34/files/patch-CMakeModules_FindOpenEXR.cmake +++ /dev/null @@ -1,23 +0,0 @@ ---- CMakeModules/FindOpenEXR.cmake.orig 2021-04-11 21:39:01 UTC -+++ CMakeModules/FindOpenEXR.cmake -@@ -51,14 +51,14 @@ MACRO(OPENEXR_FIND libname) - OPENEXR_FIND_VAR(OPENEXR_${libname}_LIBRARY_DEBUG ${libname}d) - ENDMACRO(OPENEXR_FIND) - --OPENEXR_FIND(IlmImf) -+OPENEXR_FIND(OpenEXR) - OPENEXR_FIND(IlmThread) - OPENEXR_FIND(Iex) --OPENEXR_FIND(Half) -+OPENEXR_FIND(Imath) - - SET(OPENEXR_FOUND "NO") --IF(OPENEXR_INCLUDE_DIR AND OPENEXR_IlmImf_LIBRARY AND OPENEXR_IlmThread_LIBRARY AND OPENEXR_Iex_LIBRARY AND OPENEXR_Half_LIBRARY) -- SET(OPENEXR_LIBRARIES ${OPENEXR_IlmImf_LIBRARY} ${OPENEXR_IlmThread_LIBRARY} ${OPENEXR_Half_LIBRARY} ${OPENEXR_Iex_LIBRARY} ) -- SET(OPENEXR_LIBRARIES_VARS OPENEXR_IlmImf_LIBRARY OPENEXR_IlmThread_LIBRARY OPENEXR_Half_LIBRARY OPENEXR_Iex_LIBRARY ) -+IF(OPENEXR_INCLUDE_DIR AND OPENEXR_OpenEXR_LIBRARY AND OPENEXR_IlmThread_LIBRARY AND OPENEXR_Iex_LIBRARY AND OPENEXR_Imath_LIBRARY) -+ SET(OPENEXR_LIBRARIES ${OPENEXR_OpenEXR_LIBRARY} ${OPENEXR_IlmThread_LIBRARY} ${OPENEXR_Imath_LIBRARY} ${OPENEXR_Iex_LIBRARY} ) -+ SET(OPENEXR_LIBRARIES_VARS OPENEXR_OpenEXR_LIBRARY OPENEXR_IlmThread_LIBRARY OPENEXR_Imath_LIBRARY OPENEXR_Iex_LIBRARY ) - SET(OPENEXR_FOUND "YES") --ENDIF(OPENEXR_INCLUDE_DIR AND OPENEXR_IlmImf_LIBRARY AND OPENEXR_IlmThread_LIBRARY AND OPENEXR_Iex_LIBRARY AND OPENEXR_Half_LIBRARY) -+ENDIF(OPENEXR_INCLUDE_DIR AND OPENEXR_OpenEXR_LIBRARY AND OPENEXR_IlmThread_LIBRARY AND OPENEXR_Iex_LIBRARY AND OPENEXR_Imath_LIBRARY) diff --git a/graphics/osg34/files/patch-shift-key-fix b/graphics/osg34/files/patch-shift-key-fix deleted file mode 100644 index 87d9003ae693..000000000000 --- a/graphics/osg34/files/patch-shift-key-fix +++ /dev/null @@ -1,23 +0,0 @@ -# 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 deleted file mode 100644 index 675ef5a726a0..000000000000 --- a/graphics/osg34/files/patch-src-OpenThreads-CMakeLists.txt +++ /dev/null @@ -1,8 +0,0 @@ ---- 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 deleted file mode 100644 index eeaba23f077d..000000000000 --- a/graphics/osg34/files/patch-src-OpenThreads-pthreads-PThread.cpp +++ /dev/null @@ -1,37 +0,0 @@ ---- 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 deleted file mode 100644 index 426b4f3145b3..000000000000 --- a/graphics/osg34/files/patch-src_osgPlugins_ffmpeg_CMakeLists.txt +++ /dev/null @@ -1,31 +0,0 @@ ---- 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 deleted file mode 100644 index acdc497a60b1..000000000000 --- a/graphics/osg34/files/patch-src_osgPlugins_gdal_CMakeLists.txt +++ /dev/null @@ -1,8 +0,0 @@ ---- ./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 deleted file mode 100644 index 40902a58bb5c..000000000000 --- a/graphics/osg34/files/patch-src_osgPlugins_nvtt_CMakeLists.txt +++ /dev/null @@ -1,8 +0,0 @@ ---- 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 deleted file mode 100644 index 73fd9c93c2ec..000000000000 --- a/graphics/osg34/files/patch-src_osgPlugins_ogr_CMakeLists.txt +++ /dev/null @@ -1,8 +0,0 @@ ---- ./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) - |