From e748ba9741f6540f4675c23e3e37b73e822c13a4 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Mon, 31 May 2021 20:59:14 +0100
Subject: gentoo resync : 31.05.2021

---
 .../files/liborigin-3.0.1-buildsystem.patch        | 47 ++++++++++++++++++++++
 .../files/liborigin-3.0.1-missing-header.patch     | 24 +++++++++++
 2 files changed, 71 insertions(+)
 create mode 100644 sci-libs/liborigin/files/liborigin-3.0.1-buildsystem.patch
 create mode 100644 sci-libs/liborigin/files/liborigin-3.0.1-missing-header.patch

(limited to 'sci-libs/liborigin/files')

diff --git a/sci-libs/liborigin/files/liborigin-3.0.1-buildsystem.patch b/sci-libs/liborigin/files/liborigin-3.0.1-buildsystem.patch
new file mode 100644
index 000000000000..36e5d7fc7a9c
--- /dev/null
+++ b/sci-libs/liborigin/files/liborigin-3.0.1-buildsystem.patch
@@ -0,0 +1,47 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 2f3b26d..4c543bf 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -28,6 +28,8 @@ else()
+     set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -pedantic" )
+ endif()
+ 
++option(ENABLE_TOOLS "Install opj2dat command line util" ON)
++
+ # compile-time configuration variables to be linked in
+ configure_file(config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h)
+ include_directories(${CMAKE_CURRENT_BINARY_DIR})
+@@ -44,7 +46,6 @@ set (devel-headers
+     OriginObj.h
+     OriginFile.h
+     OriginParser.h
+-    tree.hh
+ )
+ 
+ # object library
+@@ -87,6 +88,7 @@ if (BUILD_SHARED_LIBS)
+ endif ()
+ 
+ # command line util
++if(ENABLE_TOOLS)
+ if (BUILD_STATIC_LIBS)
+     add_executable(opj2dat opj2dat.cpp)
+     target_link_libraries (opj2dat origin_static)
+@@ -94,6 +96,7 @@ elseif (BUILD_SHARED_LIBS)
+     add_executable(opj2dat opj2dat.cpp)
+     target_link_libraries (opj2dat origin_shared)
+ endif ()
++endif ()
+ 
+ # Generate a pkg-config file matching this config
+ configure_file("liborigin.pc.in" "liborigin.pc" @ONLY)
+@@ -103,7 +106,9 @@ install(FILES ${devel-headers} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/liborigin
+ # install pkg-config file
+ if (BUILD_STATIC_LIBS OR BUILD_SHARED_LIBS)
+     install(FILES ${CMAKE_CURRENT_BINARY_DIR}/liborigin.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
++    if(ENABLE_TOOLS)
+     install(TARGETS opj2dat DESTINATION ${CMAKE_INSTALL_BINDIR} OPTIONAL)
++    endif ()
+ endif ()
+ 
+ # documentation
diff --git a/sci-libs/liborigin/files/liborigin-3.0.1-missing-header.patch b/sci-libs/liborigin/files/liborigin-3.0.1-missing-header.patch
new file mode 100644
index 000000000000..3f78c61ebabe
--- /dev/null
+++ b/sci-libs/liborigin/files/liborigin-3.0.1-missing-header.patch
@@ -0,0 +1,24 @@
+diff --git a/OriginAnyParser.cpp b/OriginAnyParser.cpp
+index 05bfb95..dd5dd9b 100644
+--- a/OriginAnyParser.cpp
++++ b/OriginAnyParser.cpp
+@@ -22,6 +22,7 @@
+ #include "OriginAnyParser.h"
+ #include <sstream>
+ #include <cinttypes>
++#include <iostream>
+ 
+ /* define a macro to get an int (or uint) from a istringstream in binary mode */
+ #if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
+diff --git a/opj2dat.cpp b/opj2dat.cpp
+index 4b8d57a..5a31b4e 100644
+--- a/opj2dat.cpp
++++ b/opj2dat.cpp
+@@ -31,6 +31,7 @@
+ #include <cmath>
+ #include <fstream>
+ #include <sstream>
++#include <iostream>
+ #include <string>
+ 
+ using namespace std;
-- 
cgit v1.2.3