root
10 years ago
parent
50c02aaa33
commit
c619642775
@ -1,6 +1,8 @@
|
||||
DIST 0.46.tar.gz 211917 SHA256 dbfe47d0b721b8a0c2b47fae6766fb03a62bbbd26f99d082c004074f0d28ed2f SHA512 1f8869d81d6237a72d22eb0e801cbe7ce59fccfc5cd730f58f9b5d0736bec85458cebf8b0e115719f8c7ac326c06b54465be9d23b8b3e1db9e0d11dbb79e2f90 WHIRLPOOL be4481fa15a90ae8c8adbf396d7d352e651c35efee727cd4546944378509d890af8654c3bd52e9dfd3f32cd6bab8b3651bea32cdaca37b149151da56b4a50330
|
||||
DIST 0.51.2.tar.gz 219822 SHA256 280a5b6b38042c34df2409fb1a54dd231cc2820818854d774aec8363b16117d7 SHA512 61aafce363ef26c8ce0c218fa2722cb52614d73481bb10719526d127a3b87116483aabd4761452cb1181f8e76e5d19b05a727132f71c99d827b003d07b42733a WHIRLPOOL 5f0b5b1d8f86a499ad93730e4af846b340e556e09904dd0a45bf98eeeb727c277071fc4edf2b2174bcd55f2c80766636d175f1f8498afcac6a1085fe5ca726e8
|
||||
DIST Rex-0.45.1.tar.gz 196657 SHA256 0183ac7c201c00e1b54fc135daa35ee32ad4712491b15700c2fc1f35f87c7c5c SHA512 ede66c3373b6b8d03dd5ac3b25a31797d9e32117678a5211bf0e9c0a72697b97414ebb077220a1f8a4a3f2feff6652ea532cbe03ded06cb3f295eb03985e5695 WHIRLPOOL 8c595f2ff5e015b6d7c969497b8824a9bbf0ae0143c447c558c84daf42f534514cd0c254682ffa68f975dd84e149cd38df206688cd0ea31ff3bf832cb70da171
|
||||
EBUILD rex-0.45.1.ebuild 700 SHA256 3d27626e758690445d350c7970130781f8cb7c9e168a496a7f2255d7560599f3 SHA512 2c85e733027b66963bc765671ea93e5e724891a2de49ac49edd45f32eec8c0bcefa1d6af9f7435a335ed38c5007b27932e1161d9bc48125ada2c7ced1cd2c6ab WHIRLPOOL 63d4f7baed4f3f1f513c97acad10fca4663fcdadaf312129f4355173dba2bda6b88d8b6cef1d6d83c2ad37d8d0aab17469ba4be85adfd2f5042682cae1b33336
|
||||
EBUILD rex-0.46.ebuild 715 SHA256 4d11143d995d5ae9d9dd180fb57548476663aa140b037a84183880226fadf15e SHA512 c18dde654c1d6a9686e6908a61083d7cfd54557c0041bb7c1f12ee8dc5fcd8174a3eef21503202d4eeff5bc05d473fb89c5bb69aaf9d9044a54edba4a113886f WHIRLPOOL c340b3f619842e502c311030a68d9d26c9dac20efd338a82ee58ef558440a5fe8f40150a92ff08c9146a8af9f085458cbead4b7504d82bb32d92a1a257d74aeb
|
||||
MISC ChangeLog 2616 SHA256 5878a8fa11d927a86a27e85a5a284f9739fffeaf0f33b68821bbb528dd266427 SHA512 eb91ad8fa352f4eabd3c7f3c10b59aca162742e211519a038d3e008fa4db461ee7d0ed2ee1c2c0b846a27d1e81fee566f294915d32387bb8ec03ca22144e4282 WHIRLPOOL 2d2862a360c98a706e379983a5936a77c513c5ab09c2e42a68f31ed0b26aba9a177377ead79d5984b99c17dee703769cf4d609ef46d6f1b2c8754eb596251f80
|
||||
EBUILD rex-0.51.2.ebuild 748 SHA256 e3a4b8e766e825588ba29dcb62eec99719dcf1cdb33bcbf9ecb413594f894f09 SHA512 2da3370ecced70e05a4ee14c30f853faf2fe170497579386b9a7788553d6ff79af34f149ffa6dc83d67329d7fe822dc1d7f006c595cd6b4d70d5e52ab4c3244c WHIRLPOOL 9ad96589e84c2bfe986d6d6e0ddcb810665a264f91ece4550a31063a8603261678a18086fd0326e0d6cd8f27adf48328749710c78eab8c80263d6aa4e467776a
|
||||
MISC ChangeLog 2721 SHA256 98599a82a693250159dbf2c6a466e42bf43e8c087ce3feb0ec85465b44cfd86a SHA512 bf6903461d46fb3801a065a4fc12e1c27c3ca07ac0aaf44d6ed3fd9421e4679b20d92f7b948606fd004d9c822f5db4a828a8328c9dd62c3df48c98b7f62d5944 WHIRLPOOL 11f8afbba925075cc58163955dcb55cb416da0e6c549cf163e34b033593c4bb2050e4173abce9547b647ead51d4618d99efb6fcedcb6272d28792d24a1a4b204
|
||||
MISC metadata.xml 233 SHA256 65209e280ca6de32a92e1a57301ff69fb3472e55ba07848d6f80405d35e92d47 SHA512 0d30bfb39315a04767e07896409f5d3954f8e954e20fcbac7b92bb9a636c9f61c50b1b2cf55e6c1db9a199a0edc159b5c8cc8f541efb9c4adafa28e3652cff7b WHIRLPOOL 027c5101e1cbc665c9d2ef240f73a874c9f49a9b70175c5947e012df61de484585088a46b6ce9078816e548e6bcc326e7223539cc999159eee2757d0a2eb1480
|
||||
|
||||
@ -0,0 +1,33 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-admin/rex/rex-0.51.2.ebuild,v 1.1 2014/08/15 03:21:03 patrick Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
inherit perl-module
|
||||
|
||||
SRC_URI="https://github.com/RexOps/Rex/archive/${PV}.tar.gz"
|
||||
|
||||
DESCRIPTION="(R)?ex is a small script to ease the execution of remote commands"
|
||||
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE=""
|
||||
|
||||
RDEPEND="dev-perl/Net-SSH2"
|
||||
DEPEND="${RDEPEND}
|
||||
dev-perl/JSON-XS
|
||||
dev-perl/XML-Simple
|
||||
dev-perl/Digest-SHA1
|
||||
dev-perl/Digest-HMAC
|
||||
dev-perl/Expect
|
||||
dev-perl/DBI
|
||||
dev-perl/yaml
|
||||
dev-perl/libwww-perl
|
||||
dev-perl/String-Escape
|
||||
dev-perl/List-MoreUtils
|
||||
dev-perl/Parallel-ForkManager"
|
||||
|
||||
SRC_TEST="do"
|
||||
|
||||
S="${WORKDIR}/Rex-${PV}"
|
||||
@ -0,0 +1,817 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.3.29.ebuild,v 1.1 2014/08/14 17:39:35 olemarkus Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool systemd
|
||||
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd"
|
||||
|
||||
function php_get_uri ()
|
||||
{
|
||||
case "${1}" in
|
||||
"php-pre")
|
||||
echo "http://downloads.php.net/johannes/${2}"
|
||||
;;
|
||||
"php")
|
||||
echo "http://www.php.net/distributions/${2}"
|
||||
;;
|
||||
"olemarkus")
|
||||
echo "http://dev.gentoo.org/~olemarkus/php/${2}"
|
||||
;;
|
||||
"gentoo")
|
||||
echo "mirror://gentoo/${2}"
|
||||
;;
|
||||
*)
|
||||
die "unhandled case in php_get_uri"
|
||||
;;
|
||||
esac
|
||||
}
|
||||
|
||||
PHP_MV="$(get_major_version)"
|
||||
SLOT="$(get_version_component_range 1-2)"
|
||||
|
||||
# alias, so we can handle different types of releases (finals, rcs, alphas,
|
||||
# betas, ...) w/o changing the whole ebuild
|
||||
PHP_PV="${PV/_rc/RC}"
|
||||
PHP_PV="${PHP_PV/_alpha/alpha}"
|
||||
PHP_PV="${PHP_PV/_beta/beta}"
|
||||
PHP_RELEASE="php"
|
||||
[[ ${PV} == ${PV/_alpha/} ]] || PHP_RELEASE="php-pre"
|
||||
[[ ${PV} == ${PV/_beta/} ]] || PHP_RELEASE="php-pre"
|
||||
[[ ${PV} == ${PV/_rc/} ]] || PHP_RELEASE="php-pre"
|
||||
PHP_P="${PN}-${PHP_PV}"
|
||||
|
||||
PHP_PATCHSET_LOC="olemarkus"
|
||||
|
||||
PHP_SRC_URI="$(php_get_uri "${PHP_RELEASE}" "${PHP_P}.tar.bz2")"
|
||||
|
||||
PHP_PATCHSET="0"
|
||||
PHP_PATCHSET_URI="
|
||||
$(php_get_uri "${PHP_PATCHSET_LOC}" "php-patchset-${SLOT}-r${PHP_PATCHSET}.tar.bz2")"
|
||||
|
||||
PHP_FPM_INIT_VER="4"
|
||||
PHP_FPM_CONF_VER="1"
|
||||
|
||||
SRC_URI="
|
||||
${PHP_SRC_URI}
|
||||
${PHP_PATCHSET_URI}"
|
||||
|
||||
DESCRIPTION="The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs"
|
||||
HOMEPAGE="http://php.net/"
|
||||
LICENSE="PHP-3"
|
||||
|
||||
S="${WORKDIR}/${PHP_P}"
|
||||
|
||||
# We can build the following SAPIs in the given order
|
||||
SAPIS="embed cli cgi fpm apache2"
|
||||
|
||||
# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
|
||||
IUSE="${IUSE}
|
||||
${SAPIS/cli/+cli}
|
||||
threads"
|
||||
|
||||
IUSE="${IUSE} bcmath berkdb bzip2 calendar cdb cjk
|
||||
crypt +ctype curl curlwrappers debug
|
||||
enchant exif +fileinfo +filter firebird
|
||||
flatfile ftp gd gdbm gmp +hash +iconv imap inifile
|
||||
intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash
|
||||
mssql mysql mysqlnd mysqli nls
|
||||
oci8-instant-client odbc pcntl pdo +phar +posix postgres qdbm
|
||||
readline recode selinux +session sharedmem
|
||||
+simplexml snmp soap sockets spell sqlite2 sqlite ssl
|
||||
sybase-ct sysvipc tidy +tokenizer truetype unicode wddx
|
||||
+xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib"
|
||||
|
||||
DEPEND="
|
||||
>=app-admin/eselect-php-0.7.1-r3[apache2?,fpm?]
|
||||
>=dev-libs/libpcre-8.32[unicode]
|
||||
apache2? ( www-servers/apache[threads=] )
|
||||
berkdb? ( =sys-libs/db-4* )
|
||||
bzip2? ( app-arch/bzip2 )
|
||||
cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
|
||||
cjk? ( !gd? (
|
||||
virtual/jpeg:0
|
||||
media-libs/libpng:0=
|
||||
sys-libs/zlib
|
||||
) )
|
||||
crypt? ( >=dev-libs/libmcrypt-2.4 )
|
||||
curl? ( >=net-misc/curl-7.10.5 )
|
||||
enchant? ( app-text/enchant )
|
||||
exif? ( !gd? (
|
||||
virtual/jpeg:0
|
||||
media-libs/libpng:0=
|
||||
sys-libs/zlib
|
||||
) )
|
||||
firebird? ( dev-db/firebird )
|
||||
gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
|
||||
gdbm? ( >=sys-libs/gdbm-1.8.0 )
|
||||
gmp? ( >=dev-libs/gmp-4.1.2 )
|
||||
iconv? ( virtual/libiconv )
|
||||
imap? ( virtual/imap-c-client[ssl=] )
|
||||
intl? ( dev-libs/icu:= )
|
||||
iodbc? ( dev-db/libiodbc )
|
||||
kerberos? ( virtual/krb5 )
|
||||
ldap? ( >=net-nds/openldap-1.2.11 )
|
||||
ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 )
|
||||
libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) )
|
||||
mssql? ( dev-db/freetds[mssql] )
|
||||
!mysqlnd? (
|
||||
mysql? ( virtual/mysql )
|
||||
mysqli? ( >=virtual/mysql-4.1 )
|
||||
)
|
||||
nls? ( sys-devel/gettext )
|
||||
oci8-instant-client? ( dev-db/oracle-instantclient-basic )
|
||||
odbc? ( >=dev-db/unixODBC-1.8.13 )
|
||||
postgres? ( dev-db/postgresql-base )
|
||||
qdbm? ( dev-db/qdbm )
|
||||
readline? ( sys-libs/readline )
|
||||
recode? ( app-text/recode )
|
||||
sharedmem? ( dev-libs/mm )
|
||||
simplexml? ( >=dev-libs/libxml2-2.6.8 )
|
||||
snmp? ( >=net-analyzer/net-snmp-5.2 )
|
||||
soap? ( >=dev-libs/libxml2-2.6.8 )
|
||||
spell? ( >=app-text/aspell-0.50 )
|
||||
sqlite2? ( =dev-db/sqlite-2* )
|
||||
sqlite? ( >=dev-db/sqlite-3.7.7.1 )
|
||||
ssl? ( >=dev-libs/openssl-0.9.7 )
|
||||
sybase-ct? ( dev-db/freetds )
|
||||
tidy? ( app-text/htmltidy )
|
||||
truetype? (
|
||||
=media-libs/freetype-2*
|
||||
>=media-libs/t1lib-5.0.0
|
||||
!gd? (
|
||||
virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
|
||||
)
|
||||
unicode? ( dev-libs/oniguruma )
|
||||
wddx? ( >=dev-libs/libxml2-2.6.8 )
|
||||
xml? ( >=dev-libs/libxml2-2.6.8 )
|
||||
xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv )
|
||||
xmlreader? ( >=dev-libs/libxml2-2.6.8 )
|
||||
xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
|
||||
xpm? (
|
||||
x11-libs/libXpm
|
||||
virtual/jpeg:0
|
||||
media-libs/libpng:0= sys-libs/zlib
|
||||
)
|
||||
xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
|
||||
zip? ( sys-libs/zlib )
|
||||
zlib? ( sys-libs/zlib )
|
||||
virtual/mta
|
||||
"
|
||||
|
||||
php="=${CATEGORY}/${PF}"
|
||||
|
||||
REQUIRED_USE="
|
||||
truetype? ( gd )
|
||||
cjk? ( gd )
|
||||
exif? ( gd )
|
||||
|
||||
xpm? ( gd )
|
||||
gd? ( zlib )
|
||||
simplexml? ( xml )
|
||||
soap? ( xml )
|
||||
wddx? ( xml )
|
||||
xmlrpc? ( || ( xml iconv ) )
|
||||
xmlreader? ( xml )
|
||||
xslt? ( xml )
|
||||
ldap-sasl? ( ldap )
|
||||
mhash? ( hash )
|
||||
phar? ( hash )
|
||||
mysqlnd? ( || (
|
||||
mysql
|
||||
mysqli
|
||||
pdo
|
||||
) )
|
||||
|
||||
qdbm? ( !gdbm )
|
||||
readline? ( !libedit )
|
||||
recode? ( !imap !mysql !mysqli )
|
||||
sharedmem? ( !threads )
|
||||
|
||||
!cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )"
|
||||
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
RDEPEND="${RDEPEND} fpm? ( selinux? ( sec-policy/selinux-phpfpm ) )"
|
||||
|
||||
DEPEND="${DEPEND}
|
||||
sys-devel/flex
|
||||
>=sys-devel/m4-1.4.3
|
||||
>=sys-devel/libtool-1.5.18"
|
||||
|
||||
# Allow users to install production version if they want to
|
||||
|
||||
case "${PHP_INI_VERSION}" in
|
||||
production|development)
|
||||
;;
|
||||
*)
|
||||
PHP_INI_VERSION="development"
|
||||
;;
|
||||
esac
|
||||
|
||||
PHP_INI_UPSTREAM="php.ini-${PHP_INI_VERSION}"
|
||||
PHP_INI_FILE="php.ini"
|
||||
|
||||
want_apache
|
||||
|
||||
pkg_setup() {
|
||||
depend.apache_pkg_setup
|
||||
}
|
||||
|
||||
php_install_ini() {
|
||||
local phpsapi="${1}"
|
||||
|
||||
# work out where we are installing the ini file
|
||||
php_set_ini_dir "${phpsapi}"
|
||||
|
||||
local phpinisrc="${PHP_INI_UPSTREAM}-${phpsapi}"
|
||||
cp "${PHP_INI_UPSTREAM}" "${phpinisrc}"
|
||||
|
||||
# default to /tmp for save_path, bug #282768
|
||||
sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}"
|
||||
|
||||
# Set the extension dir
|
||||
sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" -i "${phpinisrc}"
|
||||
|
||||
# Set the include path to point to where we want to find PEAR packages
|
||||
sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}"
|
||||
|
||||
if use_if_iuse opcache; then
|
||||
elog "Adding opcache to ${phpinisrc}"
|
||||
echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> ${phpinisrc}
|
||||
fi
|
||||
|
||||
dodir "${PHP_INI_DIR#${EPREFIX}}"
|
||||
insinto "${PHP_INI_DIR#${EPREFIX}}"
|
||||
newins "${phpinisrc}" "${PHP_INI_FILE}"
|
||||
|
||||
elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
|
||||
elog
|
||||
|
||||
dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
|
||||
dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
|
||||
|
||||
# SAPI-specific handling
|
||||
|
||||
if [[ "${sapi}" == "fpm" ]] ; then
|
||||
[[ -z ${PHP_FPM_CONF_VER} ]] && PHP_FPM_CONF_VER=0
|
||||
einfo "Installing FPM CGI config file php-fpm.conf"
|
||||
insinto "${PHP_INI_DIR#${EPREFIX}}"
|
||||
newins "${FILESDIR}/php-fpm-r${PHP_FPM_CONF_VER}.conf" php-fpm.conf
|
||||
|
||||
# Remove bogus /etc/php-fpm.conf.default (bug 359906)
|
||||
[[ -f "${ED}/etc/php-fpm.conf.default" ]] && rm "${ED}/etc/php-fpm.conf.default"
|
||||
fi
|
||||
|
||||
# Install PHP ini files into /usr/share/php
|
||||
|
||||
dodoc php.ini-development
|
||||
dodoc php.ini-production
|
||||
|
||||
}
|
||||
|
||||
php_set_ini_dir() {
|
||||
PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
|
||||
PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
|
||||
PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
# USE=sharedmem (session/mod_mm to be exact) tries to mmap() this path
|
||||
# ([empty session.save_path]/session_mm_[sapi][gid].sem)
|
||||
# there is no easy way to circumvent that, all php calls during
|
||||
# install use -n, so no php.ini file will be used.
|
||||
# As such, this is the easiest way to get around
|
||||
addpredict /session_mm_cli250.sem
|
||||
addpredict /session_mm_cli0.sem
|
||||
|
||||
# Change PHP branding
|
||||
sed -re "s|^(PHP_EXTRA_VERSION=\").*(\")|\1-pl${PR/r/}-gentoo\2|g" \
|
||||
-i configure.in || die "Unable to change PHP branding"
|
||||
|
||||
# Apply generic PHP patches
|
||||
EPATCH_SOURCE="${WORKDIR}/patches/generic" EPATCH_SUFFIX="patch" \
|
||||
EPATCH_FORCE="yes" \
|
||||
EPATCH_MULTI_MSG="Applying generic patches and fixes from upstream..." epatch
|
||||
|
||||
#Fix bug 463498
|
||||
epatch "${FILESDIR}/fix-libstdc++-underlinking.patch"
|
||||
|
||||
# Patch for pkg-config-0.28 (Bug 455040)
|
||||
epatch "${FILESDIR}"/missing-openssl-include.patch
|
||||
|
||||
epatch "${FILESDIR}"/bison_build_2a.patch
|
||||
epatch "${FILESDIR}"/bison_any_version.patch
|
||||
rm Zend/zend_{language,ini}_parser.[ch]
|
||||
|
||||
# Fix for freetype-2.5.1 bug #494272
|
||||
epatch "${FILESDIR}"/freetype-2.5.1-linking-fix.patch
|
||||
|
||||
# Patch PHP to show Gentoo as the server platform
|
||||
sed -e 's/PHP_UNAME=`uname -a | xargs`/PHP_UNAME=`uname -s -n -r -v | xargs`/g' \
|
||||
-i configure.in || die "Failed to fix server platform name"
|
||||
|
||||
# Prevent PHP from activating the Apache config,
|
||||
# as we will do that ourselves
|
||||
sed -i \
|
||||
-e "s,-i -a -n php${PHP_MV},-i -n php${PHP_MV},g" \
|
||||
-e "s,-i -A -n php${PHP_MV},-i -n php${PHP_MV},g" \
|
||||
configure sapi/apache2filter/config.m4 sapi/apache2handler/config.m4
|
||||
|
||||
# Patch PHP to support heimdal instead of mit-krb5
|
||||
if has_version "app-crypt/heimdal" ; then
|
||||
sed -e 's|gssapi_krb5|gssapi|g' -i acinclude.m4 \
|
||||
|| die "Failed to fix heimdal libname"
|
||||
sed -e 's|PHP_ADD_LIBRARY(k5crypto, 1, $1)||g' -i acinclude.m4 \
|
||||
|| die "Failed to fix heimdal crypt library reference"
|
||||
fi
|
||||
|
||||
#Add user patches #357637
|
||||
epatch_user
|
||||
|
||||
#force rebuilding aclocal.m4
|
||||
rm aclocal.m4
|
||||
|
||||
# work around divert() issues with newer autoconf, bug #281697
|
||||
if has_version '>=sys-devel/autoconf-2.64' ; then
|
||||
sed -i -r \
|
||||
-e 's:^((m4_)?divert)[(]([0-9]*)[)]:\1(600\3):' \
|
||||
$(grep -l divert $(find . -name '*.m4') configure.in) || die
|
||||
fi
|
||||
eautoreconf --force -W no-cross
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
addpredict /usr/share/snmp/mibs/.index
|
||||
addpredict /var/lib/net-snmp/mib_indexes
|
||||
|
||||
PHP_DESTDIR="/usr/$(get_libdir)/php${SLOT}"
|
||||
|
||||
# This is a global variable and should be in caps. It isn't because the
|
||||
# phpconfutils eclass relies on exactly this name...
|
||||
# for --with-libdir see bug #327025
|
||||
my_conf="--prefix=${PHP_DESTDIR}
|
||||
--mandir=${PHP_DESTDIR}/man
|
||||
--infodir=${PHP_DESTDIR}/info
|
||||
--libdir=${PHP_DESTDIR}/lib
|
||||
--with-libdir=$(get_libdir)
|
||||
--without-pear
|
||||
$(use_enable threads maintainer-zts)"
|
||||
|
||||
# extension USE flag shared
|
||||
my_conf+="
|
||||
$(use_enable bcmath bcmath )
|
||||
$(use_with bzip2 bz2 )
|
||||
$(use_enable calendar calendar )
|
||||
$(use_enable ctype ctype )
|
||||
$(use_with curl curl )
|
||||
$(use_with curlwrappers curlwrappers )
|
||||
$(use_enable xml dom )
|
||||
$(use_with enchant enchant /usr)
|
||||
$(use_enable exif exif )
|
||||
$(use_enable fileinfo fileinfo )
|
||||
$(use_enable filter filter )
|
||||
$(use_enable ftp ftp )
|
||||
$(use_with nls gettext )
|
||||
$(use_with gmp gmp )
|
||||
$(use_enable hash hash )
|
||||
$(use_with mhash mhash )
|
||||
$(use_with iconv iconv )
|
||||
$(use_enable intl intl )
|
||||
$(use_enable ipv6 ipv6 )
|
||||
$(use_enable json json )
|
||||
$(use_with kerberos kerberos /usr)
|
||||
$(use_enable xml libxml )
|
||||
$(use_enable unicode mbstring )
|
||||
$(use_with crypt mcrypt )
|
||||
$(use_with mssql mssql )
|
||||
$(use_with unicode onig /usr)
|
||||
$(use_with ssl openssl )
|
||||
$(use_with ssl openssl-dir /usr)
|
||||
$(use_enable pcntl pcntl )
|
||||
$(use_enable phar phar )
|
||||
$(use_enable pdo pdo )
|
||||
$(use_with postgres pgsql )
|
||||
$(use_enable posix posix )
|
||||
$(use_with spell pspell )
|
||||
$(use_with recode recode )
|
||||
$(use_enable simplexml simplexml )
|
||||
$(use_enable sharedmem shmop )
|
||||
$(use_with snmp snmp )
|
||||
$(use_enable soap soap )
|
||||
$(use_enable sockets sockets )"
|
||||
if version_is_at_least 5.3.16-r2; then
|
||||
my_conf+=" $(use_with sqlite2 sqlite /usr) "
|
||||
use sqlite2 && my_conf+=" $(use_enable unicode sqlite-utf8)"
|
||||
else
|
||||
my_conf+=" $(use_with sqlite sqlite /usr) "
|
||||
use sqlite && my_conf+=" $(use_enable unicode sqlite-utf8)"
|
||||
fi
|
||||
my_conf+="
|
||||
$(use_with sqlite sqlite3 /usr)
|
||||
$(use_with sybase-ct sybase-ct /usr)
|
||||
$(use_enable sysvipc sysvmsg )
|
||||
$(use_enable sysvipc sysvsem )
|
||||
$(use_enable sysvipc sysvshm )
|
||||
$(use_with tidy tidy )
|
||||
$(use_enable tokenizer tokenizer )
|
||||
$(use_enable wddx wddx )
|
||||
$(use_enable xml xml )
|
||||
$(use_enable xmlreader xmlreader )
|
||||
$(use_enable xmlwriter xmlwriter )
|
||||
$(use_with xmlrpc xmlrpc )
|
||||
$(use_with xslt xsl )
|
||||
$(use_enable zip zip )
|
||||
$(use_with zlib zlib )
|
||||
$(use_enable debug debug )"
|
||||
|
||||
# DBA support
|
||||
if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
|
||||
|| use qdbm ; then
|
||||
my_conf="${my_conf} --enable-dba${shared}"
|
||||
fi
|
||||
|
||||
# DBA drivers support
|
||||
my_conf+="
|
||||
$(use_with cdb cdb )
|
||||
$(use_with berkdb db4 )
|
||||
$(use_enable flatfile flatfile )
|
||||
$(use_with gdbm gdbm )
|
||||
$(use_enable inifile inifile )
|
||||
$(use_with qdbm qdbm )"
|
||||
|
||||
# Support for the GD graphics library
|
||||
my_conf+="
|
||||
$(use_with truetype freetype-dir /usr)
|
||||
$(use_with truetype t1lib /usr)
|
||||
$(use_enable cjk gd-jis-conv )
|
||||
$(use_with gd jpeg-dir /usr)
|
||||
$(use_with gd png-dir /usr)
|
||||
$(use_with xpm xpm-dir /usr)"
|
||||
# enable gd last, so configure can pick up the previous settings
|
||||
my_conf+="
|
||||
$(use_with gd gd )"
|
||||
|
||||
# IMAP support
|
||||
if use imap ; then
|
||||
my_conf+="
|
||||
$(use_with imap imap )
|
||||
$(use_with ssl imap-ssl )"
|
||||
fi
|
||||
|
||||
# Interbase/firebird support
|
||||
|
||||
if use firebird ; then
|
||||
my_conf+="
|
||||
$(use_with firebird interbase /usr)"
|
||||
fi
|
||||
|
||||
# LDAP support
|
||||
if use ldap ; then
|
||||
my_conf+="
|
||||
$(use_with ldap ldap )
|
||||
$(use_with ldap-sasl ldap-sasl )"
|
||||
fi
|
||||
|
||||
# MySQL support
|
||||
if use mysql ; then
|
||||
if use mysqlnd ; then
|
||||
my_conf+="
|
||||
$(use_with mysqlnd mysql mysqlnd)"
|
||||
else
|
||||
my_conf+="
|
||||
$(use_with mysql mysql /usr)"
|
||||
fi
|
||||
my_conf+="
|
||||
$(use_with mysql mysql-sock /var/run/mysqld/mysqld.sock)"
|
||||
fi
|
||||
|
||||
# MySQLi support
|
||||
if use mysqlnd ; then
|
||||
my_conf+="
|
||||
$(use_with mysqli mysqli mysqlnd)"
|
||||
else
|
||||
my_conf+="
|
||||
$(use_with mysqli mysqli /usr/bin/mysql_config)"
|
||||
fi
|
||||
|
||||
# ODBC support
|
||||
if use odbc ; then
|
||||
my_conf+="
|
||||
$(use_with odbc unixODBC /usr)"
|
||||
fi
|
||||
|
||||
if use iodbc ; then
|
||||
my_conf+="
|
||||
$(use_with iodbc iodbc /usr)"
|
||||
fi
|
||||
|
||||
# Oracle support
|
||||
if use oci8-instant-client ; then
|
||||
my_conf+="
|
||||
$(use_with oci8-instant-client oci8)"
|
||||
fi
|
||||
|
||||
# PDO support
|
||||
if use pdo ; then
|
||||
my_conf+="
|
||||
$(use_with mssql pdo-dblib )"
|
||||
if use mysqlnd ; then
|
||||
my_conf+="
|
||||
$(use_with mysql pdo-mysql mysqlnd)"
|
||||
else
|
||||
my_conf+="
|
||||
$(use_with mysql pdo-mysql /usr)"
|
||||
fi
|
||||
my_conf+="
|
||||
$(use_with postgres pdo-pgsql )
|
||||
$(use_with sqlite pdo-sqlite /usr)
|
||||
$(use_with odbc pdo-odbc unixODBC,/usr)"
|
||||
if use oci8-instant-client ; then
|
||||
my_conf+="
|
||||
$(use_with oci8-instant-client pdo-oci)"
|
||||
fi
|
||||
fi
|
||||
|
||||
# readline/libedit support
|
||||
my_conf+="
|
||||
$(use_with readline readline )
|
||||
$(use_with libedit libedit )"
|
||||
|
||||
# Session support
|
||||
if use session ; then
|
||||
my_conf+="
|
||||
$(use_with sharedmem mm )"
|
||||
else
|
||||
my_conf+="
|
||||
$(use_enable session session )"
|
||||
fi
|
||||
|
||||
# Use pic for shared modules such as apache2's mod_php
|
||||
my_conf="${my_conf} --with-pic"
|
||||
|
||||
# we use the system copy of pcre
|
||||
# --with-pcre-regex affects ext/pcre
|
||||
# --with-pcre-dir affects ext/filter and ext/zip
|
||||
my_conf="${my_conf} --with-pcre-regex=/usr --with-pcre-dir=/usr"
|
||||
|
||||
# Catch CFLAGS problems
|
||||
# Fixes bug #14067.
|
||||
# Changed order to run it in reverse for bug #32022 and #12021.
|
||||
replace-cpu-flags "k6*" "i586"
|
||||
|
||||
# Support user-passed configuration parameters
|
||||
my_conf="${my_conf} ${EXTRA_ECONF:-}"
|
||||
|
||||
# Support the Apache2 extras, they must be set globally for all
|
||||
# SAPIs to work correctly, especially for external PHP extensions
|
||||
|
||||
mkdir -p "${WORKDIR}/sapis-build"
|
||||
for one_sapi in $SAPIS ; do
|
||||
use "${one_sapi}" || continue
|
||||
php_set_ini_dir "${one_sapi}"
|
||||
|
||||
cp -r "${S}" "${WORKDIR}/sapis-build/${one_sapi}"
|
||||
cd "${WORKDIR}/sapis-build/${one_sapi}"
|
||||
|
||||
sapi_conf="${my_conf} --with-config-file-path=${PHP_INI_DIR}
|
||||
--with-config-file-scan-dir=${PHP_EXT_INI_DIR_ACTIVE}"
|
||||
|
||||
for sapi in $SAPIS ; do
|
||||
case "$sapi" in
|
||||
cli|cgi|embed|fpm)
|
||||
if [[ "${one_sapi}" == "${sapi}" ]] ; then
|
||||
sapi_conf="${sapi_conf} --enable-${sapi}"
|
||||
else
|
||||
sapi_conf="${sapi_conf} --disable-${sapi}"
|
||||
fi
|
||||
;;
|
||||
|
||||
apache2)
|
||||
if [[ "${one_sapi}" == "${sapi}" ]] ; then
|
||||
sapi_conf="${sapi_conf} --with-apxs2=/usr/sbin/apxs"
|
||||
else
|
||||
sapi_conf="${sapi_conf} --without-apxs2"
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
done
|
||||
|
||||
econf ${sapi_conf}
|
||||
done
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
# snmp seems to run during src_compile, too (bug #324739)
|
||||
addpredict /usr/share/snmp/mibs/.index
|
||||
addpredict /var/lib/net-snmp/mib_indexes
|
||||
|
||||
for sapi in ${SAPIS} ; do
|
||||
if use "${sapi}"; then
|
||||
cd "${WORKDIR}/sapis-build/$sapi" || "Failed to change dir to ${WORKDIR}/sapis-build/$1"
|
||||
emake || die "emake failed"
|
||||
fi
|
||||
done
|
||||
}
|
||||
|
||||
src_install() {
|
||||
# see bug #324739 for what happens when we don't have that
|
||||
addpredict /usr/share/snmp/mibs/.index
|
||||
|
||||
# grab the first SAPI that got built and install common files from there
|
||||
local first_sapi=""
|
||||
for sapi in $SAPIS ; do
|
||||
if use $sapi ; then
|
||||
first_sapi=$sapi
|
||||
break
|
||||
fi
|
||||
done
|
||||
|
||||
# Makefile forgets to create this before trying to write to it...
|
||||
dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
|
||||
|
||||
# Install php environment (without any sapis)
|
||||
cd "${WORKDIR}/sapis-build/$first_sapi"
|
||||
emake INSTALL_ROOT="${D}" \
|
||||
install-build install-headers install-programs \
|
||||
|| die "emake install failed"
|
||||
|
||||
local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
|
||||
|
||||
# Create the directory where we'll put version-specific php scripts
|
||||
keepdir /usr/share/php${PHP_MV}
|
||||
|
||||
local sapi="", file=""
|
||||
local sapi_list=""
|
||||
|
||||
for sapi in ${SAPIS}; do
|
||||
if use "${sapi}" ; then
|
||||
einfo "Installing SAPI: ${sapi}"
|
||||
cd "${WORKDIR}/sapis-build/${sapi}"
|
||||
|
||||
if [[ "${sapi}" == "apache2" ]] ; then
|
||||
# We're specifically not using emake install-sapi as libtool
|
||||
# may cause unnecessary relink failures (see bug #351266)
|
||||
insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
|
||||
newins ".libs/libphp5$(get_libname)" "libphp${PHP_MV}$(get_libname)"
|
||||
keepdir "/usr/$(get_libdir)/apache2/modules"
|
||||
else
|
||||
# needed each time, php_install_ini would reset it
|
||||
local dest="${PHP_DESTDIR#${EPREFIX}}"
|
||||
into "${dest}"
|
||||
case "$sapi" in
|
||||
cli)
|
||||
source="sapi/cli/php"
|
||||
;;
|
||||
cgi)
|
||||
source="sapi/cgi/php-cgi"
|
||||
;;
|
||||
fpm)
|
||||
source="sapi/fpm/php-fpm"
|
||||
;;
|
||||
embed)
|
||||
source="libs/libphp${PHP_MV}$(get_libname)"
|
||||
;;
|
||||
*)
|
||||
die "unhandled sapi in src_install"
|
||||
;;
|
||||
esac
|
||||
|
||||
if [[ "${source}" == *"$(get_libname)" ]]; then
|
||||
dolib.so "${source}" || die "Unable to install ${sapi} sapi"
|
||||
else
|
||||
dobin "${source}" || die "Unable to install ${sapi} sapi"
|
||||
local name="$(basename ${source})"
|
||||
dosym "${dest}/bin/${name}" "/usr/bin/${name}${SLOT}"
|
||||
fi
|
||||
fi
|
||||
|
||||
php_install_ini "${sapi}"
|
||||
|
||||
# construct correct SAPI string for php-config
|
||||
# thanks to ferringb for the bash voodoo
|
||||
if [[ "${sapi}" == "apache2" ]]; then
|
||||
sapi_list="${sapi_list:+${sapi_list} }apache2handler"
|
||||
else
|
||||
sapi_list="${sapi_list:+${sapi_list} }${sapi}"
|
||||
fi
|
||||
fi
|
||||
done
|
||||
|
||||
# Installing opcache module
|
||||
if use_if_iuse opcache ; then
|
||||
dolib.so "modules/opcache$(get_libname)" || die "Unable to install opcache module"
|
||||
fi
|
||||
|
||||
# Install env.d files
|
||||
newenvd "${FILESDIR}/20php5-envd" \
|
||||
"20php${SLOT}"
|
||||
sed -e "s|/lib/|/$(get_libdir)/|g" -i \
|
||||
"${ED}/etc/env.d/20php${SLOT}"
|
||||
sed -e "s|php5|php${SLOT}|g" -i \
|
||||
"${ED}/etc/env.d/20php${SLOT}"
|
||||
|
||||
# set php-config variable correctly (bug #278439)
|
||||
sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
|
||||
"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config"
|
||||
|
||||
use fpm && systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" "php-fpm@${SLOT}.service"
|
||||
}
|
||||
|
||||
src_test() {
|
||||
echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
|
||||
PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
|
||||
if [[ ! -x "${PHP_BIN}" ]] ; then
|
||||
ewarn "Test phase requires USE=cli, skipping"
|
||||
return
|
||||
else
|
||||
export TEST_PHP_EXECUTABLE="${PHP_BIN}"
|
||||
fi
|
||||
|
||||
if [[ -x "${WORKDIR}/sapis/cgi/php-cgi" ]] ; then
|
||||
export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis/cgi/php-cgi"
|
||||
fi
|
||||
|
||||
REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n -d "session.save_path=${T}" \
|
||||
"${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d "session.save_path=${T}"
|
||||
|
||||
for name in ${EXPECTED_TEST_FAILURES}; do
|
||||
mv "${name}.out" "${name}.out.orig" 2>/dev/null
|
||||
done
|
||||
|
||||
local failed="$(find -name '*.out')"
|
||||
if [[ ${failed} != "" ]] ; then
|
||||
ewarn "The following test cases failed unexpectedly:"
|
||||
for name in ${failed}; do
|
||||
ewarn " ${name/.out/}"
|
||||
done
|
||||
else
|
||||
einfo "No unexpected test failures, all fine"
|
||||
fi
|
||||
|
||||
if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
|
||||
local passed=""
|
||||
for name in ${EXPECTED_TEST_FAILURES}; do
|
||||
[[ -f "${name}.diff" ]] && continue
|
||||
passed="${passed} ${name}"
|
||||
done
|
||||
if [[ ${passed} != "" ]] ; then
|
||||
einfo "The following test cases passed unexpectedly:"
|
||||
for name in ${passed}; do
|
||||
ewarn " ${passed}"
|
||||
done
|
||||
else
|
||||
einfo "None of the known-to-fail tests passed, all fine"
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
# Output some general info to the user
|
||||
if use apache2 ; then
|
||||
APACHE2_MOD_DEFINE="PHP5"
|
||||
APACHE2_MOD_CONF="70_mod_php5"
|
||||
apache-module_pkg_postinst
|
||||
fi
|
||||
|
||||
# Create the symlinks for php
|
||||
for m in ${SAPIS}; do
|
||||
[[ ${m} == 'embed' ]] && continue;
|
||||
if use $m ; then
|
||||
local ci=$(eselect php show $m)
|
||||
if [[ -z $ci ]]; then
|
||||
eselect php set $m php${SLOT}
|
||||
einfo "Switched ${m} to use php:${SLOT}"
|
||||
einfo
|
||||
elif [[ $ci != "php${SLOT}" ]] ; then
|
||||
elog "To switch $m to use php:${SLOT}, run"
|
||||
elog " eselect php set $m php${SLOT}"
|
||||
elog
|
||||
fi
|
||||
fi
|
||||
done
|
||||
|
||||
elog "Make sure that PHP_TARGETS in /etc/make.conf includes php${SLOT/./-} in order"
|
||||
elog "to compile extensions for the ${SLOT} ABI"
|
||||
elog
|
||||
if ! use readline && use cli ; then
|
||||
ewarn "Note that in order to use php interactivly, you need to enable"
|
||||
ewarn "the readline USE flag or php -a will hang"
|
||||
fi
|
||||
elog
|
||||
elog "This ebuild installed a version of php.ini based on php.ini-${PHP_INI_VERSION} version."
|
||||
elog "You can chose which version of php.ini to install by default by setting PHP_INI_VERSION to either"
|
||||
elog "'production' or 'development' in /etc/make.conf"
|
||||
ewarn "Both versions of php.ini can be found in /usr/share/doc/${PF}"
|
||||
|
||||
elog
|
||||
elog "For more details on how minor version slotting works (PHP_TARGETS) please read the upgrade guide:"
|
||||
elog "http://www.gentoo.org/proj/en/php/php-upgrading.xml"
|
||||
elog
|
||||
}
|
||||
|
||||
pkg_prerm() {
|
||||
eselect php cleanup
|
||||
}
|
||||
@ -0,0 +1,96 @@
|
||||
diff -ur pysvn-1.7.9.orig/Source/setup_configure.py pysvn-1.7.9/Source/setup_configure.py
|
||||
--- Source/setup_configure.py 2014-02-02 22:19:59.000000000 +0800
|
||||
+++ Source/setup_configure.py 2014-08-15 08:15:44.676746371 +0800
|
||||
@@ -848,8 +848,8 @@
|
||||
def __init__( self, setup ):
|
||||
Compiler.__init__( self, setup )
|
||||
|
||||
- self._addVar( 'CCC', 'g++' )
|
||||
- self._addVar( 'CC', 'gcc' )
|
||||
+ self._addVar( 'CCC', '$(CXX)' )
|
||||
+ self._addVar( 'CC', '$(CC)' )
|
||||
|
||||
def getPythonExtensionFileExt( self ):
|
||||
return '.so'
|
||||
@@ -975,8 +975,8 @@
|
||||
else:
|
||||
arch_options = ''
|
||||
|
||||
- self._addVar( 'CCC', 'g++ %s' % (arch_options,) )
|
||||
- self._addVar( 'CC', 'gcc %s' % (arch_options,) )
|
||||
+ self._addVar( 'CCC', '$(CXX) %s' % (arch_options,) )
|
||||
+ self._addVar( 'CC', '$(CC) %s' % (arch_options,) )
|
||||
|
||||
self._find_paths_pycxx_dir = [
|
||||
'../Import/pycxx-%d.%d.%d' % pycxx_version,
|
||||
@@ -1031,12 +1031,12 @@
|
||||
|
||||
def setupUtilities( self ):
|
||||
self._addVar( 'CCCFLAGS',
|
||||
- '-g '
|
||||
+ '$(CXXFLAGS) '
|
||||
'-no-long-double '
|
||||
'-Wall -fPIC -fexceptions -frtti '
|
||||
'-I. -I%(APR_INC)s -I%(APU_INC)s -I%(SVN_INC)s '
|
||||
'-D%(DEBUG)s' )
|
||||
- self._addVar( 'LDEXE', '%(CCC)s -g' )
|
||||
+ self._addVar( 'LDEXE', '$(CXX) $(LDFLAGS)' )
|
||||
|
||||
def setupPySvn( self ):
|
||||
self._pysvnModuleSetup()
|
||||
@@ -1048,7 +1048,7 @@
|
||||
self._addVar( 'PYTHON_INC', distutils.sysconfig.get_python_inc() )
|
||||
|
||||
py_cflags_list = [
|
||||
- '-g',
|
||||
+ '$(CXXFLAGS) ',
|
||||
'-no-long-double',
|
||||
'-Wall -fPIC -fexceptions -frtti',
|
||||
'-I. -I%(APR_INC)s -I%(APU_INC)s -I%(SVN_INC)s',
|
||||
@@ -1075,13 +1075,12 @@
|
||||
|
||||
self._addVar( 'CCCFLAGS', ' '.join( py_cflags_list ) )
|
||||
self._addVar( 'LDLIBS', ' '.join( py_ld_libs ) )
|
||||
- self._addVar( 'LDSHARED', '%(CCC)s -bundle -g '
|
||||
+ self._addVar( 'LDSHARED', '$(CXX) $(LDFLAGS) -bundle '
|
||||
'-framework System '
|
||||
'%(PYTHON_FRAMEWORK)s '
|
||||
'-framework CoreFoundation '
|
||||
'-framework Kerberos '
|
||||
- '-framework Security '
|
||||
- '%(LDLIBS)s' )
|
||||
+ '-framework Security' )
|
||||
|
||||
class UnixCompilerGCC(CompilerGCC):
|
||||
def __init__( self, setup ):
|
||||
@@ -1141,11 +1140,11 @@
|
||||
|
||||
def setupUtilities( self ):
|
||||
self._addVar( 'CCCFLAGS',
|
||||
- '-g '
|
||||
+ '$(CXXFLAGS) '
|
||||
'-Wall -fPIC -fexceptions -frtti '
|
||||
'-I. -I%(APR_INC)s -I%(APU_INC)s -I%(SVN_INC)s '
|
||||
'-D%(DEBUG)s' )
|
||||
- self._addVar( 'LDEXE', '%(CCC)s -g' )
|
||||
+ self._addVar( 'LDEXE', '$(CXX) $(LDFLAGS)' )
|
||||
|
||||
def setupPySvn( self ):
|
||||
self._pysvnModuleSetup()
|
||||
@@ -1156,6 +1155,7 @@
|
||||
self._addVar( 'PYTHON_ARCH_SPECIFIC_INC', distutils.sysconfig.get_python_inc( True ) )
|
||||
|
||||
py_cflags_list = [
|
||||
+ '$(CXXFLAGS)',
|
||||
'-Wall -fPIC -fexceptions -frtti',
|
||||
'-I. -I%(APR_INC)s -I%(APU_INC)s -I%(SVN_INC)s',
|
||||
'-DPYCXX_PYTHON_2TO3 -I%(PYCXX)s -I%(PYCXX_SRC)s -I%(PYTHON_INC)s',
|
||||
@@ -1173,7 +1173,7 @@
|
||||
|
||||
self._addVar( 'CCCFLAGS', ' '.join( py_cflags_list ) )
|
||||
self._addVar( 'LDLIBS', ' '.join( self._getLdLibs() ) )
|
||||
- self._addVar( 'LDSHARED', '%(CCC)s -shared -g' )
|
||||
+ self._addVar( 'LDSHARED', '$(CXX) $(LDFLAGS) -shared' )
|
||||
|
||||
#--------------------------------------------------------------------------------
|
||||
class LinuxCompilerGCC(UnixCompilerGCC):
|
||||
@ -0,0 +1,59 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-python/pysvn/pysvn-1.7.9.ebuild,v 1.1 2014/08/15 01:30:28 idella4 Exp $
|
||||
|
||||
EAPI=5
|
||||
PYTHON_COMPAT=( python{2_7,3_3,3_4} )
|
||||
|
||||
inherit eutils distutils-r1 toolchain-funcs
|
||||
|
||||
DESCRIPTION="Object-oriented python bindings for subversion"
|
||||
HOMEPAGE="http://pysvn.tigris.org/"
|
||||
SRC_URI="http://pysvn.barrys-emacs.org/source_kits/${P}.tar.gz"
|
||||
|
||||
LICENSE="Apache-1.1"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
|
||||
IUSE="doc examples"
|
||||
|
||||
DEPEND="
|
||||
>=dev-python/pycxx-6.2.0[${PYTHON_USEDEP}]
|
||||
<dev-vcs/subversion-1.9"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
PATCHES=( "${FILESDIR}"/${P}-respect_flags.patch )
|
||||
|
||||
python_prepare() {
|
||||
# Don't use internal copy of dev-python/pycxx.
|
||||
rm -r Import || die
|
||||
|
||||
# http://pysvn.tigris.org/source/browse/pysvn?view=rev&revision=1469
|
||||
sed -e "s/PYSVN_HAS_SVN_CLIENT_CTX_T__CONFLICT_FUNC_16/PYSVN_HAS_SVN_CLIENT_CTX_T__CONFLICT_FUNC_1_6/" -i Source/pysvn_svnenv.hpp
|
||||
}
|
||||
|
||||
python_configure() {
|
||||
cd Source || die
|
||||
# all config options from 1.7.6 are all already set
|
||||
esetup.py configure
|
||||
}
|
||||
|
||||
python_compile() {
|
||||
cd Source || die
|
||||
emake CC="$(tc-getCC)" CXX="$(tc-getCXX)"
|
||||
}
|
||||
|
||||
python_test() {
|
||||
cd Tests || die
|
||||
emake
|
||||
}
|
||||
|
||||
python_install() {
|
||||
cd Source || die
|
||||
python_domodule pysvn
|
||||
}
|
||||
|
||||
python_install_all() {
|
||||
use doc && local HTML_DOCS=( Docs/ )
|
||||
use examples && local EXAMPLES=( Examples/Client/. )
|
||||
distutils-r1_python_install_all
|
||||
}
|
||||
@ -0,0 +1,21 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-python/w3lib/w3lib-1.8.0.ebuild,v 1.1 2014/08/15 03:20:52 idella4 Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
|
||||
|
||||
inherit distutils-r1
|
||||
|
||||
DESCRIPTION="Python library of web-related functions"
|
||||
HOMEPAGE="http://github.com/scrapy/w3lib"
|
||||
SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
|
||||
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE=""
|
||||
|
||||
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
|
||||
RDEPEND=">=dev-python/six-1.4.1[${PYTHON_USEDEP}]"
|
||||
@ -1,25 +0,0 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/kde-misc/ksoprano/ksoprano-0.2.ebuild,v 1.2 2014/05/13 17:57:00 johu Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
inherit kde4-base
|
||||
|
||||
DESCRIPTION="A GUI for querying and manipulating RDF data"
|
||||
HOMEPAGE="http://www.kde-apps.org/content/show.php?content=116756"
|
||||
SRC_URI="http://kde-apps.org/CONTENT/content-files/116756-${PN}.tgz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
SLOT="4"
|
||||
IUSE="debug"
|
||||
|
||||
DEPEND="
|
||||
$(add_kdebase_dep kdelibs 'semantic-desktop(+)')
|
||||
"
|
||||
RDEPEND="${DEPEND}
|
||||
$(add_kdebase_dep nepomuk)
|
||||
"
|
||||
|
||||
S="${WORKDIR}/${PN}"
|
||||
@ -1,22 +0,0 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/kde-misc/nepomukshell/nepomukshell-0.8.0.ebuild,v 1.1 2013/06/19 01:20:01 creffett Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
inherit kde4-base
|
||||
|
||||
DESCRIPTION="Browse, query, and edit Nepomuk resources"
|
||||
HOMEPAGE="https://projects.kde.org/projects/extragear/utils/nepomukshell"
|
||||
SRC_URI="mirror://kde/unstable/nepomuk/${P}.tar.bz2"
|
||||
|
||||
LICENSE="GPL-2+"
|
||||
SLOT="4"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="debug"
|
||||
|
||||
DEPEND="
|
||||
$(add_kdebase_dep kdelibs 'semantic-desktop(+)')
|
||||
"
|
||||
|
||||
RDEPEND="${DEPEND}"
|
||||
@ -1,48 +0,0 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/media-gfx/kphotoalbum/kphotoalbum-4.4-r1.ebuild,v 1.2 2014/05/13 18:04:45 johu Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
KDE_LINGUAS="ar be bg bs ca ca@valencia cs da de el en_GB eo es et eu fi fr ga
|
||||
gl hi hne hr hu is it ja km lt mai nb nds nl nn pa pl pt pt_BR ro ru se sk sv
|
||||
tr ug uk vi zh_CN zh_TW"
|
||||
inherit kde4-base
|
||||
|
||||
DESCRIPTION="KDE Photo Album is a tool for indexing, searching, and viewing images"
|
||||
HOMEPAGE="http://www.kphotoalbum.org/"
|
||||
SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.bz2"
|
||||
|
||||
LICENSE="GPL-2 FDL-1.2"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
SLOT="4"
|
||||
IUSE="debug +exif +geolocation +kipi nepomuk +raw"
|
||||
|
||||
DEPEND="
|
||||
$(add_kdebase_dep kdelibs 'nepomuk?')
|
||||
>=dev-qt/qtsql-4.4:4[sqlite]
|
||||
virtual/jpeg
|
||||
exif? ( >=media-gfx/exiv2-0.17 )
|
||||
geolocation? ( $(add_kdebase_dep marble) )
|
||||
kipi? ( $(add_kdebase_dep libkipi '' 4.9.58) )
|
||||
raw? ( $(add_kdebase_dep libkdcraw '' 4.9.58) )
|
||||
"
|
||||
RDEPEND="${DEPEND}
|
||||
nepomuk? ( $(add_kdebase_dep nepomuk) )
|
||||
|| ( media-video/mplayer2 media-video/mplayer )
|
||||
"
|
||||
|
||||
DOCS=( ChangeLog README TODO )
|
||||
|
||||
src_configure() {
|
||||
mycmakeargs=(
|
||||
$(cmake-utils_use_with exif Exiv2)
|
||||
$(cmake-utils_use_with geolocation Marble)
|
||||
$(cmake-utils_use_with kipi)
|
||||
$(cmake-utils_use_with raw Kdcraw)
|
||||
$(cmake-utils_use_with nepomuk)
|
||||
$(cmake-utils_use_with nepomuk Soprano)
|
||||
)
|
||||
|
||||
kde4-base_src_configure
|
||||
}
|
||||
@ -0,0 +1,19 @@
|
||||
# ChangeLog for media-gfx/meshlab
|
||||
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/media-gfx/meshlab/ChangeLog,v 1.1 2014/08/14 18:38:38 amynka Exp $
|
||||
|
||||
*meshlab-1.3.2 (14 Aug 2014)
|
||||
|
||||
14 Aug 2014; Amy Winston <amynka@gentoo.org>
|
||||
+files/1.3.2/01_crash-on-save.patch, +files/1.3.2/02_cstddef.patch,
|
||||
+files/1.3.2/03_disable-updates.patch, +files/1.3.2/05_externals.patch,
|
||||
+files/1.3.2/06_format-security.patch, +files/1.3.2/07_gcc47.patch,
|
||||
+files/1.3.2/08_lib3ds.patch, +files/1.3.2/09_libbz2.patch,
|
||||
+files/1.3.2/10_muparser.patch, +files/1.3.2/11_openctm.patch,
|
||||
+files/1.3.2/12_overflow.patch, +files/1.3.2/13_pluginsdir.patch,
|
||||
+files/1.3.2/14_ply_numeric.patch, +files/1.3.2/15_qhull.patch,
|
||||
+files/1.3.2/16_shadersdir.patch, +files/1.3.2/17_structuresynth.patch,
|
||||
+files/1.3.2/18_glew.c18p1.patch, +files/1.3.2/19_CONFLICTS_IN_rpath.patch,
|
||||
+files/1.3.2/20_rpath.c18p2.patch, +files/1.3.2/21_RESOLUTION.patch,
|
||||
+files/1.3.2/22_aliasing.patch, +meshlab-1.3.2.ebuild, +metadata.xml:
|
||||
New package for 3d printing added
|
||||
@ -0,0 +1,39 @@
|
||||
-----BEGIN PGP SIGNED MESSAGE-----
|
||||
Hash: SHA256
|
||||
|
||||
AUX 1.3.2/01_crash-on-save.patch 1150 SHA256 c7ed4f43b01ee8d6bdfb46760f776de112fc61e19e51c1057f771fd3dfb1717d SHA512 b6c6f06584ab5c43bcfef3b697fc1b3dcc6ee6e2ac7f15cdd3ac1a71af356e56299a78353f6a1c6bc8e19cde60b78a82980ae25abd87eb0a467a3fe4f1d769e6 WHIRLPOOL 89e0c7aa254a23074318210e9b08a53ddc8df6f28565d82dc1522e839b4065be7c5319e118f128a9be14c4945f40711216a72839d5165d75c39e8a304b8c63f1
|
||||
AUX 1.3.2/02_cstddef.patch 1549 SHA256 067ec2879cc5dc2ffb0870e3bc91ad285851ce370a586a1767b6665b086e40dd SHA512 4b4eb9ddb444f6c69a8dd817a2312329d9ee5d5b272ea8e7f310fd7c1f7e8cc22978e632016a27784c3456c3fe4a7ad753784c04b9c0e6f544eddc26e497da85 WHIRLPOOL 15225c6f3b33b9543493de32bfdef77baf503755eedcf21074885345d70c04fcacee548cde9a5a77658ccaa6d086f12250214ca3023474f0c5c8c7020b607a33
|
||||
AUX 1.3.2/03_disable-updates.patch 876 SHA256 cf6cc9bc8af61c160eca07a413292447e87877d3428f11e95f0739fbaf79fdfa SHA512 cb198c08ccfc1602f3922131fad385b7b6568733885e2df64cf404aa199d12b9a3a75f21d7e8972a330eb0ed8697a5bdb6af1aa78311563e8afe23f53bb223b2 WHIRLPOOL 7bc10dd2cff94d201652afbad341c6cf792c3919b584d264359f1ee8af4bbaa22ff34287ee45e28d5baa05fb28e26619a7c74bd1d71db1ccd91007cfbc634e7c
|
||||
AUX 1.3.2/05_externals.patch 966 SHA256 9d96b76a93bb94caf57292fbbccdf7c67fc0ae2542bf47e7c4aca59ea615414f SHA512 9053bc7b7c37fd826ee00e4b3f6f49c429e2afd2e4017a56aa361845463033acdfacdea5a4510f48353390d44bab6eb49cc23214cf5c3323458c01772b3e1817 WHIRLPOOL d42fee28cde1894798523b32e16f67ccfcc50f58fec8dff9182b04b501b8039d69506188cf433c98550a6fd8a4cca72b852911ed4c77628f728e2b1c69b24b0b
|
||||
AUX 1.3.2/06_format-security.patch 2399 SHA256 4567170ca15eef7b0ebf3660bb13757315e8d47b18c035a732dd61813beb7268 SHA512 637027b9f0080c0ea5c290816bc9b81cb07f12f8f052863ce6bd599ef8422f5403dd33086439cdddf3ae265f15fcdae1b7e7e157074f9396f369b019f69fe4d7 WHIRLPOOL 70e74dbb85864786a09eba994d06e37602aed8f8bf8396f63732c38a72f55573ed357f4ddb98abd5016845c85265c92780795fcfe0c88accf06b9fba99dd0277
|
||||
AUX 1.3.2/07_gcc47.patch 3697 SHA256 4cfd458ded80322acdbf5e763234700eec70a0e43a4e025568d64fcb7cd0dad3 SHA512 1dd5fbaf612ecbd01414ce1ca9ae52a6138a9a2f4ba8ec9a1f91e7613bb621628976931e0911467c9f06bb419cc780dec319f5cde7ce6a3945769985fba2a37a WHIRLPOOL 692967f20c666732192e0ec00c98092642b267733dd494524b5d85b19d012e92a0a3792e665d11a6f1e554b4d73393a6f9aa9477b21c9393c9e58efbd9db20dc
|
||||
AUX 1.3.2/08_lib3ds.patch 1350 SHA256 ad8c118ae0da7cea33c75e9ac0b4406e19d6789532b085ea32b2deeea0344758 SHA512 0c1f87e5ba9c5ad5861c4a1b9fbd9d662c306f1704a56f277e37f0ca1322a5faa8e7c36a4f91860ffaf3e0fce8526c06ffcb6adbd17aed264ca673fb642faa5e WHIRLPOOL eb41816d0a77b5060d35916113182e9937403a36ec08b240bfcff028859bd02386eea1c6bd5d663d40af30813976cb20401846c81b1efd50bbbf586e91c556cd
|
||||
AUX 1.3.2/09_libbz2.patch 1425 SHA256 e206583d558bc064e8632c58f757f08911d04692af1bf1e8135316476aabbafa SHA512 75d23a84619e52c527629855d5a158f7feed7b2fec0b9d2659eb3c8d741a8029502c6a62c9b8b7f4903fbb77c6270261d63100251be72e0c500b237673f42852 WHIRLPOOL 8a22b24c9b78c2f958224f6e559eec2ddb31768ae5811f330060ca374f42c85d4ac7c89ac5a7b1c42e3998ceb153c5fb72849b92687de0009659700d1d240ff3
|
||||
AUX 1.3.2/10_muparser.patch 1432 SHA256 34c6df0cd94ae21eccfe62861703d7b6e3ffc7483aa5b5780253780559d0e9a3 SHA512 5e7a498f4d4dd661084ed06abf11adc32c00c04af1ec21775dbd899888cf647c7875831ca6284580e2bc58586e2e38b8c74befcb982b7e1b64a86661470529ef WHIRLPOOL ca0b21ba8b41de39d0b5f451f4159101617ac9a6f3f8ab4587d357893ca2be6982f353877aa23addd38a2f6f253404bd0f4c4ac24e99b83935931b3aa071919e
|
||||
AUX 1.3.2/11_openctm.patch 1414 SHA256 ca4a57a6a281c020d3b029edbde88289f7fd17c832f709c10b83e4d9cb7630d1 SHA512 9f2adba65f5308734ee0c510db4aa0dc63c0c6084709d787a8aba6394019de7aa96a3bd102c580e9bd827b6eb60f48f50f573f653521b5ee515e72180509c071 WHIRLPOOL 1b7104ad59d2472c299f59a306cf57699012f5aee7172439df1897e9af839cf3b24e4f2fd6109d138ee537e96ebc6789b818f624cb15de454b6203e30b26cd51
|
||||
AUX 1.3.2/12_overflow.patch 860 SHA256 909e015b1b4b56502d23971a68bc828631589eff54c1cc7ca023167aad0894f6 SHA512 841141c015161988df188ca25f99d695fe0c22850cd69dbb4956f4ee9c9950172554addf249f79e111dbee212a7ec09d5d8f7bf68cd9289c6781ddbf7659e4af WHIRLPOOL 1078424dd60794169001ce74e85bc27856b96a987b4b73698e8c0042ee27e4b501d34543ab7d56cc69450bcb3188a7e5b1d6d0f4d0a4a249050717e730230f83
|
||||
AUX 1.3.2/13_pluginsdir.patch 927 SHA256 e5667d3f901a7f67e1897c9d8803292c0f1f92563748106e52b1c7e589caa7c9 SHA512 85bbc68b6d95168c0936ddc9bf602b8c3c8a9c7d8f5aaa449cc540c891ab90dc57d5ea3d8e10697242442f6dc587c4d9ad45c5c5e59f07fd800c8f291fde7598 WHIRLPOOL b12f350f1d02f2d3b251e104cf8a0b60f4aad3f8bf3beb40b2980ca32e5e87bd58a1f9bb78c48d74f043728c6852f5eeafa033fa59af265822fb8a1186814675
|
||||
AUX 1.3.2/14_ply_numeric.patch 881 SHA256 a1ec3e4cfe7b7a355793ca854da9a123870fa92e8f1b3cc72805dba7ff6f95c7 SHA512 88266fa82a343d70b7469fa4399abd0859c34c43de4d222d01118d9482fca4e5ffdfb2d8b10add238d36a5a3084273515284ab9e8a9bd855c2eadd069a7fbf90 WHIRLPOOL afc4fa1ecfc2c3e7951239f5d1eef54e4d1ca874ae41c0af7f6045f48ef6fc122db45c8bccaaa1e472cdbd09731d1334d44dc7c0b5a4308482dd6a9f9eaa9936
|
||||
AUX 1.3.2/15_qhull.patch 2749 SHA256 66302dd3daeae64aaf01035998439fa79f56a09878679100ef208f9e471a64df SHA512 25966ab73a8719e28e201ad998749ca891f4256163aeef0d9d23a9699b4299a757959c00fe5930e8f5bf713713c215c58944af65a9d48a7428d25c480096c3df WHIRLPOOL 91beddb020d6c539eef565589911433c6dba7a20d8339b032fc8d17d4ce6cbeb4d801f3a767ec685f48ffc3a47b7176f4ac7969b98a9dd7db63ac67e98ba018d
|
||||
AUX 1.3.2/16_shadersdir.patch 2311 SHA256 86bbc4f68de902ebbcbee808228ca9363262fbfbfa2a7dd9dde8015290268f19 SHA512 20c67f2eb4770427e648d7d69ac06cfd90b06eeb050d1fe1fac1068d7a84a0c9f378ffd5ca5d743dfb7385edee67ee5b98f569ea4d8e0109d8054dd36d6283e9 WHIRLPOOL 273ee08e4a5d0a86c2852e5872c0e0443dd857e4a96861444522a04ffe39b18edb197ead699478a303228d1d03f0e43abad1c42e69ca53aa4032d358282b5368
|
||||
AUX 1.3.2/17_structuresynth.patch 2229 SHA256 e9e7094c0a2684a7f06a5790f1ea7bfcd8caa95cfff03efa15826d3a55586c5a SHA512 03b2bebf3c70a064f380d3ccabdbd19b2c5a30d08a539d5025894560c1b31849feb295f14b8fb2bf75eb95cc21727eb9375acf96b74e40ea57d692648460dfd1 WHIRLPOOL defc27201696639d1133303c0d4aa83334a9de989e2bf71458f78ba02840aec03facec5866635be84161b22ab6ea3d683d7070e5b87e4539deb2507e8ab54c4e
|
||||
AUX 1.3.2/18_glew.c18p1.patch 5725 SHA256 5508284f5d30fb6ec9996fb2f4bd86a7839b048c2c3870f9db493afcfb57be9f SHA512 0986165ce47459c324d47a2c9081da9f09e3700bcb1d942fe0e82766fc5da61f716a1553c50d0c1f612417da95c7cc794416d75fb82f077b9cde35aa28344926 WHIRLPOOL 283dcc42401d49b5fa53c2eb0d3ba6707a3acf7319b5774ad35172beb5a70e8f398caf4540d21c6464b377a2f18982a5723f90f12a2b83343e786bc2fce13217
|
||||
AUX 1.3.2/19_CONFLICTS_IN_rpath.patch 1375 SHA256 630ddac55bfc24a8814584068e0023d3cf9884f476440eace189927a7e07586c SHA512 d1a33986ecf7d55fe762094dd57dd91bd1515b19964215cf041741269f7fb32fa903fe3b2fff42262fa731a98b5014d73818cb934ff9035f3b09726476dded9c WHIRLPOOL 37ebf686faf7297948bf086c5a13ed52cfa44ddb27e5ded6437da4d60d88e365f7f1ecb12223ec92890720cbb1929bc1f739bc960544e9efc98e1659832e08b5
|
||||
AUX 1.3.2/20_rpath.c18p2.patch 2016 SHA256 9aae726a619614a9f8a2e42a8c6c4d8e249e6d4169ca8b588556b3ab122f6d9a SHA512 99059d13898293fe499669e200f594cf824c2eaad728806a12e906cb97079cd8de80c494da1ff5f73aaeb4756366d8b6c0f404f8e98bfee68c012a4a2fccfb4e WHIRLPOOL 19d35f80d228489a79e7839eb8927fea963013449a7ae3722a012661acd1513576559ec342c8636a2fd7de3ac45eb5bdfd55f02559f444cf973f24eaad1769ef
|
||||
AUX 1.3.2/21_RESOLUTION.patch 1444 SHA256 36820b39371ee6938219f28e3005f5d7d39d0bc6230a01bebacc4e67f15e6efc SHA512 3742e3999e5c3842d831dc4742b40ea4659a0c6b036af81047d52c8234b4854ab147c76b795adde6ec52397d46f22a00017bf85079633aacd14ae1f711f6669f WHIRLPOOL 0820a94a01d0933cddc993c3a8a63bdd5029ae2e670cd69ff7b885f046f47ad386f262f539dde522dac307605572b896504d04e39cfd3f754be0ef84e7681efd
|
||||
AUX 1.3.2/22_aliasing.patch 1960 SHA256 576544a1c3646cbd9974ee30f71d18ae3775d3b1c5a3725818c000fa40963200 SHA512 5007163025f34e5f399e22843711d730b1e46612d9553e29bea46d575a4bdcb0663e978ebaa936e9213b210e9b99dd8ed30d3b40c212e7505f46da3ed45af8ed WHIRLPOOL df8bdad9c4641180765344862e4a4938f6812b7e788307c1db7e48eba10caa50e5e8b4e9574f686731b47dff5e5d03fabdfd66802d8eec6575118ef630fe309c
|
||||
DIST MeshLabSrc_AllInc_v132.tgz 12874196 SHA256 d57f0a99a55421aac54a66e2475d48f00f7b1752f9587cd69cf9b5b9c1a519b1 SHA512 40ef1f887d18e2146d6001d9c290bb76f6fc27caf13a1256a4061d5e2c43fd8dfdc843ace2cb83c6370648c2c5be3a22e2d5b31698df46e0695890d6a20651ac WHIRLPOOL aa6da94a8d5b9d28c9b787fe307774b7223e57278ed45c3bf1a823da9f5a9b59fd058a466f3f4dea3c4c57e3934b0aed88b1446f20e746349881c1bc965fec36
|
||||
EBUILD meshlab-1.3.2.ebuild 2500 SHA256 2e7a34d7fb2eb82cccff35d67afb072891a07be3bb8ad04d4c6235487627dc4a SHA512 a79e65ab65950ca489affce387007c6844ed65766b56b590e77dd1b68a7e755377ac852e105d98a5bc109580f2f99e5518731c594a197106e504e83dff927d1f WHIRLPOOL a6a9d0baeacf0ac6369434077689f7d75dc3f945ae89efc216e9c35f459d8ded8e4c4fc7e95ebc2e4c2015db68ea72f12d24003c4802ee50defc236f1a868dc4
|
||||
MISC ChangeLog 1090 SHA256 4f8fce587ff35b9e039956cbff930a69667ca0460857ed87bf8734aa1d02f869 SHA512 e02dacf80567abb87af075a40b1d02e68067d6766c57958107e69d6270843e8ddb7472b1f2df331249d6cbb55bbea2fa21bcb76d664afdf247e45ba702273efb WHIRLPOOL 7d67cdc0cf70421702f3deb8d4c27cc04a2581052fb3b2df3e1e8ed47f5f752e4226a28fce7b518358aee650451f09e2f58e3b230e82560c6787952b680dddad
|
||||
MISC metadata.xml 539 SHA256 42f8b1022ced56f567d785b2dcf504d26844467e9c7cd3ca7de0fa2c8d4a72aa SHA512 9027fb642725a1e384785d52654ca8abda65f2638fba92c14b6d06ba1b72e92bca80632a2ba22dcafaa96ded3d0dcf26b9e582ac43b1f6775edcfaa82e8bf8c6 WHIRLPOOL add2d8638a00c63d0c2205fca1c2bdadec95903f2ac03a17e2f654f427a4db7f570452760c743c36c5d9112af7ab555bc170bee1ec9f92dcde7ff17a4e67017b
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
Version: GnuPG v2
|
||||
|
||||
iQEcBAEBCAAGBQJT7QIvAAoJEDuJ1FA05peBPscH/1f2E1GhXsp+1ElpI9GVWiiW
|
||||
KPK0TaDce++RpG1lNseEZfAINMlapiWSddVAMTA3VKS25uL2RExF6jSU1Gzv/7AS
|
||||
PgxMcVk49MrVsjWy645yPVnRAkte5B+cpTcqvyWIppaC16MoEF7ycg+ASQyMzQWK
|
||||
ei+JrscV4vtzant7cxS8mIEsuUqbr4ywp9omEic6Imp8AYEN0mUkDGDmYi58bG1L
|
||||
4w8wb20XkFe9iQr/rRRyllcgK7LeiS5NJjFRIOvtuzmnopvIyYC5ElnZBJfz+VBn
|
||||
O0tBZkMueYpPUuO5fHpf2KqZJwGsLyNfVPhpjtBbG+t6W8vs/LRvWC4Mno3rgDA=
|
||||
=48p3
|
||||
-----END PGP SIGNATURE-----
|
||||
@ -0,0 +1,29 @@
|
||||
From: Teemu Ikonen <tpikonen@gmail.com>
|
||||
Subject: Fix crash on project save (closes: #718583)
|
||||
Git-Branch: p/crash-on-save
|
||||
Git-Diff: 532bdd9a6bde03cf47da8fb63fee60..cfc9473d1fa0e565d0aad4994fbb31
|
||||
|
||||
Patch from upstream SVN commit [r6114].
|
||||
|
||||
meshlab/src/meshlab/mainwindow_RunTime.cpp | 8 ++++++--
|
||||
1 file changed, 6 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/meshlab/src/meshlab/mainwindow_RunTime.cpp b/meshlab/src/meshlab/mainwindow_RunTime.cpp
|
||||
index 8f5057c..3273cec 100644
|
||||
--- a/meshlab/src/meshlab/mainwindow_RunTime.cpp
|
||||
+++ b/meshlab/src/meshlab/mainwindow_RunTime.cpp
|
||||
@@ -1575,8 +1575,12 @@ void MainWindow::saveProject()
|
||||
|
||||
/*********WARNING!!!!!! CHANGE IT!!! ALSO IN THE OPENPROJECT FUNCTION********/
|
||||
meshDoc()->setDocLabel(fileName);
|
||||
- mdiarea->activeSubWindow()->setWindowTitle(meshDoc()->docLabel());
|
||||
- layerDialog->setWindowTitle(meshDoc()->docLabel());
|
||||
+ QMdiSubWindow* sub = mdiarea->currentSubWindow();
|
||||
+ if (sub != NULL)
|
||||
+ {
|
||||
+ sub->setWindowTitle(meshDoc()->docLabel());
|
||||
+ layerDialog->setWindowTitle(meshDoc()->docLabel());
|
||||
+ }
|
||||
/****************************************************************************/
|
||||
|
||||
|
||||
@ -0,0 +1,46 @@
|
||||
From: Teemu Ikonen <tpikonen@gmail.com>
|
||||
Subject: Include <cstddef> on files using offsetoff (closes: #625053)
|
||||
Git-Branch: p/cstddef
|
||||
Git-Diff: 532bdd9a6bde03cf47da8fb63fee60..8fb2fc380c1a53d0e603d1aaeff156
|
||||
|
||||
vcglib/wrap/io_tetramesh/import_ply.h | 1 +
|
||||
vcglib/wrap/io_trimesh/import_ply.h | 1 +
|
||||
vcglib/wrap/ply/plystuff.h | 1 +
|
||||
3 files changed, 3 insertions(+)
|
||||
|
||||
diff --git a/vcglib/wrap/io_tetramesh/import_ply.h b/vcglib/wrap/io_tetramesh/import_ply.h
|
||||
index 0da4c1f..8370e48 100644
|
||||
--- a/vcglib/wrap/io_tetramesh/import_ply.h
|
||||
+++ b/vcglib/wrap/io_tetramesh/import_ply.h
|
||||
@@ -36,6 +36,7 @@ created
|
||||
#include<wrap/ply/io_mask.h>
|
||||
#include<wrap/io_tetramesh/io_ply.h>
|
||||
#include<vcg/complex/tetramesh/allocate.h>
|
||||
+#include <cstddef>
|
||||
|
||||
|
||||
|
||||
diff --git a/vcglib/wrap/io_trimesh/import_ply.h b/vcglib/wrap/io_trimesh/import_ply.h
|
||||
index 13eaa30..ce2de3a 100644
|
||||
--- a/vcglib/wrap/io_trimesh/import_ply.h
|
||||
+++ b/vcglib/wrap/io_trimesh/import_ply.h
|
||||
@@ -29,6 +29,7 @@
|
||||
#include<wrap/io_trimesh/io_mask.h>
|
||||
#include<wrap/io_trimesh/io_ply.h>
|
||||
#include<vcg/complex/algorithms/create/platonic.h>
|
||||
+#include <cstddef>
|
||||
|
||||
namespace vcg {
|
||||
namespace tri {
|
||||
diff --git a/vcglib/wrap/ply/plystuff.h b/vcglib/wrap/ply/plystuff.h
|
||||
index 3e41e63..4761e9f 100644
|
||||
--- a/vcglib/wrap/ply/plystuff.h
|
||||
+++ b/vcglib/wrap/ply/plystuff.h
|
||||
@@ -57,6 +57,7 @@ Cleaning of the automatic bbox caching support for ply files. First working vers
|
||||
#include <sys/types.h>
|
||||
#include <sys/stat.h>
|
||||
#include <fcntl.h>
|
||||
+#include <cstddef>
|
||||
#ifdef WIN32
|
||||
#include <io.h>
|
||||
#endif
|
||||
@ -0,0 +1,21 @@
|
||||
From: Teemu Ikonen <tpikonen@gmail.com>
|
||||
Subject: Disable checking for updates on startup.
|
||||
Git-Branch: p/disable-updates
|
||||
Git-Diff: 532bdd9a6bde03cf47da8fb63fee60..8f6cf9176644dce65ef4518b08526c
|
||||
|
||||
meshlab/src/meshlab/mainwindow_Init.cpp | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/meshlab/src/meshlab/mainwindow_Init.cpp b/meshlab/src/meshlab/mainwindow_Init.cpp
|
||||
index de3ff1d..ce7bf81 100644
|
||||
--- a/meshlab/src/meshlab/mainwindow_Init.cpp
|
||||
+++ b/meshlab/src/meshlab/mainwindow_Init.cpp
|
||||
@@ -926,7 +926,7 @@ void MainWindow::saveRecentFileList(const QString &fileName)
|
||||
|
||||
if(loadedMeshCounter-lastComunicatedValue>connectionInterval && !myLocalBuf.isOpen())
|
||||
{
|
||||
-#if not defined(__DISABLE_AUTO_STATS__)
|
||||
+#if defined(__ENABLE_AUTO_STATS__)
|
||||
checkForUpdates(false);
|
||||
#endif
|
||||
int congratsMeshCounter = settings.value("congratsMeshCounter",50).toInt();
|
||||
@ -0,0 +1,25 @@
|
||||
From: Teemu Ikonen <tpikonen@gmail.com>
|
||||
Subject: Only build necessary external sources.
|
||||
Git-Branch: p/externals
|
||||
Git-Diff: 532bdd9a6bde03cf47da8fb63fee60..ca572df8704909a1bbe18b1ce25d76
|
||||
|
||||
meshlab/src/external/external.pro | 7 +------
|
||||
1 file changed, 1 insertion(+), 6 deletions(-)
|
||||
|
||||
diff --git a/meshlab/src/external/external.pro b/meshlab/src/external/external.pro
|
||||
index c103d88..324eb91 100644
|
||||
--- a/meshlab/src/external/external.pro
|
||||
+++ b/meshlab/src/external/external.pro
|
||||
@@ -2,11 +2,6 @@ config += debug_and_release
|
||||
|
||||
TEMPLATE = subdirs
|
||||
|
||||
-SUBDIRS = lib3ds-1.3.0/lib3ds \
|
||||
- bzip2-1.0.5/bzip2-1.0.5.pro \
|
||||
- muparser_v132/src \
|
||||
- levmar-2.3/levmar-2.3.pro \
|
||||
+SUBDIRS = levmar-2.3/levmar-2.3.pro \
|
||||
structuresynth/structuresynth.pro \
|
||||
- OpenCTM-1.0.3/openctm.pro \
|
||||
jhead-2.95/jhead-2.95.pro
|
||||
-# openkinect/openkinect.pro
|
||||
@ -0,0 +1,44 @@
|
||||
From: Teemu Ikonen <tpikonen@gmail.com>
|
||||
Subject: Fix compilation errors with -Werror=format-security.
|
||||
Git-Branch: p/format-security
|
||||
Git-Diff: 532bdd9a6bde03cf47da8fb63fee60..be247b855ebb49a4d826d60b7d21a0
|
||||
|
||||
.../meshlabplugins/decorate_raster_proj/decorate_raster_proj.cpp | 4 ++--
|
||||
meshlab/src/meshlabplugins/edit_arc3D/edit_arc3D.cpp | 2 +-
|
||||
2 files changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/meshlab/src/meshlabplugins/decorate_raster_proj/decorate_raster_proj.cpp b/meshlab/src/meshlabplugins/decorate_raster_proj/decorate_raster_proj.cpp
|
||||
index 4864214..233b657 100644
|
||||
--- a/meshlab/src/meshlabplugins/decorate_raster_proj/decorate_raster_proj.cpp
|
||||
+++ b/meshlab/src/meshlabplugins/decorate_raster_proj/decorate_raster_proj.cpp
|
||||
@@ -526,7 +526,7 @@ bool DecorateRasterProjPlugin::startDecorate( QAction *act,
|
||||
GLenum err = glewInit();
|
||||
if( err != GLEW_OK )
|
||||
{
|
||||
- qWarning( (std::string("Impossible to load GLEW library.")+(char*)glewGetErrorString(err)).c_str() );
|
||||
+ qWarning("Impossible to load GLEW library: %s", glewGetErrorString(err));
|
||||
return false;
|
||||
}
|
||||
Log( "GLEW library correctly initialized." );
|
||||
@@ -536,7 +536,7 @@ bool DecorateRasterProjPlugin::startDecorate( QAction *act,
|
||||
std::string logs;
|
||||
if( !initShaders(logs) )
|
||||
{
|
||||
- qWarning( ("Error while initializing shaders.\n"+logs).c_str() );
|
||||
+ qWarning("Error while initializing shaders.\n%s", logs.c_str());
|
||||
return false;
|
||||
}
|
||||
Log( "Shaders correctly loaded." );
|
||||
diff --git a/meshlab/src/meshlabplugins/edit_arc3D/edit_arc3D.cpp b/meshlab/src/meshlabplugins/edit_arc3D/edit_arc3D.cpp
|
||||
index 88b6f9f..c23987c 100644
|
||||
--- a/meshlab/src/meshlabplugins/edit_arc3D/edit_arc3D.cpp
|
||||
+++ b/meshlab/src/meshlabplugins/edit_arc3D/edit_arc3D.cpp
|
||||
@@ -269,7 +269,7 @@ void EditArc3DPlugin::ExportPly()
|
||||
QString suffix = "." + qfInfo.completeSuffix();
|
||||
QString path = qfInfo.absoluteFilePath().remove(suffix);
|
||||
path.append("Undist" + suffix);
|
||||
- qDebug(path.toLatin1());
|
||||
+ qDebug("%s", path.toStdString().c_str());
|
||||
|
||||
QImage undistImg(originalImg.width(),originalImg.height(),originalImg.format());
|
||||
undistImg.fill(qRgba(0,0,0,255));
|
||||
@ -0,0 +1,105 @@
|
||||
From: Teemu Ikonen <tpikonen@gmail.com>
|
||||
Subject: Fix FTBFS with GCC-4.7
|
||||
Git-Branch: p/gcc47
|
||||
Git-Diff: 532bdd9a6bde03cf47da8fb63fee60..07a6c6cf991f44779236b31381a7ca
|
||||
|
||||
Closes: #667276
|
||||
|
||||
Thanks to Matej Vela for the patch.
|
||||
|
||||
meshlab/src/meshlabplugins/decorate_base/colorhistogram.h | 2 +-
|
||||
.../vcg/complex/algorithms/local_optimization/tri_edge_flip.h | 8 ++++----
|
||||
vcglib/vcg/space/index/grid_static_obj.h | 2 +-
|
||||
vcglib/wrap/gl/trimesh.h | 2 +-
|
||||
vcglib/wrap/ply/plystuff.h | 1 +
|
||||
5 files changed, 8 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/meshlab/src/meshlabplugins/decorate_base/colorhistogram.h b/meshlab/src/meshlabplugins/decorate_base/colorhistogram.h
|
||||
index 2351b2a..90c6d76 100644
|
||||
--- a/meshlab/src/meshlabplugins/decorate_base/colorhistogram.h
|
||||
+++ b/meshlab/src/meshlabplugins/decorate_base/colorhistogram.h
|
||||
@@ -40,7 +40,7 @@ public:
|
||||
|
||||
//! Reset histogram data.
|
||||
void Clear() {
|
||||
- this->::Clear();
|
||||
+ Histogram<ScalarType>::Clear();
|
||||
CV.clear();
|
||||
}
|
||||
/*
|
||||
diff --git a/vcglib/vcg/complex/algorithms/local_optimization/tri_edge_flip.h b/vcglib/vcg/complex/algorithms/local_optimization/tri_edge_flip.h
|
||||
index 9054166..f40f0dc 100644
|
||||
--- a/vcglib/vcg/complex/algorithms/local_optimization/tri_edge_flip.h
|
||||
+++ b/vcglib/vcg/complex/algorithms/local_optimization/tri_edge_flip.h
|
||||
@@ -558,13 +558,13 @@ public:
|
||||
// edges of the first face, except the flipped edge
|
||||
for(int i = 0; i < 3; i++) if(i != flipped) {
|
||||
PosType newpos(f1, i);
|
||||
- Insert(heap, newpos, this->GlobalMark());
|
||||
+ this->Insert(heap, newpos, this->GlobalMark());
|
||||
}
|
||||
|
||||
// edges of the second face, except the flipped edge
|
||||
for(int i = 0; i < 3; i++) if(i != f1->FFi(flipped)) {
|
||||
PosType newpos(f2, i);
|
||||
- Insert(heap, newpos, this->GlobalMark());
|
||||
+ this->Insert(heap, newpos, this->GlobalMark());
|
||||
}
|
||||
|
||||
// every edge with v0, v1 v3 of f1
|
||||
@@ -583,7 +583,7 @@ public:
|
||||
do {
|
||||
VertexPointer v = pos.VFlip();
|
||||
if(v != v0 && v != v1 && v != v2 && v != v3)
|
||||
- Insert(heap, pos, this->GlobalMark());
|
||||
+ this->Insert(heap, pos, this->GlobalMark());
|
||||
|
||||
pos.NextE();
|
||||
} while(pos != startpos && !pos.IsBorder());
|
||||
@@ -603,7 +603,7 @@ public:
|
||||
do {
|
||||
VertexPointer v = pos.VFlip();
|
||||
if(v != v0 && v != v1 && v != v2 && v != v3)
|
||||
- Insert(heap, pos, this->GlobalMark());
|
||||
+ this->Insert(heap, pos, this->GlobalMark());
|
||||
|
||||
pos.NextE();
|
||||
} while(pos != startpos && !pos.IsBorder());
|
||||
diff --git a/vcglib/vcg/space/index/grid_static_obj.h b/vcglib/vcg/space/index/grid_static_obj.h
|
||||
index 0554393..26608d5 100644
|
||||
--- a/vcglib/vcg/space/index/grid_static_obj.h
|
||||
+++ b/vcglib/vcg/space/index/grid_static_obj.h
|
||||
@@ -72,7 +72,7 @@ class GridStaticObj : public BasicGrid<FLT>
|
||||
inline ~GridStaticObj() { if(grid) delete[] grid; }
|
||||
inline void Init(const ObjType &val)
|
||||
{
|
||||
- fill(grid,grid+size(),val);
|
||||
+ std::fill(grid,grid+size(),val);
|
||||
}
|
||||
|
||||
|
||||
diff --git a/vcglib/wrap/gl/trimesh.h b/vcglib/wrap/gl/trimesh.h
|
||||
index 5d40404..ba72456 100644
|
||||
--- a/vcglib/wrap/gl/trimesh.h
|
||||
+++ b/vcglib/wrap/gl/trimesh.h
|
||||
@@ -1003,7 +1003,7 @@ void Crease(MESH_TYPE &m, typename MESH_TYPE::scalar_type angleRad)
|
||||
}
|
||||
}
|
||||
|
||||
- m.vert.math::Swap(newvert);
|
||||
+ m.vert.swap(newvert);
|
||||
m.vn=m.vert.size();
|
||||
}
|
||||
|
||||
diff --git a/vcglib/wrap/ply/plystuff.h b/vcglib/wrap/ply/plystuff.h
|
||||
index 3e41e63..4af9508 100644
|
||||
--- a/vcglib/wrap/ply/plystuff.h
|
||||
+++ b/vcglib/wrap/ply/plystuff.h
|
||||
@@ -75,6 +75,7 @@ using namespace vcg;
|
||||
#define pb_close _close
|
||||
#define DIR_SEP "\\"
|
||||
#else
|
||||
+#include <unistd.h>
|
||||
#define pb_mkdir(n) mkdir(n,0755)
|
||||
#define pb_access access
|
||||
#define pb_stat stat
|
||||
@ -0,0 +1,32 @@
|
||||
From: Teemu Ikonen <tpikonen@gmail.com>
|
||||
Subject: Use Debian lib3ds.
|
||||
Git-Branch: p/lib3ds
|
||||
Git-Diff: 532bdd9a6bde03cf47da8fb63fee60..944ece3e566dbf4cc885163178d303
|
||||
|
||||
meshlab/src/meshlabplugins/io_3ds/io_3ds.pro | 6 ++----
|
||||
1 file changed, 2 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/meshlab/src/meshlabplugins/io_3ds/io_3ds.pro b/meshlab/src/meshlabplugins/io_3ds/io_3ds.pro
|
||||
index cf8052a..fed064d 100644
|
||||
--- a/meshlab/src/meshlabplugins/io_3ds/io_3ds.pro
|
||||
+++ b/meshlab/src/meshlabplugins/io_3ds/io_3ds.pro
|
||||
@@ -14,7 +14,7 @@ SOURCES += meshio.cpp \
|
||||
|
||||
TARGET = io_3ds
|
||||
|
||||
-INCLUDEPATH += ../../external/lib3ds-1.3.0/
|
||||
+INCLUDEPATH += /usr/include/lib3ds
|
||||
|
||||
# Notes on the paths of lib3ds files.
|
||||
# Once you have compiled the library put the lib files in a dir named lib/XXX/
|
||||
@@ -25,9 +25,7 @@ win32-msvc.net:LIBS += ../../external/lib/win32-msvc.net/3ds.lib
|
||||
win32-msvc2005:LIBS += ../../external/lib/win32-msvc2005/3ds.lib
|
||||
win32-msvc2008:LIBS += ../../external/lib/win32-msvc2008/3ds.lib
|
||||
win32-g++:LIBS += ../../external/lib/win32-gcc/lib3ds.a
|
||||
-linux-g++:LIBS += ../../external/lib/linux-g++/lib3ds.a
|
||||
-linux-g++-32:LIBS += ../../external/lib/linux-g++-32/lib3ds.a
|
||||
-linux-g++-64:LIBS += ../../external/lib/linux-g++-64/lib3ds.a
|
||||
+linux-g++:LIBS += -l3ds
|
||||
|
||||
# unix:LIBS += -L../../../../code/lib/lib3ds-1.3.0/lib3ds/lib/unix -l3ds
|
||||
|
||||
@ -0,0 +1,31 @@
|
||||
From: Teemu Ikonen <tpikonen@gmail.com>
|
||||
Subject: Use Debian libbz2.
|
||||
Git-Branch: p/libbz2
|
||||
Git-Diff: 532bdd9a6bde03cf47da8fb63fee60..a6e1a0b242a02075c0d686ec4fa8b8
|
||||
|
||||
meshlab/src/meshlabplugins/edit_arc3D/edit_arc3D.pro | 8 ++------
|
||||
1 file changed, 2 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/meshlab/src/meshlabplugins/edit_arc3D/edit_arc3D.pro b/meshlab/src/meshlabplugins/edit_arc3D/edit_arc3D.pro
|
||||
index e317b99..94dc124 100644
|
||||
--- a/meshlab/src/meshlabplugins/edit_arc3D/edit_arc3D.pro
|
||||
+++ b/meshlab/src/meshlabplugins/edit_arc3D/edit_arc3D.pro
|
||||
@@ -32,16 +32,12 @@ RESOURCES = edit_arc3D.qrc
|
||||
win32-msvc2005:LIBS += ../../external/lib/win32-msvc2005/bz2.lib
|
||||
win32-msvc2008:LIBS += ../../external/lib/win32-msvc2008/bz2.lib
|
||||
win32-g++:LIBS += ../../external/lib/win32-gcc/libbz2.a
|
||||
-linux-g++:LIBS += ../../external/lib/linux-g++/libbz2.a
|
||||
-linux-g++-32:LIBS += ../../external/lib/linux-g++-32/libbz2.a
|
||||
-linux-g++-64:LIBS += ../../external/lib/linux-g++-64/libbz2.a
|
||||
+linux-g++:LIBS += -lbz2
|
||||
|
||||
win32-msvc2005:INCLUDEPATH += ../../external/bzip2-1.0.5
|
||||
win32-msvc2008:INCLUDEPATH += ../../external/bzip2-1.0.5
|
||||
win32-g++:INCLUDEPATH += ../../external/bzip2-1.0.5
|
||||
-linux-g++:INCLUDEPATH += ../../external/bzip2-1.0.5
|
||||
-linux-g++-32:INCLUDEPATH += ../../external/bzip2-1.0.5
|
||||
-linux-g++-64:INCLUDEPATH += ../../external/bzip2-1.0.5
|
||||
+linux-g++:INCLUDEPATH += /usr/include
|
||||
|
||||
mac:LIBS += -lbz2
|
||||
|
||||
@ -0,0 +1,30 @@
|
||||
From: Teemu Ikonen <tpikonen@gmail.com>
|
||||
Subject: Use Debian muparser.
|
||||
Git-Branch: p/muparser
|
||||
Git-Diff: 532bdd9a6bde03cf47da8fb63fee60..5e9cfcdae805ddac6f550b2a9f7011
|
||||
|
||||
meshlab/src/meshlabplugins/filter_func/filter_func.pro | 6 ++----
|
||||
1 file changed, 2 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/meshlab/src/meshlabplugins/filter_func/filter_func.pro b/meshlab/src/meshlabplugins/filter_func/filter_func.pro
|
||||
index 3bcce2a..9a147b2 100644
|
||||
--- a/meshlab/src/meshlabplugins/filter_func/filter_func.pro
|
||||
+++ b/meshlab/src/meshlabplugins/filter_func/filter_func.pro
|
||||
@@ -6,7 +6,7 @@ SOURCES += filter_func.cpp
|
||||
|
||||
TARGET = filter_func
|
||||
|
||||
-INCLUDEPATH += ../../external/muparser_v132/include
|
||||
+INCLUDEPATH += /usr/include/muParser
|
||||
|
||||
# Note: we need static libs so when building muparser lib use
|
||||
# ./configure --enable-shared=no
|
||||
@@ -14,7 +14,5 @@ INCLUDEPATH += ../../external/muparser_v132/include
|
||||
win32-msvc2005:LIBS += ../../external/lib/win32-msvc2005/muparser.lib
|
||||
win32-msvc2008:LIBS += ../../external/lib/win32-msvc2008/muparser.lib
|
||||
macx:LIBS += $$MACLIBDIR/libmuparser.a
|
||||
-linux-g++:LIBS += ../../external/lib/linux-g++/libmuparser.a
|
||||
-linux-g++-32:LIBS += ../../external/lib/linux-g++-32/libmuparser.a
|
||||
-linux-g++-64:LIBS += ../../external/lib/linux-g++-64/libmuparser.a
|
||||
+linux-g++:LIBS += -lmuparser
|
||||
win32-g++:LIBS += ../../external/lib/win32-gcc/libmuparser.a
|
||||
@ -0,0 +1,31 @@
|
||||
From: Teemu Ikonen <tpikonen@gmail.com>
|
||||
Subject: Use Debian OpenCTM
|
||||
Git-Branch: p/openctm
|
||||
Git-Diff: 532bdd9a6bde03cf47da8fb63fee60..e067d2c66c2408593f62f9c7776eed
|
||||
|
||||
meshlab/src/meshlabplugins/io_ctm/io_ctm.pro | 6 ++----
|
||||
1 file changed, 2 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/meshlab/src/meshlabplugins/io_ctm/io_ctm.pro b/meshlab/src/meshlabplugins/io_ctm/io_ctm.pro
|
||||
index 1084902..31f0237 100644
|
||||
--- a/meshlab/src/meshlabplugins/io_ctm/io_ctm.pro
|
||||
+++ b/meshlab/src/meshlabplugins/io_ctm/io_ctm.pro
|
||||
@@ -3,7 +3,7 @@ HEADERS += io_ctm.h \
|
||||
$$VCGDIR/wrap/io_trimesh/import_ctm.h \
|
||||
$$VCGDIR/wrap/io_trimesh/export_ctm.h
|
||||
SOURCES += io_ctm.cpp
|
||||
-INCLUDEPATH += ../../external/OpenCTM-1.0.3/lib
|
||||
+INCLUDEPATH += /usr/include
|
||||
TARGET = io_ctm
|
||||
|
||||
win32-msvc.net:QMAKE_CXXFLAGS += /DOPENCTM_STATIC
|
||||
@@ -15,8 +15,6 @@ win32-msvc.net:LIBS += ../../external/lib/win32-msvc.net/openctm.lib
|
||||
win32-msvc2005:LIBS += ../../external/lib/win32-msvc2005/openctm.lib
|
||||
win32-msvc2008:LIBS += ../../external/lib/win32-msvc2008/openctm.lib
|
||||
win32-g++:LIBS += ../../external/lib/win32-gcc/libopenctm.a
|
||||
-linux-g++:LIBS += ../../external/lib/linux-g++/libopenctm.a
|
||||
-linux-g++-32:LIBS += ../../external/lib/linux-g++-32/libopenctm.a
|
||||
-linux-g++-64:LIBS += ../../external/lib/linux-g++-64/libopenctm.a
|
||||
+linux-g++:LIBS += -lopenctm
|
||||
#macx:LIBS += ../../external/lib/macx/libopenctm.a
|
||||
macx:LIBS += $$MACLIBDIR/libopenctm.a
|
||||
@ -0,0 +1,23 @@
|
||||
From: Teemu Ikonen <tpikonen@gmail.com>
|
||||
Subject: Fix overflowing array index in VCGlib
|
||||
Git-Branch: p/overflow
|
||||
Git-Diff: 532bdd9a6bde03cf47da8fb63fee60..ec0961589f0d134ab51265b8431c5f
|
||||
|
||||
Fixes also E-array-bounds error in Debian build log scanner.
|
||||
|
||||
vcglib/wrap/gl/addons.h | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/vcglib/wrap/gl/addons.h b/vcglib/wrap/gl/addons.h
|
||||
index 002ff1b..bc863bf 100644
|
||||
--- a/vcglib/wrap/gl/addons.h
|
||||
+++ b/vcglib/wrap/gl/addons.h
|
||||
@@ -292,7 +292,7 @@ public:
|
||||
P[1] = Point3f( 0, sinf(angle), cosf(angle));
|
||||
assert(!glGetError());
|
||||
glBegin(GL_TRIANGLES);
|
||||
- Point3f n = ( (P[0]-p0) ^ (P[2]-p0) ).Normalize();
|
||||
+ Point3f n = ( (P[0]-p0) ^ (P[1]-p0) ).Normalize();
|
||||
glNormal3f(n[0],n[1],n[2]);
|
||||
glVertex3f(p0[0],p0[1],p0[2]);
|
||||
glNormal3f(N[0][0],N[0][1],N[0][2]);
|
||||
@ -0,0 +1,21 @@
|
||||
From: Teemu Ikonen <tpikonen@gmail.com>
|
||||
Subject: Hardcode pluginsDir to the correct path in Debian
|
||||
Git-Branch: p/pluginsdir
|
||||
Git-Diff: 532bdd9a6bde03cf47da8fb63fee60..e1db74a038fd5fc27cc5e9f0bee8d3
|
||||
|
||||
meshlab/src/common/pluginmanager.cpp | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/meshlab/src/common/pluginmanager.cpp b/meshlab/src/common/pluginmanager.cpp
|
||||
index d84c8fa..a039736 100644
|
||||
--- a/meshlab/src/common/pluginmanager.cpp
|
||||
+++ b/meshlab/src/common/pluginmanager.cpp
|
||||
@@ -230,7 +230,7 @@ QString PluginManager::getBaseDirPath()
|
||||
|
||||
QString PluginManager::getPluginDirPath()
|
||||
{
|
||||
- QDir pluginsDir(getBaseDirPath());
|
||||
+ QDir pluginsDir("/usr/lib/meshlab");
|
||||
if(!pluginsDir.exists("plugins"))
|
||||
//QMessageBox::warning(0,"Meshlab Initialization","Serious error. Unable to find the plugins directory.");
|
||||
qDebug("Meshlab Initialization: Serious error. Unable to find the plugins directory.");
|
||||
@ -0,0 +1,32 @@
|
||||
From: Teemu Ikonen <tpikonen@gmail.com>
|
||||
Subject: Set LC_NUMERIC to "C"
|
||||
Git-Branch: p/ply_numeric
|
||||
Git-Diff: 532bdd9a6bde03cf47da8fb63fee60..2aeac7daa4785a9cf0b2480f663780
|
||||
|
||||
Fixes reading of ascii float values in locales which use the comma as a
|
||||
float separator.
|
||||
|
||||
meshlab/src/meshlab/main.cpp | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/meshlab/src/meshlab/main.cpp b/meshlab/src/meshlab/main.cpp
|
||||
index 7058e31..e452e87 100644
|
||||
--- a/meshlab/src/meshlab/main.cpp
|
||||
+++ b/meshlab/src/meshlab/main.cpp
|
||||
@@ -25,12 +25,16 @@
|
||||
#include <QMessageBox>
|
||||
#include "mainwindow.h"
|
||||
|
||||
+using namespace std;
|
||||
+
|
||||
int main(int argc, char *argv[])
|
||||
{
|
||||
MeshLabApplication app(argc, argv);
|
||||
QLocale::setDefault(QLocale::C);
|
||||
QCoreApplication::setOrganizationName("VCG");
|
||||
QCoreApplication::setApplicationName("MeshLab");
|
||||
+
|
||||
+ std::setlocale(LC_NUMERIC, "C");
|
||||
|
||||
if(argc>1)
|
||||
{
|
||||
@ -0,0 +1,49 @@
|
||||
From: Teemu Ikonen <tpikonen@gmail.com>
|
||||
Subject: Hardcode shadersDir to the correct path in Debian in various plugins
|
||||
Git-Branch: p/shadersdir
|
||||
Git-Diff: 532bdd9a6bde03cf47da8fb63fee60..06b8aa9ce525fc0c5c221f5d675c29
|
||||
|
||||
meshlab/src/meshlabplugins/render_gdp/meshrender.cpp | 2 +-
|
||||
meshlab/src/meshlabplugins/render_gdp/shaderDialog.cpp | 2 +-
|
||||
meshlab/src/meshlabplugins/render_rfx/render_rfx.cpp | 2 +-
|
||||
3 files changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/meshlab/src/meshlabplugins/render_gdp/meshrender.cpp b/meshlab/src/meshlabplugins/render_gdp/meshrender.cpp
|
||||
index 64dbcc3..c07998c 100644
|
||||
--- a/meshlab/src/meshlabplugins/render_gdp/meshrender.cpp
|
||||
+++ b/meshlab/src/meshlabplugins/render_gdp/meshrender.cpp
|
||||
@@ -39,7 +39,7 @@ void MeshShaderRenderPlugin::initActionList() {
|
||||
qaNone->setCheckable(false);
|
||||
actionList << qaNone;*/
|
||||
|
||||
- QDir shadersDir = QDir(qApp->applicationDirPath());
|
||||
+ QDir shadersDir = QDir("/usr/share/meshlab");
|
||||
#if defined(Q_OS_WIN)
|
||||
if (shadersDir.dirName() == "debug" || shadersDir.dirName() == "release" || shadersDir.dirName() == "plugins" )
|
||||
shadersDir.cdUp();
|
||||
diff --git a/meshlab/src/meshlabplugins/render_gdp/shaderDialog.cpp b/meshlab/src/meshlabplugins/render_gdp/shaderDialog.cpp
|
||||
index 9c45981..0256805 100644
|
||||
--- a/meshlab/src/meshlabplugins/render_gdp/shaderDialog.cpp
|
||||
+++ b/meshlab/src/meshlabplugins/render_gdp/shaderDialog.cpp
|
||||
@@ -323,7 +323,7 @@ void ShaderDialog::changeTexturePath(int i) {
|
||||
void ShaderDialog::browseTexturePath(int i) {
|
||||
QFileDialog fd(0,"Choose new texture");
|
||||
|
||||
- QDir shadersDir = QDir(qApp->applicationDirPath());
|
||||
+ QDir shadersDir = QDir("/usr/share/meshlab");
|
||||
#if defined(Q_OS_WIN)
|
||||
if (shadersDir.dirName() == "debug" || shadersDir.dirName() == "release")
|
||||
shadersDir.cdUp();
|
||||
diff --git a/meshlab/src/meshlabplugins/render_rfx/render_rfx.cpp b/meshlab/src/meshlabplugins/render_rfx/render_rfx.cpp
|
||||
index e327cea..eb67fd2 100755
|
||||
--- a/meshlab/src/meshlabplugins/render_rfx/render_rfx.cpp
|
||||
+++ b/meshlab/src/meshlabplugins/render_rfx/render_rfx.cpp
|
||||
@@ -55,7 +55,7 @@ QList<QAction*> RenderRFX::actions()
|
||||
|
||||
void RenderRFX::initActionList()
|
||||
{
|
||||
- QDir shadersDir = PluginManager::getBaseDirPath();
|
||||
+ QDir shadersDir = QDir("/usr/share/meshlab");
|
||||
|
||||
#if defined(Q_OS_WIN)
|
||||
if (shadersDir.dirName() == "debug" ||
|
||||
@ -0,0 +1,48 @@
|
||||
From: Teemu Ikonen <tpikonen@gmail.com>
|
||||
Subject: Include glu.h where needed in included structure-synth code.
|
||||
Git-Branch: p/structuresynth
|
||||
Git-Diff: 532bdd9a6bde03cf47da8fb63fee60..45495fd45078a06d7c5f7405ba636c
|
||||
|
||||
Also link structuresynth code with libGLU.
|
||||
|
||||
This FTBS was exposed by GCC-4.7. See Debian bug #672000 for the same
|
||||
issue in the real structure-synth Debian package.
|
||||
|
||||
.../structuresynth/ssynth/SyntopiaCore/GLEngine/EngineWidget.h | 1 +
|
||||
.../src/external/structuresynth/ssynth/SyntopiaCore/GLEngine/Sphere.h | 1 +
|
||||
meshlab/src/external/structuresynth/structuresynth.pro | 1 +
|
||||
3 files changed, 3 insertions(+)
|
||||
|
||||
diff --git a/meshlab/src/external/structuresynth/ssynth/SyntopiaCore/GLEngine/EngineWidget.h b/meshlab/src/external/structuresynth/ssynth/SyntopiaCore/GLEngine/EngineWidget.h
|
||||
index 8905cbe..e13b011 100644
|
||||
--- a/meshlab/src/external/structuresynth/ssynth/SyntopiaCore/GLEngine/EngineWidget.h
|
||||
+++ b/meshlab/src/external/structuresynth/ssynth/SyntopiaCore/GLEngine/EngineWidget.h
|
||||
@@ -5,6 +5,7 @@
|
||||
#include <QMainWindow>
|
||||
#include <QPoint>
|
||||
#include <QList>
|
||||
+#include <GL/glu.h>
|
||||
|
||||
#include "SyntopiaCore/Math/Vector3.h"
|
||||
#include "SyntopiaCore/Math/Matrix4.h"
|
||||
diff --git a/meshlab/src/external/structuresynth/ssynth/SyntopiaCore/GLEngine/Sphere.h b/meshlab/src/external/structuresynth/ssynth/SyntopiaCore/GLEngine/Sphere.h
|
||||
index 0b0dc40..ed95346 100644
|
||||
--- a/meshlab/src/external/structuresynth/ssynth/SyntopiaCore/GLEngine/Sphere.h
|
||||
+++ b/meshlab/src/external/structuresynth/ssynth/SyntopiaCore/GLEngine/Sphere.h
|
||||
@@ -2,6 +2,7 @@
|
||||
|
||||
#include "SyntopiaCore/Math/Vector3.h"
|
||||
#include "Object3D.h"
|
||||
+#include <GL/glu.h>
|
||||
|
||||
namespace SyntopiaCore {
|
||||
namespace GLEngine {
|
||||
diff --git a/meshlab/src/external/structuresynth/structuresynth.pro b/meshlab/src/external/structuresynth/structuresynth.pro
|
||||
index 8579b03..362ce5d 100644
|
||||
--- a/meshlab/src/external/structuresynth/structuresynth.pro
|
||||
+++ b/meshlab/src/external/structuresynth/structuresynth.pro
|
||||
@@ -120,3 +120,4 @@ win32-msvc2008:DESTDIR = ../lib/win32-msvc2008
|
||||
linux-g++-32:DESTDIR = ../lib/linux-g++-32
|
||||
linux-g++-64:DESTDIR = ../lib/linux-g++-64
|
||||
linux-g++:DESTDIR = ../lib/linux-g++
|
||||
+unix:LIBS+=-lGLU
|
||||
@ -0,0 +1,146 @@
|
||||
From: Teemu Ikonen <tpikonen@gmail.com>
|
||||
Subject: Use Debian GLEW.
|
||||
Git-Branch: p/glew
|
||||
Git-Diff: 532bdd9a6bde03cf47da8fb63fee60..7023f74389baab6b9032c08ae2e2b2
|
||||
|
||||
meshlab/src/common/common.pro | 5 ++---
|
||||
meshlab/src/meshlab/meshlab.pro | 4 +---
|
||||
meshlab/src/meshlabplugins/filter_plymc/plymc.pro | 2 +-
|
||||
meshlab/src/meshlabserver/meshlabserver.pro | 6 ++----
|
||||
meshlab/src/shared.pri | 7 ++++---
|
||||
vcglib/apps/sample/trimesh_QT/trimesh_qt.pro | 5 +++--
|
||||
vcglib/apps/sample/trimesh_pos_demo/trimesh_pos_demo.pro | 4 ++--
|
||||
7 files changed, 15 insertions(+), 18 deletions(-)
|
||||
|
||||
diff --git a/meshlab/src/common/common.pro b/meshlab/src/common/common.pro
|
||||
index eec1863..58bda06 100644
|
||||
--- a/meshlab/src/common/common.pro
|
||||
+++ b/meshlab/src/common/common.pro
|
||||
@@ -1,9 +1,9 @@
|
||||
include (../general.pri)
|
||||
EXIF_DIR = ../external/jhead-2.95
|
||||
+GLEWDIR = /usr
|
||||
+LIBS += -lGLEW
|
||||
|
||||
|
||||
-GLEWCODE = $$GLEWDIR/src/glew.c
|
||||
-
|
||||
win32-msvc2005:DESTDIR = ../distrib
|
||||
win32-msvc2008:DESTDIR = ../distrib
|
||||
win32-msvc2010:DESTDIR = ../distrib
|
||||
@@ -106,7 +106,6 @@ SOURCES += filterparameter.cpp \
|
||||
mlapplication.cpp \
|
||||
scriptsyntax.cpp \
|
||||
searcher.cpp \
|
||||
- $$GLEWCODE \
|
||||
meshlabdocumentxml.cpp \
|
||||
meshlabdocumentbundler.cpp
|
||||
|
||||
diff --git a/meshlab/src/meshlab/meshlab.pro b/meshlab/src/meshlab/meshlab.pro
|
||||
index 4a7d0fd..ecd9ed6 100644
|
||||
--- a/meshlab/src/meshlab/meshlab.pro
|
||||
+++ b/meshlab/src/meshlab/meshlab.pro
|
||||
@@ -129,11 +129,9 @@ win32-g++:LIBS += -L../external/lib/win32-gcc -L../distrib -lcommon
|
||||
# win32-g++:release:LIBS += -L../common/release -lcommon
|
||||
#}
|
||||
|
||||
-linux-g++:LIBS += -L../external/lib/linux-g++ -ljhead -L../distrib -lcommon -lGLU
|
||||
+linux-g++:LIBS += -L../external/lib/linux-g++ -ljhead -L../distrib -lcommon -lGLEW -lGLU
|
||||
linux-g++:QMAKE_RPATHDIR += ../distrib
|
||||
-linux-g++-32:LIBS += -L../external/lib/linux-g++-32 -L../distrib -lcommon -lGLU
|
||||
linux-g++-32:QMAKE_RPATHDIR += ../distrib
|
||||
-linux-g++-64:LIBS += -L../external/lib/linux-g++-64 -L../distrib -lcommon -lGLU
|
||||
linux-g++-64:QMAKE_RPATHDIR += ../distrib
|
||||
|
||||
# uncomment in your local copy only in emergency cases.
|
||||
diff --git a/meshlab/src/meshlabplugins/filter_plymc/plymc.pro b/meshlab/src/meshlabplugins/filter_plymc/plymc.pro
|
||||
index b609419..a89e8c6 100755
|
||||
--- a/meshlab/src/meshlabplugins/filter_plymc/plymc.pro
|
||||
+++ b/meshlab/src/meshlabplugins/filter_plymc/plymc.pro
|
||||
@@ -1,7 +1,7 @@
|
||||
TARGET = plymc
|
||||
DEPENDPATH += .
|
||||
INCLUDEPATH += ../../../../vcglib \
|
||||
- ../../code/lib/glew/include
|
||||
+ /usr/include
|
||||
CONFIG += console \
|
||||
stl \
|
||||
debug_and_release
|
||||
diff --git a/meshlab/src/meshlabserver/meshlabserver.pro b/meshlab/src/meshlabserver/meshlabserver.pro
|
||||
index cca5560..9b070c7 100644
|
||||
--- a/meshlab/src/meshlabserver/meshlabserver.pro
|
||||
+++ b/meshlab/src/meshlabserver/meshlabserver.pro
|
||||
@@ -1,4 +1,4 @@
|
||||
-GLEWDIR = ../external/glew-1.5.1
|
||||
+GLEWDIR = /usr
|
||||
|
||||
HEADERS =
|
||||
|
||||
@@ -25,11 +25,9 @@ win32-msvc2005: LIBS += -L../distrib -lcommon
|
||||
win32-msvc2008: LIBS += -L../distrib -lcommon
|
||||
win32-msvc2010: LIBS += -L../distrib -lcommon
|
||||
win32-g++: LIBS += -L../distrib -lcommon
|
||||
-linux-g++: LIBS += -L../distrib -lcommon
|
||||
+linux-g++: LIBS += -L../distrib -lcommon -lGLEW
|
||||
linux-g++:QMAKE_RPATHDIR += ../distrib
|
||||
-linux-g++-32: LIBS += -L../distrib -lcommon
|
||||
linux-g++-32:QMAKE_RPATHDIR += ../distrib
|
||||
-linux-g++-64: LIBS += -L../distrib -lcommon
|
||||
linux-g++-64:QMAKE_RPATHDIR += ../distrib
|
||||
#CONFIG (release,debug | release) {
|
||||
# win32-msvc2005:release: LIBS += -L../common/release -lcommon
|
||||
diff --git a/meshlab/src/shared.pri b/meshlab/src/shared.pri
|
||||
index 93ed32f..0ba3e67 100644
|
||||
--- a/meshlab/src/shared.pri
|
||||
+++ b/meshlab/src/shared.pri
|
||||
@@ -17,9 +17,10 @@ win32-msvc2005: LIBS += ../../distrib/common.lib
|
||||
win32-msvc2008: LIBS += ../../distrib/common.lib
|
||||
win32-msvc2010: LIBS += ../../distrib/common.lib
|
||||
win32-g++:LIBS += -L../../distrib -lcommon
|
||||
-linux-g++:LIBS += -L../../distrib -lcommon
|
||||
-linux-g++-32:LIBS += -L../../distrib -lcommon
|
||||
-linux-g++-64:LIBS += -L../../distrib -lcommon
|
||||
+linux-g++:LIBS += -L../../distrib -lcommon -lGLEW
|
||||
+#linux-g++-32:LIBS += -L../../distrib -lcommon
|
||||
+#linux-g++-64:LIBS += -L../../distrib -lcommon
|
||||
+
|
||||
|
||||
#CONFIG(debug, debug|release) {
|
||||
# win32-msvc2005: LIBS += ../../common/debug/common.lib
|
||||
diff --git a/vcglib/apps/sample/trimesh_QT/trimesh_qt.pro b/vcglib/apps/sample/trimesh_QT/trimesh_qt.pro
|
||||
index 8a3c7fc..986116e 100644
|
||||
--- a/vcglib/apps/sample/trimesh_QT/trimesh_qt.pro
|
||||
+++ b/vcglib/apps/sample/trimesh_QT/trimesh_qt.pro
|
||||
@@ -26,8 +26,9 @@ SOURCES += ../../../wrap/gui/trackmode.cpp
|
||||
|
||||
# Compile glew
|
||||
DEFINES += GLEW_STATIC
|
||||
-INCLUDEPATH += ../../../../code/lib/glew/include
|
||||
-SOURCES += ../../../../code/lib/glew/src/glew.c
|
||||
+INCLUDEPATH += /usr/include
|
||||
+#SOURCES += ../../../../code/lib/glew/src/glew.c
|
||||
+LIBS += -lGLEW
|
||||
|
||||
# Awful problem with windows..
|
||||
win32{
|
||||
diff --git a/vcglib/apps/sample/trimesh_pos_demo/trimesh_pos_demo.pro b/vcglib/apps/sample/trimesh_pos_demo/trimesh_pos_demo.pro
|
||||
index e8ae178..4a69fef 100644
|
||||
--- a/vcglib/apps/sample/trimesh_pos_demo/trimesh_pos_demo.pro
|
||||
+++ b/vcglib/apps/sample/trimesh_pos_demo/trimesh_pos_demo.pro
|
||||
@@ -1,14 +1,14 @@
|
||||
-INCLUDEPATH += . ../../.. ../../../../code/lib ../../../../code/lib/glew/include
|
||||
+INCLUDEPATH += . ../../.. ../../../../code/lib /usr/include
|
||||
HEADERS = glwidget.h \
|
||||
window.h \
|
||||
mesh_type.h
|
||||
SOURCES = glwidget.cpp \
|
||||
main.cpp \
|
||||
window.cpp\
|
||||
- ../../../../code/lib/glew/src/glew.c \
|
||||
../../../wrap/ply/plylib.cpp\
|
||||
../../../wrap/gui/trackmode.cpp\
|
||||
../../../wrap/gui/trackball.cpp
|
||||
+LIBS += -lGLEW
|
||||
QT += opengl
|
||||
|
||||
# install
|
||||
@ -0,0 +1,32 @@
|
||||
reverted:
|
||||
--- b/meshlab/src/meshlab/meshlab.pro
|
||||
+++ a/meshlab/src/meshlab/meshlab.pro
|
||||
@@ -129,9 +129,11 @@
|
||||
# win32-g++:release:LIBS += -L../common/release -lcommon
|
||||
#}
|
||||
|
||||
+linux-g++:LIBS += -L../external/lib/linux-g++ -ljhead -L../distrib -lcommon -lGLU
|
||||
-linux-g++:LIBS += -L../external/lib/linux-g++ -ljhead -L../distrib -lcommon -lGLEW -lGLU
|
||||
linux-g++:QMAKE_RPATHDIR += ../distrib
|
||||
+linux-g++-32:LIBS += -L../external/lib/linux-g++-32 -L../distrib -lcommon -lGLU
|
||||
linux-g++-32:QMAKE_RPATHDIR += ../distrib
|
||||
+linux-g++-64:LIBS += -L../external/lib/linux-g++-64 -L../distrib -lcommon -lGLU
|
||||
linux-g++-64:QMAKE_RPATHDIR += ../distrib
|
||||
|
||||
# uncomment in your local copy only in emergency cases.
|
||||
reverted:
|
||||
--- b/meshlab/src/meshlabserver/meshlabserver.pro
|
||||
+++ a/meshlab/src/meshlabserver/meshlabserver.pro
|
||||
@@ -25,9 +25,11 @@
|
||||
win32-msvc2008: LIBS += -L../distrib -lcommon
|
||||
win32-msvc2010: LIBS += -L../distrib -lcommon
|
||||
win32-g++: LIBS += -L../distrib -lcommon
|
||||
+linux-g++: LIBS += -L../distrib -lcommon
|
||||
-linux-g++: LIBS += -L../distrib -lcommon -lGLEW
|
||||
linux-g++:QMAKE_RPATHDIR += ../distrib
|
||||
+linux-g++-32: LIBS += -L../distrib -lcommon
|
||||
linux-g++-32:QMAKE_RPATHDIR += ../distrib
|
||||
+linux-g++-64: LIBS += -L../distrib -lcommon
|
||||
linux-g++-64:QMAKE_RPATHDIR += ../distrib
|
||||
#CONFIG (release,debug | release) {
|
||||
# win32-msvc2005:release: LIBS += -L../common/release -lcommon
|
||||
@ -0,0 +1,43 @@
|
||||
From: Teemu Ikonen <tpikonen@gmail.com>
|
||||
Subject: Use /usr/lib/meshlab as RPATH in binaries.
|
||||
Git-Branch: p/rpath
|
||||
Git-Diff: 532bdd9a6bde03cf47da8fb63fee60..0ecffa4d55bfff6f3b98a478d0cd82
|
||||
|
||||
meshlab/src/meshlab/meshlab.pro | 4 +---
|
||||
meshlab/src/meshlabserver/meshlabserver.pro | 4 +---
|
||||
2 files changed, 2 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/meshlab/src/meshlab/meshlab.pro b/meshlab/src/meshlab/meshlab.pro
|
||||
index 4a7d0fd..f67ba07 100644
|
||||
--- a/meshlab/src/meshlab/meshlab.pro
|
||||
+++ b/meshlab/src/meshlab/meshlab.pro
|
||||
@@ -130,11 +130,9 @@ win32-g++:LIBS += -L../external/lib/win32-gcc -L../distrib -lcommon
|
||||
#}
|
||||
|
||||
linux-g++:LIBS += -L../external/lib/linux-g++ -ljhead -L../distrib -lcommon -lGLU
|
||||
-linux-g++:QMAKE_RPATHDIR += ../distrib
|
||||
+linux-g++:QMAKE_RPATHDIR += /usr/lib/meshlab
|
||||
linux-g++-32:LIBS += -L../external/lib/linux-g++-32 -L../distrib -lcommon -lGLU
|
||||
-linux-g++-32:QMAKE_RPATHDIR += ../distrib
|
||||
linux-g++-64:LIBS += -L../external/lib/linux-g++-64 -L../distrib -lcommon -lGLU
|
||||
-linux-g++-64:QMAKE_RPATHDIR += ../distrib
|
||||
|
||||
# uncomment in your local copy only in emergency cases.
|
||||
# We should never be too permissive
|
||||
diff --git a/meshlab/src/meshlabserver/meshlabserver.pro b/meshlab/src/meshlabserver/meshlabserver.pro
|
||||
index cca5560..6a19b81 100644
|
||||
--- a/meshlab/src/meshlabserver/meshlabserver.pro
|
||||
+++ b/meshlab/src/meshlabserver/meshlabserver.pro
|
||||
@@ -26,11 +26,9 @@ win32-msvc2008: LIBS += -L../distrib -lcommon
|
||||
win32-msvc2010: LIBS += -L../distrib -lcommon
|
||||
win32-g++: LIBS += -L../distrib -lcommon
|
||||
linux-g++: LIBS += -L../distrib -lcommon
|
||||
-linux-g++:QMAKE_RPATHDIR += ../distrib
|
||||
+linux-g++:QMAKE_RPATHDIR += /usr/lib/meshlab
|
||||
linux-g++-32: LIBS += -L../distrib -lcommon
|
||||
-linux-g++-32:QMAKE_RPATHDIR += ../distrib
|
||||
linux-g++-64: LIBS += -L../distrib -lcommon
|
||||
-linux-g++-64:QMAKE_RPATHDIR += ../distrib
|
||||
#CONFIG (release,debug | release) {
|
||||
# win32-msvc2005:release: LIBS += -L../common/release -lcommon
|
||||
# win32-msvc2008:release: LIBS += -L../common/release -lcommon
|
||||
@ -0,0 +1,29 @@
|
||||
Resolve patch overlaps.
|
||||
--- a/meshlab/src/meshlab/meshlab.pro
|
||||
+++ b/meshlab/src/meshlab/meshlab.pro
|
||||
@@ -129,10 +129,8 @@ win32-g++:LIBS += -L../external/lib/win32-gcc -L../distrib -lcommon
|
||||
# win32-g++:release:LIBS += -L../common/release -lcommon
|
||||
#}
|
||||
|
||||
-linux-g++:LIBS += -L../external/lib/linux-g++ -ljhead -L../distrib -lcommon -lGLU
|
||||
+linux-g++:LIBS += -L../external/lib/linux-g++ -ljhead -L../distrib -lcommon -lGLEW -lGLU
|
||||
linux-g++:QMAKE_RPATHDIR += /usr/lib/meshlab
|
||||
-linux-g++-32:LIBS += -L../external/lib/linux-g++-32 -L../distrib -lcommon -lGLU
|
||||
-linux-g++-64:LIBS += -L../external/lib/linux-g++-64 -L../distrib -lcommon -lGLU
|
||||
|
||||
# uncomment in your local copy only in emergency cases.
|
||||
# We should never be too permissive
|
||||
--- a/meshlab/src/meshlabserver/meshlabserver.pro
|
||||
+++ b/meshlab/src/meshlabserver/meshlabserver.pro
|
||||
@@ -25,10 +25,8 @@ win32-msvc2005: LIBS += -L../distrib -lcommon
|
||||
win32-msvc2008: LIBS += -L../distrib -lcommon
|
||||
win32-msvc2010: LIBS += -L../distrib -lcommon
|
||||
win32-g++: LIBS += -L../distrib -lcommon
|
||||
-linux-g++: LIBS += -L../distrib -lcommon
|
||||
+linux-g++: LIBS += -L../distrib -lcommon -lGLEW
|
||||
linux-g++:QMAKE_RPATHDIR += /usr/lib/meshlab
|
||||
-linux-g++-32: LIBS += -L../distrib -lcommon
|
||||
-linux-g++-64: LIBS += -L../distrib -lcommon
|
||||
#CONFIG (release,debug | release) {
|
||||
# win32-msvc2005:release: LIBS += -L../common/release -lcommon
|
||||
# win32-msvc2008:release: LIBS += -L../common/release -lcommon
|
||||
@ -0,0 +1,43 @@
|
||||
diff -urN meshlab-1.3.2-r1.old/meshlab/src/meshlabplugins/io_tri/io_tri.cpp meshlab-1.3.2-r1/meshlab/src/meshlabplugins/io_tri/io_tri.cpp
|
||||
--- meshlab-1.3.2-r1.old/meshlab/src/meshlabplugins/io_tri/io_tri.cpp 2014-08-11 18:01:55.329182160 +0200
|
||||
+++ meshlab-1.3.2-r1/meshlab/src/meshlabplugins/io_tri/io_tri.cpp 2014-08-11 15:11:20.000000000 +0200
|
||||
@@ -149,9 +149,11 @@
|
||||
fread(&numFaces,sizeof(int),1,fp);
|
||||
}
|
||||
// advance pointer ??
|
||||
- char s[4];
|
||||
+
|
||||
+ char s[5];
|
||||
fread(s,sizeof(char),4,fp);
|
||||
- printf("extara is %s (%d)\n", s, *(int*)(&s[0]));
|
||||
+ s[4]=0;
|
||||
+ printf("extara is %s (%d)\n", s, ((unsigned)s[0])|(((unsigned)s[1])<<8)|(((unsigned)s[2])<<16)|(((unsigned)s[3])<<24));
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -284,7 +286,7 @@
|
||||
bool floatFlag=false;
|
||||
|
||||
int ret=fread(texCode,sizeof(char),4,fp);
|
||||
- qDebug("TexString code is '%s' (int:%d) (float:%f)\n", texCode, *(int*)(&texCode[0]), *(float*)(&texCode[0]));
|
||||
+ //qDebug("TexString code is '%s' (int:%d) (float:%f)\n", texCode, *(int*)((void*)(&texCode[0])), *(float*)((void*)(&texCode[0])));
|
||||
|
||||
if(feof(fp)){
|
||||
qDebug("Premature end of file");
|
||||
diff -urN meshlab-1.3.2-r1.old/vcglib/vcg/complex/algorithms/clustering.h meshlab-1.3.2-r1/vcglib/vcg/complex/algorithms/clustering.h
|
||||
--- meshlab-1.3.2-r1.old/vcglib/vcg/complex/algorithms/clustering.h 2014-08-11 18:01:55.366182161 +0200
|
||||
+++ meshlab-1.3.2-r1/vcglib/vcg/complex/algorithms/clustering.h 2014-08-11 14:36:38.000000000 +0200
|
||||
@@ -233,12 +233,12 @@
|
||||
// DuplicateFace=false a model with looks ok if you enable doublesided lighting and disable backfaceculling
|
||||
|
||||
bool DuplicateFaceParam;
|
||||
-
|
||||
// This class keeps the references to the three cells where a face has its vertexes.
|
||||
class SimpleTri
|
||||
{
|
||||
public:
|
||||
CellType *v[3];
|
||||
+#pragma GCC diagnostic ignored "-Wstrict-aliasing"
|
||||
int ii(int i) const {return *((int *)(&(v[i])));}
|
||||
bool operator < ( const SimpleTri &p) const {
|
||||
return (v[2]!=p.v[2])?(v[2]<p.v[2]):
|
||||
@ -0,0 +1,84 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/media-gfx/meshlab/meshlab-1.3.2.ebuild,v 1.1 2014/08/14 18:38:38 amynka Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
inherit eutils versionator multilib qt4-r2
|
||||
|
||||
DESCRIPTION="A mesh processing system"
|
||||
HOMEPAGE="http://meshlab.sourceforge.net/"
|
||||
MY_PV="$(delete_all_version_separators ${PV})"
|
||||
SRC_URI="mirror://sourceforge/project/${PN}/${PN}/MeshLab%20v${PV}/MeshLabSrc_AllInc_v${MY_PV}.tgz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE=""
|
||||
DEPEND="dev-cpp/eigen:3
|
||||
dev-cpp/muParser
|
||||
dev-qt/qtcore
|
||||
dev-qt/qtopengl
|
||||
media-libs/glew
|
||||
media-libs/qhull
|
||||
=media-libs/lib3ds-1*
|
||||
media-libs/openctm
|
||||
sci-libs/levmar
|
||||
sys-libs/libunwind"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
S="${WORKDIR}/meshlab/src"
|
||||
|
||||
src_prepare() {
|
||||
rm "${WORKDIR}"/meshlab/src/distrib/plugins/*.xml
|
||||
rm "${WORKDIR}"/meshlab/src/meshlabplugins/filter_qhull/qhull_tools.h
|
||||
cd ${PORTAGE_BUILDDIR}
|
||||
#patches from debian repo
|
||||
cd "${WORKDIR}"
|
||||
epatch "${FILESDIR}/${PV}"/01_crash-on-save.patch \
|
||||
"${FILESDIR}/${PV}"/02_cstddef.patch \
|
||||
"${FILESDIR}/${PV}"/03_disable-updates.patch \
|
||||
"${FILESDIR}/${PV}"/05_externals.patch \
|
||||
"${FILESDIR}/${PV}"/06_format-security.patch \
|
||||
"${FILESDIR}/${PV}"/07_gcc47.patch \
|
||||
"${FILESDIR}/${PV}"/08_lib3ds.patch \
|
||||
"${FILESDIR}/${PV}"/09_libbz2.patch \
|
||||
"${FILESDIR}/${PV}"/10_muparser.patch \
|
||||
"${FILESDIR}/${PV}"/11_openctm.patch \
|
||||
"${FILESDIR}/${PV}"/12_overflow.patch \
|
||||
"${FILESDIR}/${PV}"/13_pluginsdir.patch \
|
||||
"${FILESDIR}/${PV}"/14_ply_numeric.patch \
|
||||
"${FILESDIR}/${PV}"/15_qhull.patch \
|
||||
"${FILESDIR}/${PV}"/16_shadersdir.patch \
|
||||
"${FILESDIR}/${PV}"/17_structuresynth.patch \
|
||||
"${FILESDIR}/${PV}"/18_glew.c18p1.patch \
|
||||
"${FILESDIR}/${PV}"/19_CONFLICTS_IN_rpath.patch \
|
||||
"${FILESDIR}/${PV}"/20_rpath.c18p2.patch \
|
||||
"${FILESDIR}/${PV}"/21_RESOLUTION.patch \
|
||||
"${FILESDIR}/${PV}"/22_aliasing.patch
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
eqmake4 external/external.pro
|
||||
eqmake4 meshlab_full.pro
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
cd external && emake
|
||||
cd .. && emake
|
||||
}
|
||||
|
||||
src_install() {
|
||||
dobin distrib/{meshlab,meshlabserver}
|
||||
dolib distrib/libcommon.so.1.0.0
|
||||
dosym libcommon.so.1.0.0 /usr/$(get_libdir)/libcommon.so.1
|
||||
dosym libcommon.so.1 /usr/$(get_libdir)/libcommon.so
|
||||
|
||||
exeinto /usr/$(get_libdir)/meshlab/plugins
|
||||
doexe distrib/plugins/*.so
|
||||
|
||||
insinto /usr/share/meshlab/shaders
|
||||
doins -r distrib/shaders/*
|
||||
newicon "${S}"/meshlab/images/eye64.png "${PN}".png
|
||||
make_desktop_entry meshlab "Meshlab"
|
||||
}
|
||||
@ -0,0 +1,14 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<herd>3dprint</herd>
|
||||
<maintainer>
|
||||
<email>amynka@gentoo.org</email>
|
||||
</maintainer>
|
||||
<longdescription lang="en">
|
||||
Printrun is a set of G-code sending applications for RepRap.
|
||||
It consists of printcore (dumb G-code sender), pronsole (featured command line
|
||||
G-code sender), pronterface (featured G-code sender with graphical user
|
||||
interface), and a small collection of helpful scripts.
|
||||
</longdescription>
|
||||
</pkgmetadata>
|
||||
@ -1,6 +1,24 @@
|
||||
-----BEGIN PGP SIGNED MESSAGE-----
|
||||
Hash: SHA256
|
||||
|
||||
AUX lib3ds-1.3.0-r1-mesh.c.patch 682 SHA256 bc15f51a3ea319b1bb0e35617c9f12e9760879eaedf790a6a96e6a47ac7d60b7 SHA512 d01466d08f0ffae7f97f510842f89d7b5b171bf5534e2348ea1e7d5e6588b4bc802d9a67fe992a00d4894a4c7194a7896740aaac85b398f191384656fcbb677e WHIRLPOOL 1968c8cf96eb27d777e8205540b67ac48375b18cfe1a3301f0cdb7a2706663e943b4f7f9c640ec7525e1fe8dec191bd7dec10bd5de071e837f9e2c74f5a7c7f5
|
||||
AUX lib3ds-1.3.0-r1-pkgconfig.patch 2345 SHA256 85b15a0fce686e3c070aa2d9479fff6b544610a93e3c54ebc9ecf1f3c0ae5d95 SHA512 4f9ef4bb9a6716822a4310441f53954b02b18266b95db1d31dce8e3a46a944fde3af39ba74409939500a61387ba2f4f9c5af5b73c58ca91b1dab75d996f85394 WHIRLPOOL 664698bec3d2518389d27089478b010e3d888420eb53d5303189a787ad6da835f625fe2778b6bbc170f0adffd0934c991a14d745f7c4ba79e52da9f6a7822613
|
||||
AUX lib3ds-2.0.0_rc1-underlinking-no-autoreconf.patch 1453 SHA256 3e25948200a8548b404394f3658225fb86c00e6803840300498472ce9089354b SHA512 63bc93b5cdf099a33b13ad84ebbd964607fe2824f102d5e4dd37c435cb84ca82e4de16a1796de8abe9e4dd43071b3bcb6b3f176d0d2c4019534d8d08decc8570 WHIRLPOOL 06dbb832c50dc114da2274a43ef60c6f502e99dde4db4b1bab18aac6d3cf4c3e9313d22c4048bd589724f7337bf84a1619aabf6aa0aceee89bf6fb8cf9b5ddaa
|
||||
AUX lib3ds-2.0.0_rc1-underlinking.patch 1584 SHA256 c633b458054ff28d02644f3e9709925a7d2358bece2590a7ad2855f248f9332e SHA512 be3a3470cba90beeac5f1bc161c6885c09483e197b5501208e338ef7256e66e1a27066f0f91403ae6abdeb311e2eb374a36e01c4e3c99a2e7b77422bf24b9799 WHIRLPOOL 1cf58cd821bacec707c44f94396b2d2aac41fd328d8d69f2257a857f41c8b3fceaa3e1f50f3fee2d2806a0b71142c69835ac1989c66c4e531647fc6e4071c555
|
||||
DIST lib3ds-1.3.0.zip 443675 SHA256 f5b00c302955a67fa5fb1f2d3f2583767cdc61fdbc6fd843c0c7c9d95c5629e3 SHA512 7c866ea9721a7a124c25b4962e933a7066ec2e3c7998e5ae2ba93727f19b91bdb103699bada6d1e04b67e0a54b9f58d09382093569114a1846d86bb03821b8ac WHIRLPOOL 33adf50f5afff3563dabd48844cb0ea0631a4c2ce047fc7998139b15293f7de68646465ce0956918e1e3d04ece5efdd575d172c5d4183a73bb816d3d262c3682
|
||||
DIST lib3ds-20080909.zip 427233 SHA256 5d4df5f86a17a1aba58e9f54fe6a43c825bab15d8439ac9416c3f0c30fd1cca2 SHA512 ba7166dbd9fb97edc0f5cf0df56747b7e3c5aa1e62334ca995020a6ccd77284abc58e3fba80ec96ecf3765f5ce3121612c9f8c7dfedb2322f1cd2af85d567f87 WHIRLPOOL fd9c19a3fe6341cbf970d2c75352cb317c8073b23e94b792c4e905aa0a79e7c31d7ca1dd35dbef11f891052438c9216faee8245470423d5d8e206ea4981a9aa5
|
||||
EBUILD lib3ds-1.3.0-r1.ebuild 686 SHA256 f13ad78c3c251904a43933dde1953235f7b849c5e5d5e437e81f59ba1fed946e SHA512 f49827ee008a95d35614bbd3e4afab3247e5976b1d478b1cd4ce8a1d59f2110dff38346b858d4b771534b30931dddada8bbc20aae719931e77436cffa9797283 WHIRLPOOL 7e3dba93d40ea8ff49d670c1af009971029213c0e8aa84c9dcf0deb9f5f82ce2d30b038e551a8cdc9d4a16079439b154f98b3bb970257f32397b016aba0aa665
|
||||
EBUILD lib3ds-2.0.0_rc1.ebuild 842 SHA256 1620c3e0e510868a2568f3bc18fb9ad0bd4ac33d3a9e54d62a70b090d8e1e8e5 SHA512 81a2ba40f826c7b7f08b21b7c236fdf18874a2570821993b984e0ef34536738241a36b7548e171a296d8522e9809d1a41447bfec727620a528bef82bcc6dc0da WHIRLPOOL 3d9140980ff9db78803cd323f3d5814f96f14f318d53f80c960ec8c7689b5037693d13b33133eab5bdce266b921ff5dc8124f63d76d08e18fa7486bc874bc1bf
|
||||
MISC ChangeLog 3225 SHA256 8eed908c6b895c34b7a608fd0960147e5fc35b57a2c14dbba740251a6b2dff86 SHA512 0c353cbb1f487e71159de5a89fc1ab183b70b2d17f261b1025d445c32c7de76007cf998aa4380cd3e75d83851953524c9c7619ceb9c3d266a98fdb1442f653f9 WHIRLPOOL c3593cfbdb28ae721d09c6d55019ec44771751cb6c29568ec083283aff4b38053345bb9878c61191889bbf64f7a71a4992f1ae7e658af720492fcd6b9b9a4db6
|
||||
MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada
|
||||
MISC ChangeLog 3596 SHA256 3a59f0be71037d1f176c649606a8707e2d82970199dbebe856cd0e202b06a327 SHA512 e7acba4d052b6a4c563e56976fa6fa1b4430aebe617d4f77456b64c37756c0c8c99e963cd7e62e5000de4bfe9743609a2eb3388402b43a255dcd964f3942c61a WHIRLPOOL c42e8b919d9ddf5b7c073ce2c19347651a2b3a1e87484cf2da002b17848f6d83965f15d7336c735e163af45e53bc736c1becc0bcbeec9ba59f8e8b07a48bc789
|
||||
MISC metadata.xml 368 SHA256 bb40674c78fedfe4acd6de977498d686c1fdcfcac840ec170278d09a809a3436 SHA512 7ff33cf1fe43388568a244c973e425ff2b549aee9f70f8e9fed1a6b8fbff3cb640d8ee8a1ab3dbd84587a74d15af4328ebaa86a1ec96e765f138bf33e45de96a WHIRLPOOL 8954ad946bfa74130ff4b5e74cd8f112190c430d520b0b99ec5cc5afd50ce31a765f7b055e909a74a1b5bc86b98a85d2ff1eb0703bb5a7a24984cda8a0fdeb6b
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
Version: GnuPG v2
|
||||
|
||||
iQEcBAEBCAAGBQJT7P8KAAoJEDuJ1FA05peBr3kH/Rm9cIVqi58041tro2XqywbU
|
||||
3EAAQ2/yFGULx5S+SINpjDrtE/N+RFfg2gE1ow/jue8cDBambZlQFe4BupDXbert
|
||||
7vAvxS8McPKG5ZmM0z5Sfp+9QfxMuWpffeaT/cbJncvQLDdY2iGzI3xUvfzMBHpd
|
||||
oyIHPHr//KKJ8INUxZkcuexTmt9DGbNI39BGrp7OuZfeODGsl4IPNIcdhXvz/57a
|
||||
RZhZ2K6lDc0g2lI5VjY8tjBGWQ2meb2Yh2FXD6TNOwHPowOCwryQwiUoaX2Qllca
|
||||
7SqnjAYV7VUUu3jMBOvowy3bUurv9Gg6TBAqSGD0mZsBfw5Ya3Ch8Sg5VWiNg10=
|
||||
=M/4M
|
||||
-----END PGP SIGNATURE-----
|
||||
|
||||
@ -0,0 +1,17 @@
|
||||
diff -Naur lib3ds-1.3.0.orig/lib3ds/mesh.c lib3ds-1.3.0/lib3ds/mesh.c
|
||||
--- lib3ds-1.3.0.orig/lib3ds/mesh.c 2007-06-20 19:04:08.000000000 +0200
|
||||
+++ lib3ds-1.3.0/lib3ds/mesh.c 2010-09-14 06:34:39.987807911 +0200
|
||||
@@ -87,8 +87,11 @@
|
||||
faces=lib3ds_io_read_word(io);
|
||||
for (i=0; i<faces; ++i) {
|
||||
index=lib3ds_io_read_word(io);
|
||||
- ASSERT(index<mesh->faces);
|
||||
- strcpy(mesh->faceL[index].material, name);
|
||||
+ if (index<mesh->faces) {
|
||||
+ strncpy(mesh->faceL[index].material, name, 64);
|
||||
+ } else {
|
||||
+ // TODO warning
|
||||
+ }
|
||||
}
|
||||
}
|
||||
break;
|
||||
@ -0,0 +1,94 @@
|
||||
diff -uNr lib3ds-1.2.0.orig/lib3ds-config.in lib3ds-1.2.0/lib3ds-config.in
|
||||
--- lib3ds-1.2.0.orig/lib3ds-config.in 2000-05-23 14:13:08.000000000 +0200
|
||||
+++ lib3ds-1.2.0/lib3ds-config.in 2007-10-21 06:37:48.000000000 +0200
|
||||
@@ -1,9 +1,5 @@
|
||||
#!/bin/sh
|
||||
|
||||
-prefix=@prefix@
|
||||
-exec_prefix=@exec_prefix@
|
||||
-exec_prefix_set=no
|
||||
-
|
||||
usage()
|
||||
{
|
||||
cat <<EOF
|
||||
@@ -22,6 +18,8 @@
|
||||
usage 1 1>&2
|
||||
fi
|
||||
|
||||
+PKG_CONFIG_ARGS=
|
||||
+
|
||||
while test $# -gt 0; do
|
||||
case "$1" in
|
||||
-*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
|
||||
@@ -30,23 +28,23 @@
|
||||
|
||||
case $1 in
|
||||
--prefix=*)
|
||||
- prefix=$optarg
|
||||
+ PKG_CONFIG_ARGS="$PKG_CONFIG_ARGS --define-variable=prefix=$optarg"
|
||||
if test $exec_prefix_set = no ; then
|
||||
- exec_prefix=$optarg
|
||||
+ PKG_CONFIG_ARGS="$PKG_CONFIG_ARGS --define-variable=exec_prefix=$optarg"
|
||||
fi
|
||||
;;
|
||||
--prefix)
|
||||
echo_prefix=yes
|
||||
;;
|
||||
--exec-prefix=*)
|
||||
- exec_prefix=$optarg
|
||||
+ PKG_CONFIG_ARGS="$PKG_CONFIG_ARGS --define-variable=exec_prefix=$optarg"
|
||||
exec_prefix_set=yes
|
||||
;;
|
||||
--exec-prefix)
|
||||
echo_exec_prefix=yes
|
||||
;;
|
||||
--version)
|
||||
- echo @LIB3DS_VERSION@
|
||||
+ pkg-config --modversion lib3ds
|
||||
;;
|
||||
--cflags)
|
||||
echo_cflags=yes
|
||||
@@ -62,23 +60,18 @@
|
||||
done
|
||||
|
||||
if test "$echo_prefix" = "yes"; then
|
||||
- echo $prefix
|
||||
+ pkg-config $PKG_CONFIG_ARGS --variable=prefix lib3ds
|
||||
fi
|
||||
|
||||
if test "$echo_exec_prefix" = "yes"; then
|
||||
- echo $exec_prefix
|
||||
+ pkg-config $PKG_CONFIG_ARGS --variable=exec_prefix lib3ds
|
||||
fi
|
||||
|
||||
if test "$echo_cflags" = "yes"; then
|
||||
- if test @includedir@ != /usr/include ; then
|
||||
- echo -I@includedir@
|
||||
- fi
|
||||
+ pkg-config $PKG_CONFIG_ARGS --cflags lib3ds
|
||||
fi
|
||||
|
||||
if test "$echo_libs" = "yes"; then
|
||||
- if test @libdir@ != /usr/lib ; then
|
||||
- my_linker_flags="-L@libdir@"
|
||||
- fi
|
||||
- echo ${my_linker_flags} -l3ds
|
||||
-fi
|
||||
+ pkg-config $PKG_CONFIG_ARGS --libs lib3ds
|
||||
+fi
|
||||
|
||||
diff -uNr lib3ds-1.2.0.orig/lib3ds.pc.in lib3ds-1.2.0/lib3ds.pc.in
|
||||
--- lib3ds-1.2.0.orig/lib3ds.pc.in 1970-01-01 01:00:00.000000000 +0100
|
||||
+++ lib3ds-1.2.0/lib3ds.pc.in 2007-10-21 06:23:53.000000000 +0200
|
||||
@@ -0,0 +1,11 @@
|
||||
+prefix=@prefix@
|
||||
+exec_prefix=@exec_prefix@
|
||||
+libdir=@libdir@
|
||||
+includedir=@includedir@
|
||||
+
|
||||
+Name: lib3ds
|
||||
+Description: lib3ds
|
||||
+Version: @VERSION@
|
||||
+Requires:
|
||||
+Libs: -L${libdir} -l3ds -lm
|
||||
+Cflags: -I${includedir}
|
||||
@ -0,0 +1,25 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/media-libs/lib3ds/lib3ds-1.3.0-r1.ebuild,v 1.1 2014/08/14 18:25:13 amynka Exp $
|
||||
|
||||
EAPI="5"
|
||||
|
||||
inherit autotools-utils
|
||||
|
||||
DESCRIPTION="library for managing 3D-Studio Release 3 and 4 .3DS files"
|
||||
HOMEPAGE="https://code.google.com/p/lib3ds/"
|
||||
SRC_URI="https://${PN}.googlecode.com/files/${P}.zip"
|
||||
|
||||
LICENSE="LGPL-2.1"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="static-libs"
|
||||
|
||||
RDEPEND="media-libs/freeglut
|
||||
virtual/opengl"
|
||||
DEPEND="${RDEPEND}
|
||||
app-arch/unzip"
|
||||
PATCHES=(
|
||||
"${FILESDIR}/lib3ds-1.3.0-r1-pkgconfig.patch"
|
||||
"${FILESDIR}/lib3ds-1.3.0-r1-mesh.c.patch"
|
||||
)
|
||||
@ -1,54 +0,0 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/media-video/qx11grab/qx11grab-0.4.6.ebuild,v 1.7 2013/10/01 21:28:11 pesa Exp $
|
||||
|
||||
EAPI=4
|
||||
|
||||
inherit cmake-utils
|
||||
|
||||
DESCRIPTION="X11 desktop video grabber tray"
|
||||
HOMEPAGE="http://qx11grab.hjcms.de/"
|
||||
SRC_URI="http://qx11grab.hjcms.de/downloads/${PV}/${P}.tar.xz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 x86"
|
||||
IUSE="kde opengl pulseaudio"
|
||||
|
||||
RDEPEND="
|
||||
>=media-libs/alsa-lib-1.0.24
|
||||
>=media-libs/fontconfig-2.4
|
||||
>=media-libs/freetype-2.4:2
|
||||
>=sys-apps/dbus-1.4.16
|
||||
>=x11-libs/libX11-1.3.4
|
||||
>=x11-libs/libXrandr-1.3
|
||||
>=dev-qt/qtcore-4.7.2:4
|
||||
>=dev-qt/qtdbus-4.7.2:4
|
||||
>=dev-qt/qtgui-4.7.2:4
|
||||
>=virtual/ffmpeg-0.10.3[X,encode,truetype]
|
||||
kde? ( kde-base/kdelibs:4 )
|
||||
opengl? ( >=dev-qt/qtopengl-4.7.2:4 )
|
||||
pulseaudio? ( media-sound/pulseaudio )
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
virtual/pkgconfig
|
||||
kde? ( dev-util/automoc )
|
||||
"
|
||||
PDEPEND="virtual/freedesktop-icon-theme"
|
||||
|
||||
src_prepare() {
|
||||
cmake-utils_src_prepare
|
||||
|
||||
# install docs into standard Gentoo location
|
||||
sed -i -e "/DESTINATION share/ s:\${CMAKE_PROJECT_NAME}:doc/${PF}:" \
|
||||
CMakeLists.txt || die
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local mycmakeargs=(
|
||||
$(cmake-utils_use_enable kde KDE_SUPPORT)
|
||||
$(cmake-utils_use_enable opengl)
|
||||
$(cmake-utils_use_enable pulseaudio PULSE)
|
||||
)
|
||||
cmake-utils_src_configure
|
||||
}
|
||||
@ -1 +1 @@
|
||||
Thu, 14 Aug 2014 17:37:05 +0000
|
||||
Fri, 15 Aug 2014 04:07:00 +0000
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue