[gentoo-commits] repo/gentoo:master commit in: sci-libs/liborigin/files/
commit: 8c3931f98286d6ff3341965ffe44fa4e9b5399f7 Author: Andrew Ammerlaan gentoo org> AuthorDate: Tue Dec 7 21:14:31 2021 + Commit: Andrew Ammerlaan gentoo org> CommitDate: Tue Dec 7 22:40:02 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c3931f9 sci-libs/liborigin: fix .pc file Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Andrew Ammerlaan gentoo.org> .../files/liborigin-3.0.1_p20210828-buildsystem.patch | 13 + 1 file changed, 13 insertions(+) diff --git a/sci-libs/liborigin/files/liborigin-3.0.1_p20210828-buildsystem.patch b/sci-libs/liborigin/files/liborigin-3.0.1_p20210828-buildsystem.patch index a34067aeb1b8..43cf499bb7a8 100644 --- a/sci-libs/liborigin/files/liborigin-3.0.1_p20210828-buildsystem.patch +++ b/sci-libs/liborigin/files/liborigin-3.0.1_p20210828-buildsystem.patch @@ -35,3 +35,16 @@ index a8e5914..8eb13c2 100644 # documentation install(FILES COPYING FORMAT README DESTINATION ${CMAKE_INSTALL_DOCDIR} +diff --git a/liborigin.pc.in b/liborigin.pc.in +index b6f7c90..55f82fa 100644 +--- a/liborigin.pc.in b/liborigin.pc.in +@@ -5,7 +5,7 @@ includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ + + Name: liborigin + Description: Library for reading OriginLab files +-Version: @LIBORIGIN_VERSION_MAJOR@.@LIBORIGIN_VERSION_MINOR@.@LIBORIGIN_VERSION_BUGFIX@ ++Version: @liborigin_VERSION_MAJOR@.@liborigin_VERSION_MINOR@.@liborigin_VERSION_PATCH@ + + Requires: + Libs: -L${libdir} -lorigin
[gentoo-commits] repo/gentoo:master commit in: sci-libs/liborigin/files/
commit: 615037c94596ca6ac97d5dc8be7c08ead842dc67 Author: Andrew Ammerlaan gentoo org> AuthorDate: Tue Dec 7 21:20:01 2021 + Commit: Andrew Ammerlaan gentoo org> CommitDate: Tue Dec 7 22:40:03 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=615037c9 sci-libs/liborigin: fix header location in pc file Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Andrew Ammerlaan gentoo.org> .../files/liborigin-3.0.1_p20210828-buildsystem.patch| 16 +--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/sci-libs/liborigin/files/liborigin-3.0.1_p20210828-buildsystem.patch b/sci-libs/liborigin/files/liborigin-3.0.1_p20210828-buildsystem.patch index 43cf499bb7a8..8ad6fd432abe 100644 --- a/sci-libs/liborigin/files/liborigin-3.0.1_p20210828-buildsystem.patch +++ b/sci-libs/liborigin/files/liborigin-3.0.1_p20210828-buildsystem.patch @@ -1,5 +1,5 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index a8e5914..8eb13c2 100644 +index a8e5914..6401a30 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -41,7 +41,6 @@ set (devel-headers @@ -10,7 +10,15 @@ index a8e5914..8eb13c2 100644 ) # allow for installation of individual targets -@@ -74,11 +73,13 @@ if( "${CMAKE_SOURCE_DIR}" STREQUAL "${PROJECT_SOURCE_DIR}" ) +@@ -65,6 +64,7 @@ add_library (origin_static STATIC $) + set_target_properties(origin_static PROPERTIES OUTPUT_NAME "origin" ) + + if( "${CMAKE_SOURCE_DIR}" STREQUAL "${PROJECT_SOURCE_DIR}" ) ++ include(GNUInstallDirs) + + # Shared library + add_library( origin_shared SHARED $) +@@ -74,13 +74,14 @@ if( "${CMAKE_SOURCE_DIR}" STREQUAL "${PROJECT_SOURCE_DIR}" ) SOVERSION ${PROJECT_VERSION_MAJOR} ) # Generate a pkg-config file matching this config @@ -23,8 +31,10 @@ index a8e5914..8eb13c2 100644 target_link_libraries (opj2dat origin_static) + endif () - include(GNUInstallDirs) +- include(GNUInstallDirs) # install libraries + install( TARGETS origin_shared origin_static + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} @@ -92,7 +93,9 @@ if( "${CMAKE_SOURCE_DIR}" STREQUAL "${PROJECT_SOURCE_DIR}" ) # install pkg-config file install(FILES ${CMAKE_CURRENT_BINARY_DIR}/liborigin.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
[gentoo-commits] repo/gentoo:master commit in: sci-libs/liborigin/files/, sci-libs/liborigin/
commit: d5fd1a6ad2a5373a4ab06b1b8f123091417228ed Author: Andrew Ammerlaan gentoo org> AuthorDate: Tue Dec 7 19:38:17 2021 + Commit: Andrew Ammerlaan gentoo org> CommitDate: Tue Dec 7 22:40:02 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5fd1a6a sci-libs/liborigin: add new snapshot Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Andrew Ammerlaan gentoo.org> sci-libs/liborigin/Manifest| 1 + .../liborigin-3.0.1_p20210828-buildsystem.patch| 37 +++ .../liborigin/liborigin-3.0.1_p20210828.ebuild | 55 ++ 3 files changed, 93 insertions(+) diff --git a/sci-libs/liborigin/Manifest b/sci-libs/liborigin/Manifest index 3e0b88d860e1..05362459eb68 100644 --- a/sci-libs/liborigin/Manifest +++ b/sci-libs/liborigin/Manifest @@ -1 +1,2 @@ DIST liborigin-3.0.1.tar.gz 156842 BLAKE2B 2c88d0419c4c7be1ff6d3aaba1f794fe67174e02e591878c754a32d9b2789bd8594d39f4786d9ac04884b443b528086617a9e1fdbca8815089c8ebb400dd321c SHA512 c3fde3549bce462ea38b961885d6c835aac53db64375645db1d3636eb78396b3353c5bcc9ea3313dac3ffb436de35677ecec6fddb2fcf1eb37eaf6a78e2a31f8 +DIST liborigin-3.0.1_p20210828.tar.gz 156437 BLAKE2B 48713d8854ccd7f46b1aca72bf7b7739af588f08aea32e1d27ff4416ca4fa96a942b19e37fb151f5e7afbd5133d870c305a608e639c620672e683fe805d4f5d1 SHA512 0c9866bef16844102be6ae6e150c927420ca07e6ee50342e9fbd4312f9cd3c476c8d730464b010076f31d7fdcc16bd1133de9ace3a6e5b9b321a231ddab00458 diff --git a/sci-libs/liborigin/files/liborigin-3.0.1_p20210828-buildsystem.patch b/sci-libs/liborigin/files/liborigin-3.0.1_p20210828-buildsystem.patch new file mode 100644 index ..a34067aeb1b8 --- /dev/null +++ b/sci-libs/liborigin/files/liborigin-3.0.1_p20210828-buildsystem.patch @@ -0,0 +1,37 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a8e5914..8eb13c2 100644 +--- a/CMakeLists.txt b/CMakeLists.txt +@@ -41,7 +41,6 @@ set (devel-headers + OriginObj.h + OriginFile.h + OriginParser.h +- tree.hh + ) + + # allow for installation of individual targets +@@ -74,11 +73,13 @@ if( "${CMAKE_SOURCE_DIR}" STREQUAL "${PROJECT_SOURCE_DIR}" ) + SOVERSION ${PROJECT_VERSION_MAJOR} + ) + # Generate a pkg-config file matching this config +- configure_file( "liborigin.pc.in" "$liborigin.pc" @ONLY ) ++ configure_file( "liborigin.pc.in" "liborigin.pc" @ONLY ) + ++ if(ENABLE_TOOLS) + # command line util + add_executable(opj2dat opj2dat.cpp) + target_link_libraries (opj2dat origin_static) ++ endif () + + include(GNUInstallDirs) + # install libraries +@@ -92,7 +93,9 @@ if( "${CMAKE_SOURCE_DIR}" STREQUAL "${PROJECT_SOURCE_DIR}" ) + # install pkg-config file + 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 () + # documentation + install(FILES COPYING FORMAT README + DESTINATION ${CMAKE_INSTALL_DOCDIR} diff --git a/sci-libs/liborigin/liborigin-3.0.1_p20210828.ebuild b/sci-libs/liborigin/liborigin-3.0.1_p20210828.ebuild new file mode 100644 index ..9b2c2bb6e60f --- /dev/null +++ b/sci-libs/liborigin/liborigin-3.0.1_p20210828.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +COMMIT="970b90ada051dfa2e80929cde91d052bf28be674" + +DESCRIPTION="Library for reading OriginLab OPJ project files" +HOMEPAGE="https://sourceforge.net/projects/liborigin/ https://github.com/SciDAVis/liborigin/"; +SRC_URI="https://github.com/SciDAVis/liborigin/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}-${COMMIT}" + +LICENSE="GPL-3" +SLOT="2" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE="debug doc tools" + +BDEPEND=" + doc? ( app-doc/doxygen ) +" +RDEPEND=" + dev-cpp/tree +" +DEPEND="${RDEPEND}" + +PATCHES=( + # add missing header + "${FILESDIR}/${PN}-3.0.1-missing-header.patch" + # downstream + "${FILESDIR}/${P}-buildsystem.patch" # ENABLE_TOOLS, shared link, doc paths +) + +src_prepare() { + cmake_src_prepare + rm tree.hh || die "failed to remove bundled tree.hh" + + sed -e "/install.*html/s/liborigin/${PF}/" \ + -i CMakeLists.txt || die "failed to fix htmldoc install path" +} + +src_configure() { + local mycmakeargs=( + -DGENERATE_CODE_FOR_LOG=$(usex debug) + $(cmake_use_find_package doc Doxygen) + -DENABLE_TOOLS=$(usex tools) + ) + cmake_src_configure +} + +src_compile() { + cmake_src_compile + use doc && cmake_src_compile doc +}
[gentoo-commits] repo/gentoo:master commit in: sci-libs/liborigin/files/
commit: 1f46dd808b100fb91f146cd35e1ad6329738 Author: Michael Mair-Keimberger levelnine at> AuthorDate: Sun Oct 10 18:14:17 2021 + Commit: Jakov Smolić gentoo org> CommitDate: Sun Oct 10 19:05:04 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f46dd80 sci-libs/liborigin: remove unused patches Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Michael Mair-Keimberger levelnine.at> Signed-off-by: Jakov Smolić gentoo.org> .../files/liborigin-3.0.0-buildsystem.patch| 166 .../files/liborigin-3.0.0-missing-header.patch | 38 .../files/liborigin-3.0.0-no-exit-calls.patch | 89 - .../liborigin-3.0.0-no-standard-streams.patch | 210 - 4 files changed, 503 deletions(-) diff --git a/sci-libs/liborigin/files/liborigin-3.0.0-buildsystem.patch b/sci-libs/liborigin/files/liborigin-3.0.0-buildsystem.patch deleted file mode 100644 index d8444dedafe..000 --- a/sci-libs/liborigin/files/liborigin-3.0.0-buildsystem.patch +++ /dev/null @@ -1,166 +0,0 @@ -From a751f00ebba9fa226860ed4e2c1ae5fa35622e89 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner -Date: Wed, 20 May 2020 22:33:08 +0200 -Subject: [PATCH 1/4] Don't install bundled tree.hh - -Signed-off-by: Andreas Sturmlechner - CMakeLists.txt | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 17c613b..a6b4b8a 100644 a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -25,7 +25,6 @@ set (devel-headers - OriginObj.h - OriginFile.h - OriginParser.h -- tree.hh - ) - - # LIB_SUFFIX can either be defined at cmake command line: cmake -DLIB_SUFFIX:STRING=64 ... --- -2.26.2 - - -From 0b4fa1ce0946bc293d798484c609c6a7ac5ab50a Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner -Date: Wed, 20 May 2020 22:35:02 +0200 -Subject: [PATCH 2/4] No static target, compile opj2dat against the shared lib - -Signed-off-by: Andreas Sturmlechner - CMakeLists.txt | 8 +--- - 1 file changed, 1 insertion(+), 7 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index a6b4b8a..6f2d87b 100644 a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -52,22 +52,16 @@ set_target_properties(origin PROPERTIES - VERSION ${LIBORIGIN_VERSION_MAJOR}.${LIBORIGIN_VERSION_MINOR}.${LIBORIGIN_VERSION_BUGFIX} - SOVERSION ${LIBORIGIN_VERSION_MAJOR} ) - --# static library --add_library (origin-static STATIC ${sources}) --set_target_properties(origin-static PROPERTIES OUTPUT_NAME "origin" POSITION_INDEPENDENT_CODE ON) -- - # inform on log setting - if (DEFINED GENERATE_CODE_FOR_LOG) - message("File parsing will be logged.") - target_compile_definitions(origin PRIVATE GENERATE_CODE_FOR_LOG=${GENERATE_CODE_FOR_LOG}) --target_compile_definitions(origin-static PRIVATE GENERATE_CODE_FOR_LOG=${GENERATE_CODE_FOR_LOG}) - else() - message("File parsing will NOT be logged. Define GENERATE_CODE_FOR_LOG to activate logging.") - endif () - - # install libraries - install(TARGETS origin DESTINATION lib${LIB_SUFFIX} OPTIONAL) --install(TARGETS origin-static DESTINATION lib${LIB_SUFFIX} OPTIONAL) - - # install headers - install(FILES ${devel-headers} DESTINATION include/liborigin) -@@ -77,7 +71,7 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/liborigin.pc DESTINATION lib${LIB_SUFF - - # command line util - add_executable(opj2dat opj2dat.cpp) --target_link_libraries (opj2dat origin-static) -+target_link_libraries (opj2dat origin) - - install(TARGETS opj2dat DESTINATION bin OPTIONAL) - --- -2.26.2 - - -From 5f4c497408a6f144e581dd17fb3e49963e8b6b2b Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner -Date: Wed, 20 May 2020 22:43:52 +0200 -Subject: [PATCH 3/4] Don't install README COPYING etc., distro package does - that - -Signed-off-by: Andreas Sturmlechner - CMakeLists.txt | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 6f2d87b..4fc16e0 100644 a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -76,7 +76,6 @@ target_link_libraries (opj2dat origin) - install(TARGETS opj2dat DESTINATION bin OPTIONAL) - - # documentation --install(FILES COPYING FORMAT README DESTINATION share/doc/liborigin OPTIONAL) - configure_file(doc/Doxyfile.in ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile) - find_package(Doxygen) - if(DOXYGEN_FOUND) --- -2.26.2 - - -From bb554d88b78e7575c04cf3e79098f35b776c3878 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner -Date: Wed, 20 May 2020 22:47:22 +0200 -Subject: [PATCH 4/4] Drop 'OPTIONAL' from install targets, add ENABLE_TOOLS - option - -I've never seen an optional install of library. -ENABLE_TOOLS takes care of the binary. -Doxygen is already optional. - -Signed-off-by: Andreas Sturmlechner - CMakeLists.txt | 14 +- - 1 file changed, 9 insertions(+), 5 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 4fc16e0..1759eee 100644 a/CMakeLists.txt -+++ b/CMakeLists.t
[gentoo-commits] repo/gentoo:master commit in: sci-libs/liborigin/files/, sci-libs/liborigin/
commit: fc55a1624d72aedb24af9db44538162fbbdfd480 Author: Andrew Ammerlaan gentoo org> AuthorDate: Sun May 23 12:37:28 2021 + Commit: Andrew Ammerlaan gentoo org> CommitDate: Sun May 23 12:47:40 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc55a162 sci-libs/liborigin: add version 3.0.1 Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Andrew Ammerlaan gentoo.org> sci-libs/liborigin/Manifest| 1 + .../files/liborigin-3.0.1-buildsystem.patch| 47 +++ .../files/liborigin-3.0.1-missing-header.patch | 24 ++ sci-libs/liborigin/liborigin-3.0.1.ebuild | 53 ++ sci-libs/liborigin/metadata.xml| 4 ++ 5 files changed, 129 insertions(+) diff --git a/sci-libs/liborigin/Manifest b/sci-libs/liborigin/Manifest index 325e5f11cc4..3296248678b 100644 --- a/sci-libs/liborigin/Manifest +++ b/sci-libs/liborigin/Manifest @@ -1 +1,2 @@ DIST liborigin-3.0.0.tar.gz 156736 BLAKE2B 1c1fda3fc3ad47394b65637a808eca1ecf4cff19eb49de0811e50d395c3b7759f8ec19c680ed83f7a8191022aa17b4ba1211baa6ea16a48a5153736d9138ed5c SHA512 1cf00ec33a90b4baede0cd3b2a3e6d78ca4810511c6be58c4d1cce12e7e1001752422fe2ddbca80cd9016b91c5321eca1ab43606ace3acc21955a034ebc4094c +DIST liborigin-3.0.1.tar.gz 156842 BLAKE2B 2c88d0419c4c7be1ff6d3aaba1f794fe67174e02e591878c754a32d9b2789bd8594d39f4786d9ac04884b443b528086617a9e1fdbca8815089c8ebb400dd321c SHA512 c3fde3549bce462ea38b961885d6c835aac53db64375645db1d3636eb78396b3353c5bcc9ea3313dac3ffb436de35677ecec6fddb2fcf1eb37eaf6a78e2a31f8 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 000..36e5d7fc7a9 --- /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 000..3f78c61ebab --- /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 + #include ++#include + + /* 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 + #include + #include ++#include + #include + + using namespace std; diff --git a/sci-libs/liborigin/liborigin-3.0.1.ebuild b/sci-libs/liborigin/liborigin-3.0.1.ebuild new file mode 100644 index 000..c7fb5af70c2 --- /dev/null +++ b/sci-libs/liborigin/liborigin-3.0.1.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake + +DESCRIPTION="Library for reading OriginLab OPJ project files" +HOMEPAGE="https://sourceforge.net/projects/liborigin/ https://github.com/SciDAVis/liborigin/"; +SRC_URI="http://downloads.sourceforge.net/liborigin/${P}.tar.gz"; + +LICENSE="GPL-3" +SLOT="2" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE="debug doc tool
[gentoo-commits] repo/gentoo:master commit in: sci-libs/liborigin/files/, sci-libs/liborigin/
commit: 15ac48991620a8b7f73d67788bed75b7ab8853b7 Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed May 20 21:36:43 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed May 20 22:17:52 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15ac4899 sci-libs/liborigin: 3.0.0 version bump Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Andreas Sturmlechner gentoo.org> sci-libs/liborigin/Manifest| 1 + .../files/liborigin-3.0.0-buildsystem.patch| 166 .../files/liborigin-3.0.0-missing-header.patch | 38 .../files/liborigin-3.0.0-no-exit-calls.patch | 89 + .../liborigin-3.0.0-no-standard-streams.patch | 210 + sci-libs/liborigin/liborigin-3.0.0.ebuild | 55 ++ sci-libs/liborigin/metadata.xml| 6 +- 7 files changed, 562 insertions(+), 3 deletions(-) diff --git a/sci-libs/liborigin/Manifest b/sci-libs/liborigin/Manifest index 9f0b954a93d..9b2da118ce9 100644 --- a/sci-libs/liborigin/Manifest +++ b/sci-libs/liborigin/Manifest @@ -1 +1,2 @@ +DIST liborigin-3.0.0.tar.gz 156736 BLAKE2B 1c1fda3fc3ad47394b65637a808eca1ecf4cff19eb49de0811e50d395c3b7759f8ec19c680ed83f7a8191022aa17b4ba1211baa6ea16a48a5153736d9138ed5c SHA512 1cf00ec33a90b4baede0cd3b2a3e6d78ca4810511c6be58c4d1cce12e7e1001752422fe2ddbca80cd9016b91c5321eca1ab43606ace3acc21955a034ebc4094c DIST liborigin2-20110829.zip 158364 BLAKE2B fb6902142fe20bd29c8f3dd4c6d0c77b6f94e66f082c6950809367a4049adc1092a5e1abc2705670a15a32d1d680c14fc05061d34d422cd55689bb778ee47fde SHA512 d0e4013a686fbc61c58b1f39e98aace91978bcadffbb2ef9d32576a3b2f19cc2443d595da2d3ecc19298ec6e29c20717db94e1fda6a64d71f3763841228a01c0 diff --git a/sci-libs/liborigin/files/liborigin-3.0.0-buildsystem.patch b/sci-libs/liborigin/files/liborigin-3.0.0-buildsystem.patch new file mode 100644 index 000..d8444dedafe --- /dev/null +++ b/sci-libs/liborigin/files/liborigin-3.0.0-buildsystem.patch @@ -0,0 +1,166 @@ +From a751f00ebba9fa226860ed4e2c1ae5fa35622e89 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner +Date: Wed, 20 May 2020 22:33:08 +0200 +Subject: [PATCH 1/4] Don't install bundled tree.hh + +Signed-off-by: Andreas Sturmlechner +--- + CMakeLists.txt | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 17c613b..a6b4b8a 100644 +--- a/CMakeLists.txt b/CMakeLists.txt +@@ -25,7 +25,6 @@ set (devel-headers + OriginObj.h + OriginFile.h + OriginParser.h +- tree.hh + ) + + # LIB_SUFFIX can either be defined at cmake command line: cmake -DLIB_SUFFIX:STRING=64 ... +-- +2.26.2 + + +From 0b4fa1ce0946bc293d798484c609c6a7ac5ab50a Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner +Date: Wed, 20 May 2020 22:35:02 +0200 +Subject: [PATCH 2/4] No static target, compile opj2dat against the shared lib + +Signed-off-by: Andreas Sturmlechner +--- + CMakeLists.txt | 8 +--- + 1 file changed, 1 insertion(+), 7 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a6b4b8a..6f2d87b 100644 +--- a/CMakeLists.txt b/CMakeLists.txt +@@ -52,22 +52,16 @@ set_target_properties(origin PROPERTIES + VERSION ${LIBORIGIN_VERSION_MAJOR}.${LIBORIGIN_VERSION_MINOR}.${LIBORIGIN_VERSION_BUGFIX} + SOVERSION ${LIBORIGIN_VERSION_MAJOR} ) + +-# static library +-add_library (origin-static STATIC ${sources}) +-set_target_properties(origin-static PROPERTIES OUTPUT_NAME "origin" POSITION_INDEPENDENT_CODE ON) +- + # inform on log setting + if (DEFINED GENERATE_CODE_FOR_LOG) + message("File parsing will be logged.") + target_compile_definitions(origin PRIVATE GENERATE_CODE_FOR_LOG=${GENERATE_CODE_FOR_LOG}) +-target_compile_definitions(origin-static PRIVATE GENERATE_CODE_FOR_LOG=${GENERATE_CODE_FOR_LOG}) + else() + message("File parsing will NOT be logged. Define GENERATE_CODE_FOR_LOG to activate logging.") + endif () + + # install libraries + install(TARGETS origin DESTINATION lib${LIB_SUFFIX} OPTIONAL) +-install(TARGETS origin-static DESTINATION lib${LIB_SUFFIX} OPTIONAL) + + # install headers + install(FILES ${devel-headers} DESTINATION include/liborigin) +@@ -77,7 +71,7 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/liborigin.pc DESTINATION lib${LIB_SUFF + + # command line util + add_executable(opj2dat opj2dat.cpp) +-target_link_libraries (opj2dat origin-static) ++target_link_libraries (opj2dat origin) + + install(TARGETS opj2dat DESTINATION bin OPTIONAL) + +-- +2.26.2 + + +From 5f4c497408a6f144e581dd17fb3e49963e8b6b2b Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner +Date: Wed, 20 May 2020 22:43:52 +0200 +Subject: [PATCH 3/4] Don't install README COPYING etc., distro package does + that + +Signed-off-by: Andreas Sturmlechner +--- + CMakeLists.txt | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 6f2d87b..4fc16e0 100644 +--- a/CMakeLis