From fab849d1daed0ba7f2ac497d07985c3dbb692543 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 16 Jun 2019 21:23:20 +0100 Subject: gentoo resync : 16.06.2019 --- media-libs/ptex/Manifest | 9 +-- media-libs/ptex/files/ptex-2.1.28-20170213.patch | 72 ---------------------- .../ptex-2.1.28-allow-custom-build-type.patch | 39 ------------ media-libs/ptex/files/ptex-2.3.0-cxx11.patch | 12 ---- media-libs/ptex/ptex-2.1.28-r1.ebuild | 25 -------- media-libs/ptex/ptex-2.3.0.ebuild | 33 ---------- media-libs/ptex/ptex-2.3.2.ebuild | 2 +- 7 files changed, 2 insertions(+), 190 deletions(-) delete mode 100644 media-libs/ptex/files/ptex-2.1.28-20170213.patch delete mode 100644 media-libs/ptex/files/ptex-2.1.28-allow-custom-build-type.patch delete mode 100644 media-libs/ptex/files/ptex-2.3.0-cxx11.patch delete mode 100644 media-libs/ptex/ptex-2.1.28-r1.ebuild delete mode 100644 media-libs/ptex/ptex-2.3.0.ebuild (limited to 'media-libs/ptex') diff --git a/media-libs/ptex/Manifest b/media-libs/ptex/Manifest index 3d0d49f3ced3..e8250b8e9324 100644 --- a/media-libs/ptex/Manifest +++ b/media-libs/ptex/Manifest @@ -1,11 +1,4 @@ -AUX ptex-2.1.28-20170213.patch 2324 BLAKE2B 1536d8b2f8c6c28718ae81a04e3041d5c25f562647e84a098500ca523cb2c4f0743b812e3a1fb9838604752a41b07d1dd41f65d7a9c2bca7a84cc25eb312f3be SHA512 dcdad0e6b2b37c523b5b54c4d885cd99facd7d50733150b2c75fac3b600010c61d2c219a14aecc24a86ff869b62a962e975dd5790228112fe004aa2d8b2fa51a -AUX ptex-2.1.28-allow-custom-build-type.patch 1410 BLAKE2B 9d1bd1b41752bc3d8c21f72505dbc7c2bafccadcdb1ace339a8f25045f4e2b527af0b3263d4be2f5883912eca733d74cb20aa10eff6792ff89f288e34d27600f SHA512 fc51d24895c7624ee610f5f8537bacc15903816cf4cebb2c32f15afa6c9ab4dd087e21018a81e4d032b37735bf4fba73a406acef8e0c88cebfd6606ba2b11b24 -AUX ptex-2.3.0-cxx11.patch 399 BLAKE2B 482ff38239256f3195d13478a461c45eb812e1f4f047dbbebd275d77edca71273978c183360a6428ca411029be4174637bc591846554ad37af58cf64ee80d6c6 SHA512 9ab265f7d330142453b8b135ee32fde20b70ce6b17266ff61051682d6ca620a9d55c40f199c52feb807372cc64c21e1905907c10b609d2e5f07e572451c9b1d6 AUX ptex-2.3.2-cxx11.patch 828 BLAKE2B e445858c625de0c924a412690cbf2f1bed6ee4fd7efafd60765a4f43fa204ba474cdf2944acf3eb94b061df6c39cd9016413e6c5d73da3813144fa289746ceb4 SHA512 53d6e66dd4a35dc2e16e5f227a24ec90d3f7667c5f80dc3d7321086b4efb4d63451783450a02a389c09a3faa6808cd90e89e2097390ef9881ffe313fbfd8c6d1 -DIST ptex-2.1.28.tar.gz 305327 BLAKE2B 4a91b08ae326e8ed8d420022c693ea60cb21908380b8c49a7672771686f9dd2ef05151b7d43755bc63ab6624db772c2b53d1ffdcdea9c1dff7627cc3fe0f3b15 SHA512 ddce3c79f14d196e550c1e8a5b371482f88190cd667a2e2aa84601de1639f7cabb8571c1b3a49b48df46ce550d27088a00a67b1403c3bfec2ed73437c3dca3e8 -DIST ptex-2.3.0.tar.gz 306462 BLAKE2B 790e3623ce6ebae2dfd8884d8e19e62395c54432289d88bdcf3a01c8ae1ef752ca88869357ac1e4657d59f1ca73d311a3fb9a08efe4e145ca259eff93d8a3b6a SHA512 2d9d320e4205236a4eff05ec3c67d085624809ebefa89fa3b943d18a8b2b6a5f61c022a4cc4363a7c6ceccfb9eac4f8738dff2e90a3355814f2c4ff096c09992 DIST ptex-2.3.2.tar.gz 308550 BLAKE2B 7b3145dbf9d2c13140c3f20ed606ee911deed3c38fd30adfbb01b58c3af5794dbd4e0fa1fbab6e8ae83556a0ffec725bf077271abf752f1271ed721ca200a1ff SHA512 dbc557dc5e1761204ee3483af9bf4ff1504cbd7955e0405dc27a51f7182e2445e41db086b2792c2491aa2cbaddc74e523170a4b3d25e44d332123d5b7081f4b9 -EBUILD ptex-2.1.28-r1.ebuild 575 BLAKE2B 5ec37846a07464082c8863b53e523f1b046151f14cccb7b19672028560072703b303feeaac156c78c6a7006d79bed649e9a24d5dac6f2e81985e57077595850e SHA512 0289b417671552ad7400b5784f985d1b3d405b07d10e2101a06289292249d67ab88ad1c041f5641ea724de59a0285797fc7435cc68ad9f3c550bbb30b55bb967 -EBUILD ptex-2.3.0.ebuild 659 BLAKE2B 22ebe67087dc4ce5549dd32b35becb3b2606ae7a9c86ea19b29bf6f9a2165c1648b10f7970b3be9fadf2449d71a78b24232155d038036e3cdbc91be27ab33ce8 SHA512 e6ba1ca758119dca0e886a7988dfdff81ea1dbed0a0e84fffeb13bdc1cc140781250f6515cb8a568f5000383b01b2435caf2907d8116e50034418c8108447ede -EBUILD ptex-2.3.2.ebuild 793 BLAKE2B 4e038fb24bbe5c65fa973fde8d294a980fa4c04d9a73abdb5e6df43b55529ce7eb853a2fd6132b12324a2f634d7dde11aedb6a6fef0b0a228390d227ea343ef3 SHA512 0c88c278faaa06bd433b12a0e935a0faaad921b2b099b0b74cc811a947ffedf06bf13b1b3797f57ad056217984e6af5fd22dc4f41932f3cc53bd6bf734930a29 +EBUILD ptex-2.3.2.ebuild 791 BLAKE2B 503764f19394ed110997c6f3d0930b7fd75103a310277d566202b84a0b788cbd3f0dc57dddb492e21f845fc063ff6deedb1971c5ecc376e531d86ff9ad378255 SHA512 1e879f58054fff1f8eb94e4708b1e0d81be1734ea80821a0f146cbebe6f2a662d16925ef40925b8cea946cd24f21623c4518dc611e21944c5974a0478ed9f519 MISC metadata.xml 646 BLAKE2B 443223f4b464d16d2e7b4ea692b080f49aeceb1ef4d599d5dccd5aab6223e8f3a562317f7dda0cddb79840f19270f65af948df153cb2064b903f80e00580ee8e SHA512 ec1b3e3f8b15023413723136125ad6a92b7a509532824fcc547bcfe147e63a60e072496cbfa2337bb180e9c718fbe9e49c198f469a9e41a252b1706cf6cd461f diff --git a/media-libs/ptex/files/ptex-2.1.28-20170213.patch b/media-libs/ptex/files/ptex-2.1.28-20170213.patch deleted file mode 100644 index 335d07788632..000000000000 --- a/media-libs/ptex/files/ptex-2.1.28-20170213.patch +++ /dev/null @@ -1,72 +0,0 @@ -diff -purN a/CMakeLists.txt b/CMakeLists.txt ---- a/CMakeLists.txt 2016-04-04 18:14:05.000000000 +0100 -+++ b/CMakeLists.txt 2017-02-13 22:59:10.000000000 +0000 -@@ -16,7 +16,7 @@ else () - endif () - - if (NOT WIN32) -- set(CMAKE_CXX_FLAGS "-std=c++98 -Wall -Wextra -pedantic") -+ set(CMAKE_CXX_FLAGS "-std=c++11 -Wall -Wextra -pedantic ${CMAKE_CXX_FLAGS}") - endif () - - if(MSVC) -diff -purN a/Makefile b/Makefile ---- a/Makefile 2016-04-04 18:14:05.000000000 +0100 -+++ b/Makefile 2017-02-13 22:59:10.000000000 +0000 -@@ -17,6 +17,10 @@ ifdef PRMAN_15_COMPATIBLE_PTEX - CMAKE_FLAGS += -DPRMAN_15_COMPATIBLE_PTEX:BOOL=TRUE - endif - -+ifdef TOOLCHAIN -+ CMAKE_FLAGS += -DCMAKE_TOOLCHAIN_FILE=$(TOOLCHAIN) -+endif -+ - # make V=1 shortcut for VERBOSE=1 - ifdef V - VERBOSE=1 -diff -purN a/src/ptex/PtexHashMap.h b/src/ptex/PtexHashMap.h ---- a/src/ptex/PtexHashMap.h 2016-04-04 18:14:05.000000000 +0100 -+++ b/src/ptex/PtexHashMap.h 2017-02-13 22:59:10.000000000 +0000 -@@ -284,14 +284,11 @@ private: - - Entry* lockEntriesAndGrowIfNeeded(size_t& newMemUsed) - { -- while (_size*2 >= _numEntries) { -- Entry* entries = lockEntries(); -- if (_size*2 >= _numEntries) { -- entries = grow(entries, newMemUsed); -- } -- return entries; -+ Entry* entries = lockEntries(); -+ if (_size*2 >= _numEntries) { -+ entries = grow(entries, newMemUsed); - } -- return lockEntries(); -+ return entries; - } - - Entry* grow(Entry* oldEntries, size_t& newMemUsed) -diff -purN a/src/ptex/PtexIO.h b/src/ptex/PtexIO.h ---- a/src/ptex/PtexIO.h 2016-04-04 18:14:05.000000000 +0100 -+++ b/src/ptex/PtexIO.h 2017-02-13 22:59:10.000000000 +0000 -@@ -40,6 +40,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE - - PTEX_NAMESPACE_BEGIN - -+#pragma pack(push, 1) - struct Header { - uint32_t magic; - uint32_t version; -@@ -98,6 +99,7 @@ struct EditMetaDataHeader { - uint32_t metadatazipsize; - uint32_t metadatamemsize; - }; -+#pragma pack(pop) - - const uint32_t Magic = 'P' | ('t'<<8) | ('e'<<16) | ('x'<<24); - const int HeaderSize = sizeof(Header); -diff -purN a/.workonrc.products b/.workonrc.products ---- a/.workonrc.products 1970-01-01 01:00:00.000000000 +0100 -+++ b/.workonrc.products 2017-02-13 22:59:10.000000000 +0000 -@@ -0,0 +1 @@ -+Ptex diff --git a/media-libs/ptex/files/ptex-2.1.28-allow-custom-build-type.patch b/media-libs/ptex/files/ptex-2.1.28-allow-custom-build-type.patch deleted file mode 100644 index fd79759f7ed4..000000000000 --- a/media-libs/ptex/files/ptex-2.1.28-allow-custom-build-type.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff -purN a/CMakeLists.txt b/CMakeLists.txt ---- a/CMakeLists.txt 2017-02-13 22:59:10.000000000 +0000 -+++ b/CMakeLists.txt 2017-08-08 14:19:10.325817085 +0100 -@@ -8,11 +8,16 @@ include(FindThreads) - - enable_testing() - --# Detect the build type from the $FLAVOR environment variable --if ("$ENV{FLAVOR}" MATCHES "debug") -- set(CMAKE_BUILD_TYPE "Debug" CACHE STRING "type of build" FORCE) --else () -- set(CMAKE_BUILD_TYPE "Release" CACHE STRING "type of build" FORCE) -+if (NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES) -+ # Detect the build type from the $FLAVOR environment variable -+ # Default to optimized Release builds when unspecified. -+ if ("$ENV{FLAVOR}" MATCHES "debug") -+ set(CMAKE_BUILD_TYPE "Debug" CACHE STRING "type of build" FORCE) -+ elseif ("$ENV{FLAVOR}" MATCHES "profile") -+ set(CMAKE_BUILD_TYPE "RelWithDebInfo" CACHE STRING "type of build" FORCE) -+ else () -+ set(CMAKE_BUILD_TYPE "Release" CACHE STRING "type of build" FORCE) -+ endif () - endif () - - if (NOT WIN32) -diff -purN a/Makefile b/Makefile ---- a/Makefile 2017-02-13 22:59:10.000000000 +0000 -+++ b/Makefile 2017-08-08 14:19:16.939829578 +0100 -@@ -21,6 +21,10 @@ ifdef TOOLCHAIN - CMAKE_FLAGS += -DCMAKE_TOOLCHAIN_FILE=$(TOOLCHAIN) - endif - -+ifdef BUILD_TYPE -+ CMAKE_FLAGS += -DCMAKE_BUILD_TYPE=$(BUILD_TYPE) -+endif -+ - # make V=1 shortcut for VERBOSE=1 - ifdef V - VERBOSE=1 diff --git a/media-libs/ptex/files/ptex-2.3.0-cxx11.patch b/media-libs/ptex/files/ptex-2.3.0-cxx11.patch deleted file mode 100644 index f0b600091377..000000000000 --- a/media-libs/ptex/files/ptex-2.3.0-cxx11.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -purN a/CMakeLists.txt b/CMakeLists.txt ---- a/CMakeLists.txt 2016-04-04 18:14:05.000000000 +0100 -+++ b/CMakeLists.txt 2017-02-13 22:59:10.000000000 +0000 -@@ -16,7 +16,7 @@ else () - endif () - - if (NOT WIN32) -- set(CMAKE_CXX_FLAGS "-std=c++98 -Wall -Wextra -pedantic ${CMAKE_CXX_FLAGS}") -+ set(CMAKE_CXX_FLAGS "-std=c++11 -Wall -Wextra -pedantic ${CMAKE_CXX_FLAGS}") - endif () - - if(MSVC) diff --git a/media-libs/ptex/ptex-2.1.28-r1.ebuild b/media-libs/ptex/ptex-2.1.28-r1.ebuild deleted file mode 100644 index 6b688c975e60..000000000000 --- a/media-libs/ptex/ptex-2.1.28-r1.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils - -DESCRIPTION="Per-Face Texture Mapping for Production Rendering" -HOMEPAGE="http://ptex.us/" -SRC_URI="https://github.com/wdas/ptex/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ~x86" - -RDEPEND="sys-libs/zlib:=" -DEPEND="${RDEPEND} - app-doc/doxygen" - -PATCHES=( - "${FILESDIR}/${P}-20170213.patch" - "${FILESDIR}/${P}-allow-custom-build-type.patch" -) - -mycmakeargs=( -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}/html" ) diff --git a/media-libs/ptex/ptex-2.3.0.ebuild b/media-libs/ptex/ptex-2.3.0.ebuild deleted file mode 100644 index ce1f9fd9c98e..000000000000 --- a/media-libs/ptex/ptex-2.3.0.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils - -DESCRIPTION="Per-Face Texture Mapping for Production Rendering" -HOMEPAGE="http://ptex.us/" -SRC_URI="https://github.com/wdas/ptex/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ~x86" -IUSE="static-libs" - -RDEPEND="sys-libs/zlib:=" -DEPEND="${RDEPEND} - app-doc/doxygen" - -RESTRICT="test" - -PATCHES=( - "${FILESDIR}/${P}-cxx11.patch" -) - -src_configure() { - local mycmakeargs=( - -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}/html" - -DPTEX_BUILD_STATIC_LIBS=$(usex static-libs) - ) - cmake-utils_src_configure -} diff --git a/media-libs/ptex/ptex-2.3.2.ebuild b/media-libs/ptex/ptex-2.3.2.ebuild index b9d0f650ba96..48580481fd2b 100644 --- a/media-libs/ptex/ptex-2.3.2.ebuild +++ b/media-libs/ptex/ptex-2.3.2.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/wdas/ptex/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="static-libs" BDEPEND="app-doc/doxygen" -- cgit v1.2.3