* [gentoo-commits] repo/gentoo:master commit in: media-libs/ptex/, media-libs/ptex/files/
@ 2017-09-23 8:38 David Seifert
0 siblings, 0 replies; 5+ messages in thread
From: David Seifert @ 2017-09-23 8:38 UTC (permalink / raw
To: gentoo-commits
commit: 952cb1555b5ec3b133b5f0deb4fdd26810d5ae47
Author: Jonathan Scruggs <j.scruggs <AT> gmail <DOT> com>
AuthorDate: Thu Sep 21 09:26:32 2017 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Sep 23 08:37:18 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=952cb155
media-libs/ptex: revision bump to 2.1.28-r1
* Add latest upstream fixes
* Add patch to allow custom build types
Closes: https://github.com/gentoo/gentoo/pull/5753
media-libs/ptex/files/ptex-2.1.28-20170213.patch | 72 ++++++++++++++++++++++
.../ptex-2.1.28-allow-custom-build-type.patch | 39 ++++++++++++
media-libs/ptex/ptex-2.1.28-r1.ebuild | 25 ++++++++
3 files changed, 136 insertions(+)
diff --git a/media-libs/ptex/files/ptex-2.1.28-20170213.patch b/media-libs/ptex/files/ptex-2.1.28-20170213.patch
new file mode 100644
index 00000000000..335d0778863
--- /dev/null
+++ b/media-libs/ptex/files/ptex-2.1.28-20170213.patch
@@ -0,0 +1,72 @@
+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
new file mode 100644
index 00000000000..fd79759f7ed
--- /dev/null
+++ b/media-libs/ptex/files/ptex-2.1.28-allow-custom-build-type.patch
@@ -0,0 +1,39 @@
+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/ptex-2.1.28-r1.ebuild b/media-libs/ptex/ptex-2.1.28-r1.ebuild
new file mode 100644
index 00000000000..494ddef43b0
--- /dev/null
+++ b/media-libs/ptex/ptex-2.1.28-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 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" )
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/ptex/, media-libs/ptex/files/
@ 2018-08-15 20:08 Jonathan Scruggs
0 siblings, 0 replies; 5+ messages in thread
From: Jonathan Scruggs @ 2018-08-15 20:08 UTC (permalink / raw
To: gentoo-commits
commit: cf90a26960bf46cafe077d8eee562044ac4d8dd1
Author: Jonathan Scruggs <j.scruggs <AT> gmail <DOT> com>
AuthorDate: Wed Aug 15 17:35:27 2018 +0000
Commit: Jonathan Scruggs <dracwyrm <AT> gentoo <DOT> org>
CommitDate: Wed Aug 15 20:08:17 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf90a269
media-libs/ptex: bump to version 2.3.0
Restrict tests as not fixed upstream:
Closes: https://bugs.gentoo.org/646006
media-libs/ptex/Manifest | 1 +
media-libs/ptex/files/ptex-2.3.0-cxx11.patch | 12 ++++++++++
media-libs/ptex/ptex-2.3.0.ebuild | 33 ++++++++++++++++++++++++++++
3 files changed, 46 insertions(+)
diff --git a/media-libs/ptex/Manifest b/media-libs/ptex/Manifest
index a49cd522665..f7c5d0f3e48 100644
--- a/media-libs/ptex/Manifest
+++ b/media-libs/ptex/Manifest
@@ -1 +1,2 @@
DIST ptex-2.1.28.tar.gz 305327 BLAKE2B 4a91b08ae326e8ed8d420022c693ea60cb21908380b8c49a7672771686f9dd2ef05151b7d43755bc63ab6624db772c2b53d1ffdcdea9c1dff7627cc3fe0f3b15 SHA512 ddce3c79f14d196e550c1e8a5b371482f88190cd667a2e2aa84601de1639f7cabb8571c1b3a49b48df46ce550d27088a00a67b1403c3bfec2ed73437c3dca3e8
+DIST ptex-2.3.0.tar.gz 306462 BLAKE2B 790e3623ce6ebae2dfd8884d8e19e62395c54432289d88bdcf3a01c8ae1ef752ca88869357ac1e4657d59f1ca73d311a3fb9a08efe4e145ca259eff93d8a3b6a SHA512 2d9d320e4205236a4eff05ec3c67d085624809ebefa89fa3b943d18a8b2b6a5f61c022a4cc4363a7c6ceccfb9eac4f8738dff2e90a3355814f2c4ff096c09992
diff --git a/media-libs/ptex/files/ptex-2.3.0-cxx11.patch b/media-libs/ptex/files/ptex-2.3.0-cxx11.patch
new file mode 100644
index 00000000000..f0b60009137
--- /dev/null
+++ b/media-libs/ptex/files/ptex-2.3.0-cxx11.patch
@@ -0,0 +1,12 @@
+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.3.0.ebuild b/media-libs/ptex/ptex-2.3.0.ebuild
new file mode 100644
index 00000000000..b3cec3d387b
--- /dev/null
+++ b/media-libs/ptex/ptex-2.3.0.ebuild
@@ -0,0 +1,33 @@
+# 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"
+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
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/ptex/, media-libs/ptex/files/
@ 2019-05-21 21:55 Andreas Sturmlechner
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2019-05-21 21:55 UTC (permalink / raw
To: gentoo-commits
commit: 990682531e4094824f0ba2986193f6876d41e7f0
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue May 21 21:18:23 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue May 21 21:55:04 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99068253
media-libs/ptex: 2.3.2 version bump
Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-libs/ptex/Manifest | 1 +
media-libs/ptex/files/ptex-2.3.2-cxx11.patch | 22 ++++++++++++++++
media-libs/ptex/ptex-2.3.2.ebuild | 39 ++++++++++++++++++++++++++++
3 files changed, 62 insertions(+)
diff --git a/media-libs/ptex/Manifest b/media-libs/ptex/Manifest
index f7c5d0f3e48..439468d5e6e 100644
--- a/media-libs/ptex/Manifest
+++ b/media-libs/ptex/Manifest
@@ -1,2 +1,3 @@
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
diff --git a/media-libs/ptex/files/ptex-2.3.2-cxx11.patch b/media-libs/ptex/files/ptex-2.3.2-cxx11.patch
new file mode 100644
index 00000000000..f35372b7c63
--- /dev/null
+++ b/media-libs/ptex/files/ptex-2.3.2-cxx11.patch
@@ -0,0 +1,22 @@
+--- a/CMakeLists.txt 2019-03-08 18:39:47.000000000 +0100
++++ b/CMakeLists.txt 2019-05-21 23:20:50.964082298 +0200
+@@ -5,19 +5,6 @@
+ option(PTEX_BUILD_SHARED_LIBS "Enable building Ptex shared libraries" ON)
+ option(PRMAN_15_COMPATIBLE_PTEX "Enable PRMan 15 compatibility" OFF)
+
+-if (DEFINED ENV{CXXFLAGS_STD})
+- if ($ENV{CXXFLAGS_STD} STREQUAL "c++17")
+- set(CMAKE_CXX_STANDARD 17)
+- elseif ($ENV{CXXFLAGS_STD} STREQUAL "c++14")
+- set(CMAKE_CXX_STANDARD 14)
+- elseif ($ENV{CXXFLAGS_STD} STREQUAL "c++11")
+- set(CMAKE_CXX_STANDARD 11)
+- else ()
+- set(CMAKE_CXX_STANDARD 98)
+- endif ()
+-else ()
+- set(CMAKE_CXX_STANDARD 98)
+-endif ()
+ set(CMAKE_CXX_EXTENSIONS OFF)
+ set(CMAKE_FIND_PACKAGE_RESOLVE_SYMLINKS ON)
+ set(CMAKE_INSTALL_MESSAGE LAZY) # Silence "Up-to-date:" install messages
diff --git a/media-libs/ptex/ptex-2.3.2.ebuild b/media-libs/ptex/ptex-2.3.2.ebuild
new file mode 100644
index 00000000000..b9d0f650ba9
--- /dev/null
+++ b/media-libs/ptex/ptex-2.3.2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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"
+
+BDEPEND="app-doc/doxygen"
+RDEPEND="sys-libs/zlib"
+DEPEND="${RDEPEND}"
+
+RESTRICT="test"
+
+PATCHES=( "${FILESDIR}/${P}-cxx11.patch" )
+
+src_prepare() {
+ # https://github.com/wdas/ptex/issues/41
+ cat <<-EOF > version || die
+ ${PV}
+ EOF
+ cmake-utils_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}/html"
+ -DPTEX_BUILD_STATIC_LIBS=$(usex static-libs)
+ )
+ cmake-utils_src_configure
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/ptex/, media-libs/ptex/files/
@ 2019-06-09 20:24 Andreas Sturmlechner
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2019-06-09 20:24 UTC (permalink / raw
To: gentoo-commits
commit: 9065c85aa8c015d1e35d9d42e97ae311c986e52c
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 9 20:22:18 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jun 9 20:24:16 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9065c85a
media-libs/ptex: Drop 2.1.28-r1 and 2.3.0
Package-Manager: Portage-2.3.67, Repoman-2.3.14
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-libs/ptex/Manifest | 2 -
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 ----------
6 files changed, 183 deletions(-)
diff --git a/media-libs/ptex/Manifest b/media-libs/ptex/Manifest
index 439468d5e6e..185404267ba 100644
--- a/media-libs/ptex/Manifest
+++ b/media-libs/ptex/Manifest
@@ -1,3 +1 @@
-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
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 335d0778863..00000000000
--- 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 fd79759f7ed..00000000000
--- 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 f0b60009137..00000000000
--- 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 6b688c975e6..00000000000
--- 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 ce1f9fd9c98..00000000000
--- 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
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/ptex/, media-libs/ptex/files/
@ 2023-05-16 19:32 Andreas Sturmlechner
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2023-05-16 19:32 UTC (permalink / raw
To: gentoo-commits
commit: 0fa490d508d20f73d206d471f44deca5974d3e35
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun May 14 08:15:36 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue May 16 19:32:08 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0fa490d5
media-libs/ptex: drop 2.3.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-libs/ptex/Manifest | 1 -
media-libs/ptex/files/ptex-2.3.2-cxx11.patch | 22 ----------------
media-libs/ptex/ptex-2.3.2.ebuild | 39 ----------------------------
3 files changed, 62 deletions(-)
diff --git a/media-libs/ptex/Manifest b/media-libs/ptex/Manifest
index 8442a8fa3c7f..a798b93d52fb 100644
--- a/media-libs/ptex/Manifest
+++ b/media-libs/ptex/Manifest
@@ -1,2 +1 @@
-DIST ptex-2.3.2.tar.gz 308550 BLAKE2B 7b3145dbf9d2c13140c3f20ed606ee911deed3c38fd30adfbb01b58c3af5794dbd4e0fa1fbab6e8ae83556a0ffec725bf077271abf752f1271ed721ca200a1ff SHA512 dbc557dc5e1761204ee3483af9bf4ff1504cbd7955e0405dc27a51f7182e2445e41db086b2792c2491aa2cbaddc74e523170a4b3d25e44d332123d5b7081f4b9
DIST ptex-2.4.2.tar.gz 312942 BLAKE2B 13446eae2327f92410859f7e01dc30e46a069d2069b2b1bf1bd9fe52902efacb6aeadc2c3bdc66dfad17662e01ae6fd3fac2861674691646871721d9e12ceb12 SHA512 3b9607b7803e7c857bb00a6d4d8bbe108810c622a3593fb5d655183f3e6689f274ee5e79bcaab6928de38daf05cf25eb56125f39477f134131a8ad45071551b3
diff --git a/media-libs/ptex/files/ptex-2.3.2-cxx11.patch b/media-libs/ptex/files/ptex-2.3.2-cxx11.patch
deleted file mode 100644
index f35372b7c636..000000000000
--- a/media-libs/ptex/files/ptex-2.3.2-cxx11.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/CMakeLists.txt 2019-03-08 18:39:47.000000000 +0100
-+++ b/CMakeLists.txt 2019-05-21 23:20:50.964082298 +0200
-@@ -5,19 +5,6 @@
- option(PTEX_BUILD_SHARED_LIBS "Enable building Ptex shared libraries" ON)
- option(PRMAN_15_COMPATIBLE_PTEX "Enable PRMan 15 compatibility" OFF)
-
--if (DEFINED ENV{CXXFLAGS_STD})
-- if ($ENV{CXXFLAGS_STD} STREQUAL "c++17")
-- set(CMAKE_CXX_STANDARD 17)
-- elseif ($ENV{CXXFLAGS_STD} STREQUAL "c++14")
-- set(CMAKE_CXX_STANDARD 14)
-- elseif ($ENV{CXXFLAGS_STD} STREQUAL "c++11")
-- set(CMAKE_CXX_STANDARD 11)
-- else ()
-- set(CMAKE_CXX_STANDARD 98)
-- endif ()
--else ()
-- set(CMAKE_CXX_STANDARD 98)
--endif ()
- set(CMAKE_CXX_EXTENSIONS OFF)
- set(CMAKE_FIND_PACKAGE_RESOLVE_SYMLINKS ON)
- set(CMAKE_INSTALL_MESSAGE LAZY) # Silence "Up-to-date:" install messages
diff --git a/media-libs/ptex/ptex-2.3.2.ebuild b/media-libs/ptex/ptex-2.3.2.ebuild
deleted file mode 100644
index 7a3f0ff151bf..000000000000
--- a/media-libs/ptex/ptex-2.3.2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-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 ~arm ~arm64 ~riscv x86"
-IUSE="static-libs"
-
-BDEPEND="app-doc/doxygen"
-RDEPEND="sys-libs/zlib"
-DEPEND="${RDEPEND}"
-
-RESTRICT="test"
-
-PATCHES=( "${FILESDIR}/${P}-cxx11.patch" )
-
-src_prepare() {
- # https://github.com/wdas/ptex/issues/41
- cat <<-EOF > version || die
- ${PV}
- EOF
- cmake_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}/html"
- -DPTEX_BUILD_STATIC_LIBS=$(usex static-libs)
- )
- cmake_src_configure
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2023-05-16 19:32 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-06-09 20:24 [gentoo-commits] repo/gentoo:master commit in: media-libs/ptex/, media-libs/ptex/files/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2023-05-16 19:32 Andreas Sturmlechner
2019-05-21 21:55 Andreas Sturmlechner
2018-08-15 20:08 Jonathan Scruggs
2017-09-23 8:38 David Seifert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox