parent
6ce16d5fa2
commit
d654dd5601
@ -1,2 +1,4 @@
|
||||
DIST filebeat-1.0.1-i686.tar.gz 3073413 SHA256 a9ccf9a4f1d3e2c840ad153ae4594a4cabccaa53c178c3ad585590e10994d7b8 SHA512 164835cb4dd98b6e897e004fdc0c099022be8e83ced89a0dbbbec119f32eaaf9f6ed5eaec41d3c86d5722df662577d83b9623b057ac7913038b04ee344ae5a85 WHIRLPOOL 9983b74569ff303cdfcff8968a0a93dab34e1f9c3d184f89e88e066106cd94a687e07a94e3ba6ac6019d786cad50a07ec8052043a5bdd3cbc095eaae64c50c0f
|
||||
DIST filebeat-1.0.1-x86_64.tar.gz 3265179 SHA256 662bceca18eabf9c81681b790776398a78fdf36604b5d0edc8abedd28980de52 SHA512 5ec0a0371790a425fac67ddb164fc4b347eb79468f85b8a64d78491a478aacfc2d3eaad62f654847c7381d4dc3686075e428ecc2271f415aa1cc83b5c84e72b7 WHIRLPOOL 58c86a41cdd2543d8de82e0572af27adac7d44d09c7866c984616c7dcb296087eaa25f6c7de234f27ed25698bad9d18a444bfd89166c5a415457a2f473fa6263
|
||||
DIST filebeat-1.1.1-i686.tar.gz 3421542 SHA256 c425223e0fd6fe2c768cf1982a5da997ec1ef183ebcbb3419d815c26851b4ff4 SHA512 e912407b1ebf265741fbeb2ecd742850f428e103a116773bf06e8835ef12179d10767d650f79342e440efe7786f88740787ff8c75cc0df0f7295de5d8f4b1eed WHIRLPOOL 2b937f428889e79c25bc80cbd499c02d42bc5583c681df6b1e6610a58d4ef5fa24254bfe1c51303b4b6dcfd05d6ff2bce4484c4d75fde0b2add47ae17da58b1f
|
||||
DIST filebeat-1.1.1-x86_64.tar.gz 3633191 SHA256 2df9ec1b4e0e78b1edfa678d70c1b4dde3c06f2f166accdb176617377061b583 SHA512 d9da1999302c5de476b7788102af0ab7786100f90cd957f2fe3e212b871d38c017aedfea7eaa32865dc0f3e21e256b6597a3575072e9320674d49fbc2f1ab1d8 WHIRLPOOL 1bf075c967a39a270cd37ae94d222fb0ec1cf2e7faf3e0bc74b1461093ea9547e67bb8969e5a4033e793653772de659ee39e20c06926ed44ce48228b915cc47d
|
||||
|
@ -0,0 +1,49 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
|
||||
MY_PN=${PN/-bin/}
|
||||
MY_P=${MY_PN}-${PV}
|
||||
|
||||
DESCRIPTION="Lightweight log shipper for Logstash and Elasticsearch"
|
||||
HOMEPAGE="https://www.elastic.co/products/beats"
|
||||
SRC_URI="amd64? ( https://download.elastic.co/beats/${MY_PN}/${MY_P}-x86_64.tar.gz )
|
||||
x86? ( https://download.elastic.co/beats/${MY_PN}/${MY_P}-i686.tar.gz )"
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
|
||||
src_unpack() {
|
||||
if use amd64; then
|
||||
S="${WORKDIR}/${MY_P}-x86_64"
|
||||
elif use x86; then
|
||||
S="${WORKDIR}/${MY_P}-i686"
|
||||
fi
|
||||
|
||||
default
|
||||
}
|
||||
|
||||
src_install() {
|
||||
keepdir /etc/${MY_PN}
|
||||
keepdir /var/lib/${MY_PN}
|
||||
|
||||
fperms 0750 /var/lib/${MY_PN}
|
||||
|
||||
newconfd "${FILESDIR}/${MY_PN}.confd" ${MY_PN}
|
||||
newinitd "${FILESDIR}/${MY_PN}.initd" ${MY_PN}
|
||||
|
||||
insinto /etc/${MY_PN}
|
||||
newins ${MY_PN}.yml ${MY_PN}.yml.example
|
||||
|
||||
dobin ${MY_PN}
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
if [[ ! -e /etc/${MY_PN}/${MY_PN}.yml ]]; then
|
||||
elog "Before starting filebeat, you need to create a configuration file at:"
|
||||
elog "/etc/${MY_PN}/${MY_PN}.yml"
|
||||
fi
|
||||
}
|
@ -1,3 +1,4 @@
|
||||
DIST logstash-2.1.2.tar.gz 74425223 SHA256 5d396acf901558c49b231a954741b805a57a67a45ce6b22056fa296690b2cdab SHA512 aafec2ea88849f8a844ba4276a4193a374e4f549756117535f625e4b5b384304d411382066bc39f76ebab440a7ae417d31f6d5b43c1c16c9772cac6f02f4a0db WHIRLPOOL d96b89979debc71a10b90f5ee7efedcd2e4e858750886f3fde0991ac22a5f09b869ea2c3a68bbfc1f2bd630ac748c38ade44e4d5950b923619d6e1519a683b96
|
||||
DIST logstash-2.2.0.tar.gz 74440588 SHA256 aee2437f45c726ec354f0bf9634b3638428d48bef32beb412f827eb2cc736f78 SHA512 8a167971731bf0d0a7eddb023c57c66fa8ebeb0842756711795117bdb988018040ea50848c1f6e06ba748d76b723a39f758e275778270cf92acebb3284263ce0 WHIRLPOOL b07eba50168bd9ee9e7b55e8b9fd181353188db4b4c8e4dedc289cd8c8d4fae4c10650a8d968c06cd90e132f90adbc0805c077f1d891ef968e5ae02bf240dc27
|
||||
DIST logstash-2.2.1.tar.gz 74453503 SHA256 a7c55428aabdf2a2143f5907f3e5bb4bfba897f17359142e4dae70d7b446591e SHA512 9fff0f46b15a26a2679fe24fe5f2c80d90d92381b195b8c77f0b22cf61865b8834219e1ac09a10f4407b0b6cedcbe79c18ce0e529decf083b05a05ca96660f11 WHIRLPOOL e75f6fccf139eaaeb8fb09538c0ad5e56bd2945838b567a9aa1535275b1d849513835230547102010d06375727bfc3d0e900d408f196b6366947e29448ebc2e2
|
||||
DIST logstash-all-plugins-2.2.0.tar.gz 129473672 SHA256 966b5408e66af003f96084bf6f8764855c00530db8b326513d795541a62e4d41 SHA512 0725275e312f9a936d750959ccc388bac0df91ff7dd1a74d501cfdfe20006a0a5008d0877012ad80b5caece3f64bdc86b79ffb20e2f07c4a8cd5bdd2daf8d1b2 WHIRLPOOL 3cfaf4693a0b7ef0343a973de344b063ad0d1928bf9316cc893ed88de9a7ef209a206d0cb881582c2213de9409874a959c44d874af82a5bad6468943fe4297c8
|
||||
|
@ -0,0 +1,52 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
|
||||
MY_PN="${PN/-bin}"
|
||||
MY_P="${MY_PN}-${PV}"
|
||||
|
||||
DESCRIPTION="Tool for managing events and logs"
|
||||
HOMEPAGE="https://www.elastic.co/products/logstash"
|
||||
SRC_URI="https://download.elastic.co/${MY_PN}/${MY_PN}/${MY_P}.tar.gz"
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64"
|
||||
|
||||
RESTRICT="strip"
|
||||
QA_PREBUILT="opt/logstash/vendor/jruby/lib/jni/*/libjffi*.so"
|
||||
|
||||
DEPEND=""
|
||||
RDEPEND="|| ( virtual/jre:1.8 virtual/jre:1.7 )"
|
||||
|
||||
S="${WORKDIR}/${MY_P}"
|
||||
|
||||
src_install() {
|
||||
keepdir /etc/"${MY_PN}"/{conf.d,patterns,plugins}
|
||||
keepdir "/var/log/${MY_PN}"
|
||||
|
||||
insinto "/etc/${MY_PN}/conf.d"
|
||||
newins "${FILESDIR}/agent.conf.sample" agent.conf.sample
|
||||
|
||||
insinto "/opt/${MY_PN}"
|
||||
doins -r .
|
||||
fperms 0755 "/opt/${MY_PN}/bin/${MY_PN}" "/opt/${MY_PN}/vendor/jruby/bin/jruby"
|
||||
|
||||
insinto /etc/logrotate.d
|
||||
newins "${FILESDIR}/${MY_PN}.logrotate" ${MY_PN}
|
||||
|
||||
newconfd "${FILESDIR}/${MY_PN}.confd" ${MY_PN}
|
||||
newinitd "${FILESDIR}/${MY_PN}.initd" ${MY_PN}
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
einfo "Getting started with logstash:"
|
||||
einfo " https://www.elastic.co/guide/en/logstash/current/getting-started-with-logstash.html"
|
||||
einfo ""
|
||||
einfo "Packages that might be interesting:"
|
||||
einfo " app-misc/elasticsearch"
|
||||
einfo " dev-python/elasticsearch-curator"
|
||||
einfo " www-apps/kibana-bin"
|
||||
}
|
@ -1,16 +0,0 @@
|
||||
diff -urNad rdiff-backup-1.2.8~/rdiff_backup/SetConnections.py rdiff-backup-1.2.8/rdiff_backup/SetConnections.py
|
||||
--- rdiff-backup-1.2.8~/rdiff_backup/SetConnections.py 2009-03-16 15:36:21.000000000 +0100
|
||||
+++ rdiff-backup-1.2.8/rdiff_backup/SetConnections.py 2009-10-03 19:27:54.935647306 +0200
|
||||
@@ -135,10 +135,10 @@
|
||||
if not remote_cmd: return Globals.local_connection
|
||||
|
||||
Log("Executing " + remote_cmd, 4)
|
||||
- if os.name == "nt":
|
||||
+ if map(int, sys.version.split()[0].split('.')[:2]) >= [2, 6]:
|
||||
import subprocess
|
||||
try:
|
||||
- process = subprocess.Popen(remote_cmd, shell=False, bufsize=0,
|
||||
+ process = subprocess.Popen(remote_cmd, shell=True, bufsize=0,
|
||||
stdin=subprocess.PIPE,
|
||||
stdout=subprocess.PIPE)
|
||||
(stdin, stdout) = (process.stdin, process.stdout)
|
@ -0,0 +1,16 @@
|
||||
--- rdiff-backup-1.2.8/_librsyncmodule.c 2009-03-16 15:36:21.000000000 +0100
|
||||
+++ rdiff-backup-1.2.8/_librsyncmodule.c.librsync-1.0.0 2015-03-02 00:54:24.000000000 +0100
|
||||
@@ -59,8 +59,13 @@
|
||||
if (sm == NULL) return NULL;
|
||||
sm->x_attr = NULL;
|
||||
|
||||
+#ifdef RS_DEFAULT_STRONG_LEN
|
||||
sm->sig_job = rs_sig_begin((size_t)blocklen,
|
||||
(size_t)RS_DEFAULT_STRONG_LEN);
|
||||
+#else
|
||||
+ sm->sig_job = rs_sig_begin((size_t)blocklen,
|
||||
+ (size_t)8, RS_MD4_SIG_MAGIC);
|
||||
+#endif
|
||||
return (PyObject*)sm;
|
||||
}
|
||||
|
@ -0,0 +1,35 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
PYTHON_COMPAT=( python2_7 )
|
||||
|
||||
inherit distutils-r1 versionator
|
||||
|
||||
UPSTREAM_PV=$(replace_all_version_separators '-')
|
||||
|
||||
DESCRIPTION="Local/remote mirroring+incremental backup"
|
||||
HOMEPAGE="https://github.com/sol1/rdiff-backup"
|
||||
SRC_URI="https://github.com/sol1/${PN}/archive/r${UPSTREAM_PV}.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
|
||||
IUSE="examples"
|
||||
|
||||
DEPEND="
|
||||
net-libs/librsync:0/2
|
||||
"
|
||||
RDEPEND="
|
||||
dev-python/pyxattr[${PYTHON_USEDEP}]
|
||||
dev-python/pylibacl[${PYTHON_USEDEP}]
|
||||
"
|
||||
|
||||
PATCHES=( "${FILESDIR}/${P}-librsync-1.0.0.patch" )
|
||||
|
||||
python_install_all() {
|
||||
use examples && local EXAMPLES=( examples.html )
|
||||
|
||||
distutils-r1_python_install_all
|
||||
}
|
@ -1,2 +1 @@
|
||||
DIST qemu-2.4.1.tar.bz2 25087522 SHA256 e3d5cf4c8b1f9129c9c797329a515bfb6b3b1ded0ab8b394c8a316490fe3a177 SHA512 fde32b71a50d888c1055e61f4e6dfc45bb97e8e9ebee490c545965fbdcbd5ffd859fbf20648abed1f4fa9fcc5635e9b22e1829bbe802fc8aaf989d6013235917 WHIRLPOOL a698cfa5d2d138eeddb3c6bea57e3b89ca5d47165c04ed1cfd66a81647ac59cbdd594c919abef67bf198278da1160c5b9f3a0da84cd73827f3eb19a6e6f05436
|
||||
DIST qemu-2.5.0.tar.bz2 25464996 SHA256 3443887401619fe33bfa5d900a4f2d6a79425ae2b7e43d5b8c36eb7a683772d4 SHA512 12153f94cc7f834fd6a85f25690c36f2331d88d414426fb8b9ac20a34e6f9222b1eda30b727674af583580fae90dfd6d0614a905dce1567d94cd049d426b9dd3 WHIRLPOOL 8f5717989d8d234ecf1763ee386b2e1f20c3b17918de130c6dae255e4523a230b2b01a759eba25e4b9f604c680d9b868c56f58bd71b7c6c2c22a2e46804435ef
|
||||
|
@ -1,11 +0,0 @@
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -3131,8 +3131,6 @@ fi
|
||||
if test "$gcov" = "yes" ; then
|
||||
CFLAGS="-fprofile-arcs -ftest-coverage -g $CFLAGS"
|
||||
LDFLAGS="-fprofile-arcs -ftest-coverage $LDFLAGS"
|
||||
-elif test "$debug" = "no" ; then
|
||||
- CFLAGS="-O2 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 $CFLAGS"
|
||||
fi
|
||||
|
||||
|
@ -1,78 +0,0 @@
|
||||
From d54a299b83a07642c85a22bfe19b69ca4def9ec4 Mon Sep 17 00:00:00 2001
|
||||
From: Leon Alrae <leon.alrae@imgtec.com>
|
||||
Date: Wed, 9 Sep 2015 12:44:25 +0100
|
||||
Subject: [PATCH] target-mips: correct MTC0 instruction on MIPS64
|
||||
|
||||
MTC0 on a 64-bit processor should move entire 64-bit GPR content to CP0
|
||||
register.
|
||||
|
||||
Signed-off-by: Leon Alrae <leon.alrae@imgtec.com>
|
||||
Reviewed-by: Aurelien Jarno <aurelien@aurel32.net>
|
||||
---
|
||||
target-mips/translate.c | 18 +++++++-----------
|
||||
1 files changed, 7 insertions(+), 11 deletions(-)
|
||||
|
||||
diff --git a/target-mips/translate.c b/target-mips/translate.c
|
||||
index 0883782..a59b670 100644
|
||||
--- a/target-mips/translate.c
|
||||
+++ b/target-mips/translate.c
|
||||
@@ -4765,12 +4765,6 @@ static inline void gen_mtc0_store32 (TCGv arg, target_ulong off)
|
||||
tcg_temp_free_i32(t0);
|
||||
}
|
||||
|
||||
-static inline void gen_mtc0_store64 (TCGv arg, target_ulong off)
|
||||
-{
|
||||
- tcg_gen_ext32s_tl(arg, arg);
|
||||
- tcg_gen_st_tl(arg, cpu_env, off);
|
||||
-}
|
||||
-
|
||||
static void gen_mfhc0(DisasContext *ctx, TCGv arg, int reg, int sel)
|
||||
{
|
||||
const char *rn = "invalid";
|
||||
@@ -5629,12 +5623,14 @@ static void gen_mtc0(DisasContext *ctx, TCGv arg, int reg, int sel)
|
||||
break;
|
||||
case 5:
|
||||
CP0_CHECK(ctx->insn_flags & ASE_MT);
|
||||
- gen_mtc0_store64(arg, offsetof(CPUMIPSState, CP0_VPESchedule));
|
||||
+ tcg_gen_st_tl(arg, cpu_env,
|
||||
+ offsetof(CPUMIPSState, CP0_VPESchedule));
|
||||
rn = "VPESchedule";
|
||||
break;
|
||||
case 6:
|
||||
CP0_CHECK(ctx->insn_flags & ASE_MT);
|
||||
- gen_mtc0_store64(arg, offsetof(CPUMIPSState, CP0_VPEScheFBack));
|
||||
+ tcg_gen_st_tl(arg, cpu_env,
|
||||
+ offsetof(CPUMIPSState, CP0_VPEScheFBack));
|
||||
rn = "VPEScheFBack";
|
||||
break;
|
||||
case 7:
|
||||
@@ -5884,7 +5880,7 @@ static void gen_mtc0(DisasContext *ctx, TCGv arg, int reg, int sel)
|
||||
case 14:
|
||||
switch (sel) {
|
||||
case 0:
|
||||
- gen_mtc0_store64(arg, offsetof(CPUMIPSState, CP0_EPC));
|
||||
+ tcg_gen_st_tl(arg, cpu_env, offsetof(CPUMIPSState, CP0_EPC));
|
||||
rn = "EPC";
|
||||
break;
|
||||
default:
|
||||
@@ -6057,7 +6053,7 @@ static void gen_mtc0(DisasContext *ctx, TCGv arg, int reg, int sel)
|
||||
switch (sel) {
|
||||
case 0:
|
||||
/* EJTAG support */
|
||||
- gen_mtc0_store64(arg, offsetof(CPUMIPSState, CP0_DEPC));
|
||||
+ tcg_gen_st_tl(arg, cpu_env, offsetof(CPUMIPSState, CP0_DEPC));
|
||||
rn = "DEPC";
|
||||
break;
|
||||
default:
|
||||
@@ -6160,7 +6156,7 @@ static void gen_mtc0(DisasContext *ctx, TCGv arg, int reg, int sel)
|
||||
case 30:
|
||||
switch (sel) {
|
||||
case 0:
|
||||
- gen_mtc0_store64(arg, offsetof(CPUMIPSState, CP0_ErrorEPC));
|
||||
+ tcg_gen_st_tl(arg, cpu_env, offsetof(CPUMIPSState, CP0_ErrorEPC));
|
||||
rn = "ErrorEPC";
|
||||
break;
|
||||
default:
|
||||
--
|
||||
1.7.0.4
|
||||
|
@ -1,44 +0,0 @@
|
||||
From cdfcad788394ff53e317043e07b8e34f4987c659 Mon Sep 17 00:00:00 2001
|
||||
From: Alex Smith <alex.smith@imgtec.com>
|
||||
Date: Tue, 8 Sep 2015 11:34:11 +0100
|
||||
Subject: [PATCH 1/1] target-mips: Fix RDHWR on CP0.Count
|
||||
|
||||
For RDHWR on the CP0.Count register, env->CP0_Count was being returned.
|
||||
This value is a delta against the QEMU_CLOCK_VIRTUAL clock, not the
|
||||
correct current value of CP0.Count. Use cpu_mips_get_count() instead.
|
||||
|
||||
Signed-off-by: Alex Smith <alex.smith@imgtec.com>
|
||||
Cc: Aurelien Jarno <aurelien@aurel32.net>
|
||||
Cc: Leon Alrae <leon.alrae@imgtec.com>
|
||||
Reviewed-by: Leon Alrae <leon.alrae@imgtec.com>
|
||||
Reviewed-by: Aurelien Jarno <aurelien@aurel32.net>
|
||||
Signed-off-by: Leon Alrae <leon.alrae@imgtec.com>
|
||||
---
|
||||
target-mips/op_helper.c | 9 +++++++--
|
||||
1 files changed, 7 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/target-mips/op_helper.c b/target-mips/op_helper.c
|
||||
index 1aa9e3c..94de108 100644
|
||||
--- a/target-mips/op_helper.c
|
||||
+++ b/target-mips/op_helper.c
|
||||
@@ -2184,10 +2184,15 @@ target_ulong helper_rdhwr_synci_step(CPUMIPSState *env)
|
||||
target_ulong helper_rdhwr_cc(CPUMIPSState *env)
|
||||
{
|
||||
if ((env->hflags & MIPS_HFLAG_CP0) ||
|
||||
- (env->CP0_HWREna & (1 << 2)))
|
||||
+ (env->CP0_HWREna & (1 << 2))) {
|
||||
+#ifdef CONFIG_USER_ONLY
|
||||
return env->CP0_Count;
|
||||
- else
|
||||
+#else
|
||||
+ return (int32_t)cpu_mips_get_count(env);
|
||||
+#endif
|
||||
+ } else {
|
||||
helper_raise_exception(env, EXCP_RI);
|
||||
+ }
|
||||
|
||||
return 0;
|
||||
}
|
||||
--
|
||||
1.7.0.4
|
||||
|
@ -1,89 +0,0 @@
|
||||
Pending upstream inclusion
|
||||
|
||||
Link: https://lists.gnu.org/archive/html/qemu-devel/2015-09/msg03573.html
|
||||
Patchwork: https://patchwork.ozlabs.org/patch/517392/
|
||||
X-Gentoo-Bug: 563162
|
||||
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=563162
|
||||
|
||||
Signed-off-by: Markos Chandras <hwoarang@gentoo.org>
|
||||
|
||||
diff --git a/target-mips/cpu.c b/target-mips/cpu.c
|
||||
index 4027d0f..144eea9 100644
|
||||
--- a/target-mips/cpu.c
|
||||
+++ b/target-mips/cpu.c
|
||||
@@ -58,7 +58,9 @@ static bool mips_cpu_has_work(CPUState *cs)
|
||||
check for interrupts that can be taken. */
|
||||
if ((cs->interrupt_request & CPU_INTERRUPT_HARD) &&
|
||||
cpu_mips_hw_interrupts_pending(env)) {
|
||||
- has_work = true;
|
||||
+ if (cpu_mips_hw_interrupts_enabled(env)) {
|
||||
+ has_work = true;
|
||||
+ }
|
||||
}
|
||||
|
||||
/* MIPS-MT has the ability to halt the CPU. */
|
||||
diff --git a/target-mips/cpu.h b/target-mips/cpu.h
|
||||
index c91883d..210370e 100644
|
||||
--- a/target-mips/cpu.h
|
||||
+++ b/target-mips/cpu.h
|
||||
@@ -639,23 +639,24 @@ static inline int cpu_mmu_index (CPUMIPSState *env)
|
||||
return env->hflags & MIPS_HFLAG_KSU;
|
||||
}
|
||||
|
||||
-static inline int cpu_mips_hw_interrupts_pending(CPUMIPSState *env)
|
||||
+static inline bool cpu_mips_hw_interrupts_enabled(CPUMIPSState *env)
|
||||
{
|
||||
- int32_t pending;
|
||||
- int32_t status;
|
||||
- int r;
|
||||
-
|
||||
- if (!(env->CP0_Status & (1 << CP0St_IE)) ||
|
||||
- (env->CP0_Status & (1 << CP0St_EXL)) ||
|
||||
- (env->CP0_Status & (1 << CP0St_ERL)) ||
|
||||
+ return (env->CP0_Status & (1 << CP0St_IE)) &&
|
||||
+ !(env->CP0_Status & (1 << CP0St_EXL)) &&
|
||||
+ !(env->CP0_Status & (1 << CP0St_ERL)) &&
|
||||
+ !(env->hflags & MIPS_HFLAG_DM) &&
|
||||
/* Note that the TCStatus IXMT field is initialized to zero,
|
||||
and only MT capable cores can set it to one. So we don't
|
||||
need to check for MT capabilities here. */
|
||||
- (env->active_tc.CP0_TCStatus & (1 << CP0TCSt_IXMT)) ||
|
||||
- (env->hflags & MIPS_HFLAG_DM)) {
|
||||
- /* Interrupts are disabled */
|
||||
- return 0;
|
||||
- }
|
||||
+ !(env->active_tc.CP0_TCStatus & (1 << CP0TCSt_IXMT));
|
||||
+}
|
||||
+
|
||||
+/* Check if there is pending and not masked out interrupt */
|
||||
+static inline bool cpu_mips_hw_interrupts_pending(CPUMIPSState *env)
|
||||
+{
|
||||
+ int32_t pending;
|
||||
+ int32_t status;
|
||||
+ bool r;
|
||||
|
||||
pending = env->CP0_Cause & CP0Ca_IP_mask;
|
||||
status = env->CP0_Status & CP0Ca_IP_mask;
|
||||
@@ -669,7 +670,7 @@ static inline int cpu_mips_hw_interrupts_pending(CPUMIPSState *env)
|
||||
/* A MIPS configured with compatibility or VInt (Vectored Interrupts)
|
||||
treats the pending lines as individual interrupt lines, the status
|
||||
lines are individual masks. */
|
||||
- r = pending & status;
|
||||
+ r = (pending & status) != 0;
|
||||
}
|
||||
return r;
|
||||
}
|
||||
diff --git a/target-mips/helper.c b/target-mips/helper.c
|
||||
index 01c4461..2d86323 100644
|
||||
--- a/target-mips/helper.c
|
||||
+++ b/target-mips/helper.c
|
||||
@@ -759,7 +759,8 @@ bool mips_cpu_exec_interrupt(CPUState *cs, int interrupt_request)
|
||||
MIPSCPU *cpu = MIPS_CPU(cs);
|
||||
CPUMIPSState *env = &cpu->env;
|
||||
|
||||
- if (cpu_mips_hw_interrupts_pending(env)) {
|
||||
+ if (cpu_mips_hw_interrupts_enabled(env) &&
|
||||
+ cpu_mips_hw_interrupts_pending(env)) {
|
||||
/* Raise it */
|
||||
cs->exception_index = EXCP_EXT_INTERRUPT;
|
||||
env->error_code = 0;
|
@ -1,29 +0,0 @@
|
||||
Pending upstream inclusion
|
||||
|
||||
Link: https://lists.gnu.org/archive/html/qemu-devel/2015-09/msg03572.html
|
||||
Patchwork: https://patchwork.ozlabs.org/patch/517391/
|
||||
X-Gentoo-Bug: 563162
|
||||
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=563162
|
||||
|
||||
Signed-off-by: Markos Chandras <hwoarang@gentoo.org>
|
||||
diff --git a/target-mips/cpu.c b/target-mips/cpu.c
|
||||
index 144eea9..cbeca04 100644
|
||||
--- a/target-mips/cpu.c
|
||||
+++ b/target-mips/cpu.c
|
||||
@@ -53,12 +53,13 @@ static bool mips_cpu_has_work(CPUState *cs)
|
||||
CPUMIPSState *env = &cpu->env;
|
||||
bool has_work = false;
|
||||
|
||||
- /* It is implementation dependent if non-enabled interrupts
|
||||
- wake-up the CPU, however most of the implementations only
|
||||
+ /* Prior to MIPS Release 6 it is implementation dependent if non-enabled
|
||||
+ interrupts wake-up the CPU, however most of the implementations only
|
||||
check for interrupts that can be taken. */
|
||||
if ((cs->interrupt_request & CPU_INTERRUPT_HARD) &&
|
||||
cpu_mips_hw_interrupts_pending(env)) {
|
||||
- if (cpu_mips_hw_interrupts_enabled(env)) {
|
||||
+ if (cpu_mips_hw_interrupts_enabled(env) ||
|
||||
+ (env->insn_flags & ISA_MIPS32R6)) {
|
||||
has_work = true;
|
||||
}
|
||||
}
|
@ -1,49 +0,0 @@
|
||||
From 837f21aacf5a714c23ddaadbbc5212f9b661e3f7 Mon Sep 17 00:00:00 2001
|
||||
From: Prasad J Pandit <pjp@fedoraproject.org>
|
||||
Date: Fri, 20 Nov 2015 11:50:31 +0530
|
||||
Subject: [PATCH] net: pcnet: add check to validate receive data
|
||||
size(CVE-2015-7504)
|
||||
|
||||
In loopback mode, pcnet_receive routine appends CRC code to the
|
||||
receive buffer. If the data size given is same as the buffer size,
|
||||
the appended CRC code overwrites 4 bytes after s->buffer. Added a
|
||||
check to avoid that.
|
||||
|
||||
Reported by: Qinghao Tang <luodalongde@gmail.com>
|
||||
Cc: qemu-stable@nongnu.org
|
||||
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
|
||||
Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org>
|
||||
Signed-off-by: Jason Wang <jasowang@redhat.com>
|
||||
---
|
||||
hw/net/pcnet.c | 8 +++++---
|
||||
1 file changed, 5 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/hw/net/pcnet.c b/hw/net/pcnet.c
|
||||
index 0eb3cc4..309c40b 100644
|
||||
--- a/hw/net/pcnet.c
|
||||
+++ b/hw/net/pcnet.c
|
||||
@@ -1084,7 +1084,7 @@ ssize_t pcnet_receive(NetClientState *nc, const uint8_t *buf, size_t size_)
|
||||
uint32_t fcs = ~0;
|
||||
uint8_t *p = src;
|
||||
|
||||
- while (p != &src[size-4])
|
||||
+ while (p != &src[size])
|
||||
CRC(fcs, *p++);
|
||||
crc_err = (*(uint32_t *)p != htonl(fcs));
|
||||
}
|
||||
@@ -1233,8 +1233,10 @@ static void pcnet_transmit(PCNetState *s)
|
||||
bcnt = 4096 - GET_FIELD(tmd.length, TMDL, BCNT);
|
||||
|
||||
/* if multi-tmd packet outsizes s->buffer then skip it silently.
|
||||
- Note: this is not what real hw does */
|
||||
- if (s->xmit_pos + bcnt > sizeof(s->buffer)) {
|
||||
+ * Note: this is not what real hw does.
|
||||
+ * Last four bytes of s->buffer are used to store CRC FCS code.
|
||||
+ */
|
||||
+ if (s->xmit_pos + bcnt > sizeof(s->buffer) - 4) {
|
||||
s->xmit_pos = -1;
|
||||
goto txdone;
|
||||
}
|
||||
--
|
||||
2.6.2
|
||||
|
@ -1,37 +0,0 @@
|
||||
From 8b98a2f07175d46c3f7217639bd5e03f2ec56343 Mon Sep 17 00:00:00 2001
|
||||
From: Jason Wang <jasowang@redhat.com>
|
||||
Date: Mon, 30 Nov 2015 15:00:06 +0800
|
||||
Subject: [PATCH] pcnet: fix rx buffer overflow(CVE-2015-7512)
|
||||
|
||||
Backends could provide a packet whose length is greater than buffer
|
||||
size. Check for this and truncate the packet to avoid rx buffer
|
||||
overflow in this case.
|
||||
|
||||
Cc: Prasad J Pandit <pjp@fedoraproject.org>
|
||||
Cc: qemu-stable@nongnu.org
|
||||
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
|
||||
Signed-off-by: Jason Wang <jasowang@redhat.com>
|
||||
---
|
||||
hw/net/pcnet.c | 6 ++++++
|
||||
1 file changed, 6 insertions(+)
|
||||
|
||||
diff --git a/hw/net/pcnet.c b/hw/net/pcnet.c
|
||||
index 309c40b..1f4a3db 100644
|
||||
--- a/hw/net/pcnet.c
|
||||
+++ b/hw/net/pcnet.c
|
||||
@@ -1064,6 +1064,12 @@ ssize_t pcnet_receive(NetClientState *nc, const uint8_t *buf, size_t size_)
|
||||
int pktcount = 0;
|
||||
|
||||
if (!s->looptest) {
|
||||
+ if (size > 4092) {
|
||||
+#ifdef PCNET_DEBUG_RMD
|
||||
+ fprintf(stderr, "pcnet: truncates rx packet.\n");
|
||||
+#endif
|
||||
+ size = 4092;
|
||||
+ }
|
||||
memcpy(src, buf, size);
|
||||
/* no need to compute the CRC */
|
||||
src[size] = 0;
|
||||
--
|
||||
2.6.2
|
||||
|
@ -1,62 +0,0 @@
|
||||
https://bugs.gentoo.org/568214
|
||||
|
||||
From 43b11a91dd861a946b231b89b7542856ade23d1b Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau@redhat.com>
|
||||
Date: Fri, 26 Jun 2015 14:25:29 +0200
|
||||
Subject: [PATCH] msix: implement pba write (but read-only)
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
qpci_msix_pending() writes on pba region, causing qemu to SEGV:
|
||||
|
||||
Program received signal SIGSEGV, Segmentation fault.
|
||||
[Switching to Thread 0x7ffff7fba8c0 (LWP 25882)]
|
||||
0x0000000000000000 in ?? ()
|
||||
(gdb) bt
|
||||
#0 0x0000000000000000 in ()
|
||||
#1 0x00005555556556c5 in memory_region_oldmmio_write_accessor (mr=0x5555579f3f80, addr=0, value=0x7fffffffbf68, size=4, shift=0, mask=4294967295, attrs=...) at /home/elmarco/src/qemu/memory.c:434
|
||||
#2 0x00005555556558e1 in access_with_adjusted_size (addr=0, value=0x7fffffffbf68, size=4, access_size_min=1, access_size_max=4, access=0x55555565563e <memory_region_oldmmio_write_accessor>, mr=0x5555579f3f80, attrs=...) at /home/elmarco/src/qemu/memory.c:506
|
||||
#3 0x00005555556581eb in memory_region_dispatch_write (mr=0x5555579f3f80, addr=0, data=0, size=4, attrs=...) at /home/elmarco/src/qemu/memory.c:1176
|
||||
#4 0x000055555560b6f9 in address_space_rw (as=0x555555eff4e0 <address_space_memory>, addr=3759147008, attrs=..., buf=0x7fffffffc1b0 "", len=4, is_write=true) at /home/elmarco/src/qemu/exec.c:2439
|
||||
#5 0x000055555560baa2 in cpu_physical_memory_rw (addr=3759147008, buf=0x7fffffffc1b0 "", len=4, is_write=1) at /home/elmarco/src/qemu/exec.c:2534
|
||||
#6 0x000055555564c005 in cpu_physical_memory_write (addr=3759147008, buf=0x7fffffffc1b0, len=4) at /home/elmarco/src/qemu/include/exec/cpu-common.h:80
|
||||
#7 0x000055555564cd9c in qtest_process_command (chr=0x55555642b890, words=0x5555578de4b0) at /home/elmarco/src/qemu/qtest.c:378
|
||||
#8 0x000055555564db77 in qtest_process_inbuf (chr=0x55555642b890, inbuf=0x55555641b340) at /home/elmarco/src/qemu/qtest.c:569
|
||||
#9 0x000055555564dc07 in qtest_read (opaque=0x55555642b890, buf=0x7fffffffc2e0 "writel 0xe0100800 0x0\n", size=22) at /home/elmarco/src/qemu/qtest.c:581
|
||||
#10 0x000055555574ce3e in qemu_chr_be_write (s=0x55555642b890, buf=0x7fffffffc2e0 "writel 0xe0100800 0x0\n", len=22) at qemu-char.c:306
|
||||
#11 0x0000555555751263 in tcp_chr_read (chan=0x55555642bcf0, cond=G_IO_IN, opaque=0x55555642b890) at qemu-char.c:2876
|
||||
#12 0x00007ffff64c9a8a in g_main_context_dispatch (context=0x55555641c400) at gmain.c:3122
|
||||
|
||||
(without this patch, this can be reproduced with the ivshmem qtest)
|
||||
|
||||
Implement an empty mmio write to avoid the crash.
|
||||
|
||||
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
|
||||
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
|
||||
---
|
||||
hw/pci/msix.c | 6 ++++++
|
||||
1 file changed, 6 insertions(+)
|
||||
|
||||
diff --git a/hw/pci/msix.c b/hw/pci/msix.c
|
||||
index 2fdada4..64c93d8 100644
|
||||
--- a/hw/pci/msix.c
|
||||
+++ b/hw/pci/msix.c
|
||||
@@ -200,8 +200,14 @@ static uint64_t msix_pba_mmio_read(void *opaque, hwaddr addr,
|
||||
return pci_get_long(dev->msix_pba + addr);
|
||||
}
|
||||
|
||||
+static void msix_pba_mmio_write(void *opaque, hwaddr addr,
|
||||
+ uint64_t val, unsigned size)
|
||||
+{
|
||||
+}
|
||||
+
|
||||
static const MemoryRegionOps msix_pba_mmio_ops = {
|
||||
.read = msix_pba_mmio_read,
|
||||
+ .write = msix_pba_mmio_write,
|
||||
.endianness = DEVICE_LITTLE_ENDIAN,
|
||||
.valid = {
|
||||
.min_access_size = 4,
|
||||
--
|
||||
2.6.2
|
||||
|
@ -1,65 +0,0 @@
|
||||
https://bugs.gentoo.org/566792
|
||||
|
||||
From 00837731d254908a841d69298a4f9f077babaf24 Mon Sep 17 00:00:00 2001
|
||||
From: Stefan Weil <sw@weilnetz.de>
|
||||
Date: Fri, 20 Nov 2015 08:42:33 +0100
|
||||
Subject: [PATCH] eepro100: Prevent two endless loops
|
||||
|
||||
http://lists.nongnu.org/archive/html/qemu-devel/2015-11/msg04592.html
|
||||
shows an example how an endless loop in function action_command can
|
||||
be achieved.
|
||||
|
||||
During my code review, I noticed a 2nd case which can result in an
|
||||
endless loop.
|
||||
|
||||
Reported-by: Qinghao Tang <luodalongde@gmail.com>
|
||||
Signed-off-by: Stefan Weil <sw@weilnetz.de>
|
||||
Signed-off-by: Jason Wang <jasowang@redhat.com>
|
||||
---
|
||||
hw/net/eepro100.c | 16 ++++++++++++++++
|
||||
1 file changed, 16 insertions(+)
|
||||
|
||||
diff --git a/hw/net/eepro100.c b/hw/net/eepro100.c
|
||||
index 60333b7..685a478 100644
|
||||
--- a/hw/net/eepro100.c
|
||||
+++ b/hw/net/eepro100.c
|
||||
@@ -774,6 +774,11 @@ static void tx_command(EEPRO100State *s)
|
||||
#if 0
|
||||
uint16_t tx_buffer_el = lduw_le_pci_dma(&s->dev, tbd_address + 6);
|
||||
#endif
|
||||
+ if (tx_buffer_size == 0) {
|
||||
+ /* Prevent an endless loop. */
|
||||
+ logout("loop in %s:%u\n", __FILE__, __LINE__);
|
||||
+ break;
|
||||
+ }
|
||||
tbd_address += 8;
|
||||
TRACE(RXTX, logout
|
||||
("TBD (simplified mode): buffer address 0x%08x, size 0x%04x\n",
|
||||
@@ -855,6 +860,10 @@ static void set_multicast_list(EEPRO100State *s)
|
||||
|
||||
static void action_command(EEPRO100State *s)
|
||||
{
|
||||
+ /* The loop below won't stop if it gets special handcrafted data.
|
||||
+ Therefore we limit the number of iterations. */
|
||||
+ unsigned max_loop_count = 16;
|
||||
+
|
||||
for (;;) {
|
||||
bool bit_el;
|
||||
bool bit_s;
|
||||
@@ -870,6 +879,13 @@ static void action_command(EEPRO100State *s)
|
||||
#if 0
|
||||
bool bit_sf = ((s->tx.command & COMMAND_SF) != 0);
|
||||
#endif
|
||||
+
|
||||
+ if (max_loop_count-- == 0) {
|
||||
+ /* Prevent an endless loop. */
|
||||
+ logout("loop in %s:%u\n", __FILE__, __LINE__);
|
||||
+ break;
|
||||
+ }
|
||||
+
|
||||
s->cu_offset = s->tx.link;
|
||||
TRACE(OTHER,
|
||||
logout("val=(cu start), status=0x%04x, command=0x%04x, link=0x%08x\n",
|
||||
--
|
||||
2.6.2
|
||||
|
@ -1,46 +0,0 @@
|
||||
https://bugs.gentoo.org/567828
|
||||
|
||||
From 4c65fed8bdf96780735dbdb92a8bd0d6b6526cc3 Mon Sep 17 00:00:00 2001
|
||||
From: Prasad J Pandit <pjp@fedoraproject.org>
|
||||
Date: Thu, 3 Dec 2015 18:54:17 +0530
|
||||
Subject: [PATCH] ui: vnc: avoid floating point exception
|
||||
|
||||
While sending 'SetPixelFormat' messages to a VNC server,
|
||||
the client could set the 'red-max', 'green-max' and 'blue-max'
|
||||
values to be zero. This leads to a floating point exception in
|
||||
write_png_palette while doing frame buffer updates.
|
||||
|
||||
Reported-by: Lian Yihan <lianyihan@360.cn>
|
||||
Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org>
|
||||
Reviewed-by: Gerd Hoffmann <kraxel@redhat.com>
|
||||
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
|
||||
---
|
||||
ui/vnc.c | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/ui/vnc.c b/ui/vnc.c
|
||||
index 7538405..cbe4d33 100644
|
||||
--- a/ui/vnc.c
|
||||
+++ b/ui/vnc.c
|
||||
@@ -2198,15 +2198,15 @@ static void set_pixel_format(VncState *vs,
|
||||
return;
|
||||
}
|
||||
|
||||
- vs->client_pf.rmax = red_max;
|
||||
+ vs->client_pf.rmax = red_max ? red_max : 0xFF;
|
||||
vs->client_pf.rbits = hweight_long(red_max);
|
||||
vs->client_pf.rshift = red_shift;
|
||||
vs->client_pf.rmask = red_max << red_shift;
|
||||
- vs->client_pf.gmax = green_max;
|
||||
+ vs->client_pf.gmax = green_max ? green_max : 0xFF;
|
||||
vs->client_pf.gbits = hweight_long(green_max);
|
||||
vs->client_pf.gshift = green_shift;
|
||||
vs->client_pf.gmask = green_max << green_shift;
|
||||
- vs->client_pf.bmax = blue_max;
|
||||
+ vs->client_pf.bmax = blue_max ? blue_max : 0xFF;
|
||||
vs->client_pf.bbits = hweight_long(blue_max);
|
||||
vs->client_pf.bshift = blue_shift;
|
||||
vs->client_pf.bmask = blue_max << blue_shift;
|
||||
--
|
||||
2.6.2
|
||||
|
@ -1,642 +0,0 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
|
||||
PYTHON_COMPAT=( python2_7 )
|
||||
PYTHON_REQ_USE="ncurses,readline"
|
||||
|
||||
inherit eutils flag-o-matic linux-info toolchain-funcs multilib python-r1 \
|
||||
user udev fcaps readme.gentoo pax-utils
|
||||
|
||||
BACKPORTS=
|
||||
|
||||
if [[ ${PV} = *9999* ]]; then
|
||||
EGIT_REPO_URI="git://git.qemu.org/qemu.git"
|
||||
inherit git-2
|
||||
SRC_URI=""
|
||||
else
|
||||
SRC_URI="http://wiki.qemu-project.org/download/${P}.tar.bz2
|
||||
${BACKPORTS:+
|
||||
https://dev.gentoo.org/~cardoe/distfiles/${P}-${BACKPORTS}.tar.xz}"
|
||||
KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd"
|
||||
fi
|
||||
|
||||
DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
|
||||
HOMEPAGE="http://www.qemu.org http://www.linux-kvm.org"
|
||||
|
||||
LICENSE="GPL-2 LGPL-2 BSD-2"
|
||||
SLOT="0"
|
||||
IUSE="accessibility +aio alsa bluetooth +caps +curl debug +fdt glusterfs \
|
||||
gtk gtk2 infiniband iscsi +jpeg \
|
||||
kernel_linux kernel_FreeBSD lzo ncurses nfs nls numa opengl +pin-upstream-blobs
|
||||
+png pulseaudio python \
|
||||
rbd sasl +seccomp sdl sdl2 selinux smartcard snappy spice ssh static static-softmmu
|
||||
static-user systemtap tci test +threads tls usb usbredir +uuid vde +vhost-net \
|
||||
virtfs +vnc vte xattr xen xfs"
|
||||
|
||||
COMMON_TARGETS="aarch64 alpha arm cris i386 m68k microblaze microblazeel mips
|
||||
mips64 mips64el mipsel or32 ppc ppc64 s390x sh4 sh4eb sparc sparc64 unicore32
|
||||
x86_64"
|
||||
IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} lm32 moxie ppcemb tricore xtensa xtensaeb"
|
||||
IUSE_USER_TARGETS="${COMMON_TARGETS} armeb mipsn32 mipsn32el ppc64abi32 ppc64le sparc32plus"
|
||||
|
||||
use_softmmu_targets=$(printf ' qemu_softmmu_targets_%s' ${IUSE_SOFTMMU_TARGETS})
|
||||
use_user_targets=$(printf ' qemu_user_targets_%s' ${IUSE_USER_TARGETS})
|
||||
IUSE+=" ${use_softmmu_targets} ${use_user_targets}"
|
||||
|
||||
# Allow no targets to be built so that people can get a tools-only build.
|
||||
# Block USE flag configurations known to not work.
|
||||
REQUIRED_USE="${PYTHON_REQUIRED_USE}
|
||||
gtk2? ( gtk )
|
||||
qemu_softmmu_targets_arm? ( fdt )
|
||||
qemu_softmmu_targets_microblaze? ( fdt )
|
||||
qemu_softmmu_targets_ppc? ( fdt )
|
||||
qemu_softmmu_targets_ppc64? ( fdt )
|
||||
sdl2? ( sdl )
|
||||
static? ( static-softmmu static-user )
|
||||
static-softmmu? ( !alsa !pulseaudio !bluetooth !opengl !gtk !gtk2 )
|
||||
virtfs? ( xattr )
|
||||
vte? ( gtk )"
|
||||
|
||||
# Yep, you need both libcap and libcap-ng since virtfs only uses libcap.
|
||||
#
|
||||
# The attr lib isn't always linked in (although the USE flag is always
|
||||
# respected). This is because qemu supports using the C library's API
|
||||
# when available rather than always using the extranl library.
|
||||
COMMON_LIB_DEPEND=">=dev-libs/glib-2.0[static-libs(+)]
|
||||
sys-libs/zlib[static-libs(+)]
|
||||
xattr? ( sys-apps/attr[static-libs(+)] )"
|
||||
SOFTMMU_LIB_DEPEND="${COMMON_LIB_DEPEND}
|
||||
>=x11-libs/pixman-0.28.0[static-libs(+)]
|
||||
accessibility? ( app-accessibility/brltty[static-libs(+)] )
|
||||
aio? ( dev-libs/libaio[static-libs(+)] )
|
||||
alsa? ( >=media-libs/alsa-lib-1.0.13 )
|
||||
bluetooth? ( net-wireless/bluez )
|
||||
caps? ( sys-libs/libcap-ng[static-libs(+)] )
|
||||
curl? ( >=net-misc/curl-7.15.4[static-libs(+)] )
|
||||
fdt? ( >=sys-apps/dtc-1.4.0[static-libs(+)] )
|
||||
glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] )
|
||||
gtk? (
|
||||
gtk2? (
|
||||
x11-libs/gtk+:2
|
||||
vte? ( x11-libs/vte:0 )
|
||||
)
|
||||
!gtk2? (
|
||||
x11-libs/gtk+:3
|
||||
vte? ( x11-libs/vte:2.90 )
|
||||
)
|
||||
)
|
||||
infiniband? ( sys-infiniband/librdmacm:=[static-libs(+)] )
|
||||
iscsi? ( net-libs/libiscsi )
|
||||
jpeg? ( virtual/jpeg:=[static-libs(+)] )
|
||||
lzo? ( dev-libs/lzo:2[static-libs(+)] )
|
||||
ncurses? ( sys-libs/ncurses:0=[static-libs(+)] )
|
||||
nfs? ( >=net-fs/libnfs-1.9.3[static-libs(+)] )
|
||||
numa? ( sys-process/numactl[static-libs(+)] )
|
||||
opengl? (
|
||||
virtual/opengl
|
||||
media-libs/libepoxy[static-libs(+)]
|
||||
media-libs/mesa[static-libs(+)]
|
||||
media-libs/mesa[egl,gles2]
|
||||
)
|
||||
png? ( media-libs/libpng:0=[static-libs(+)] )
|
||||
pulseaudio? ( media-sound/pulseaudio )
|
||||
rbd? ( sys-cluster/ceph[static-libs(+)] )
|
||||
sasl? ( dev-libs/cyrus-sasl[static-libs(+)] )
|
||||
sdl? (
|
||||
!sdl2? (
|
||||
media-libs/libsdl[X]
|
||||
>=media-libs/libsdl-1.2.11[static-libs(+)]
|
||||
)
|
||||
sdl2? (
|
||||
media-libs/libsdl2[X]
|
||||
media-libs/libsdl2[static-libs(+)]
|
||||
)
|
||||
)
|
||||
seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] )
|
||||
smartcard? ( dev-libs/nss !app-emulation/libcacard )
|
||||
snappy? ( app-arch/snappy[static-libs(+)] )
|
||||
spice? (
|
||||
>=app-emulation/spice-protocol-0.12.3
|
||||
>=app-emulation/spice-0.12.0[static-libs(+)]
|
||||
)
|
||||
ssh? ( >=net-libs/libssh2-1.2.8[static-libs(+)] )
|
||||
tls? ( net-libs/gnutls[static-libs(+)] )
|
||||
usb? ( >=virtual/libusb-1-r2[static-libs(+)] )
|
||||
usbredir? ( >=sys-apps/usbredir-0.6[static-libs(+)] )
|
||||
uuid? ( >=sys-apps/util-linux-2.16.0[static-libs(+)] )
|
||||
vde? ( net-misc/vde[static-libs(+)] )
|
||||
virtfs? ( sys-libs/libcap )
|
||||
xfs? ( sys-fs/xfsprogs[static-libs(+)] )"
|
||||
USER_LIB_DEPEND="${COMMON_LIB_DEPEND}"
|
||||
X86_FIRMWARE_DEPEND="
|
||||
>=sys-firmware/ipxe-1.0.0_p20130624
|
||||
pin-upstream-blobs? (
|
||||
~sys-firmware/seabios-1.8.2
|
||||
~sys-firmware/sgabios-0.1_pre8
|
||||
~sys-firmware/vgabios-0.7a
|
||||
)
|
||||
!pin-upstream-blobs? (
|
||||
sys-firmware/seabios
|
||||
sys-firmware/sgabios
|
||||
sys-firmware/vgabios
|
||||
)"
|
||||
CDEPEND="
|
||||
!static-softmmu? ( $(printf "%s? ( ${SOFTMMU_LIB_DEPEND//\[static-libs(+)]} ) " ${use_softmmu_targets}) )
|
||||
!static-user? ( $(printf "%s? ( ${USER_LIB_DEPEND//\[static-libs(+)]} ) " ${use_user_targets}) )
|
||||
qemu_softmmu_targets_i386? ( ${X86_FIRMWARE_DEPEND} )
|
||||
qemu_softmmu_targets_x86_64? ( ${X86_FIRMWARE_DEPEND} )
|
||||
python? ( ${PYTHON_DEPS} )
|
||||
systemtap? ( dev-util/systemtap )
|
||||
xen? ( app-emulation/xen-tools:= )"
|
||||
DEPEND="${CDEPEND}
|
||||
dev-lang/perl
|
||||
=dev-lang/python-2*
|
||||
sys-apps/texinfo
|
||||
virtual/pkgconfig
|
||||
kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 )
|
||||
gtk? ( nls? ( sys-devel/gettext ) )
|
||||
static-softmmu? ( $(printf "%s? ( ${SOFTMMU_LIB_DEPEND} ) " ${use_softmmu_targets}) )
|
||||
static-user? ( $(printf "%s? ( ${USER_LIB_DEPEND} ) " ${use_user_targets}) )
|
||||
test? (
|
||||
dev-libs/glib[utils]
|
||||
sys-devel/bc
|
||||
)"
|
||||
RDEPEND="${CDEPEND}
|
||||
selinux? ( sec-policy/selinux-qemu )
|
||||
"
|
||||
|
||||
STRIP_MASK="/usr/share/qemu/palcode-clipper"
|
||||
|
||||
QA_PREBUILT="
|
||||
usr/share/qemu/openbios-ppc
|
||||
usr/share/qemu/openbios-sparc64
|
||||
usr/share/qemu/openbios-sparc32
|
||||
usr/share/qemu/palcode-clipper
|
||||
usr/share/qemu/s390-ccw.img
|
||||
usr/share/qemu/u-boot.e500
|
||||
"
|
||||
|
||||
QA_WX_LOAD="usr/bin/qemu-i386
|
||||
usr/bin/qemu-x86_64
|
||||
usr/bin/qemu-alpha
|
||||
usr/bin/qemu-arm
|
||||
usr/bin/qemu-cris
|
||||
usr/bin/qemu-m68k
|
||||
usr/bin/qemu-microblaze
|
||||
usr/bin/qemu-microblazeel
|
||||
usr/bin/qemu-mips
|
||||
usr/bin/qemu-mipsel
|
||||
usr/bin/qemu-or32
|
||||
usr/bin/qemu-ppc
|
||||
usr/bin/qemu-ppc64
|
||||
usr/bin/qemu-ppc64abi32
|
||||
usr/bin/qemu-sh4
|
||||
usr/bin/qemu-sh4eb
|
||||
usr/bin/qemu-sparc
|
||||
usr/bin/qemu-sparc64
|
||||
usr/bin/qemu-armeb
|
||||
usr/bin/qemu-sparc32plus
|
||||
usr/bin/qemu-s390x
|
||||
usr/bin/qemu-unicore32"
|
||||
|
||||
DOC_CONTENTS="If you don't have kvm compiled into the kernel, make sure
|
||||
you have the kernel module loaded before running kvm. The easiest way to
|
||||
ensure that the kernel module is loaded is to load it on boot.\n
|
||||
For AMD CPUs the module is called 'kvm-amd'\n
|
||||
For Intel CPUs the module is called 'kvm-intel'\n
|
||||
Please review /etc/conf.d/modules for how to load these\n\n
|
||||
Make sure your user is in the 'kvm' group\n
|
||||
Just run 'gpasswd -a <USER> kvm', then have <USER> re-login."
|
||||
|
||||
qemu_support_kvm() {
|
||||
if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386 \
|
||||
use qemu_softmmu_targets_ppc || use qemu_softmmu_targets_ppc64 \
|
||||
use qemu_softmmu_targets_s390x; then
|
||||
return 0
|
||||
fi
|
||||
|
||||
return 1
|
||||
}
|
||||
|
||||
pkg_pretend() {
|
||||
if use kernel_linux && kernel_is lt 2 6 25; then
|
||||
eerror "This version of KVM requres a host kernel of 2.6.25 or higher."
|
||||
elif use kernel_linux; then
|
||||
if ! linux_config_exists; then
|
||||
eerror "Unable to check your kernel for KVM support"
|
||||
else
|
||||
CONFIG_CHECK="~KVM ~TUN ~BRIDGE"
|
||||
ERROR_KVM="You must enable KVM in your kernel to continue"
|
||||
ERROR_KVM_AMD="If you have an AMD CPU, you must enable KVM_AMD in"
|
||||
ERROR_KVM_AMD+=" your kernel configuration."
|
||||
ERROR_KVM_INTEL="If you have an Intel CPU, you must enable"
|
||||
ERROR_KVM_INTEL+=" KVM_INTEL in your kernel configuration."
|
||||
ERROR_TUN="You will need the Universal TUN/TAP driver compiled"
|
||||
ERROR_TUN+=" into your kernel or loaded as a module to use the"
|
||||
ERROR_TUN+=" virtual network device if using -net tap."
|
||||
ERROR_BRIDGE="You will also need support for 802.1d"
|
||||
ERROR_BRIDGE+=" Ethernet Bridging for some network configurations."
|
||||
use vhost-net && CONFIG_CHECK+=" ~VHOST_NET"
|
||||
ERROR_VHOST_NET="You must enable VHOST_NET to have vhost-net"
|
||||
ERROR_VHOST_NET+=" support"
|
||||
|
||||
if use amd64 || use x86 || use amd64-linux || use x86-linux; then
|
||||
CONFIG_CHECK+=" ~KVM_AMD ~KVM_INTEL"
|
||||
fi
|
||||
|
||||
use python && CONFIG_CHECK+=" ~DEBUG_FS"
|
||||
ERROR_DEBUG_FS="debugFS support required for kvm_stat"
|
||||
|
||||
# Now do the actual checks setup above
|
||||
check_extra_config
|
||||
fi
|
||||
fi
|
||||
|
||||
if grep -qs '/usr/bin/qemu-kvm' "${EROOT}"/etc/libvirt/qemu/*.xml; then
|
||||
eerror "The kvm/qemu-kvm wrappers no longer exist, but your libvirt"
|
||||
eerror "instances are still pointing to it. Please update your"
|
||||
eerror "configs in /etc/libvirt/qemu/ to use the -enable-kvm flag"
|
||||
eerror "and the right system binary (e.g. qemu-system-x86_64)."
|
||||
die "update your virt configs to not use qemu-kvm"
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_setup() {
|
||||
enewgroup kvm 78
|
||||
}
|
||||
|
||||
# Sanity check to make sure target lists are kept up-to-date.
|
||||
check_targets() {
|
||||
local var=$1 mak=$2
|
||||
local detected sorted
|
||||
|
||||
pushd "${S}"/default-configs >/dev/null || die
|
||||
|
||||
# Force C locale until glibc is updated. #564936
|
||||
detected=$(echo $(printf '%s\n' *-${mak}.mak | sed "s:-${mak}.mak::" | LC_COLLATE=C sort -u))
|
||||
sorted=$(echo $(printf '%s\n' ${!var} | LC_COLLATE=C sort -u))
|
||||
if [[ ${sorted} != "${detected}" ]] ; then
|
||||
eerror "The ebuild needs to be kept in sync."
|
||||
eerror "${var}: ${sorted}"
|
||||
eerror "$(printf '%-*s' ${#var} configure): ${detected}"
|
||||
die "sync ${var} to the list of targets"
|
||||
fi
|
||||
|
||||
popd >/dev/null
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
check_targets IUSE_SOFTMMU_TARGETS softmmu
|
||||
check_targets IUSE_USER_TARGETS linux-user
|
||||
|
||||
# Alter target makefiles to accept CFLAGS set via flag-o
|
||||
sed -i -r \
|
||||
-e 's/^(C|OP_C|HELPER_C)FLAGS=/\1FLAGS+=/' \
|
||||
Makefile Makefile.target || die
|
||||
|
||||
# Cheap hack to disable gettext .mo generation.
|
||||
use nls || rm -f po/*.po
|
||||
|
||||
epatch "${FILESDIR}"/qemu-1.7.0-cflags.patch
|
||||
epatch "${FILESDIR}"/${PN}-2.4.1-CVE-2015-{7504,7512}.patch #567144
|
||||
epatch "${FILESDIR}"/${PN}-2.4.1-CVE-2015-8345.patch #566792
|
||||
epatch "${FILESDIR}"/${PN}-2.4.1-CVE-2015-8504.patch #567828
|
||||
epatch "${FILESDIR}"/${PN}-2.4.1-CVE-2015-7549.patch #568214
|
||||
epatch "${FILESDIR}"/${PN}-2.4-mips-* #563162
|
||||
[[ -n ${BACKPORTS} ]] && \
|
||||
EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
|
||||
epatch
|
||||
|
||||
# Fix ld and objcopy being called directly
|
||||
tc-export AR LD OBJCOPY
|
||||
|
||||
# Verbose builds
|
||||
MAKEOPTS+=" V=1"
|
||||
|
||||
epatch_user
|
||||
}
|
||||
|
||||
##
|
||||
# configures qemu based on the build directory and the build type
|
||||
# we are using.
|
||||
#
|
||||
qemu_src_configure() {
|
||||
debug-print-function ${FUNCNAME} "$@"
|
||||
|
||||
local buildtype=$1
|
||||
local builddir="${S}/${buildtype}-build"
|
||||
local static_flag="static-${buildtype}"
|
||||
|
||||
mkdir "${builddir}"
|
||||
|
||||
local conf_opts=(
|
||||
--prefix=/usr
|
||||
--sysconfdir=/etc
|
||||
--libdir=/usr/$(get_libdir)
|
||||
--docdir=/usr/share/doc/${PF}/html
|
||||
--disable-bsd-user
|
||||
--disable-guest-agent
|
||||
--disable-strip
|
||||
--disable-werror
|
||||
--python="${PYTHON}"
|
||||
--cc="$(tc-getCC)"
|
||||
--cxx="$(tc-getCXX)"
|
||||
--host-cc="$(tc-getBUILD_CC)"
|
||||
$(use_enable debug debug-info)
|
||||
$(use_enable debug debug-tcg)
|
||||
--enable-docs
|
||||
$(use_enable tci tcg-interpreter)
|
||||
$(use_enable xattr attr)
|
||||
)
|
||||
|
||||
# Disable options not used by user targets as the default configure
|
||||
# options will autoprobe and try to link in a bunch of unused junk.
|
||||
conf_softmmu() {
|
||||
if [[ ${buildtype} == "user" ]] ; then
|
||||
echo "--disable-${2:-$1}"
|
||||
else
|
||||
use_enable "$@"
|
||||
fi
|
||||
}
|
||||
conf_opts+=(
|
||||
$(conf_softmmu accessibility brlapi)
|
||||
$(conf_softmmu aio linux-aio)
|
||||
$(conf_softmmu bluetooth bluez)
|
||||
$(conf_softmmu caps cap-ng)
|
||||
$(conf_softmmu curl)
|
||||
$(conf_softmmu fdt)
|
||||
$(conf_softmmu glusterfs)
|
||||
$(conf_softmmu gtk)
|
||||
$(conf_softmmu infiniband rdma)
|
||||
$(conf_softmmu iscsi libiscsi)
|
||||
$(conf_softmmu jpeg vnc-jpeg)
|
||||
$(conf_softmmu kernel_linux kvm)
|
||||
$(conf_softmmu lzo)
|
||||
$(conf_softmmu ncurses curses)
|
||||
$(conf_softmmu nfs libnfs)
|
||||
$(conf_softmmu numa)
|
||||
$(conf_softmmu opengl)
|
||||
$(conf_softmmu png vnc-png)
|
||||
$(conf_softmmu rbd)
|
||||
$(conf_softmmu sasl vnc-sasl)
|
||||
$(conf_softmmu sdl)
|
||||
$(conf_softmmu seccomp)
|
||||
$(conf_softmmu smartcard smartcard-nss)
|
||||
$(conf_softmmu snappy)
|
||||
$(conf_softmmu spice)
|
||||
$(conf_softmmu ssh libssh2)
|
||||
$(conf_softmmu tls vnc-tls)
|
||||
$(conf_softmmu usb libusb)
|
||||
$(conf_softmmu usbredir usb-redir)
|
||||
$(conf_softmmu uuid)
|
||||
$(conf_softmmu vde)
|
||||
$(conf_softmmu vhost-net)
|
||||
$(conf_softmmu virtfs)
|
||||
$(conf_softmmu vnc)
|
||||
$(conf_softmmu vte)
|
||||
$(conf_softmmu xen)
|
||||
$(conf_softmmu xen xen-pci-passthrough)
|
||||
$(conf_softmmu xfs xfsctl)
|
||||
)
|
||||
|
||||
case ${buildtype} in
|
||||
user)
|
||||
conf_opts+=(
|
||||
--enable-linux-user
|
||||
--disable-system
|
||||
--disable-blobs
|
||||
--disable-tools
|
||||
)
|
||||
;;
|
||||
softmmu)
|
||||
# audio options
|
||||
local audio_opts="oss"
|
||||
use alsa && audio_opts="alsa,${audio_opts}"
|
||||
use sdl && audio_opts="sdl,${audio_opts}"
|
||||
use pulseaudio && audio_opts="pa,${audio_opts}"
|
||||
|
||||
conf_opts+=(
|
||||
--disable-linux-user
|
||||
--enable-system
|
||||
--with-system-pixman
|
||||
--audio-drv-list="${audio_opts}"
|
||||
)
|
||||
use gtk && conf_opts+=( --with-gtkabi=$(usex gtk2 2.0 3.0) )
|
||||
use sdl && conf_opts+=( --with-sdlabi=$(usex sdl2 2.0 1.2) )
|
||||
;;
|
||||
tools)
|
||||
conf_opts+=(
|
||||
--disable-linux-user
|
||||
--disable-system
|
||||
--disable-blobs
|
||||
)
|
||||
static_flag="static"
|
||||
;;
|
||||
esac
|
||||
|
||||
local targets="${buildtype}_targets"
|
||||
[[ -n ${targets} ]] && conf_opts+=( --target-list="${!targets}" )
|
||||
|
||||
# Add support for SystemTAP
|
||||
use systemtap && conf_opts+=( --enable-trace-backend=dtrace )
|
||||
|
||||
# We always want to attempt to build with PIE support as it results
|
||||
# in a more secure binary. But it doesn't work with static or if
|
||||
# the current GCC doesn't have PIE support.
|
||||
if use ${static_flag}; then
|
||||
conf_opts+=( --static --disable-pie )
|
||||
else
|
||||
gcc-specs-pie && conf_opts+=( --enable-pie )
|
||||
fi
|
||||
|
||||
echo "../configure ${conf_opts[*]}"
|
||||
cd "${builddir}"
|
||||
../configure "${conf_opts[@]}" || die "configure failed"
|
||||
|
||||
# FreeBSD's kernel does not support QEMU assigning/grabbing
|
||||
# host USB devices yet
|
||||
use kernel_FreeBSD && \
|
||||
sed -i -E -e "s|^(HOST_USB=)bsd|\1stub|" "${S}"/config-host.mak
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local target
|
||||
|
||||
python_setup
|
||||
|
||||
softmmu_targets= softmmu_bins=()
|
||||
user_targets= user_bins=()
|
||||
|
||||
for target in ${IUSE_SOFTMMU_TARGETS} ; do
|
||||
if use "qemu_softmmu_targets_${target}"; then
|
||||
softmmu_targets+=",${target}-softmmu"
|
||||
softmmu_bins+=( "qemu-system-${target}" )
|
||||
fi
|
||||
done
|
||||
|
||||
for target in ${IUSE_USER_TARGETS} ; do
|
||||
if use "qemu_user_targets_${target}"; then
|
||||
user_targets+=",${target}-linux-user"
|
||||
user_bins+=( "qemu-${target}" )
|
||||
fi
|
||||
done
|
||||
|
||||
softmmu_targets=${softmmu_targets#,}
|
||||
user_targets=${user_targets#,}
|
||||
|
||||
[[ -n ${softmmu_targets} ]] && qemu_src_configure "softmmu"
|
||||
[[ -n ${user_targets} ]] && qemu_src_configure "user"
|
||||
[[ -z ${softmmu_targets}${user_targets} ]] && qemu_src_configure "tools"
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
if [[ -n ${user_targets} ]]; then
|
||||
cd "${S}/user-build"
|
||||
default
|
||||
fi
|
||||
|
||||
if [[ -n ${softmmu_targets} ]]; then
|
||||
cd "${S}/softmmu-build"
|
||||
default
|
||||
fi
|
||||
|
||||
if [[ -z ${softmmu_targets}${user_targets} ]]; then
|
||||
cd "${S}/tools-build"
|
||||
default
|
||||
fi
|
||||
}
|
||||
|
||||
src_test() {
|
||||
if [[ -n ${softmmu_targets} ]]; then
|
||||
cd "${S}/softmmu-build"
|
||||
pax-mark m */qemu-system-* #515550
|
||||
emake -j1 check
|
||||
emake -j1 check-report.html
|
||||
fi
|
||||
}
|
||||
|
||||
qemu_python_install() {
|
||||
python_domodule "${S}/scripts/qmp/qmp.py"
|
||||
|
||||
python_doscript "${S}/scripts/kvm/kvm_stat"
|
||||
python_doscript "${S}/scripts/kvm/vmxcap"
|
||||
python_doscript "${S}/scripts/qmp/qmp-shell"
|
||||
python_doscript "${S}/scripts/qmp/qemu-ga-client"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
if [[ -n ${user_targets} ]]; then
|
||||
cd "${S}/user-build"
|
||||
emake DESTDIR="${ED}" install
|
||||
|
||||
# Install binfmt handler init script for user targets
|
||||
newinitd "${FILESDIR}/qemu-binfmt.initd-r1" qemu-binfmt
|
||||
fi
|
||||
|
||||
if [[ -n ${softmmu_targets} ]]; then
|
||||
cd "${S}/softmmu-build"
|
||||
emake DESTDIR="${ED}" install
|
||||
|
||||
# This might not exist if the test failed. #512010
|
||||
[[ -e check-report.html ]] && dohtml check-report.html
|
||||
|
||||
if use kernel_linux; then
|
||||
udev_dorules "${FILESDIR}"/65-kvm.rules
|
||||
fi
|
||||
|
||||
if use python; then
|
||||
python_foreach_impl qemu_python_install
|
||||
fi
|
||||
fi
|
||||
|
||||
if [[ -z ${softmmu_targets}${user_targets} ]]; then
|
||||
cd "${S}/tools-build"
|
||||
emake DESTDIR="${ED}" install
|
||||
fi
|
||||
|
||||
# Disable mprotect on the qemu binaries as they use JITs to be fast #459348
|
||||
pushd "${ED}"/usr/bin >/dev/null
|
||||
pax-mark m "${softmmu_bins[@]}" "${user_bins[@]}"
|
||||
popd >/dev/null
|
||||
|
||||
# Install config file example for qemu-bridge-helper
|
||||
insinto "/etc/qemu"
|
||||
doins "${FILESDIR}/bridge.conf"
|
||||
|
||||
# Remove the docdir placed qmp-commands.txt
|
||||
mv "${ED}/usr/share/doc/${PF}/html/qmp-commands.txt" "${S}/docs/qmp/"
|
||||
|
||||
cd "${S}"
|
||||
dodoc Changelog MAINTAINERS docs/specs/pci-ids.txt
|
||||
newdoc pc-bios/README README.pc-bios
|
||||
dodoc docs/qmp/*.txt
|
||||
|
||||
if [[ -n ${softmmu_targets} ]]; then
|
||||
# Remove SeaBIOS since we're using the SeaBIOS packaged one
|
||||
rm "${ED}/usr/share/qemu/bios.bin"
|
||||
if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
|
||||
dosym ../seabios/bios.bin /usr/share/qemu/bios.bin
|
||||
fi
|
||||
|
||||
# Remove vgabios since we're using the vgabios packaged one
|
||||
rm "${ED}/usr/share/qemu/vgabios.bin"
|
||||
rm "${ED}/usr/share/qemu/vgabios-cirrus.bin"
|
||||
rm "${ED}/usr/share/qemu/vgabios-qxl.bin"
|
||||
rm "${ED}/usr/share/qemu/vgabios-stdvga.bin"
|
||||
rm "${ED}/usr/share/qemu/vgabios-vmware.bin"
|
||||
if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
|
||||
dosym ../vgabios/vgabios.bin /usr/share/qemu/vgabios.bin
|
||||
dosym ../vgabios/vgabios-cirrus.bin /usr/share/qemu/vgabios-cirrus.bin
|
||||
dosym ../vgabios/vgabios-qxl.bin /usr/share/qemu/vgabios-qxl.bin
|
||||
dosym ../vgabios/vgabios-stdvga.bin /usr/share/qemu/vgabios-stdvga.bin
|
||||
dosym ../vgabios/vgabios-vmware.bin /usr/share/qemu/vgabios-vmware.bin
|
||||
fi
|
||||
|
||||
# Remove sgabios since we're using the sgabios packaged one
|
||||
rm "${ED}/usr/share/qemu/sgabios.bin"
|
||||
if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
|
||||
dosym ../sgabios/sgabios.bin /usr/share/qemu/sgabios.bin
|
||||
fi
|
||||
|
||||
# Remove iPXE since we're using the iPXE packaged one
|
||||
rm "${ED}"/usr/share/qemu/pxe-*.rom
|
||||
if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
|
||||
dosym ../ipxe/8086100e.rom /usr/share/qemu/pxe-e1000.rom
|
||||
dosym ../ipxe/80861209.rom /usr/share/qemu/pxe-eepro100.rom
|
||||
dosym ../ipxe/10500940.rom /usr/share/qemu/pxe-ne2k_pci.rom
|
||||
dosym ../ipxe/10222000.rom /usr/share/qemu/pxe-pcnet.rom
|
||||
dosym ../ipxe/10ec8139.rom /usr/share/qemu/pxe-rtl8139.rom
|
||||
dosym ../ipxe/1af41000.rom /usr/share/qemu/pxe-virtio.rom
|
||||
fi
|
||||
fi
|
||||
|
||||
qemu_support_kvm && readme.gentoo_create_doc
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
if qemu_support_kvm; then
|
||||
readme.gentoo_print_elog
|
||||
fi
|
||||
|
||||
if [[ -n ${softmmu_targets} ]] && use kernel_linux; then
|
||||
udev_reload
|
||||
fi
|
||||
|
||||
fcaps cap_net_admin /usr/libexec/qemu-bridge-helper
|
||||
}
|
||||
|
||||
pkg_info() {
|
||||
echo "Using:"
|
||||
echo " $(best_version app-emulation/spice-protocol)"
|
||||
echo " $(best_version sys-firmware/ipxe)"
|
||||
echo " $(best_version sys-firmware/seabios)"
|
||||
if has_version 'sys-firmware/seabios[binary]'; then
|
||||
echo " USE=binary"
|
||||
else
|
||||
echo " USE=''"
|
||||
fi
|
||||
echo " $(best_version sys-firmware/vgabios)"
|
||||
}
|
@ -1,651 +0,0 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
|
||||
PYTHON_COMPAT=( python2_7 )
|
||||
PYTHON_REQ_USE="ncurses,readline"
|
||||
|
||||
inherit eutils flag-o-matic linux-info toolchain-funcs multilib python-r1 \
|
||||
user udev fcaps readme.gentoo pax-utils
|
||||
|
||||
BACKPORTS=
|
||||
|
||||
if [[ ${PV} = *9999* ]]; then
|
||||
EGIT_REPO_URI="git://git.qemu.org/qemu.git"
|
||||
inherit git-2
|
||||
SRC_URI=""
|
||||
else
|
||||
SRC_URI="http://wiki.qemu-project.org/download/${P}.tar.bz2
|
||||
${BACKPORTS:+
|
||||
https://dev.gentoo.org/~cardoe/distfiles/${P}-${BACKPORTS}.tar.xz}"
|
||||
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
|
||||
fi
|
||||
|
||||
DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
|
||||
HOMEPAGE="http://www.qemu.org http://www.linux-kvm.org"
|
||||
|
||||
LICENSE="GPL-2 LGPL-2 BSD-2"
|
||||
SLOT="0"
|
||||
IUSE="accessibility +aio alsa bluetooth +caps +curl debug +fdt glusterfs \
|
||||
gnutls gtk gtk2 infiniband iscsi +jpeg \
|
||||
kernel_linux kernel_FreeBSD lzo ncurses nfs nls numa opengl +pin-upstream-blobs
|
||||
+png pulseaudio python \
|
||||
rbd sasl +seccomp sdl sdl2 selinux smartcard snappy spice ssh static static-softmmu
|
||||
static-user systemtap tci test +threads usb usbredir +uuid vde +vhost-net \
|
||||
virgl virtfs +vnc vte xattr xen xfs"
|
||||
|
||||
COMMON_TARGETS="aarch64 alpha arm cris i386 m68k microblaze microblazeel mips
|
||||
mips64 mips64el mipsel or32 ppc ppc64 s390x sh4 sh4eb sparc sparc64 unicore32
|
||||
x86_64"
|
||||
IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} lm32 moxie ppcemb tricore xtensa xtensaeb"
|
||||
IUSE_USER_TARGETS="${COMMON_TARGETS} armeb mipsn32 mipsn32el ppc64abi32 ppc64le sparc32plus tilegx"
|
||||
|
||||
use_softmmu_targets=$(printf ' qemu_softmmu_targets_%s' ${IUSE_SOFTMMU_TARGETS})
|
||||
use_user_targets=$(printf ' qemu_user_targets_%s' ${IUSE_USER_TARGETS})
|
||||
IUSE+=" ${use_softmmu_targets} ${use_user_targets}"
|
||||
|
||||
# Allow no targets to be built so that people can get a tools-only build.
|
||||
# Block USE flag configurations known to not work.
|
||||
REQUIRED_USE="${PYTHON_REQUIRED_USE}
|
||||
gtk2? ( gtk )
|
||||
qemu_softmmu_targets_arm? ( fdt )
|
||||
qemu_softmmu_targets_microblaze? ( fdt )
|
||||
qemu_softmmu_targets_ppc? ( fdt )
|
||||
qemu_softmmu_targets_ppc64? ( fdt )
|
||||
sdl2? ( sdl )
|
||||
static? ( static-softmmu static-user )
|
||||
static-softmmu? ( !alsa !pulseaudio !bluetooth !opengl !gtk !gtk2 )
|
||||
virtfs? ( xattr )
|
||||
vte? ( gtk )"
|
||||
|
||||
# Yep, you need both libcap and libcap-ng since virtfs only uses libcap.
|
||||
#
|
||||
# The attr lib isn't always linked in (although the USE flag is always
|
||||
# respected). This is because qemu supports using the C library's API
|
||||
# when available rather than always using the extranl library.
|
||||
#
|
||||
# Older versions of gnutls are supported, but it's simpler to just require
|
||||
# the latest versions. This is also why we require nettle.
|
||||
COMMON_LIB_DEPEND=">=dev-libs/glib-2.0[static-libs(+)]
|
||||
sys-libs/zlib[static-libs(+)]
|
||||
xattr? ( sys-apps/attr[static-libs(+)] )"
|
||||
SOFTMMU_LIB_DEPEND="${COMMON_LIB_DEPEND}
|
||||
>=x11-libs/pixman-0.28.0[static-libs(+)]
|
||||
accessibility? ( app-accessibility/brltty[static-libs(+)] )
|
||||
aio? ( dev-libs/libaio[static-libs(+)] )
|
||||
alsa? ( >=media-libs/alsa-lib-1.0.13 )
|
||||
bluetooth? ( net-wireless/bluez )
|
||||
caps? ( sys-libs/libcap-ng[static-libs(+)] )
|
||||
curl? ( >=net-misc/curl-7.15.4[static-libs(+)] )
|
||||
fdt? ( >=sys-apps/dtc-1.4.0[static-libs(+)] )
|
||||
glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] )
|
||||
gnutls? (
|
||||
dev-libs/nettle[static-libs(+)]
|
||||
>=net-libs/gnutls-3.0[static-libs(+)]
|
||||
)
|
||||
gtk? (
|
||||
gtk2? (
|
||||
x11-libs/gtk+:2
|
||||
vte? ( x11-libs/vte:0 )
|
||||
)
|
||||
!gtk2? (
|
||||
x11-libs/gtk+:3
|
||||
vte? ( x11-libs/vte:2.90 )
|
||||
)
|
||||
)
|
||||
infiniband? ( sys-infiniband/librdmacm:=[static-libs(+)] )
|
||||
iscsi? ( net-libs/libiscsi )
|
||||
jpeg? ( virtual/jpeg:=[static-libs(+)] )
|
||||
lzo? ( dev-libs/lzo:2[static-libs(+)] )
|
||||
ncurses? ( sys-libs/ncurses:0=[static-libs(+)] )
|
||||
nfs? ( >=net-fs/libnfs-1.9.3[static-libs(+)] )
|
||||
numa? ( sys-process/numactl[static-libs(+)] )
|
||||
opengl? (
|
||||
virtual/opengl
|
||||
media-libs/libepoxy[static-libs(+)]
|
||||
media-libs/mesa[static-libs(+)]
|
||||
media-libs/mesa[egl,gles2]
|
||||
)
|
||||
png? ( media-libs/libpng:0=[static-libs(+)] )
|
||||
pulseaudio? ( media-sound/pulseaudio )
|
||||
rbd? ( sys-cluster/ceph[static-libs(+)] )
|
||||
sasl? ( dev-libs/cyrus-sasl[static-libs(+)] )
|
||||
sdl? (
|
||||
!sdl2? (
|
||||
media-libs/libsdl[X]
|
||||
>=media-libs/libsdl-1.2.11[static-libs(+)]
|
||||
)
|
||||
sdl2? (
|
||||
media-libs/libsdl2[X]
|
||||
media-libs/libsdl2[static-libs(+)]
|
||||
)
|
||||
)
|
||||
seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] )
|
||||
smartcard? ( >=app-emulation/libcacard-2.5.0[static-libs(+)] )
|
||||
snappy? ( app-arch/snappy[static-libs(+)] )
|
||||
spice? (
|
||||
>=app-emulation/spice-protocol-0.12.3
|
||||
>=app-emulation/spice-0.12.0[static-libs(+)]
|
||||
)
|
||||
ssh? ( >=net-libs/libssh2-1.2.8[static-libs(+)] )
|
||||
usb? ( >=virtual/libusb-1-r2[static-libs(+)] )
|
||||
usbredir? ( >=sys-apps/usbredir-0.6[static-libs(+)] )
|
||||
uuid? ( >=sys-apps/util-linux-2.16.0[static-libs(+)] )
|
||||
vde? ( net-misc/vde[static-libs(+)] )
|
||||
virgl? ( media-libs/virglrenderer[static-libs(+)] )
|
||||
virtfs? ( sys-libs/libcap )
|
||||
xfs? ( sys-fs/xfsprogs[static-libs(+)] )"
|
||||
USER_LIB_DEPEND="${COMMON_LIB_DEPEND}"
|
||||
X86_FIRMWARE_DEPEND="
|
||||
>=sys-firmware/ipxe-1.0.0_p20130624
|
||||
pin-upstream-blobs? (
|
||||
~sys-firmware/seabios-1.8.2
|
||||
~sys-firmware/sgabios-0.1_pre8
|
||||
~sys-firmware/vgabios-0.7a
|
||||
)
|
||||
!pin-upstream-blobs? (
|
||||
sys-firmware/seabios
|
||||
sys-firmware/sgabios
|
||||
sys-firmware/vgabios
|
||||
)"
|
||||
CDEPEND="
|
||||
!static-softmmu? ( $(printf "%s? ( ${SOFTMMU_LIB_DEPEND//\[static-libs(+)]} ) " ${use_softmmu_targets}) )
|
||||
!static-user? ( $(printf "%s? ( ${USER_LIB_DEPEND//\[static-libs(+)]} ) " ${use_user_targets}) )
|
||||
qemu_softmmu_targets_i386? ( ${X86_FIRMWARE_DEPEND} )
|
||||
qemu_softmmu_targets_x86_64? ( ${X86_FIRMWARE_DEPEND} )
|
||||
python? ( ${PYTHON_DEPS} )
|
||||
systemtap? ( dev-util/systemtap )
|
||||
xen? ( app-emulation/xen-tools:= )"
|
||||
DEPEND="${CDEPEND}
|
||||
dev-lang/perl
|
||||
=dev-lang/python-2*
|
||||
sys-apps/texinfo
|
||||
virtual/pkgconfig
|
||||
kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 )
|
||||
gtk? ( nls? ( sys-devel/gettext ) )
|
||||
static-softmmu? ( $(printf "%s? ( ${SOFTMMU_LIB_DEPEND} ) " ${use_softmmu_targets}) )
|
||||
static-user? ( $(printf "%s? ( ${USER_LIB_DEPEND} ) " ${use_user_targets}) )
|
||||
test? (
|
||||
dev-libs/glib[utils]
|
||||
sys-devel/bc
|
||||
)"
|
||||
RDEPEND="${CDEPEND}
|
||||
selinux? ( sec-policy/selinux-qemu )
|
||||
"
|
||||
|
||||
STRIP_MASK="/usr/share/qemu/palcode-clipper"
|
||||
|
||||
QA_PREBUILT="
|
||||
usr/share/qemu/openbios-ppc
|
||||
usr/share/qemu/openbios-sparc64
|
||||
usr/share/qemu/openbios-sparc32
|
||||
usr/share/qemu/palcode-clipper
|
||||
usr/share/qemu/s390-ccw.img
|
||||
usr/share/qemu/u-boot.e500
|
||||
"
|
||||
|
||||
QA_WX_LOAD="usr/bin/qemu-i386
|
||||
usr/bin/qemu-x86_64
|
||||
usr/bin/qemu-alpha
|
||||
usr/bin/qemu-arm
|
||||
usr/bin/qemu-cris
|
||||
usr/bin/qemu-m68k
|
||||
usr/bin/qemu-microblaze
|
||||
usr/bin/qemu-microblazeel
|
||||
usr/bin/qemu-mips
|
||||
usr/bin/qemu-mipsel
|
||||
usr/bin/qemu-or32
|
||||
usr/bin/qemu-ppc
|
||||
usr/bin/qemu-ppc64
|
||||
usr/bin/qemu-ppc64abi32
|
||||
usr/bin/qemu-sh4
|
||||
usr/bin/qemu-sh4eb
|
||||
usr/bin/qemu-sparc
|
||||
usr/bin/qemu-sparc64
|
||||
usr/bin/qemu-armeb
|
||||
usr/bin/qemu-sparc32plus
|
||||
usr/bin/qemu-s390x
|
||||
usr/bin/qemu-unicore32"
|
||||
|
||||
DOC_CONTENTS="If you don't have kvm compiled into the kernel, make sure
|
||||
you have the kernel module loaded before running kvm. The easiest way to
|
||||
ensure that the kernel module is loaded is to load it on boot.\n
|
||||
For AMD CPUs the module is called 'kvm-amd'\n
|
||||
For Intel CPUs the module is called 'kvm-intel'\n
|
||||
Please review /etc/conf.d/modules for how to load these\n\n
|
||||
Make sure your user is in the 'kvm' group\n
|
||||
Just run 'gpasswd -a <USER> kvm', then have <USER> re-login."
|
||||
|
||||
qemu_support_kvm() {
|
||||
if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386 \
|
||||
use qemu_softmmu_targets_ppc || use qemu_softmmu_targets_ppc64 \
|
||||
use qemu_softmmu_targets_s390x; then
|
||||
return 0
|
||||
fi
|
||||
|
||||
return 1
|
||||
}
|
||||
|
||||
pkg_pretend() {
|
||||
if use kernel_linux && kernel_is lt 2 6 25; then
|
||||
eerror "This version of KVM requres a host kernel of 2.6.25 or higher."
|
||||
elif use kernel_linux; then
|
||||
if ! linux_config_exists; then
|
||||
eerror "Unable to check your kernel for KVM support"
|
||||
else
|
||||
CONFIG_CHECK="~KVM ~TUN ~BRIDGE"
|
||||
ERROR_KVM="You must enable KVM in your kernel to continue"
|
||||
ERROR_KVM_AMD="If you have an AMD CPU, you must enable KVM_AMD in"
|
||||
ERROR_KVM_AMD+=" your kernel configuration."
|
||||
ERROR_KVM_INTEL="If you have an Intel CPU, you must enable"
|
||||
ERROR_KVM_INTEL+=" KVM_INTEL in your kernel configuration."
|
||||
ERROR_TUN="You will need the Universal TUN/TAP driver compiled"
|
||||
ERROR_TUN+=" into your kernel or loaded as a module to use the"
|
||||
ERROR_TUN+=" virtual network device if using -net tap."
|
||||
ERROR_BRIDGE="You will also need support for 802.1d"
|
||||
ERROR_BRIDGE+=" Ethernet Bridging for some network configurations."
|
||||
use vhost-net && CONFIG_CHECK+=" ~VHOST_NET"
|
||||
ERROR_VHOST_NET="You must enable VHOST_NET to have vhost-net"
|
||||
ERROR_VHOST_NET+=" support"
|
||||
|
||||
if use amd64 || use x86 || use amd64-linux || use x86-linux; then
|
||||
CONFIG_CHECK+=" ~KVM_AMD ~KVM_INTEL"
|
||||
fi
|
||||
|
||||
use python && CONFIG_CHECK+=" ~DEBUG_FS"
|
||||
ERROR_DEBUG_FS="debugFS support required for kvm_stat"
|
||||
|
||||
# Now do the actual checks setup above
|
||||
check_extra_config
|
||||
fi
|
||||
fi
|
||||
|
||||
if grep -qs '/usr/bin/qemu-kvm' "${EROOT}"/etc/libvirt/qemu/*.xml; then
|
||||
eerror "The kvm/qemu-kvm wrappers no longer exist, but your libvirt"
|
||||
eerror "instances are still pointing to it. Please update your"
|
||||
eerror "configs in /etc/libvirt/qemu/ to use the -enable-kvm flag"
|
||||
eerror "and the right system binary (e.g. qemu-system-x86_64)."
|
||||
die "update your virt configs to not use qemu-kvm"
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_setup() {
|
||||
enewgroup kvm 78
|
||||
}
|
||||
|
||||
# Sanity check to make sure target lists are kept up-to-date.
|
||||
check_targets() {
|
||||
local var=$1 mak=$2
|
||||
local detected sorted
|
||||
|
||||
pushd "${S}"/default-configs >/dev/null || die
|
||||
|
||||
# Force C locale until glibc is updated. #564936
|
||||
detected=$(echo $(printf '%s\n' *-${mak}.mak | sed "s:-${mak}.mak::" | LC_COLLATE=C sort -u))
|
||||
sorted=$(echo $(printf '%s\n' ${!var} | LC_COLLATE=C sort -u))
|
||||
if [[ ${sorted} != "${detected}" ]] ; then
|
||||
eerror "The ebuild needs to be kept in sync."
|
||||
eerror "${var}: ${sorted}"
|
||||
eerror "$(printf '%-*s' ${#var} configure): ${detected}"
|
||||
die "sync ${var} to the list of targets"
|
||||
fi
|
||||
|
||||
popd >/dev/null
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
check_targets IUSE_SOFTMMU_TARGETS softmmu
|
||||
check_targets IUSE_USER_TARGETS linux-user
|
||||
|
||||
# Alter target makefiles to accept CFLAGS set via flag-o
|
||||
sed -i -r \
|
||||
-e 's/^(C|OP_C|HELPER_C)FLAGS=/\1FLAGS+=/' \
|
||||
Makefile Makefile.target || die
|
||||
|
||||
# Cheap hack to disable gettext .mo generation.
|
||||
use nls || rm -f po/*.po
|
||||
|
||||
epatch "${FILESDIR}"/qemu-2.5.0-cflags.patch
|
||||
[[ -n ${BACKPORTS} ]] && \
|
||||
EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
|
||||
epatch
|
||||
|
||||
# Fix ld and objcopy being called directly
|
||||
tc-export AR LD OBJCOPY
|
||||
|
||||
# Verbose builds
|
||||
MAKEOPTS+=" V=1"
|
||||
|
||||
epatch_user
|
||||
}
|
||||
|
||||
##
|
||||
# configures qemu based on the build directory and the build type
|
||||
# we are using.
|
||||
#
|
||||
qemu_src_configure() {
|
||||
debug-print-function ${FUNCNAME} "$@"
|
||||
|
||||
local buildtype=$1
|
||||
local builddir="${S}/${buildtype}-build"
|
||||
local static_flag="static-${buildtype}"
|
||||
|
||||
mkdir "${builddir}"
|
||||
|
||||
local conf_opts=(
|
||||
--prefix=/usr
|
||||
--sysconfdir=/etc
|
||||
--libdir=/usr/$(get_libdir)
|
||||
--docdir=/usr/share/doc/${PF}/html
|
||||
--disable-bsd-user
|
||||
--disable-guest-agent
|
||||
--disable-strip
|
||||
--disable-werror
|
||||
# We support gnutls/nettle for crypto operations. It is possible
|
||||
# to use gcrypt when gnutls/nettle are disabled (but not when they
|
||||
# are enabled), but it's not really worth the hassle. Disable it
|
||||
# all the time to avoid automatically detecting it. #568856
|
||||
--disable-gcrypt
|
||||
--python="${PYTHON}"
|
||||
--cc="$(tc-getCC)"
|
||||
--cxx="$(tc-getCXX)"
|
||||
--host-cc="$(tc-getBUILD_CC)"
|
||||
$(use_enable debug debug-info)
|
||||
$(use_enable debug debug-tcg)
|
||||
--enable-docs
|
||||
$(use_enable tci tcg-interpreter)
|
||||
$(use_enable xattr attr)
|
||||
)
|
||||
|
||||
# Disable options not used by user targets as the default configure
|
||||
# options will autoprobe and try to link in a bunch of unused junk.
|
||||
conf_softmmu() {
|
||||
if [[ ${buildtype} == "user" ]] ; then
|
||||
echo "--disable-${2:-$1}"
|
||||
else
|
||||
use_enable "$@"
|
||||
fi
|
||||
}
|
||||
conf_opts+=(
|
||||
$(conf_softmmu accessibility brlapi)
|
||||
$(conf_softmmu aio linux-aio)
|
||||
$(conf_softmmu bluetooth bluez)
|
||||
$(conf_softmmu caps cap-ng)
|
||||
$(conf_softmmu curl)
|
||||
$(conf_softmmu fdt)
|
||||
$(conf_softmmu glusterfs)
|
||||
$(conf_softmmu gnutls)
|
||||
$(conf_softmmu gnutls nettle)
|
||||
$(conf_softmmu gtk)
|
||||
$(conf_softmmu infiniband rdma)
|
||||
$(conf_softmmu iscsi libiscsi)
|
||||
$(conf_softmmu jpeg vnc-jpeg)
|
||||
$(conf_softmmu kernel_linux kvm)
|
||||
$(conf_softmmu lzo)
|
||||
$(conf_softmmu ncurses curses)
|
||||
$(conf_softmmu nfs libnfs)
|
||||
$(conf_softmmu numa)
|
||||
$(conf_softmmu opengl)
|
||||
$(conf_softmmu png vnc-png)
|
||||
$(conf_softmmu rbd)
|
||||
$(conf_softmmu sasl vnc-sasl)
|
||||
$(conf_softmmu sdl)
|
||||
$(conf_softmmu seccomp)
|
||||
$(conf_softmmu smartcard)
|
||||
$(conf_softmmu snappy)
|
||||
$(conf_softmmu spice)
|
||||
$(conf_softmmu ssh libssh2)
|
||||
$(conf_softmmu usb libusb)
|
||||
$(conf_softmmu usbredir usb-redir)
|
||||
$(conf_softmmu uuid)
|
||||
$(conf_softmmu vde)
|
||||
$(conf_softmmu vhost-net)
|
||||
$(conf_softmmu virgl virglrenderer)
|
||||
$(conf_softmmu virtfs)
|
||||
$(conf_softmmu vnc)
|
||||
$(conf_softmmu vte)
|
||||
$(conf_softmmu xen)
|
||||
$(conf_softmmu xen xen-pci-passthrough)
|
||||
$(conf_softmmu xfs xfsctl)
|
||||
)
|
||||
|
||||
case ${buildtype} in
|
||||
user)
|
||||
conf_opts+=(
|
||||
--enable-linux-user
|
||||
--disable-system
|
||||
--disable-blobs
|
||||
--disable-tools
|
||||
)
|
||||
;;
|
||||
softmmu)
|
||||
# audio options
|
||||
local audio_opts="oss"
|
||||
use alsa && audio_opts="alsa,${audio_opts}"
|
||||
use sdl && audio_opts="sdl,${audio_opts}"
|
||||
use pulseaudio && audio_opts="pa,${audio_opts}"
|
||||
|
||||
conf_opts+=(
|
||||
--disable-linux-user
|
||||
--enable-system
|
||||
--with-system-pixman
|
||||
--audio-drv-list="${audio_opts}"
|
||||
)
|
||||
use gtk && conf_opts+=( --with-gtkabi=$(usex gtk2 2.0 3.0) )
|
||||
use sdl && conf_opts+=( --with-sdlabi=$(usex sdl2 2.0 1.2) )
|
||||
;;
|
||||
tools)
|
||||
conf_opts+=(
|
||||
--disable-linux-user
|
||||
--disable-system
|
||||
--disable-blobs
|
||||
)
|
||||
static_flag="static"
|
||||
;;
|
||||
esac
|
||||
|
||||
local targets="${buildtype}_targets"
|
||||
[[ -n ${targets} ]] && conf_opts+=( --target-list="${!targets}" )
|
||||
|
||||
# Add support for SystemTAP
|
||||
use systemtap && conf_opts+=( --enable-trace-backend=dtrace )
|
||||
|
||||
# We always want to attempt to build with PIE support as it results
|
||||
# in a more secure binary. But it doesn't work with static or if
|
||||
# the current GCC doesn't have PIE support.
|
||||
if use ${static_flag}; then
|
||||
conf_opts+=( --static --disable-pie )
|
||||
else
|
||||
gcc-specs-pie && conf_opts+=( --enable-pie )
|
||||
fi
|
||||
|
||||
echo "../configure ${conf_opts[*]}"
|
||||
cd "${builddir}"
|
||||
../configure "${conf_opts[@]}" || die "configure failed"
|
||||
|
||||
# FreeBSD's kernel does not support QEMU assigning/grabbing
|
||||
# host USB devices yet
|
||||
use kernel_FreeBSD && \
|
||||
sed -i -E -e "s|^(HOST_USB=)bsd|\1stub|" "${S}"/config-host.mak
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local target
|
||||
|
||||
python_setup
|
||||
|
||||
softmmu_targets= softmmu_bins=()
|
||||
user_targets= user_bins=()
|
||||
|
||||
for target in ${IUSE_SOFTMMU_TARGETS} ; do
|
||||
if use "qemu_softmmu_targets_${target}"; then
|
||||
softmmu_targets+=",${target}-softmmu"
|
||||
softmmu_bins+=( "qemu-system-${target}" )
|
||||
fi
|
||||
done
|
||||
|
||||
for target in ${IUSE_USER_TARGETS} ; do
|
||||
if use "qemu_user_targets_${target}"; then
|
||||
user_targets+=",${target}-linux-user"
|
||||
user_bins+=( "qemu-${target}" )
|
||||
fi
|
||||
done
|
||||
|
||||
softmmu_targets=${softmmu_targets#,}
|
||||
user_targets=${user_targets#,}
|
||||
|
||||
[[ -n ${softmmu_targets} ]] && qemu_src_configure "softmmu"
|
||||
[[ -n ${user_targets} ]] && qemu_src_configure "user"
|
||||
[[ -z ${softmmu_targets}${user_targets} ]] && qemu_src_configure "tools"
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
if [[ -n ${user_targets} ]]; then
|
||||
cd "${S}/user-build"
|
||||
default
|
||||
fi
|
||||
|
||||
if [[ -n ${softmmu_targets} ]]; then
|
||||
cd "${S}/softmmu-build"
|
||||
default
|
||||
fi
|
||||
|
||||
if [[ -z ${softmmu_targets}${user_targets} ]]; then
|
||||
cd "${S}/tools-build"
|
||||
default
|
||||
fi
|
||||
}
|
||||
|
||||
src_test() {
|
||||
if [[ -n ${softmmu_targets} ]]; then
|
||||
cd "${S}/softmmu-build"
|
||||
pax-mark m */qemu-system-* #515550
|
||||
emake -j1 check
|
||||
emake -j1 check-report.html
|
||||
fi
|
||||
}
|
||||
|
||||
qemu_python_install() {
|
||||
python_domodule "${S}/scripts/qmp/qmp.py"
|
||||
|
||||
python_doscript "${S}/scripts/kvm/kvm_stat"
|
||||
python_doscript "${S}/scripts/kvm/vmxcap"
|
||||
python_doscript "${S}/scripts/qmp/qmp-shell"
|
||||
python_doscript "${S}/scripts/qmp/qemu-ga-client"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
if [[ -n ${user_targets} ]]; then
|
||||
cd "${S}/user-build"
|
||||
emake DESTDIR="${ED}" install
|
||||
|
||||
# Install binfmt handler init script for user targets
|
||||
newinitd "${FILESDIR}/qemu-binfmt.initd-r1" qemu-binfmt
|
||||
fi
|
||||
|
||||
if [[ -n ${softmmu_targets} ]]; then
|
||||
cd "${S}/softmmu-build"
|
||||
emake DESTDIR="${ED}" install
|
||||
|
||||
# This might not exist if the test failed. #512010
|
||||
[[ -e check-report.html ]] && dohtml check-report.html
|
||||
|
||||
if use kernel_linux; then
|
||||
udev_dorules "${FILESDIR}"/65-kvm.rules
|
||||
fi
|
||||
|
||||
if use python; then
|
||||
python_foreach_impl qemu_python_install
|
||||
fi
|
||||
fi
|
||||
|
||||
if [[ -z ${softmmu_targets}${user_targets} ]]; then
|
||||
cd "${S}/tools-build"
|
||||
emake DESTDIR="${ED}" install
|
||||
fi
|
||||
|
||||
# Disable mprotect on the qemu binaries as they use JITs to be fast #459348
|
||||
pushd "${ED}"/usr/bin >/dev/null
|
||||
pax-mark m "${softmmu_bins[@]}" "${user_bins[@]}"
|
||||
popd >/dev/null
|
||||
|
||||
# Install config file example for qemu-bridge-helper
|
||||
insinto "/etc/qemu"
|
||||
doins "${FILESDIR}/bridge.conf"
|
||||
|
||||
# Remove the docdir placed qmp-commands.txt
|
||||
mv "${ED}/usr/share/doc/${PF}/html/qmp-commands.txt" "${S}/docs/" || die
|
||||
|
||||
cd "${S}"
|
||||
dodoc Changelog MAINTAINERS docs/specs/pci-ids.txt
|
||||
newdoc pc-bios/README README.pc-bios
|
||||
dodoc docs/qmp-*.txt
|
||||
|
||||
if [[ -n ${softmmu_targets} ]]; then
|
||||
# Remove SeaBIOS since we're using the SeaBIOS packaged one
|
||||
rm "${ED}/usr/share/qemu/bios.bin"
|
||||
if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
|
||||
dosym ../seabios/bios.bin /usr/share/qemu/bios.bin
|
||||
fi
|
||||
|
||||
# Remove vgabios since we're using the vgabios packaged one
|
||||
rm "${ED}/usr/share/qemu/vgabios.bin"
|
||||
rm "${ED}/usr/share/qemu/vgabios-cirrus.bin"
|
||||
rm "${ED}/usr/share/qemu/vgabios-qxl.bin"
|
||||
rm "${ED}/usr/share/qemu/vgabios-stdvga.bin"
|
||||
rm "${ED}/usr/share/qemu/vgabios-vmware.bin"
|
||||
if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
|
||||
dosym ../vgabios/vgabios.bin /usr/share/qemu/vgabios.bin
|
||||
dosym ../vgabios/vgabios-cirrus.bin /usr/share/qemu/vgabios-cirrus.bin
|
||||
dosym ../vgabios/vgabios-qxl.bin /usr/share/qemu/vgabios-qxl.bin
|
||||
dosym ../vgabios/vgabios-stdvga.bin /usr/share/qemu/vgabios-stdvga.bin
|
||||
dosym ../vgabios/vgabios-vmware.bin /usr/share/qemu/vgabios-vmware.bin
|
||||
fi
|
||||
|
||||
# Remove sgabios since we're using the sgabios packaged one
|
||||
rm "${ED}/usr/share/qemu/sgabios.bin"
|
||||
if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
|
||||
dosym ../sgabios/sgabios.bin /usr/share/qemu/sgabios.bin
|
||||
fi
|
||||
|
||||
# Remove iPXE since we're using the iPXE packaged one
|
||||
rm "${ED}"/usr/share/qemu/pxe-*.rom
|
||||
if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
|
||||
dosym ../ipxe/8086100e.rom /usr/share/qemu/pxe-e1000.rom
|
||||
dosym ../ipxe/80861209.rom /usr/share/qemu/pxe-eepro100.rom
|
||||
dosym ../ipxe/10500940.rom /usr/share/qemu/pxe-ne2k_pci.rom
|
||||
dosym ../ipxe/10222000.rom /usr/share/qemu/pxe-pcnet.rom
|
||||
dosym ../ipxe/10ec8139.rom /usr/share/qemu/pxe-rtl8139.rom
|
||||
dosym ../ipxe/1af41000.rom /usr/share/qemu/pxe-virtio.rom
|
||||
fi
|
||||
fi
|
||||
|
||||
qemu_support_kvm && readme.gentoo_create_doc
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
if qemu_support_kvm; then
|
||||
readme.gentoo_print_elog
|
||||
fi
|
||||
|
||||
if [[ -n ${softmmu_targets} ]] && use kernel_linux; then
|
||||
udev_reload
|
||||
fi
|
||||
|
||||
fcaps cap_net_admin /usr/libexec/qemu-bridge-helper
|
||||
}
|
||||
|
||||
pkg_info() {
|
||||
echo "Using:"
|
||||
echo " $(best_version app-emulation/spice-protocol)"
|
||||
echo " $(best_version sys-firmware/ipxe)"
|
||||
echo " $(best_version sys-firmware/seabios)"
|
||||
if has_version 'sys-firmware/seabios[binary]'; then
|
||||
echo " USE=binary"
|
||||
else
|
||||
echo " USE=''"
|
||||
fi
|
||||
echo " $(best_version sys-firmware/vgabios)"
|
||||
}
|
@ -0,0 +1,469 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
|
||||
PYTHON_COMPAT=( python2_7 )
|
||||
PYTHON_REQ_USE='ncurses,xml,threads'
|
||||
|
||||
inherit eutils bash-completion-r1 flag-o-matic multilib python-single-r1 toolchain-funcs versionator
|
||||
|
||||
MY_PV=${PV/_/-}
|
||||
MAJOR_V="$(get_version_component_range 1-2)"
|
||||
|
||||
if [[ $PV == *9999 ]]; then
|
||||
inherit git-r3
|
||||
KEYWORDS=""
|
||||
REPO="xen.git"
|
||||
EGIT_REPO_URI="git://xenbits.xen.org/${REPO}"
|
||||
S="${WORKDIR}/${REPO}"
|
||||
else
|
||||
KEYWORDS="~amd64 ~arm ~arm64 ~x86"
|
||||
UPSTREAM_VER=0
|
||||
SECURITY_VER=7
|
||||
# vars set to reflect https://dev.gentoo.org/~idella4/
|
||||
# first instance of UPS_VER (usptream ver)
|
||||
UPS_VER=0
|
||||
SEC_VER=5
|
||||
QEMU_VER=0
|
||||
# xen-tools's gentoo patches tarball
|
||||
GENTOO_VER=4
|
||||
# xen-tools's gentoo patches version which apply to this specific ebuild
|
||||
GENTOO_GPV=0
|
||||
# xen-tools ovmf's patches
|
||||
OVMF_VER=1
|
||||
|
||||
SEABIOS_VER=1.8.2
|
||||
OVMF_PV=20150629
|
||||
|
||||
[[ -n ${UPSTREAM_VER} ]] && \
|
||||
UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz
|
||||
https://dev.gentoo.org/~idella4/distfiles/${PN/-tools}-upstream-patches-${UPS_VER}.tar.gz"
|
||||
[[ -n ${SECURITY_VER} ]] && \
|
||||
SECURITY_PATCHSET_URI="https://dev.gentoo.org/~idella4/distfiles/${PN/-tools}-security-patches-${SECURITY_VER}.tar.xz
|
||||
https://dev.gentoo.org/~idella4/distfiles/${PN/-tools}-security-patches-${SEC_VER}.tar.gz
|
||||
https://dev.gentoo.org/~idella4/distfiles/${PN/-tools}-qemu-patches-${QEMU_VER}.tar.gz"
|
||||
[[ -n ${GENTOO_VER} ]] && \
|
||||
GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-gentoo-patches-${GENTOO_VER}.tar.xz"
|
||||
[[ -n ${OVMF_VER} ]] && \
|
||||
OVMF_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-ovmf-patches-${OVMF_VER}.tar.xz"
|
||||
|
||||
SRC_URI="http://bits.xensource.com/oss-xen/release/${MY_PV}/xen-${MY_PV}.tar.gz
|
||||
http://code.coreboot.org/p/seabios/downloads/get/seabios-${SEABIOS_VER}.tar.gz
|
||||
https://dev.gentoo.org/~dlan/distfiles/seabios-${SEABIOS_VER}.tar.gz
|
||||
ovmf? ( https://dev.gentoo.org/~dlan/distfiles/ovmf-${OVMF_PV}.tar.bz2
|
||||
${OVMF_PATCHSET_URI} )
|
||||
${UPSTREAM_PATCHSET_URI}
|
||||
${SECURITY_PATCHSET_URI}
|
||||
${GENTOO_PATCHSET_URI}"
|
||||
|
||||
S="${WORKDIR}/xen-${MY_PV}"
|
||||
fi
|
||||
|
||||
DESCRIPTION="Xen tools including QEMU and xl"
|
||||
HOMEPAGE="http://xen.org/"
|
||||
DOCS=( README docs/README.xen-bugtool )
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0/${MAJOR_V}"
|
||||
# Inclusion of IUSE ocaml on stabalizing requires maintainer of ocaml to (get off his hands and) make
|
||||
# >=dev-lang/ocaml-4 stable
|
||||
# Masked in profiles/eapi-5-files instead
|
||||
IUSE="api custom-cflags debug doc flask hvm qemu ocaml ovmf qemu-traditional +pam python pygrub screen sdl static-libs system-qemu system-seabios"
|
||||
|
||||
REQUIRED_USE="hvm? ( || ( qemu system-qemu ) )
|
||||
${PYTHON_REQUIRED_USE}
|
||||
pygrub? ( python )
|
||||
ovmf? ( hvm )
|
||||
qemu? ( !system-qemu )"
|
||||
|
||||
COMMON_DEPEND="
|
||||
dev-libs/lzo:2
|
||||
dev-libs/glib:2
|
||||
dev-libs/yajl
|
||||
dev-libs/libaio
|
||||
dev-libs/libgcrypt:0
|
||||
sys-libs/zlib
|
||||
"
|
||||
|
||||
DEPEND="${COMMON_DEPEND}
|
||||
dev-python/lxml[${PYTHON_USEDEP}]
|
||||
x86? ( sys-devel/dev86
|
||||
sys-power/iasl )
|
||||
pam? ( dev-python/pypam[${PYTHON_USEDEP}] )
|
||||
${PYTHON_DEPS}
|
||||
api? ( dev-libs/libxml2
|
||||
net-misc/curl )
|
||||
ovmf? ( $(python_gen_impl_dep sqlite) )
|
||||
!amd64? ( >=sys-apps/dtc-1.4.0 )
|
||||
amd64? ( sys-devel/bin86
|
||||
system-seabios? ( sys-firmware/seabios )
|
||||
sys-firmware/ipxe
|
||||
sys-devel/dev86
|
||||
sys-power/iasl )
|
||||
dev-lang/perl
|
||||
app-misc/pax-utils
|
||||
doc? (
|
||||
app-doc/doxygen
|
||||
dev-python/markdown[${PYTHON_USEDEP}]
|
||||
dev-tex/latex2html[png,gif]
|
||||
media-gfx/graphviz
|
||||
dev-tex/xcolor
|
||||
media-gfx/transfig
|
||||
dev-texlive/texlive-latexextra
|
||||
virtual/latex-base
|
||||
dev-tex/latexmk
|
||||
dev-texlive/texlive-latex
|
||||
dev-texlive/texlive-pictures
|
||||
dev-texlive/texlive-latexrecommended
|
||||
)
|
||||
hvm? ( x11-proto/xproto
|
||||
!net-libs/libiscsi )
|
||||
qemu? (
|
||||
x11-libs/pixman
|
||||
sdl? ( media-libs/libsdl[X] )
|
||||
)
|
||||
system-qemu? ( app-emulation/qemu[xen] )
|
||||
ocaml? ( dev-ml/findlib
|
||||
>=dev-lang/ocaml-4 )"
|
||||
|
||||
RDEPEND="${COMMON_DEPEND}
|
||||
sys-apps/iproute2[-minimal]
|
||||
net-misc/bridge-utils
|
||||
screen? (
|
||||
app-misc/screen
|
||||
app-admin/logrotate
|
||||
)"
|
||||
|
||||
# hvmloader is used to bootstrap a fully virtualized kernel
|
||||
# Approved by QA team in bug #144032
|
||||
QA_WX_LOAD="usr/lib/xen/boot/hvmloader
|
||||
usr/share/qemu-xen/qemu/s390-ccw.img"
|
||||
|
||||
RESTRICT="test"
|
||||
|
||||
pkg_setup() {
|
||||
python-single-r1_pkg_setup
|
||||
export "CONFIG_LOMOUNT=y"
|
||||
|
||||
#bug 522642, disable compile tools/tests
|
||||
export "CONFIG_TESTS=n"
|
||||
|
||||
if has_version dev-libs/libgcrypt:0; then
|
||||
export "CONFIG_GCRYPT=y"
|
||||
fi
|
||||
|
||||
if [[ -z ${XEN_TARGET_ARCH} ]] ; then
|
||||
if use x86 && use amd64; then
|
||||
die "Confusion! Both x86 and amd64 are set in your use flags!"
|
||||
elif use x86; then
|
||||
export XEN_TARGET_ARCH="x86_32"
|
||||
elif use amd64 ; then
|
||||
export XEN_TARGET_ARCH="x86_64"
|
||||
elif use arm; then
|
||||
export XEN_TARGET_ARCH="arm32"
|
||||
elif use arm64; then
|
||||
export XEN_TARGET_ARCH="arm64"
|
||||
else
|
||||
die "Unsupported architecture!"
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
# Upstream's patchset
|
||||
if [[ -n ${UPSTREAM_VER} ]]; then
|
||||
einfo "Try to apply Xen Upstream patch set"
|
||||
EPATCH_SUFFIX="patch" \
|
||||
EPATCH_FORCE="yes" \
|
||||
EPATCH_OPTS="-p1" \
|
||||
epatch "${WORKDIR}"/patches-upstream \
|
||||
"${WORKDIR}"/libexec.patch
|
||||
fi
|
||||
|
||||
# Security patchset
|
||||
if [[ -n ${SECURITY_VER} ]]; then
|
||||
einfo "Try to apply Xen Security patch set"
|
||||
source "${WORKDIR}"/patches-security/${PV}.conf
|
||||
# apply main xen patches
|
||||
# Two parallel systems, both work side by side
|
||||
# Over time they may concdense into one. This will suffice for now
|
||||
EPATCH_SUFFIX="patch"
|
||||
EPATCH_FORCE="yes"
|
||||
for i in ${XEN_SECURITY_MAIN}; do
|
||||
epatch "${WORKDIR}"/patches-security/xen/$i
|
||||
done
|
||||
|
||||
for i in "${WORKDIR}"/xen-sec/xsa*.patch; do
|
||||
epatch $i
|
||||
done
|
||||
|
||||
# apply qemu-traditional patches
|
||||
pushd "${S}"/tools/qemu-xen-traditional/ > /dev/null
|
||||
for i in ${XEN_SECURITY_QEMUT}; do
|
||||
epatch "${WORKDIR}"/patches-security/qemut/$i
|
||||
done
|
||||
for i in "${WORKDIR}"/qemu-patches/qemut/xsa*.patch; do
|
||||
epatch $i
|
||||
done
|
||||
popd > /dev/null
|
||||
|
||||
# apply qemu-xen/upstream patches
|
||||
pushd "${S}"/tools/qemu-xen/ > /dev/null
|
||||
for i in ${XEN_SECURITY_QEMUU}; do
|
||||
epatch "${WORKDIR}"/patches-security/qemuu/$i
|
||||
done
|
||||
for i in "${WORKDIR}"/qemu-patches/qemuu/xsa*.patch; do
|
||||
epatch $i
|
||||
done
|
||||
popd > /dev/null
|
||||
fi
|
||||
|
||||
# move before Gentoo patch, one patch should apply to seabios, to fix gcc-4.5.x build err
|
||||
mv ../seabios-${SEABIOS_VER} tools/firmware/seabios-dir-remote || die
|
||||
pushd tools/firmware/ > /dev/null
|
||||
ln -s seabios-dir-remote seabios-dir || die
|
||||
popd > /dev/null
|
||||
|
||||
# Gentoo's patchset
|
||||
if [[ -n ${GENTOO_VER} && -n ${GENTOO_GPV} ]]; then
|
||||
einfo "Try to apply Gentoo specific patch set"
|
||||
source "${FILESDIR}"/gentoo-patches.conf
|
||||
_gpv=_gpv_${PN/-/_}_${PV//./}_${GENTOO_GPV}
|
||||
for i in ${!_gpv}; do
|
||||
EPATCH_SUFFIX="patch" \
|
||||
EPATCH_FORCE="yes" \
|
||||
epatch "${WORKDIR}"/patches-gentoo/$i
|
||||
done
|
||||
fi
|
||||
|
||||
# Ovmf's patchset
|
||||
if [[ -n ${OVMF_VER} ]] && use ovmf; then
|
||||
einfo "Try to apply Ovmf patch set"
|
||||
pushd "${WORKDIR}"/ovmf-*/ > /dev/null
|
||||
EPATCH_SUFFIX="patch" \
|
||||
EPATCH_FORCE="yes" \
|
||||
EPATCH_OPTS="-p1" \
|
||||
epatch "${WORKDIR}"/patches-ovmf
|
||||
popd > /dev/null
|
||||
mv ../ovmf-${OVMF_PV} tools/firmware/ovmf-dir-remote || die
|
||||
fi
|
||||
|
||||
mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die
|
||||
|
||||
# Fix texi2html build error with new texi2html, qemu.doc.html
|
||||
sed -i -e "/texi2html -monolithic/s/-number//" tools/qemu-xen-traditional/Makefile || die
|
||||
|
||||
use api || sed -e "/SUBDIRS-\$(LIBXENAPI_BINDINGS) += libxen/d" -i tools/Makefile || die
|
||||
sed -e 's:$(MAKE) PYTHON=$(PYTHON) subdirs-$@:LC_ALL=C "$(MAKE)" PYTHON=$(PYTHON) subdirs-$@:' \
|
||||
-i tools/firmware/Makefile || die
|
||||
|
||||
# Drop .config, fixes to gcc-4.6
|
||||
sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't drop"
|
||||
|
||||
# if the user *really* wants to use their own custom-cflags, let them
|
||||
if use custom-cflags; then
|
||||
einfo "User wants their own CFLAGS - removing defaults"
|
||||
|
||||
# try and remove all the default cflags
|
||||
find "${S}" \( -name Makefile -o -name Rules.mk -o -name Config.mk \) \
|
||||
-exec sed \
|
||||
-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
|
||||
-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
|
||||
-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
|
||||
-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
|
||||
-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
|
||||
-i {} + || die "failed to re-set custom-cflags"
|
||||
else
|
||||
unset CFLAGS
|
||||
unset LDFLAGS
|
||||
unset ASFLAGS
|
||||
unset CPPFLAGS
|
||||
fi
|
||||
|
||||
if ! use pygrub; then
|
||||
sed -e '/^SUBDIRS-y += pygrub/d' -i tools/Makefile || die
|
||||
fi
|
||||
|
||||
if ! use python; then
|
||||
sed -e '/^SUBDIRS-y += python$/d' -i tools/Makefile || die
|
||||
fi
|
||||
|
||||
if ! use hvm; then
|
||||
sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile || die
|
||||
# Bug 351648
|
||||
elif ! use x86 && ! has x86 $(get_all_abis); then
|
||||
mkdir -p "${WORKDIR}"/extra-headers/gnu || die
|
||||
touch "${WORKDIR}"/extra-headers/gnu/stubs-32.h || die
|
||||
export CPATH="${WORKDIR}"/extra-headers
|
||||
fi
|
||||
|
||||
if use qemu; then
|
||||
if use sdl; then
|
||||
sed -i -e "s:\$\$source/configure:\0 --enable-sdl:" \
|
||||
tools/Makefile || die
|
||||
else
|
||||
sed -i -e "s:\${QEMU_ROOT\:\-\.}/configure:\0 --disable-sdl:" \
|
||||
tools/qemu-xen-traditional/xen-setup || die
|
||||
sed -i -e "s:\$\$source/configure:\0 --disable-sdl:" \
|
||||
tools/Makefile || die
|
||||
fi
|
||||
else
|
||||
# Don't bother with qemu, only needed for fully virtualised guests
|
||||
sed -e "s:install-tools\: tools/qemu-xen-traditional-dir:install-tools\: :g" -i Makefile || die
|
||||
fi
|
||||
|
||||
# Reset bash completion dir; Bug 472438
|
||||
sed -e "s:^BASH_COMPLETION_DIR ?= \$(CONFIG_DIR)/bash_completion.d:BASH_COMPLETION_DIR ?= $(get_bashcompdir):" \
|
||||
-i Config.mk || die
|
||||
sed -i -e "/bash-completion/s/xl\.sh/xl/g" tools/libxl/Makefile || die
|
||||
|
||||
# xencommons, Bug #492332, sed lighter weight than patching
|
||||
sed -e 's:\$QEMU_XEN -xen-domid:test -e "\$QEMU_XEN" \&\& &:' \
|
||||
-i tools/hotplug/Linux/init.d/xencommons.in || die
|
||||
|
||||
# respect multilib, usr/lib/libcacard.so.0.0.0
|
||||
sed -e "/^libdir=/s/\/lib/\/$(get_libdir)/" \
|
||||
-i tools/qemu-xen/configure || die
|
||||
|
||||
#bug 518136, don't build 32bit exactuable for nomultilib profile
|
||||
if [[ "${ARCH}" == 'amd64' ]] && ! has_multilib_profile; then
|
||||
sed -i -e "/x86_emulator/d" tools/tests/Makefile || die
|
||||
fi
|
||||
|
||||
# use /var instead of /var/lib, consistat with previous ebuild
|
||||
sed -i -e "/XEN_LOCK_DIR=/s/\$localstatedir/\/var/g" \
|
||||
m4/paths.m4 configure tools/configure || die
|
||||
# use /run instead of /var/run
|
||||
sed -i -e "/XEN_RUN_DIR=/s/\$localstatedir//g" \
|
||||
m4/paths.m4 configure tools/configure || die
|
||||
|
||||
# uncomment lines in xl.conf
|
||||
sed -e 's:^#autoballoon=:autoballoon=:' \
|
||||
-e 's:^#lockfile=:lockfile=:' \
|
||||
-e 's:^#vif.default.script=:vif.default.script=:' \
|
||||
-i tools/examples/xl.conf || die
|
||||
|
||||
epatch_user
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local myconf="--prefix=${PREFIX}/usr \
|
||||
--libdir=${PREFIX}/usr/$(get_libdir) \
|
||||
--libexecdir=${PREFIX}/usr/libexec \
|
||||
--disable-werror \
|
||||
--disable-xen \
|
||||
--enable-tools \
|
||||
--enable-docs \
|
||||
$(use_with system-qemu) \
|
||||
$(use_enable pam) \
|
||||
$(use_enable api xenapi) \
|
||||
$(use_enable ovmf) \
|
||||
$(use_enable ocaml ocamltools) \
|
||||
--with-xenstored=$(usex ocaml 'oxenstored' 'xenstored') \
|
||||
"
|
||||
|
||||
use system-seabios && myconf+=" --with-system-seabios=/usr/share/seabios/bios.bin"
|
||||
use qemu || myconf+=" --with-system-qemu"
|
||||
use amd64 && myconf+=" $(use_enable qemu-traditional)"
|
||||
econf ${myconf}
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
export VARTEXFONTS="${T}/fonts"
|
||||
local myopt
|
||||
use debug && myopt="${myopt} debug=y"
|
||||
|
||||
if test-flag-CC -fno-strict-overflow; then
|
||||
append-flags -fno-strict-overflow
|
||||
fi
|
||||
|
||||
emake V=1 CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" -C tools ${myopt}
|
||||
|
||||
use doc && emake -C docs txt html
|
||||
emake -C docs man-pages
|
||||
}
|
||||
|
||||
src_install() {
|
||||
# Override auto-detection in the build system, bug #382573
|
||||
export INITD_DIR=/tmp/init.d
|
||||
export CONFIG_LEAF_DIR=../tmp/default
|
||||
|
||||
# Let the build system compile installed Python modules.
|
||||
local PYTHONDONTWRITEBYTECODE
|
||||
export PYTHONDONTWRITEBYTECODE
|
||||
|
||||
emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" \
|
||||
XEN_PYTHON_NATIVE_INSTALL=y install-tools
|
||||
|
||||
# Fix the remaining Python shebangs.
|
||||
python_fix_shebang "${D}"
|
||||
|
||||
# Remove RedHat-specific stuff
|
||||
rm -rf "${D}"tmp || die
|
||||
|
||||
if use doc; then
|
||||
emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs
|
||||
|
||||
dohtml -r docs/
|
||||
docinto pdf
|
||||
dodoc ${DOCS[@]}
|
||||
[ -d "${D}"/usr/share/doc/xen ] && mv "${D}"/usr/share/doc/xen/* "${D}"/usr/share/doc/${PF}/html
|
||||
fi
|
||||
|
||||
rm -rf "${D}"/usr/share/doc/xen/
|
||||
doman docs/man?/*
|
||||
|
||||
newconfd "${FILESDIR}"/xendomains.confd xendomains
|
||||
newconfd "${FILESDIR}"/xenstored.confd xenstored
|
||||
newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled
|
||||
newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains
|
||||
newinitd "${FILESDIR}"/xenstored.initd xenstored
|
||||
newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled
|
||||
newinitd "${FILESDIR}"/xencommons.initd xencommons
|
||||
newconfd "${FILESDIR}"/xencommons.confd xencommons
|
||||
newinitd "${FILESDIR}"/xenqemudev.initd xenqemudev
|
||||
newconfd "${FILESDIR}"/xenqemudev.confd xenqemudev
|
||||
|
||||
if use screen; then
|
||||
cat "${FILESDIR}"/xendomains-screen.confd >> "${D}"/etc/conf.d/xendomains || die
|
||||
cp "${FILESDIR}"/xen-consoles.logrotate "${D}"/etc/xen/ || die
|
||||
keepdir /var/log/xen-consoles
|
||||
fi
|
||||
|
||||
# For -static-libs wrt Bug 384355
|
||||
if ! use static-libs; then
|
||||
rm -f "${D}"usr/$(get_libdir)/*.a "${D}"usr/$(get_libdir)/ocaml/*/*.a
|
||||
fi
|
||||
|
||||
# for xendomains
|
||||
keepdir /etc/xen/auto
|
||||
|
||||
# Remove files failing QA AFTER emake installs them, avoiding seeking absent files
|
||||
find "${D}" \( -name openbios-sparc32 -o -name openbios-sparc64 \
|
||||
-o -name openbios-ppc -o -name palcode-clipper \) -delete || die
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
elog "Official Xen Guide and the offical wiki page:"
|
||||
elog "https://wiki.gentoo.org/wiki/Xen"
|
||||
elog "http://wiki.xen.org/wiki/Main_Page"
|
||||
elog ""
|
||||
elog "Recommended to utilise the xencommons script to config sytem At boot"
|
||||
elog "Add by use of rc-update on completion of the install"
|
||||
|
||||
if ! use hvm; then
|
||||
echo
|
||||
elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm"
|
||||
elog "support enable the hvm use flag."
|
||||
elog "An x86 or amd64 system is required to build HVM support."
|
||||
fi
|
||||
|
||||
if use qemu; then
|
||||
elog "The qemu-bridge-helper is renamed to the xen-bridge-helper in the in source"
|
||||
elog "build of qemu. This allows for app-emulation/qemu to be emerged concurrently"
|
||||
elog "with the qemu capable xen. It is up to the user to distinguish between and utilise"
|
||||
elog "the qemu-bridge-helper and the xen-bridge-helper. File bugs of any issues that arise"
|
||||
fi
|
||||
}
|
@ -1,3 +1,4 @@
|
||||
DIST qp9.1.tar.gz 1460679 SHA256 1f3052f2700d537b33207943a3ade48b2b3aa5cd01cafc0475bcf26c645bc9af SHA512 44590be9d1ecec97fa6c82b657e9ecc3778f833644055ee87c9a6a36996663d139ffd7b583d72f8ac317648e0f22ccbc2a1da9c3a5eabd23381c668e5d073cbb WHIRLPOOL 37ec4e25c2284b267f72c016b4ea1e542d735c9da5f6532d1f6b439af2b91422ddc251d31e1a17b6366ee6af0e754acdbf8a0c44ef03f46a2515f14b1259b732
|
||||
DIST qp9.5.tar.gz 1537445 SHA256 7e4b9883fad00b16c919620033da48482b2eccc875b37f8170d674ce9f72aee2 SHA512 7a79090a6e3f0263e38cf5e5724a5c35c63c8cca2842fa8c07f9ff84011ef7ac9a22b195713aeb626a787c9391c612f3fea0ff38c084634a2f62258feb3eb6e2 WHIRLPOOL 3f589998f3480925fa3ad3c54f1f0ba4122cfa12c48d9bf1269e92a0fdf52d1823cd8dae8851e36d2c97ec2f869da10ff6ee7f2663b752d1d396e1b5a95ca982
|
||||
DIST qp9.6.tar.gz 1539483 SHA256 631ab73af271279d583c5ecf19e5542dd8dff097179e3bb34ac2624aeb029f7a SHA512 a15d3f2254d9ed9a2032f7e2902363f2ed2dbf0a7ba67a89aae79202d38954a195e93725aa828d19d50d7a891d8cea4f0d23af66ffd55984738db9b612467cd8 WHIRLPOOL 3dcc746da3283044267abd7aa00795b1bff79bffd206c1bf227087281d94f2dc4a390a5ccd85933641aea150313b2f62e0e9fbe491ef4fafa73e4fdd9b35d7d1
|
||||
DIST qp9.7.tar.gz 1539804 SHA256 9b77c97e0cb981669cf27df0f68875ba44958e67cc82ac71a4f5d2665b96708b SHA512 20a7a00eab2ec489489f95d78eb4dc8edf71d99fae2f23807158ca78d0bbd1b66d03460f0e06f91ac4ecafd9aab2bbdd109368ba8d3cc2c8452e17c634035c19 WHIRLPOOL 20a790902848790cfedefc6434eda01bb4b0ed2cfdf26c7d1a7914cef9916d161fcd397001a7f5a0aadf2d710112446bd99103f161ef22ad7b3567b45b33ac6d
|
||||
|
@ -0,0 +1,91 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
|
||||
inherit eutils multilib qmake-utils
|
||||
|
||||
MY_P=qp${PV}
|
||||
|
||||
DESCRIPTION="Extended Prolog supporting quantifiers, object-variables and substitutions"
|
||||
HOMEPAGE="http://www.itee.uq.edu.au/~pjr/HomePages/QuPrologHome.html"
|
||||
SRC_URI="http://www.itee.uq.edu.au/~pjr/HomePages/QPFiles/${MY_P}.tar.gz"
|
||||
|
||||
LICENSE="Qu-Prolog GPL-2+"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~ppc ~x86"
|
||||
IUSE="debug doc examples pedro qt4 readline threads"
|
||||
|
||||
RDEPEND="
|
||||
!dev-util/mpatch
|
||||
!dev-util/rej
|
||||
qt4? ( dev-qt/qtgui:4 )
|
||||
pedro? ( net-misc/pedro )
|
||||
readline? ( app-misc/rlwrap )"
|
||||
DEPEND="${RDEPEND}
|
||||
dev-lang/perl"
|
||||
|
||||
S="${WORKDIR}"/${MY_P}
|
||||
|
||||
src_configure() {
|
||||
econf \
|
||||
--libdir=/usr/$(get_libdir) \
|
||||
$(use_enable debug) \
|
||||
$(use_enable threads multiple-threads)
|
||||
|
||||
if use qt4; then
|
||||
cd "${S}"/src/xqp || die
|
||||
eqmake4 xqp.pro
|
||||
fi
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake OPTIMISATION="${CXXFLAGS}"
|
||||
|
||||
if use qt4; then
|
||||
cd "${S}"/src/xqp || die
|
||||
emake
|
||||
fi
|
||||
}
|
||||
|
||||
src_install() {
|
||||
sed \
|
||||
-e "s|${S}|/usr/$(get_libdir)/qu-prolog|g" \
|
||||
-i bin/qc bin/qc1.qup bin/qecat bin/qg bin/qp || die
|
||||
|
||||
dobin bin/{qc,qecat,qp,kq}
|
||||
|
||||
into /usr/$(get_libdir)/${PN}
|
||||
dobin bin/{qa,qc1.qup,qdeal,qem,qg,ql,qppp}
|
||||
|
||||
use qt4 && dobin src/xqp/xqp
|
||||
|
||||
insinto /usr/$(get_libdir)/${PN}/bin
|
||||
doins bin/rl_commands
|
||||
doins bin/{qc1.qup,qecat,qg,qp}.qx
|
||||
|
||||
insinto /usr/$(get_libdir)/${PN}/library
|
||||
doins prolog/library/*.qo
|
||||
|
||||
insinto /usr/$(get_libdir)/${PN}/compiler
|
||||
doins prolog/compiler/*.qo
|
||||
|
||||
doman doc/man/man1/*.1
|
||||
|
||||
dodoc README
|
||||
|
||||
if use doc ; then
|
||||
docinto reference-manual
|
||||
dodoc doc/manual/*.html
|
||||
docinto user-guide
|
||||
dodoc doc/user/main.pdf
|
||||
fi
|
||||
|
||||
if use examples ; then
|
||||
insinto /usr/share/doc/${PF}/examples
|
||||
doins examples/*.ql
|
||||
docinto examples
|
||||
newdoc examples/README README.examples
|
||||
fi
|
||||
}
|
@ -1,6 +1,3 @@
|
||||
DIST 2p-2.4.0.zip 2421675 SHA256 f674b282bd7bc60e92ea417f8766e635979366d84d48634dd622e60ad1aa78c6 SHA512 20c86f736efe526dfffe603b19648394aaeaadf326034bba4f5717a193d7f76a99c6f3cb7bb93e2f1b608abd4e4af30341a2727f61e60e60289c2a964da782e9 WHIRLPOOL 7a353f5c6df2dba877d6880fc91ff0356639900767eb346a2eba97773303e125d0d2ffeead35e83cb61ffd013b49d4a05498861207de228e208a3f690a65ec4b
|
||||
DIST tuprolog-2.5.0.zip 4847183 SHA256 227714576fb1815a3fcc017211758bfb2d5a0b6a07ce3a3a24f8cd93db2e5e04 SHA512 cf026d2171537fe3ca04a4cf572497fb1ce32ff2d0c206268fd62cf7b8216f61da73150def1ee884b367451a5da57a354e1f7ba75deb28e34ed3d390cb5ee35b WHIRLPOOL fb11d691262ac5fc16a7258ab73cde32623068402645ffcecbd4701b499ab674f2da8a3c7bbb0ca750651803f6e134085b89730667fd6b01faaa36ff15ec115e
|
||||
DIST tuprolog-2.6.0.tar.gz 8366655 SHA256 5c9416c72ddde806720c1bce122a8bb12cab04a9af35a42b88067e1b145bf0c5 SHA512 5253f0d65787e9f090a8b4da8df007da269492098686fa5847e8d624a6656d1820b36c5b096e51d6f40480fea02a64793797c23161627942f076fc5eae414b82 WHIRLPOOL 81de4453dd6b62558260f31ab2e3af1f2a256934cc8a24a9e18723bd95ef646b206941169a3d69994f26f20c65c00b14022392f35ccb8573d8a7cbc7af16b353
|
||||
DIST tuprolog-2.7.0.tar.gz 9005490 SHA256 93cec171d48e40a695baafcce419b75fc3d7b6e5ef06b0e787b4823e09f571a7 SHA512 88a9edb5c26317ea82e114a7e82d933d99f85ca89f1244d92de66e7eae11c8c61ed771c104a70ec210c1a65dca2b3ca2c3aba077d3afab4b250b62d14e83c7e4 WHIRLPOOL 3f4c76bea53b899d7be6fa93a9b24c5aaab84bd5ba4c65ca2a988e3a8acaeb1f2d0205c3a60720fbbf02a54d52bb6e7c39b5504ae9777d80d8f238b7c3c7050a
|
||||
DIST tuprolog-2.7.2.tar.gz 9104934 SHA256 8b0c653d3c9d701197f13d8dec6e45548565cddfd052a5bec9578f4e6a50f21e SHA512 c327893e0fcf777b6ad8951b3baf88bc9527bf88e9d06ac54af04e777e6c0fc255b15f492c2cf483859d3a1966897d5969e1496370b88287b96e83d92babc722 WHIRLPOOL cf5082d0ca07f8bc59e678c27b1fb8aaa8879f6b15dc887949cb61760dfd721ba4a6fd5b05fb979ea94e6ab607dfcff5707be47d5ac657623556426e734ca395
|
||||
DIST tuprolog-2.9.0.tar.gz 4841110 SHA256 e789c7f1777a4f57698ac4756d03574f8fd5be4cebb1d5226722c35df75e163f SHA512 be15c99c40f750f3d1d4b70ae7ced9fe3792e8747876b6190ec1a01dd287e0fa34f88671f99f9e3fd7249e6fd44da7c4dadce0cd111b44b24e0e43d31c85165e WHIRLPOOL ada10ff775dc5e55d5c55c4dc920f5a4e7f8654891a10cf815734649e384fe6351921b807c54f6a6e8503fcbd0cbd9ee7f1569140bb5eba7e77e4da85f907203
|
||||
|
@ -1,228 +0,0 @@
|
||||
diff -ur 2p-deploy.orig/src/alice/tuprolog/ChoicePointStore.java 2p-deploy/src/alice/tuprolog/ChoicePointStore.java
|
||||
--- 2p-deploy.orig/src/alice/tuprolog/ChoicePointStore.java 2010-01-21 21:29:24.000000000 +1300
|
||||
+++ 2p-deploy/src/alice/tuprolog/ChoicePointStore.java 2012-01-15 09:20:48.000000000 +1300
|
||||
@@ -35,7 +35,6 @@
|
||||
|
||||
/**
|
||||
* Return the actual choice-point store
|
||||
- * @return
|
||||
*/
|
||||
public ChoicePointContext getPointer() {
|
||||
return pointer;
|
||||
@@ -44,7 +43,6 @@
|
||||
/**
|
||||
* Check if a choice point exists in the store.
|
||||
* As a side effect, removes choice points which have been already used and are now empty.
|
||||
- * @return
|
||||
*/
|
||||
protected boolean existChoicePoint() {
|
||||
if (pointer == null) return false;
|
||||
diff -ur 2p-deploy.orig/src/alice/tuprolog/ClauseStore.java 2p-deploy/src/alice/tuprolog/ClauseStore.java
|
||||
--- 2p-deploy.orig/src/alice/tuprolog/ClauseStore.java 2010-11-04 11:55:42.000000000 +1300
|
||||
+++ 2p-deploy/src/alice/tuprolog/ClauseStore.java 2012-01-15 09:20:48.000000000 +1300
|
||||
@@ -62,8 +62,6 @@
|
||||
|
||||
/**
|
||||
* Verify if there is a term in compatibleGoals compatible with goal.
|
||||
- * @param goal
|
||||
- * @param compGoals
|
||||
* @return true if compatible or false otherwise.
|
||||
*/
|
||||
protected boolean existCompatibleClause() {
|
||||
diff -ur 2p-deploy.orig/src/alice/tuprolog/EngineManager.java 2p-deploy/src/alice/tuprolog/EngineManager.java
|
||||
--- 2p-deploy.orig/src/alice/tuprolog/EngineManager.java 2010-01-21 21:29:24.000000000 +1300
|
||||
+++ 2p-deploy/src/alice/tuprolog/EngineManager.java 2012-01-15 09:20:48.000000000 +1300
|
||||
@@ -87,7 +87,7 @@
|
||||
/**
|
||||
* Solves a query
|
||||
*
|
||||
- * @param g the term representing the goal to be demonstrated
|
||||
+ * @param query the term representing the goal to be demonstrated
|
||||
* @return the result of the demonstration
|
||||
* @see SolveInfo
|
||||
**/
|
||||
diff -ur 2p-deploy.orig/src/alice/tuprolog/PrimitiveManager.java 2p-deploy/src/alice/tuprolog/PrimitiveManager.java
|
||||
--- 2p-deploy.orig/src/alice/tuprolog/PrimitiveManager.java 2010-01-21 21:29:24.000000000 +1300
|
||||
+++ 2p-deploy/src/alice/tuprolog/PrimitiveManager.java 2012-01-15 09:20:48.000000000 +1300
|
||||
@@ -87,7 +87,7 @@
|
||||
* This involves identifying structs representing builtin
|
||||
* predicates and functors, and setting up related structures and links
|
||||
*
|
||||
- * @parm term the term to be identified
|
||||
+ * @param term the term to be identified
|
||||
* @return term with the identified built-in directive
|
||||
*/
|
||||
public Term identifyDirective(Term term) {
|
||||
diff -ur 2p-deploy.orig/src/alice/tuprolog/lib/BasicLibrary.java 2p-deploy/src/alice/tuprolog/lib/BasicLibrary.java
|
||||
--- 2p-deploy.orig/src/alice/tuprolog/lib/BasicLibrary.java 2011-01-28 16:31:44.000000000 +1300
|
||||
+++ 2p-deploy/src/alice/tuprolog/lib/BasicLibrary.java 2012-01-15 09:20:48.000000000 +1300
|
||||
@@ -109,7 +109,7 @@
|
||||
/**
|
||||
* Loads a library constructed from a theory.
|
||||
*
|
||||
- * @param theory
|
||||
+ * @param th
|
||||
* theory text
|
||||
* @param libName
|
||||
* name of the library
|
||||
diff -ur 2p-deploy.orig/src/alice/tuprolog/lib/IOLibrary.java 2p-deploy/src/alice/tuprolog/lib/IOLibrary.java
|
||||
--- 2p-deploy.orig/src/alice/tuprolog/lib/IOLibrary.java 2011-01-19 16:34:24.000000000 +1300
|
||||
+++ 2p-deploy/src/alice/tuprolog/lib/IOLibrary.java 2012-01-15 09:20:48.000000000 +1300
|
||||
@@ -372,7 +372,7 @@
|
||||
/**
|
||||
* Sets an arbitrary seed for the Random object.
|
||||
*
|
||||
- * @param seed Seed to use
|
||||
+ * @param t Seed to use
|
||||
* @return true if seed Term has a valid long value, false otherwise
|
||||
*/
|
||||
public boolean set_seed_1(Term t) throws PrologError {
|
||||
diff -ur 2p-deploy.orig/src/alice/tuprolog/lib/JavaLibrary.java 2p-deploy/src/alice/tuprolog/lib/JavaLibrary.java
|
||||
--- 2p-deploy.orig/src/alice/tuprolog/lib/JavaLibrary.java 2010-01-21 21:29:24.000000000 +1300
|
||||
+++ 2p-deploy/src/alice/tuprolog/lib/JavaLibrary.java 2012-01-15 09:20:48.000000000 +1300
|
||||
@@ -1390,8 +1390,6 @@
|
||||
|
||||
/**
|
||||
* Generates a fresh numeric identifier
|
||||
- *
|
||||
- * @return
|
||||
*/
|
||||
protected Struct generateFreshId() {
|
||||
return new Struct("$obj_" + id++);
|
||||
diff -ur 2p-deploy.orig/src/alice/tuprologx/ide/LibraryDialogFrame.java 2p-deploy/src/alice/tuprologx/ide/LibraryDialogFrame.java
|
||||
--- 2p-deploy.orig/src/alice/tuprologx/ide/LibraryDialogFrame.java 2010-01-21 21:29:22.000000000 +1300
|
||||
+++ 2p-deploy/src/alice/tuprologx/ide/LibraryDialogFrame.java 2012-01-15 09:20:48.000000000 +1300
|
||||
@@ -317,7 +317,6 @@
|
||||
displayLibraryManagerStatus();
|
||||
}
|
||||
|
||||
- /** @see alice.tuprologx.ide.SwingFrame#onClose()*/
|
||||
public void closeLibraryDialog()
|
||||
{
|
||||
onClose();
|
||||
diff -ur 2p-deploy.orig/src/alice/tuprologx/ide/ToolBar.java 2p-deploy/src/alice/tuprologx/ide/ToolBar.java
|
||||
--- 2p-deploy.orig/src/alice/tuprologx/ide/ToolBar.java 2010-01-21 21:29:22.000000000 +1300
|
||||
+++ 2p-deploy/src/alice/tuprologx/ide/ToolBar.java 2012-01-15 09:20:48.000000000 +1300
|
||||
@@ -232,8 +232,6 @@
|
||||
|
||||
/**
|
||||
* Set the tuProlog config frame
|
||||
- *
|
||||
- * @param libraryManager a libraryManager to associate to the libraryDialog
|
||||
*/
|
||||
public void setPrologConfig(PrologConfigFrame configFrame)
|
||||
{
|
||||
diff -ur 2p-deploy.orig/src/alice/tuprologx/pj/lib/PJLibrary.java 2p-deploy/src/alice/tuprologx/pj/lib/PJLibrary.java
|
||||
--- 2p-deploy.orig/src/alice/tuprologx/pj/lib/PJLibrary.java 2010-01-21 21:29:48.000000000 +1300
|
||||
+++ 2p-deploy/src/alice/tuprologx/pj/lib/PJLibrary.java 2012-01-15 09:20:48.000000000 +1300
|
||||
@@ -1252,7 +1252,6 @@
|
||||
|
||||
/**
|
||||
* Generates a fresh numeric identifier
|
||||
- * @return
|
||||
*/
|
||||
protected Struct generateFreshId() {
|
||||
return new Struct("$obj_" + id++);
|
||||
diff -ur 2p-deploy.orig/src/alice/util/ReadOnlyLinkedList.java 2p-deploy/src/alice/util/ReadOnlyLinkedList.java
|
||||
--- 2p-deploy.orig/src/alice/util/ReadOnlyLinkedList.java 2010-03-17 18:14:10.000000000 +1300
|
||||
+++ 2p-deploy/src/alice/util/ReadOnlyLinkedList.java 2012-01-15 09:32:03.000000000 +1300
|
||||
@@ -12,10 +12,10 @@
|
||||
import java.util.ListIterator;
|
||||
|
||||
/**
|
||||
- * ReadOnlyLinkedList<E> encapsulate a {@link LinkedList<E>}
|
||||
+ * ReadOnlyLinkedList<E> encapsulate a {@link LinkedList}
|
||||
* and ensures that the given list is navigated only.
|
||||
*
|
||||
- * Even if ReadOnlyLinkedList<E> implements {@link List<E>} it doesn't
|
||||
+ * Even if ReadOnlyLinkedList<E> implements {@link List} it doesn't
|
||||
* support modifiers methods, and throws {@link UnsupportedOperationException}
|
||||
* if invoked.
|
||||
*
|
||||
diff -ur 2p-deploy.orig/src/alice/util/jedit/InputHandler.java 2p-deploy/src/alice/util/jedit/InputHandler.java
|
||||
--- 2p-deploy.orig/src/alice/util/jedit/InputHandler.java 2010-01-21 21:29:24.000000000 +1300
|
||||
+++ 2p-deploy/src/alice/util/jedit/InputHandler.java 2012-01-15 09:20:48.000000000 +1300
|
||||
@@ -24,7 +24,7 @@
|
||||
*
|
||||
* @author Slava Pestov
|
||||
* @version $Id: InputHandler.java,v 1.14 1999/12/13 03:40:30 sp Exp $
|
||||
- * @see org.gjt.sp.jedit.textarea.DefaultInputHandler
|
||||
+ * @see alice.util.jedit.DefaultInputHandler
|
||||
*/
|
||||
public abstract class InputHandler extends KeyAdapter
|
||||
{
|
||||
@@ -187,7 +187,7 @@
|
||||
/**
|
||||
* Grabs the next key typed event and invokes the specified
|
||||
* action with the key as a the action command.
|
||||
- * @param action The action
|
||||
+ * @param listener The action
|
||||
*/
|
||||
public void grabNextKeyStroke(ActionListener listener)
|
||||
{
|
||||
diff -ur 2p-deploy.orig/src/alice/util/jedit/JEditTextArea.java 2p-deploy/src/alice/util/jedit/JEditTextArea.java
|
||||
--- 2p-deploy.orig/src/alice/util/jedit/JEditTextArea.java 2010-01-21 21:29:24.000000000 +1300
|
||||
+++ 2p-deploy/src/alice/util/jedit/JEditTextArea.java 2012-01-15 09:20:48.000000000 +1300
|
||||
@@ -1389,7 +1389,7 @@
|
||||
|
||||
/**
|
||||
* Sets if the selection should be rectangular.
|
||||
- * @param overwrite True if the selection should be rectangular,
|
||||
+ * @param rectSelect True if the selection should be rectangular,
|
||||
* false otherwise.
|
||||
*/
|
||||
public final void setSelectionRectangular(boolean rectSelect)
|
||||
diff -ur 2p-deploy.orig/src/alice/util/jedit/KeywordMap.java 2p-deploy/src/alice/util/jedit/KeywordMap.java
|
||||
--- 2p-deploy.orig/src/alice/util/jedit/KeywordMap.java 2010-01-21 21:29:22.000000000 +1300
|
||||
+++ 2p-deploy/src/alice/util/jedit/KeywordMap.java 2012-01-15 09:20:48.000000000 +1300
|
||||
@@ -75,7 +75,7 @@
|
||||
/**
|
||||
* Adds a key-value mapping.
|
||||
* @param keyword The key
|
||||
- * @Param id The value
|
||||
+ * @param id The value
|
||||
*/
|
||||
public void add(String keyword, byte id)
|
||||
{
|
||||
diff -ur 2p-deploy.orig/src/alice/util/jedit/TextAreaPainter.java 2p-deploy/src/alice/util/jedit/TextAreaPainter.java
|
||||
--- 2p-deploy.orig/src/alice/util/jedit/TextAreaPainter.java 2010-01-21 21:29:24.000000000 +1300
|
||||
+++ 2p-deploy/src/alice/util/jedit/TextAreaPainter.java 2012-01-15 09:20:48.000000000 +1300
|
||||
@@ -75,7 +75,7 @@
|
||||
/**
|
||||
* Returns the syntax styles used to paint colorized text. Entry <i>n</i>
|
||||
* will be used to paint tokens with id = <i>n</i>.
|
||||
- * @see org.gjt.sp.jedit.syntax.Token
|
||||
+ * @see alice.util.jedit.Token
|
||||
*/
|
||||
public final SyntaxStyle[] getStyles()
|
||||
{
|
||||
@@ -86,7 +86,7 @@
|
||||
* Sets the syntax styles used to paint colorized text. Entry <i>n</i>
|
||||
* will be used to paint tokens with id = <i>n</i>.
|
||||
* @param styles The syntax styles
|
||||
- * @see org.gjt.sp.jedit.syntax.Token
|
||||
+ * @see alice.util.jedit.Token
|
||||
*/
|
||||
public final void setStyles(SyntaxStyle[] styles)
|
||||
{
|
||||
@@ -356,7 +356,7 @@
|
||||
|
||||
/**
|
||||
* Repaints the text.
|
||||
- * @param g The graphics context
|
||||
+ * @param gfx The graphics context
|
||||
*/
|
||||
public void paint(Graphics gfx)
|
||||
{
|
||||
diff -ur 2p-deploy.orig/src/alice/util/jedit/TokenMarker.java 2p-deploy/src/alice/util/jedit/TokenMarker.java
|
||||
--- 2p-deploy.orig/src/alice/util/jedit/TokenMarker.java 2010-01-21 21:29:22.000000000 +1300
|
||||
+++ 2p-deploy/src/alice/util/jedit/TokenMarker.java 2012-01-15 09:20:48.000000000 +1300
|
||||
@@ -24,7 +24,7 @@
|
||||
* @author Slava Pestov
|
||||
* @version $Id: TokenMarker.java,v 1.32 1999/12/13 03:40:30 sp Exp $
|
||||
*
|
||||
- * @see org.gjt.sp.jedit.syntax.Token
|
||||
+ * @see alice.util.jedit.Token
|
||||
*/
|
||||
public abstract class TokenMarker
|
||||
{
|
@ -1,315 +0,0 @@
|
||||
diff -ur tuprolog-2.5.0.orig/src/alice/tuprolog/ChoicePointStore.java tuprolog-2.5.0/src/alice/tuprolog/ChoicePointStore.java
|
||||
--- tuprolog-2.5.0.orig/src/alice/tuprolog/ChoicePointStore.java 2012-08-03 02:38:21.000000000 +0200
|
||||
+++ tuprolog-2.5.0/src/alice/tuprolog/ChoicePointStore.java 2012-08-03 03:45:45.000000000 +0200
|
||||
@@ -36,7 +36,6 @@
|
||||
|
||||
/**
|
||||
* Return the actual choice-point store
|
||||
- * @return
|
||||
*/
|
||||
public ChoicePointContext getPointer() {
|
||||
return pointer;
|
||||
@@ -45,7 +44,6 @@
|
||||
/**
|
||||
* Check if a choice point exists in the store.
|
||||
* As a side effect, removes choice points which have been already used and are now empty.
|
||||
- * @return
|
||||
*/
|
||||
protected boolean existChoicePoint() {
|
||||
if (pointer == null) return false;
|
||||
@@ -93,4 +91,4 @@
|
||||
return l;
|
||||
}
|
||||
|
||||
-}
|
||||
\ No newline at end of file
|
||||
+}
|
||||
diff -ur tuprolog-2.5.0.orig/src/alice/tuprolog/ClauseStore.java tuprolog-2.5.0/src/alice/tuprolog/ClauseStore.java
|
||||
--- tuprolog-2.5.0.orig/src/alice/tuprolog/ClauseStore.java 2012-08-03 02:38:21.000000000 +0200
|
||||
+++ tuprolog-2.5.0/src/alice/tuprolog/ClauseStore.java 2012-08-03 03:45:45.000000000 +0200
|
||||
@@ -62,8 +62,6 @@
|
||||
|
||||
/**
|
||||
* Verify if there is a term in compatibleGoals compatible with goal.
|
||||
- * @param goal
|
||||
- * @param compGoals
|
||||
* @return true if compatible or false otherwise.
|
||||
*/
|
||||
protected boolean existCompatibleClause() {
|
||||
@@ -160,4 +158,4 @@
|
||||
}
|
||||
|
||||
|
||||
-}
|
||||
\ No newline at end of file
|
||||
+}
|
||||
diff -ur tuprolog-2.5.0.orig/src/alice/tuprolog/EngineManager.java tuprolog-2.5.0/src/alice/tuprolog/EngineManager.java
|
||||
--- tuprolog-2.5.0.orig/src/alice/tuprolog/EngineManager.java 2012-08-03 02:38:21.000000000 +0200
|
||||
+++ tuprolog-2.5.0/src/alice/tuprolog/EngineManager.java 2012-08-03 03:45:45.000000000 +0200
|
||||
@@ -96,7 +96,7 @@
|
||||
/**
|
||||
* Solves a query
|
||||
*
|
||||
- * @param g the term representing the goal to be demonstrated
|
||||
+ * @param query the term representing the goal to be demonstrated
|
||||
* @return the result of the demonstration
|
||||
* @see SolveInfo
|
||||
**/
|
||||
@@ -243,4 +243,4 @@
|
||||
}
|
||||
|
||||
|
||||
-}
|
||||
\ No newline at end of file
|
||||
+}
|
||||
diff -ur tuprolog-2.5.0.orig/src/alice/tuprolog/event/SpyEvent.java tuprolog-2.5.0/src/alice/tuprolog/event/SpyEvent.java
|
||||
--- tuprolog-2.5.0.orig/src/alice/tuprolog/event/SpyEvent.java 2012-08-03 02:38:21.000000000 +0200
|
||||
+++ tuprolog-2.5.0/src/alice/tuprolog/event/SpyEvent.java 2012-08-03 03:45:45.000000000 +0200
|
||||
@@ -33,10 +33,6 @@
|
||||
* event description
|
||||
*/
|
||||
private String msg;
|
||||
- /**
|
||||
- * @uml.property name="env"
|
||||
- * @uml.associationEnd
|
||||
- */
|
||||
private Engine env;
|
||||
|
||||
public SpyEvent(Object source, String msg_) {
|
||||
@@ -63,4 +59,4 @@
|
||||
return msg + ((env == null) ? "" : env.toString());
|
||||
}
|
||||
|
||||
-}
|
||||
\ No newline at end of file
|
||||
+}
|
||||
diff -ur tuprolog-2.5.0.orig/src/alice/tuprolog/lib/BasicLibrary.java tuprolog-2.5.0/src/alice/tuprolog/lib/BasicLibrary.java
|
||||
--- tuprolog-2.5.0.orig/src/alice/tuprolog/lib/BasicLibrary.java 2012-08-03 02:38:21.000000000 +0200
|
||||
+++ tuprolog-2.5.0/src/alice/tuprolog/lib/BasicLibrary.java 2012-08-03 03:45:45.000000000 +0200
|
||||
@@ -114,7 +114,7 @@
|
||||
/**
|
||||
* Loads a library constructed from a theory.
|
||||
*
|
||||
- * @param theory
|
||||
+ * @param th
|
||||
* theory text
|
||||
* @param libName
|
||||
* name of the library
|
||||
@@ -1356,4 +1356,4 @@
|
||||
{ "\\", "expression_bitwise_not", "functor" } };
|
||||
}
|
||||
|
||||
-}
|
||||
\ No newline at end of file
|
||||
+}
|
||||
diff -ur tuprolog-2.5.0.orig/src/alice/tuprolog/lib/IOLibrary.java tuprolog-2.5.0/src/alice/tuprolog/lib/IOLibrary.java
|
||||
--- tuprolog-2.5.0.orig/src/alice/tuprolog/lib/IOLibrary.java 2012-08-03 02:38:21.000000000 +0200
|
||||
+++ tuprolog-2.5.0/src/alice/tuprolog/lib/IOLibrary.java 2012-08-03 03:45:45.000000000 +0200
|
||||
@@ -375,7 +375,7 @@
|
||||
/**
|
||||
* Sets an arbitrary seed for the Random object.
|
||||
*
|
||||
- * @param seed Seed to use
|
||||
+ * @param t Seed to use
|
||||
* @return true if seed Term has a valid long value, false otherwise
|
||||
*/
|
||||
public boolean set_seed_1(Term t) throws PrologError {
|
||||
@@ -470,4 +470,4 @@
|
||||
}
|
||||
return true;
|
||||
}
|
||||
-}
|
||||
\ No newline at end of file
|
||||
+}
|
||||
diff -ur tuprolog-2.5.0.orig/src/alice/tuprolog/lib/JavaLibrary.java tuprolog-2.5.0/src/alice/tuprolog/lib/JavaLibrary.java
|
||||
--- tuprolog-2.5.0.orig/src/alice/tuprolog/lib/JavaLibrary.java 2012-08-03 02:38:21.000000000 +0200
|
||||
+++ tuprolog-2.5.0/src/alice/tuprolog/lib/JavaLibrary.java 2012-08-03 03:45:45.000000000 +0200
|
||||
@@ -1393,8 +1393,6 @@
|
||||
|
||||
/**
|
||||
* Generates a fresh numeric identifier
|
||||
- *
|
||||
- * @return
|
||||
*/
|
||||
protected Struct generateFreshId() {
|
||||
return new Struct("$obj_" + id++);
|
||||
diff -ur tuprolog-2.5.0.orig/src/alice/tuprolog/PrimitiveManager.java tuprolog-2.5.0/src/alice/tuprolog/PrimitiveManager.java
|
||||
--- tuprolog-2.5.0.orig/src/alice/tuprolog/PrimitiveManager.java 2012-08-03 02:38:21.000000000 +0200
|
||||
+++ tuprolog-2.5.0/src/alice/tuprolog/PrimitiveManager.java 2012-08-03 03:45:45.000000000 +0200
|
||||
@@ -89,7 +89,7 @@
|
||||
* This involves identifying structs representing builtin
|
||||
* predicates and functors, and setting up related structures and links
|
||||
*
|
||||
- * @parm term the term to be identified
|
||||
+ * @param term the term to be identified
|
||||
* @return term with the identified built-in directive
|
||||
*/
|
||||
public Term identifyDirective(Term term) {
|
||||
@@ -192,4 +192,4 @@
|
||||
return (functorHashMap.containsKey(name + "/" + nArgs) || predicateHashMap.containsKey(name + "/" + nArgs));
|
||||
}
|
||||
/**/
|
||||
-}
|
||||
\ No newline at end of file
|
||||
+}
|
||||
diff -ur tuprolog-2.5.0.orig/src/alice/tuprologx/ide/Console.java tuprolog-2.5.0/src/alice/tuprologx/ide/Console.java
|
||||
--- tuprolog-2.5.0.orig/src/alice/tuprologx/ide/Console.java 2012-08-03 02:38:20.000000000 +0200
|
||||
+++ tuprolog-2.5.0/src/alice/tuprologx/ide/Console.java 2012-08-03 03:45:45.000000000 +0200
|
||||
@@ -10,8 +10,5 @@
|
||||
public void getNextSolution();
|
||||
public void acceptSolution();
|
||||
public void stopEngine();
|
||||
- /**
|
||||
- * @uml.property name="goal"
|
||||
- */
|
||||
public String getGoal();
|
||||
-}
|
||||
\ No newline at end of file
|
||||
+}
|
||||
diff -ur tuprolog-2.5.0.orig/src/alice/tuprologx/ide/LibraryDialogFrame.java tuprolog-2.5.0/src/alice/tuprologx/ide/LibraryDialogFrame.java
|
||||
--- tuprolog-2.5.0.orig/src/alice/tuprologx/ide/LibraryDialogFrame.java 2012-08-03 02:38:20.000000000 +0200
|
||||
+++ tuprolog-2.5.0/src/alice/tuprologx/ide/LibraryDialogFrame.java 2012-08-03 03:45:45.000000000 +0200
|
||||
@@ -325,7 +325,6 @@
|
||||
displayLibraryManagerStatus();
|
||||
}
|
||||
|
||||
- /** @see alice.tuprologx.ide.SwingFrame#onClose()*/
|
||||
public void closeLibraryDialog()
|
||||
{
|
||||
onClose();
|
||||
diff -ur tuprolog-2.5.0.orig/src/alice/tuprologx/ide/ToolBar.java tuprolog-2.5.0/src/alice/tuprologx/ide/ToolBar.java
|
||||
--- tuprolog-2.5.0.orig/src/alice/tuprologx/ide/ToolBar.java 2012-08-03 02:38:20.000000000 +0200
|
||||
+++ tuprolog-2.5.0/src/alice/tuprologx/ide/ToolBar.java 2012-08-03 03:45:45.000000000 +0200
|
||||
@@ -242,8 +242,6 @@
|
||||
|
||||
/**
|
||||
* Set the tuProlog config frame
|
||||
- *
|
||||
- * @param libraryManager a libraryManager to associate to the libraryDialog
|
||||
*/
|
||||
public void setPrologConfig(PrologConfigFrame configFrame)
|
||||
{
|
||||
diff -ur tuprolog-2.5.0.orig/src/alice/tuprologx/pj/lib/PJLibrary.java tuprolog-2.5.0/src/alice/tuprologx/pj/lib/PJLibrary.java
|
||||
--- tuprolog-2.5.0.orig/src/alice/tuprologx/pj/lib/PJLibrary.java 2012-08-03 02:38:20.000000000 +0200
|
||||
+++ tuprolog-2.5.0/src/alice/tuprologx/pj/lib/PJLibrary.java 2012-08-03 03:45:45.000000000 +0200
|
||||
@@ -1252,7 +1252,6 @@
|
||||
|
||||
/**
|
||||
* Generates a fresh numeric identifier
|
||||
- * @return
|
||||
*/
|
||||
protected Struct generateFreshId() {
|
||||
return new Struct("$obj_" + id++);
|
||||
diff -ur tuprolog-2.5.0.orig/src/alice/util/jedit/InputHandler.java tuprolog-2.5.0/src/alice/util/jedit/InputHandler.java
|
||||
--- tuprolog-2.5.0.orig/src/alice/util/jedit/InputHandler.java 2012-08-03 02:38:21.000000000 +0200
|
||||
+++ tuprolog-2.5.0/src/alice/util/jedit/InputHandler.java 2012-08-03 03:45:45.000000000 +0200
|
||||
@@ -24,7 +24,7 @@
|
||||
*
|
||||
* @author Slava Pestov
|
||||
* @version $Id: InputHandler.java,v 1.14 1999/12/13 03:40:30 sp Exp $
|
||||
- * @see org.gjt.sp.jedit.textarea.DefaultInputHandler
|
||||
+ * @see alice.util.jedit.DefaultInputHandler
|
||||
*/
|
||||
public abstract class InputHandler extends KeyAdapter
|
||||
{
|
||||
@@ -187,7 +187,7 @@
|
||||
/**
|
||||
* Grabs the next key typed event and invokes the specified
|
||||
* action with the key as a the action command.
|
||||
- * @param action The action
|
||||
+ * @param listener The action
|
||||
*/
|
||||
public void grabNextKeyStroke(ActionListener listener)
|
||||
{
|
||||
diff -ur tuprolog-2.5.0.orig/src/alice/util/jedit/JEditTextArea.java tuprolog-2.5.0/src/alice/util/jedit/JEditTextArea.java
|
||||
--- tuprolog-2.5.0.orig/src/alice/util/jedit/JEditTextArea.java 2012-08-03 02:38:21.000000000 +0200
|
||||
+++ tuprolog-2.5.0/src/alice/util/jedit/JEditTextArea.java 2012-08-03 03:48:07.000000000 +0200
|
||||
@@ -1401,7 +1401,7 @@
|
||||
|
||||
/**
|
||||
* Sets if the selection should be rectangular.
|
||||
- * @param overwrite True if the selection should be rectangular,
|
||||
+ * @param rectSelect True if the selection should be rectangular,
|
||||
* false otherwise.
|
||||
*/
|
||||
public final void setSelectionRectangular(boolean rectSelect)
|
||||
diff -ur tuprolog-2.5.0.orig/src/alice/util/jedit/KeywordMap.java tuprolog-2.5.0/src/alice/util/jedit/KeywordMap.java
|
||||
--- tuprolog-2.5.0.orig/src/alice/util/jedit/KeywordMap.java 2012-08-03 02:38:21.000000000 +0200
|
||||
+++ tuprolog-2.5.0/src/alice/util/jedit/KeywordMap.java 2012-08-03 03:45:45.000000000 +0200
|
||||
@@ -75,7 +75,7 @@
|
||||
/**
|
||||
* Adds a key-value mapping.
|
||||
* @param keyword The key
|
||||
- * @Param id The value
|
||||
+ * @param id The value
|
||||
*/
|
||||
public void add(String keyword, byte id)
|
||||
{
|
||||
@@ -102,9 +102,6 @@
|
||||
}
|
||||
|
||||
// protected members
|
||||
- /**
|
||||
- * @uml.property name="mapLength"
|
||||
- */
|
||||
protected int mapLength;
|
||||
|
||||
protected int getStringMapKey(String s)
|
||||
diff -ur tuprolog-2.5.0.orig/src/alice/util/jedit/TextAreaPainter.java tuprolog-2.5.0/src/alice/util/jedit/TextAreaPainter.java
|
||||
--- tuprolog-2.5.0.orig/src/alice/util/jedit/TextAreaPainter.java 2012-08-03 02:38:21.000000000 +0200
|
||||
+++ tuprolog-2.5.0/src/alice/util/jedit/TextAreaPainter.java 2012-08-03 03:45:45.000000000 +0200
|
||||
@@ -75,7 +75,7 @@
|
||||
|
||||
/**
|
||||
* Returns the syntax styles used to paint colorized text. Entry <i>n</i> will be used to paint tokens with id = <i>n</i>.
|
||||
- * @see org.gjt.sp.jedit.syntax.Token
|
||||
+ * @see alice.util.jedit.Token
|
||||
*/
|
||||
public final SyntaxStyle[] getStyles()
|
||||
{
|
||||
@@ -85,7 +85,7 @@
|
||||
/**
|
||||
* Sets the syntax styles used to paint colorized text. Entry <i>n</i> will be used to paint tokens with id = <i>n</i>.
|
||||
* @param styles The syntax styles
|
||||
- * @see org.gjt.sp.jedit.syntax.Token
|
||||
+ * @see alice.util.jedit.Token
|
||||
*/
|
||||
public final void setStyles(SyntaxStyle[] styles)
|
||||
{
|
||||
@@ -356,7 +356,7 @@
|
||||
|
||||
/**
|
||||
* Repaints the text.
|
||||
- * @param g The graphics context
|
||||
+ * @param gfx The graphics context
|
||||
*/
|
||||
public void paint(Graphics gfx)
|
||||
{
|
||||
diff -ur tuprolog-2.5.0.orig/src/alice/util/jedit/TokenMarker.java tuprolog-2.5.0/src/alice/util/jedit/TokenMarker.java
|
||||
--- tuprolog-2.5.0.orig/src/alice/util/jedit/TokenMarker.java 2012-08-03 02:38:21.000000000 +0200
|
||||
+++ tuprolog-2.5.0/src/alice/util/jedit/TokenMarker.java 2012-08-03 03:45:45.000000000 +0200
|
||||
@@ -23,7 +23,7 @@
|
||||
* @author Slava Pestov
|
||||
* @version $Id: TokenMarker.java,v 1.32 1999/12/13 03:40:30 sp Exp $
|
||||
*
|
||||
- * @see org.gjt.sp.jedit.syntax.Token
|
||||
+ * @see alice.util.jedit.Token
|
||||
*/
|
||||
public abstract class TokenMarker
|
||||
{
|
||||
diff -ur tuprolog-2.5.0.orig/src/alice/util/ReadOnlyLinkedList.java tuprolog-2.5.0/src/alice/util/ReadOnlyLinkedList.java
|
||||
--- tuprolog-2.5.0.orig/src/alice/util/ReadOnlyLinkedList.java 2012-08-03 02:38:21.000000000 +0200
|
||||
+++ tuprolog-2.5.0/src/alice/util/ReadOnlyLinkedList.java 2012-08-03 03:45:45.000000000 +0200
|
||||
@@ -12,10 +12,10 @@
|
||||
import java.util.ListIterator;
|
||||
|
||||
/**
|
||||
- * ReadOnlyLinkedList<E> encapsulate a {@link LinkedList<E>}
|
||||
+ * ReadOnlyLinkedList<E> encapsulate a {@link LinkedList}
|
||||
* and ensures that the given list is navigated only.
|
||||
*
|
||||
- * Even if ReadOnlyLinkedList<E> implements {@link List<E>} it doesn't
|
||||
+ * Even if ReadOnlyLinkedList<E> implements {@link List} it doesn't
|
||||
* support modifiers methods, and throws {@link UnsupportedOperationException}
|
||||
* if invoked.
|
||||
*
|
@ -1,454 +0,0 @@
|
||||
diff -ur tuprolog-2.6.0.orig/src/alice/tuprolog/ChoicePointStore.java tuprolog-2.6.0/src/alice/tuprolog/ChoicePointStore.java
|
||||
--- tuprolog-2.6.0.orig/src/alice/tuprolog/ChoicePointStore.java 2013-02-14 12:01:32.000000000 +0100
|
||||
+++ tuprolog-2.6.0/src/alice/tuprolog/ChoicePointStore.java 2013-02-14 12:01:56.000000000 +0100
|
||||
@@ -36,7 +36,6 @@
|
||||
|
||||
/**
|
||||
* Return the actual choice-point store
|
||||
- * @return
|
||||
*/
|
||||
public ChoicePointContext getPointer() {
|
||||
return pointer;
|
||||
@@ -45,7 +44,6 @@
|
||||
/**
|
||||
* Check if a choice point exists in the store.
|
||||
* As a side effect, removes choice points which have been already used and are now empty.
|
||||
- * @return
|
||||
*/
|
||||
protected boolean existChoicePoint() {
|
||||
if (pointer == null) return false;
|
||||
@@ -93,4 +91,4 @@
|
||||
return l;
|
||||
}
|
||||
|
||||
-}
|
||||
\ No newline at end of file
|
||||
+}
|
||||
diff -ur tuprolog-2.6.0.orig/src/alice/tuprolog/ClauseStore.java tuprolog-2.6.0/src/alice/tuprolog/ClauseStore.java
|
||||
--- tuprolog-2.6.0.orig/src/alice/tuprolog/ClauseStore.java 2013-02-14 12:01:32.000000000 +0100
|
||||
+++ tuprolog-2.6.0/src/alice/tuprolog/ClauseStore.java 2013-02-14 12:01:56.000000000 +0100
|
||||
@@ -62,8 +62,6 @@
|
||||
|
||||
/**
|
||||
* Verify if there is a term in compatibleGoals compatible with goal.
|
||||
- * @param goal
|
||||
- * @param compGoals
|
||||
* @return true if compatible or false otherwise.
|
||||
*/
|
||||
protected boolean existCompatibleClause() {
|
||||
@@ -160,4 +158,4 @@
|
||||
}
|
||||
|
||||
|
||||
-}
|
||||
\ No newline at end of file
|
||||
+}
|
||||
diff -ur tuprolog-2.6.0.orig/src/alice/tuprolog/EngineManager.java tuprolog-2.6.0/src/alice/tuprolog/EngineManager.java
|
||||
--- tuprolog-2.6.0.orig/src/alice/tuprolog/EngineManager.java 2013-02-14 12:01:32.000000000 +0100
|
||||
+++ tuprolog-2.6.0/src/alice/tuprolog/EngineManager.java 2013-02-14 12:01:56.000000000 +0100
|
||||
@@ -96,7 +96,7 @@
|
||||
/**
|
||||
* Solves a query
|
||||
*
|
||||
- * @param g the term representing the goal to be demonstrated
|
||||
+ * @param query the term representing the goal to be demonstrated
|
||||
* @return the result of the demonstration
|
||||
* @see SolveInfo
|
||||
**/
|
||||
@@ -243,4 +243,4 @@
|
||||
}
|
||||
|
||||
|
||||
-}
|
||||
\ No newline at end of file
|
||||
+}
|
||||
diff -ur tuprolog-2.6.0.orig/src/alice/tuprolog/event/SpyEvent.java tuprolog-2.6.0/src/alice/tuprolog/event/SpyEvent.java
|
||||
--- tuprolog-2.6.0.orig/src/alice/tuprolog/event/SpyEvent.java 2013-02-14 12:01:32.000000000 +0100
|
||||
+++ tuprolog-2.6.0/src/alice/tuprolog/event/SpyEvent.java 2013-02-14 12:01:56.000000000 +0100
|
||||
@@ -33,10 +33,6 @@
|
||||
* event description
|
||||
*/
|
||||
private String msg;
|
||||
- /**
|
||||
- * @uml.property name="env"
|
||||
- * @uml.associationEnd
|
||||
- */
|
||||
private Engine env;
|
||||
|
||||
public SpyEvent(Object source, String msg_) {
|
||||
@@ -63,4 +59,4 @@
|
||||
return msg + ((env == null) ? "" : env.toString());
|
||||
}
|
||||
|
||||
-}
|
||||
\ No newline at end of file
|
||||
+}
|
||||
diff -ur tuprolog-2.6.0.orig/src/alice/tuprolog/lib/BasicLibrary.java tuprolog-2.6.0/src/alice/tuprolog/lib/BasicLibrary.java
|
||||
--- tuprolog-2.6.0.orig/src/alice/tuprolog/lib/BasicLibrary.java 2013-02-14 12:01:32.000000000 +0100
|
||||
+++ tuprolog-2.6.0/src/alice/tuprolog/lib/BasicLibrary.java 2013-02-14 12:01:56.000000000 +0100
|
||||
@@ -116,7 +116,7 @@
|
||||
/**
|
||||
* Loads a library constructed from a theory.
|
||||
*
|
||||
- * @param theory
|
||||
+ * @param th
|
||||
* theory text
|
||||
* @param libName
|
||||
* name of the library
|
||||
@@ -1358,4 +1358,4 @@
|
||||
{ "\\", "expression_bitwise_not", "functor" } };
|
||||
}
|
||||
|
||||
-}
|
||||
\ No newline at end of file
|
||||
+}
|
||||
diff -ur tuprolog-2.6.0.orig/src/alice/tuprolog/lib/IOLibrary.java tuprolog-2.6.0/src/alice/tuprolog/lib/IOLibrary.java
|
||||
--- tuprolog-2.6.0.orig/src/alice/tuprolog/lib/IOLibrary.java 2013-02-14 12:01:32.000000000 +0100
|
||||
+++ tuprolog-2.6.0/src/alice/tuprolog/lib/IOLibrary.java 2013-02-14 12:01:56.000000000 +0100
|
||||
@@ -375,7 +375,7 @@
|
||||
/**
|
||||
* Sets an arbitrary seed for the Random object.
|
||||
*
|
||||
- * @param seed Seed to use
|
||||
+ * @param t Seed to use
|
||||
* @return true if seed Term has a valid long value, false otherwise
|
||||
*/
|
||||
public boolean set_seed_1(Term t) throws PrologError {
|
||||
@@ -470,4 +470,4 @@
|
||||
}
|
||||
return true;
|
||||
}
|
||||
-}
|
||||
\ No newline at end of file
|
||||
+}
|
||||
diff -ur tuprolog-2.6.0.orig/src/alice/tuprolog/lib/JavaLibrary.java tuprolog-2.6.0/src/alice/tuprolog/lib/JavaLibrary.java
|
||||
--- tuprolog-2.6.0.orig/src/alice/tuprolog/lib/JavaLibrary.java 2013-02-14 12:01:32.000000000 +0100
|
||||
+++ tuprolog-2.6.0/src/alice/tuprolog/lib/JavaLibrary.java 2013-02-14 12:12:49.000000000 +0100
|
||||
@@ -265,7 +265,7 @@
|
||||
* @author Michele Mannino
|
||||
* Creates of a java object - not backtrackable case
|
||||
* @param className The name of the class
|
||||
- * @oaram path The list of the paths where the class may be contained
|
||||
+ * @param paths The list of the paths where the class may be contained
|
||||
* @param argl The list of the arguments used by the constructor
|
||||
* @param id The name of the prolog term
|
||||
* @throws JavaException
|
||||
@@ -1745,8 +1745,6 @@
|
||||
|
||||
/**
|
||||
* Generates a fresh numeric identifier
|
||||
- *
|
||||
- * @return
|
||||
*/
|
||||
protected Struct generateFreshId() {
|
||||
return new Struct("$obj_" + id++);
|
||||
@@ -2099,4 +2097,4 @@
|
||||
this.eventFullClass = eventClass;
|
||||
listenerInterfaceName = n;
|
||||
}
|
||||
-}
|
||||
\ No newline at end of file
|
||||
+}
|
||||
diff -ur tuprolog-2.6.0.orig/src/alice/tuprolog/LibraryManager.java tuprolog-2.6.0/src/alice/tuprolog/LibraryManager.java
|
||||
--- tuprolog-2.6.0.orig/src/alice/tuprolog/LibraryManager.java 2013-02-14 12:01:32.000000000 +0100
|
||||
+++ tuprolog-2.6.0/src/alice/tuprolog/LibraryManager.java 2013-02-14 12:05:56.000000000 +0100
|
||||
@@ -49,7 +49,7 @@
|
||||
* If a library with the same name is already present,
|
||||
* a warning event is notified and the request is ignored.
|
||||
*
|
||||
- * @param the name of the Java class containing the library to be loaded
|
||||
+ * @param className the name of the Java class containing the library to be loaded
|
||||
* @return the reference to the Library just loaded
|
||||
* @throws InvalidLibraryException if name is not a valid library
|
||||
*/
|
||||
@@ -81,8 +81,8 @@
|
||||
* If a library with the same name is already present,
|
||||
* a warning event is notified and the request is ignored.
|
||||
*
|
||||
- * @param the name of the Java class containing the library to be loaded
|
||||
- * @param the list of the paths where the library may be contained
|
||||
+ * @param className the name of the Java class containing the library to be loaded
|
||||
+ * @param paths the list of the paths where the library may be contained
|
||||
* @return the reference to the Library just loaded
|
||||
* @throws InvalidLibraryException if name is not a valid library
|
||||
*/
|
||||
@@ -305,4 +305,4 @@
|
||||
|
||||
|
||||
|
||||
-}
|
||||
\ No newline at end of file
|
||||
+}
|
||||
diff -ur tuprolog-2.6.0.orig/src/alice/tuprolog/PrimitiveManager.java tuprolog-2.6.0/src/alice/tuprolog/PrimitiveManager.java
|
||||
--- tuprolog-2.6.0.orig/src/alice/tuprolog/PrimitiveManager.java 2013-02-14 12:01:32.000000000 +0100
|
||||
+++ tuprolog-2.6.0/src/alice/tuprolog/PrimitiveManager.java 2013-02-14 12:01:56.000000000 +0100
|
||||
@@ -89,7 +89,7 @@
|
||||
* This involves identifying structs representing builtin
|
||||
* predicates and functors, and setting up related structures and links
|
||||
*
|
||||
- * @parm term the term to be identified
|
||||
+ * @param term the term to be identified
|
||||
* @return term with the identified built-in directive
|
||||
*/
|
||||
public Term identifyDirective(Term term) {
|
||||
@@ -192,4 +192,4 @@
|
||||
return (functorHashMap.containsKey(name + "/" + nArgs) || predicateHashMap.containsKey(name + "/" + nArgs));
|
||||
}
|
||||
/**/
|
||||
-}
|
||||
\ No newline at end of file
|
||||
+}
|
||||
diff -ur tuprolog-2.6.0.orig/src/alice/tuprolog/Struct.java tuprolog-2.6.0/src/alice/tuprolog/Struct.java
|
||||
--- tuprolog-2.6.0.orig/src/alice/tuprolog/Struct.java 2013-02-14 12:01:32.000000000 +0100
|
||||
+++ tuprolog-2.6.0/src/alice/tuprolog/Struct.java 2013-02-14 12:06:46.000000000 +0100
|
||||
@@ -201,7 +201,7 @@
|
||||
}
|
||||
|
||||
/**
|
||||
- * @return
|
||||
+ * @return predicateIndicator
|
||||
*/
|
||||
String getPredicateIndicator() {
|
||||
return predicateIndicator;
|
||||
@@ -894,4 +894,4 @@
|
||||
}
|
||||
/**/
|
||||
|
||||
-}
|
||||
\ No newline at end of file
|
||||
+}
|
||||
diff -ur tuprolog-2.6.0.orig/src/alice/tuprologx/ide/Console.java tuprolog-2.6.0/src/alice/tuprologx/ide/Console.java
|
||||
--- tuprolog-2.6.0.orig/src/alice/tuprologx/ide/Console.java 2013-02-14 12:01:32.000000000 +0100
|
||||
+++ tuprolog-2.6.0/src/alice/tuprologx/ide/Console.java 2013-02-14 12:01:56.000000000 +0100
|
||||
@@ -10,8 +10,5 @@
|
||||
public void getNextSolution();
|
||||
public void acceptSolution();
|
||||
public void stopEngine();
|
||||
- /**
|
||||
- * @uml.property name="goal"
|
||||
- */
|
||||
public String getGoal();
|
||||
-}
|
||||
\ No newline at end of file
|
||||
+}
|
||||
diff -ur tuprolog-2.6.0.orig/src/alice/tuprologx/ide/LibraryDialogFrame.java tuprolog-2.6.0/src/alice/tuprologx/ide/LibraryDialogFrame.java
|
||||
--- tuprolog-2.6.0.orig/src/alice/tuprologx/ide/LibraryDialogFrame.java 2013-02-14 12:01:32.000000000 +0100
|
||||
+++ tuprolog-2.6.0/src/alice/tuprologx/ide/LibraryDialogFrame.java 2013-02-14 12:12:14.000000000 +0100
|
||||
@@ -370,7 +370,7 @@
|
||||
* Add a library from file chooser path.
|
||||
*
|
||||
* @param libraryClassname The name of the .class of the library to be added.
|
||||
- * @param path from file chooser.
|
||||
+ * @param file from file chooser.
|
||||
*/
|
||||
public void addLibrary(String libraryClassname, File file)
|
||||
{
|
||||
@@ -498,7 +498,6 @@
|
||||
displayLibraryManagerStatus();
|
||||
}
|
||||
|
||||
- /** @see alice.tuprologx.ide.SwingFrame#onClose()*/
|
||||
public void closeLibraryDialog()
|
||||
{
|
||||
onClose();
|
||||
diff -ur tuprolog-2.6.0.orig/src/alice/tuprologx/ide/LibraryManager.java tuprolog-2.6.0/src/alice/tuprologx/ide/LibraryManager.java
|
||||
--- tuprolog-2.6.0.orig/src/alice/tuprologx/ide/LibraryManager.java 2013-02-14 12:01:32.000000000 +0100
|
||||
+++ tuprolog-2.6.0/src/alice/tuprologx/ide/LibraryManager.java 2013-02-14 12:11:42.000000000 +0100
|
||||
@@ -131,7 +131,7 @@
|
||||
* Add a library to the manager.
|
||||
*
|
||||
* @param libraryClassname The name of the .class of the library to be added.
|
||||
- * @param path The path where is contained the library.
|
||||
+ * @param file The path where is contained the library.
|
||||
* @throws ClassNotFoundException if the library class cannot be found.
|
||||
* @throws InvalidLibraryException if the library is not a valid tuProlog library.
|
||||
*/
|
||||
@@ -235,7 +235,7 @@
|
||||
* Load a library from the Library Manager into the engine.
|
||||
*
|
||||
* @param library The library to be loaded into the engine.
|
||||
- * @param path The library path where is contained the library.
|
||||
+ * @param file The library path where is contained the library.
|
||||
* @throws InvalidLibraryException
|
||||
*/
|
||||
public void loadLibrary(String library, File file) throws InvalidLibraryException {
|
||||
@@ -290,4 +290,4 @@
|
||||
klass.getName().replace('.', '/') + ".class");
|
||||
}
|
||||
|
||||
-} // end LibraryManager class
|
||||
\ No newline at end of file
|
||||
+} // end LibraryManager class
|
||||
diff -ur tuprolog-2.6.0.orig/src/alice/tuprologx/ide/ToolBar.java tuprolog-2.6.0/src/alice/tuprologx/ide/ToolBar.java
|
||||
--- tuprolog-2.6.0.orig/src/alice/tuprologx/ide/ToolBar.java 2013-02-14 12:01:32.000000000 +0100
|
||||
+++ tuprolog-2.6.0/src/alice/tuprologx/ide/ToolBar.java 2013-02-14 12:01:56.000000000 +0100
|
||||
@@ -242,8 +242,6 @@
|
||||
|
||||
/**
|
||||
* Set the tuProlog config frame
|
||||
- *
|
||||
- * @param libraryManager a libraryManager to associate to the libraryDialog
|
||||
*/
|
||||
public void setPrologConfig(PrologConfigFrame configFrame)
|
||||
{
|
||||
diff -ur tuprolog-2.6.0.orig/src/alice/tuprologx/pj/lib/PJLibrary.java tuprolog-2.6.0/src/alice/tuprologx/pj/lib/PJLibrary.java
|
||||
--- tuprolog-2.6.0.orig/src/alice/tuprologx/pj/lib/PJLibrary.java 2013-02-14 12:01:32.000000000 +0100
|
||||
+++ tuprolog-2.6.0/src/alice/tuprologx/pj/lib/PJLibrary.java 2013-02-14 12:01:56.000000000 +0100
|
||||
@@ -1252,7 +1252,6 @@
|
||||
|
||||
/**
|
||||
* Generates a fresh numeric identifier
|
||||
- * @return
|
||||
*/
|
||||
protected Struct generateFreshId() {
|
||||
return new Struct("$obj_" + id++);
|
||||
diff -ur tuprolog-2.6.0.orig/src/alice/util/DynamicURLClassLoader.java tuprolog-2.6.0/src/alice/util/DynamicURLClassLoader.java
|
||||
--- tuprolog-2.6.0.orig/src/alice/util/DynamicURLClassLoader.java 2013-02-14 12:01:32.000000000 +0100
|
||||
+++ tuprolog-2.6.0/src/alice/util/DynamicURLClassLoader.java 2013-02-14 12:10:02.000000000 +0100
|
||||
@@ -35,7 +35,7 @@
|
||||
|
||||
/**
|
||||
* Constructor that specifies the URLs array.
|
||||
- * @param URL[] urls - Used to load a directory a URL ends with "/" or "\"
|
||||
+ * @param urls - Used to load a directory a URL ends with "/" or "\"
|
||||
* otherwise it loads a class contained into a .jar
|
||||
*/
|
||||
|
||||
@@ -148,7 +148,7 @@
|
||||
|
||||
/**
|
||||
* Remove array URLs method.
|
||||
- * @param urls - URL to be removed.
|
||||
+ * @param url - URL to be removed.
|
||||
*/
|
||||
|
||||
public void removeURL(URL url) throws IllegalArgumentException
|
||||
diff -ur tuprolog-2.6.0.orig/src/alice/util/InspectionUtils.java tuprolog-2.6.0/src/alice/util/InspectionUtils.java
|
||||
--- tuprolog-2.6.0.orig/src/alice/util/InspectionUtils.java 2013-02-14 12:01:32.000000000 +0100
|
||||
+++ tuprolog-2.6.0/src/alice/util/InspectionUtils.java 2013-02-14 12:09:22.000000000 +0100
|
||||
@@ -14,9 +14,9 @@
|
||||
/**
|
||||
* @author Michele Mannino
|
||||
*
|
||||
- * @param type: class to be inspected
|
||||
- * @param methodName: name of method
|
||||
- * @param parms: array of params
|
||||
+ * @param type class to be inspected
|
||||
+ * @param methodName name of method
|
||||
+ * @param parms array of params
|
||||
*/
|
||||
public static Method searchForMethod(Class<?> type, String methodName, Class<?>[] parms) {
|
||||
Method[] methods = type.getMethods();
|
||||
diff -ur tuprolog-2.6.0.orig/src/alice/util/jedit/InputHandler.java tuprolog-2.6.0/src/alice/util/jedit/InputHandler.java
|
||||
--- tuprolog-2.6.0.orig/src/alice/util/jedit/InputHandler.java 2013-02-14 12:01:32.000000000 +0100
|
||||
+++ tuprolog-2.6.0/src/alice/util/jedit/InputHandler.java 2013-02-14 12:01:56.000000000 +0100
|
||||
@@ -24,7 +24,7 @@
|
||||
*
|
||||
* @author Slava Pestov
|
||||
* @version $Id: InputHandler.java,v 1.14 1999/12/13 03:40:30 sp Exp $
|
||||
- * @see org.gjt.sp.jedit.textarea.DefaultInputHandler
|
||||
+ * @see alice.util.jedit.DefaultInputHandler
|
||||
*/
|
||||
public abstract class InputHandler extends KeyAdapter
|
||||
{
|
||||
@@ -187,7 +187,7 @@
|
||||
/**
|
||||
* Grabs the next key typed event and invokes the specified
|
||||
* action with the key as a the action command.
|
||||
- * @param action The action
|
||||
+ * @param listener The action
|
||||
*/
|
||||
public void grabNextKeyStroke(ActionListener listener)
|
||||
{
|
||||
diff -ur tuprolog-2.6.0.orig/src/alice/util/jedit/JEditTextArea.java tuprolog-2.6.0/src/alice/util/jedit/JEditTextArea.java
|
||||
--- tuprolog-2.6.0.orig/src/alice/util/jedit/JEditTextArea.java 2013-02-14 12:01:32.000000000 +0100
|
||||
+++ tuprolog-2.6.0/src/alice/util/jedit/JEditTextArea.java 2013-02-14 12:01:56.000000000 +0100
|
||||
@@ -1401,7 +1401,7 @@
|
||||
|
||||
/**
|
||||
* Sets if the selection should be rectangular.
|
||||
- * @param overwrite True if the selection should be rectangular,
|
||||
+ * @param rectSelect True if the selection should be rectangular,
|
||||
* false otherwise.
|
||||
*/
|
||||
public final void setSelectionRectangular(boolean rectSelect)
|
||||
diff -ur tuprolog-2.6.0.orig/src/alice/util/jedit/KeywordMap.java tuprolog-2.6.0/src/alice/util/jedit/KeywordMap.java
|
||||
--- tuprolog-2.6.0.orig/src/alice/util/jedit/KeywordMap.java 2013-02-14 12:01:32.000000000 +0100
|
||||
+++ tuprolog-2.6.0/src/alice/util/jedit/KeywordMap.java 2013-02-14 12:01:56.000000000 +0100
|
||||
@@ -75,7 +75,7 @@
|
||||
/**
|
||||
* Adds a key-value mapping.
|
||||
* @param keyword The key
|
||||
- * @Param id The value
|
||||
+ * @param id The value
|
||||
*/
|
||||
public void add(String keyword, byte id)
|
||||
{
|
||||
@@ -102,9 +102,6 @@
|
||||
}
|
||||
|
||||
// protected members
|
||||
- /**
|
||||
- * @uml.property name="mapLength"
|
||||
- */
|
||||
protected int mapLength;
|
||||
|
||||
protected int getStringMapKey(String s)
|
||||
diff -ur tuprolog-2.6.0.orig/src/alice/util/jedit/TextAreaPainter.java tuprolog-2.6.0/src/alice/util/jedit/TextAreaPainter.java
|
||||
--- tuprolog-2.6.0.orig/src/alice/util/jedit/TextAreaPainter.java 2013-02-14 12:01:32.000000000 +0100
|
||||
+++ tuprolog-2.6.0/src/alice/util/jedit/TextAreaPainter.java 2013-02-14 12:01:56.000000000 +0100
|
||||
@@ -75,7 +75,7 @@
|
||||
|
||||
/**
|
||||
* Returns the syntax styles used to paint colorized text. Entry <i>n</i> will be used to paint tokens with id = <i>n</i>.
|
||||
- * @see org.gjt.sp.jedit.syntax.Token
|
||||
+ * @see alice.util.jedit.Token
|
||||
*/
|
||||
public final SyntaxStyle[] getStyles()
|
||||
{
|
||||
@@ -85,7 +85,7 @@
|
||||
/**
|
||||
* Sets the syntax styles used to paint colorized text. Entry <i>n</i> will be used to paint tokens with id = <i>n</i>.
|
||||
* @param styles The syntax styles
|
||||
- * @see org.gjt.sp.jedit.syntax.Token
|
||||
+ * @see alice.util.jedit.Token
|
||||
*/
|
||||
public final void setStyles(SyntaxStyle[] styles)
|
||||
{
|
||||
@@ -356,7 +356,7 @@
|
||||
|
||||
/**
|
||||
* Repaints the text.
|
||||
- * @param g The graphics context
|
||||
+ * @param gfx The graphics context
|
||||
*/
|
||||
public void paint(Graphics gfx)
|
||||
{
|
||||
diff -ur tuprolog-2.6.0.orig/src/alice/util/jedit/TokenMarker.java tuprolog-2.6.0/src/alice/util/jedit/TokenMarker.java
|
||||
--- tuprolog-2.6.0.orig/src/alice/util/jedit/TokenMarker.java 2013-02-14 12:01:32.000000000 +0100
|
||||
+++ tuprolog-2.6.0/src/alice/util/jedit/TokenMarker.java 2013-02-14 12:01:56.000000000 +0100
|
||||
@@ -23,7 +23,7 @@
|
||||
* @author Slava Pestov
|
||||
* @version $Id: TokenMarker.java,v 1.32 1999/12/13 03:40:30 sp Exp $
|
||||
*
|
||||
- * @see org.gjt.sp.jedit.syntax.Token
|
||||
+ * @see alice.util.jedit.Token
|
||||
*/
|
||||
public abstract class TokenMarker
|
||||
{
|
||||
diff -ur tuprolog-2.6.0.orig/src/alice/util/ReadOnlyLinkedList.java tuprolog-2.6.0/src/alice/util/ReadOnlyLinkedList.java
|
||||
--- tuprolog-2.6.0.orig/src/alice/util/ReadOnlyLinkedList.java 2013-02-14 12:01:32.000000000 +0100
|
||||
+++ tuprolog-2.6.0/src/alice/util/ReadOnlyLinkedList.java 2013-02-14 12:01:56.000000000 +0100
|
||||
@@ -12,10 +12,10 @@
|
||||
import java.util.ListIterator;
|
||||
|
||||
/**
|
||||
- * ReadOnlyLinkedList<E> encapsulate a {@link LinkedList<E>}
|
||||
+ * ReadOnlyLinkedList<E> encapsulate a {@link LinkedList}
|
||||
* and ensures that the given list is navigated only.
|
||||
*
|
||||
- * Even if ReadOnlyLinkedList<E> implements {@link List<E>} it doesn't
|
||||
+ * Even if ReadOnlyLinkedList<E> implements {@link List} it doesn't
|
||||
* support modifiers methods, and throws {@link UnsupportedOperationException}
|
||||
* if invoked.
|
||||
*
|
@ -1,437 +0,0 @@
|
||||
diff -ur tuprolog-2.7.0.orig/src/alice/tuprolog/ChoicePointStore.java tuprolog-2.7.0/src/alice/tuprolog/ChoicePointStore.java
|
||||
--- tuprolog-2.7.0.orig/src/alice/tuprolog/ChoicePointStore.java 2013-05-16 13:50:42.000000000 +0200
|
||||
+++ tuprolog-2.7.0/src/alice/tuprolog/ChoicePointStore.java 2013-05-16 13:56:42.000000000 +0200
|
||||
@@ -36,7 +36,6 @@
|
||||
|
||||
/**
|
||||
* Return the actual choice-point store
|
||||
- * @return
|
||||
*/
|
||||
public ChoicePointContext getPointer() {
|
||||
return pointer;
|
||||
@@ -45,7 +44,6 @@
|
||||
/**
|
||||
* Check if a choice point exists in the store.
|
||||
* As a side effect, removes choice points which have been already used and are now empty.
|
||||
- * @return
|
||||
*/
|
||||
protected boolean existChoicePoint() {
|
||||
if (pointer == null) return false;
|
||||
@@ -93,4 +91,4 @@
|
||||
return l;
|
||||
}
|
||||
|
||||
-}
|
||||
\ No newline at end of file
|
||||
+}
|
||||
diff -ur tuprolog-2.7.0.orig/src/alice/tuprolog/ClauseStore.java tuprolog-2.7.0/src/alice/tuprolog/ClauseStore.java
|
||||
--- tuprolog-2.7.0.orig/src/alice/tuprolog/ClauseStore.java 2013-05-16 13:50:42.000000000 +0200
|
||||
+++ tuprolog-2.7.0/src/alice/tuprolog/ClauseStore.java 2013-05-16 13:56:42.000000000 +0200
|
||||
@@ -62,8 +62,6 @@
|
||||
|
||||
/**
|
||||
* Verify if there is a term in compatibleGoals compatible with goal.
|
||||
- * @param goal
|
||||
- * @param compGoals
|
||||
* @return true if compatible or false otherwise.
|
||||
*/
|
||||
protected boolean existCompatibleClause() {
|
||||
@@ -160,4 +158,4 @@
|
||||
}
|
||||
|
||||
|
||||
-}
|
||||
\ No newline at end of file
|
||||
+}
|
||||
diff -ur tuprolog-2.7.0.orig/src/alice/tuprolog/event/SpyEvent.java tuprolog-2.7.0/src/alice/tuprolog/event/SpyEvent.java
|
||||
--- tuprolog-2.7.0.orig/src/alice/tuprolog/event/SpyEvent.java 2013-05-16 13:50:42.000000000 +0200
|
||||
+++ tuprolog-2.7.0/src/alice/tuprolog/event/SpyEvent.java 2013-05-16 13:56:42.000000000 +0200
|
||||
@@ -33,10 +33,6 @@
|
||||
* event description
|
||||
*/
|
||||
private String msg;
|
||||
- /**
|
||||
- * @uml.property name="env"
|
||||
- * @uml.associationEnd
|
||||
- */
|
||||
private Engine env;
|
||||
|
||||
public SpyEvent(Object source, String msg_) {
|
||||
@@ -63,4 +59,4 @@
|
||||
return msg + ((env == null) ? "" : env.toString());
|
||||
}
|
||||
|
||||
-}
|
||||
\ No newline at end of file
|
||||
+}
|
||||
diff -ur tuprolog-2.7.0.orig/src/alice/tuprolog/lib/BasicLibrary.java tuprolog-2.7.0/src/alice/tuprolog/lib/BasicLibrary.java
|
||||
--- tuprolog-2.7.0.orig/src/alice/tuprolog/lib/BasicLibrary.java 2013-05-16 13:50:42.000000000 +0200
|
||||
+++ tuprolog-2.7.0/src/alice/tuprolog/lib/BasicLibrary.java 2013-05-16 13:56:42.000000000 +0200
|
||||
@@ -116,7 +116,7 @@
|
||||
/**
|
||||
* Loads a library constructed from a theory.
|
||||
*
|
||||
- * @param theory
|
||||
+ * @param th
|
||||
* theory text
|
||||
* @param libName
|
||||
* name of the library
|
||||
@@ -1358,4 +1358,4 @@
|
||||
{ "\\", "expression_bitwise_not", "functor" } };
|
||||
}
|
||||
|
||||
-}
|
||||
\ No newline at end of file
|
||||
+}
|
||||
diff -ur tuprolog-2.7.0.orig/src/alice/tuprolog/lib/IOLibrary.java tuprolog-2.7.0/src/alice/tuprolog/lib/IOLibrary.java
|
||||
--- tuprolog-2.7.0.orig/src/alice/tuprolog/lib/IOLibrary.java 2013-05-16 13:50:42.000000000 +0200
|
||||
+++ tuprolog-2.7.0/src/alice/tuprolog/lib/IOLibrary.java 2013-05-16 13:56:42.000000000 +0200
|
||||
@@ -379,7 +379,7 @@
|
||||
/**
|
||||
* Sets an arbitrary seed for the Random object.
|
||||
*
|
||||
- * @param seed Seed to use
|
||||
+ * @param t Seed to use
|
||||
* @return true if seed Term has a valid long value, false otherwise
|
||||
*/
|
||||
public boolean set_seed_1(Term t) throws PrologError {
|
||||
@@ -474,4 +474,4 @@
|
||||
}
|
||||
return true;
|
||||
}
|
||||
-}
|
||||
\ No newline at end of file
|
||||
+}
|
||||
Only in tuprolog-2.7.0/src/alice/tuprolog/lib: IOLibrary.java.orig
|
||||
diff -ur tuprolog-2.7.0.orig/src/alice/tuprolog/lib/JavaLibrary.java tuprolog-2.7.0/src/alice/tuprolog/lib/JavaLibrary.java
|
||||
--- tuprolog-2.7.0.orig/src/alice/tuprolog/lib/JavaLibrary.java 2013-05-16 13:50:42.000000000 +0200
|
||||
+++ tuprolog-2.7.0/src/alice/tuprolog/lib/JavaLibrary.java 2013-05-16 13:56:42.000000000 +0200
|
||||
@@ -265,7 +265,7 @@
|
||||
* @author Michele Mannino
|
||||
* Creates of a java object - not backtrackable case
|
||||
* @param className The name of the class
|
||||
- * @oaram path The list of the paths where the class may be contained
|
||||
+ * @param paths The list of the paths where the class may be contained
|
||||
* @param argl The list of the arguments used by the constructor
|
||||
* @param id The name of the prolog term
|
||||
* @throws JavaException
|
||||
@@ -1745,8 +1745,6 @@
|
||||
|
||||
/**
|
||||
* Generates a fresh numeric identifier
|
||||
- *
|
||||
- * @return
|
||||
*/
|
||||
protected Struct generateFreshId() {
|
||||
return new Struct("$obj_" + id++);
|
||||
@@ -2099,4 +2097,4 @@
|
||||
this.eventFullClass = eventClass;
|
||||
listenerInterfaceName = n;
|
||||
}
|
||||
-}
|
||||
\ No newline at end of file
|
||||
+}
|
||||
diff -ur tuprolog-2.7.0.orig/src/alice/tuprolog/LibraryManager.java tuprolog-2.7.0/src/alice/tuprolog/LibraryManager.java
|
||||
--- tuprolog-2.7.0.orig/src/alice/tuprolog/LibraryManager.java 2013-05-16 13:50:42.000000000 +0200
|
||||
+++ tuprolog-2.7.0/src/alice/tuprolog/LibraryManager.java 2013-05-16 13:56:42.000000000 +0200
|
||||
@@ -49,7 +49,7 @@
|
||||
* If a library with the same name is already present,
|
||||
* a warning event is notified and the request is ignored.
|
||||
*
|
||||
- * @param the name of the Java class containing the library to be loaded
|
||||
+ * @param className the name of the Java class containing the library to be loaded
|
||||
* @return the reference to the Library just loaded
|
||||
* @throws InvalidLibraryException if name is not a valid library
|
||||
*/
|
||||
@@ -83,8 +83,8 @@
|
||||
* If a library with the same name is already present,
|
||||
* a warning event is notified and the request is ignored.
|
||||
*
|
||||
- * @param the name of the Java class containing the library to be loaded
|
||||
- * @param the list of the paths where the library may be contained
|
||||
+ * @param className the name of the Java class containing the library to be loaded
|
||||
+ * @param paths the list of the paths where the library may be contained
|
||||
* @return the reference to the Library just loaded
|
||||
* @throws InvalidLibraryException if name is not a valid library
|
||||
*/
|
||||
@@ -314,4 +314,4 @@
|
||||
|
||||
|
||||
|
||||
-}
|
||||
\ No newline at end of file
|
||||
+}
|
||||
Only in tuprolog-2.7.0/src/alice/tuprolog: LibraryManager.java.orig
|
||||
diff -ur tuprolog-2.7.0.orig/src/alice/tuprolog/PrimitiveManager.java tuprolog-2.7.0/src/alice/tuprolog/PrimitiveManager.java
|
||||
--- tuprolog-2.7.0.orig/src/alice/tuprolog/PrimitiveManager.java 2013-05-16 13:50:42.000000000 +0200
|
||||
+++ tuprolog-2.7.0/src/alice/tuprolog/PrimitiveManager.java 2013-05-16 13:56:42.000000000 +0200
|
||||
@@ -89,7 +89,7 @@
|
||||
* This involves identifying structs representing builtin
|
||||
* predicates and functors, and setting up related structures and links
|
||||
*
|
||||
- * @parm term the term to be identified
|
||||
+ * @param term the term to be identified
|
||||
* @return term with the identified built-in directive
|
||||
*/
|
||||
public Term identifyDirective(Term term) {
|
||||
@@ -192,4 +192,4 @@
|
||||
return (functorHashMap.containsKey(name + "/" + nArgs) || predicateHashMap.containsKey(name + "/" + nArgs));
|
||||
}
|
||||
/**/
|
||||
-}
|
||||
\ No newline at end of file
|
||||
+}
|
||||
diff -ur tuprolog-2.7.0.orig/src/alice/tuprolog/Struct.java tuprolog-2.7.0/src/alice/tuprolog/Struct.java
|
||||
--- tuprolog-2.7.0.orig/src/alice/tuprolog/Struct.java 2013-05-16 13:50:42.000000000 +0200
|
||||
+++ tuprolog-2.7.0/src/alice/tuprolog/Struct.java 2013-05-16 13:56:42.000000000 +0200
|
||||
@@ -201,7 +201,7 @@
|
||||
}
|
||||
|
||||
/**
|
||||
- * @return
|
||||
+ * @return predicateIndicator
|
||||
*/
|
||||
String getPredicateIndicator() {
|
||||
return predicateIndicator;
|
||||
@@ -894,4 +894,4 @@
|
||||
}
|
||||
/**/
|
||||
|
||||
-}
|
||||
\ No newline at end of file
|
||||
+}
|
||||
diff -ur tuprolog-2.7.0.orig/src/alice/tuprologx/ide/Console.java tuprolog-2.7.0/src/alice/tuprologx/ide/Console.java
|
||||
--- tuprolog-2.7.0.orig/src/alice/tuprologx/ide/Console.java 2013-05-16 13:50:41.000000000 +0200
|
||||
+++ tuprolog-2.7.0/src/alice/tuprologx/ide/Console.java 2013-05-16 13:56:42.000000000 +0200
|
||||
@@ -10,8 +10,5 @@
|
||||
public void getNextSolution();
|
||||
public void acceptSolution();
|
||||
public void stopEngine();
|
||||
- /**
|
||||
- * @uml.property name="goal"
|
||||
- */
|
||||
public String getGoal();
|
||||
-}
|
||||
\ No newline at end of file
|
||||
+}
|
||||
diff -ur tuprolog-2.7.0.orig/src/alice/tuprologx/ide/LibraryDialogFrame.java tuprolog-2.7.0/src/alice/tuprologx/ide/LibraryDialogFrame.java
|
||||
--- tuprolog-2.7.0.orig/src/alice/tuprologx/ide/LibraryDialogFrame.java 2013-05-16 13:50:41.000000000 +0200
|
||||
+++ tuprolog-2.7.0/src/alice/tuprologx/ide/LibraryDialogFrame.java 2013-05-16 13:56:42.000000000 +0200
|
||||
@@ -370,7 +370,7 @@
|
||||
* Add a library from file chooser path.
|
||||
*
|
||||
* @param libraryClassname The name of the .class of the library to be added.
|
||||
- * @param path from file chooser.
|
||||
+ * @param file from file chooser.
|
||||
*/
|
||||
public void addLibrary(String libraryClassname, File file)
|
||||
{
|
||||
@@ -498,7 +498,6 @@
|
||||
displayLibraryManagerStatus();
|
||||
}
|
||||
|
||||
- /** @see alice.tuprologx.ide.SwingFrame#onClose()*/
|
||||
public void closeLibraryDialog()
|
||||
{
|
||||
onClose();
|
||||
diff -ur tuprolog-2.7.0.orig/src/alice/tuprologx/ide/LibraryManager.java tuprolog-2.7.0/src/alice/tuprologx/ide/LibraryManager.java
|
||||
--- tuprolog-2.7.0.orig/src/alice/tuprologx/ide/LibraryManager.java 2013-05-16 13:50:41.000000000 +0200
|
||||
+++ tuprolog-2.7.0/src/alice/tuprologx/ide/LibraryManager.java 2013-05-16 13:56:42.000000000 +0200
|
||||
@@ -131,7 +131,7 @@
|
||||
* Add a library to the manager.
|
||||
*
|
||||
* @param libraryClassname The name of the .class of the library to be added.
|
||||
- * @param path The path where is contained the library.
|
||||
+ * @param file The path where is contained the library.
|
||||
* @throws ClassNotFoundException if the library class cannot be found.
|
||||
* @throws InvalidLibraryException if the library is not a valid tuProlog library.
|
||||
*/
|
||||
@@ -235,7 +235,7 @@
|
||||
* Load a library from the Library Manager into the engine.
|
||||
*
|
||||
* @param library The library to be loaded into the engine.
|
||||
- * @param path The library path where is contained the library.
|
||||
+ * @param file The library path where is contained the library.
|
||||
* @throws InvalidLibraryException
|
||||
*/
|
||||
public void loadLibrary(String library, File file) throws InvalidLibraryException {
|
||||
@@ -290,4 +290,4 @@
|
||||
klass.getName().replace('.', '/') + ".class");
|
||||
}
|
||||
|
||||
-} // end LibraryManager class
|
||||
\ No newline at end of file
|
||||
+} // end LibraryManager class
|
||||
diff -ur tuprolog-2.7.0.orig/src/alice/tuprologx/ide/ToolBar.java tuprolog-2.7.0/src/alice/tuprologx/ide/ToolBar.java
|
||||
--- tuprolog-2.7.0.orig/src/alice/tuprologx/ide/ToolBar.java 2013-05-16 13:50:41.000000000 +0200
|
||||
+++ tuprolog-2.7.0/src/alice/tuprologx/ide/ToolBar.java 2013-05-16 13:56:42.000000000 +0200
|
||||
@@ -242,8 +242,6 @@
|
||||
|
||||
/**
|
||||
* Set the tuProlog config frame
|
||||
- *
|
||||
- * @param libraryManager a libraryManager to associate to the libraryDialog
|
||||
*/
|
||||
public void setPrologConfig(PrologConfigFrame configFrame)
|
||||
{
|
||||
diff -ur tuprolog-2.7.0.orig/src/alice/tuprologx/pj/lib/PJLibrary.java tuprolog-2.7.0/src/alice/tuprologx/pj/lib/PJLibrary.java
|
||||
--- tuprolog-2.7.0.orig/src/alice/tuprologx/pj/lib/PJLibrary.java 2013-05-16 13:50:41.000000000 +0200
|
||||
+++ tuprolog-2.7.0/src/alice/tuprologx/pj/lib/PJLibrary.java 2013-05-16 13:56:42.000000000 +0200
|
||||
@@ -1252,7 +1252,6 @@
|
||||
|
||||
/**
|
||||
* Generates a fresh numeric identifier
|
||||
- * @return
|
||||
*/
|
||||
protected Struct generateFreshId() {
|
||||
return new Struct("$obj_" + id++);
|
||||
diff -ur tuprolog-2.7.0.orig/src/alice/util/DynamicURLClassLoader.java tuprolog-2.7.0/src/alice/util/DynamicURLClassLoader.java
|
||||
--- tuprolog-2.7.0.orig/src/alice/util/DynamicURLClassLoader.java 2013-05-16 13:50:43.000000000 +0200
|
||||
+++ tuprolog-2.7.0/src/alice/util/DynamicURLClassLoader.java 2013-05-16 13:56:42.000000000 +0200
|
||||
@@ -35,7 +35,7 @@
|
||||
|
||||
/**
|
||||
* Constructor that specifies the URLs array.
|
||||
- * @param URL[] urls - Used to load a directory a URL ends with "/" or "\"
|
||||
+ * @param urls - Used to load a directory a URL ends with "/" or "\"
|
||||
* otherwise it loads a class contained into a .jar
|
||||
*/
|
||||
|
||||
@@ -148,7 +148,7 @@
|
||||
|
||||
/**
|
||||
* Remove array URLs method.
|
||||
- * @param urls - URL to be removed.
|
||||
+ * @param url - URL to be removed.
|
||||
*/
|
||||
|
||||
public void removeURL(URL url) throws IllegalArgumentException
|
||||
diff -ur tuprolog-2.7.0.orig/src/alice/util/InspectionUtils.java tuprolog-2.7.0/src/alice/util/InspectionUtils.java
|
||||
--- tuprolog-2.7.0.orig/src/alice/util/InspectionUtils.java 2013-05-16 13:50:43.000000000 +0200
|
||||
+++ tuprolog-2.7.0/src/alice/util/InspectionUtils.java 2013-05-16 13:56:42.000000000 +0200
|
||||
@@ -14,9 +14,9 @@
|
||||
/**
|
||||
* @author Michele Mannino
|
||||
*
|
||||
- * @param type: class to be inspected
|
||||
- * @param methodName: name of method
|
||||
- * @param parms: array of params
|
||||
+ * @param type class to be inspected
|
||||
+ * @param methodName name of method
|
||||
+ * @param parms array of params
|
||||
*/
|
||||
public static Method searchForMethod(Class<?> type, String methodName, Class<?>[] parms) {
|
||||
Method[] methods = type.getMethods();
|
||||
diff -ur tuprolog-2.7.0.orig/src/alice/util/jedit/InputHandler.java tuprolog-2.7.0/src/alice/util/jedit/InputHandler.java
|
||||
--- tuprolog-2.7.0.orig/src/alice/util/jedit/InputHandler.java 2013-05-16 13:50:42.000000000 +0200
|
||||
+++ tuprolog-2.7.0/src/alice/util/jedit/InputHandler.java 2013-05-16 13:56:42.000000000 +0200
|
||||
@@ -24,7 +24,7 @@
|
||||
*
|
||||
* @author Slava Pestov
|
||||
* @version $Id: InputHandler.java,v 1.14 1999/12/13 03:40:30 sp Exp $
|
||||
- * @see org.gjt.sp.jedit.textarea.DefaultInputHandler
|
||||
+ * @see alice.util.jedit.DefaultInputHandler
|
||||
*/
|
||||
public abstract class InputHandler extends KeyAdapter
|
||||
{
|
||||
@@ -187,7 +187,7 @@
|
||||
/**
|
||||
* Grabs the next key typed event and invokes the specified
|
||||
* action with the key as a the action command.
|
||||
- * @param action The action
|
||||
+ * @param listener The action
|
||||
*/
|
||||
public void grabNextKeyStroke(ActionListener listener)
|
||||
{
|
||||
diff -ur tuprolog-2.7.0.orig/src/alice/util/jedit/JEditTextArea.java tuprolog-2.7.0/src/alice/util/jedit/JEditTextArea.java
|
||||
--- tuprolog-2.7.0.orig/src/alice/util/jedit/JEditTextArea.java 2013-05-16 13:50:42.000000000 +0200
|
||||
+++ tuprolog-2.7.0/src/alice/util/jedit/JEditTextArea.java 2013-05-16 13:56:42.000000000 +0200
|
||||
@@ -1401,7 +1401,7 @@
|
||||
|
||||
/**
|
||||
* Sets if the selection should be rectangular.
|
||||
- * @param overwrite True if the selection should be rectangular,
|
||||
+ * @param rectSelect True if the selection should be rectangular,
|
||||
* false otherwise.
|
||||
*/
|
||||
public final void setSelectionRectangular(boolean rectSelect)
|
||||
diff -ur tuprolog-2.7.0.orig/src/alice/util/jedit/KeywordMap.java tuprolog-2.7.0/src/alice/util/jedit/KeywordMap.java
|
||||
--- tuprolog-2.7.0.orig/src/alice/util/jedit/KeywordMap.java 2013-05-16 13:50:42.000000000 +0200
|
||||
+++ tuprolog-2.7.0/src/alice/util/jedit/KeywordMap.java 2013-05-16 13:56:42.000000000 +0200
|
||||
@@ -75,7 +75,7 @@
|
||||
/**
|
||||
* Adds a key-value mapping.
|
||||
* @param keyword The key
|
||||
- * @Param id The value
|
||||
+ * @param id The value
|
||||
*/
|
||||
public void add(String keyword, byte id)
|
||||
{
|
||||
@@ -102,9 +102,6 @@
|
||||
}
|
||||
|
||||
// protected members
|
||||
- /**
|
||||
- * @uml.property name="mapLength"
|
||||
- */
|
||||
protected int mapLength;
|
||||
|
||||
protected int getStringMapKey(String s)
|
||||
diff -ur tuprolog-2.7.0.orig/src/alice/util/jedit/TextAreaPainter.java tuprolog-2.7.0/src/alice/util/jedit/TextAreaPainter.java
|
||||
--- tuprolog-2.7.0.orig/src/alice/util/jedit/TextAreaPainter.java 2013-05-16 13:50:42.000000000 +0200
|
||||
+++ tuprolog-2.7.0/src/alice/util/jedit/TextAreaPainter.java 2013-05-16 13:56:42.000000000 +0200
|
||||
@@ -75,7 +75,7 @@
|
||||
|
||||
/**
|
||||
* Returns the syntax styles used to paint colorized text. Entry <i>n</i> will be used to paint tokens with id = <i>n</i>.
|
||||
- * @see org.gjt.sp.jedit.syntax.Token
|
||||
+ * @see alice.util.jedit.Token
|
||||
*/
|
||||
public final SyntaxStyle[] getStyles()
|
||||
{
|
||||
@@ -85,7 +85,7 @@
|
||||
/**
|
||||
* Sets the syntax styles used to paint colorized text. Entry <i>n</i> will be used to paint tokens with id = <i>n</i>.
|
||||
* @param styles The syntax styles
|
||||
- * @see org.gjt.sp.jedit.syntax.Token
|
||||
+ * @see alice.util.jedit.Token
|
||||
*/
|
||||
public final void setStyles(SyntaxStyle[] styles)
|
||||
{
|
||||
@@ -356,7 +356,7 @@
|
||||
|
||||
/**
|
||||
* Repaints the text.
|
||||
- * @param g The graphics context
|
||||
+ * @param gfx The graphics context
|
||||
*/
|
||||
public void paint(Graphics gfx)
|
||||
{
|
||||
diff -ur tuprolog-2.7.0.orig/src/alice/util/jedit/TokenMarker.java tuprolog-2.7.0/src/alice/util/jedit/TokenMarker.java
|
||||
--- tuprolog-2.7.0.orig/src/alice/util/jedit/TokenMarker.java 2013-05-16 13:50:42.000000000 +0200
|
||||
+++ tuprolog-2.7.0/src/alice/util/jedit/TokenMarker.java 2013-05-16 13:56:42.000000000 +0200
|
||||
@@ -23,7 +23,7 @@
|
||||
* @author Slava Pestov
|
||||
* @version $Id: TokenMarker.java,v 1.32 1999/12/13 03:40:30 sp Exp $
|
||||
*
|
||||
- * @see org.gjt.sp.jedit.syntax.Token
|
||||
+ * @see alice.util.jedit.Token
|
||||
*/
|
||||
public abstract class TokenMarker
|
||||
{
|
||||
diff -ur tuprolog-2.7.0.orig/src/alice/util/ReadOnlyLinkedList.java tuprolog-2.7.0/src/alice/util/ReadOnlyLinkedList.java
|
||||
--- tuprolog-2.7.0.orig/src/alice/util/ReadOnlyLinkedList.java 2013-05-16 13:50:43.000000000 +0200
|
||||
+++ tuprolog-2.7.0/src/alice/util/ReadOnlyLinkedList.java 2013-05-16 13:56:42.000000000 +0200
|
||||
@@ -12,10 +12,10 @@
|
||||
import java.util.ListIterator;
|
||||
|
||||
/**
|
||||
- * ReadOnlyLinkedList<E> encapsulate a {@link LinkedList<E>}
|
||||
+ * ReadOnlyLinkedList<E> encapsulate a {@link LinkedList}
|
||||
* and ensures that the given list is navigated only.
|
||||
*
|
||||
- * Even if ReadOnlyLinkedList<E> implements {@link List<E>} it doesn't
|
||||
+ * Even if ReadOnlyLinkedList<E> implements {@link List} it doesn't
|
||||
* support modifiers methods, and throws {@link UnsupportedOperationException}
|
||||
* if invoked.
|
||||
*
|
@ -1,55 +0,0 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=2
|
||||
|
||||
inherit eutils java-pkg-2 java-ant-2
|
||||
|
||||
DESCRIPTION="tuProlog is a light-weight Prolog for Internet applications and infrastructures"
|
||||
HOMEPAGE="http://www.alice.unibo.it/tuProlog/"
|
||||
SRC_URI="mirror://gentoo/${P}.zip"
|
||||
|
||||
LICENSE="LGPL-3"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="doc test"
|
||||
|
||||
RDEPEND=">=virtual/jdk-1.5
|
||||
>=dev-java/javassist-3"
|
||||
|
||||
DEPEND="${RDEPEND}
|
||||
app-arch/unzip
|
||||
dev-java/ant-core
|
||||
test? ( dev-java/ant-junit )"
|
||||
|
||||
S="${WORKDIR}"/${P}
|
||||
|
||||
EANT_GENTOO_CLASSPATH="javassist-3"
|
||||
|
||||
src_prepare() {
|
||||
epatch "${FILESDIR}"/${P}-javadocs.patch
|
||||
|
||||
cp "${FILESDIR}"/build.xml "${S}" || die
|
||||
sed -i -e "s|test/unit|test|" "${S}"/build.xml \
|
||||
|| die "sed build.xml failed"
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
eant jar $(use_doc)
|
||||
}
|
||||
|
||||
src_test() {
|
||||
cd "${S}"/dist
|
||||
java-pkg_jar-from junit
|
||||
cd "${S}"
|
||||
ANT_TASKS="ant-junit" eant test || die "eant test failed"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
java-pkg_dojar dist/${PN}.jar
|
||||
|
||||
if use doc ; then
|
||||
java-pkg_dohtml -r docs/* || die
|
||||
fi
|
||||
}
|
@ -1,59 +0,0 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=3
|
||||
|
||||
inherit eutils java-pkg-2 java-ant-2
|
||||
|
||||
DESCRIPTION="tuProlog is a light-weight Prolog for Internet applications and infrastructures"
|
||||
HOMEPAGE="http://www.alice.unibo.it/tuProlog/"
|
||||
SRC_URI="mirror://gentoo/${P}.tar.gz"
|
||||
|
||||
LICENSE="LGPL-3"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="doc test"
|
||||
|
||||
RDEPEND=">=virtual/jdk-1.7
|
||||
>=dev-java/javassist-3"
|
||||
|
||||
DEPEND="${RDEPEND}
|
||||
dev-java/ant-core
|
||||
test? (
|
||||
dev-java/ant-junit4
|
||||
dev-java/hamcrest-core
|
||||
)"
|
||||
|
||||
S="${WORKDIR}"/${P}
|
||||
|
||||
EANT_GENTOO_CLASSPATH="javassist-3"
|
||||
|
||||
src_prepare() {
|
||||
epatch "${FILESDIR}"/${P}-javadocs.patch
|
||||
|
||||
cp "${FILESDIR}"/build.xml "${S}" || die
|
||||
sed -i -e "s|test/unit|test|" "${S}"/build.xml \
|
||||
|| die "sed build.xml failed"
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
eant jar $(use_doc)
|
||||
}
|
||||
|
||||
src_test() {
|
||||
cd "${S}"/dist
|
||||
java-pkg_jar-from junit-4
|
||||
java-pkg_jar-from hamcrest-core
|
||||
cd "${S}"
|
||||
ANT_TASKS="ant-junit4" eant -Djunit.jar=junit.jar test \
|
||||
|| die "eant test failed"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
java-pkg_dojar dist/${PN}.jar
|
||||
|
||||
if use doc ; then
|
||||
java-pkg_dohtml -r docs/* || die
|
||||
fi
|
||||
}
|
@ -1,59 +0,0 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=3
|
||||
|
||||
inherit eutils java-pkg-2 java-ant-2
|
||||
|
||||
DESCRIPTION="tuProlog is a light-weight Prolog for Internet applications and infrastructures"
|
||||
HOMEPAGE="http://tuprolog.unibo.it/"
|
||||
SRC_URI="mirror://gentoo/${P}.tar.gz"
|
||||
|
||||
LICENSE="LGPL-3"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="doc test"
|
||||
|
||||
RDEPEND=">=virtual/jdk-1.7
|
||||
>=dev-java/javassist-3"
|
||||
|
||||
DEPEND="${RDEPEND}
|
||||
dev-java/ant-core
|
||||
test? (
|
||||
dev-java/ant-junit4
|
||||
dev-java/hamcrest-core
|
||||
)"
|
||||
|
||||
S="${WORKDIR}"/${P}
|
||||
|
||||
EANT_GENTOO_CLASSPATH="javassist-3"
|
||||
|
||||
src_prepare() {
|
||||
epatch "${FILESDIR}"/${P}-javadocs.patch
|
||||
|
||||
cp "${FILESDIR}"/build.xml "${S}" || die
|
||||
sed -i -e "s|test/unit|test|" "${S}"/build.xml \
|
||||
|| die "sed build.xml failed"
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
eant jar $(use_doc)
|
||||
}
|
||||
|
||||
src_test() {
|
||||
cd "${S}"/dist
|
||||
java-pkg_jar-from junit-4
|
||||
java-pkg_jar-from hamcrest-core
|
||||
cd "${S}"
|
||||
ANT_TASKS="ant-junit4" eant -Djunit.jar=junit.jar test \
|
||||
|| die "eant test failed"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
java-pkg_dojar dist/${PN}.jar
|
||||
|
||||
if use doc ; then
|
||||
java-pkg_dohtml -r docs/* || die
|
||||
fi
|
||||
}
|
@ -1 +1,2 @@
|
||||
DIST ocaml-ipaddr-2.6.1.tar.gz 64458 SHA256 7051013d8f58abff433187d70cd7ddd7a6b49a6fbe6cad1893f571f65b8ed3d0 SHA512 a22382b5118caf0a29322e52d40523cbf52edd21d477c2e4581a5f70441b71f948b75ff7d55a7cf6c32f0e68c430c3aff59a05d9514b29e858ff78f4c649c4c6 WHIRLPOOL 418a3bcbef9a1198962bd5d09381756520eaced7e86f8ba204810b786187cfb6e020019da331d85e11d510fa744802c66d52a450fb31a9ff8a418004ff1d4cbe
|
||||
DIST ocaml-ipaddr-2.7.0.tar.gz 65470 SHA256 3031abb4a5391af8b7e307db09807ef748fc718ee23855e2f933df47892d4c23 SHA512 36ce32945e05166165ba9d2d6d10a9fb1531a50ff4e9e1a87d1bf557e767fa2938af9cbaeea7da4eefd058d687f0b36696075fd4c9ed075f5207e3c9f5488c87 WHIRLPOOL 188acfc6e110253b62f92a21a08a1519650289141b9649bed2e80b7850f9cdaa8327859933501ff0b938c2896f42ba48fac57b0b4c6b3ea59b6f4368eac0bd28
|
||||
|
@ -0,0 +1,25 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
|
||||
OASIS_BUILD_TESTS=1
|
||||
|
||||
inherit oasis
|
||||
|
||||
DESCRIPTION="OCaml library for manipulation of IP (and MAC) address representations"
|
||||
HOMEPAGE="https://github.com/mirage/ocaml-ipaddr"
|
||||
SRC_URI="https://github.com/mirage/ocaml-ipaddr/archive/${PV}.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
LICENSE="ISC"
|
||||
SLOT="0/${PV}"
|
||||
KEYWORDS="~amd64"
|
||||
IUSE=""
|
||||
|
||||
DEPEND="dev-ml/sexplib:=
|
||||
dev-ml/ppx_sexp_conv:=
|
||||
"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
DOCS=( CHANGES README.md )
|
@ -1,2 +1,3 @@
|
||||
DIST postgresql-ocaml-2.0.5.tar.gz 79123 SHA256 e786c46edbd63aacd82e008098a2c801f445d59a29bd49713eae5cf5c157eaa8 SHA512 1d4b09b9135e1d6a98295bd51175ac44e6b51219703ad8ba5c0d429d81534989b43ed8922eff6511de4fc31b6dde1e6ca4f7bea91981e3d8c025d151258e41c7 WHIRLPOOL 04ae6fb1865fea75f286faf366ba4a976f260c502de1f898b48c8fb93b70ddedfdeeb9383e54efb2dd3b15e9b6d5302e1a5e0009188d8d83bbd69d4448774eef
|
||||
DIST postgresql-ocaml-3.2.2.tar.gz 85697 SHA256 51348110f06e7d17f68894fd91f91b3e1f935647355a94a79b8c16f923ce9e81 SHA512 c41c6feed76d8d49932399a080d2e2fa9227b742e0cab5efdf849315ae1b633369e035bee3fd1d94c6a61e533f23d3881e9de650d1b4ec01946660f39c245917 WHIRLPOOL c314346cf113c87ceec3ded469505952a7717f06bdc6099e5fab84d4b5911927b611036bf924c9fdadb35c545ad3fc8ab06d115fd24ad78e045580ba8e02a04f
|
||||
DIST postgresql-ocaml-4.0.1.tar.gz 85871 SHA256 07d8fdb5c161b30809876375c43ebf29e5b99a475ee6b019b6fee3a80c18a4cb SHA512 baecd1b3b98f790131972dbd2eba563b43dec6e13e37ab904ee38b2b1168b03533272532887a42a2536806951c9e543306c6eccfb441de517ee860383ea5df36 WHIRLPOOL 71562d46b8688b4319f6fae06aeaea866e397cf6ce9f533b096d8d9f0850b2746fdffca6f4f234cc23cfb433d8124f559f89971d32554a756e88234c5a311e6d
|
||||
|
@ -0,0 +1,34 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
|
||||
OASIS_BUILD_DOCS=1
|
||||
|
||||
inherit oasis
|
||||
|
||||
DESCRIPTION="A package for ocaml that provides access to PostgreSQL databases"
|
||||
SRC_URI="https://github.com/mmottl/postgresql-ocaml/releases/download/v${PV}/${P}.tar.gz"
|
||||
HOMEPAGE="http://mmottl.github.io/postgresql-ocaml/"
|
||||
IUSE="examples"
|
||||
|
||||
RDEPEND="
|
||||
dev-db/postgresql:=[server]
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
>=dev-ml/findlib-1.5"
|
||||
|
||||
SLOT="0/${PV}"
|
||||
LICENSE="LGPL-2"
|
||||
KEYWORDS="~amd64 ~ppc ~x86"
|
||||
|
||||
DOCS=( "AUTHORS.txt" "CHANGES.txt" "README.md" )
|
||||
|
||||
src_install() {
|
||||
oasis_src_install
|
||||
if use examples ; then
|
||||
insinto /usr/share/doc/${PF}
|
||||
doins -r examples
|
||||
fi
|
||||
}
|
@ -1,20 +0,0 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
|
||||
MODULE_AUTHOR=MARKSTOS
|
||||
MODULE_VERSION=2.20
|
||||
inherit perl-module
|
||||
|
||||
DESCRIPTION="Populates HTML Forms with data"
|
||||
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 ~arm ~ppc x86 ~x86-fbsd"
|
||||
IUSE=""
|
||||
|
||||
RDEPEND="dev-perl/HTML-Parser"
|
||||
DEPEND="${RDEPEND}"
|
||||
|
||||
SRC_TEST="do"
|
@ -1,2 +1 @@
|
||||
DIST HTML-FillInForm-2.20.tar.gz 17309 SHA256 75e1125e32fb218d5aceddb7f6ffdd49edf16ff438571ab0fd4866a52fc7ec5b SHA512 d00955fae1d9602ccda79e42e4a2863cb04b7070d72bdfe383b3b68ac56cf0a629bf2cbea35aaa042a379fe1c9679d7905407454d0e6c19433f6821dfbd27ebd WHIRLPOOL d60f5118b2e16115e5e1316c72b41a9583334261e18fa1299ba78b9d5fa641fa775283ae734e11f099e43a850fba403d817f679b183332dbc48a47f04e4d82b3
|
||||
DIST HTML-FillInForm-2.21.tar.gz 17823 SHA256 d3af183cc8327614f1192929f4f0919b6e9725fc19c6f3730ce556a8daea6cf6 SHA512 05a755635478a797c4711e812a7fbd0428e61b4a4dbb3f8b62ed929122bb4b138aa3d86f2d99ace01d9e7f9486663e64b2c50490d0084c861cbdf8c25645be96 WHIRLPOOL 2f89df5e337e11ea9c327de5afaeca18b845b77d437f1fa139681ccb3be1495fe58852728a94debedee3f36483a2b30f3f5a14733b7f3c90b391a021a416ec0e
|
||||
|
@ -1,4 +1,4 @@
|
||||
DIST elasticsearch-1.7.1.tar.gz 28500556 SHA256 86a0c20eea6ef55b14345bff5adf896e6332437b19180c4582a346394abde019 SHA512 88786d277cb3228a5e477068fc5ff723e0b5aa47411cea5c55d15ae769f2fb123d274e29c592a9e0f655deedb9db62f296af5aff4e8b56539928025a3375daaa WHIRLPOOL 2218ec3603314a60b38e903b3f00681512306efe1892350ced71c060a24924391d66cb9273d6db5ebb781d60808a2f3ab4c77c57baa03714db143c3718602bf5
|
||||
DIST elasticsearch-1.7.3.tar.gz 28510917 SHA256 af517611493374cfb2daa8897ae17e63e2efea4d0377d316baa351c1776a2bca SHA512 0cb6b2ebd77c3d1467f6a22f845bfbf9f4a7c9c9ddedae17aeb6bd2d2bc576171fc80e3a4963e7b890af574e9fd0b0faa152e7f2671a74254826e14fe2554c9f WHIRLPOOL c86de3076389a9b95cf4d424673edb3c3b1dae0b4470b18b15a5f2e9bde6669a61b8ffd5cc3f7fc3b52f99441915a84b0396a5673ebbc12fec0d83eb41a03c74
|
||||
DIST elasticsearch-curator-3.3.0.tar.gz 85260 SHA256 e55ec74df61b8afc05a27bb1791cf07131b54d0fccede6bd5ce8815f350c9a7b SHA512 030644137f2065d89ea44d19f71a5b54d2a216891f9f83984e131cd0c29d348a8a38dc292a076e13c2b87e6a25c30b6ed85780878f5bcaae1f4f0d57f4f6df24 WHIRLPOOL 80f2b6ad95e3f34b5adb6c55fc2ca7c8b31108bedc474735b5023d40c49930ab33993cb087c9d5928e67e907d2ed87a99b7fa4b5951ff91638bc4da7b725820b
|
||||
DIST elasticsearch-2.2.0.tar.gz 29419005 SHA256 ed70cc81e1f55cd5f0032beea2907227b6ad8e7457dcb75ddc97a2cc6e054d30 SHA512 b1c9d10ba6c778fe1a440c058b4968bae1cfb81cff9e00508e406ce02ec5eb889b6d7caf8fb69ef132a2e681b127fbe3b71c6298ee0c9f047aeaeec29cdc1cc6 WHIRLPOOL 1e57b2cca97d90756d592ca96ceb4e1fc026e1c9deaeceb3df3a59937a9cd8710222d6c74ece2883dd425aeb1bfde034413d2f04ea0f4a4c276c0d7de3671cee
|
||||
DIST elasticsearch-curator-3.4.0.tar.gz 96741 SHA256 86e542886d83ad4c499437e42f4ff69d6602314a75c0c156d1c8dd838ab5e605 SHA512 23cab700acb8afe7967d3e024a293a765ba1823015006c2856c3967ba33ec8a21d214fe7e0b2840e9fc3adb4cc15c889dba955c849036850ed67d689285f9871 WHIRLPOOL 01828a116a11d41666fb21c967375055114ff050650ab329f5aded441aa98743b0c62bcbb98f7f5a2335b844d44e1f3020d6f36e0f2f24acbf357f69b056062e
|
||||
DIST elasticsearch-curator-3.4.1.tar.gz 91420 SHA256 38d3c576c1a714d3e4defd78c43d898908ac563aa93018afd47702b5ae1e01c1 SHA512 63cee7e7778cf9cc5484a5e2a5a7cb379c8ba84f194d44758bf6e7a468492c27f41dbf5df42d964c060761e61166d3eba056c59b4d44e0df6a75052c5f9b42d8 WHIRLPOOL 2aa54a725b5cf1b5db0e3a8b069bd9d0f6d791f7750311676d25bcb7fba233316d38980c68e2ad2bfd7ae7ea82cc69ccbc7746e40f95e6ce19562ed577e32228
|
||||
|
@ -1 +1,2 @@
|
||||
DIST rosbridge_suite-0.7.13.tar.gz 367051 SHA256 c26130590ed36d899dc4a2f3282caec96fadc75732cd5c3364e3210139d85820 SHA512 f5a6abddfa768c43685ad16f20d1351e63b268c69f239aa3ff2e30f656c6a81686461185e21be88a5a0badcbc473bc7faa308540c1a14ca15fce11e9b23b9d7e WHIRLPOOL c45da51149bacd246e1c18ef34a0e56b6698ff0c7a1fe6380f581134cb0f9a432b31d96280872b92ec1accd021fb7dae38c7fe708501d5597a170f3def209aed
|
||||
DIST rosbridge_suite-0.7.14.tar.gz 368983 SHA256 710021193a87a0da760c9f7124a6abf566b73c4ebb42e0a5eac7738375f80f0b SHA512 5e7de568d32dff41870c11012b4f272c99d28d20bacd748121407f9574a4e4b94ee022aa81a859ac4cd3a1915b0a00cb6fece7f71b829cc2cc07cc6469457655 WHIRLPOOL 2484202e7fa03e1a996049aa60f7d031c38e03d36c384ffc58fb7c6f543ad945c6ed95702a1e994739d2f8c2e1a80d0ae1057732e92b948989f3aee221fa606c
|
||||
|
@ -0,0 +1,26 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
CATKIN_HAS_MESSAGES=yes
|
||||
ROS_REPO_URI="https://github.com/RobotWebTools/rosbridge_suite"
|
||||
KEYWORDS="~amd64"
|
||||
PYTHON_COMPAT=( python2_7 )
|
||||
ROS_SUBDIR=${PN}
|
||||
CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
|
||||
|
||||
inherit ros-catkin
|
||||
|
||||
DESCRIPTION="Provides service calls for getting ros meta-information, like list of topics, services, params, etc."
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
IUSE=""
|
||||
|
||||
RDEPEND="
|
||||
dev-ros/rospy[${PYTHON_USEDEP}]
|
||||
dev-ros/rosnode[${PYTHON_USEDEP}]
|
||||
dev-ros/rosgraph[${PYTHON_USEDEP}]
|
||||
dev-ros/rosbridge_library[${PYTHON_USEDEP}]
|
||||
"
|
||||
DEPEND="${RDEPEND}"
|
@ -1 +1,2 @@
|
||||
DIST rosbridge_suite-0.7.13.tar.gz 367051 SHA256 c26130590ed36d899dc4a2f3282caec96fadc75732cd5c3364e3210139d85820 SHA512 f5a6abddfa768c43685ad16f20d1351e63b268c69f239aa3ff2e30f656c6a81686461185e21be88a5a0badcbc473bc7faa308540c1a14ca15fce11e9b23b9d7e WHIRLPOOL c45da51149bacd246e1c18ef34a0e56b6698ff0c7a1fe6380f581134cb0f9a432b31d96280872b92ec1accd021fb7dae38c7fe708501d5597a170f3def209aed
|
||||
DIST rosbridge_suite-0.7.14.tar.gz 368983 SHA256 710021193a87a0da760c9f7124a6abf566b73c4ebb42e0a5eac7738375f80f0b SHA512 5e7de568d32dff41870c11012b4f272c99d28d20bacd748121407f9574a4e4b94ee022aa81a859ac4cd3a1915b0a00cb6fece7f71b829cc2cc07cc6469457655 WHIRLPOOL 2484202e7fa03e1a996049aa60f7d031c38e03d36c384ffc58fb7c6f543ad945c6ed95702a1e994739d2f8c2e1a80d0ae1057732e92b948989f3aee221fa606c
|
||||
|
@ -0,0 +1,43 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
CATKIN_HAS_MESSAGES=yes
|
||||
ROS_REPO_URI="https://github.com/RobotWebTools/rosbridge_suite"
|
||||
KEYWORDS="~amd64"
|
||||
PYTHON_COMPAT=( python2_7 )
|
||||
ROS_SUBDIR=${PN}
|
||||
CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs"
|
||||
|
||||
inherit ros-catkin
|
||||
|
||||
DESCRIPTION="Core rosbridge package repsonsible for interpreting JSON and performing the appropriate ROS action"
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
IUSE=""
|
||||
|
||||
RDEPEND="
|
||||
dev-ros/rospy[${PYTHON_USEDEP}]
|
||||
dev-ros/rosservice[${PYTHON_USEDEP}]
|
||||
dev-ros/rostopic[${PYTHON_USEDEP}]
|
||||
dev-ros/rosgraph[${PYTHON_USEDEP}]
|
||||
dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
|
||||
dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
|
||||
dev-python/pymongo[${PYTHON_USEDEP}]
|
||||
dev-python/pillow[${PYTHON_USEDEP}]
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
test? (
|
||||
dev-ros/actionlib_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
|
||||
dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
|
||||
dev-ros/nav_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
|
||||
dev-ros/rospy_tutorials[${CATKIN_MESSAGES_PYTHON_USEDEP}]
|
||||
dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
|
||||
dev-ros/std_srvs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
|
||||
dev-ros/stereo_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
|
||||
dev-ros/tf2_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
|
||||
dev-ros/trajectory_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
|
||||
dev-ros/visualization_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
|
||||
)
|
||||
"
|
@ -1 +1,2 @@
|
||||
DIST rosbridge_suite-0.7.13.tar.gz 367051 SHA256 c26130590ed36d899dc4a2f3282caec96fadc75732cd5c3364e3210139d85820 SHA512 f5a6abddfa768c43685ad16f20d1351e63b268c69f239aa3ff2e30f656c6a81686461185e21be88a5a0badcbc473bc7faa308540c1a14ca15fce11e9b23b9d7e WHIRLPOOL c45da51149bacd246e1c18ef34a0e56b6698ff0c7a1fe6380f581134cb0f9a432b31d96280872b92ec1accd021fb7dae38c7fe708501d5597a170f3def209aed
|
||||
DIST rosbridge_suite-0.7.14.tar.gz 368983 SHA256 710021193a87a0da760c9f7124a6abf566b73c4ebb42e0a5eac7738375f80f0b SHA512 5e7de568d32dff41870c11012b4f272c99d28d20bacd748121407f9574a4e4b94ee022aa81a859ac4cd3a1915b0a00cb6fece7f71b829cc2cc07cc6469457655 WHIRLPOOL 2484202e7fa03e1a996049aa60f7d031c38e03d36c384ffc58fb7c6f543ad945c6ed95702a1e994739d2f8c2e1a80d0ae1057732e92b948989f3aee221fa606c
|
||||
|
@ -0,0 +1,30 @@
|
||||
# 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/RobotWebTools/rosbridge_suite"
|
||||
KEYWORDS="~amd64"
|
||||
PYTHON_COMPAT=( python2_7 )
|
||||
ROS_SUBDIR=${PN}
|
||||
|
||||
inherit ros-catkin
|
||||
|
||||
DESCRIPTION="A WebSocket interface to rosbridge"
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
IUSE=""
|
||||
|
||||
RDEPEND="
|
||||
dev-ros/rosapi[${PYTHON_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
|
||||
dev-ros/rospy[${PYTHON_USEDEP}]
|
||||
dev-ros/rosbridge_library[${PYTHON_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
|
||||
dev-ros/rosauth[${PYTHON_USEDEP}]
|
||||
dev-python/backports-ssl-match-hostname[${PYTHON_USEDEP}]
|
||||
www-servers/tornado[${PYTHON_USEDEP}]
|
||||
"
|
||||
DEPEND="${RDEPEND}"
|
||||
PATCHES=(
|
||||
"${FILESDIR}/backports-ssl.patch"
|
||||
"${FILESDIR}/tornado.patch"
|
||||
)
|
@ -1,2 +1 @@
|
||||
DIST ffmpegsource-2.20.tar.gz 539587 SHA256 c7d880172756c253f2c5673044dabf03c19890dcfe64da5104ee9f42a1a573a0 SHA512 77cfb027a6be21952700fadee66467d18bc0521569cf3d5eef3f7fd3ff9785ba1c6b7a251a5ccfb8b6e8dd965aef9928cf27459dca28591eeddd1fd5a2905295 WHIRLPOOL 321cc4a3ff37201def87bfb7596e84e76cb58fb05a43d99901eaca8f46f712fa4d86af9cdc65a24749c2715a4f52c9106ab2b24d7060cfe87f5401e520ac7fb1
|
||||
DIST ffmpegsource-2.22.tar.gz 487244 SHA256 7c5202fa2e49186fb3bb815e5b12ca71f05ec09cb707ffd9465852e21a06fdad SHA512 af92766f19b5db15c2f0b08e4d894e26bb66f93360b12461d37f38983a4e1916656514d52bf86f8a5def83207e2433d04f58384b1cf8f617ab19aafd2f0d7d56 WHIRLPOOL 2fb1b189ba573fd2e1f65e61cfa365201a419a3bb066ef54e06c07c5f8eabcfb93dc3191c860a8816a797eb9e47a62929a35c1c786a43712ab80ac2df69ee811
|
||||
|
@ -1,28 +0,0 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
|
||||
AUTOTOOLS_AUTORECONF=1
|
||||
|
||||
inherit autotools-utils
|
||||
|
||||
DESCRIPTION="A libav/ffmpeg based source library for easy frame accurate access"
|
||||
HOMEPAGE="https://github.com/FFMS/ffms2"
|
||||
SRC_URI="https://github.com/FFMS/ffms2/archive/${PV}.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
LICENSE="MIT"
|
||||
SLOT="0/3"
|
||||
KEYWORDS="amd64 x86"
|
||||
IUSE="libav static-libs"
|
||||
|
||||
RDEPEND="
|
||||
sys-libs/zlib
|
||||
libav? ( >=media-video/libav-9.17:0= )
|
||||
!libav? ( >=media-video/ffmpeg-1.2.6-r1:0= )
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
virtual/pkgconfig
|
||||
"
|
||||
S="${WORKDIR}/ffms2-${PV}"
|
@ -0,0 +1,500 @@
|
||||
commit 97c2dd0de4f578ad40d547eddf78fcb1e4a008a4
|
||||
Author: Dan Dennedy <dan@dennedy.org>
|
||||
Date: Sat Sep 5 13:06:21 2015 -0700
|
||||
|
||||
Fix avformat build against FFmpeg and Libav master.
|
||||
|
||||
This drops support for FFmpeg v1.0; requires at least v1.1. Still works
|
||||
with Libav v9.
|
||||
CPU flags are no longer required/used by libswscale. They are detected
|
||||
at runtime automatically.
|
||||
|
||||
diff --git a/src/modules/avformat/consumer_avformat.c b/src/modules/avformat/consumer_avformat.c
|
||||
index ef8b153..7947c47 100644
|
||||
--- a/src/modules/avformat/consumer_avformat.c
|
||||
+++ b/src/modules/avformat/consumer_avformat.c
|
||||
@@ -439,18 +439,18 @@ static void apply_properties( void *obj, mlt_properties properties, int flags )
|
||||
}
|
||||
}
|
||||
|
||||
-static enum PixelFormat pick_pix_fmt( mlt_image_format img_fmt )
|
||||
+static enum AVPixelFormat pick_pix_fmt( mlt_image_format img_fmt )
|
||||
{
|
||||
switch ( img_fmt )
|
||||
{
|
||||
case mlt_image_rgb24:
|
||||
- return PIX_FMT_RGB24;
|
||||
+ return AV_PIX_FMT_RGB24;
|
||||
case mlt_image_rgb24a:
|
||||
- return PIX_FMT_RGBA;
|
||||
+ return AV_PIX_FMT_RGBA;
|
||||
case mlt_image_yuv420p:
|
||||
- return PIX_FMT_YUV420P;
|
||||
+ return AV_PIX_FMT_YUV420P;
|
||||
default:
|
||||
- return PIX_FMT_YUYV422;
|
||||
+ return AV_PIX_FMT_YUYV422;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -798,7 +798,7 @@ static AVStream *add_video_stream( mlt_consumer consumer, AVFormatContext *oc, A
|
||||
st->time_base = c->time_base;
|
||||
|
||||
// Default to the codec's first pix_fmt if possible.
|
||||
- c->pix_fmt = pix_fmt? av_get_pix_fmt( pix_fmt ) : codec? codec->pix_fmts[0] : PIX_FMT_YUV420P;
|
||||
+ c->pix_fmt = pix_fmt? av_get_pix_fmt( pix_fmt ) : codec? codec->pix_fmts[0] : AV_PIX_FMT_YUV420P;
|
||||
|
||||
switch ( colorspace )
|
||||
{
|
||||
@@ -1032,7 +1032,7 @@ static int open_video( mlt_properties properties, AVFormatContext *oc, AVStream
|
||||
|
||||
if( codec && codec->pix_fmts )
|
||||
{
|
||||
- const enum PixelFormat *p = codec->pix_fmts;
|
||||
+ const enum AVPixelFormat *p = codec->pix_fmts;
|
||||
for( ; *p!=-1; p++ )
|
||||
{
|
||||
if( *p == video_enc->pix_fmt )
|
||||
@@ -1791,12 +1791,6 @@ static void *consumer_thread( void *arg )
|
||||
|
||||
// Do the colour space conversion
|
||||
int flags = SWS_BICUBIC;
|
||||
-#ifdef USE_MMX
|
||||
- flags |= SWS_CPU_CAPS_MMX;
|
||||
-#endif
|
||||
-#ifdef USE_SSE
|
||||
- flags |= SWS_CPU_CAPS_MMX2;
|
||||
-#endif
|
||||
struct SwsContext *context = sws_getContext( width, height, pick_pix_fmt( img_fmt ),
|
||||
width, height, c->pix_fmt, flags, NULL, NULL, NULL);
|
||||
sws_scale( context, (const uint8_t* const*) video_avframe->data, video_avframe->linesize, 0, height,
|
||||
@@ -1808,9 +1802,9 @@ static void *consumer_thread( void *arg )
|
||||
// Apply the alpha if applicable
|
||||
if ( !mlt_properties_get( properties, "mlt_image_format" ) ||
|
||||
strcmp( mlt_properties_get( properties, "mlt_image_format" ), "rgb24a" ) )
|
||||
- if ( c->pix_fmt == PIX_FMT_RGBA ||
|
||||
- c->pix_fmt == PIX_FMT_ARGB ||
|
||||
- c->pix_fmt == PIX_FMT_BGRA )
|
||||
+ if ( c->pix_fmt == AV_PIX_FMT_RGBA ||
|
||||
+ c->pix_fmt == AV_PIX_FMT_ARGB ||
|
||||
+ c->pix_fmt == AV_PIX_FMT_BGRA )
|
||||
{
|
||||
uint8_t *alpha = mlt_frame_get_alpha_mask( frame );
|
||||
register int n;
|
||||
@@ -1844,8 +1838,6 @@ static void *consumer_thread( void *arg )
|
||||
av_init_packet(&pkt);
|
||||
|
||||
// Set frame interlace hints
|
||||
- c->coded_frame->interlaced_frame = !mlt_properties_get_int( frame_properties, "progressive" );
|
||||
- c->coded_frame->top_field_first = mlt_properties_get_int( frame_properties, "top_field_first" );
|
||||
if ( mlt_properties_get_int( frame_properties, "progressive" ) )
|
||||
c->field_order = AV_FIELD_PROGRESSIVE;
|
||||
else
|
||||
diff --git a/src/modules/avformat/filter_avcolour_space.c b/src/modules/avformat/filter_avcolour_space.c
|
||||
index f70fd08..910de0c 100644
|
||||
--- a/src/modules/avformat/filter_avcolour_space.c
|
||||
+++ b/src/modules/avformat/filter_avcolour_space.c
|
||||
@@ -47,17 +47,17 @@ static int convert_mlt_to_av_cs( mlt_image_format format )
|
||||
switch( format )
|
||||
{
|
||||
case mlt_image_rgb24:
|
||||
- value = PIX_FMT_RGB24;
|
||||
+ value = AV_PIX_FMT_RGB24;
|
||||
break;
|
||||
case mlt_image_rgb24a:
|
||||
case mlt_image_opengl:
|
||||
- value = PIX_FMT_RGBA;
|
||||
+ value = AV_PIX_FMT_RGBA;
|
||||
break;
|
||||
case mlt_image_yuv422:
|
||||
- value = PIX_FMT_YUYV422;
|
||||
+ value = AV_PIX_FMT_YUYV422;
|
||||
break;
|
||||
case mlt_image_yuv420p:
|
||||
- value = PIX_FMT_YUV420P;
|
||||
+ value = AV_PIX_FMT_YUV420P;
|
||||
break;
|
||||
default:
|
||||
mlt_log_error( NULL, "[filter avcolor_space] Invalid format %s\n",
|
||||
@@ -123,16 +123,10 @@ static int av_convert_image( uint8_t *out, uint8_t *in, int out_fmt, int in_fmt,
|
||||
int flags = SWS_BICUBIC | SWS_ACCURATE_RND;
|
||||
int error = -1;
|
||||
|
||||
- if ( out_fmt == PIX_FMT_YUYV422 )
|
||||
+ if ( out_fmt == AV_PIX_FMT_YUYV422 )
|
||||
flags |= SWS_FULL_CHR_H_INP;
|
||||
else
|
||||
flags |= SWS_FULL_CHR_H_INT;
|
||||
-#ifdef USE_MMX
|
||||
- flags |= SWS_CPU_CAPS_MMX;
|
||||
-#endif
|
||||
-#ifdef USE_SSE
|
||||
- flags |= SWS_CPU_CAPS_MMX2;
|
||||
-#endif
|
||||
|
||||
avpicture_fill( &input, in, in_fmt, width, height );
|
||||
avpicture_fill( &output, out, out_fmt, width, height );
|
||||
@@ -141,7 +135,7 @@ static int av_convert_image( uint8_t *out, uint8_t *in, int out_fmt, int in_fmt,
|
||||
if ( context )
|
||||
{
|
||||
// libswscale wants the RGB colorspace to be SWS_CS_DEFAULT, which is = SWS_CS_ITU601.
|
||||
- if ( out_fmt == PIX_FMT_RGB24 || out_fmt == PIX_FMT_RGBA )
|
||||
+ if ( out_fmt == AV_PIX_FMT_RGB24 || out_fmt == AV_PIX_FMT_RGBA )
|
||||
dst_colorspace = 601;
|
||||
error = set_luma_transfer( context, src_colorspace, dst_colorspace, use_full_range );
|
||||
sws_scale( context, (const uint8_t* const*) input.data, input.linesize, 0, height,
|
||||
@@ -326,7 +320,7 @@ mlt_filter filter_avcolour_space_init( void *arg )
|
||||
int *width = (int*) arg;
|
||||
if ( *width > 0 )
|
||||
{
|
||||
- struct SwsContext *context = sws_getContext( *width, *width, PIX_FMT_RGB32, 64, 64, PIX_FMT_RGB32, SWS_BILINEAR, NULL, NULL, NULL);
|
||||
+ struct SwsContext *context = sws_getContext( *width, *width, AV_PIX_FMT_RGB32, 64, 64, AV_PIX_FMT_RGB32, SWS_BILINEAR, NULL, NULL, NULL);
|
||||
if ( context )
|
||||
sws_freeContext( context );
|
||||
else
|
||||
diff --git a/src/modules/avformat/filter_avdeinterlace.c b/src/modules/avformat/filter_avdeinterlace.c
|
||||
index 9c0189e..91c435c 100644
|
||||
--- a/src/modules/avformat/filter_avdeinterlace.c
|
||||
+++ b/src/modules/avformat/filter_avdeinterlace.c
|
||||
@@ -234,28 +234,28 @@ static int mlt_avpicture_deinterlace(AVPicture *dst, const AVPicture *src,
|
||||
{
|
||||
int i;
|
||||
|
||||
- if (pix_fmt != PIX_FMT_YUV420P &&
|
||||
- pix_fmt != PIX_FMT_YUV422P &&
|
||||
- pix_fmt != PIX_FMT_YUYV422 &&
|
||||
- pix_fmt != PIX_FMT_YUV444P &&
|
||||
- pix_fmt != PIX_FMT_YUV411P)
|
||||
+ if (pix_fmt != AV_PIX_FMT_YUV420P &&
|
||||
+ pix_fmt != AV_PIX_FMT_YUV422P &&
|
||||
+ pix_fmt != AV_PIX_FMT_YUYV422 &&
|
||||
+ pix_fmt != AV_PIX_FMT_YUV444P &&
|
||||
+ pix_fmt != AV_PIX_FMT_YUV411P)
|
||||
return -1;
|
||||
if ((width & 3) != 0 || (height & 3) != 0)
|
||||
return -1;
|
||||
|
||||
- if ( pix_fmt != PIX_FMT_YUYV422 )
|
||||
+ if ( pix_fmt != AV_PIX_FMT_YUYV422 )
|
||||
{
|
||||
for(i=0;i<3;i++) {
|
||||
if (i == 1) {
|
||||
switch(pix_fmt) {
|
||||
- case PIX_FMT_YUV420P:
|
||||
+ case AV_PIX_FMT_YUV420P:
|
||||
width >>= 1;
|
||||
height >>= 1;
|
||||
break;
|
||||
- case PIX_FMT_YUV422P:
|
||||
+ case AV_PIX_FMT_YUV422P:
|
||||
width >>= 1;
|
||||
break;
|
||||
- case PIX_FMT_YUV411P:
|
||||
+ case AV_PIX_FMT_YUV411P:
|
||||
width >>= 2;
|
||||
break;
|
||||
default:
|
||||
@@ -312,8 +312,8 @@ static int filter_get_image( mlt_frame frame, uint8_t **image, mlt_image_format
|
||||
AVPicture *output = mlt_pool_alloc( sizeof( AVPicture ) );
|
||||
|
||||
// Fill the picture
|
||||
- avpicture_fill( output, *image, PIX_FMT_YUYV422, *width, *height );
|
||||
- mlt_avpicture_deinterlace( output, output, PIX_FMT_YUYV422, *width, *height );
|
||||
+ avpicture_fill( output, *image, AV_PIX_FMT_YUYV422, *width, *height );
|
||||
+ mlt_avpicture_deinterlace( output, output, AV_PIX_FMT_YUYV422, *width, *height );
|
||||
|
||||
// Free the picture
|
||||
mlt_pool_release( output );
|
||||
diff --git a/src/modules/avformat/filter_swscale.c b/src/modules/avformat/filter_swscale.c
|
||||
index b8213a3..37c156d 100644
|
||||
--- a/src/modules/avformat/filter_swscale.c
|
||||
+++ b/src/modules/avformat/filter_swscale.c
|
||||
@@ -37,17 +37,17 @@ static inline int convert_mlt_to_av_cs( mlt_image_format format )
|
||||
switch( format )
|
||||
{
|
||||
case mlt_image_rgb24:
|
||||
- value = PIX_FMT_RGB24;
|
||||
+ value = AV_PIX_FMT_RGB24;
|
||||
break;
|
||||
case mlt_image_rgb24a:
|
||||
case mlt_image_opengl:
|
||||
- value = PIX_FMT_RGBA;
|
||||
+ value = AV_PIX_FMT_RGBA;
|
||||
break;
|
||||
case mlt_image_yuv422:
|
||||
- value = PIX_FMT_YUYV422;
|
||||
+ value = AV_PIX_FMT_YUYV422;
|
||||
break;
|
||||
case mlt_image_yuv420p:
|
||||
- value = PIX_FMT_YUV420P;
|
||||
+ value = AV_PIX_FMT_YUV420P;
|
||||
break;
|
||||
default:
|
||||
fprintf( stderr, "Invalid format...\n" );
|
||||
@@ -108,12 +108,6 @@ static int filter_scale( mlt_frame frame, uint8_t **image, mlt_image_format *for
|
||||
// XXX: we only know how to rescale packed formats
|
||||
return 1;
|
||||
}
|
||||
-#ifdef USE_MMX
|
||||
- interp |= SWS_CPU_CAPS_MMX;
|
||||
-#endif
|
||||
-#ifdef USE_SSE
|
||||
- interp |= SWS_CPU_CAPS_MMX2;
|
||||
-#endif
|
||||
|
||||
// Convert the pixel formats
|
||||
int avformat = convert_mlt_to_av_cs( *format );
|
||||
@@ -148,7 +142,7 @@ static int filter_scale( mlt_frame frame, uint8_t **image, mlt_image_format *for
|
||||
uint8_t *alpha = mlt_frame_get_alpha( frame );
|
||||
if ( alpha )
|
||||
{
|
||||
- avformat = PIX_FMT_GRAY8;
|
||||
+ avformat = AV_PIX_FMT_GRAY8;
|
||||
struct SwsContext *context = sws_getContext( iwidth, iheight, avformat, owidth, oheight, avformat, interp, NULL, NULL, NULL);
|
||||
avpicture_fill( &input, alpha, avformat, iwidth, iheight );
|
||||
outbuf = mlt_pool_alloc( owidth * oheight );
|
||||
@@ -182,7 +176,7 @@ mlt_filter filter_swscale_init( mlt_profile profile, void *arg )
|
||||
int *width = (int*) arg;
|
||||
if ( *width > 0 )
|
||||
{
|
||||
- struct SwsContext *context = sws_getContext( *width, *width, PIX_FMT_RGB32, 64, 64, PIX_FMT_RGB32, SWS_BILINEAR, NULL, NULL, NULL);
|
||||
+ struct SwsContext *context = sws_getContext( *width, *width, AV_PIX_FMT_RGB32, 64, 64, AV_PIX_FMT_RGB32, SWS_BILINEAR, NULL, NULL, NULL);
|
||||
if ( context )
|
||||
sws_freeContext( context );
|
||||
else
|
||||
diff --git a/src/modules/avformat/producer_avformat.c b/src/modules/avformat/producer_avformat.c
|
||||
index 3495e2a..55e326d 100644
|
||||
--- a/src/modules/avformat/producer_avformat.c
|
||||
+++ b/src/modules/avformat/producer_avformat.c
|
||||
@@ -33,6 +33,7 @@
|
||||
#include <libavutil/pixdesc.h>
|
||||
#include <libavutil/dict.h>
|
||||
#include <libavutil/opt.h>
|
||||
+#include <libavutil/channel_layout.h>
|
||||
|
||||
#ifdef VDPAU
|
||||
# include <libavcodec/vdpau.h>
|
||||
@@ -504,21 +505,21 @@ static char* parse_url( mlt_profile profile, const char* URL, AVInputFormat **fo
|
||||
return result;
|
||||
}
|
||||
|
||||
-static enum PixelFormat pick_pix_fmt( enum PixelFormat pix_fmt )
|
||||
+static enum AVPixelFormat pick_pix_fmt( enum AVPixelFormat pix_fmt )
|
||||
{
|
||||
switch ( pix_fmt )
|
||||
{
|
||||
- case PIX_FMT_ARGB:
|
||||
- case PIX_FMT_RGBA:
|
||||
- case PIX_FMT_ABGR:
|
||||
- case PIX_FMT_BGRA:
|
||||
- return PIX_FMT_RGBA;
|
||||
+ case AV_PIX_FMT_ARGB:
|
||||
+ case AV_PIX_FMT_RGBA:
|
||||
+ case AV_PIX_FMT_ABGR:
|
||||
+ case AV_PIX_FMT_BGRA:
|
||||
+ return AV_PIX_FMT_RGBA;
|
||||
#if defined(FFUDIV) && (LIBSWSCALE_VERSION_INT >= ((2<<16)+(5<<8)+102))
|
||||
case AV_PIX_FMT_BAYER_RGGB16LE:
|
||||
- return PIX_FMT_RGB24;
|
||||
+ return AV_PIX_FMT_RGB24;
|
||||
#endif
|
||||
default:
|
||||
- return PIX_FMT_YUV422P;
|
||||
+ return AV_PIX_FMT_YUV422P;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -976,26 +977,26 @@ static int set_luma_transfer( struct SwsContext *context, int src_colorspace,
|
||||
brightness, contrast, saturation );
|
||||
}
|
||||
|
||||
-static mlt_image_format pick_image_format( enum PixelFormat pix_fmt )
|
||||
+static mlt_image_format pick_image_format( enum AVPixelFormat pix_fmt )
|
||||
{
|
||||
switch ( pix_fmt )
|
||||
{
|
||||
- case PIX_FMT_ARGB:
|
||||
- case PIX_FMT_RGBA:
|
||||
- case PIX_FMT_ABGR:
|
||||
- case PIX_FMT_BGRA:
|
||||
+ case AV_PIX_FMT_ARGB:
|
||||
+ case AV_PIX_FMT_RGBA:
|
||||
+ case AV_PIX_FMT_ABGR:
|
||||
+ case AV_PIX_FMT_BGRA:
|
||||
return mlt_image_rgb24a;
|
||||
- case PIX_FMT_YUV420P:
|
||||
- case PIX_FMT_YUVJ420P:
|
||||
- case PIX_FMT_YUVA420P:
|
||||
+ case AV_PIX_FMT_YUV420P:
|
||||
+ case AV_PIX_FMT_YUVJ420P:
|
||||
+ case AV_PIX_FMT_YUVA420P:
|
||||
return mlt_image_yuv420p;
|
||||
- case PIX_FMT_RGB24:
|
||||
- case PIX_FMT_BGR24:
|
||||
- case PIX_FMT_GRAY8:
|
||||
- case PIX_FMT_MONOWHITE:
|
||||
- case PIX_FMT_MONOBLACK:
|
||||
- case PIX_FMT_RGB8:
|
||||
- case PIX_FMT_BGR8:
|
||||
+ case AV_PIX_FMT_RGB24:
|
||||
+ case AV_PIX_FMT_BGR24:
|
||||
+ case AV_PIX_FMT_GRAY8:
|
||||
+ case AV_PIX_FMT_MONOWHITE:
|
||||
+ case AV_PIX_FMT_MONOBLACK:
|
||||
+ case AV_PIX_FMT_RGB8:
|
||||
+ case AV_PIX_FMT_BGR8:
|
||||
#if defined(FFUDIV) && (LIBSWSCALE_VERSION_INT >= ((2<<16)+(5<<8)+102))
|
||||
case AV_PIX_FMT_BAYER_RGGB16LE:
|
||||
return mlt_image_rgb24;
|
||||
@@ -1071,21 +1072,14 @@ static int convert_image( producer_avformat self, AVFrame *frame, uint8_t *buffe
|
||||
mlt_profile profile = mlt_service_profile( MLT_PRODUCER_SERVICE( self->parent ) );
|
||||
int result = self->yuv_colorspace;
|
||||
|
||||
-#ifdef USE_MMX
|
||||
- flags |= SWS_CPU_CAPS_MMX;
|
||||
-#endif
|
||||
-#ifdef USE_SSE
|
||||
- flags |= SWS_CPU_CAPS_MMX2;
|
||||
-#endif
|
||||
-
|
||||
mlt_log_debug( MLT_PRODUCER_SERVICE(self->parent), "%s @ %dx%d space %d->%d\n",
|
||||
mlt_image_format_name( *format ),
|
||||
width, height, self->yuv_colorspace, profile->colorspace );
|
||||
|
||||
// extract alpha from planar formats
|
||||
- if ( ( pix_fmt == PIX_FMT_YUVA420P
|
||||
+ if ( ( pix_fmt == AV_PIX_FMT_YUVA420P
|
||||
#if defined(FFUDIV)
|
||||
- || pix_fmt == PIX_FMT_YUVA444P
|
||||
+ || pix_fmt == AV_PIX_FMT_YUVA444P
|
||||
#endif
|
||||
) &&
|
||||
*format != mlt_image_rgb24a && *format != mlt_image_opengl &&
|
||||
@@ -1110,10 +1104,10 @@ static int convert_image( producer_avformat self, AVFrame *frame, uint8_t *buffe
|
||||
// avformat with no filters and explicitly requested.
|
||||
#if defined(FFUDIV) && (LIBAVFORMAT_VERSION_INT >= ((55<<16)+(48<<8)+100))
|
||||
struct SwsContext *context = sws_getContext(width, height, src_pix_fmt,
|
||||
- width, height, PIX_FMT_YUV420P, flags, NULL, NULL, NULL);
|
||||
+ width, height, AV_PIX_FMT_YUV420P, flags, NULL, NULL, NULL);
|
||||
#else
|
||||
struct SwsContext *context = sws_getContext( width, height, pix_fmt,
|
||||
- width, height, self->full_luma ? PIX_FMT_YUVJ420P : PIX_FMT_YUV420P,
|
||||
+ width, height, self->full_luma ? AV_PIX_FMT_YUVJ420P : AV_PIX_FMT_YUV420P,
|
||||
flags, NULL, NULL, NULL);
|
||||
#endif
|
||||
|
||||
@@ -1133,9 +1127,9 @@ static int convert_image( producer_avformat self, AVFrame *frame, uint8_t *buffe
|
||||
else if ( *format == mlt_image_rgb24 )
|
||||
{
|
||||
struct SwsContext *context = sws_getContext( width, height, src_pix_fmt,
|
||||
- width, height, PIX_FMT_RGB24, flags | SWS_FULL_CHR_H_INT, NULL, NULL, NULL);
|
||||
+ width, height, AV_PIX_FMT_RGB24, flags | SWS_FULL_CHR_H_INT, NULL, NULL, NULL);
|
||||
AVPicture output;
|
||||
- avpicture_fill( &output, buffer, PIX_FMT_RGB24, width, height );
|
||||
+ avpicture_fill( &output, buffer, AV_PIX_FMT_RGB24, width, height );
|
||||
// libswscale wants the RGB colorspace to be SWS_CS_DEFAULT, which is = SWS_CS_ITU601.
|
||||
set_luma_transfer( context, self->yuv_colorspace, 601, self->full_luma, 0 );
|
||||
sws_scale( context, (const uint8_t* const*) frame->data, frame->linesize, 0, height,
|
||||
@@ -1145,9 +1139,9 @@ static int convert_image( producer_avformat self, AVFrame *frame, uint8_t *buffe
|
||||
else if ( *format == mlt_image_rgb24a || *format == mlt_image_opengl )
|
||||
{
|
||||
struct SwsContext *context = sws_getContext( width, height, src_pix_fmt,
|
||||
- width, height, PIX_FMT_RGBA, flags | SWS_FULL_CHR_H_INT, NULL, NULL, NULL);
|
||||
+ width, height, AV_PIX_FMT_RGBA, flags | SWS_FULL_CHR_H_INT, NULL, NULL, NULL);
|
||||
AVPicture output;
|
||||
- avpicture_fill( &output, buffer, PIX_FMT_RGBA, width, height );
|
||||
+ avpicture_fill( &output, buffer, AV_PIX_FMT_RGBA, width, height );
|
||||
// libswscale wants the RGB colorspace to be SWS_CS_DEFAULT, which is = SWS_CS_ITU601.
|
||||
set_luma_transfer( context, self->yuv_colorspace, 601, self->full_luma, 0 );
|
||||
sws_scale( context, (const uint8_t* const*) frame->data, frame->linesize, 0, height,
|
||||
@@ -1158,13 +1152,13 @@ static int convert_image( producer_avformat self, AVFrame *frame, uint8_t *buffe
|
||||
{
|
||||
#if defined(FFUDIV) && (LIBAVFORMAT_VERSION_INT >= ((55<<16)+(48<<8)+100))
|
||||
struct SwsContext *context = sws_getContext( width, height, src_pix_fmt,
|
||||
- width, height, PIX_FMT_YUYV422, flags | SWS_FULL_CHR_H_INP, NULL, NULL, NULL);
|
||||
+ width, height, AV_PIX_FMT_YUYV422, flags | SWS_FULL_CHR_H_INP, NULL, NULL, NULL);
|
||||
#else
|
||||
struct SwsContext *context = sws_getContext( width, height, pix_fmt,
|
||||
- width, height, PIX_FMT_YUYV422, flags | SWS_FULL_CHR_H_INP, NULL, NULL, NULL);
|
||||
+ width, height, AV_PIX_FMT_YUYV422, flags | SWS_FULL_CHR_H_INP, NULL, NULL, NULL);
|
||||
#endif
|
||||
AVPicture output;
|
||||
- avpicture_fill( &output, buffer, PIX_FMT_YUYV422, width, height );
|
||||
+ avpicture_fill( &output, buffer, AV_PIX_FMT_YUYV422, width, height );
|
||||
if ( !set_luma_transfer( context, self->yuv_colorspace, profile->colorspace, self->full_luma, 0 ) )
|
||||
result = profile->colorspace;
|
||||
sws_scale( context, (const uint8_t* const*) frame->data, frame->linesize, 0, height,
|
||||
@@ -1297,12 +1291,11 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form
|
||||
double delay = mlt_properties_get_double( properties, "video_delay" );
|
||||
|
||||
// Seek if necessary
|
||||
- const char *interp = mlt_properties_get( frame_properties, "rescale.interp" );
|
||||
- int preseek = must_decode
|
||||
+ int preseek = must_decode && codec_context->has_b_frames;
|
||||
#if defined(FFUDIV)
|
||||
- && ( interp && strcmp( interp, "nearest" ) )
|
||||
+ const char *interp = mlt_properties_get( frame_properties, "rescale.interp" );
|
||||
+ preseek = preseek && interp && strcmp( interp, "nearest" );
|
||||
#endif
|
||||
- && codec_context->has_b_frames;
|
||||
int paused = seek_video( self, position, req_position, preseek );
|
||||
|
||||
// Seek might have reopened the file
|
||||
@@ -1310,10 +1303,10 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form
|
||||
stream = context->streams[ self->video_index ];
|
||||
codec_context = stream->codec;
|
||||
if ( *format == mlt_image_none || *format == mlt_image_glsl ||
|
||||
- codec_context->pix_fmt == PIX_FMT_ARGB ||
|
||||
- codec_context->pix_fmt == PIX_FMT_RGBA ||
|
||||
- codec_context->pix_fmt == PIX_FMT_ABGR ||
|
||||
- codec_context->pix_fmt == PIX_FMT_BGRA )
|
||||
+ codec_context->pix_fmt == AV_PIX_FMT_ARGB ||
|
||||
+ codec_context->pix_fmt == AV_PIX_FMT_RGBA ||
|
||||
+ codec_context->pix_fmt == AV_PIX_FMT_ABGR ||
|
||||
+ codec_context->pix_fmt == AV_PIX_FMT_BGRA )
|
||||
*format = pick_image_format( codec_context->pix_fmt );
|
||||
#if defined(FFUDIV) && (LIBSWSCALE_VERSION_INT >= ((2<<16)+(5<<8)+102))
|
||||
else if ( codec_context->pix_fmt == AV_PIX_FMT_BAYER_RGGB16LE ) {
|
||||
@@ -1346,7 +1339,7 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form
|
||||
picture.linesize[1] = codec_context->width / 2;
|
||||
picture.linesize[2] = codec_context->width / 2;
|
||||
yuv_colorspace = convert_image( self, (AVFrame*) &picture, *buffer,
|
||||
- PIX_FMT_YUV420P, format, *width, *height, &alpha );
|
||||
+ AV_PIX_FMT_YUV420P, format, *width, *height, &alpha );
|
||||
}
|
||||
else
|
||||
#endif
|
||||
@@ -1539,7 +1532,7 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form
|
||||
VdpStatus status = vdp_surface_get_bits( render->surface, dest_format, planes, pitches );
|
||||
if ( status == VDP_STATUS_OK )
|
||||
{
|
||||
- yuv_colorspace = convert_image( self, self->video_frame, *buffer, PIX_FMT_YUV420P,
|
||||
+ yuv_colorspace = convert_image( self, self->video_frame, *buffer, AV_PIX_FMT_YUV420P,
|
||||
format, *width, *height, &alpha );
|
||||
mlt_properties_set_int( frame_properties, "colorspace", yuv_colorspace );
|
||||
}
|
||||
diff --git a/src/modules/avformat/vdpau.c b/src/modules/avformat/vdpau.c
|
||||
index 719db1c..4f2e6b9 100644
|
||||
--- a/src/modules/avformat/vdpau.c
|
||||
+++ b/src/modules/avformat/vdpau.c
|
||||
@@ -136,9 +136,9 @@ static int vdpau_init( producer_avformat self )
|
||||
return success;
|
||||
}
|
||||
|
||||
-static enum PixelFormat vdpau_get_format( struct AVCodecContext *s, const enum PixelFormat *fmt )
|
||||
+static enum AVPixelFormat vdpau_get_format( struct AVCodecContext *s, const enum AVPixelFormat *fmt )
|
||||
{
|
||||
- return PIX_FMT_VDPAU_H264;
|
||||
+ return AV_PIX_FMT_VDPAU_H264;
|
||||
}
|
||||
|
||||
static int vdpau_get_buffer( AVCodecContext *codec_context, AVFrame *frame )
|
||||
@@ -240,7 +240,7 @@ static int vdpau_decoder_init( producer_avformat self )
|
||||
self->video_codec->release_buffer = vdpau_release_buffer;
|
||||
self->video_codec->draw_horiz_band = vdpau_draw_horiz;
|
||||
self->video_codec->slice_flags = SLICE_FLAG_CODED_ORDER | SLICE_FLAG_ALLOW_FIELD;
|
||||
- self->video_codec->pix_fmt = PIX_FMT_VDPAU_H264;
|
||||
+ self->video_codec->pix_fmt = AV_PIX_FMT_VDPAU_H264;
|
||||
|
||||
VdpDecoderProfile profile = VDP_DECODER_PROFILE_H264_HIGH;
|
||||
uint32_t max_references = self->video_codec->refs;
|
@ -0,0 +1,460 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=6
|
||||
|
||||
# Subslot: libavutil major.libavcodec major.libavformat major
|
||||
# Since FFmpeg ships several libraries, subslot is kind of limited here.
|
||||
# Most consumers will use those three libraries, if a "less used" library
|
||||
# changes its soname, consumers will have to be rebuilt the old way
|
||||
# (preserve-libs).
|
||||
# If, for example, a package does not link to libavformat and only libavformat
|
||||
# changes its ABI then this package will be rebuilt needlessly. Hence, such a
|
||||
# package is free _not_ to := depend on FFmpeg but I would strongly encourage
|
||||
# doing so since such a case is unlikely.
|
||||
FFMPEG_SUBSLOT=55.57.57
|
||||
|
||||
SCM=""
|
||||
if [ "${PV#9999}" != "${PV}" ] ; then
|
||||
SCM="git-r3"
|
||||
EGIT_REPO_URI="git://source.ffmpeg.org/ffmpeg.git"
|
||||
fi
|
||||
|
||||
inherit eutils flag-o-matic multilib multilib-minimal toolchain-funcs ${SCM}
|
||||
|
||||
DESCRIPTION="Complete solution to record, convert and stream audio and video. Includes libavcodec"
|
||||
HOMEPAGE="http://ffmpeg.org/"
|
||||
if [ "${PV#9999}" != "${PV}" ] ; then
|
||||
SRC_URI=""
|
||||
elif [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot
|
||||
SRC_URI="mirror://gentoo/${P}.tar.bz2"
|
||||
else # Release
|
||||
SRC_URI="http://ffmpeg.org/releases/${P/_/-}.tar.bz2"
|
||||
fi
|
||||
FFMPEG_REVISION="${PV#*_p}"
|
||||
|
||||
SLOT="0/${FFMPEG_SUBSLOT}"
|
||||
LICENSE="
|
||||
!gpl? ( LGPL-2.1 )
|
||||
gpl? ( GPL-2 )
|
||||
amr? (
|
||||
gpl? ( GPL-3 )
|
||||
!gpl? ( LGPL-3 )
|
||||
)
|
||||
gmp? (
|
||||
gpl? ( GPL-3 )
|
||||
!gpl? ( LGPL-3 )
|
||||
)
|
||||
encode? (
|
||||
amrenc? (
|
||||
gpl? ( GPL-3 )
|
||||
!gpl? ( LGPL-3 )
|
||||
)
|
||||
)
|
||||
samba? ( GPL-3 )
|
||||
"
|
||||
if [ "${PV#9999}" = "${PV}" ] ; then
|
||||
KEYWORDS="~amd64 ~mips ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
|
||||
fi
|
||||
|
||||
# Options to use as use_enable in the foo[:bar] form.
|
||||
# This will feed configure with $(use_enable foo bar)
|
||||
# or $(use_enable foo foo) if no :bar is set.
|
||||
# foo is added to IUSE.
|
||||
FFMPEG_FLAG_MAP=(
|
||||
+bzip2:bzlib cpudetection:runtime-cpudetect debug gcrypt gnutls gmp
|
||||
+gpl +hardcoded-tables +iconv lzma +network openssl +postproc
|
||||
samba:libsmbclient sdl:ffplay sdl vaapi vdpau X:xlib xcb:libxcb
|
||||
xcb:libxcb-shm xcb:libxcb-xfixes +zlib
|
||||
# libavdevice options
|
||||
cdio:libcdio iec61883:libiec61883 ieee1394:libdc1394 libcaca openal
|
||||
opengl
|
||||
# indevs
|
||||
libv4l:libv4l2 pulseaudio:libpulse
|
||||
# decoders
|
||||
amr:libopencore-amrwb amr:libopencore-amrnb fdk:libfdk-aac
|
||||
jpeg2k:libopenjpeg bluray:libbluray celt:libcelt gme:libgme gsm:libgsm
|
||||
mmal modplug:libmodplug opus:libopus librtmp ssh:libssh
|
||||
schroedinger:libschroedinger speex:libspeex vorbis:libvorbis vpx:libvpx
|
||||
zvbi:libzvbi
|
||||
# libavfilter options
|
||||
bs2b:libbs2b chromaprint flite:libflite frei0r fribidi:libfribidi
|
||||
fontconfig ladspa libass truetype:libfreetype rubberband:librubberband
|
||||
zimg:libzimg
|
||||
# libswresample options
|
||||
libsoxr
|
||||
# Threads; we only support pthread for now but ffmpeg supports more
|
||||
+threads:pthreads
|
||||
)
|
||||
|
||||
# Same as above but for encoders, i.e. they do something only with USE=encode.
|
||||
FFMPEG_ENCODER_FLAG_MAP=(
|
||||
amrenc:libvo-amrwbenc mp3:libmp3lame
|
||||
faac:libfaac kvazaar:libkvazaar nvenc:nvenc
|
||||
openh264:libopenh264 snappy:libsnappy theora:libtheora twolame:libtwolame
|
||||
wavpack:libwavpack webp:libwebp x264:libx264 x265:libx265 xvid:libxvid
|
||||
)
|
||||
|
||||
IUSE="
|
||||
alsa doc +encode jack oss pic static-libs test v4l
|
||||
${FFMPEG_FLAG_MAP[@]%:*}
|
||||
${FFMPEG_ENCODER_FLAG_MAP[@]%:*}
|
||||
"
|
||||
|
||||
# Strings for CPU features in the useflag[:configure_option] form
|
||||
# if :configure_option isn't set, it will use 'useflag' as configure option
|
||||
ARM_CPU_FEATURES=( armv5te armv6 armv6t2 neon armvfp:vfp )
|
||||
MIPS_CPU_FEATURES=( mipsdspr1 mipsdspr2 mipsfpu )
|
||||
PPC_CPU_FEATURES=( altivec )
|
||||
X86_CPU_FEATURES_RAW=( 3dnow:amd3dnow 3dnowext:amd3dnowext aes:aesni avx:avx avx2:avx2 fma3:fma3 fma4:fma4 mmx:mmx mmxext:mmxext sse:sse sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4 sse4_2:sse42 xop:xop )
|
||||
X86_CPU_FEATURES=( ${X86_CPU_FEATURES_RAW[@]/#/cpu_flags_x86_} )
|
||||
X86_CPU_REQUIRED_USE="
|
||||
cpu_flags_x86_avx2? ( cpu_flags_x86_avx )
|
||||
cpu_flags_x86_fma4? ( cpu_flags_x86_avx )
|
||||
cpu_flags_x86_fma3? ( cpu_flags_x86_avx )
|
||||
cpu_flags_x86_xop? ( cpu_flags_x86_avx )
|
||||
cpu_flags_x86_avx? ( cpu_flags_x86_sse4_2 )
|
||||
cpu_flags_x86_aes? ( cpu_flags_x86_sse4_2 )
|
||||
cpu_flags_x86_sse4_2? ( cpu_flags_x86_sse4_1 )
|
||||
cpu_flags_x86_sse4_1? ( cpu_flags_x86_ssse3 )
|
||||
cpu_flags_x86_ssse3? ( cpu_flags_x86_sse3 )
|
||||
cpu_flags_x86_sse3? ( cpu_flags_x86_sse2 )
|
||||
cpu_flags_x86_sse2? ( cpu_flags_x86_sse )
|
||||
cpu_flags_x86_sse? ( cpu_flags_x86_mmxext )
|
||||
cpu_flags_x86_mmxext? ( cpu_flags_x86_mmx )
|
||||
cpu_flags_x86_3dnowext? ( cpu_flags_x86_3dnow )
|
||||
cpu_flags_x86_3dnow? ( cpu_flags_x86_mmx )
|
||||
"
|
||||
|
||||
IUSE="${IUSE}
|
||||
${ARM_CPU_FEATURES[@]%:*}
|
||||
${MIPS_CPU_FEATURES[@]%:*}
|
||||
${PPC_CPU_FEATURES[@]%:*}
|
||||
${X86_CPU_FEATURES[@]%:*}
|
||||
"
|
||||
|
||||
CPU_REQUIRED_USE="
|
||||
${X86_CPU_REQUIRED_USE}
|
||||
"
|
||||
|
||||
# "$(tc-arch):XXX" form where XXX_CPU_FEATURES are the cpu features that apply to
|
||||
# $(tc-arch).
|
||||
CPU_FEATURES_MAP="
|
||||
arm:ARM
|
||||
arm64:ARM
|
||||
mips:MIPS
|
||||
ppc:PPC
|
||||
ppc64:PPC
|
||||
x86:X86
|
||||
amd64:X86
|
||||
"
|
||||
|
||||
FFTOOLS=( aviocat cws2fws ffescape ffeval ffhash fourcc2pixfmt graph2dot ismindex pktdumper qt-faststart sidxindex trasher )
|
||||
IUSE="${IUSE} ${FFTOOLS[@]/#/+fftools_}"
|
||||
|
||||
RDEPEND="
|
||||
alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
|
||||
amr? ( >=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}] )
|
||||
bluray? ( >=media-libs/libbluray-0.3.0-r1[${MULTILIB_USEDEP}] )
|
||||
bs2b? ( >=media-libs/libbs2b-3.1.0-r1[${MULTILIB_USEDEP}] )
|
||||
bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
|
||||
cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}] )
|
||||
celt? ( >=media-libs/celt-0.11.1-r1[${MULTILIB_USEDEP}] )
|
||||
chromaprint? ( >=media-libs/chromaprint-1.2-r1[${MULTILIB_USEDEP}] )
|
||||
encode? (
|
||||
amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] )
|
||||
faac? ( >=media-libs/faac-1.28-r3[${MULTILIB_USEDEP}] )
|
||||
kvazaar? ( media-libs/kvazaar[${MULTILIB_USEDEP}] )
|
||||
mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] )
|
||||
nvenc? ( media-video/nvidia_video_sdk )
|
||||
openh264? ( >=media-libs/openh264-1.4.0-r1[${MULTILIB_USEDEP}] )
|
||||
snappy? ( >=app-arch/snappy-1.1.2-r1[${MULTILIB_USEDEP}] )
|
||||
theora? (
|
||||
>=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}]
|
||||
>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
|
||||
)
|
||||
twolame? ( >=media-sound/twolame-0.3.13-r1[${MULTILIB_USEDEP}] )
|
||||
wavpack? ( >=media-sound/wavpack-4.60.1-r1[${MULTILIB_USEDEP}] )
|
||||
webp? ( >=media-libs/libwebp-0.3.0[${MULTILIB_USEDEP}] )
|
||||
x264? ( >=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}] )
|
||||
x265? ( >=media-libs/x265-1.6:=[${MULTILIB_USEDEP}] )
|
||||
xvid? ( >=media-libs/xvid-1.3.2-r1[${MULTILIB_USEDEP}] )
|
||||
)
|
||||
fdk? ( >=media-libs/fdk-aac-0.1.3:=[${MULTILIB_USEDEP}] )
|
||||
flite? ( >=app-accessibility/flite-1.4-r4[${MULTILIB_USEDEP}] )
|
||||
fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
|
||||
frei0r? ( media-plugins/frei0r-plugins )
|
||||
fribidi? ( >=dev-libs/fribidi-0.19.6[${MULTILIB_USEDEP}] )
|
||||
gcrypt? ( >=dev-libs/libgcrypt-1.6:0=[${MULTILIB_USEDEP}] )
|
||||
gme? ( >=media-libs/game-music-emu-0.6.0[${MULTILIB_USEDEP}] )
|
||||
gmp? ( >=dev-libs/gmp-6:0=[${MULTILIB_USEDEP}] )
|
||||
gnutls? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}] )
|
||||
gsm? ( >=media-sound/gsm-1.0.13-r1[${MULTILIB_USEDEP}] )
|
||||
iconv? ( >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] )
|
||||
iec61883? (
|
||||
>=media-libs/libiec61883-1.2.0-r1[${MULTILIB_USEDEP}]
|
||||
>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
|
||||
>=sys-libs/libavc1394-0.5.4-r1[${MULTILIB_USEDEP}]
|
||||
)
|
||||
ieee1394? (
|
||||
>=media-libs/libdc1394-2.2.1[${MULTILIB_USEDEP}]
|
||||
>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
|
||||
)
|
||||
jack? ( >=media-sound/jack-audio-connection-kit-0.121.3-r1[${MULTILIB_USEDEP}] )
|
||||
jpeg2k? ( >=media-libs/openjpeg-2:2[${MULTILIB_USEDEP}] )
|
||||
libass? ( >=media-libs/libass-0.10.2[${MULTILIB_USEDEP}] )
|
||||
libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[${MULTILIB_USEDEP}] )
|
||||
libsoxr? ( >=media-libs/soxr-0.1.0[${MULTILIB_USEDEP}] )
|
||||
libv4l? ( >=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}] )
|
||||
lzma? ( >=app-arch/xz-utils-5.0.5-r1[${MULTILIB_USEDEP}] )
|
||||
mmal? ( media-libs/raspberrypi-userland )
|
||||
modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] )
|
||||
openal? ( >=media-libs/openal-1.15.1[${MULTILIB_USEDEP}] )
|
||||
opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
|
||||
openssl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
|
||||
opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] )
|
||||
pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
|
||||
librtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
|
||||
rubberband? ( >=media-libs/rubberband-1.8.1-r1[${MULTILIB_USEDEP}] )
|
||||
samba? ( >=net-fs/samba-3.6.23-r1[${MULTILIB_USEDEP}] )
|
||||
schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[${MULTILIB_USEDEP}] )
|
||||
sdl? ( >=media-libs/libsdl-1.2.15-r4[sound,video,${MULTILIB_USEDEP}] )
|
||||
speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
|
||||
ssh? ( >=net-libs/libssh-0.5.5[${MULTILIB_USEDEP}] )
|
||||
truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
|
||||
vaapi? ( >=x11-libs/libva-1.2.1-r1[${MULTILIB_USEDEP}] )
|
||||
vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] )
|
||||
vorbis? (
|
||||
>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
|
||||
>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
|
||||
)
|
||||
vpx? ( >=media-libs/libvpx-1.4.0:=[${MULTILIB_USEDEP}] )
|
||||
X? (
|
||||
>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
|
||||
>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
|
||||
!xcb? ( >=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}] )
|
||||
>=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}]
|
||||
)
|
||||
xcb? ( >=x11-libs/libxcb-1.4[${MULTILIB_USEDEP}] )
|
||||
zimg? ( media-libs/zimg[${MULTILIB_USEDEP}] )
|
||||
zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
|
||||
zvbi? ( >=media-libs/zvbi-0.2.35[${MULTILIB_USEDEP}] )
|
||||
!media-video/qt-faststart
|
||||
postproc? ( !media-libs/libpostproc )
|
||||
"
|
||||
|
||||
DEPEND="${RDEPEND}
|
||||
>=sys-devel/make-3.81
|
||||
doc? ( sys-apps/texinfo )
|
||||
>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
|
||||
ladspa? ( >=media-libs/ladspa-sdk-1.13-r2[${MULTILIB_USEDEP}] )
|
||||
cpu_flags_x86_mmx? ( >=dev-lang/yasm-1.2 )
|
||||
test? ( net-misc/wget sys-devel/bc )
|
||||
v4l? ( sys-kernel/linux-headers )
|
||||
"
|
||||
|
||||
RDEPEND="${RDEPEND}
|
||||
abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3
|
||||
!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
|
||||
|
||||
# Code requiring FFmpeg to be built under gpl license
|
||||
GPL_REQUIRED_USE="
|
||||
postproc? ( gpl )
|
||||
frei0r? ( gpl )
|
||||
cdio? ( gpl )
|
||||
samba? ( gpl )
|
||||
encode? (
|
||||
x264? ( gpl )
|
||||
x265? ( gpl )
|
||||
xvid? ( gpl )
|
||||
X? ( !xcb? ( gpl ) )
|
||||
)
|
||||
"
|
||||
REQUIRED_USE="
|
||||
libv4l? ( v4l )
|
||||
fftools_cws2fws? ( zlib )
|
||||
test? ( encode )
|
||||
${GPL_REQUIRED_USE}
|
||||
${CPU_REQUIRED_USE}"
|
||||
RESTRICT="
|
||||
encode? ( faac? ( bindist ) nvenc? ( bindist ) )
|
||||
gpl? ( openssl? ( bindist ) fdk? ( bindist ) )
|
||||
"
|
||||
|
||||
S=${WORKDIR}/${P/_/-}
|
||||
|
||||
MULTILIB_WRAPPED_HEADERS=(
|
||||
/usr/include/libavutil/avconfig.h
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
if [[ "${PV%_p*}" != "${PV}" ]] ; then # Snapshot
|
||||
export revision=git-N-${FFMPEG_REVISION}
|
||||
fi
|
||||
default
|
||||
}
|
||||
|
||||
multilib_src_configure() {
|
||||
local myconf=( ${EXTRA_FFMPEG_CONF} )
|
||||
|
||||
local ffuse=( "${FFMPEG_FLAG_MAP[@]}" )
|
||||
use openssl && use gpl && myconf+=( --enable-nonfree )
|
||||
use samba && myconf+=( --enable-version3 )
|
||||
|
||||
# Encoders
|
||||
if use encode ; then
|
||||
ffuse+=( "${FFMPEG_ENCODER_FLAG_MAP[@]}" )
|
||||
|
||||
# Licensing.
|
||||
if use amrenc ; then
|
||||
myconf+=( --enable-version3 )
|
||||
fi
|
||||
if use faac || use nvenc ; then
|
||||
myconf+=( --enable-nonfree )
|
||||
fi
|
||||
else
|
||||
myconf+=( --disable-encoders )
|
||||
fi
|
||||
|
||||
# Indevs
|
||||
use v4l || myconf+=( --disable-indev=v4l2 --disable-outdev=v4l2 )
|
||||
for i in alsa oss jack ; do
|
||||
use ${i} || myconf+=( --disable-indev=${i} )
|
||||
done
|
||||
use xcb || ffuse+=( X:x11grab )
|
||||
|
||||
# Outdevs
|
||||
for i in alsa oss sdl ; do
|
||||
use ${i} || myconf+=( --disable-outdev=${i} )
|
||||
done
|
||||
|
||||
# Decoders
|
||||
use amr && myconf+=( --enable-version3 )
|
||||
use gmp && myconf+=( --enable-version3 )
|
||||
use fdk && use gpl && myconf+=( --enable-nonfree )
|
||||
|
||||
for i in "${ffuse[@]#+}" ; do
|
||||
myconf+=( $(use_enable ${i%:*} ${i#*:}) )
|
||||
done
|
||||
|
||||
# (temporarily) disable non-multilib deps
|
||||
if ! multilib_is_native_abi; then
|
||||
for i in frei0r ; do
|
||||
myconf+=( --disable-${i} )
|
||||
done
|
||||
fi
|
||||
|
||||
# CPU features
|
||||
for i in ${CPU_FEATURES_MAP} ; do
|
||||
if [ "$(tc-arch)" = "${i%:*}" ] ; then
|
||||
local var="${i#*:}_CPU_FEATURES[@]"
|
||||
for j in ${!var} ; do
|
||||
use ${j%:*} || myconf+=( --disable-${j#*:} )
|
||||
done
|
||||
fi
|
||||
done
|
||||
|
||||
if use pic ; then
|
||||
myconf+=( --enable-pic )
|
||||
# disable asm code if PIC is required
|
||||
# as the provided asm decidedly is not PIC for x86.
|
||||
[[ ${ABI} == x86 ]] && myconf+=( --disable-asm )
|
||||
fi
|
||||
[[ ${ABI} == x32 ]] && myconf+=( --disable-asm ) #427004
|
||||
|
||||
# Try to get cpu type based on CFLAGS.
|
||||
# Bug #172723
|
||||
# We need to do this so that features of that CPU will be better used
|
||||
# If they contain an unknown CPU it will not hurt since ffmpeg's configure
|
||||
# will just ignore it.
|
||||
for i in $(get-flag mcpu) $(get-flag march) $(get-flag mtune) ; do
|
||||
[[ ${i} = native ]] && i="host" # bug #273421
|
||||
myconf+=( --cpu=${i} )
|
||||
break
|
||||
done
|
||||
|
||||
# LTO support, bug #566282
|
||||
is-flagq "-flto*" && myconf+=( "--enable-lto" )
|
||||
|
||||
# Mandatory configuration
|
||||
myconf=(
|
||||
--enable-avfilter
|
||||
--enable-avresample
|
||||
--disable-stripping
|
||||
"${myconf[@]}"
|
||||
)
|
||||
|
||||
# cross compile support
|
||||
if tc-is-cross-compiler ; then
|
||||
myconf+=( --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}- )
|
||||
case ${CHOST} in
|
||||
*freebsd*)
|
||||
myconf+=( --target-os=freebsd )
|
||||
;;
|
||||
mingw32*)
|
||||
myconf+=( --target-os=mingw32 )
|
||||
;;
|
||||
*linux*)
|
||||
myconf+=( --target-os=linux )
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
|
||||
# doc
|
||||
myconf+=(
|
||||
$(multilib_native_use_enable doc)
|
||||
$(multilib_native_use_enable doc htmlpages)
|
||||
$(multilib_native_enable manpages)
|
||||
)
|
||||
|
||||
set -- "${S}/configure" \
|
||||
--prefix="${EPREFIX}/usr" \
|
||||
--libdir="${EPREFIX}/usr/$(get_libdir)" \
|
||||
--shlibdir="${EPREFIX}/usr/$(get_libdir)" \
|
||||
--docdir="${EPREFIX}/usr/share/doc/${PF}/html" \
|
||||
--mandir="${EPREFIX}/usr/share/man" \
|
||||
--enable-shared \
|
||||
--cc="$(tc-getCC)" \
|
||||
--cxx="$(tc-getCXX)" \
|
||||
--ar="$(tc-getAR)" \
|
||||
--optflags="${CFLAGS}" \
|
||||
$(use_enable static-libs static) \
|
||||
"${myconf[@]}"
|
||||
echo "${@}"
|
||||
"${@}" || die
|
||||
}
|
||||
|
||||
multilib_src_compile() {
|
||||
emake V=1
|
||||
|
||||
if multilib_is_native_abi; then
|
||||
for i in "${FFTOOLS[@]}" ; do
|
||||
if use fftools_${i} ; then
|
||||
emake V=1 tools/${i}
|
||||
fi
|
||||
done
|
||||
fi
|
||||
}
|
||||
|
||||
multilib_src_install() {
|
||||
emake V=1 DESTDIR="${D}" install install-doc
|
||||
|
||||
if multilib_is_native_abi; then
|
||||
for i in "${FFTOOLS[@]}" ; do
|
||||
if use fftools_${i} ; then
|
||||
dobin tools/${i}
|
||||
fi
|
||||
done
|
||||
fi
|
||||
}
|
||||
|
||||
multilib_src_install_all() {
|
||||
dodoc Changelog README.md CREDITS doc/*.txt doc/APIchanges
|
||||
[ -f "RELEASE_NOTES" ] && dodoc "RELEASE_NOTES"
|
||||
}
|
||||
|
||||
multilib_src_test() {
|
||||
LD_LIBRARY_PATH="${BUILD_DIR}/libpostproc:${BUILD_DIR}/libswscale:${BUILD_DIR}/libswresample:${BUILD_DIR}/libavcodec:${BUILD_DIR}/libavdevice:${BUILD_DIR}/libavfilter:${BUILD_DIR}/libavformat:${BUILD_DIR}/libavutil:${BUILD_DIR}/libavresample" \
|
||||
emake V=1 fate
|
||||
}
|
@ -1,34 +0,0 @@
|
||||
<!ELEMENT herds ( (herd)* )>
|
||||
<!-- One tag for each herd -->
|
||||
<!ELEMENT herd (name, email? , description?, (maintainersof|maintainer*))>
|
||||
|
||||
<!-- One tag for each maintainer of a herd, multiple allowed-->
|
||||
<!ELEMENT maintainer ( email, (role| name)* )>
|
||||
|
||||
<!-- Get the maintainers of another herd and make them maintainers of this
|
||||
one-->
|
||||
<!ELEMENT maintainersof EMPTY>
|
||||
<!ATTLIST maintainersof herd CDATA #REQUIRED>
|
||||
|
||||
<!-- Common attributes -->
|
||||
|
||||
<!-- the lang attribute, specifies the language of this tag. This is
|
||||
only useful for descriptions of various kinds. If a tag with this
|
||||
attribute is included there must be a description in the default
|
||||
language "C" or "en", which is equivalent -->
|
||||
<!ATTLIST description lang CDATA "C" >
|
||||
|
||||
<!-- The restrict attribute, this attribute specifies restrictions on
|
||||
the applicability of tags on versions. The format of this attribute is
|
||||
equal to the format of DEPEND lines in ebuilds. There is one special
|
||||
value though: restrict="*". A tag that specifies this only applies if
|
||||
there are no other tags that apply.
|
||||
|
||||
For required tags, there must be either an unrestricted version, or a
|
||||
version that is default restricted. -->
|
||||
|
||||
<!-- standard parts -->
|
||||
<!ELEMENT email (#PCDATA) ><!-- an email address -->
|
||||
<!ELEMENT name (#PCDATA) ><!-- the name of a herd or maintainer-->
|
||||
<!ELEMENT description (#PCDATA) ><!-- A description of the herd-->
|
||||
<!ELEMENT role (#PCDATA) ><!-- The role this maintainer plays within the herd-->
|
@ -1 +1 @@
|
||||
Mon, 15 Feb 2016 10:38:18 +0000
|
||||
Mon, 15 Feb 2016 19:08:27 +0000
|
||||
|
@ -1 +1 @@
|
||||
Mon, 15 Feb 2016 10:38:18 +0000
|
||||
Mon, 15 Feb 2016 19:08:27 +0000
|
||||
|
@ -0,0 +1,9 @@
|
||||
DEFINED_PHASES=install postinst unpack
|
||||
DESCRIPTION=Lightweight log shipper for Logstash and Elasticsearch
|
||||
EAPI=5
|
||||
HOMEPAGE=https://www.elastic.co/products/beats
|
||||
KEYWORDS=~amd64 ~x86
|
||||
LICENSE=Apache-2.0
|
||||
SLOT=0
|
||||
SRC_URI=amd64? ( https://download.elastic.co/beats/filebeat/filebeat-1.1.1-x86_64.tar.gz ) x86? ( https://download.elastic.co/beats/filebeat/filebeat-1.1.1-i686.tar.gz )
|
||||
_md5_=fe68b98646e4a59e0d80326354d83f52
|
@ -0,0 +1,11 @@
|
||||
DEFINED_PHASES=install postinst
|
||||
DESCRIPTION=Tool for managing events and logs
|
||||
EAPI=5
|
||||
HOMEPAGE=https://www.elastic.co/products/logstash
|
||||
KEYWORDS=~amd64
|
||||
LICENSE=Apache-2.0
|
||||
RDEPEND=|| ( virtual/jre:1.8 virtual/jre:1.7 )
|
||||
RESTRICT=strip
|
||||
SLOT=0
|
||||
SRC_URI=https://download.elastic.co/logstash/logstash/logstash-2.2.1.tar.gz
|
||||
_md5_=3509f9473fc8f8c3b1d313fb2b06f397
|
@ -1,14 +1,14 @@
|
||||
DEFINED_PHASES=compile configure install prepare test
|
||||
DEPEND=~net-libs/librsync-0.9.7 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
|
||||
DEPEND=net-libs/librsync:0/1 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
|
||||
DESCRIPTION=Local/remote mirroring+incremental backup
|
||||
EAPI=5
|
||||
HOMEPAGE=http://rdiff-backup.nongnu.org/
|
||||
HOMEPAGE=https://github.com/sol1/rdiff-backup
|
||||
IUSE=examples python_targets_python2_7
|
||||
KEYWORDS=alpha amd64 arm ~mips ppc ppc64 ~sh sparc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
|
||||
LICENSE=GPL-2
|
||||
RDEPEND=dev-python/pyxattr[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pylibacl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
|
||||
REQUIRED_USE=|| ( python_targets_python2_7 )
|
||||
SLOT=0
|
||||
SRC_URI=http://savannah.nongnu.org/download/rdiff-backup/rdiff-backup-1.3.3.tar.gz
|
||||
_eclasses_=distutils-r1 4e8ac1ba76ddacd8f7c0289aa586a34c eutils 28fb3e5852485af1c348d446b0b98389 multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 3972ca401cf7dbb430df9995f5d8d580 multiprocessing e32940a7b2a9992ad217eccddb84d548 python-r1 0f6937650a475d673baa5d0c8c0b37b3 python-utils-r1 2e6826f6a93ad2acf904eecf5b5fb6d2 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85
|
||||
_md5_=97160b6b9f4daef3ff0737ed90f846e1
|
||||
SRC_URI=https://github.com/sol1/rdiff-backup/archive/r1-3-3.tar.gz -> rdiff-backup-1.3.3.tar.gz
|
||||
_eclasses_=distutils-r1 4e8ac1ba76ddacd8f7c0289aa586a34c eutils 28fb3e5852485af1c348d446b0b98389 multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 3972ca401cf7dbb430df9995f5d8d580 multiprocessing e32940a7b2a9992ad217eccddb84d548 python-r1 0f6937650a475d673baa5d0c8c0b37b3 python-utils-r1 2e6826f6a93ad2acf904eecf5b5fb6d2 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
|
||||
_md5_=32f321ee2e3b2b84cefdbf9ca4d9477e
|
||||
|
@ -0,0 +1,14 @@
|
||||
DEFINED_PHASES=compile configure install prepare test
|
||||
DEPEND=net-libs/librsync:0/2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
|
||||
DESCRIPTION=Local/remote mirroring+incremental backup
|
||||
EAPI=5
|
||||
HOMEPAGE=https://github.com/sol1/rdiff-backup
|
||||
IUSE=examples python_targets_python2_7
|
||||
KEYWORDS=~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
|
||||
LICENSE=GPL-2
|
||||
RDEPEND=dev-python/pyxattr[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pylibacl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
|
||||
REQUIRED_USE=|| ( python_targets_python2_7 )
|
||||
SLOT=0
|
||||
SRC_URI=https://github.com/sol1/rdiff-backup/archive/r1-3-3.tar.gz -> rdiff-backup-1.3.3.tar.gz
|
||||
_eclasses_=distutils-r1 4e8ac1ba76ddacd8f7c0289aa586a34c eutils 28fb3e5852485af1c348d446b0b98389 multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 3972ca401cf7dbb430df9995f5d8d580 multiprocessing e32940a7b2a9992ad217eccddb84d548 python-r1 0f6937650a475d673baa5d0c8c0b37b3 python-utils-r1 2e6826f6a93ad2acf904eecf5b5fb6d2 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
|
||||
_md5_=8f615700f73cb74744bccc1aaa25312a
|
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@ -0,0 +1,15 @@
|
||||
DEFINED_PHASES=compile configure install postinst prepare setup
|
||||
DEPEND=dev-libs/lzo:2 dev-libs/glib:2 dev-libs/yajl dev-libs/libaio dev-libs/libgcrypt:0 sys-libs/zlib dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] x86? ( sys-devel/dev86 sys-power/iasl ) pam? ( dev-python/pypam[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) >=dev-lang/python-2.7.5-r2:2.7[ncurses,xml,threads] >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] api? ( dev-libs/libxml2 net-misc/curl ) ovmf? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) ) !amd64? ( >=sys-apps/dtc-1.4.0 ) amd64? ( sys-devel/bin86 system-seabios? ( sys-firmware/seabios ) sys-firmware/ipxe sys-devel/dev86 sys-power/iasl ) dev-lang/perl app-misc/pax-utils doc? ( app-doc/doxygen dev-python/markdown[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-tex/latex2html[png,gif] media-gfx/graphviz dev-tex/xcolor media-gfx/transfig dev-texlive/texlive-latexextra virtual/latex-base dev-tex/latexmk dev-texlive/texlive-latex dev-texlive/texlive-pictures dev-texlive/texlive-latexrecommended ) hvm? ( x11-proto/xproto !net-libs/libiscsi ) qemu? ( x11-libs/pixman sdl? ( media-libs/libsdl[X] ) ) system-qemu? ( app-emulation/qemu[xen] ) ocaml? ( dev-ml/findlib >=dev-lang/ocaml-4 )
|
||||
DESCRIPTION=Xen tools including QEMU and xl
|
||||
EAPI=5
|
||||
HOMEPAGE=http://xen.org/
|
||||
IUSE=api custom-cflags debug doc flask hvm qemu ocaml ovmf qemu-traditional +pam python pygrub screen sdl static-libs system-qemu system-seabios python_targets_python2_7
|
||||
KEYWORDS=~amd64 ~arm ~arm64 ~x86
|
||||
LICENSE=GPL-2
|
||||
RDEPEND=dev-libs/lzo:2 dev-libs/glib:2 dev-libs/yajl dev-libs/libaio dev-libs/libgcrypt:0 sys-libs/zlib sys-apps/iproute2[-minimal] net-misc/bridge-utils screen? ( app-misc/screen app-admin/logrotate )
|
||||
REQUIRED_USE=hvm? ( || ( qemu system-qemu ) ) python_targets_python2_7 pygrub? ( python ) ovmf? ( hvm ) qemu? ( !system-qemu )
|
||||
RESTRICT=test
|
||||
SLOT=0/4.6
|
||||
SRC_URI=http://bits.xensource.com/oss-xen/release/4.6.0/xen-4.6.0.tar.gz http://code.coreboot.org/p/seabios/downloads/get/seabios-1.8.2.tar.gz https://dev.gentoo.org/~dlan/distfiles/seabios-1.8.2.tar.gz ovmf? ( https://dev.gentoo.org/~dlan/distfiles/ovmf-20150629.tar.bz2 https://dev.gentoo.org/~dlan/distfiles/xen-ovmf-patches-1.tar.xz ) https://dev.gentoo.org/~dlan/distfiles/xen-4.6.0-upstream-patches-0.tar.xz https://dev.gentoo.org/~idella4/distfiles/xen-upstream-patches-0.tar.gz https://dev.gentoo.org/~idella4/distfiles/xen-security-patches-7.tar.xz https://dev.gentoo.org/~idella4/distfiles/xen-security-patches-5.tar.gz https://dev.gentoo.org/~idella4/distfiles/xen-qemu-patches-0.tar.gz https://dev.gentoo.org/~dlan/distfiles/xen-gentoo-patches-4.tar.xz
|
||||
_eclasses_=bash-completion-r1 acf715fa09463f043fbfdc1640f3fb85 eutils 28fb3e5852485af1c348d446b0b98389 flag-o-matic d270fa247153df66074f795fa42dba3e multilib 3972ca401cf7dbb430df9995f5d8d580 python-single-r1 2ebea8fbab356d63110245129a67a6dd python-utils-r1 2e6826f6a93ad2acf904eecf5b5fb6d2 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
|
||||
_md5_=357aeb3c3cc0b0246e99e42cc6766d02
|
@ -0,0 +1,13 @@
|
||||
DEFINED_PHASES=compile configure install
|
||||
DEPEND=!dev-util/mpatch !dev-util/rej qt4? ( dev-qt/qtgui:4 ) pedro? ( net-misc/pedro ) readline? ( app-misc/rlwrap ) dev-lang/perl
|
||||
DESCRIPTION=Extended Prolog supporting quantifiers, object-variables and substitutions
|
||||
EAPI=5
|
||||
HOMEPAGE=http://www.itee.uq.edu.au/~pjr/HomePages/QuPrologHome.html
|
||||
IUSE=debug doc examples pedro qt4 readline threads
|
||||
KEYWORDS=~amd64 ~ppc ~x86
|
||||
LICENSE=Qu-Prolog GPL-2+
|
||||
RDEPEND=!dev-util/mpatch !dev-util/rej qt4? ( dev-qt/qtgui:4 ) pedro? ( net-misc/pedro ) readline? ( app-misc/rlwrap )
|
||||
SLOT=0
|
||||
SRC_URI=http://www.itee.uq.edu.au/~pjr/HomePages/QPFiles/qp9.7.tar.gz
|
||||
_eclasses_=eutils 28fb3e5852485af1c348d446b0b98389 multilib 3972ca401cf7dbb430df9995f5d8d580 qmake-utils 0a242e7177789b0028b4045f336dd4db toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85
|
||||
_md5_=f290418ac2bf165ab3199d18e988cecf
|
@ -1,13 +0,0 @@
|
||||
DEFINED_PHASES=compile configure install preinst prepare setup test
|
||||
DEPEND=>=virtual/jdk-1.5 >=dev-java/javassist-3 app-arch/unzip dev-java/ant-core test? ( dev-java/ant-junit ) >=dev-java/java-config-2.2.0 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
|
||||
DESCRIPTION=tuProlog is a light-weight Prolog for Internet applications and infrastructures
|
||||
EAPI=2
|
||||
HOMEPAGE=http://www.alice.unibo.it/tuProlog/
|
||||
IUSE=doc test elibc_FreeBSD elibc_FreeBSD
|
||||
KEYWORDS=~amd64 ~x86
|
||||
LICENSE=LGPL-3
|
||||
RDEPEND=>=virtual/jdk-1.5 >=dev-java/javassist-3 >=dev-java/java-config-2.2.0
|
||||
SLOT=0
|
||||
SRC_URI=mirror://gentoo/tuprolog-2.5.0.zip
|
||||
_eclasses_=eutils 28fb3e5852485af1c348d446b0b98389 java-ant-2 7c5d0c274d390745f5033754a319f515 java-pkg-2 b02dc1e46b3648e467b5fbdf7857cf28 java-utils-2 51a42ff2f35cd75af735cd1626829b06 multilib 3972ca401cf7dbb430df9995f5d8d580 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
|
||||
_md5_=2b64132777e75d778ccf48f7cea12200
|
@ -1,13 +0,0 @@
|
||||
DEFINED_PHASES=compile configure install preinst prepare setup test
|
||||
DEPEND=>=virtual/jdk-1.7 >=dev-java/javassist-3 dev-java/ant-core test? ( dev-java/ant-junit4 dev-java/hamcrest-core ) >=dev-java/java-config-2.2.0 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
|
||||
DESCRIPTION=tuProlog is a light-weight Prolog for Internet applications and infrastructures
|
||||
EAPI=3
|
||||
HOMEPAGE=http://www.alice.unibo.it/tuProlog/
|
||||
IUSE=doc test elibc_FreeBSD elibc_FreeBSD
|
||||
KEYWORDS=~amd64 ~x86
|
||||
LICENSE=LGPL-3
|
||||
RDEPEND=>=virtual/jdk-1.7 >=dev-java/javassist-3 >=dev-java/java-config-2.2.0
|
||||
SLOT=0
|
||||
SRC_URI=mirror://gentoo/tuprolog-2.6.0.tar.gz
|
||||
_eclasses_=eutils 28fb3e5852485af1c348d446b0b98389 java-ant-2 7c5d0c274d390745f5033754a319f515 java-pkg-2 b02dc1e46b3648e467b5fbdf7857cf28 java-utils-2 51a42ff2f35cd75af735cd1626829b06 multilib 3972ca401cf7dbb430df9995f5d8d580 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
|
||||
_md5_=937e01ea646fe69d7636f307bd0cee96
|
@ -1,13 +0,0 @@
|
||||
DEFINED_PHASES=compile configure install preinst prepare setup test
|
||||
DEPEND=>=virtual/jdk-1.7 >=dev-java/javassist-3 dev-java/ant-core test? ( dev-java/ant-junit4 dev-java/hamcrest-core ) >=dev-java/java-config-2.2.0 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
|
||||
DESCRIPTION=tuProlog is a light-weight Prolog for Internet applications and infrastructures
|
||||
EAPI=3
|
||||
HOMEPAGE=http://tuprolog.unibo.it/
|
||||
IUSE=doc test elibc_FreeBSD elibc_FreeBSD
|
||||
KEYWORDS=~amd64 ~x86
|
||||
LICENSE=LGPL-3
|
||||
RDEPEND=>=virtual/jdk-1.7 >=dev-java/javassist-3 >=dev-java/java-config-2.2.0
|
||||
SLOT=0
|
||||
SRC_URI=mirror://gentoo/tuprolog-2.7.0.tar.gz
|
||||
_eclasses_=eutils 28fb3e5852485af1c348d446b0b98389 java-ant-2 7c5d0c274d390745f5033754a319f515 java-pkg-2 b02dc1e46b3648e467b5fbdf7857cf28 java-utils-2 51a42ff2f35cd75af735cd1626829b06 multilib 3972ca401cf7dbb430df9995f5d8d580 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
|
||||
_md5_=0426564a8997e76a3fdbbbfdc56227d8
|
@ -0,0 +1,13 @@
|
||||
DEFINED_PHASES=compile configure install prepare test unpack
|
||||
DEPEND=dev-ml/sexplib:= dev-ml/ppx_sexp_conv:= >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?]
|
||||
DESCRIPTION=OCaml library for manipulation of IP (and MAC) address representations
|
||||
EAPI=5
|
||||
HOMEPAGE=https://github.com/mirage/ocaml-ipaddr
|
||||
IUSE=+ocamlopt debug test
|
||||
KEYWORDS=~amd64
|
||||
LICENSE=ISC
|
||||
RDEPEND=dev-ml/sexplib:= dev-ml/ppx_sexp_conv:= >=dev-lang/ocaml-3.12:=[ocamlopt?]
|
||||
SLOT=0/2.7.0
|
||||
SRC_URI=https://github.com/mirage/ocaml-ipaddr/archive/2.7.0.tar.gz -> ocaml-ipaddr-2.7.0.tar.gz
|
||||
_eclasses_=base 3fe4f8980633fd7bc69e9887209ba2fe eutils 28fb3e5852485af1c348d446b0b98389 findlib 9909e5ca0f77ff5b693885a3d7aeadb7 multilib 3972ca401cf7dbb430df9995f5d8d580 oasis dab31007fb098ff15db810bfe5001e64 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85
|
||||
_md5_=c589d5f918bbfcc41f905f26877e9c84
|
@ -0,0 +1,13 @@
|
||||
DEFINED_PHASES=compile configure install prepare test unpack
|
||||
DEPEND=dev-db/postgresql:=[server] >=dev-ml/findlib-1.5 >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?]
|
||||
DESCRIPTION=A package for ocaml that provides access to PostgreSQL databases
|
||||
EAPI=5
|
||||
HOMEPAGE=http://mmottl.github.io/postgresql-ocaml/
|
||||
IUSE=examples +ocamlopt debug doc
|
||||
KEYWORDS=~amd64 ~ppc ~x86
|
||||
LICENSE=LGPL-2
|
||||
RDEPEND=dev-db/postgresql:=[server] >=dev-lang/ocaml-3.12:=[ocamlopt?]
|
||||
SLOT=0/4.0.1
|
||||
SRC_URI=https://github.com/mmottl/postgresql-ocaml/releases/download/v4.0.1/postgresql-ocaml-4.0.1.tar.gz
|
||||
_eclasses_=base 3fe4f8980633fd7bc69e9887209ba2fe eutils 28fb3e5852485af1c348d446b0b98389 findlib 9909e5ca0f77ff5b693885a3d7aeadb7 multilib 3972ca401cf7dbb430df9995f5d8d580 oasis dab31007fb098ff15db810bfe5001e64 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85
|
||||
_md5_=46e4d27bbc11439b6e4f47a9dcbe78fa
|
@ -1,12 +0,0 @@
|
||||
DEFINED_PHASES=compile configure install prepare test unpack
|
||||
DEPEND=dev-perl/HTML-Parser dev-lang/perl:=[-build(-)]
|
||||
DESCRIPTION=Populates HTML Forms with data
|
||||
EAPI=5
|
||||
HOMEPAGE=http://search.cpan.org/dist/HTML-FillInForm/
|
||||
KEYWORDS=amd64 ~arm ~ppc x86 ~x86-fbsd
|
||||
LICENSE=|| ( Artistic GPL-1+ )
|
||||
RDEPEND=dev-perl/HTML-Parser dev-lang/perl:=[-build(-)]
|
||||
SLOT=0
|
||||
SRC_URI=mirror://cpan/authors/id/M/MA/MARKSTOS/HTML-FillInForm-2.20.tar.gz
|
||||
_eclasses_=eutils 28fb3e5852485af1c348d446b0b98389 multilib 3972ca401cf7dbb430df9995f5d8d580 multiprocessing e32940a7b2a9992ad217eccddb84d548 perl-functions 15aff0b9cba2282790142295ceb6be0c perl-module b2108b3c85ac7a6a6a9b035b54f6813c toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 unpacker 1d149d9bda7723e740cfd28118f27813
|
||||
_md5_=9d16713593a4da6cdb3275583a5267cc
|
@ -1,14 +0,0 @@
|
||||
DEFINED_PHASES=compile configure install postinst prepare test
|
||||
DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] test? ( >=dev-python/elasticsearch-py-1.6.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/elasticsearch-py-2.0.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/click-3.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/certifi[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/urllib3-1.8.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] || ( virtual/jre:1.8 virtual/jre:1.7 ) ~dev-python/mock-1.0.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/coverage[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/nosexcover[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
|
||||
DESCRIPTION=Tending time-series indices in Elasticsearch
|
||||
EAPI=5
|
||||
HOMEPAGE=https://github.com/elasticsearch/curator
|
||||
IUSE=doc test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
|
||||
KEYWORDS=~amd64 ~x86
|
||||
LICENSE=Apache-2.0
|
||||
RDEPEND=>=dev-python/elasticsearch-py-1.6.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/elasticsearch-py-2.0.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/click-3.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/certifi[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/urllib3-1.8.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
|
||||
REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
|
||||
SLOT=0
|
||||
SRC_URI=https://github.com/elasticsearch/curator/archive/v3.3.0.tar.gz -> elasticsearch-curator-3.3.0.tar.gz test? ( https://download.elasticsearch.org/elasticsearch/elasticsearch/elasticsearch-1.7.1.tar.gz )
|
||||
_eclasses_=distutils-r1 4e8ac1ba76ddacd8f7c0289aa586a34c eutils 28fb3e5852485af1c348d446b0b98389 multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 3972ca401cf7dbb430df9995f5d8d580 multiprocessing e32940a7b2a9992ad217eccddb84d548 python-r1 0f6937650a475d673baa5d0c8c0b37b3 python-utils-r1 2e6826f6a93ad2acf904eecf5b5fb6d2 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85
|
||||
_md5_=7b113a3639d643347898b2c6d106b028
|
@ -0,0 +1,14 @@
|
||||
DEFINED_PHASES=compile configure install postinst prepare test
|
||||
DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] test? ( >=dev-python/elasticsearch-py-1.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/elasticsearch-py-2.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/click-3.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/certifi[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/urllib3-1.8.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] || ( virtual/jre:1.8 virtual/jre:1.7 ) ~dev-python/mock-1.0.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/coverage[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/nosexcover[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
|
||||
DESCRIPTION=Tending time-series indices in Elasticsearch
|
||||
EAPI=5
|
||||
HOMEPAGE=https://github.com/elasticsearch/curator
|
||||
IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
|
||||
KEYWORDS=~amd64 ~x86
|
||||
LICENSE=Apache-2.0
|
||||
RDEPEND=>=dev-python/elasticsearch-py-1.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/elasticsearch-py-2.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/click-3.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/certifi[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/urllib3-1.8.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
|
||||
REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
|
||||
SLOT=0
|
||||
SRC_URI=https://github.com/elasticsearch/curator/archive/v3.4.1.tar.gz -> elasticsearch-curator-3.4.1.tar.gz test? ( https://download.elasticsearch.org/elasticsearch/elasticsearch/elasticsearch-2.2.0.tar.gz )
|
||||
_eclasses_=distutils-r1 4e8ac1ba76ddacd8f7c0289aa586a34c eutils 28fb3e5852485af1c348d446b0b98389 multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 3972ca401cf7dbb430df9995f5d8d580 multiprocessing e32940a7b2a9992ad217eccddb84d548 python-r1 0f6937650a475d673baa5d0c8c0b37b3 python-utils-r1 2e6826f6a93ad2acf904eecf5b5fb6d2 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85
|
||||
_md5_=a02d51d7f079af9b26dd428b367ee4fe
|
@ -0,0 +1,13 @@
|
||||
DEFINED_PHASES=compile configure install prepare test
|
||||
DEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosnode[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosbridge_library[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-2.8.12 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
|
||||
DESCRIPTION=Provides service calls for getting ros meta-information, like list of topics, services, params, etc.
|
||||
EAPI=5
|
||||
HOMEPAGE=http://wiki.ros.org/rosapi
|
||||
IUSE=python_targets_python2_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp
|
||||
KEYWORDS=~amd64
|
||||
LICENSE=BSD
|
||||
RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosnode[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosbridge_library[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
|
||||
SLOT=0
|
||||
SRC_URI=https://github.com/RobotWebTools/rosbridge_suite/archive/0.7.14.tar.gz -> rosbridge_suite-0.7.14.tar.gz
|
||||
_eclasses_=cmake-utils c67ce9708a9c02be2d296cf547740e9c eutils 28fb3e5852485af1c348d446b0b98389 flag-o-matic d270fa247153df66074f795fa42dba3e multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 3972ca401cf7dbb430df9995f5d8d580 python-r1 0f6937650a475d673baa5d0c8c0b37b3 python-utils-r1 2e6826f6a93ad2acf904eecf5b5fb6d2 ros-catkin 5bd0782bea06cf2dd93b07f40e0a5e09 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
|
||||
_md5_=bba7f8200ec01fe53d178807f72b1573
|
@ -0,0 +1,13 @@
|
||||
DEFINED_PHASES=compile configure install prepare test
|
||||
DEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosservice[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostopic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pymongo[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/actionlib_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/nav_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy_tutorials[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_srvs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/stereo_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/trajectory_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/visualization_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-2.8.12 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
|
||||
DESCRIPTION=Core rosbridge package repsonsible for interpreting JSON and performing the appropriate ROS action
|
||||
EAPI=5
|
||||
HOMEPAGE=http://wiki.ros.org/rosbridge_library
|
||||
IUSE=python_targets_python2_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp
|
||||
KEYWORDS=~amd64
|
||||
LICENSE=BSD
|
||||
RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosservice[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostopic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pymongo[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
|
||||
SLOT=0
|
||||
SRC_URI=https://github.com/RobotWebTools/rosbridge_suite/archive/0.7.14.tar.gz -> rosbridge_suite-0.7.14.tar.gz
|
||||
_eclasses_=cmake-utils c67ce9708a9c02be2d296cf547740e9c eutils 28fb3e5852485af1c348d446b0b98389 flag-o-matic d270fa247153df66074f795fa42dba3e multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 3972ca401cf7dbb430df9995f5d8d580 python-r1 0f6937650a475d673baa5d0c8c0b37b3 python-utils-r1 2e6826f6a93ad2acf904eecf5b5fb6d2 ros-catkin 5bd0782bea06cf2dd93b07f40e0a5e09 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
|
||||
_md5_=45c7521307af285429000918972e601c
|
@ -0,0 +1,13 @@
|
||||
DEFINED_PHASES=compile configure install prepare test
|
||||
DEPEND=dev-ros/rosapi[python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosbridge_library[python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosauth[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/backports-ssl-match-hostname[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] www-servers/tornado[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-2.8.12 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
|
||||
DESCRIPTION=A WebSocket interface to rosbridge
|
||||
EAPI=5
|
||||
HOMEPAGE=http://wiki.ros.org/rosbridge_server
|
||||
IUSE=python_targets_python2_7 test
|
||||
KEYWORDS=~amd64
|
||||
LICENSE=BSD
|
||||
RDEPEND=dev-ros/rosapi[python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosbridge_library[python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosauth[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/backports-ssl-match-hostname[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] www-servers/tornado[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
|
||||
SLOT=0
|
||||
SRC_URI=https://github.com/RobotWebTools/rosbridge_suite/archive/0.7.14.tar.gz -> rosbridge_suite-0.7.14.tar.gz
|
||||
_eclasses_=cmake-utils c67ce9708a9c02be2d296cf547740e9c eutils 28fb3e5852485af1c348d446b0b98389 flag-o-matic d270fa247153df66074f795fa42dba3e multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 3972ca401cf7dbb430df9995f5d8d580 python-r1 0f6937650a475d673baa5d0c8c0b37b3 python-utils-r1 2e6826f6a93ad2acf904eecf5b5fb6d2 ros-catkin 5bd0782bea06cf2dd93b07f40e0a5e09 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
|
||||
_md5_=55a7e9d93cee659bf9c42b11066be733
|
@ -1,13 +0,0 @@
|
||||
DEFINED_PHASES=compile configure install prepare test
|
||||
DEPEND=sys-libs/zlib libav? ( >=media-video/libav-9.17:0= ) !libav? ( >=media-video/ffmpeg-1.2.6-r1:0= ) virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
|
||||
DESCRIPTION=A libav/ffmpeg based source library for easy frame accurate access
|
||||
EAPI=5
|
||||
HOMEPAGE=https://github.com/FFMS/ffms2
|
||||
IUSE=libav static-libs
|
||||
KEYWORDS=amd64 x86
|
||||
LICENSE=MIT
|
||||
RDEPEND=sys-libs/zlib libav? ( >=media-video/libav-9.17:0= ) !libav? ( >=media-video/ffmpeg-1.2.6-r1:0= )
|
||||
SLOT=0/3
|
||||
SRC_URI=https://github.com/FFMS/ffms2/archive/2.20.tar.gz -> ffmpegsource-2.20.tar.gz
|
||||
_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c autotools-utils 419811142edf3516b0d0cf1a254d93cb eutils 28fb3e5852485af1c348d446b0b98389 libtool b75230758539a7da029e24afdb693960 multilib 3972ca401cf7dbb430df9995f5d8d580 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85
|
||||
_md5_=54b6f2a332bf23b80298ac7fcac2505d
|
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@ -0,0 +1,13 @@
|
||||
DEFINED_PHASES=compile configure install prepare test
|
||||
DEPEND=sys-devel/make >=dev-util/cmake-2.8.12 dev-util/catkin dev-python/empy
|
||||
DESCRIPTION=JSON API to ROS functionality for non-ROS programs
|
||||
EAPI=5
|
||||
HOMEPAGE=http://wiki.ros.org/rosbridge_suite
|
||||
IUSE=test
|
||||
KEYWORDS=~amd64
|
||||
LICENSE=BSD
|
||||
RDEPEND=dev-ros/rosapi dev-ros/rosbridge_library dev-ros/rosbridge_server dev-util/catkin dev-python/empy
|
||||
SLOT=0
|
||||
SRC_URI=https://github.com/RobotWebTools/rosbridge_suite/archive/0.7.14.tar.gz -> rosbridge_suite-0.7.14.tar.gz
|
||||
_eclasses_=cmake-utils c67ce9708a9c02be2d296cf547740e9c eutils 28fb3e5852485af1c348d446b0b98389 flag-o-matic d270fa247153df66074f795fa42dba3e multilib 3972ca401cf7dbb430df9995f5d8d580 ros-catkin 5bd0782bea06cf2dd93b07f40e0a5e09 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
|
||||
_md5_=2a0e2066087215064a0fa56a8a0e2007
|
@ -1,14 +0,0 @@
|
||||
DEFINED_PHASES=compile configure install prepare test
|
||||
DEPEND=coin? ( media-libs/coin virtual/opengl ) dmtx? ( media-libs/libdmtx ) ffmpeg? ( virtual/ffmpeg ) gsl? ( sci-libs/gsl ) ieee1394? ( media-libs/libdc1394 ) jpeg? ( virtual/jpeg:0 ) lapack? ( virtual/lapack ) !qt4? ( motif? ( media-libs/SoXt ) ) ogre? ( dev-games/ogre[ois?] dev-libs/boost:=[threads] ) opencv? ( media-libs/opencv qt4? ( media-libs/opencv[-qt5(-)] ) ) png? ( media-libs/libpng:0= ) qt4? ( media-libs/SoQt dev-qt/qtgui:4 ) usb? ( virtual/libusb:1 ) v4l? ( media-libs/libv4l ) X? ( x11-libs/libX11 ) xml? ( dev-libs/libxml2 ) zbar? ( media-gfx/zbar ) zlib? ( sys-libs/zlib ) doc? ( app-doc/doxygen virtual/latex-base media-gfx/graphviz ) virtual/pkgconfig test? ( sci-misc/ViSP-images ) v4l? ( virtual/os-headers ) sys-devel/make >=dev-util/cmake-2.8.12
|
||||
DESCRIPTION=Visual Servoing Platform: visual tracking and visual servoing library
|
||||
EAPI=5
|
||||
HOMEPAGE=http://www.irisa.fr/lagadic/visp/visp.html
|
||||
IUSE=+coin demos +dmtx doc examples ffmpeg gsl ieee1394 jpeg lapack motif ogre ois opencv png qt4 test tutorials usb v4l X xml +zbar zlib
|
||||
KEYWORDS=~amd64 ~arm
|
||||
LICENSE=GPL-2
|
||||
RDEPEND=coin? ( media-libs/coin virtual/opengl ) dmtx? ( media-libs/libdmtx ) ffmpeg? ( virtual/ffmpeg ) gsl? ( sci-libs/gsl ) ieee1394? ( media-libs/libdc1394 ) jpeg? ( virtual/jpeg:0 ) lapack? ( virtual/lapack ) !qt4? ( motif? ( media-libs/SoXt ) ) ogre? ( dev-games/ogre[ois?] dev-libs/boost:=[threads] ) opencv? ( media-libs/opencv qt4? ( media-libs/opencv[-qt5(-)] ) ) png? ( media-libs/libpng:0= ) qt4? ( media-libs/SoQt dev-qt/qtgui:4 ) usb? ( virtual/libusb:1 ) v4l? ( media-libs/libv4l ) X? ( x11-libs/libX11 ) xml? ( dev-libs/libxml2 ) zbar? ( media-gfx/zbar ) zlib? ( sys-libs/zlib ) demos? ( sci-misc/ViSP-images )
|
||||
REQUIRED_USE=ffmpeg? ( opencv ) ois? ( ogre ) qt4? ( coin ) motif? ( coin )
|
||||
SLOT=0
|
||||
SRC_URI=http://gforge.inria.fr/frs/download.php/latestfile/475/ViSP-2.10.0.tar.gz
|
||||
_eclasses_=cmake-utils c67ce9708a9c02be2d296cf547740e9c eutils 28fb3e5852485af1c348d446b0b98389 flag-o-matic d270fa247153df66074f795fa42dba3e multilib 3972ca401cf7dbb430df9995f5d8d580 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
|
||||
_md5_=f28e5cef23aba612b6fe35f3b76106db
|
@ -1,13 +0,0 @@
|
||||
DEFINED_PHASES=configure install postinst prepare setup
|
||||
DEPEND=!<sys-apps/openrc-0.9.9.3 selinux? ( sys-libs/libselinux ) selinux? ( virtual/pkgconfig ) app-arch/xz-utils
|
||||
DESCRIPTION=Standard Linux networking tools
|
||||
EAPI=3
|
||||
HOMEPAGE=http://net-tools.sourceforge.net/
|
||||
IUSE=nls old-output selinux static
|
||||
KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux
|
||||
LICENSE=GPL-2
|
||||
RDEPEND=!<sys-apps/openrc-0.9.9.3 selinux? ( sys-libs/libselinux )
|
||||
SLOT=0
|
||||
SRC_URI=mirror://gentoo/net-tools-1.60_p20130513023548.tar.xz mirror://gentoo/net-tools-1.60_p20130513023548-patches-1.tar.xz
|
||||
_eclasses_=eutils 28fb3e5852485af1c348d446b0b98389 flag-o-matic d270fa247153df66074f795fa42dba3e multilib 3972ca401cf7dbb430df9995f5d8d580 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85
|
||||
_md5_=ef8dead72a89479a38e4e0a9cd0eab35
|
@ -1,13 +0,0 @@
|
||||
DEFINED_PHASES=configure install postinst prepare setup
|
||||
DEPEND=!<sys-apps/openrc-0.9.9.3 selinux? ( sys-libs/libselinux ) selinux? ( virtual/pkgconfig ) app-arch/xz-utils
|
||||
DESCRIPTION=Standard Linux networking tools
|
||||
EAPI=5
|
||||
HOMEPAGE=http://net-tools.sourceforge.net/
|
||||
IUSE=nls old-output selinux static
|
||||
KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
|
||||
LICENSE=GPL-2
|
||||
RDEPEND=!<sys-apps/openrc-0.9.9.3 selinux? ( sys-libs/libselinux )
|
||||
SLOT=0
|
||||
SRC_URI=mirror://gentoo/net-tools-1.60_p20130513023548.tar.xz mirror://gentoo/net-tools-1.60_p20130513023548-patches-2.tar.xz
|
||||
_eclasses_=eutils 28fb3e5852485af1c348d446b0b98389 flag-o-matic d270fa247153df66074f795fa42dba3e multilib 3972ca401cf7dbb430df9995f5d8d580 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85
|
||||
_md5_=b3c33e75843802e9acafa9dadb9a44b5
|
@ -1,13 +0,0 @@
|
||||
DEFINED_PHASES=configure install postinst prepare setup
|
||||
DEPEND=!<sys-apps/openrc-0.9.9.3 selinux? ( sys-libs/libselinux ) selinux? ( virtual/pkgconfig ) app-arch/xz-utils
|
||||
DESCRIPTION=Standard Linux networking tools
|
||||
EAPI=5
|
||||
HOMEPAGE=http://net-tools.sourceforge.net/
|
||||
IUSE=nls old-output selinux static
|
||||
KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
|
||||
LICENSE=GPL-2
|
||||
RDEPEND=!<sys-apps/openrc-0.9.9.3 selinux? ( sys-libs/libselinux )
|
||||
SLOT=0
|
||||
SRC_URI=mirror://gentoo/net-tools-1.60_p20130513023548.tar.xz mirror://gentoo/net-tools-1.60_p20130513023548-patches-2.tar.xz
|
||||
_eclasses_=eutils 28fb3e5852485af1c348d446b0b98389 flag-o-matic d270fa247153df66074f795fa42dba3e multilib 3972ca401cf7dbb430df9995f5d8d580 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85
|
||||
_md5_=abd0430d7bad988cecaeebbbd940c5ca
|
@ -1,13 +0,0 @@
|
||||
DEFINED_PHASES=configure install postinst prepare setup
|
||||
DEPEND=!<sys-apps/openrc-0.9.9.3 selinux? ( sys-libs/libselinux ) selinux? ( virtual/pkgconfig ) app-arch/xz-utils
|
||||
DESCRIPTION=Standard Linux networking tools
|
||||
EAPI=3
|
||||
HOMEPAGE=http://net-tools.sourceforge.net/
|
||||
IUSE=nls old-output selinux static
|
||||
KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
|
||||
LICENSE=GPL-2
|
||||
RDEPEND=!<sys-apps/openrc-0.9.9.3 selinux? ( sys-libs/libselinux )
|
||||
SLOT=0
|
||||
SRC_URI=mirror://gentoo/net-tools-1.60_p20141019041918.tar.xz mirror://gentoo/net-tools-1.60_p20141019041918-patches-1.tar.xz
|
||||
_eclasses_=eutils 28fb3e5852485af1c348d446b0b98389 flag-o-matic d270fa247153df66074f795fa42dba3e multilib 3972ca401cf7dbb430df9995f5d8d580 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85
|
||||
_md5_=3730781f8cc748b48984b8ec5a627717
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue