root
7 years ago
parent
20183d74d3
commit
eb96b86304
@ -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,2 +1,3 @@
|
||||
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
|
||||
|
||||
@ -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 @@
|
||||
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
|
||||
DIST image_pipeline-1.12.19.tar.gz 130635 SHA256 fc3073428fc930523efd6ed4a86d838ab0f0ff04a312eb4188c72a854d300e97 SHA512 f0677e4a811622ffc19792af828f4766408b6a051d271950a8a096d064b043dae1457b2a6f2d59fe5c2971795db04e7abf5e0878ead1428a4da19033693829ba WHIRLPOOL ecb1cdcc07109d3781bb82e88c0fe7e91754b2dfac0bfc7f5d053e6df9ce78b95b4131a9b65715fbce1b44b0acab6f833bd9c0d4f2fb68718fee4f4bfd586c63
|
||||
|
||||
@ -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,5 +1 @@
|
||||
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
|
||||
DIST image_pipeline-1.12.19.tar.gz 130635 SHA256 fc3073428fc930523efd6ed4a86d838ab0f0ff04a312eb4188c72a854d300e97 SHA512 f0677e4a811622ffc19792af828f4766408b6a051d271950a8a096d064b043dae1457b2a6f2d59fe5c2971795db04e7abf5e0878ead1428a4da19033693829ba WHIRLPOOL ecb1cdcc07109d3781bb82e88c0fe7e91754b2dfac0bfc7f5d053e6df9ce78b95b4131a9b65715fbce1b44b0acab6f833bd9c0d4f2fb68718fee4f4bfd586c63
|
||||
|
||||
@ -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}"
|
||||
@ -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,5 +1 @@
|
||||
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
|
||||
DIST image_pipeline-1.12.19.tar.gz 130635 SHA256 fc3073428fc930523efd6ed4a86d838ab0f0ff04a312eb4188c72a854d300e97 SHA512 f0677e4a811622ffc19792af828f4766408b6a051d271950a8a096d064b043dae1457b2a6f2d59fe5c2971795db04e7abf5e0878ead1428a4da19033693829ba WHIRLPOOL ecb1cdcc07109d3781bb82e88c0fe7e91754b2dfac0bfc7f5d053e6df9ce78b95b4131a9b65715fbce1b44b0acab6f833bd9c0d4f2fb68718fee4f4bfd586c63
|
||||
|
||||
@ -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,5 +1 @@
|
||||
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
|
||||
DIST image_pipeline-1.12.19.tar.gz 130635 SHA256 fc3073428fc930523efd6ed4a86d838ab0f0ff04a312eb4188c72a854d300e97 SHA512 f0677e4a811622ffc19792af828f4766408b6a051d271950a8a096d064b043dae1457b2a6f2d59fe5c2971795db04e7abf5e0878ead1428a4da19033693829ba WHIRLPOOL ecb1cdcc07109d3781bb82e88c0fe7e91754b2dfac0bfc7f5d053e6df9ce78b95b4131a9b65715fbce1b44b0acab6f833bd9c0d4f2fb68718fee4f4bfd586c63
|
||||
|
||||
@ -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}"
|
||||
@ -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 +1,2 @@
|
||||
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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -1,14 +0,0 @@
|
||||
DEFINED_PHASES=compile install postinst prepare setup unpack
|
||||
DEPEND=>=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] ) dev-go/go-md2man btrfs? ( >=sys-fs/btrfs-progs-3.8 ) >=dev-lang/go-1.4.2:= virtual/pkgconfig virtual/pkgconfig
|
||||
DESCRIPTION=The core functions you need to create Docker images and run Docker containers
|
||||
EAPI=5
|
||||
HOMEPAGE=https://dockerproject.org
|
||||
IUSE=apparmor aufs btrfs +device-mapper experimental overlay seccomp
|
||||
KEYWORDS=amd64
|
||||
LICENSE=Apache-2.0
|
||||
RDEPEND=>=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] ) !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
|
||||
SLOT=0
|
||||
SRC_URI=https://github.com/docker/docker/archive/v1.11.0.tar.gz -> docker-1.11.0.tar.gz
|
||||
_eclasses_=bash-completion-r1 acf715fa09463f043fbfdc1640f3fb85 eutils ea170b525f6a38a006be05c9d9429f13 golang-base 08fe6e0e2b4750daff8887a7f0e1f873 golang-vcs-snapshot 1caa6d8238d2378ad688ae068ff22e5a linux-info af49d8ab3be91bb1d38b7201dc9e5123 multilib 165fc17c38d1b11dac2008280dab6e80 systemd 5b6ca8b2fc1307ca593223f327342c96 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 udev 0498b698e76cdc94930b59a00c73dd9c user 80aaa71614ced86f02ee1a513821dc87 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
|
||||
_md5_=c6d5692f17ece433c7673d40ad416d84
|
||||
@ -1,14 +0,0 @@
|
||||
DEFINED_PHASES=compile install postinst setup unpack
|
||||
DEPEND=>=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 ) dev-go/go-md2man btrfs? ( >=sys-fs/btrfs-progs-3.16.1 ) >=dev-lang/go-1.4.2:= virtual/pkgconfig virtual/pkgconfig
|
||||
DESCRIPTION=The core functions you need to create Docker images and run Docker containers
|
||||
EAPI=6
|
||||
HOMEPAGE=https://dockerproject.org
|
||||
IUSE=apparmor aufs btrfs +container-init +device-mapper hardened overlay pkcs11 seccomp
|
||||
KEYWORDS=~amd64
|
||||
LICENSE=Apache-2.0
|
||||
RDEPEND=>=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 ) !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
|
||||
SLOT=0
|
||||
SRC_URI=https://github.com/docker/docker/archive/v1.13.0-rc7.tar.gz -> docker-1.13.0_rc7.tar.gz
|
||||
_eclasses_=bash-completion-r1 acf715fa09463f043fbfdc1640f3fb85 eutils ea170b525f6a38a006be05c9d9429f13 golang-base 08fe6e0e2b4750daff8887a7f0e1f873 golang-vcs-snapshot 1caa6d8238d2378ad688ae068ff22e5a linux-info af49d8ab3be91bb1d38b7201dc9e5123 multilib 165fc17c38d1b11dac2008280dab6e80 systemd 5b6ca8b2fc1307ca593223f327342c96 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 udev 0498b698e76cdc94930b59a00c73dd9c user 80aaa71614ced86f02ee1a513821dc87 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
|
||||
_md5_=3b744e5f6550f15030386905a957273d
|
||||
@ -0,0 +1,12 @@
|
||||
DEFINED_PHASES=compile configure install prepare test
|
||||
DEPEND=dev-libs/boost:= sys-libs/zlib:=[minizip] dev-libs/libxml2 dev-libs/libpcre[cxx] virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.5.2
|
||||
DESCRIPTION=COLLADA Document Object Model (DOM) C++ Library
|
||||
EAPI=6
|
||||
HOMEPAGE=https://github.com/rdiankov/collada-dom
|
||||
KEYWORDS=~amd64 ~arm
|
||||
LICENSE=MIT
|
||||
RDEPEND=dev-libs/boost:= sys-libs/zlib:=[minizip] dev-libs/libxml2 dev-libs/libpcre[cxx]
|
||||
SLOT=0
|
||||
SRC_URI=https://github.com/rdiankov/collada-dom/archive/v2.4.4.tar.gz -> collada-dom-2.4.4.tar.gz
|
||||
_eclasses_=cmake-utils fa4d8052a1ccf4fbbfa76361bffebe42 eutils ea170b525f6a38a006be05c9d9429f13 flag-o-matic 7366202dd55cb8f018f5d450d54e7749 multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing 7bb10a841be2368af0c00f27dd67560b toolchain-funcs 1b1da0c45c555989dc5d832b54880783 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
|
||||
_md5_=17d167ae9bc9b404ea932b5d727fadbd
|
||||
@ -1,13 +0,0 @@
|
||||
DEFINED_PHASES=compile configure install prepare test
|
||||
DEPEND=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[ros_messages_cxx(-)] dev-ros/stereo_msgs[ros_messages_cxx(-)] dev-ros/tf2 dev-ros/tf2_ros sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
|
||||
DESCRIPTION=Nodelets for processing depth images such as those produced by OpenNI camera
|
||||
EAPI=5
|
||||
HOMEPAGE=http://wiki.ros.org/depth_image_proc
|
||||
IUSE=test
|
||||
KEYWORDS=~amd64 ~arm
|
||||
LICENSE=BSD
|
||||
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[ros_messages_cxx(-)] dev-ros/stereo_msgs[ros_messages_cxx(-)] dev-ros/tf2 dev-ros/tf2_ros dev-util/catkin dev-python/empy
|
||||
SLOT=0
|
||||
SRC_URI=https://github.com/ros-perception/image_pipeline/archive/1.12.14.tar.gz -> image_pipeline-1.12.14.tar.gz
|
||||
_eclasses_=cmake-utils fa4d8052a1ccf4fbbfa76361bffebe42 eutils ea170b525f6a38a006be05c9d9429f13 flag-o-matic 7366202dd55cb8f018f5d450d54e7749 multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing 7bb10a841be2368af0c00f27dd67560b ros-catkin 8b7e3d7128bd81dfe56a947e63201e78 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
|
||||
_md5_=16708847397b33d7642b22435850560d
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue