From b7ebc951da8800f711142f69d9d958bde67a112d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 28 Apr 2019 09:54:45 +0100 Subject: gentoo resync : 28.04.2019 --- media-libs/rply/Manifest | 6 - media-libs/rply/files/rply-1.01-lc_numeric.patch | 86 ----------- media-libs/rply/files/rply-1.01-stdint.h.patch | 185 ----------------------- media-libs/rply/files/rply_CMakeLists.txt | 39 ----- media-libs/rply/metadata.xml | 5 - media-libs/rply/rply-1.01-r1.ebuild | 40 ----- 6 files changed, 361 deletions(-) delete mode 100644 media-libs/rply/Manifest delete mode 100644 media-libs/rply/files/rply-1.01-lc_numeric.patch delete mode 100644 media-libs/rply/files/rply-1.01-stdint.h.patch delete mode 100644 media-libs/rply/files/rply_CMakeLists.txt delete mode 100644 media-libs/rply/metadata.xml delete mode 100644 media-libs/rply/rply-1.01-r1.ebuild (limited to 'media-libs/rply') diff --git a/media-libs/rply/Manifest b/media-libs/rply/Manifest deleted file mode 100644 index c1696eb818c1..000000000000 --- a/media-libs/rply/Manifest +++ /dev/null @@ -1,6 +0,0 @@ -AUX rply-1.01-lc_numeric.patch 2868 BLAKE2B 42b624e137c20485e503d0c1f0e2f1f4e1998f0959a3202c8554bc9a39ffab49141bc90a7287df74adcb6677bef8dff40337f112922481b8599afbb38015964d SHA512 f17c4a5c7106f860c68d9eb4ff9bd6f1daa0abf674f8a6130dd80e7744ee800fd74a65e7f563bd70f826b6b9af3aeb5e3f23dd37e3aea3710b6e023e9330d4a3 -AUX rply-1.01-stdint.h.patch 6326 BLAKE2B bc839f43e96923c0f2bcec7ca28b5ec548c122c2e29aaf4217207bf306981a658086e32fc2f0b2810c31ee87a1f87ba25319946307fd85ed2dfb5694a3507fab SHA512 a3611eeccd37a18ffa30ba8b9093d29386fb20169bfbb45a581f079580731e431f98a455b2f9c1433f751d77ed5cda7b7a09ef43c5561268345cb8737b7fa834 -AUX rply_CMakeLists.txt 1256 BLAKE2B fa8aab3001c3d1ea22f3b2aca8ff6447bb90019ba5d2e1efd31d7b8434965b1192bdb34ed20291f7e768759a30897776a69e20d5732429f3d30bf66b71860a36 SHA512 071e58199b832b371211f6b9de8ad517fca8dd5eda2850eef50d9166fa7f3f4ba8f579b7c82afdca34f57246a795957c800449ca8ded8c3af2217a86be634e59 -DIST rply-1.01.tar.gz 28903 BLAKE2B f6b6cef38951ed48eab58f3336501d9d3875a340b7475c6dd52f3823a126873d5f43bac9b38423ec1a89fb746e234f060e1cb4ec62bb509a79641f757d61e254 SHA512 c5d9b8b031bff24ad6ae71a0b3b2fc265cdf9db4386389d48dbe05eac48d2db289d7ca86aa4e7379f8596cf08909c647e74714775b2c699bee31d987ad355474 -EBUILD rply-1.01-r1.ebuild 1073 BLAKE2B 4744e65fbc4548866b84b5cd88ec4751e4c89ba17bdf08507124f7365cebba3de2ad79ca4730cd75c14585dace3bf00968bd1f8d3afbd71fbf1b9b62bfceae43 SHA512 e87489bd5fc108f1a1fc6be7af9f96102ee0b1643e81ffc4b7387c31efad62462444940c7b561b6638a056306b084fb5824b6809b489f52834f961b17acdb746 -MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 diff --git a/media-libs/rply/files/rply-1.01-lc_numeric.patch b/media-libs/rply/files/rply-1.01-lc_numeric.patch deleted file mode 100644 index 6d98abd95d57..000000000000 --- a/media-libs/rply/files/rply-1.01-lc_numeric.patch +++ /dev/null @@ -1,86 +0,0 @@ -From 8a7a76b7dcc94e8e71725e26a146330c73377ebd Mon Sep 17 00:00:00 2001 -From: Alexandre Rostovtsev -Date: Mon, 26 Sep 2011 04:46:44 -0400 -Subject: [PATCH 2/2] Switch LC_NUMERIC locale to "C" for decimal point - separator safety - -Make sure to switch the LC_NUMERIC locale to "C" when using strtod() and -fpritnf("%g",...) to ensure that '.' is used as the decimal point -separator when reading and writing .ply files. ---- - rply.c | 31 +++++++++++++++++++++++++++---- - 1 files changed, 27 insertions(+), 4 deletions(-) - -diff --git a/rply.c b/rply.c -index 9eaa77f..789c002 100644 ---- a/rply.c -+++ b/rply.c -@@ -12,6 +12,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -1229,13 +1230,27 @@ static int oascii_uint32(p_ply ply, double value) { - } - - static int oascii_float32(p_ply ply, double value) { -+ char *curr_locale; -+ int ret; - if (value < -FLT_MAX || value > FLT_MAX) return 0; -- return fprintf(ply->fp, "%g ", (float) value) > 0; -+ /* Switch locale to C to use '.' as the decimal point separator */ -+ curr_locale = setlocale(LC_NUMERIC, NULL); -+ setlocale(LC_NUMERIC, "C"); -+ ret = fprintf(ply->fp, "%g ", (float) value); -+ setlocale(LC_NUMERIC, curr_locale); -+ return ret > 0; - } - - static int oascii_float64(p_ply ply, double value) { -+ char *curr_locale; -+ int ret; - if (value < -DBL_MAX || value > DBL_MAX) return 0; -- return fprintf(ply->fp, "%g ", value) > 0; -+ /* Switch locale to C to use '.' as the decimal point separator */ -+ curr_locale = setlocale(LC_NUMERIC, NULL); -+ setlocale(LC_NUMERIC, "C"); -+ ret = fprintf(ply->fp, "%g ", value); -+ setlocale(LC_NUMERIC, curr_locale); -+ return ret > 0; - } - - static int obinary_int8(p_ply ply, double value) { -@@ -1336,17 +1351,25 @@ static int iascii_uint32(p_ply ply, double *value) { - } - - static int iascii_float32(p_ply ply, double *value) { -- char *end; -+ char *end, *curr_locale; - if (!ply_read_word(ply)) return 0; -+ /* Switch locale to C to use '.' as the decimal point separator */ -+ curr_locale = setlocale(LC_NUMERIC, NULL); -+ setlocale(LC_NUMERIC, "C"); - *value = strtod(BWORD(ply), &end); -+ setlocale(LC_NUMERIC, curr_locale); - if (*end || *value < -FLT_MAX || *value > FLT_MAX) return 0; - return 1; - } - - static int iascii_float64(p_ply ply, double *value) { -- char *end; -+ char *end, *curr_locale; - if (!ply_read_word(ply)) return 0; -+ /* Switch locale to C to use '.' as the decimal point separator */ -+ curr_locale = setlocale(LC_NUMERIC, NULL); -+ setlocale(LC_NUMERIC, "C"); - *value = strtod(BWORD(ply), &end); -+ setlocale(LC_NUMERIC, curr_locale); - if (*end || *value < -DBL_MAX || *value > DBL_MAX) return 0; - return 1; - } --- -1.7.6.1 - diff --git a/media-libs/rply/files/rply-1.01-stdint.h.patch b/media-libs/rply/files/rply-1.01-stdint.h.patch deleted file mode 100644 index 45c911643bcb..000000000000 --- a/media-libs/rply/files/rply-1.01-stdint.h.patch +++ /dev/null @@ -1,185 +0,0 @@ -From eeb09032068baed6d81cff01cdfcccd6d55a8152 Mon Sep 17 00:00:00 2001 -From: Alexandre Rostovtsev -Date: Mon, 26 Sep 2011 04:45:49 -0400 -Subject: [PATCH 1/2] Use stdint.h types - -Use stdint.h types (int16_t and int32_t) instead of assuming that short -and long must always a specific number of bytes. Also, use strtoul for -reading uint32_t values. ---- - rply.c | 61 ++++++++++++++++++++++++++++--------------------------------- - 1 files changed, 28 insertions(+), 33 deletions(-) - -diff --git a/rply.c b/rply.c -index 042244f..9eaa77f 100644 ---- a/rply.c -+++ b/rply.c -@@ -15,6 +15,7 @@ - #include - #include - #include -+#include - - #include "rply.h" - -@@ -1183,18 +1184,12 @@ static e_ply_storage_mode ply_arch_endian(void) { - static int ply_type_check(void) { - assert(sizeof(char) == 1); - assert(sizeof(unsigned char) == 1); -- assert(sizeof(short) == 2); -- assert(sizeof(unsigned short) == 2); -- assert(sizeof(long) == 4); -- assert(sizeof(unsigned long) == 4); -+ assert(sizeof(long) >= 4); - assert(sizeof(float) == 4); - assert(sizeof(double) == 8); - if (sizeof(char) != 1) return 0; - if (sizeof(unsigned char) != 1) return 0; -- if (sizeof(short) != 2) return 0; -- if (sizeof(unsigned short) != 2) return 0; -- if (sizeof(long) != 4) return 0; -- if (sizeof(unsigned long) != 4) return 0; -+ if (sizeof(long) < 4) return 0; - if (sizeof(float) != 4) return 0; - if (sizeof(double) != 8) return 0; - return 1; -@@ -1214,23 +1209,23 @@ static int oascii_uint8(p_ply ply, double value) { - } - - static int oascii_int16(p_ply ply, double value) { -- if (value > SHRT_MAX || value < SHRT_MIN) return 0; -- return fprintf(ply->fp, "%d ", (short) value) > 0; -+ if (value > INT16_MAX || value < INT16_MIN) return 0; -+ return fprintf(ply->fp, "%d ", (int16_t) value) > 0; - } - - static int oascii_uint16(p_ply ply, double value) { -- if (value > USHRT_MAX || value < 0) return 0; -- return fprintf(ply->fp, "%d ", (unsigned short) value) > 0; -+ if (value > UINT16_MAX || value < 0) return 0; -+ return fprintf(ply->fp, "%d ", (uint16_t) value) > 0; - } - - static int oascii_int32(p_ply ply, double value) { -- if (value > LONG_MAX || value < LONG_MIN) return 0; -- return fprintf(ply->fp, "%d ", (int) value) > 0; -+ if (value > INT32_MAX || value < INT32_MIN) return 0; -+ return fprintf(ply->fp, "%d ", (int32_t) value) > 0; - } - - static int oascii_uint32(p_ply ply, double value) { -- if (value > ULONG_MAX || value < 0) return 0; -- return fprintf(ply->fp, "%d ", (unsigned int) value) > 0; -+ if (value > UINT32_MAX || value < 0) return 0; -+ return fprintf(ply->fp, "%d ", (uint32_t) value) > 0; - } - - static int oascii_float32(p_ply ply, double value) { -@@ -1256,26 +1251,26 @@ static int obinary_uint8(p_ply ply, double value) { - } - - static int obinary_int16(p_ply ply, double value) { -- short int16 = (short) value; -- if (value > SHRT_MAX || value < SHRT_MIN) return 0; -+ int16_t int16 = value; -+ if (value > INT16_MAX || value < INT16_MIN) return 0; - return ply->odriver->ochunk(ply, &int16, sizeof(int16)); - } - - static int obinary_uint16(p_ply ply, double value) { -- unsigned short uint16 = (unsigned short) value; -- if (value > USHRT_MAX || value < 0) return 0; -+ uint16_t uint16 = value; -+ if (value > UINT16_MAX || value < 0) return 0; - return ply->odriver->ochunk(ply, &uint16, sizeof(uint16)); - } - - static int obinary_int32(p_ply ply, double value) { -- long int32 = (long) value; -- if (value > LONG_MAX || value < LONG_MIN) return 0; -+ int32_t int32 = value; -+ if (value > INT32_MAX || value < INT32_MIN) return 0; - return ply->odriver->ochunk(ply, &int32, sizeof(int32)); - } - - static int obinary_uint32(p_ply ply, double value) { -- unsigned long uint32 = (unsigned long) value; -- if (value > ULONG_MAX || value < 0) return 0; -+ uint32_t uint32 = value; -+ if (value > UINT32_MAX || value < 0) return 0; - return ply->odriver->ochunk(ply, &uint32, sizeof(uint32)); - } - -@@ -1312,7 +1307,7 @@ static int iascii_int16(p_ply ply, double *value) { - char *end; - if (!ply_read_word(ply)) return 0; - *value = strtol(BWORD(ply), &end, 10); -- if (*end || *value > SHRT_MAX || *value < SHRT_MIN) return 0; -+ if (*end || *value > INT16_MAX || *value < INT16_MIN) return 0; - return 1; - } - -@@ -1320,7 +1315,7 @@ static int iascii_uint16(p_ply ply, double *value) { - char *end; - if (!ply_read_word(ply)) return 0; - *value = strtol(BWORD(ply), &end, 10); -- if (*end || *value > USHRT_MAX || *value < 0) return 0; -+ if (*end || *value > UINT16_MAX || *value < 0) return 0; - return 1; - } - -@@ -1328,15 +1323,15 @@ static int iascii_int32(p_ply ply, double *value) { - char *end; - if (!ply_read_word(ply)) return 0; - *value = strtol(BWORD(ply), &end, 10); -- if (*end || *value > LONG_MAX || *value < LONG_MIN) return 0; -+ if (*end || *value > INT32_MAX || *value < INT32_MIN) return 0; - return 1; - } - - static int iascii_uint32(p_ply ply, double *value) { - char *end; - if (!ply_read_word(ply)) return 0; -- *value = strtol(BWORD(ply), &end, 10); -- if (*end || *value < 0) return 0; -+ *value = strtoul(BWORD(ply), &end, 10); -+ if (*end || *value > UINT32_MAX || *value < 0) return 0; - return 1; - } - -@@ -1371,28 +1366,28 @@ static int ibinary_uint8(p_ply ply, double *value) { - } - - static int ibinary_int16(p_ply ply, double *value) { -- short int16; -+ int16_t int16; - if (!ply->idriver->ichunk(ply, &int16, sizeof(int16))) return 0; - *value = int16; - return 1; - } - - static int ibinary_uint16(p_ply ply, double *value) { -- unsigned short uint16; -+ uint16_t uint16; - if (!ply->idriver->ichunk(ply, &uint16, sizeof(uint16))) return 0; - *value = uint16; - return 1; - } - - static int ibinary_int32(p_ply ply, double *value) { -- long int32; -+ int32_t int32; - if (!ply->idriver->ichunk(ply, &int32, sizeof(int32))) return 0; - *value = int32; - return 1; - } - - static int ibinary_uint32(p_ply ply, double *value) { -- unsigned long uint32; -+ uint32_t uint32; - if (!ply->idriver->ichunk(ply, &uint32, sizeof(uint32))) return 0; - *value = uint32; - return 1; --- -1.7.6.1 - diff --git a/media-libs/rply/files/rply_CMakeLists.txt b/media-libs/rply/files/rply_CMakeLists.txt deleted file mode 100644 index 5497fffb225f..000000000000 --- a/media-libs/rply/files/rply_CMakeLists.txt +++ /dev/null @@ -1,39 +0,0 @@ -# Fedora's cmake file for rply -# http://pkgs.fedoraproject.org/gitweb/?p=rply.git;a=blob;f=rply_CMakeLists.txt -PROJECT(rply) -cmake_minimum_required(VERSION 2.6) - -SET(RPLY_LIB_MAJOR_VERSION 1) -SET(RPLY_LIB_MINOR_VERSION 01) - -SET(RPLY_CMAKE_DIR ${CMAKE_SOURCE_DIR}/CMake/ ) -SET(RPLY_LIBRARY librply.so ) - -add_library(rply SHARED rply.c ) -set_target_properties( rply PROPERTIES - VERSION ${RPLY_LIB_MAJOR_VERSION}.${RPLY_LIB_MINOR_VERSION} - SOVERSION ${RPLY_LIB_MAJOR_VERSION} - ) - -include_directories( ${CMAKE_SOURCE_DIR} ) -add_executable(rply_convert etc/convert.c ) -add_executable(rply_dump etc/dump.c ) -add_executable(rply_sconvert etc/sconvert.c ) -target_link_libraries (rply_convert rply) -target_link_libraries (rply_dump rply) -target_link_libraries (rply_sconvert rply) - -# Installs the header files -install(FILES rply.h DESTINATION include/rply) - -# Installs the target file -install(TARGETS rply LIBRARY DESTINATION lib${LIB_SUFFIX}) -install(TARGETS rply_convert RUNTIME DESTINATION bin) -install(TARGETS rply_dump RUNTIME DESTINATION bin) -install(TARGETS rply_sconvert RUNTIME DESTINATION bin) - -#This should be the last line of the project -SUBDIRS( CMake/export ) - - - diff --git a/media-libs/rply/metadata.xml b/media-libs/rply/metadata.xml deleted file mode 100644 index 6f49eba8f496..000000000000 --- a/media-libs/rply/metadata.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/media-libs/rply/rply-1.01-r1.ebuild b/media-libs/rply/rply-1.01-r1.ebuild deleted file mode 100644 index b2874323bdd1..000000000000 --- a/media-libs/rply/rply-1.01-r1.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils - -DESCRIPTION="A library to read and write PLY files" -HOMEPAGE="http://w3.impa.br/~diego/software/rply/" -# SRC_URI="http://w3.impa.br/~diego/software/rply/${P}.tar.gz" -# Tarball no longer available from upstream website -SRC_URI="https://dev.gentoo.org/~tetromino/distfiles/${PN}/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="doc" - -DEPEND="" -RDEPEND="${DEPEND}" - -PATCHES=( - # Use int16_t and int32_t instead of assuming e.g. that sizeof(long) == 4 - "${FILESDIR}/${P}-stdint.h.patch" - # Switch LC_NUMERIC locale to "C" to ensure "." is the decimal separator - "${FILESDIR}/${P}-lc_numeric.patch" -) - -pkg_setup() { - use doc && HTML_DOCS="manual/*" -} - -src_prepare() { - # rply doesn't have *any* build system - not even a Makefile! - # For simplicity, use the cmake file that Fedora maintainers have created - cp "${FILESDIR}/rply_CMakeLists.txt" CMakeLists.txt || die - mkdir -p CMake/export || die - - cmake-utils_src_prepare -} -- cgit v1.2.3