root
8 years ago
parent
6a349fd5b4
commit
8cab062301
@ -1,275 +0,0 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
|
||||
EGO_PN="github.com/docker/docker"
|
||||
|
||||
if [[ ${PV} = *9999* ]]; then
|
||||
# Docker cannot be fetched via "go get", thanks to autogenerated code
|
||||
EGIT_REPO_URI="https://${EGO_PN}.git"
|
||||
EGIT_CHECKOUT_DIR="${WORKDIR}/${P}/src/${EGO_PN}"
|
||||
inherit golang-base git-r3
|
||||
else
|
||||
MY_PV="${PV/_/-}"
|
||||
DOCKER_GITCOMMIT="4dc5990"
|
||||
EGIT_COMMIT="v${MY_PV}"
|
||||
SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
|
||||
KEYWORDS="amd64"
|
||||
[ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually for each bump!"
|
||||
inherit golang-vcs-snapshot
|
||||
fi
|
||||
inherit bash-completion-r1 linux-info multilib systemd udev user
|
||||
|
||||
DESCRIPTION="The core functions you need to create Docker images and run Docker containers"
|
||||
HOMEPAGE="https://dockerproject.org"
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
IUSE="apparmor aufs btrfs +device-mapper experimental overlay seccomp"
|
||||
|
||||
# https://github.com/docker/docker/blob/master/hack/PACKAGERS.md#build-dependencies
|
||||
CDEPEND="
|
||||
>=dev-db/sqlite-3.7.9:3
|
||||
device-mapper? (
|
||||
>=sys-fs/lvm2-2.02.89[thin]
|
||||
)
|
||||
seccomp? (
|
||||
>=sys-libs/libseccomp-2.2.1[static-libs]
|
||||
)
|
||||
"
|
||||
|
||||
DEPEND="
|
||||
${CDEPEND}
|
||||
|
||||
dev-go/go-md2man
|
||||
|
||||
btrfs? (
|
||||
>=sys-fs/btrfs-progs-3.8
|
||||
)
|
||||
"
|
||||
|
||||
# https://github.com/docker/docker/blob/master/hack/PACKAGERS.md#runtime-dependencies
|
||||
# https://github.com/docker/docker/blob/master/hack/PACKAGERS.md#optional-dependencies
|
||||
RDEPEND="
|
||||
${CDEPEND}
|
||||
|
||||
!app-emulation/docker-bin
|
||||
>=net-firewall/iptables-1.4
|
||||
sys-process/procps
|
||||
>=dev-vcs/git-1.7
|
||||
>=app-arch/xz-utils-4.9
|
||||
|
||||
>=app-emulation/containerd-0.2.0
|
||||
>=app-emulation/runc-0.1.0
|
||||
|
||||
apparmor? (
|
||||
sys-libs/libapparmor[static-libs]
|
||||
)
|
||||
"
|
||||
|
||||
RESTRICT="installsources strip"
|
||||
|
||||
# see "contrib/check-config.sh" from upstream's sources
|
||||
CONFIG_CHECK="
|
||||
~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS
|
||||
~DEVPTS_MULTIPLE_INSTANCES
|
||||
~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED ~CPUSETS ~MEMCG
|
||||
~KEYS ~MACVLAN ~VETH ~BRIDGE ~BRIDGE_NETFILTER
|
||||
~NF_NAT_IPV4 ~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE
|
||||
~NETFILTER_XT_MATCH_ADDRTYPE ~NETFILTER_XT_MATCH_CONNTRACK
|
||||
~NF_NAT ~NF_NAT_NEEDED
|
||||
|
||||
~POSIX_MQUEUE
|
||||
|
||||
~MEMCG_KMEM ~MEMCG_SWAP ~MEMCG_SWAP_ENABLED
|
||||
|
||||
~BLK_CGROUP ~IOSCHED_CFQ
|
||||
~CGROUP_PERF
|
||||
~CGROUP_HUGETLB
|
||||
~NET_CLS_CGROUP
|
||||
~CFS_BANDWIDTH ~FAIR_GROUP_SCHED ~RT_GROUP_SCHED
|
||||
"
|
||||
|
||||
ERROR_KEYS="CONFIG_KEYS: is mandatory, see bug 581348"
|
||||
ERROR_MEMCG_KMEM="CONFIG_MEMCG_KMEM: is optional"
|
||||
ERROR_MEMCG_SWAP="CONFIG_MEMCG_SWAP: is required if you wish to limit swap usage of containers"
|
||||
ERROR_RESOURCE_COUNTERS="CONFIG_RESOURCE_COUNTERS: is optional for container statistics gathering"
|
||||
|
||||
ERROR_BLK_CGROUP="CONFIG_BLK_CGROUP: is optional for container statistics gathering"
|
||||
ERROR_IOSCHED_CFQ="CONFIG_IOSCHED_CFQ: is optional for container statistics gathering"
|
||||
ERROR_CGROUP_PERF="CONFIG_CGROUP_PERF: is optional for container statistics gathering"
|
||||
ERROR_CFS_BANDWIDTH="CONFIG_CFS_BANDWIDTH: is optional for container statistics gathering"
|
||||
|
||||
pkg_setup() {
|
||||
if kernel_is lt 3 10; then
|
||||
ewarn ""
|
||||
ewarn "Using Docker with kernels older than 3.10 is unstable and unsupported."
|
||||
ewarn " - http://docs.docker.com/installation/binaries/#check-kernel-dependencies"
|
||||
fi
|
||||
|
||||
# for where these kernel versions come from, see:
|
||||
# https://www.google.com/search?q=945b2b2d259d1a4364a2799e80e8ff32f8c6ee6f+site%3Akernel.org%2Fpub%2Flinux%2Fkernel+file%3AChangeLog*
|
||||
if ! {
|
||||
kernel_is ge 3 16 \
|
||||
|| { kernel_is 3 15 && kernel_is ge 3 15 5; } \
|
||||
|| { kernel_is 3 14 && kernel_is ge 3 14 12; } \
|
||||
|| { kernel_is 3 12 && kernel_is ge 3 12 25; }
|
||||
}; then
|
||||
ewarn ""
|
||||
ewarn "There is a serious Docker-related kernel panic that has been fixed in 3.16+"
|
||||
ewarn " (and was backported to 3.15.5+, 3.14.12+, and 3.12.25+)"
|
||||
ewarn ""
|
||||
ewarn "See also https://github.com/docker/docker/issues/2960"
|
||||
fi
|
||||
|
||||
if kernel_is le 3 18; then
|
||||
CONFIG_CHECK+="
|
||||
~RESOURCE_COUNTERS
|
||||
"
|
||||
fi
|
||||
|
||||
if kernel_is le 3 13; then
|
||||
CONFIG_CHECK+="
|
||||
~NETPRIO_CGROUP
|
||||
"
|
||||
else
|
||||
CONFIG_CHECK+="
|
||||
~CGROUP_NET_PRIO
|
||||
"
|
||||
fi
|
||||
|
||||
if use aufs; then
|
||||
CONFIG_CHECK+="
|
||||
~AUFS_FS
|
||||
~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY
|
||||
"
|
||||
ERROR_AUFS_FS="CONFIG_AUFS_FS: is required to be set if and only if aufs-sources are used instead of aufs4/aufs3"
|
||||
fi
|
||||
|
||||
if use btrfs; then
|
||||
CONFIG_CHECK+="
|
||||
~BTRFS_FS
|
||||
"
|
||||
fi
|
||||
|
||||
if use device-mapper; then
|
||||
CONFIG_CHECK+="
|
||||
~BLK_DEV_DM ~DM_THIN_PROVISIONING ~EXT4_FS ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY
|
||||
"
|
||||
fi
|
||||
|
||||
if use overlay; then
|
||||
CONFIG_CHECK+="
|
||||
~OVERLAY_FS ~EXT4_FS_SECURITY ~EXT4_FS_POSIX_ACL
|
||||
"
|
||||
fi
|
||||
|
||||
linux-info_pkg_setup
|
||||
|
||||
# create docker group for the code checking for it in /etc/group
|
||||
enewgroup docker
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
cd "src/${EGO_PN}" || die
|
||||
epatch "${FILESDIR}/docker-containerd.patch"
|
||||
# allow user patches (use sparingly - upstream won't support them)
|
||||
epatch_user
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
cd "src/${EGO_PN}" || die
|
||||
export GOPATH="${WORKDIR}/${P}:${PWD}/vendor"
|
||||
|
||||
# setup CFLAGS and LDFLAGS for separate build target
|
||||
# see https://github.com/tianon/docker-overlay/pull/10
|
||||
export CGO_CFLAGS="-I${ROOT}/usr/include"
|
||||
export CGO_LDFLAGS="-L${ROOT}/usr/$(get_libdir)"
|
||||
|
||||
# if we're building from a zip, we need the GITCOMMIT value
|
||||
[ "$DOCKER_GITCOMMIT" ] && export DOCKER_GITCOMMIT
|
||||
|
||||
if gcc-specs-pie; then
|
||||
sed -i "s/EXTLDFLAGS_STATIC='/&-fno-PIC /" hack/make.sh || die
|
||||
grep -q -- '-fno-PIC' hack/make.sh || die 'hardened sed failed'
|
||||
|
||||
sed "s/LDFLAGS_STATIC_DOCKER='/&-extldflags -fno-PIC /" \
|
||||
-i hack/make/dynbinary || die
|
||||
grep -q -- '-fno-PIC' hack/make/dynbinary || die 'hardened sed failed'
|
||||
fi
|
||||
|
||||
# let's set up some optional features :)
|
||||
export DOCKER_BUILDTAGS=''
|
||||
for gd in aufs btrfs device-mapper overlay; do
|
||||
if ! use $gd; then
|
||||
DOCKER_BUILDTAGS+=" exclude_graphdriver_${gd//-/}"
|
||||
fi
|
||||
done
|
||||
|
||||
for tag in apparmor seccomp; do
|
||||
if use $tag; then
|
||||
DOCKER_BUILDTAGS+=" $tag"
|
||||
fi
|
||||
done
|
||||
|
||||
# https://github.com/docker/docker/pull/13338
|
||||
if use experimental; then
|
||||
export DOCKER_EXPERIMENTAL=1
|
||||
else
|
||||
unset DOCKER_EXPERIMENTAL
|
||||
fi
|
||||
|
||||
# time to build!
|
||||
./hack/make.sh dynbinary || die 'dynbinary failed'
|
||||
|
||||
# build the man pages too
|
||||
./man/md2man-all.sh || die "unable to generate man pages"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
cd "src/${EGO_PN}" || die
|
||||
VERSION="$(cat VERSION)"
|
||||
newbin "bundles/$VERSION/dynbinary/docker-$VERSION" docker
|
||||
#exeinto /usr/libexec/docker
|
||||
#newexe "bundles/$VERSION/dynbinary/dockerinit-$VERSION" dockerinit
|
||||
|
||||
newinitd contrib/init/openrc/docker.initd docker
|
||||
newconfd contrib/init/openrc/docker.confd docker
|
||||
|
||||
systemd_dounit contrib/init/systemd/docker.{service,socket}
|
||||
|
||||
udev_dorules contrib/udev/*.rules
|
||||
|
||||
dodoc AUTHORS CONTRIBUTING.md CHANGELOG.md NOTICE README.md
|
||||
dodoc -r docs/*
|
||||
doman man/man*/*
|
||||
|
||||
dobashcomp contrib/completion/bash/*
|
||||
|
||||
insinto /usr/share/zsh/site-functions
|
||||
doins contrib/completion/zsh/*
|
||||
|
||||
insinto /usr/share/vim/vimfiles
|
||||
doins -r contrib/syntax/vim/ftdetect
|
||||
doins -r contrib/syntax/vim/syntax
|
||||
|
||||
# note: intentionally not using "doins" so that we preserve +x bits
|
||||
mkdir -p "${D}/usr/share/${PN}/contrib"
|
||||
cp -R contrib/* "${D}/usr/share/${PN}/contrib"
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
udev_reload
|
||||
|
||||
elog
|
||||
elog "To use Docker, the Docker daemon must be running as root. To automatically"
|
||||
elog "start the Docker daemon at boot, add Docker to the default runlevel:"
|
||||
elog " rc-update add docker default"
|
||||
elog "Similarly for systemd:"
|
||||
elog " systemctl enable docker.service"
|
||||
elog
|
||||
elog "To use Docker as a non-root user, add yourself to the 'docker' group:"
|
||||
elog " usermod -aG docker youruser"
|
||||
elog
|
||||
}
|
||||
@ -1,287 +0,0 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=6
|
||||
|
||||
EGO_PN="github.com/docker/docker"
|
||||
|
||||
if [[ ${PV} = *9999* ]]; then
|
||||
# Docker cannot be fetched via "go get", thanks to autogenerated code
|
||||
EGIT_REPO_URI="https://${EGO_PN}.git"
|
||||
EGIT_CHECKOUT_DIR="${WORKDIR}/${P}/src/${EGO_PN}"
|
||||
inherit git-r3
|
||||
else
|
||||
MY_PV="${PV/_/-}"
|
||||
DOCKER_GITCOMMIT="48a9e53"
|
||||
EGIT_COMMIT="v${MY_PV}"
|
||||
SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
|
||||
KEYWORDS="~amd64"
|
||||
[ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually for each bump!"
|
||||
inherit golang-vcs-snapshot
|
||||
fi
|
||||
inherit bash-completion-r1 golang-base linux-info systemd udev user
|
||||
|
||||
DESCRIPTION="The core functions you need to create Docker images and run Docker containers"
|
||||
HOMEPAGE="https://dockerproject.org"
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
IUSE="apparmor aufs btrfs +container-init +device-mapper hardened overlay pkcs11 seccomp"
|
||||
|
||||
# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#build-dependencies
|
||||
CDEPEND="
|
||||
>=dev-db/sqlite-3.7.9:3
|
||||
device-mapper? (
|
||||
>=sys-fs/lvm2-2.02.89[thin]
|
||||
)
|
||||
seccomp? ( >=sys-libs/libseccomp-2.2.1 )
|
||||
apparmor? ( sys-libs/libapparmor )
|
||||
"
|
||||
|
||||
DEPEND="
|
||||
${CDEPEND}
|
||||
|
||||
dev-go/go-md2man
|
||||
|
||||
btrfs? (
|
||||
>=sys-fs/btrfs-progs-3.16.1
|
||||
)
|
||||
"
|
||||
|
||||
# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies
|
||||
# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#optional-dependencies
|
||||
RDEPEND="
|
||||
${CDEPEND}
|
||||
|
||||
!app-emulation/docker-bin
|
||||
>=net-firewall/iptables-1.4
|
||||
sys-process/procps
|
||||
>=dev-vcs/git-1.7
|
||||
>=app-arch/xz-utils-4.9
|
||||
|
||||
>=app-emulation/containerd-0.2.5
|
||||
app-emulation/runc[apparmor?,seccomp?]
|
||||
app-emulation/docker-proxy
|
||||
container-init? ( >=sys-process/tini-0.13.0[static] )
|
||||
"
|
||||
|
||||
RESTRICT="installsources strip"
|
||||
|
||||
S="${WORKDIR}/${P}/src/${EGO_PN}"
|
||||
|
||||
# see "contrib/check-config.sh" from upstream's sources
|
||||
CONFIG_CHECK="
|
||||
~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS
|
||||
~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED ~CPUSETS ~MEMCG
|
||||
~KEYS
|
||||
~VETH ~BRIDGE ~BRIDGE_NETFILTER
|
||||
~NF_NAT_IPV4 ~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE
|
||||
~NETFILTER_XT_MATCH_ADDRTYPE ~NETFILTER_XT_MATCH_CONNTRACK
|
||||
~NF_NAT ~NF_NAT_NEEDED
|
||||
~POSIX_MQUEUE
|
||||
|
||||
~USER_NS
|
||||
~SECCOMP
|
||||
~CGROUP_PIDS
|
||||
~MEMCG_SWAP ~MEMCG_SWAP_ENABLED
|
||||
|
||||
~BLK_CGROUP ~BLK_DEV_THROTTLING ~IOSCHED_CFQ ~CFQ_GROUP_IOSCHED
|
||||
~CGROUP_PERF
|
||||
~CGROUP_HUGETLB
|
||||
~NET_CLS_CGROUP
|
||||
~CFS_BANDWIDTH ~FAIR_GROUP_SCHED ~RT_GROUP_SCHED
|
||||
~IP_VS ~IP_VS_PROTO_TCP ~IP_VS_PROTO_UDP ~IP_VS_NFCT
|
||||
|
||||
~VXLAN
|
||||
~XFRM_ALGO ~XFRM_USER
|
||||
~IPVLAN
|
||||
~MACVLAN ~DUMMY
|
||||
"
|
||||
|
||||
ERROR_KEYS="CONFIG_KEYS: is mandatory"
|
||||
ERROR_MEMCG_SWAP="CONFIG_MEMCG_SWAP: is required if you wish to limit swap usage of containers"
|
||||
ERROR_RESOURCE_COUNTERS="CONFIG_RESOURCE_COUNTERS: is optional for container statistics gathering"
|
||||
|
||||
ERROR_BLK_CGROUP="CONFIG_BLK_CGROUP: is optional for container statistics gathering"
|
||||
ERROR_IOSCHED_CFQ="CONFIG_IOSCHED_CFQ: is optional for container statistics gathering"
|
||||
ERROR_CGROUP_PERF="CONFIG_CGROUP_PERF: is optional for container statistics gathering"
|
||||
ERROR_CFS_BANDWIDTH="CONFIG_CFS_BANDWIDTH: is optional for container statistics gathering"
|
||||
ERROR_XFRM_ALGO="CONFIG_XFRM_ALGO: is optional for secure networks"
|
||||
ERROR_XFRM_USER="CONFIG_XFRM_USER: is optional for secure networks"
|
||||
|
||||
pkg_setup() {
|
||||
if kernel_is lt 3 10; then
|
||||
ewarn ""
|
||||
ewarn "Using Docker with kernels older than 3.10 is unstable and unsupported."
|
||||
ewarn " - http://docs.docker.com/engine/installation/binaries/#check-kernel-dependencies"
|
||||
fi
|
||||
|
||||
# for where these kernel versions come from, see:
|
||||
# https://www.google.com/search?q=945b2b2d259d1a4364a2799e80e8ff32f8c6ee6f+site%3Akernel.org%2Fpub%2Flinux%2Fkernel+file%3AChangeLog*
|
||||
if ! {
|
||||
kernel_is ge 3 16 \
|
||||
|| { kernel_is 3 15 && kernel_is ge 3 15 5; } \
|
||||
|| { kernel_is 3 14 && kernel_is ge 3 14 12; } \
|
||||
|| { kernel_is 3 12 && kernel_is ge 3 12 25; }
|
||||
}; then
|
||||
ewarn ""
|
||||
ewarn "There is a serious Docker-related kernel panic that has been fixed in 3.16+"
|
||||
ewarn " (and was backported to 3.15.5+, 3.14.12+, and 3.12.25+)"
|
||||
ewarn ""
|
||||
ewarn "See also https://github.com/docker/docker/issues/2960"
|
||||
fi
|
||||
|
||||
if kernel_is le 3 18; then
|
||||
CONFIG_CHECK+="
|
||||
~RESOURCE_COUNTERS
|
||||
"
|
||||
fi
|
||||
|
||||
if kernel_is le 3 13; then
|
||||
CONFIG_CHECK+="
|
||||
~NETPRIO_CGROUP
|
||||
"
|
||||
else
|
||||
CONFIG_CHECK+="
|
||||
~CGROUP_NET_PRIO
|
||||
"
|
||||
fi
|
||||
|
||||
if kernel_is lt 4 5; then
|
||||
CONFIG_CHECK+="
|
||||
~MEMCG_KMEM
|
||||
"
|
||||
ERROR_MEMCG_KMEM="CONFIG_MEMCG_KMEM: is optional"
|
||||
fi
|
||||
|
||||
if kernel_is lt 4 7; then
|
||||
CONFIG_CHECK+="
|
||||
~DEVPTS_MULTIPLE_INSTANCES
|
||||
"
|
||||
fi
|
||||
|
||||
if use aufs; then
|
||||
CONFIG_CHECK+="
|
||||
~AUFS_FS
|
||||
~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY
|
||||
"
|
||||
ERROR_AUFS_FS="CONFIG_AUFS_FS: is required to be set if and only if aufs-sources are used instead of aufs4/aufs3"
|
||||
fi
|
||||
|
||||
if use btrfs; then
|
||||
CONFIG_CHECK+="
|
||||
~BTRFS_FS
|
||||
~BTRFS_FS_POSIX_ACL
|
||||
"
|
||||
fi
|
||||
|
||||
if use device-mapper; then
|
||||
CONFIG_CHECK+="
|
||||
~BLK_DEV_DM ~DM_THIN_PROVISIONING ~EXT4_FS ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY
|
||||
"
|
||||
fi
|
||||
|
||||
if use overlay; then
|
||||
CONFIG_CHECK+="
|
||||
~OVERLAY_FS ~EXT4_FS_SECURITY ~EXT4_FS_POSIX_ACL
|
||||
"
|
||||
fi
|
||||
|
||||
linux-info_pkg_setup
|
||||
|
||||
# create docker group for the code checking for it in /etc/group
|
||||
enewgroup docker
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
export GOPATH="${WORKDIR}/${P}:${PWD}/vendor"
|
||||
|
||||
# setup CFLAGS and LDFLAGS for separate build target
|
||||
# see https://github.com/tianon/docker-overlay/pull/10
|
||||
export CGO_CFLAGS="-I${ROOT}/usr/include"
|
||||
export CGO_LDFLAGS="-L${ROOT}/usr/$(get_libdir)"
|
||||
|
||||
# if we're building from a tarball, we need the GITCOMMIT value
|
||||
[ "$DOCKER_GITCOMMIT" ] && export DOCKER_GITCOMMIT
|
||||
|
||||
if use hardened; then
|
||||
sed -i "s/EXTLDFLAGS_STATIC='/&-fno-PIC /" hack/make.sh || die
|
||||
grep -q -- '-fno-PIC' hack/make.sh || die 'hardened sed failed'
|
||||
|
||||
sed "s/LDFLAGS_STATIC_DOCKER='/&-extldflags -fno-PIC /" \
|
||||
-i hack/make/dynbinary-client || die
|
||||
sed "s/LDFLAGS_STATIC_DOCKER='/&-extldflags -fno-PIC /" \
|
||||
-i hack/make/dynbinary-daemon || die
|
||||
grep -q -- '-fno-PIC' hack/make/dynbinary-daemon || die 'hardened sed failed'
|
||||
grep -q -- '-fno-PIC' hack/make/dynbinary-client || die 'hardened sed failed'
|
||||
fi
|
||||
|
||||
# let's set up some optional features :)
|
||||
export DOCKER_BUILDTAGS=''
|
||||
for gd in aufs btrfs device-mapper overlay; do
|
||||
if ! use $gd; then
|
||||
DOCKER_BUILDTAGS+=" exclude_graphdriver_${gd//-/}"
|
||||
fi
|
||||
done
|
||||
|
||||
for tag in apparmor pkcs11 seccomp; do
|
||||
if use $tag; then
|
||||
DOCKER_BUILDTAGS+=" $tag"
|
||||
fi
|
||||
done
|
||||
|
||||
# time to build!
|
||||
./hack/make.sh dynbinary || die 'dynbinary failed'
|
||||
|
||||
# build the man pages too
|
||||
./man/md2man-all.sh || die "unable to generate man pages"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
VERSION="$(cat VERSION)"
|
||||
newbin "bundles/$VERSION/dynbinary-client/docker-$VERSION" docker
|
||||
newbin "bundles/$VERSION/dynbinary-daemon/dockerd-$VERSION" dockerd
|
||||
dosym containerd /usr/bin/docker-containerd
|
||||
dosym containerd-shim /usr/bin/docker-containerd-shim
|
||||
dosym runc /usr/bin/docker-runc
|
||||
use container-init && dosym tini /usr/bin/docker-init
|
||||
|
||||
newinitd contrib/init/openrc/docker.initd docker
|
||||
newconfd contrib/init/openrc/docker.confd docker
|
||||
|
||||
systemd_dounit contrib/init/systemd/docker.{service,socket}
|
||||
|
||||
udev_dorules contrib/udev/*.rules
|
||||
|
||||
dodoc AUTHORS CONTRIBUTING.md CHANGELOG.md NOTICE README.md
|
||||
dodoc -r docs/*
|
||||
doman man/man*/*
|
||||
|
||||
dobashcomp contrib/completion/bash/*
|
||||
|
||||
insinto /usr/share/zsh/site-functions
|
||||
doins contrib/completion/zsh/_*
|
||||
|
||||
insinto /usr/share/vim/vimfiles
|
||||
doins -r contrib/syntax/vim/ftdetect
|
||||
doins -r contrib/syntax/vim/syntax
|
||||
|
||||
# note: intentionally not using "doins" so that we preserve +x bits
|
||||
dodir /usr/share/${PN}/contrib
|
||||
cp -R contrib/* "${ED}/usr/share/${PN}/contrib"
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
udev_reload
|
||||
|
||||
elog
|
||||
elog "To use Docker, the Docker daemon must be running as root. To automatically"
|
||||
elog "start the Docker daemon at boot, add Docker to the default runlevel:"
|
||||
elog " rc-update add docker default"
|
||||
elog "Similarly for systemd:"
|
||||
elog " systemctl enable docker.service"
|
||||
elog
|
||||
elog "To use Docker as a non-root user, add yourself to the 'docker' group:"
|
||||
elog " usermod -aG docker youruser"
|
||||
elog
|
||||
}
|
||||
@ -1,22 +0,0 @@
|
||||
diff --git a/libcontainerd/remote_linux.go b/libcontainerd/remote_linux.go
|
||||
index f0284ca..e44a1d1 100644
|
||||
--- a/libcontainerd/remote_linux.go
|
||||
+++ b/libcontainerd/remote_linux.go
|
||||
@@ -27,7 +27,7 @@ const (
|
||||
maxConnectionRetryCount = 3
|
||||
connectionRetryDelay = 3 * time.Second
|
||||
containerdShutdownTimeout = 15 * time.Second
|
||||
- containerdBinary = "docker-containerd"
|
||||
+ containerdBinary = "containerd"
|
||||
containerdPidFilename = "docker-containerd.pid"
|
||||
containerdSockFilename = "docker-containerd.sock"
|
||||
eventTimestampFilename = "event.ts"
|
||||
@@ -338,7 +338,7 @@ func (r *remote) runContainerdDaemon() error {
|
||||
}
|
||||
|
||||
// Start a new instance
|
||||
- args := []string{"-l", r.rpcAddr, "--runtime", "docker-runc"}
|
||||
+ args := []string{"-l", r.rpcAddr, "--runtime", "runc"}
|
||||
if r.debugLog {
|
||||
args = append(args, "--debug", "true")
|
||||
}
|
||||
@ -1,7 +1,7 @@
|
||||
AUX libmcpp-2.7.2-fix-build-system.patch 1008 SHA256 c0542fb2a7904f7936d7b9bdebc34091313afba0d7e9105d0c94ca71d071c28b SHA512 25e2e9cd8d18080947a84c0d76f0b34d74b289ccc7c6172278908c026dd6f7379ebb268aae79c3e8ab458f3883aa212e54a137cbaab336c1277acdad07a13a01 WHIRLPOOL 768e88fd24dbd0d25ffb52605d811f9a6f9ae8bef89b319f784c942fe062438c3f24d1b0b8d31170aecff8d2b48177aeb69be9608365abcabd53a46eecbe0b5e
|
||||
DIST mcpp-2.7.2.tar.gz 1533457 SHA256 3b9b4421888519876c4fc68ade324a3bbd81ceeb7092ecdbbc2055099fcb8864 SHA512 1ca885cb13fdb684de9d0595a9215b52f48a93a69077d82cdcacafe40d9a61fb77b00a3ff2b8890e7bc0a0fcc0c8d70d4093c00c280351cd4459aba67c573235 WHIRLPOOL 6e0985344a731c16419f6ec3812a0075a117856344a66a2009ad1b4c5869db8b74ddabfa5b72cc0f622ad27a1a91c4b02a329c48441fea139b428265c23fa2b6
|
||||
EBUILD libmcpp-2.7.2-r1.ebuild 720 SHA256 25ffb1143c08ce57fcd47c11a45a432ed2043c93147dcae49485ba195addb263 SHA512 300f9b7eafb9267f63ce0f595cf8bbe57d045026783589fe3b7bc357ae11ee6e0b33c04c5c44fe77cfd6052b81acd745cdc0caae698390852195ef4a65021f9e WHIRLPOOL 7e9870982be656c1262730305c5ea03d058a66e2d8c287e853c16aa878f2a0df19911a1a7ec2712703c614b87324fed1d069a965f2261a9d540c62bb8704cc1b
|
||||
EBUILD libmcpp-2.7.2-r2.ebuild 725 SHA256 8348a8ebbb5d1e477daf0a177e462f2fa2796cee9ac66fae745bc3276c999c1b SHA512 76d478246e647a2b0b449b4aadcd3f425afc2043c7be41f02fbb4fbb40e5a85cc1155bf3a66853bd3d3e89ed926ca353cac12a857cc4771ac1cd484ffa5448d9 WHIRLPOOL 617afefce31c12e4881afa45b79ce8a8d1c3019e09582dcd3ce279f313ec0586c1f336c20a897842a8fae4e8be3f2c99d8d0d9aad324654f5f67cea158a9c228
|
||||
EBUILD libmcpp-2.7.2-r2.ebuild 724 SHA256 a870c9b478b95abdb55fc7ca774b88e0574a9415a075fc73419e6320adcf1bc1 SHA512 90ae498141b9324cae94785fc786ce9b3407f7b3bc162c40fa4c67697fb6bc61042f6432ef27ab700c9d4b733aee38b1212dc6b25ae618648f2bac44adca0cce WHIRLPOOL 39b488a64b2746bac2fc96bab6a7290a32a6540072c79b282785b861f7973b717cec88c7a94c3d9ad08b95629ed088ad47ba63d5fb4c9ed5eaf54286f5a0e0ff
|
||||
MISC ChangeLog 2432 SHA256 6243848f577c8ef06ae73be9eb775d71407898bf1ba4a1874b23bdff01ce0d39 SHA512 771f0bf1ec201b29709e34ffb3879310c7b6f148711575dacafede494ce05dbe13321d7c3032e2843df6159203be633413517fb8935c6f5ca0055f7cb8ca5035 WHIRLPOOL 700a6797e9617a12860eed7abd2764861dcbb1b040a975576fb0ec2133df1823b1c000d0b561d203734916dbab0590158c0af58ad702d134f63bd336deaa33b4
|
||||
MISC ChangeLog-2015 2301 SHA256 bd577d8c2267ef33a010504b3d6ec514bc7bb26f8004bf8aebb2607b4299b8d1 SHA512 7df48e7c04e75077a9514da6fa69e710819a9c24946edec766b9c63f708505c2c4db3fe314e871aac998d109b443d19df57b0481bcb8fa379b39cbb782837a67 WHIRLPOOL 0f362d36a871b0465080404f75f90ac149ed153b76fe96a83ea0034db41271e9dd6691e565a929c01730d0a3dfaccc4bac44e70fcd850360732ff02adadfcd53
|
||||
MISC metadata.xml 323 SHA256 2a5c3905052a0061700a5519218f0711771d20571a37ca2ca5d4558394c8c3c3 SHA512 0d074121ac7cbf36bab09b3f76d81df9aa19cd2399418d3b30d9e4cb9107a3f339e8b4c478694a8c8ef560d23fe9be1b4bcfc8c347d83cb51cf45fbd6849224e WHIRLPOOL 362f754ceb70c445f2949b48b295b65f0d074e4b9bf3ab1613914511c7da8273df3e36559d4bed2f08e8f5d36789db0ed70cd7d945331ef36443a32fdb09986c
|
||||
|
||||
@ -1,9 +1,12 @@
|
||||
AUX collada-dom-2.4.4-gcc6.patch 589 SHA256 ee32c02072fe7cfc26099cc121e836c12f99b0789c2f47b928f693c2fd811f57 SHA512 cb9c948ee5fc36b20852d4afc487aae3cba849e03f0f0e72a86891d7c4a5a132ae9b1b7f35f093b84781e123c07c682268dc8c2d1e1e6685908326ad33302d05 WHIRLPOOL 3027e1b5c6184fc9d8b222006825f63947c173c0d97737c49988602b4be734ec3860476fadfaad01572004602099d2f40c739b2eb04a0d74b7cfdebc0b9a33bb
|
||||
AUX take_snapshot.sh 330 SHA256 7e53a67fd8cab9b3dd5221a851fbca4a6aaaaaceb552e4b2943e60067efd2d5d SHA512 c8bbf4c5eac8d3d67f4017d8b5097925806864d54914ba3472f0c589bcb72b4d8d4330845170f8aa6051296285abbf8e404dd19103a3e4552fe41bc615ca0487 WHIRLPOOL cefd0ad7a9c9aa55a0805d49b04062836326d209f7ef207e45dc85e75f36a8ea80876aeaa45de93a3424e58162097dabf881972f80be6bf75fb995d1c7f027ed
|
||||
DIST collada-dom-2.4.0.tgz 42517651 SHA256 5ca2d12f744bdceff0066ed3067b3b23d6859581fb0d657f98ba4487d8fa3896 SHA512 6de67dc0e631cd02c4bc5567667e7bcee4a41a137310326d5b8290e088a757f7313454028473df3e198f73b3c2db7572a437f7256e666b44ed34fe81d44229c1 WHIRLPOOL fedb8e8d8adeafdd8b4b6bf7860a005153d05fdcaed99949b8913ce51582f2bc5d4e4ff223ea012c2bba84eb889a7e5fb3c8752ad1ae0884fd0127a2a1e1b44f
|
||||
DIST collada-dom-2.4.3_pre20150112.tar.xz 2272092 SHA256 be928859dc71491420433aa86df03b14576bf97b0fa6982cde201b7dac120d98 SHA512 46c237c123a9d1b9cc8e07bf992b4386c064a3382b44be1347ab4bc6dce85f75ad59da0a5740f97c879c982e5a1119dcec5ced82d4dd725efd789021b0ead7f1 WHIRLPOOL a7e6266895ba6528ef680f5dbcecc8dd3a3c0d9227f9e53fdc31729dc5538b6aebbc110b9a9b6ba2aa77cf7ed863e0301c55db72a0b4766b780e900b8125a860
|
||||
DIST collada-dom-2.4.4.tar.gz 4507681 SHA256 0dfa494827faa971310c871535b319cadbd0c2d6958ee11b303c61a55a5a437a SHA512 3a89357cca0e219d1af3830f85fe1e09928e469e90b5c124be9e0cc5acfa3ab897b484b225f572cf26435c9b4671c97eb5ea5d156b99b03e13f120d3ba1f1dcb WHIRLPOOL 2ee0b2430a16254dfb0d111896ee9c057f139b09bc82fe57c2f0e8abb34b7f12d9614b16f6e2a93ceaa7a28e3572a65cddc6a9c960cf53ab2f92932f5b2e972b
|
||||
EBUILD collada-dom-2.4.0.ebuild 497 SHA256 c6a3e99115ed358cf65231a6bb72928f3eb60d09e71cab7b3e404a131c6926d8 SHA512 5ba2b2a6db3d2cacd0e6cf6df039d6b0b4963fd558908ca3147fec0480a05a8b6d17ccf0ea9a23f7bea8e4c82c2c17cd23e064a8eec0a9f14b5d73f27e21aba9 WHIRLPOOL 5207ee27df48de42fd418d3bb83d09b276bdaef06cad6842d0cf92450a4b25319acaf2c4fd4ad17fd386055ac44ea7a84a31aae10ad0663bb92e759f49081ee3
|
||||
EBUILD collada-dom-2.4.3_pre20150112.ebuild 852 SHA256 4f2a35e49bb3bee5237797ffcf48377abeb30855aaf6624f5e62365a3606c87e SHA512 890c8bb1824e546a75ca23c386eb3bd8780389efbbec3158962967d9b67967eef65459c5bc8e2c5fa3af614cb61c4e3c3c130fff6813c545c15aa4ff24aef738 WHIRLPOOL da51f0966e6da4fb7f31b4074dd7028514e97d5d9d12204fd0d746cca5c076c379c5874500e51ebb9ffe0bee7db74d15f96631a7ed9f10c6a4e7f06feef6fed0
|
||||
EBUILD collada-dom-9999.ebuild 737 SHA256 f9fb6b8f73a448efade3c96359705742d20706dac1288443ed65eb9245332d1a SHA512 4e7d2c8243e96ce57f48e0da80eaa9dfd357bf48606f0a32a581c0ab3d3d7c4fb3cb845fb8d0aba387a3bf127881f40b5a5538c1d3ce91773f2106cbb133c5df WHIRLPOOL aa49e95a4dcc176861c4ef625855ce9e9ce1c992a78aeb5297ead718c41cafea354928ceefdcdee96c1fa9a0127cf531e6c0f58147cf227d562af5037a14bf08
|
||||
EBUILD collada-dom-2.4.4.ebuild 895 SHA256 a685f7d39c0c67daf876795a7e5486881ffbebe4f5768a4d6492433a8125e91f SHA512 476e38b55c39b1a6d8b1a575faf97d1a978b9738eb1ab37066a445a8618b2c6dc77c079669f53d024962ea38f25d90c1b981cf5244f967ef1e4dc4adc3ae857c WHIRLPOOL 18eaa067fec00cd5fae41276ca468c33f6ad657f9645148bc42bfcb5f8b942d26a53c411e1d751f7ca20bfd01bf294d7ade46d7d0c53c3a30f2519a5243b1b60
|
||||
EBUILD collada-dom-9999.ebuild 852 SHA256 3a027d2e56f5e40e5537a19e474b6e8e3cece6d85f58cc05824ead3cbbbbb22d SHA512 1b14bbde0cfad7181cfe9cfe12a3ae230d993db834517a02b3fdce088b9f9cf7520cfbe443e1942886816a92f0fab753ae7625d24e84781c2d51854543f5d650 WHIRLPOOL 74cdc241f8d9aac39dae8fbe260859ddabdcd902cea6cc3957c74587b81996e8b8bd7e405463aec1bdf2048925455c2492896a262fe23cd1f0f21732ffc6adf4
|
||||
MISC ChangeLog 2903 SHA256 58a4509e5f75bf6a386976e4e95c202cf4b7e5c0ce3357c3b94a4e071008e079 SHA512 63a305af81e1ddc67e82ced97b4f8b7da1ecbd3e32a90e9f690d687c0a9edeffbf101cdd2a78e2a280ee7be08c7ae8ca57f774c2004fa53bc8813b9f273e63d0 WHIRLPOOL 3b62f15c0659b07372d93434173c6a04fb8b1baf2e8d3b58c897cf4af4a18fff5ea47d139b7de43b4bf340134786a67f176f16268b2acc25b72ce0bd5519734a
|
||||
MISC ChangeLog-2015 1087 SHA256 b5746906de090d913f2c6f5278ef1c2b0358b2e758f00a9a96e808acc22fae01 SHA512 407d6476ebc4c40f13f85179ab97fa7cc9f3bb8210465b009068d5e22808dca77e6cb7bc92885b29c52e9acc2228795e0ef4d0e3fffaeb0fff9cc3d9979472ef WHIRLPOOL 00b23352c2e3e7b26050eace0c8f70c0d06906a1e528b77d4234477dce78caba64dc0988dfcfd62b3a9d6a284efc10bad8f321a4f5181e236bd3e02263a66291
|
||||
MISC metadata.xml 402 SHA256 e53920455b22ae9a51b9ca9bd905cbdb5a9dab18ac7476ba7057499f5fc4c043 SHA512 7798cc43db032d2cee13b739812802e530b3ea9ba6c4ef5439a439bb77884d68ddae6d0c6e11d491b44e7598fad936e5ac455ca5d7bd39ce5e1689ad2c2555e4 WHIRLPOOL f1731d55068cae51d7c93e171accfc8e5058d624bb301531f13859f9f26f7f26973d7690b1caca2d558789de457472aa5165b74a38b1050d059552822a2eb8fc
|
||||
|
||||
@ -0,0 +1,43 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=6
|
||||
|
||||
SCM=""
|
||||
if [ "${PV#9999}" != "${PV}" ] ; then
|
||||
SCM="git-r3"
|
||||
EGIT_REPO_URI="https://github.com/rdiankov/collada-dom"
|
||||
fi
|
||||
|
||||
inherit ${SCM} cmake-utils
|
||||
|
||||
if [ "${PV#9999}" != "${PV}" ] ; then
|
||||
KEYWORDS=""
|
||||
SRC_URI=""
|
||||
elif [ "${PV%_pre*}" != "${PV}" ]; then
|
||||
# snapshot
|
||||
KEYWORDS="~amd64 ~arm"
|
||||
SRC_URI="mirror://gentoo/${P}.tar.xz"
|
||||
else
|
||||
KEYWORDS="~amd64 ~arm"
|
||||
SRC_URI="https://github.com/rdiankov/collada-dom/archive/v${PV}.tar.gz -> ${P}.tar.gz"
|
||||
fi
|
||||
|
||||
DESCRIPTION="COLLADA Document Object Model (DOM) C++ Library"
|
||||
HOMEPAGE="https://github.com/rdiankov/collada-dom"
|
||||
|
||||
LICENSE="MIT"
|
||||
SLOT="0"
|
||||
IUSE=""
|
||||
|
||||
RDEPEND="
|
||||
dev-libs/boost:=
|
||||
sys-libs/zlib:=[minizip]
|
||||
dev-libs/libxml2
|
||||
dev-libs/libpcre[cxx]
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
virtual/pkgconfig"
|
||||
|
||||
PATCHES=( "${FILESDIR}/${P}-gcc6.patch" )
|
||||
@ -0,0 +1,19 @@
|
||||
commit 8e65676c1cbecde1c0c4d8c2e1cfb20fc49c410b
|
||||
Author: rosen <rosen.diankov@mujin.co.jp>
|
||||
Date: Wed Feb 24 12:49:14 2016 +0900
|
||||
|
||||
fix return type thanks to #22
|
||||
|
||||
diff --git a/dom/src/dae/daeMetaGroup.cpp b/dom/src/dae/daeMetaGroup.cpp
|
||||
index 25fd9cc..c34ac4c 100644
|
||||
--- a/dom/src/dae/daeMetaGroup.cpp
|
||||
+++ b/dom/src/dae/daeMetaGroup.cpp
|
||||
@@ -26,7 +26,7 @@ daeElement *daeMetaGroup::placeElement( daeElement *parent, daeElement *child, d
|
||||
(void)offset;
|
||||
daeString nm = child->getElementName();
|
||||
if ( findChild( nm ) == NULL ) {
|
||||
- return false;
|
||||
+ return NULL;
|
||||
}
|
||||
daeElementRef el;
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
DIST blessings-1.6.tar.gz 19974 SHA256 edc5713061f10966048bf6b40d9a514b381e0ba849c64e034c4ef6c1847d3007 SHA512 5d0fc365416bf2b36b6de72f6b8c01bf0ab8df4a0148f492c80056a9ebd5d569e9c01966481e0d70a25add16da2bc3e73be933226369abca533ce019f97479f2 WHIRLPOOL 44dc96c1da174465b5dc3dd38c4d7ccc17408d072d290819c52d33e7e249bbbf428c7ee217faf3ec6acbe1e620b5e0cb2627c4dc3f0162cb21a810ce50e8b1c6
|
||||
EBUILD blessings-1.6.ebuild 767 SHA256 f2c61fc48bbee2b6afd2cc8bb5b6bab0e69825467a747d56583dab8502228877 SHA512 d1a31083fbb77b3818597d3ff0b257c6bd20e1a2f46060f8d11168f1577639e5520e44f75f8ef89b117d7f01fcf955519e037d3f80ce1317170357532fa46e8c WHIRLPOOL e154ac454e47d8668c4faf21d7209ca2b81586aa0576c7c27ca808b6eed7f3335b9284715bb3efcf831e8cabcf9aa882969ae1ea79b4b1e26733b1de62634323
|
||||
EBUILD blessings-1.6.ebuild 766 SHA256 d02623e7066a8512a2f9220e5746e411f5edb0a6260c808c2968cd435de8190b SHA512 39a4ae173c0f21c9acfb1c02565324ba6e32bab86e0ec68e0fadb1863e0c931ae59630e3d2ad28df8b11d47679669aedefc30927312424e5fd80d2067e4671b5 WHIRLPOOL e66a193a67af8e4c88006c783311e9e681f7206d6e8a099b33113faa0e9bb8e1e77cca312992a27351772ce32a61667405761d42d49633b71c40af91c8f541b3
|
||||
MISC ChangeLog 2835 SHA256 bd37f2819af8f76d97b8e888a165f1ddbeff619965318c54d2ae0082787c87f4 SHA512 d49f37d40dc127b172aa76bfbf76a559a51f27543019857b091ecfab9d112ae1f09758bfa8acd21b7510440b4a36b7b2f8cd9378e4539443e8b1f0abf328e520 WHIRLPOOL 44258342d910eba2155a03435daff53604066aa82258225903e3db733b91ecfb9ed9bc9ea3adba7a28074518bad4d7b8d62535fd68bfa2f33f1703797712d502
|
||||
MISC ChangeLog-2015 684 SHA256 e1b88cda02b494799da8d76fd702549a4b4beb13f610c3aa3b0b27571a05fdd4 SHA512 0e1106119acdfbea1418f75e1e4562390a6a90394350334c4206fe924638ebf203ba1a43bc4d7bf1f18406078b1b254e1c82d4aaa2b553777c320f606fff1e61 WHIRLPOOL a2ec12d15ba84dcb26866c6dd2d27969637a2c56b47178f78d7f857d4817fa93caefc572e707722cfbbffc7e3352dd0958d8c5b6b0363719b7de35877fcebc14
|
||||
MISC metadata.xml 382 SHA256 38430e742d3a069a0ed7b4b4885bd6292791dee088051c308ff13f2991b072b7 SHA512 a5b5fb01d9a791a4790ccc8ab2ce9cbac05274431379b5175a156d8f1c80e59ebf827b2732fdcf7e3ecbb6686d682157d8bd7fc3e61788d80fc0c83e186ebbe2 WHIRLPOOL 7a5c1075b2126b1b87c78ed555c13bc32ce53577d0bf44f8ff8ec0a08fdec9787d990398dc6c9328fad0718906d22d308216e079ad5d27a1c0916a01743ef7b0
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
DIST rpyc-3.2.3.tar.gz 48371 SHA256 80782d78863bc4f803b2534452dc37c5dcb6e85230af77fe0ce5a0206e37f661 SHA512 b0cc7a9429b062b0b796a7e4f6bc8056041db7e63b04dc8cbc67c5e2f343f1c1299e0e3fc88ff651f484caf5d3305cb4346523dee555e8315c9a1e1141da8b28 WHIRLPOOL 4fc6383571bb84aaed7c6e1b360c2e9b55c40f3ba2a7ca9dfd41527b889f3713003f5286edda625fcfbe4e293854389ddff437f54d18188187b3fd2a83a35cbe
|
||||
DIST rpyc-3.3.0.tar.gz 53541 SHA256 43fa845314f0bf442f5f5fab15bb1d1b5fe2011a8fc603f92d8022575cef8b4b SHA512 c586ab79d2ab3a8e14128c7ac5ae49a3311de0723453f801edb805819b06037ae015825fda32ac7620d99fdeceacbcbc5d1b4fadc3c7b2ac778e883ba9406793 WHIRLPOOL c8cd0dbf8c5c45690b3443fcd6e8a62043fbbfafc8f778dd492467bb6d1e5916d2c489fdd668817006d1105a07e87b7b707e3483b250ae68e745d51ed10e05d4
|
||||
EBUILD rpyc-3.2.3-r1.ebuild 463 SHA256 09f773c633c511d900aa49374240298c132d004b539e992c4263a8e75c62ae7e SHA512 b2e1c704b0054a885a6679631c7d4164bbe604834d398cb85f88e1f067eec97fcc9fa010bc5c29d2462087c5dae10179f2f3c89a5f08d3790650db8db5484b17 WHIRLPOOL fc7bf56d3dc369b76fe01fa304cf27f5d5db0cb2fa3f47cafc5ae8fc477d8a55587e15a5eac4e077c2733d5f6c95a7a7c1b3d8278aa2323fa89d3f0f1ed29bff
|
||||
EBUILD rpyc-3.3.0.ebuild 490 SHA256 5349afc14e75d412712315f67d4d83a36b5e6df4be46495a90205ad5eb13da8a SHA512 9fe5b9d29db885cb68bf113827c21fe0f0e91382fc5330077b502bb219b2097de8fa1ec7b330d3c980fea2e3acfd005590125ffed0c5c458f76e202596b42047 WHIRLPOOL f0acbe3207db56c61ad5548a4c753b0809001797f115ec44bed14e259b0bd1f08517b90a62ab185f276e62f7d88c7a9922e687b102767c7eafa1c5b2388ddfa6
|
||||
EBUILD rpyc-3.3.0.ebuild 489 SHA256 868224e2208fceb00d3bb6207ceadc979e5d54bdb6f6003c381d2451cfd66be2 SHA512 5ac547409b1560cb729e0130f27833b1a8d28e8239e3d49d4b63e61911794a969d3b26aa0a2ca367b2f95d0e4cd441130a8cad730386ec39890861b34636a0bb WHIRLPOOL e139d24e9b7b5fdbd05d1f8d8bbf5b19c8678b7c2ba78fb95b474ea94892083a1aa5e97842224304fa66b80c0af53ac9b716cdba1a573c409871ad57fc7f1cae
|
||||
MISC ChangeLog 3264 SHA256 574c9cd3b29d41a7f1c92446bf14941fec2da41f98597ee496341a6b3c1fe773 SHA512 3795cbb005adcd2809615050136a07cb9097bfb344390caf0f95cc65ed227ef412461a7d394b427ff26d16a97d8b9affc92a70196a4c8af48786f596cc608d5a WHIRLPOOL 99498e1b06b5f0a1c72aaaca32e599943edcf86b063e5310036affa1ffd8933a09fe7268636e60975ab86a352735bf1978bbfb62a8ac96cf20532262b8bf32a7
|
||||
MISC ChangeLog-2015 2320 SHA256 8bf95b2acdc2eb34a9be94b01495226289e8b470e7b59f880df4d168cf18d4c8 SHA512 bfd7ad1ee9edcaa73f2fc3f43094d248ffbf48b8673c3afdff4a3edfa1bb9098c2e77442bc414acefc3c508155038c3560026709fd6062d02cc291db7845547c WHIRLPOOL 5e9642a4442adff792c9606b8525dfcd70e6f11b3f0706e309a3734d125e93454b36e67263ed08d2922013db56d5ac45e01740c1d42c353aeb66cc3d78c0a8f7
|
||||
MISC metadata.xml 518 SHA256 7b83c08eb7e87d4194dc0b5f9e0a1a770b2b8ca5a06c4e5b1d61a21d3fd1d1ee SHA512 4ae598f55ddf591e0d75a9cfba54948b3ff78825377c8085ca22ad56184f18c44ef94947dbe53d207996f7bcb708454f417a74a72bbdfe22d76410acdad2f584 WHIRLPOOL 9eec979b5fc121e21c44710d38affe9449652ba821b04d2dd90d13d9111d658f0749213c766d89633535f8c2120e634ebbbcbe4d1f056b689db9d6d548a14966
|
||||
|
||||
@ -1,13 +1,6 @@
|
||||
DIST image_pipeline-1.12.14.tar.gz 118296 SHA256 8e3b756932a821b4387b7f86ca9fc5233ebb2a13541b220b866e42ea6f92b17f SHA512 724b6d20edab1436c51a05f4399b852cabab74c5e04dea97f53a256fb512b4dbfc97fd6e7d74d41bfd7d92fe183aa86a993a39b8687c27dc7b7f85d1a1c81b94 WHIRLPOOL 394343ddf299f6c7e26c0a2f45e49edc2c4047a0ccd15885a998fa902bb7373fa44181f06adc222483a285f32df800e0b268485cb2fd98e54956929056868d5d
|
||||
DIST image_pipeline-1.12.15.tar.gz 122012 SHA256 d9660a5929b69b7801b3a05e092c7a4a5543d45084c9198fdaa9c8a0210db76c SHA512 184805f99020332ad74899ec47abc56144aceef8d4eabf877a4dc85f30befdc78b209407e1be624ba151be3a71be1fafdbd87c771137bee7c080c24935f6c6fa WHIRLPOOL d9ceff4b34767e33fe8eae49076fae133dd8146c2b09fb3ce42c0c902c6d95a06cb990e5f543dfb0215a18b0592193d65c782a45301c18e4f8a34fb35e509449
|
||||
DIST image_pipeline-1.12.16.tar.gz 126407 SHA256 af0d7e43de48457ca591c4908d5771c116d2838b4bc64fbe49efaa371f44b5b4 SHA512 2e1b77a6267fef2925396b36c8d3fdabcf8c0e61043bbeb066f0923bba867c3f63a9da4a9829d26c502af70ad7ab3dcda6cca14628accc472010af8df4b1153e WHIRLPOOL b746861c95475cadf64a7e0f70f9cad62148a4d6ed8616347812c433244ef6df367bf122089794bf4669b23707dd1718961002fa46516e7ff1ce8ebe3da1b2a2
|
||||
DIST image_pipeline-1.12.18.tar.gz 127899 SHA256 7f356c7a020d4acf5acd2973180cf356329186606586bd37f8103597a0312b05 SHA512 9a9d671d31d3c6a9343836fa8c7a5566fb9e032330dbc57adeab35510263aca0482a8a8413716e79c49e2e187c3892ab200c92435e8797d4b69e3332771b64da WHIRLPOOL eed95a909a7a9b99cf313ceea4417a80d433f6b6d24053e4f6705993899d5c2b9fd14ef7ad2b07bf584c79a83f45b232b259f3cd8e3eeedcd61d17449667fe47
|
||||
AUX gcc6.patch 1362 SHA256 e778634623f29018f340f99f01ee005cb8e75119c31217800204f5b88951b0f2 SHA512 e5ec36705d0ac18f9cd7e0bc335dc7f11c94917331cc99cada5104d220aa394a0c47d7f25b498886273c9d012be32557fa50535a8add8576eb38fa90f555cccf WHIRLPOOL cdcf13f7dd954a405c1852b2edee15f0b59c625cb54f5c4450dc19150d8be2f5b2b6ab45ebe7144d530955907e35cc692783f23a1db39061b0fa5e32606020d1
|
||||
DIST image_pipeline-1.12.19.tar.gz 130635 SHA256 fc3073428fc930523efd6ed4a86d838ab0f0ff04a312eb4188c72a854d300e97 SHA512 f0677e4a811622ffc19792af828f4766408b6a051d271950a8a096d064b043dae1457b2a6f2d59fe5c2971795db04e7abf5e0878ead1428a4da19033693829ba WHIRLPOOL ecb1cdcc07109d3781bb82e88c0fe7e91754b2dfac0bfc7f5d053e6df9ce78b95b4131a9b65715fbce1b44b0acab6f833bd9c0d4f2fb68718fee4f4bfd586c63
|
||||
EBUILD depth_image_proc-1.12.14.ebuild 673 SHA256 140f3181eac5427c95ca945dfea848c3f1796f0ca5bb962e8cda3daea0db4777 SHA512 64b86ca23f867cf82554f52dc4b1462a6bad05f44dfe87629c35a5c2067dc8c040e3b42cdd9bf34c91e2b84209bfe558ef0328570b3242b5a15b512a9fcbe065 WHIRLPOOL 6cb574c561690deaf99419e492d1445ccdb97f833c559316d4c209f8a9c15e1ad1b2b03218c7fd88582aeb5673a35b8c0244a49bedc7ca63c463161ec7730587
|
||||
EBUILD depth_image_proc-1.12.15.ebuild 673 SHA256 140f3181eac5427c95ca945dfea848c3f1796f0ca5bb962e8cda3daea0db4777 SHA512 64b86ca23f867cf82554f52dc4b1462a6bad05f44dfe87629c35a5c2067dc8c040e3b42cdd9bf34c91e2b84209bfe558ef0328570b3242b5a15b512a9fcbe065 WHIRLPOOL 6cb574c561690deaf99419e492d1445ccdb97f833c559316d4c209f8a9c15e1ad1b2b03218c7fd88582aeb5673a35b8c0244a49bedc7ca63c463161ec7730587
|
||||
EBUILD depth_image_proc-1.12.16.ebuild 673 SHA256 140f3181eac5427c95ca945dfea848c3f1796f0ca5bb962e8cda3daea0db4777 SHA512 64b86ca23f867cf82554f52dc4b1462a6bad05f44dfe87629c35a5c2067dc8c040e3b42cdd9bf34c91e2b84209bfe558ef0328570b3242b5a15b512a9fcbe065 WHIRLPOOL 6cb574c561690deaf99419e492d1445ccdb97f833c559316d4c209f8a9c15e1ad1b2b03218c7fd88582aeb5673a35b8c0244a49bedc7ca63c463161ec7730587
|
||||
EBUILD depth_image_proc-1.12.18.ebuild 673 SHA256 d6a55becbec36dbfbab657ad4a819f2ad21f18b7f467dfa4356d895f7ad5708b SHA512 5dbe075119affc29c4d39df2d10a99c5693c76910d71a44b8997f222ea0d157f19f3aff41ab08b7123550cca511b63c07212a525109d9235eeee3b268e8b5dce WHIRLPOOL 224337f082373a867a28fd97fcb51aa5a156fce03a4fefe9d4e5975cb88b186ca9f2e93963bc755b6e9fe42663a4d9e2eefd29e65ab377c0d88b2a73d2c4d785
|
||||
EBUILD depth_image_proc-1.12.19.ebuild 673 SHA256 d6a55becbec36dbfbab657ad4a819f2ad21f18b7f467dfa4356d895f7ad5708b SHA512 5dbe075119affc29c4d39df2d10a99c5693c76910d71a44b8997f222ea0d157f19f3aff41ab08b7123550cca511b63c07212a525109d9235eeee3b268e8b5dce WHIRLPOOL 224337f082373a867a28fd97fcb51aa5a156fce03a4fefe9d4e5975cb88b186ca9f2e93963bc755b6e9fe42663a4d9e2eefd29e65ab377c0d88b2a73d2c4d785
|
||||
EBUILD depth_image_proc-1.12.19.ebuild 710 SHA256 f042ff0b07dc50d6644c8466e0ec3b993c52052d54aaf1866048019bfb84a0aa SHA512 f4d628de923ab86d9c3a31eca8464f4f0a9a035222de3d639c42bcab84faa9d018fb63f4f9fab5c8fd6cbfc7974fa28b90ce6bb58d33d29522245afcba12412e WHIRLPOOL 3c55aa4a4fad81fbb75d6a8e5a3309c725545fa2ad34e03a665f9d24905f78a08ba74bed680b4ac4ebf7ca4adfd8ca4f5db0af34686f13d2893540e8fcc3e45d
|
||||
EBUILD depth_image_proc-9999.ebuild 673 SHA256 140f3181eac5427c95ca945dfea848c3f1796f0ca5bb962e8cda3daea0db4777 SHA512 64b86ca23f867cf82554f52dc4b1462a6bad05f44dfe87629c35a5c2067dc8c040e3b42cdd9bf34c91e2b84209bfe558ef0328570b3242b5a15b512a9fcbe065 WHIRLPOOL 6cb574c561690deaf99419e492d1445ccdb97f833c559316d4c209f8a9c15e1ad1b2b03218c7fd88582aeb5673a35b8c0244a49bedc7ca63c463161ec7730587
|
||||
MISC ChangeLog 2170 SHA256 a0924e781bc74ad51ae2ccd43b7570b86bf5eb9d4fcc11484d923c173ca39c95 SHA512 a81a0b76021c1051ba74cac529145af68b4b6dbceeb51c783227e63ca91b6d5d0d77bbcae7874b1671a4b7ab3a838f8483a94a384e8b0198f7c440adeb173ebc WHIRLPOOL 837d436d1d7f51eec4b0fb84ca274aac1b97d0033ed4bfb4c67c4559d94d9f20eecc356d16cd8f4adeb568c084204ba19acf85bf3dfa0c9301d0b8ce1c944d2e
|
||||
MISC metadata.xml 343 SHA256 b288e9937c65e8042a7bb2d292b33d8e74b88a2e06f9d802819a8ccbe4143f0f SHA512 c16dd878a20c747d32f8445c8eb454b51ffaf8543c1f722cca0e6508d849107e89a2cda92b0d206ef618ae1075d51e542c4178e903f3cb35efd285a5fff0cfcb WHIRLPOOL 612f7cca04475ed4e748c66fedf993d68e4c06849a10574e2b405afe940c2aff53cc846779e6ebdc80dfec5cf827276d35478a227941f0ddc7058f09fa2141d5
|
||||
|
||||
@ -1,29 +0,0 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
|
||||
KEYWORDS="~amd64 ~arm"
|
||||
ROS_SUBDIR=${PN}
|
||||
|
||||
inherit ros-catkin
|
||||
|
||||
DESCRIPTION="Nodelets for processing depth images such as those produced by OpenNI camera"
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
IUSE=""
|
||||
|
||||
RDEPEND="
|
||||
dev-ros/cv_bridge
|
||||
dev-ros/eigen_conversions
|
||||
dev-ros/image_geometry
|
||||
dev-ros/image_transport
|
||||
dev-ros/message_filters
|
||||
dev-ros/nodelet
|
||||
dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
|
||||
dev-ros/stereo_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
|
||||
dev-ros/tf2
|
||||
dev-ros/tf2_ros
|
||||
"
|
||||
DEPEND="${RDEPEND}"
|
||||
@ -1,29 +0,0 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
|
||||
KEYWORDS="~amd64 ~arm"
|
||||
ROS_SUBDIR=${PN}
|
||||
|
||||
inherit ros-catkin
|
||||
|
||||
DESCRIPTION="Nodelets for processing depth images such as those produced by OpenNI camera"
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
IUSE=""
|
||||
|
||||
RDEPEND="
|
||||
dev-ros/cv_bridge
|
||||
dev-ros/eigen_conversions
|
||||
dev-ros/image_geometry
|
||||
dev-ros/image_transport
|
||||
dev-ros/message_filters
|
||||
dev-ros/nodelet
|
||||
dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
|
||||
dev-ros/stereo_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
|
||||
dev-ros/tf2
|
||||
dev-ros/tf2_ros
|
||||
"
|
||||
DEPEND="${RDEPEND}"
|
||||
@ -1,29 +0,0 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
|
||||
KEYWORDS="~amd64 ~arm"
|
||||
ROS_SUBDIR=${PN}
|
||||
|
||||
inherit ros-catkin
|
||||
|
||||
DESCRIPTION="Nodelets for processing depth images such as those produced by OpenNI camera"
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
IUSE=""
|
||||
|
||||
RDEPEND="
|
||||
dev-ros/cv_bridge
|
||||
dev-ros/eigen_conversions
|
||||
dev-ros/image_geometry
|
||||
dev-ros/image_transport
|
||||
dev-ros/message_filters
|
||||
dev-ros/nodelet
|
||||
dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
|
||||
dev-ros/stereo_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
|
||||
dev-ros/tf2
|
||||
dev-ros/tf2_ros
|
||||
"
|
||||
DEPEND="${RDEPEND}"
|
||||
@ -1,29 +0,0 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
|
||||
KEYWORDS="~amd64 ~arm"
|
||||
ROS_SUBDIR=${PN}
|
||||
|
||||
inherit ros-catkin
|
||||
|
||||
DESCRIPTION="Nodelets for processing depth images such as those produced by OpenNI camera"
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
IUSE=""
|
||||
|
||||
RDEPEND="
|
||||
dev-ros/cv_bridge
|
||||
dev-ros/eigen_conversions
|
||||
dev-ros/image_geometry
|
||||
dev-ros/image_transport
|
||||
dev-ros/message_filters
|
||||
dev-ros/nodelet
|
||||
dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
|
||||
dev-ros/stereo_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
|
||||
dev-ros/tf2
|
||||
dev-ros/tf2_ros
|
||||
"
|
||||
DEPEND="${RDEPEND}"
|
||||
@ -0,0 +1,35 @@
|
||||
commit 6c2d65452bd5fe62723988a1a570789921900d59
|
||||
Author: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de>
|
||||
Date: Fri Sep 30 15:39:47 2016 +0200
|
||||
|
||||
address gcc6 build error
|
||||
|
||||
With gcc6, compiling fails with `stdlib.h: No such file or directory`,
|
||||
as including '-isystem /usr/include' breaks with gcc6, cf.,
|
||||
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=70129.
|
||||
|
||||
This commit addresses this issue for this package in the same way
|
||||
it was addressed in various other ROS packages. A list of related
|
||||
commits and pull requests is at:
|
||||
|
||||
https://github.com/ros/rosdistro/issues/12783
|
||||
|
||||
Signed-off-by: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de>
|
||||
|
||||
diff --git a/depth_image_proc/CMakeLists.txt b/depth_image_proc/CMakeLists.txt
|
||||
index 0a7c7e2..6ceebfe 100644
|
||||
--- a/depth_image_proc/CMakeLists.txt
|
||||
+++ b/depth_image_proc/CMakeLists.txt
|
||||
@@ -10,11 +10,7 @@ catkin_package(
|
||||
find_package(Boost REQUIRED)
|
||||
find_package(Eigen REQUIRED)
|
||||
find_package(OpenCV REQUIRED)
|
||||
-include_directories(include
|
||||
- SYSTEM ${BOOST_INCLUDE_DIRS}
|
||||
- ${catkin_INCLUDE_DIRS}
|
||||
- ${EIGEN_INCLUDE_DIRS}
|
||||
-)
|
||||
+include_directories(include ${BOOST_INCLUDE_DIRS} ${catkin_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS})
|
||||
|
||||
add_library(${PROJECT_NAME} src/nodelets/convert_metric.cpp
|
||||
src/nodelets/crop_foremost.cpp
|
||||
@ -1,13 +1,6 @@
|
||||
DIST image_pipeline-1.12.14.tar.gz 118296 SHA256 8e3b756932a821b4387b7f86ca9fc5233ebb2a13541b220b866e42ea6f92b17f SHA512 724b6d20edab1436c51a05f4399b852cabab74c5e04dea97f53a256fb512b4dbfc97fd6e7d74d41bfd7d92fe183aa86a993a39b8687c27dc7b7f85d1a1c81b94 WHIRLPOOL 394343ddf299f6c7e26c0a2f45e49edc2c4047a0ccd15885a998fa902bb7373fa44181f06adc222483a285f32df800e0b268485cb2fd98e54956929056868d5d
|
||||
DIST image_pipeline-1.12.15.tar.gz 122012 SHA256 d9660a5929b69b7801b3a05e092c7a4a5543d45084c9198fdaa9c8a0210db76c SHA512 184805f99020332ad74899ec47abc56144aceef8d4eabf877a4dc85f30befdc78b209407e1be624ba151be3a71be1fafdbd87c771137bee7c080c24935f6c6fa WHIRLPOOL d9ceff4b34767e33fe8eae49076fae133dd8146c2b09fb3ce42c0c902c6d95a06cb990e5f543dfb0215a18b0592193d65c782a45301c18e4f8a34fb35e509449
|
||||
DIST image_pipeline-1.12.16.tar.gz 126407 SHA256 af0d7e43de48457ca591c4908d5771c116d2838b4bc64fbe49efaa371f44b5b4 SHA512 2e1b77a6267fef2925396b36c8d3fdabcf8c0e61043bbeb066f0923bba867c3f63a9da4a9829d26c502af70ad7ab3dcda6cca14628accc472010af8df4b1153e WHIRLPOOL b746861c95475cadf64a7e0f70f9cad62148a4d6ed8616347812c433244ef6df367bf122089794bf4669b23707dd1718961002fa46516e7ff1ce8ebe3da1b2a2
|
||||
DIST image_pipeline-1.12.18.tar.gz 127899 SHA256 7f356c7a020d4acf5acd2973180cf356329186606586bd37f8103597a0312b05 SHA512 9a9d671d31d3c6a9343836fa8c7a5566fb9e032330dbc57adeab35510263aca0482a8a8413716e79c49e2e187c3892ab200c92435e8797d4b69e3332771b64da WHIRLPOOL eed95a909a7a9b99cf313ceea4417a80d433f6b6d24053e4f6705993899d5c2b9fd14ef7ad2b07bf584c79a83f45b232b259f3cd8e3eeedcd61d17449667fe47
|
||||
AUX gcc6.patch 1175 SHA256 a7bd9fda0a50ed44da6a79e76c8961a1dcbdafbe316b668b7672660606aa65b2 SHA512 7605a0da63921e85f63e4995fc502da3bbef912626e4935d614350c18b439f40ddb0431a97ac3f22830edc925137fdd2ab08db4a4e61d01f43749fbd199c2052 WHIRLPOOL f2c5fb68b9964e0529e093ea6fa3f441417c3448640de3d483f3c8f3829c5731b29afcff276a2ee2e8375000db160fac759870f8d130c6d041ea302947d130c8
|
||||
DIST image_pipeline-1.12.19.tar.gz 130635 SHA256 fc3073428fc930523efd6ed4a86d838ab0f0ff04a312eb4188c72a854d300e97 SHA512 f0677e4a811622ffc19792af828f4766408b6a051d271950a8a096d064b043dae1457b2a6f2d59fe5c2971795db04e7abf5e0878ead1428a4da19033693829ba WHIRLPOOL ecb1cdcc07109d3781bb82e88c0fe7e91754b2dfac0bfc7f5d053e6df9ce78b95b4131a9b65715fbce1b44b0acab6f833bd9c0d4f2fb68718fee4f4bfd586c63
|
||||
EBUILD image_proc-1.12.14.ebuild 629 SHA256 48a46426ee1425cf7974bb2718d7386d3b39b6f1d9f0942eba9318309b1494e6 SHA512 18715776e93fe8f8dc2351e48f9d121cc8f70fcd1ba2a7405f8e7091d9481fa3c9b3175ca898e07a5c18b0ea8e02a4827734003f8575ec4f29dd72c3feb9dc05 WHIRLPOOL cb3515883403794d49d7996df8cd4a12d962299f0c478412db0e8cdbfa8dca67e2ca81d4c51a220b3fd16836f687a4c96c012a5217a66c90e0fd5d7f8eca0e82
|
||||
EBUILD image_proc-1.12.15.ebuild 629 SHA256 48a46426ee1425cf7974bb2718d7386d3b39b6f1d9f0942eba9318309b1494e6 SHA512 18715776e93fe8f8dc2351e48f9d121cc8f70fcd1ba2a7405f8e7091d9481fa3c9b3175ca898e07a5c18b0ea8e02a4827734003f8575ec4f29dd72c3feb9dc05 WHIRLPOOL cb3515883403794d49d7996df8cd4a12d962299f0c478412db0e8cdbfa8dca67e2ca81d4c51a220b3fd16836f687a4c96c012a5217a66c90e0fd5d7f8eca0e82
|
||||
EBUILD image_proc-1.12.16.ebuild 629 SHA256 48a46426ee1425cf7974bb2718d7386d3b39b6f1d9f0942eba9318309b1494e6 SHA512 18715776e93fe8f8dc2351e48f9d121cc8f70fcd1ba2a7405f8e7091d9481fa3c9b3175ca898e07a5c18b0ea8e02a4827734003f8575ec4f29dd72c3feb9dc05 WHIRLPOOL cb3515883403794d49d7996df8cd4a12d962299f0c478412db0e8cdbfa8dca67e2ca81d4c51a220b3fd16836f687a4c96c012a5217a66c90e0fd5d7f8eca0e82
|
||||
EBUILD image_proc-1.12.18.ebuild 629 SHA256 1f69eeb52769d3f495f851d25f1ecd3e2a5f55d33f83b9ab8ad9ecbc2b5e5588 SHA512 94eed025ad19e51d4cbde1045595d5176410f637325ce3a4f78254e29771bf9609a93663df4fbff9a7d7e26cdf3cf2fbb80d0faeeb3efa3d361bb26eea75daa8 WHIRLPOOL d3ae3e2cc822210b6d70328776c9ba435db367d916839cf3642f35d30f41a1a73b284c6b969b6bcb8957f83af3f58b94425a15fb848bc06b8249e7432f7da5b7
|
||||
EBUILD image_proc-1.12.19.ebuild 629 SHA256 1f69eeb52769d3f495f851d25f1ecd3e2a5f55d33f83b9ab8ad9ecbc2b5e5588 SHA512 94eed025ad19e51d4cbde1045595d5176410f637325ce3a4f78254e29771bf9609a93663df4fbff9a7d7e26cdf3cf2fbb80d0faeeb3efa3d361bb26eea75daa8 WHIRLPOOL d3ae3e2cc822210b6d70328776c9ba435db367d916839cf3642f35d30f41a1a73b284c6b969b6bcb8957f83af3f58b94425a15fb848bc06b8249e7432f7da5b7
|
||||
EBUILD image_proc-1.12.19.ebuild 666 SHA256 983f9bbf9db8272a8f3259483e100be5809441bc8bdca871c19275e84965c0e0 SHA512 98d00421027477c9493644aba907cf6c019659c2a52e34fd3d3a7c3a1c6697a8aee0db72824ff7f7da11f31ba391799704779570842d18533600209c349c290a WHIRLPOOL 5f639e68e2b8cb4229270476715028c94f2210f1ed7681c97a464faad7562092b9012c460e4525bdc5532307e4116dad39ab3446693e89ecd783f9d394dd96e4
|
||||
EBUILD image_proc-9999.ebuild 629 SHA256 48a46426ee1425cf7974bb2718d7386d3b39b6f1d9f0942eba9318309b1494e6 SHA512 18715776e93fe8f8dc2351e48f9d121cc8f70fcd1ba2a7405f8e7091d9481fa3c9b3175ca898e07a5c18b0ea8e02a4827734003f8575ec4f29dd72c3feb9dc05 WHIRLPOOL cb3515883403794d49d7996df8cd4a12d962299f0c478412db0e8cdbfa8dca67e2ca81d4c51a220b3fd16836f687a4c96c012a5217a66c90e0fd5d7f8eca0e82
|
||||
MISC ChangeLog 2090 SHA256 543d6fb8ca227b555c3dc54bc05addde8218830511056e64fee7b8bc6a82ef24 SHA512 2384d9b3a218a749459161d1e1349c0cae16a3223702ca2b2b234450360c31a3f4fade8e21a37858c4a6fe8bbe8203f275e9cc73063abe3d2ae5e70969c6c4e5 WHIRLPOOL d145321021aafc0212c39c87ff880d30d87a357a88939ec0030bc9a26d4ca633665adc631d975133903e7ff8f12216066e24ccf6e0479160bae24a5cd1a290ee
|
||||
MISC metadata.xml 343 SHA256 b288e9937c65e8042a7bb2d292b33d8e74b88a2e06f9d802819a8ccbe4143f0f SHA512 c16dd878a20c747d32f8445c8eb454b51ffaf8543c1f722cca0e6508d849107e89a2cda92b0d206ef618ae1075d51e542c4178e903f3cb35efd285a5fff0cfcb WHIRLPOOL 612f7cca04475ed4e748c66fedf993d68e4c06849a10574e2b405afe940c2aff53cc846779e6ebdc80dfec5cf827276d35478a227941f0ddc7058f09fa2141d5
|
||||
|
||||
@ -0,0 +1,32 @@
|
||||
commit 6c2d65452bd5fe62723988a1a570789921900d59
|
||||
Author: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de>
|
||||
Date: Fri Sep 30 15:39:47 2016 +0200
|
||||
|
||||
address gcc6 build error
|
||||
|
||||
With gcc6, compiling fails with `stdlib.h: No such file or directory`,
|
||||
as including '-isystem /usr/include' breaks with gcc6, cf.,
|
||||
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=70129.
|
||||
|
||||
This commit addresses this issue for this package in the same way
|
||||
it was addressed in various other ROS packages. A list of related
|
||||
commits and pull requests is at:
|
||||
|
||||
https://github.com/ros/rosdistro/issues/12783
|
||||
|
||||
Signed-off-by: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de>
|
||||
|
||||
diff --git a/image_proc/CMakeLists.txt b/image_proc/CMakeLists.txt
|
||||
index a13371f..34905f0 100755
|
||||
--- a/image_proc/CMakeLists.txt
|
||||
+++ b/image_proc/CMakeLists.txt
|
||||
@@ -17,8 +17,7 @@ catkin_package(
|
||||
LIBRARIES ${PROJECT_NAME}
|
||||
)
|
||||
|
||||
-include_directories(SYSTEM ${catkin_INCLUDE_DIRS} ${OpenCV_INCLUDE_DIRS})
|
||||
-include_directories(include)
|
||||
+include_directories(include ${catkin_INCLUDE_DIRS} ${OpenCV_INCLUDE_DIRS})
|
||||
|
||||
# Nodelet library
|
||||
add_library(${PROJECT_NAME} src/libimage_proc/processor.cpp
|
||||
@ -1,29 +0,0 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
|
||||
KEYWORDS="~amd64 ~arm"
|
||||
PYTHON_COMPAT=( python2_7 )
|
||||
ROS_SUBDIR=${PN}
|
||||
|
||||
inherit ros-catkin
|
||||
|
||||
DESCRIPTION="Single image rectification and color processing"
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
IUSE=""
|
||||
|
||||
RDEPEND="
|
||||
dev-ros/cv_bridge
|
||||
dev-ros/dynamic_reconfigure
|
||||
dev-ros/image_geometry
|
||||
dev-ros/image_transport
|
||||
dev-ros/nodelet
|
||||
dev-ros/roscpp
|
||||
dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
|
||||
media-libs/opencv
|
||||
dev-libs/boost:=[threads]
|
||||
"
|
||||
DEPEND="${RDEPEND}"
|
||||
@ -1,29 +0,0 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
|
||||
KEYWORDS="~amd64 ~arm"
|
||||
PYTHON_COMPAT=( python2_7 )
|
||||
ROS_SUBDIR=${PN}
|
||||
|
||||
inherit ros-catkin
|
||||
|
||||
DESCRIPTION="Single image rectification and color processing"
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
IUSE=""
|
||||
|
||||
RDEPEND="
|
||||
dev-ros/cv_bridge
|
||||
dev-ros/dynamic_reconfigure
|
||||
dev-ros/image_geometry
|
||||
dev-ros/image_transport
|
||||
dev-ros/nodelet
|
||||
dev-ros/roscpp
|
||||
dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
|
||||
media-libs/opencv
|
||||
dev-libs/boost:=[threads]
|
||||
"
|
||||
DEPEND="${RDEPEND}"
|
||||
@ -1,29 +0,0 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
|
||||
KEYWORDS="~amd64 ~arm"
|
||||
PYTHON_COMPAT=( python2_7 )
|
||||
ROS_SUBDIR=${PN}
|
||||
|
||||
inherit ros-catkin
|
||||
|
||||
DESCRIPTION="Single image rectification and color processing"
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
IUSE=""
|
||||
|
||||
RDEPEND="
|
||||
dev-ros/cv_bridge
|
||||
dev-ros/dynamic_reconfigure
|
||||
dev-ros/image_geometry
|
||||
dev-ros/image_transport
|
||||
dev-ros/nodelet
|
||||
dev-ros/roscpp
|
||||
dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
|
||||
media-libs/opencv
|
||||
dev-libs/boost:=[threads]
|
||||
"
|
||||
DEPEND="${RDEPEND}"
|
||||
@ -1,29 +0,0 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
|
||||
KEYWORDS="~amd64 ~arm"
|
||||
PYTHON_COMPAT=( python2_7 )
|
||||
ROS_SUBDIR=${PN}
|
||||
|
||||
inherit ros-catkin
|
||||
|
||||
DESCRIPTION="Single image rectification and color processing"
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
IUSE=""
|
||||
|
||||
RDEPEND="
|
||||
dev-ros/cv_bridge
|
||||
dev-ros/dynamic_reconfigure
|
||||
dev-ros/image_geometry
|
||||
dev-ros/image_transport
|
||||
dev-ros/nodelet
|
||||
dev-ros/roscpp
|
||||
dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
|
||||
media-libs/opencv
|
||||
dev-libs/boost:=[threads]
|
||||
"
|
||||
DEPEND="${RDEPEND}"
|
||||
@ -1,5 +1,7 @@
|
||||
AUX gcc6-1.patch 2698 SHA256 34fdef3f6f6fcbbe3605a6900ce375b5f66fa1d4bac8362e9c7d0814bb1c6232 SHA512 3075c3cb048740870836aad87d65c078bd87237b2300b95bec190d15d057070deaa8f4458b3ca0bfb6f100525cfe4dbd4c7208ac3261c944cbf8a8cec05380b1 WHIRLPOOL 9742902d062803ec3d82f04a016aa65ceab5027f75613df80be09f402e1e6cce3c9de07f36daa0df8e0542576b542240ddcfc80f41d8438f8224567122011e15
|
||||
AUX gcc6.patch 1221 SHA256 fff45e53a66c56c81dd983375f406afadc9d29a37a62d3fb42b77814fb81f0b4 SHA512 1328552bd051c442883eda999ecbd402d95b8f5165c52cb0562cbfafd693a9cc309564b830abaec1734cfb561dc4451980ec62974629ed2a04d296d824434165 WHIRLPOOL 87d5afb14b5300adb7c3b724d4078795d89de1475141ee0f62660563afee35acdc354f847407c6c9a112f413a2e1c6f25797cc6357e4288701082dd8ba17aa0f
|
||||
DIST image_pipeline-1.12.19.tar.gz 130635 SHA256 fc3073428fc930523efd6ed4a86d838ab0f0ff04a312eb4188c72a854d300e97 SHA512 f0677e4a811622ffc19792af828f4766408b6a051d271950a8a096d064b043dae1457b2a6f2d59fe5c2971795db04e7abf5e0878ead1428a4da19033693829ba WHIRLPOOL ecb1cdcc07109d3781bb82e88c0fe7e91754b2dfac0bfc7f5d053e6df9ce78b95b4131a9b65715fbce1b44b0acab6f833bd9c0d4f2fb68718fee4f4bfd586c63
|
||||
EBUILD image_publisher-1.12.19.ebuild 600 SHA256 90fbeb911067eed0bd77c951a49484d724b28cef5f540f4856decbe92564230f SHA512 c42817c99b409a8fb912735344e6aa40a3c7e61cd180b5e2d88c346dbc4850e7ad393f45cb7e6d651a8952dab7a767cbb679e2c80317f9cd7ba8ec326a5b97c8 WHIRLPOOL ed4f2d5447c44f60594e5a4ba7e552074026a399b4932eaadbdfd4849eb6f81c71406716ca3c29ac15cb8b3280a96b6fae63707175e8e9ed9c483e2b5d87cbad
|
||||
EBUILD image_publisher-1.12.19.ebuild 664 SHA256 2aa51dced814a1ab0edf9915bc90e922206bc2af863d227ae95032513b0d0b65 SHA512 8b6abfa62c3358edcb6a6f5ea4dd4410cae69ad1a9e7416a3091aaff8326c10f22e32a15d0c0d6a79541db9fc33ce627f259adad885e31eb1c37ffe12c9674f4 WHIRLPOOL 61b9cf91872bcb0cf85c5b26ddee9b0d73e74d9be095bc5c5a9c287f3313ef9e5d2471e04129f0d9af86facf94e391cb0ef7e3b6fd7914cb6cf236fd0c6c8552
|
||||
EBUILD image_publisher-9999.ebuild 600 SHA256 90fbeb911067eed0bd77c951a49484d724b28cef5f540f4856decbe92564230f SHA512 c42817c99b409a8fb912735344e6aa40a3c7e61cd180b5e2d88c346dbc4850e7ad393f45cb7e6d651a8952dab7a767cbb679e2c80317f9cd7ba8ec326a5b97c8 WHIRLPOOL ed4f2d5447c44f60594e5a4ba7e552074026a399b4932eaadbdfd4849eb6f81c71406716ca3c29ac15cb8b3280a96b6fae63707175e8e9ed9c483e2b5d87cbad
|
||||
MISC ChangeLog 419 SHA256 44f69d15b8ce54cdd01164194fc2a4ef0713f49df9837f446bbbd7afe5768b0e SHA512 43a950469291ec72c07ff493814d192d4482e8b22bed3ca398d65260c790ad638a8b3b6cc3b755fcc2324f1a8318a871bbc4c9d1a6cb14b75ddddd4399c9e6a0 WHIRLPOOL b0354ca370842e3f51ad3d89ab8389ce71cac72ca89f9706c4e7f853f8901b5b923d9b3a4480bd42c16287788d623f1413d8f124fb5967450b6cb31c94ce2c30
|
||||
MISC metadata.xml 343 SHA256 b288e9937c65e8042a7bb2d292b33d8e74b88a2e06f9d802819a8ccbe4143f0f SHA512 c16dd878a20c747d32f8445c8eb454b51ffaf8543c1f722cca0e6508d849107e89a2cda92b0d206ef618ae1075d51e542c4178e903f3cb35efd285a5fff0cfcb WHIRLPOOL 612f7cca04475ed4e748c66fedf993d68e4c06849a10574e2b405afe940c2aff53cc846779e6ebdc80dfec5cf827276d35478a227941f0ddc7058f09fa2141d5
|
||||
|
||||
@ -0,0 +1,44 @@
|
||||
commit 562332df73781c1e56ce9123542334cc1d91b143
|
||||
Author: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de>
|
||||
Date: Thu Oct 6 08:55:27 2016 +0200
|
||||
|
||||
explicitly cast to std::vector<double> to make gcc6 happy
|
||||
|
||||
With gcc6, compiling image_publisher fails with this error:
|
||||
```
|
||||
/[...]/image_publisher/src/nodelet/image_publisher_nodelet.cpp: In member function 'virtual void image_publisher::ImagePublisherNodelet::onInit()':
|
||||
/[...]/image_publisher/src/nodelet/image_publisher_nodelet.cpp:180:43: error: ambiguous overload for 'operator=' (operand types are 'sensor_msgs::CameraInfo_<std::allocator<void> >::_D_type {aka std::vector<double>}' and 'boost::assign_detail::generic_list<int>')
|
||||
camera_info_.D = list_of(0)(0)(0)(0)(0);
|
||||
```
|
||||
|
||||
After adding an initial explicit type cast for the assignment,
|
||||
compiling fails further with:
|
||||
```
|
||||
| /[...]/image_publisher/src/nodelet/image_publisher_nodelet.cpp: In member function 'virtual void image_publisher::ImagePublisherNodelet::onInit()':
|
||||
| /[...]/image_publisher/src/nodelet/image_publisher_nodelet.cpp:180:65: error: call of overloaded 'vector(boost::assign_detail::generic_list<int>&)' is ambiguous
|
||||
| camera_info_.D = std::vector<double> (list_of(0)(0)(0)(0)(0));
|
||||
```
|
||||
|
||||
Various sources on the internet [1, 2, 3] point to use the
|
||||
`convert_to_container` method; hence, this commit follows those
|
||||
suggestions and with that image_publisher compiles with gcc6.
|
||||
|
||||
[1] http://stackoverflow.com/questions/16211410/ambiguity-when-using-boostassignlist-of-to-construct-a-stdvector
|
||||
[2] http://stackoverflow.com/questions/12352692/ambiguous-call-with-list-of-in-vs2010/12362548#12362548
|
||||
[3] http://stackoverflow.com/questions/13285272/using-boostassignlist-of?rq=1
|
||||
|
||||
Signed-off-by: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de>
|
||||
|
||||
diff --git a/image_publisher/src/nodelet/image_publisher_nodelet.cpp b/image_publisher/src/nodelet/image_publisher_nodelet.cpp
|
||||
index 4102d0d..26e1352 100644
|
||||
--- a/image_publisher/src/nodelet/image_publisher_nodelet.cpp
|
||||
+++ b/image_publisher/src/nodelet/image_publisher_nodelet.cpp
|
||||
@@ -177,7 +177,7 @@ public:
|
||||
camera_info_.width = image_.cols;
|
||||
camera_info_.height = image_.rows;
|
||||
camera_info_.distortion_model = "plumb_bob";
|
||||
- camera_info_.D = list_of(0)(0)(0)(0)(0);
|
||||
+ camera_info_.D = list_of(0)(0)(0)(0)(0).convert_to_container<std::vector<double> >();
|
||||
camera_info_.K = list_of(1)(0)(camera_info_.width/2)(0)(1)(camera_info_.height/2)(0)(0)(1);
|
||||
camera_info_.R = list_of(1)(0)(0)(0)(1)(0)(0)(0)(1);
|
||||
camera_info_.P = list_of(1)(0)(camera_info_.width/2)(0)(0)(1)(camera_info_.height/2)(0)(0)(0)(1)(0);
|
||||
@ -0,0 +1,32 @@
|
||||
commit 6c2d65452bd5fe62723988a1a570789921900d59
|
||||
Author: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de>
|
||||
Date: Fri Sep 30 15:39:47 2016 +0200
|
||||
|
||||
address gcc6 build error
|
||||
|
||||
With gcc6, compiling fails with `stdlib.h: No such file or directory`,
|
||||
as including '-isystem /usr/include' breaks with gcc6, cf.,
|
||||
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=70129.
|
||||
|
||||
This commit addresses this issue for this package in the same way
|
||||
it was addressed in various other ROS packages. A list of related
|
||||
commits and pull requests is at:
|
||||
|
||||
https://github.com/ros/rosdistro/issues/12783
|
||||
|
||||
Signed-off-by: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de>
|
||||
|
||||
diff --git a/image_publisher/CMakeLists.txt b/image_publisher/CMakeLists.txt
|
||||
index 8015a45..431109c 100644
|
||||
--- a/image_publisher/CMakeLists.txt
|
||||
+++ b/image_publisher/CMakeLists.txt
|
||||
@@ -8,8 +8,7 @@ generate_dynamic_reconfigure_options(cfg/ImagePublisher.cfg)
|
||||
|
||||
catkin_package()
|
||||
|
||||
-# add the executable
|
||||
-include_directories(SYSTEM ${catkin_INCLUDE_DIRS})
|
||||
+include_directories(${catkin_INCLUDE_DIRS})
|
||||
|
||||
add_library(${PROJECT_NAME} SHARED src/nodelet/image_publisher_nodelet.cpp)
|
||||
target_link_libraries(${PROJECT_NAME} ${catkin_LIBRARIES})
|
||||
@ -1,13 +1,6 @@
|
||||
DIST image_pipeline-1.12.14.tar.gz 118296 SHA256 8e3b756932a821b4387b7f86ca9fc5233ebb2a13541b220b866e42ea6f92b17f SHA512 724b6d20edab1436c51a05f4399b852cabab74c5e04dea97f53a256fb512b4dbfc97fd6e7d74d41bfd7d92fe183aa86a993a39b8687c27dc7b7f85d1a1c81b94 WHIRLPOOL 394343ddf299f6c7e26c0a2f45e49edc2c4047a0ccd15885a998fa902bb7373fa44181f06adc222483a285f32df800e0b268485cb2fd98e54956929056868d5d
|
||||
DIST image_pipeline-1.12.15.tar.gz 122012 SHA256 d9660a5929b69b7801b3a05e092c7a4a5543d45084c9198fdaa9c8a0210db76c SHA512 184805f99020332ad74899ec47abc56144aceef8d4eabf877a4dc85f30befdc78b209407e1be624ba151be3a71be1fafdbd87c771137bee7c080c24935f6c6fa WHIRLPOOL d9ceff4b34767e33fe8eae49076fae133dd8146c2b09fb3ce42c0c902c6d95a06cb990e5f543dfb0215a18b0592193d65c782a45301c18e4f8a34fb35e509449
|
||||
DIST image_pipeline-1.12.16.tar.gz 126407 SHA256 af0d7e43de48457ca591c4908d5771c116d2838b4bc64fbe49efaa371f44b5b4 SHA512 2e1b77a6267fef2925396b36c8d3fdabcf8c0e61043bbeb066f0923bba867c3f63a9da4a9829d26c502af70ad7ab3dcda6cca14628accc472010af8df4b1153e WHIRLPOOL b746861c95475cadf64a7e0f70f9cad62148a4d6ed8616347812c433244ef6df367bf122089794bf4669b23707dd1718961002fa46516e7ff1ce8ebe3da1b2a2
|
||||
DIST image_pipeline-1.12.18.tar.gz 127899 SHA256 7f356c7a020d4acf5acd2973180cf356329186606586bd37f8103597a0312b05 SHA512 9a9d671d31d3c6a9343836fa8c7a5566fb9e032330dbc57adeab35510263aca0482a8a8413716e79c49e2e187c3892ab200c92435e8797d4b69e3332771b64da WHIRLPOOL eed95a909a7a9b99cf313ceea4417a80d433f6b6d24053e4f6705993899d5c2b9fd14ef7ad2b07bf584c79a83f45b232b259f3cd8e3eeedcd61d17449667fe47
|
||||
AUX gcc6.patch 1369 SHA256 c9f86e8cf42acba96ef706c35174a94f446014f0543960b9276df66b96f3e0f7 SHA512 a69a5eec22fb55b4defc36bd60ad4b1ff47c815a37810f70cf1ca2e8e1b47bd9dc3200ec27e789eb482755698f203d91e54a572049f6dd92cb3efb0feec9f617 WHIRLPOOL 6a6d2c38fab66feaa30ad7bd5bbfb3674a478a175737c0f33a468489f260a067f179a5c875a3884de4635dbdc266a7487006b40ed33e8dba94fb11d56b1a0c6b
|
||||
DIST image_pipeline-1.12.19.tar.gz 130635 SHA256 fc3073428fc930523efd6ed4a86d838ab0f0ff04a312eb4188c72a854d300e97 SHA512 f0677e4a811622ffc19792af828f4766408b6a051d271950a8a096d064b043dae1457b2a6f2d59fe5c2971795db04e7abf5e0878ead1428a4da19033693829ba WHIRLPOOL ecb1cdcc07109d3781bb82e88c0fe7e91754b2dfac0bfc7f5d053e6df9ce78b95b4131a9b65715fbce1b44b0acab6f833bd9c0d4f2fb68718fee4f4bfd586c63
|
||||
EBUILD image_rotate-1.12.14.ebuild 620 SHA256 e3cea868133959d560a7c3646eb1207e051b155969592dc1791e89bf7452a9cf SHA512 1bef854d9eb0c6150a12b3efa36e13f774fac12f1561bf69bb079bd1d4fa4a8671625dfd5550ef1dcd73c6f1224c17c8f597837d9acbbf9c42e478434bcb357e WHIRLPOOL 4b2e80dd5c38387f3e3c2ea8b44e68e73ffb03ab96aee308d34cf4853421358b7c1c8e912d644f1cca68f3b8bb49181b5255011af5de78c4923c3ac8c0429bd7
|
||||
EBUILD image_rotate-1.12.15.ebuild 620 SHA256 e3cea868133959d560a7c3646eb1207e051b155969592dc1791e89bf7452a9cf SHA512 1bef854d9eb0c6150a12b3efa36e13f774fac12f1561bf69bb079bd1d4fa4a8671625dfd5550ef1dcd73c6f1224c17c8f597837d9acbbf9c42e478434bcb357e WHIRLPOOL 4b2e80dd5c38387f3e3c2ea8b44e68e73ffb03ab96aee308d34cf4853421358b7c1c8e912d644f1cca68f3b8bb49181b5255011af5de78c4923c3ac8c0429bd7
|
||||
EBUILD image_rotate-1.12.16.ebuild 620 SHA256 e3cea868133959d560a7c3646eb1207e051b155969592dc1791e89bf7452a9cf SHA512 1bef854d9eb0c6150a12b3efa36e13f774fac12f1561bf69bb079bd1d4fa4a8671625dfd5550ef1dcd73c6f1224c17c8f597837d9acbbf9c42e478434bcb357e WHIRLPOOL 4b2e80dd5c38387f3e3c2ea8b44e68e73ffb03ab96aee308d34cf4853421358b7c1c8e912d644f1cca68f3b8bb49181b5255011af5de78c4923c3ac8c0429bd7
|
||||
EBUILD image_rotate-1.12.18.ebuild 620 SHA256 6a1bb45250dd96a6499ee30f55f1457d0db0d56f5c871e640d8c67c00fcd1f15 SHA512 aa75db31f3650d7267c2f1a9de40206020d0b632647f3efdfb35a4c2cf62cee2a0ac357219f4fce6cb2f22d3e174f47315714a893042e84093dcddb151203e81 WHIRLPOOL 2cdad615e59c7d2fca5e3a31ed9c489acd3944100f5e526e62a0df51d1809d351b391b0c8013bc937949460587954da3333612c261ab1d9d0925981857d9048d
|
||||
EBUILD image_rotate-1.12.19.ebuild 620 SHA256 6a1bb45250dd96a6499ee30f55f1457d0db0d56f5c871e640d8c67c00fcd1f15 SHA512 aa75db31f3650d7267c2f1a9de40206020d0b632647f3efdfb35a4c2cf62cee2a0ac357219f4fce6cb2f22d3e174f47315714a893042e84093dcddb151203e81 WHIRLPOOL 2cdad615e59c7d2fca5e3a31ed9c489acd3944100f5e526e62a0df51d1809d351b391b0c8013bc937949460587954da3333612c261ab1d9d0925981857d9048d
|
||||
EBUILD image_rotate-1.12.19.ebuild 657 SHA256 e5ed6c9a4bfbc091fc29d1bc4d2fac3c235b5fc5a2e2fb4038ec52602714b92a SHA512 c662c5e96c0f92e74334d7df288d213a9dd49948f96dac26c704ec82b739c0ec28eb39f9c3f64cc8b3c47e2351212fdf6ccca43673b9c6bc9d504724127647b5 WHIRLPOOL d7079fe1cd340aa78f9998103876b1596a00c068d9f6da18adef0776ead3aa7c52b293d92132f828a1d4cae829325eee4fa25ca25281b78c255191a53ee01638
|
||||
EBUILD image_rotate-9999.ebuild 620 SHA256 e3cea868133959d560a7c3646eb1207e051b155969592dc1791e89bf7452a9cf SHA512 1bef854d9eb0c6150a12b3efa36e13f774fac12f1561bf69bb079bd1d4fa4a8671625dfd5550ef1dcd73c6f1224c17c8f597837d9acbbf9c42e478434bcb357e WHIRLPOOL 4b2e80dd5c38387f3e3c2ea8b44e68e73ffb03ab96aee308d34cf4853421358b7c1c8e912d644f1cca68f3b8bb49181b5255011af5de78c4923c3ac8c0429bd7
|
||||
MISC ChangeLog 2116 SHA256 76480061076f2e09c21f446a225dc619465dd21646108709587dcfd2515390c8 SHA512 20907b7bf5187868c496c0e9e98f6bff8c85331119bda36dee953e9fd3ff629d52367ce24a88d8a53c5594bea8616357c97001bec2d8b0ecf3be2cb7e6472c4c WHIRLPOOL f95f4148a33e155997df09f7c4698dd774bab13c0208667957a1a7b09b687afbc3a8b8305fc784a5fd67ae9bcb3103efd6f6b513d4e46129ab2206dd6377e2b2
|
||||
MISC metadata.xml 343 SHA256 b288e9937c65e8042a7bb2d292b33d8e74b88a2e06f9d802819a8ccbe4143f0f SHA512 c16dd878a20c747d32f8445c8eb454b51ffaf8543c1f722cca0e6508d849107e89a2cda92b0d206ef618ae1075d51e542c4178e903f3cb35efd285a5fff0cfcb WHIRLPOOL 612f7cca04475ed4e748c66fedf993d68e4c06849a10574e2b405afe940c2aff53cc846779e6ebdc80dfec5cf827276d35478a227941f0ddc7058f09fa2141d5
|
||||
|
||||
@ -0,0 +1,34 @@
|
||||
commit 6c2d65452bd5fe62723988a1a570789921900d59
|
||||
Author: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de>
|
||||
Date: Fri Sep 30 15:39:47 2016 +0200
|
||||
|
||||
address gcc6 build error
|
||||
|
||||
With gcc6, compiling fails with `stdlib.h: No such file or directory`,
|
||||
as including '-isystem /usr/include' breaks with gcc6, cf.,
|
||||
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=70129.
|
||||
|
||||
This commit addresses this issue for this package in the same way
|
||||
it was addressed in various other ROS packages. A list of related
|
||||
commits and pull requests is at:
|
||||
|
||||
https://github.com/ros/rosdistro/issues/12783
|
||||
|
||||
Signed-off-by: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de>
|
||||
|
||||
diff --git a/image_rotate/CMakeLists.txt b/image_rotate/CMakeLists.txt
|
||||
index 04ba03b..75d8e77 100644
|
||||
--- a/image_rotate/CMakeLists.txt
|
||||
+++ b/image_rotate/CMakeLists.txt
|
||||
@@ -12,10 +12,7 @@ find_package(OpenCV REQUIRED core imgproc)
|
||||
find_package(Eigen REQUIRED)
|
||||
|
||||
# add the executable
|
||||
-include_directories(SYSTEM ${catkin_INCLUDE_DIRS}
|
||||
- ${EIGEN_INCLUDE_DIRS}
|
||||
- ${OpenCV_INCLUDE_DIRS}
|
||||
-)
|
||||
+include_directories(${catkin_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS} ${OpenCV_INCLUDE_DIRS})
|
||||
|
||||
add_library(${PROJECT_NAME} SHARED src/nodelet/image_rotate_nodelet.cpp)
|
||||
target_link_libraries(${PROJECT_NAME} ${catkin_LIBRARIES} ${OpenCV_LIBRARIES})
|
||||
@ -1,28 +0,0 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
|
||||
KEYWORDS="~amd64 ~arm"
|
||||
PYTHON_COMPAT=( python2_7 )
|
||||
ROS_SUBDIR=${PN}
|
||||
|
||||
inherit ros-catkin
|
||||
|
||||
DESCRIPTION="Rotates an image stream minimizing the angle between an arbitrary vector and the camera frame"
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
IUSE=""
|
||||
|
||||
RDEPEND="
|
||||
dev-ros/cv_bridge
|
||||
dev-ros/dynamic_reconfigure
|
||||
dev-ros/eigen_conversions
|
||||
dev-ros/image_transport
|
||||
dev-ros/nodelet
|
||||
dev-ros/roscpp
|
||||
dev-ros/tf2
|
||||
dev-ros/tf2_geometry_msgs
|
||||
"
|
||||
DEPEND="${RDEPEND}"
|
||||
@ -1,28 +0,0 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
|
||||
KEYWORDS="~amd64 ~arm"
|
||||
PYTHON_COMPAT=( python2_7 )
|
||||
ROS_SUBDIR=${PN}
|
||||
|
||||
inherit ros-catkin
|
||||
|
||||
DESCRIPTION="Rotates an image stream minimizing the angle between an arbitrary vector and the camera frame"
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
IUSE=""
|
||||
|
||||
RDEPEND="
|
||||
dev-ros/cv_bridge
|
||||
dev-ros/dynamic_reconfigure
|
||||
dev-ros/eigen_conversions
|
||||
dev-ros/image_transport
|
||||
dev-ros/nodelet
|
||||
dev-ros/roscpp
|
||||
dev-ros/tf2
|
||||
dev-ros/tf2_geometry_msgs
|
||||
"
|
||||
DEPEND="${RDEPEND}"
|
||||
@ -1,28 +0,0 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
|
||||
KEYWORDS="~amd64 ~arm"
|
||||
PYTHON_COMPAT=( python2_7 )
|
||||
ROS_SUBDIR=${PN}
|
||||
|
||||
inherit ros-catkin
|
||||
|
||||
DESCRIPTION="Rotates an image stream minimizing the angle between an arbitrary vector and the camera frame"
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
IUSE=""
|
||||
|
||||
RDEPEND="
|
||||
dev-ros/cv_bridge
|
||||
dev-ros/dynamic_reconfigure
|
||||
dev-ros/eigen_conversions
|
||||
dev-ros/image_transport
|
||||
dev-ros/nodelet
|
||||
dev-ros/roscpp
|
||||
dev-ros/tf2
|
||||
dev-ros/tf2_geometry_msgs
|
||||
"
|
||||
DEPEND="${RDEPEND}"
|
||||
@ -1,28 +0,0 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
|
||||
KEYWORDS="~amd64 ~arm"
|
||||
PYTHON_COMPAT=( python2_7 )
|
||||
ROS_SUBDIR=${PN}
|
||||
|
||||
inherit ros-catkin
|
||||
|
||||
DESCRIPTION="Rotates an image stream minimizing the angle between an arbitrary vector and the camera frame"
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
IUSE=""
|
||||
|
||||
RDEPEND="
|
||||
dev-ros/cv_bridge
|
||||
dev-ros/dynamic_reconfigure
|
||||
dev-ros/eigen_conversions
|
||||
dev-ros/image_transport
|
||||
dev-ros/nodelet
|
||||
dev-ros/roscpp
|
||||
dev-ros/tf2
|
||||
dev-ros/tf2_geometry_msgs
|
||||
"
|
||||
DEPEND="${RDEPEND}"
|
||||
@ -1,14 +1,6 @@
|
||||
AUX dynrec.patch 584 SHA256 b04cba01ee06f8692415176ccbe7123a7c8d3c4e1ee9f4369616fb4a3da5ecf3 SHA512 73f42a759dc47e37b2911492fcc470676531a4d4f57561ba5751069b6b84333dd5a0e041c7d77ec4cf9de9da4efa7408032ecf88b6e6822bc641d8cbeecdf8de WHIRLPOOL c37c3dcb6a899df5481f783d1595a50a336bf07fa7cdab02c17e371d984e74b253de5386bb56342a7b72dc45f0afc482ddfa3d54e195dc900c866a8231dd5647
|
||||
DIST image_pipeline-1.12.14.tar.gz 118296 SHA256 8e3b756932a821b4387b7f86ca9fc5233ebb2a13541b220b866e42ea6f92b17f SHA512 724b6d20edab1436c51a05f4399b852cabab74c5e04dea97f53a256fb512b4dbfc97fd6e7d74d41bfd7d92fe183aa86a993a39b8687c27dc7b7f85d1a1c81b94 WHIRLPOOL 394343ddf299f6c7e26c0a2f45e49edc2c4047a0ccd15885a998fa902bb7373fa44181f06adc222483a285f32df800e0b268485cb2fd98e54956929056868d5d
|
||||
DIST image_pipeline-1.12.15.tar.gz 122012 SHA256 d9660a5929b69b7801b3a05e092c7a4a5543d45084c9198fdaa9c8a0210db76c SHA512 184805f99020332ad74899ec47abc56144aceef8d4eabf877a4dc85f30befdc78b209407e1be624ba151be3a71be1fafdbd87c771137bee7c080c24935f6c6fa WHIRLPOOL d9ceff4b34767e33fe8eae49076fae133dd8146c2b09fb3ce42c0c902c6d95a06cb990e5f543dfb0215a18b0592193d65c782a45301c18e4f8a34fb35e509449
|
||||
DIST image_pipeline-1.12.16.tar.gz 126407 SHA256 af0d7e43de48457ca591c4908d5771c116d2838b4bc64fbe49efaa371f44b5b4 SHA512 2e1b77a6267fef2925396b36c8d3fdabcf8c0e61043bbeb066f0923bba867c3f63a9da4a9829d26c502af70ad7ab3dcda6cca14628accc472010af8df4b1153e WHIRLPOOL b746861c95475cadf64a7e0f70f9cad62148a4d6ed8616347812c433244ef6df367bf122089794bf4669b23707dd1718961002fa46516e7ff1ce8ebe3da1b2a2
|
||||
DIST image_pipeline-1.12.18.tar.gz 127899 SHA256 7f356c7a020d4acf5acd2973180cf356329186606586bd37f8103597a0312b05 SHA512 9a9d671d31d3c6a9343836fa8c7a5566fb9e032330dbc57adeab35510263aca0482a8a8413716e79c49e2e187c3892ab200c92435e8797d4b69e3332771b64da WHIRLPOOL eed95a909a7a9b99cf313ceea4417a80d433f6b6d24053e4f6705993899d5c2b9fd14ef7ad2b07bf584c79a83f45b232b259f3cd8e3eeedcd61d17449667fe47
|
||||
AUX gcc6.patch 1616 SHA256 bef38aad913f93dfde14e6ea19a921193218c067ee339aaa094e39248f1abe09 SHA512 52154437603366d4372e0303c9b1d9e0de247db22b4a931a25eff0e2cdd2604cfba28ff4b0ea7753e1e7041dc2b4e6fd74e47ea97e54b03396fcb6f206c3d235 WHIRLPOOL cb2d53c63e7117160a65cacdbceb15789b1974b160e33d375fa58bd994c2f322a9ddd1db9374b6f1677a5e4e861a1391b8f6491dd102fe19868e1b6edab3420c
|
||||
DIST image_pipeline-1.12.19.tar.gz 130635 SHA256 fc3073428fc930523efd6ed4a86d838ab0f0ff04a312eb4188c72a854d300e97 SHA512 f0677e4a811622ffc19792af828f4766408b6a051d271950a8a096d064b043dae1457b2a6f2d59fe5c2971795db04e7abf5e0878ead1428a4da19033693829ba WHIRLPOOL ecb1cdcc07109d3781bb82e88c0fe7e91754b2dfac0bfc7f5d053e6df9ce78b95b4131a9b65715fbce1b44b0acab6f833bd9c0d4f2fb68718fee4f4bfd586c63
|
||||
EBUILD image_view-1.12.14-r1.ebuild 713 SHA256 a456d203b0d867ca96b0ac95d17313d112facfa8912b388789b42ba75044f7df SHA512 00ad3ec8dc8096035267c27689247bac0b7d618814d57795820dbf0d9b4e32d155f86e1a216f1933a88dc94f266a744eed31f2dce6fe0a15c7aded640fdaa5a1 WHIRLPOOL f4dccd19cf92f44581898948655ac807b88ef6894209d32752492bab036088fab8dbd65ad5ce171fc6d9fc4473515a258d9d8af008412292f6cb6a768287a3a3
|
||||
EBUILD image_view-1.12.15.ebuild 762 SHA256 c69444f6895b016d8f4de2d6eb2e5fb652d22eb187cfe9afcfc31867b00bddec SHA512 1ddc6ddeb8e05323882a87e1e8909f00121bc57c8e90c6fbc7b451f87cd271c3d28d6ed5e92cd897ab0888e385dcf16b59f54b0c7319465aa4a33ec77c1f9fd8 WHIRLPOOL ef1363cab08478706ae81172940148144fee7c7a6e27ac65d1dd71883adc15e07ea9a2b91425ae116cdf5bacc961ef5d03b873a797e2d4759d66a760899952a9
|
||||
EBUILD image_view-1.12.16.ebuild 772 SHA256 c5b695cf34eba4d0109aba6482d4e3b5c2f9dbca3aecec456d3f75557d90c323 SHA512 baf7d099e2b25db8eb7c2d7ed3692b259b7746424a3fafe606101cbcfe1f3da3ae2dc6cb5906c96abc84847e4f9ce13f521b2e5d8fdefb376c829160ab5495c9 WHIRLPOOL c511e055401964bf6ce6ef6ac4d7eeddaa1eb00f1bbcfbedfb1b9c19f66db84b123501362073caf8bfa1a34f8aa91d54ea3de9a74ad13ed23dc12c241465004e
|
||||
EBUILD image_view-1.12.18.ebuild 772 SHA256 abe38e143d8d385901f88f584603b7660c156fc2ca28e3d15cb448aeef235760 SHA512 cb5759370c5459bbf37cc84ebc1e4cd473c92040ba3f9c00404fe57262dc90aebe2ec2e8ddd2de2215f64f069c43bb98e44506f045e1baf35193dcc4ccc244b7 WHIRLPOOL 0d108ea2c6f9d5a1ce2f8d0ab2d7bdea5b55cd9eb54c4a248f6716c2a298d73a6d67e79c6bae4036ab8bd70937a2e514e932c22a9aee2e2be98ab5363a8f5579
|
||||
EBUILD image_view-1.12.19.ebuild 772 SHA256 abe38e143d8d385901f88f584603b7660c156fc2ca28e3d15cb448aeef235760 SHA512 cb5759370c5459bbf37cc84ebc1e4cd473c92040ba3f9c00404fe57262dc90aebe2ec2e8ddd2de2215f64f069c43bb98e44506f045e1baf35193dcc4ccc244b7 WHIRLPOOL 0d108ea2c6f9d5a1ce2f8d0ab2d7bdea5b55cd9eb54c4a248f6716c2a298d73a6d67e79c6bae4036ab8bd70937a2e514e932c22a9aee2e2be98ab5363a8f5579
|
||||
EBUILD image_view-1.12.19.ebuild 809 SHA256 a6d5e33a84d619232c4e25ad3d22a62fb33c8fbc1f73587b95366f9a79140ca9 SHA512 ba2aa4ed74a68347fb6b1e873e3f3e94d7203944f0f13df1facab997731c931718247b063ded16de1fc8facbb2bf35f70459f7049f5ca0f1034661d2785e507f WHIRLPOOL e9e6070ba0bc22b838fdf0dfaf0a1859ed4174a9fa2651c99e367f29abca4fb9d59e9749e9097999bfc3f02c707f81d2854328e75a3d7b54ebed072eed3d0c64
|
||||
EBUILD image_view-9999.ebuild 772 SHA256 c5b695cf34eba4d0109aba6482d4e3b5c2f9dbca3aecec456d3f75557d90c323 SHA512 baf7d099e2b25db8eb7c2d7ed3692b259b7746424a3fafe606101cbcfe1f3da3ae2dc6cb5906c96abc84847e4f9ce13f521b2e5d8fdefb376c829160ab5495c9 WHIRLPOOL c511e055401964bf6ce6ef6ac4d7eeddaa1eb00f1bbcfbedfb1b9c19f66db84b123501362073caf8bfa1a34f8aa91d54ea3de9a74ad13ed23dc12c241465004e
|
||||
MISC ChangeLog 3409 SHA256 67b53a430fe6cd1cd0654a9c3c4115ab190bfa73175bf76bf0aaf6e881b7c70c SHA512 d050e70e293df88357395f320eb0de1c904033c34909da150eeb72c7b49703152aa5dbed225a89340451e66dbad2ad43af63809e21e179c1914153eca8db71a8 WHIRLPOOL d666a80fc0766a321d7090ca441c2c5e8acf06d6fd0097a5163c64ca528aa5cf2b8f3d10b733a94c5e667e739c4d0ec18d72eb393f9cfaecfd2188d558f5c88a
|
||||
MISC metadata.xml 343 SHA256 b288e9937c65e8042a7bb2d292b33d8e74b88a2e06f9d802819a8ccbe4143f0f SHA512 c16dd878a20c747d32f8445c8eb454b51ffaf8543c1f722cca0e6508d849107e89a2cda92b0d206ef618ae1075d51e542c4178e903f3cb35efd285a5fff0cfcb WHIRLPOOL 612f7cca04475ed4e748c66fedf993d68e4c06849a10574e2b405afe940c2aff53cc846779e6ebdc80dfec5cf827276d35478a227941f0ddc7058f09fa2141d5
|
||||
|
||||
@ -1,17 +0,0 @@
|
||||
When installing for the first time, imp.find_module will fail.
|
||||
|
||||
https://github.com/ros-perception/image_pipeline/pull/183
|
||||
|
||||
Index: image_pipeline-1.12.15/image_view/cfg/ImageView.cfg
|
||||
===================================================================
|
||||
--- image_pipeline-1.12.15.orig/image_view/cfg/ImageView.cfg
|
||||
+++ image_pipeline-1.12.15/image_view/cfg/ImageView.cfg
|
||||
@@ -2,8 +2,6 @@
|
||||
|
||||
PACKAGE='image_view'
|
||||
try:
|
||||
- import imp
|
||||
- imp.find_module(PACKAGE)
|
||||
from dynamic_reconfigure.parameter_generator_catkin import *
|
||||
except:
|
||||
import roslib; roslib.load_manifest(PACKAGE)
|
||||
@ -0,0 +1,44 @@
|
||||
commit 6c2d65452bd5fe62723988a1a570789921900d59
|
||||
Author: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de>
|
||||
Date: Fri Sep 30 15:39:47 2016 +0200
|
||||
|
||||
address gcc6 build error
|
||||
|
||||
With gcc6, compiling fails with `stdlib.h: No such file or directory`,
|
||||
as including '-isystem /usr/include' breaks with gcc6, cf.,
|
||||
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=70129.
|
||||
|
||||
This commit addresses this issue for this package in the same way
|
||||
it was addressed in various other ROS packages. A list of related
|
||||
commits and pull requests is at:
|
||||
|
||||
https://github.com/ros/rosdistro/issues/12783
|
||||
|
||||
Signed-off-by: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de>
|
||||
|
||||
diff --git a/image_view/CMakeLists.txt b/image_view/CMakeLists.txt
|
||||
index 78b9eaa..93fabe7 100644
|
||||
--- a/image_view/CMakeLists.txt
|
||||
+++ b/image_view/CMakeLists.txt
|
||||
@@ -8,9 +8,9 @@ catkin_package(CATKIN_DEPENDS dynamic_reconfigure)
|
||||
find_package(Boost REQUIRED COMPONENTS signals thread)
|
||||
find_package(OpenCV REQUIRED)
|
||||
|
||||
-include_directories(SYSTEM ${Boost_INCLUDE_DIRS}
|
||||
- ${catkin_INCLUDE_DIRS}
|
||||
- ${OpenCV_INCLUDE_DIRS}
|
||||
+include_directories(${Boost_INCLUDE_DIRS}
|
||||
+ ${catkin_INCLUDE_DIRS}
|
||||
+ ${OpenCV_INCLUDE_DIRS}
|
||||
)
|
||||
|
||||
# Extra tools
|
||||
@@ -40,7 +40,7 @@ endif()
|
||||
|
||||
find_package(GTK2)
|
||||
add_definitions(-DHAVE_GTK)
|
||||
-include_directories(SYSTEM ${GTK2_INCLUDE_DIRS})
|
||||
+include_directories(${GTK2_INCLUDE_DIRS})
|
||||
|
||||
# Nodelet library
|
||||
add_library(image_view src/nodelets/image_nodelet.cpp src/nodelets/disparity_nodelet.cpp src/nodelets/window_thread.cpp)
|
||||
@ -1,32 +0,0 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
|
||||
KEYWORDS="~amd64 ~arm"
|
||||
PYTHON_COMPAT=( python2_7 )
|
||||
ROS_SUBDIR=${PN}
|
||||
|
||||
inherit ros-catkin
|
||||
|
||||
DESCRIPTION="Simple viewer for ROS image topics"
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
IUSE=""
|
||||
|
||||
RDEPEND="
|
||||
dev-libs/boost:=[threads]
|
||||
media-libs/opencv
|
||||
x11-libs/gtk+:2
|
||||
dev-ros/camera_calibration_parsers
|
||||
dev-ros/cv_bridge
|
||||
dev-ros/image_transport
|
||||
dev-ros/message_filters
|
||||
dev-ros/nodelet
|
||||
dev-ros/rosconsole
|
||||
dev-ros/roscpp
|
||||
dev-ros/stereo_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
|
||||
dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
|
||||
"
|
||||
DEPEND="${RDEPEND}"
|
||||
@ -1,33 +0,0 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
|
||||
KEYWORDS="~amd64 ~arm"
|
||||
PYTHON_COMPAT=( python2_7 )
|
||||
ROS_SUBDIR=${PN}
|
||||
|
||||
inherit ros-catkin
|
||||
|
||||
DESCRIPTION="Simple viewer for ROS image topics"
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
IUSE=""
|
||||
|
||||
RDEPEND="
|
||||
dev-libs/boost:=[threads]
|
||||
media-libs/opencv
|
||||
x11-libs/gtk+:2
|
||||
dev-ros/camera_calibration_parsers
|
||||
>=dev-ros/cv_bridge-1.11.10
|
||||
dev-ros/image_transport
|
||||
dev-ros/message_filters
|
||||
dev-ros/nodelet
|
||||
dev-ros/rosconsole
|
||||
dev-ros/roscpp
|
||||
dev-ros/stereo_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
|
||||
dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
|
||||
"
|
||||
DEPEND="${RDEPEND}"
|
||||
PATCHES=( "${FILESDIR}/dynrec.patch" )
|
||||
@ -1,33 +0,0 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
|
||||
KEYWORDS="~amd64 ~arm"
|
||||
PYTHON_COMPAT=( python2_7 )
|
||||
ROS_SUBDIR=${PN}
|
||||
|
||||
inherit ros-catkin
|
||||
|
||||
DESCRIPTION="Simple viewer for ROS image topics"
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
IUSE=""
|
||||
|
||||
RDEPEND="
|
||||
dev-libs/boost:=[threads]
|
||||
media-libs/opencv
|
||||
x11-libs/gtk+:2
|
||||
dev-ros/camera_calibration_parsers
|
||||
>=dev-ros/cv_bridge-1.11.10
|
||||
dev-ros/image_transport
|
||||
dev-ros/message_filters
|
||||
dev-ros/nodelet
|
||||
dev-ros/rosconsole
|
||||
dev-ros/roscpp
|
||||
dev-ros/stereo_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
|
||||
dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
|
||||
dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
|
||||
"
|
||||
DEPEND="${RDEPEND}"
|
||||
@ -1,33 +0,0 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
|
||||
KEYWORDS="~amd64 ~arm"
|
||||
PYTHON_COMPAT=( python2_7 )
|
||||
ROS_SUBDIR=${PN}
|
||||
|
||||
inherit ros-catkin
|
||||
|
||||
DESCRIPTION="Simple viewer for ROS image topics"
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
IUSE=""
|
||||
|
||||
RDEPEND="
|
||||
dev-libs/boost:=[threads]
|
||||
media-libs/opencv
|
||||
x11-libs/gtk+:2
|
||||
dev-ros/camera_calibration_parsers
|
||||
>=dev-ros/cv_bridge-1.11.10
|
||||
dev-ros/image_transport
|
||||
dev-ros/message_filters
|
||||
dev-ros/nodelet
|
||||
dev-ros/rosconsole
|
||||
dev-ros/roscpp
|
||||
dev-ros/stereo_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
|
||||
dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
|
||||
dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
|
||||
"
|
||||
DEPEND="${RDEPEND}"
|
||||
@ -1,5 +1,6 @@
|
||||
AUX gcc6.patch 1289 SHA256 4279d04fbe6faa22e6a77251467b5ad33386286f542b4d7835b07b2171895acf SHA512 81d7265962d8bf87c3d08cd2f0078e6a3152f675626480855ee93dab55db805b96a1acfc9d18d0b4d9106d65e606aa9614dda75770f325c4f96e3f8420a520a4 WHIRLPOOL 8f9c21e81a5aa86d878d0463fd32e90c7f67eb61552981fa8ab21183a74e844673715d60fca210601561bd423b148c8813e290cbb42ae67795fba0a9e04549a8
|
||||
DIST image_pipeline-1.12.19.tar.gz 130635 SHA256 fc3073428fc930523efd6ed4a86d838ab0f0ff04a312eb4188c72a854d300e97 SHA512 f0677e4a811622ffc19792af828f4766408b6a051d271950a8a096d064b043dae1457b2a6f2d59fe5c2971795db04e7abf5e0878ead1428a4da19033693829ba WHIRLPOOL ecb1cdcc07109d3781bb82e88c0fe7e91754b2dfac0bfc7f5d053e6df9ce78b95b4131a9b65715fbce1b44b0acab6f833bd9c0d4f2fb68718fee4f4bfd586c63
|
||||
EBUILD stereo_image_proc-1.12.19-r1.ebuild 725 SHA256 20b29a0facad89238ba4212d38811fc37ad7854e94030e84d5c4d5f3e51a0541 SHA512 2b179ec9ab245df3bcc3b38db1a0675517c0d9b288cdae84044963610ebe1e2f9f0fe010603aca17b3c8fd5b41f54daa0cfe06223d699c80604db15fe2855113 WHIRLPOOL 477d30b21d1e519d33026b26881d3303ab5fa4987eb90a3fc617e7a824d58fd899dd335532bc55069a64c819786febb885c2f7789f5b83a5191d680d05d66381
|
||||
EBUILD stereo_image_proc-1.12.19-r1.ebuild 762 SHA256 9f439fb6f1b82210e474528efeeeb258def665ce249edecc709a0acded752a96 SHA512 1a90315a6557a8c2271f5c187f81c5344ee734bc64611316769c426d96dd15ef2eb2a1d3114362e14c309fd11fcae078ffa88b46e6c6210e777ea10ebf64fa86 WHIRLPOOL 8b1be48738f2b20c1ad03d9f4576e1f62105119616b4bc8ec4277c57174711a07f84670a7821e7ffa1056184f7d40aadcc8f0f283fab0c992a1e7d1d92a15156
|
||||
EBUILD stereo_image_proc-9999.ebuild 725 SHA256 20b29a0facad89238ba4212d38811fc37ad7854e94030e84d5c4d5f3e51a0541 SHA512 2b179ec9ab245df3bcc3b38db1a0675517c0d9b288cdae84044963610ebe1e2f9f0fe010603aca17b3c8fd5b41f54daa0cfe06223d699c80604db15fe2855113 WHIRLPOOL 477d30b21d1e519d33026b26881d3303ab5fa4987eb90a3fc617e7a824d58fd899dd335532bc55069a64c819786febb885c2f7789f5b83a5191d680d05d66381
|
||||
MISC ChangeLog 2692 SHA256 ff4495d9f076e6161948893f18b3caa50534ee384c7b04bc564cb5860f2a077c SHA512 102d215a60c469f3e71ea928089652e77f6f06b1425542c8aba87a34f9a39bcabe15c12db7e29b5a0569fcfa474d422c180931a2deb5378863a1658ae02f129e WHIRLPOOL cd990a3a1d3edf149476fe7c31aaf651d6c373f30dc0c684a326a943a304e5f0719df57085f324b0fba3a57d21ce877fe58c42e6cf9699e1cf5199bc7d7e8b41
|
||||
MISC metadata.xml 343 SHA256 b288e9937c65e8042a7bb2d292b33d8e74b88a2e06f9d802819a8ccbe4143f0f SHA512 c16dd878a20c747d32f8445c8eb454b51ffaf8543c1f722cca0e6508d849107e89a2cda92b0d206ef618ae1075d51e542c4178e903f3cb35efd285a5fff0cfcb WHIRLPOOL 612f7cca04475ed4e748c66fedf993d68e4c06849a10574e2b405afe940c2aff53cc846779e6ebdc80dfec5cf827276d35478a227941f0ddc7058f09fa2141d5
|
||||
|
||||
@ -0,0 +1,33 @@
|
||||
commit 6c2d65452bd5fe62723988a1a570789921900d59
|
||||
Author: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de>
|
||||
Date: Fri Sep 30 15:39:47 2016 +0200
|
||||
|
||||
address gcc6 build error
|
||||
|
||||
With gcc6, compiling fails with `stdlib.h: No such file or directory`,
|
||||
as including '-isystem /usr/include' breaks with gcc6, cf.,
|
||||
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=70129.
|
||||
|
||||
This commit addresses this issue for this package in the same way
|
||||
it was addressed in various other ROS packages. A list of related
|
||||
commits and pull requests is at:
|
||||
|
||||
https://github.com/ros/rosdistro/issues/12783
|
||||
|
||||
Signed-off-by: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de>
|
||||
|
||||
diff --git a/stereo_image_proc/CMakeLists.txt b/stereo_image_proc/CMakeLists.txt
|
||||
index b7127d2..e201436 100644
|
||||
--- a/stereo_image_proc/CMakeLists.txt
|
||||
+++ b/stereo_image_proc/CMakeLists.txt
|
||||
@@ -16,9 +16,7 @@ catkin_package(
|
||||
include_directories(include)
|
||||
|
||||
find_package(OpenCV REQUIRED)
|
||||
-include_directories(SYSTEM ${catkin_INCLUDE_DIRS}
|
||||
- ${OpenCV_INCLUDE_DIRS}
|
||||
-)
|
||||
+include_directories(${catkin_INCLUDE_DIRS} ${OpenCV_INCLUDE_DIRS})
|
||||
|
||||
# Nodelet library
|
||||
add_library(${PROJECT_NAME} src/libstereo_image_proc/processor.cpp src/nodelets/disparity.cpp src/nodelets/point_cloud2.cpp)
|
||||
@ -1,5 +1,7 @@
|
||||
DIST zimg-2.3.tar.gz 188682 SHA256 09962385f986dbcfd8ed6160cdafc2bc57bef8c6bfb3ca3a4bcaa482f09c06fa SHA512 18ace0b66c59304d0a0abdb3cc4d5391bd1d74ef7b69af4e35350d452cf1b43807fc9ffda2285e991920bbb414e58a3e3a20d44a6f2ed7a9e902d956f973269d WHIRLPOOL 112b0f267587d361775d4eeab158cc66f8b56bbd760073d63417dd9f388de8df8758af07c7921b896dcef59f5e2fdf1474621f2bf22ca943473d268ee222611b
|
||||
DIST zimg-2.4.tar.gz 193791 SHA256 996ea0e446df6ff4d6cb9c04a77d60978eca47c32d3785cd63fe8c29a9523d1f SHA512 978a344c8f91327c7b92c6354526042d3901ce8ca3db19ba1ea1c81f4a1f980a64290223c202af354abd9efd821664d1743714acee171529a30f3742a0195e9e WHIRLPOOL cbae92a607d94c61860461d054e2a68220b2f7039e5aaade0dc869267795759076edd42bd30f4b03d816119b181a5c703a7d7382a7ff751433eace9d8050466b
|
||||
EBUILD zimg-2.3.ebuild 806 SHA256 ed67e05c2d0d84f5ede52368419f8386523e11546988fa6b98da01a5965fe4fa SHA512 ba56b53e481df688b9c1a0a9388cb84a0a1037f313c0062f7f511a52beb4861103b0c538e38084c966240b477b135d4b848d72f0230882a46191503382808ea7 WHIRLPOOL ac8b2b44502c028897a044f65bb4f840959de64f3bf2cfd9e03c1a9b1bca6b8fb968e9bf9722ecbc6d24346a749c445dc99b84731ec0fa7266b4ed15b44cba51
|
||||
EBUILD zimg-9999.ebuild 801 SHA256 e83b50a45527393bead74d36637abd38648588b090b66abab380c409f8156aae SHA512 0a39ce428dcdc07020f54868b307f557276a64443cdf35132593a8d21b3089ddb4a604aa3947371fa05df01c5cc19e9606d051cbea2e58f8eb14cb176e3d0faa WHIRLPOOL fbb1804558548a86d610c9272a43dbcce3f32b806bbba2477900664c3e0dfacdabd533463dfc7d91edfa30f1a1a8a3d7822e78deee89dfdfe786a5404d9bd43b
|
||||
EBUILD zimg-2.4.ebuild 806 SHA256 f1681368e11c74ea5f0488f1a5abbf83a62893cd237e58281be89c3f43d3fcc8 SHA512 2a15f01687eb652c968a185465105a3f6f5d606ebeefa438f1f84083a0791e79d6c5ac95cb0f7c8b66628bc867ba9f113ee081d6520f6ee7d9d524174069ea5c WHIRLPOOL eb41e4e2fd89f68cac64cedd631d1d0ccceafca3d8bdfa9eecd102f8dd6a577c081bafb479cb858762b47070b3b9fe7923670ed2c8e94e9cf83e678de7b63e68
|
||||
EBUILD zimg-9999.ebuild 806 SHA256 f1681368e11c74ea5f0488f1a5abbf83a62893cd237e58281be89c3f43d3fcc8 SHA512 2a15f01687eb652c968a185465105a3f6f5d606ebeefa438f1f84083a0791e79d6c5ac95cb0f7c8b66628bc867ba9f113ee081d6520f6ee7d9d524174069ea5c WHIRLPOOL eb41e4e2fd89f68cac64cedd631d1d0ccceafca3d8bdfa9eecd102f8dd6a577c081bafb479cb858762b47070b3b9fe7923670ed2c8e94e9cf83e678de7b63e68
|
||||
MISC ChangeLog 2740 SHA256 f6752750a8a2d4d4d7cf470b7ecacce2a3cb3245d56900a7a3fc0d793d3246b4 SHA512 70202c93f9a9c0baaa147cf4ba0e2e4f12c45bfb5eaf8eec4825ce61fae99ec659bb874073304139aff99f7cee73aa3f0bf47cc7083a96a8ca3e8ea0f06ebf94 WHIRLPOOL eeee8b7c27d43936d5d740909a48cd0e306a28db95b76471da5e9271dd1c1559abeebe4df54a46e7f8d0b71230e2d4e9621e100efe63db0b57a776bdd7b6a001
|
||||
MISC metadata.xml 311 SHA256 0fc15c1144ae524e1bb8111b7c6a89600cac0006ebe9bd2d5846b099ac7f7fb3 SHA512 a46022cde358c89be1d423501630b15ea56d2012e022ba8e91800d834bae267bff5a79c115e0fcfd632da6b9031d3c68948f1cd83e3f27699895b7de548f95b2 WHIRLPOOL defdcd5dc6d9a12d6c6f2db36c98fcda7ae01512be9abdcadf1bdebd01c66cd5489704369c56b407208a0f800ab6345427cce1a376afff796637290c960ce69b
|
||||
|
||||
@ -0,0 +1,37 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
|
||||
AUTOTOOLS_AUTORECONF=yes
|
||||
|
||||
SCM=""
|
||||
|
||||
if [ "${PV#9999}" != "${PV}" ] ; then
|
||||
SCM="git-r3"
|
||||
EGIT_REPO_URI="https://github.com/sekrit-twc/zimg"
|
||||
fi
|
||||
|
||||
inherit autotools-multilib ${SCM}
|
||||
|
||||
DESCRIPTION="Scaling, colorspace conversion, and dithering library"
|
||||
HOMEPAGE="https://github.com/sekrit-twc/zimg"
|
||||
|
||||
if [ "${PV#9999}" = "${PV}" ] ; then
|
||||
SRC_URI="https://github.com/sekrit-twc/zimg/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
|
||||
KEYWORDS="~amd64 ~ppc ~x86"
|
||||
S="${WORKDIR}/${PN}-release-${PV}/"
|
||||
fi
|
||||
|
||||
LICENSE="WTFPL-2"
|
||||
SLOT="0"
|
||||
IUSE="static-libs cpu_flags_x86_sse"
|
||||
|
||||
DEPEND=""
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
src_configure() {
|
||||
autotools-multilib_src_configure \
|
||||
$(use_enable cpu_flags_x86_sse x86simd)
|
||||
}
|
||||
@ -1 +1 @@
|
||||
Mon, 23 Jan 2017 09:43:24 +0000
|
||||
Mon, 23 Jan 2017 14:43:31 +0000
|
||||
|
||||
@ -1 +1 @@
|
||||
Mon, 23 Jan 2017 09:43:24 +0000
|
||||
Mon, 23 Jan 2017 14:43:31 +0000
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue