gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 04:59:14 -07:00
Code Issues Projects Releases Wiki Activity

dev-libs/libsavitar: version bump to 4.2.0

Browse Source 
Package-Manager: Portage-2.3.70, Repoman-2.3.16
Signed-off-by: Michael Perlov <perlovka@gmail.com>
Signed-off-by: Joonas Niilola <juippis@gentoo.org>
This commit is contained in:
Michael Perlov
2019-08-04 19:06:11 +03:00
committed by Joonas Niilola
parent efae0a1525
commit eb80aea53d
3 changed files with 103 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
dev-libs/libsavitar/Manifest
View File

@@ -1,2 +1,3 @@
DIST libsavitar-3.4.1.tar.gz 92457 BLAKE2B ef5b7bb87d7b3293c0634d510f860b64f3235f46c8abb1365eb5e439b6f1cf3eed6ff1fa4f2a3476a6f3ed0193356d8019a6ccbce044c29339ec2693b96db3d4 SHA512 4273723536578816ab16c2d9f8c0fba57651a2cd5730e45a27e5ed5ec6a7986f59ef932094392b6bf7bd9dd9555cc44e09505c843e9b364a2c7bcc1770af1f35
DIST libsavitar-3.6.0.tar.gz 92456 BLAKE2B badd2e416015c2d3331cfe77840466f11f2b671821474b78fff084c4f1c3bebab7b2ae16f75918d4eb40996e293165be46f98efea20edc57b1e1255c2ea9fed0 SHA512 6d7c416218a69b1327ed211a9b198cdfb6ebdf1fc9c8c76b898882a63d0905521d5e41380b21f0b8100ab3e3474bbbf142adea29c6643f03bc3f8c3e6ec3c72f
DIST libsavitar-4.2.0.tar.gz 96223 BLAKE2B bfb41111e8c7cd90acec28bcb11874fc39d6fa2d0785959fd020fb36949300a0e1517a4ed78a153b1f1576b6603a466a2f5baa7e8370b05311729e17b7e83566 SHA512 9d1ee73b8e29e1b8b5688c309471cb6053addce351df8deb4e0cb46d15ffc8fe764216c9abd603440b6a60f42379fa03d88e8023ed01502c4e905ebc6a4f393d

60
dev-libs/libsavitar/files/libsavitar-4.2.0-remove-packaged-pugixml.patch Normal file
View File

@@ -0,0 +1,60 @@
diff -urN libSavitar-4.2.0_old/CMakeLists.txt libSavitar-4.2.0/CMakeLists.txt
--- libSavitar-4.2.0_old/CMakeLists.txt 2019-07-30 09:03:53.000000000 +0300
+++ libSavitar-4.2.0/CMakeLists.txt 2019-08-04 17:23:27.099395645 +0300
@@ -15,7 +15,7 @@
find_package(Threads QUIET)
endif()
-add_subdirectory(pugixml)
+find_package(pugixml REQUIRED)
if(BUILD_PYTHON)
list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
diff -urN libSavitar-4.2.0_old/src/MeshData.cpp libSavitar-4.2.0/src/MeshData.cpp
--- libSavitar-4.2.0_old/src/MeshData.cpp 2019-07-30 09:03:53.000000000 +0300
+++ libSavitar-4.2.0/src/MeshData.cpp 2019-08-04 17:23:59.891051757 +0300
@@ -17,7 +17,7 @@
*/
#include "MeshData.h"
-#include "../pugixml/src/pugixml.hpp"
+#include <pugixml.hpp>
#include <cstring>
#include <iostream>
#include <stdexcept> //For std::runtime_error.
diff -urN libSavitar-4.2.0_old/src/Scene.cpp libSavitar-4.2.0/src/Scene.cpp
--- libSavitar-4.2.0_old/src/Scene.cpp 2019-07-30 09:03:53.000000000 +0300
+++ libSavitar-4.2.0/src/Scene.cpp 2019-08-04 17:24:10.425265944 +0300
@@ -17,7 +17,7 @@
*/
#include "Scene.h"
-#include "../pugixml/src/pugixml.hpp"
+#include <pugixml.hpp>
#include <iostream>
#include <string>
using namespace Savitar;
diff -urN libSavitar-4.2.0_old/src/SceneNode.cpp libSavitar-4.2.0/src/SceneNode.cpp
--- libSavitar-4.2.0_old/src/SceneNode.cpp 2019-07-30 09:03:53.000000000 +0300
+++ libSavitar-4.2.0/src/SceneNode.cpp 2019-08-04 17:24:31.617696840 +0300
@@ -17,7 +17,7 @@
*/
#include "SceneNode.h"
-#include "../pugixml/src/pugixml.hpp"
+#include <pugixml.hpp>
#include <iostream>
using namespace Savitar;
diff -urN libSavitar-4.2.0_old/src/ThreeMFParser.h libSavitar-4.2.0/src/ThreeMFParser.h
--- libSavitar-4.2.0_old/src/ThreeMFParser.h 2019-07-30 09:03:53.000000000 +0300
+++ libSavitar-4.2.0/src/ThreeMFParser.h 2019-08-04 17:24:53.996151843 +0300
@@ -21,7 +21,7 @@
#include "SavitarExport.h"
#include "SceneNode.h"
-#include "../pugixml/src/pugixml.hpp"
+#include <pugixml.hpp>
#include <string>
namespace Savitar

42
dev-libs/libsavitar/libsavitar-4.2.0.ebuild Normal file
View File

@@ -0,0 +1,42 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
PYTHON_COMPAT=( python3_{5,6} )
inherit cmake-utils python-single-r1
MY_PN="libSavitar"
DESCRIPTION="C++ implementation of 3mf loading with SIP python bindings"
HOMEPAGE="https://github.com/Ultimaker/libSavitar"
SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="LGPL-3"
SLOT="0/3"
KEYWORDS="~amd64 ~x86"
IUSE="+python static-libs"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
RDEPEND="${PYTHON_DEPS}
dev-libs/pugixml
dev-python/sip[${PYTHON_USEDEP}]"
DEPEND="${RDEPEND}"
S="${WORKDIR}/${MY_PN}-${PV}"
PATCHES=( "${FILESDIR}"/${PN}-4.2.0-remove-packaged-pugixml.patch )
pkg_setup() {
use python && python-single-r1_pkg_setup
}
src_configure() {
local mycmakeargs=(
-DBUILD_PYTHON=$(usex python ON OFF)
-DBUILD_STATIC=$(usex static-libs ON OFF)
)
cmake-utils_src_configure
}