root
7 years ago
parent
151f8b3c2c
commit
e5ca466557
@ -1,6 +1,3 @@
|
||||
DIST logstash-2.3.4.tar.gz 79779303 SHA256 7f62a03ddc3972e33c343e982ada1796b18284f43ed9c0089a2efee78b239583 SHA512 cc5d6c04e414daf63c836141df87204e0cbc63f71ee02abb69496e29587d5b0803dd738949de559a597979c9f6c6bf9d11d55f4b084ce875f24fb362f2c9bd3b WHIRLPOOL 71b6d915153d80d9bc81d10454ffd14af4643c61557964d7fd8edf50bf1a5d1c53ce0b09c2aec9b079918df596bbb5b07420b8661572bf7ea659e9703694f07c
|
||||
DIST logstash-2.4.0.tar.gz 83882952 SHA256 622c435c5c0f40e205fd4d9411eb409cc52992cf62dde4c7cd46e480cd8247cc SHA512 27f7e22fcfbeabe58bef1220399a80b32b56b5e2af17c0279e3f583ed5170be649b961b92c3eef33120ce238f126a3cb32e614bd8109bd8c266b538888c5324d WHIRLPOOL 2d1db78ff21d86e22f709600b086dfc253120e6a659d46c1e6ebc6d62dfffd48f0a440c33fa9a1cd7014108f5ae88afa4ccd25211ce57b1a4856f756a855c71e
|
||||
DIST logstash-5.0.0.zip 110726123 SHA256 9a8ba13f9d4333fb17f373fc822a0ae5458ef8a37c026b823fc9a66044f8e331 SHA512 928541781d5f6bf16d91184f4863c2ecc3b8f07c190fd332b79f4f790091faf0531063459b96a53a250d986060a8968d9d326285e3195a39a116f0dc2ac1e43d WHIRLPOOL a6447c19d717819fa95b4e35e149215f8e6b270032311a80d56b235a1ee3de3561bd3ce5277ee3bd1fc11126819a0333d9ed068306f360e93788742ba45246d0
|
||||
DIST logstash-5.0.1.zip 110853954 SHA256 e2da648882f1583190e9146b0a994d7956c6e6ec0d17d4c92187b8fc74a1e9ee SHA512 57ceb47fb971d8bebf4d952d01f40dc14c79e9774ee228e2f3f55e8e1cf882df1361902192af93e0a5a74a18fb10ad2387b0922665e9285ff4d3b11add71b2e2 WHIRLPOOL 9867f9f1a2d06e5cccb81fe3db8ee0f8104085103f900442fd041770a3ec8c3941b7639c58766576e8a2d0c99dc5736ce62e7c002d3b6420f0de1205e9c5c09c
|
||||
DIST logstash-5.1.1.zip 100043857 SHA256 f120a8876dbb8a17717dcb7225f70baefb23e69b7c0d0217c58ed4942b22eef6 SHA512 ce7d8d5fb3217fbba8cd6602d5685d0f050d5fdab7c6311e1f2511ff24e998f0c281f07c222d8e9be3be4893cc8f4e487f8a6c59831a1b0af3fbbbcc8f97d0f3 WHIRLPOOL c461af064a939bbbd363b9ad601344b16d447b09b849b8b7dadd113440f718b17e49d8bf1112200f77e1a3f89b9547cc89422dded68aea608a73c4f4a7cd12bb
|
||||
DIST logstash-5.1.2.zip 100044055 SHA256 99fd514b6241310c78aefca2cd895c1cec4cd426aa08fccf7e8bba26567573c3 SHA512 4186f942dd555dc1284bc657cbd3a61de8aa67a50bd2f7b725d3364e5fca61029cadb0ca4f9e1c4a36078805fd015128ddcd7773e19e643eaddd5ae2fa9c6673 WHIRLPOOL 1127a419a35e42de59a4bd61fe5b75e39daad69d0646019417abf83f44639a86fd2b1ffc687b6cc551562045ef3d2d901d7985437d158094d4d054e4a93bfd5d
|
||||
DIST logstash-all-plugins-2.4.0.tar.gz 139743651 SHA256 b2ffe60745ece2140ebc4610f42543dcf3ff5ead2707f0b36f0b70e8ddf0baff SHA512 9627f6119d129b4dcdc41ff43e49a3880f4ba5fcb3ee11e1ec821929d542c93629b0f58ded6741c96da49cba16b05eca141acdeee0ed060389abc3f467bba593 WHIRLPOOL 49ddc27d6030ae65aaab0acabda478644232f92cbd2bbe3d1b118782c5ce1167edb2a485def982f3b6c8138f084e79a783273dd50519a82085b984259f7e19d4
|
||||
|
||||
@ -1,70 +0,0 @@
|
||||
#!/sbin/openrc-run
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
LS_USER=${LS_USER:-logstash}
|
||||
LS_GROUP=${LS_GROUP:-$LS_USER}
|
||||
LS_LOG_FILE=${LS_LOG_FILE:-/var/log/logstash/logstash.log}
|
||||
LS_CONF_DIR=${LS_CONF_DIR:-/etc/logstash/conf.d}
|
||||
LS_HOME=${LS_HOME:-/var/lib/logstash}
|
||||
LS_HEAP_SIZE=${LS_HEAP_SIZE:-500m}
|
||||
LS_NICE=${LS_NICE:-19}
|
||||
LS_JAVA_OPTS=${LS_JAVA_OPTS:-"-Djava.io.tmpdir=${LS_HOME}"}
|
||||
LS_USE_GC_LOGGING=${LS_USE_GC_LOGGING:-false}
|
||||
LS_OPEN_FILES=${LS_OPEN_FILES:-16384}
|
||||
KILL_ON_STOP_TIMEOUT=${KILL_ON_STOP_TIMEOUT:-0}
|
||||
|
||||
command="/opt/logstash/bin/logstash"
|
||||
command_args="--path.config ${LS_CONF_DIR} --path.logs ${LS_LOG_FILE} ${LS_OPTS}"
|
||||
command_background="true"
|
||||
pidfile=${LS_PIDFILE:-"/run/logstash/logstash.pid"}
|
||||
|
||||
start_stop_daemon_args="--user ${LS_USER}:${LS_GROUP} \
|
||||
--chdir ${LS_HOME}
|
||||
--nicelevel ${LS_NICE}
|
||||
--env LS_HEAP_SIZE=${LS_HEAP_SIZE}
|
||||
--env LS_JAVA_OPTS=${LS_JAVA_OPTS}
|
||||
--env LS_USE_GC_LOGGING=${LS_USE_GC_LOGGING}"
|
||||
|
||||
extra_commands="checkconfig"
|
||||
extra_started_commands="reload"
|
||||
|
||||
checkconfig() {
|
||||
if [ ! -f ${LS_CONF_DIR}/* ]; then
|
||||
eerror "Please put your configuration in ${LS_CONF_DIR}"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
ebegin "Checking your configuration"
|
||||
${command} ${command_args} --config.test_and_exit
|
||||
eend $? "Configuration error. Please fix your configuration files."
|
||||
}
|
||||
|
||||
reload() {
|
||||
checkconfig || return 1
|
||||
ebegin "Reloading configuration"
|
||||
start-stop-daemon --signal HUP --pidfile "${pidfile}"
|
||||
eend $?
|
||||
}
|
||||
|
||||
start_pre() {
|
||||
checkconfig || return 1
|
||||
|
||||
rc_ulimit="-n ${LS_OPEN_FILES}"
|
||||
|
||||
checkpath -d -o "${LS_USER}":"${LS_GROUP}" -m750 "$(dirname "${pidfile}")"
|
||||
checkpath -d -o "${LS_USER}":"${LS_GROUP}" -m750 "$(dirname "${LS_LOG_FILE}")"
|
||||
checkpath -f -o "${LS_USER}":"${LS_GROUP}" -m640 "${LS_LOG_FILE}"
|
||||
}
|
||||
|
||||
stop() {
|
||||
ebegin "Stopping logstash"
|
||||
if [ "${KILL_ON_STOP_TIMEOUT}" == "1" ]; then
|
||||
start-stop-daemon --stop \
|
||||
--pidfile=${pidfile} \
|
||||
--retry=TERM/5/KILL/5
|
||||
else
|
||||
start-stop-daemon --stop \
|
||||
--pidfile=${pidfile}
|
||||
fi
|
||||
}
|
||||
@ -1,64 +0,0 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
|
||||
inherit user
|
||||
|
||||
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"
|
||||
IUSE=""
|
||||
|
||||
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}"
|
||||
|
||||
pkg_setup() {
|
||||
enewgroup ${MY_PN}
|
||||
enewuser ${MY_PN} -1 -1 /var/lib/${MY_PN} ${MY_PN}
|
||||
}
|
||||
|
||||
src_install() {
|
||||
keepdir /etc/"${MY_PN}"/{conf.d,patterns,plugins}
|
||||
keepdir "/var/log/${MY_PN}"
|
||||
|
||||
insinto "/usr/share/${MY_PN}"
|
||||
doins "${FILESDIR}/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() {
|
||||
ewarn "The default user changed from root to ${MY_PN}. If you wish to run as root (for"
|
||||
ewarn "example to read local logs), be sure to change LS_USER and LS_GROUP in"
|
||||
ewarn "/etc/conf.d/${MY_PN}"
|
||||
einfo
|
||||
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,64 +0,0 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=6
|
||||
|
||||
inherit user
|
||||
|
||||
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://artifacts.elastic.co/downloads/${MY_PN}/${MY_P}.zip"
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64"
|
||||
IUSE=""
|
||||
|
||||
RESTRICT="strip"
|
||||
QA_PREBUILT="opt/logstash/vendor/jruby/lib/jni/*/libjffi*.so"
|
||||
|
||||
DEPEND=""
|
||||
RDEPEND="virtual/jre:1.8"
|
||||
|
||||
S="${WORKDIR}/${MY_P}"
|
||||
|
||||
pkg_setup() {
|
||||
enewgroup ${MY_PN}
|
||||
enewuser ${MY_PN} -1 -1 /var/lib/${MY_PN} ${MY_PN}
|
||||
}
|
||||
|
||||
src_install() {
|
||||
keepdir /etc/"${MY_PN}"/{conf.d,patterns,plugins}
|
||||
keepdir "/var/log/${MY_PN}"
|
||||
|
||||
insinto "/usr/share/${MY_PN}"
|
||||
doins "${FILESDIR}/agent.conf.sample"
|
||||
|
||||
insinto "/opt/${MY_PN}"
|
||||
doins -r .
|
||||
fperms 0755 "/opt/${MY_PN}/bin/${MY_PN}" "/opt/${MY_PN}/vendor/jruby/bin/jruby" "/opt/${MY_PN}/bin/logstash-plugin"
|
||||
|
||||
insinto /etc/logrotate.d
|
||||
newins "${FILESDIR}/${MY_PN}.logrotate" "${MY_PN}"
|
||||
|
||||
newconfd "${FILESDIR}/${MY_PN}.confd" "${MY_PN}"
|
||||
newinitd "${FILESDIR}/${MY_PN}.initd3" "${MY_PN}"
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
ewarn "The default user changed from root to ${MY_PN}. If you wish to run as root (for"
|
||||
ewarn "example to read local logs), be sure to change LS_USER and LS_GROUP in"
|
||||
ewarn "/etc/conf.d/${MY_PN}"
|
||||
einfo
|
||||
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,64 +0,0 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=6
|
||||
|
||||
inherit user
|
||||
|
||||
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://artifacts.elastic.co/downloads/${MY_PN}/${MY_P}.zip"
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64"
|
||||
IUSE=""
|
||||
|
||||
RESTRICT="strip"
|
||||
QA_PREBUILT="opt/logstash/vendor/jruby/lib/jni/*/libjffi*.so"
|
||||
|
||||
DEPEND=""
|
||||
RDEPEND="virtual/jre:1.8"
|
||||
|
||||
S="${WORKDIR}/${MY_P}"
|
||||
|
||||
pkg_setup() {
|
||||
enewgroup ${MY_PN}
|
||||
enewuser ${MY_PN} -1 -1 /var/lib/${MY_PN} ${MY_PN}
|
||||
}
|
||||
|
||||
src_install() {
|
||||
keepdir /etc/"${MY_PN}"/{conf.d,patterns,plugins}
|
||||
keepdir "/var/log/${MY_PN}"
|
||||
|
||||
insinto "/usr/share/${MY_PN}"
|
||||
doins "${FILESDIR}/agent.conf.sample"
|
||||
|
||||
insinto "/opt/${MY_PN}"
|
||||
doins -r .
|
||||
fperms 0755 "/opt/${MY_PN}/bin/${MY_PN}" "/opt/${MY_PN}/vendor/jruby/bin/jruby" "/opt/${MY_PN}/bin/logstash-plugin"
|
||||
|
||||
insinto /etc/logrotate.d
|
||||
newins "${FILESDIR}/${MY_PN}.logrotate" "${MY_PN}"
|
||||
|
||||
newconfd "${FILESDIR}/${MY_PN}.confd2" "${MY_PN}"
|
||||
newinitd "${FILESDIR}/${MY_PN}.initd4" "${MY_PN}"
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
ewarn "The default user changed from root to ${MY_PN}. If you wish to run as root (for"
|
||||
ewarn "example to read local logs), be sure to change LS_USER and LS_GROUP in"
|
||||
ewarn "/etc/conf.d/${MY_PN}"
|
||||
einfo
|
||||
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,64 +0,0 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=6
|
||||
|
||||
inherit user
|
||||
|
||||
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://artifacts.elastic.co/downloads/${MY_PN}/${MY_P}.zip"
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64"
|
||||
IUSE=""
|
||||
|
||||
RESTRICT="strip"
|
||||
QA_PREBUILT="opt/logstash/vendor/jruby/lib/jni/*/libjffi*.so"
|
||||
|
||||
DEPEND=""
|
||||
RDEPEND="virtual/jre:1.8"
|
||||
|
||||
S="${WORKDIR}/${MY_P}"
|
||||
|
||||
pkg_setup() {
|
||||
enewgroup ${MY_PN}
|
||||
enewuser ${MY_PN} -1 -1 /var/lib/${MY_PN} ${MY_PN}
|
||||
}
|
||||
|
||||
src_install() {
|
||||
keepdir /etc/"${MY_PN}"/{conf.d,patterns,plugins}
|
||||
keepdir "/var/log/${MY_PN}"
|
||||
|
||||
insinto "/usr/share/${MY_PN}"
|
||||
doins "${FILESDIR}/agent.conf.sample"
|
||||
|
||||
insinto "/opt/${MY_PN}"
|
||||
doins -r .
|
||||
fperms 0755 "/opt/${MY_PN}/bin/${MY_PN}" "/opt/${MY_PN}/vendor/jruby/bin/jruby" "/opt/${MY_PN}/bin/logstash-plugin"
|
||||
|
||||
insinto /etc/logrotate.d
|
||||
newins "${FILESDIR}/${MY_PN}.logrotate" "${MY_PN}"
|
||||
|
||||
newconfd "${FILESDIR}/${MY_PN}.confd" "${MY_PN}"
|
||||
newinitd "${FILESDIR}/${MY_PN}.initd3" "${MY_PN}"
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
ewarn "The default user changed from root to ${MY_PN}. If you wish to run as root (for"
|
||||
ewarn "example to read local logs), be sure to change LS_USER and LS_GROUP in"
|
||||
ewarn "/etc/conf.d/${MY_PN}"
|
||||
einfo
|
||||
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,3 +1,4 @@
|
||||
DIST needrestart-2.10.tar.gz 50602 SHA256 e2a9eff45d47d2c5e7c33102d204059bd493a4b950df15e01b37af7a2c084ebb SHA512 94cc4b898b3fadd4f5936133e8ce008fd79ce3e399c3343ab61308da59264f8e8301c3d1701fc0fa44478a94a6f518d73c09de708149a63fc3feb9dcd0f87a31 WHIRLPOOL 7b7eeecd92bddd326ced1671a04b50511279dacd04bcf33ccd0ceac1fd6f5eedbef388f70459789ee9dbb91299d3cbe4c2311e15a72d030be10aa546255d79b8
|
||||
DIST needrestart-2.11.tar.gz 52156 SHA256 5c7c322e551ae5de9442ac4915d6c9bc47303a22bc8fb234b953d4a158e65777 SHA512 e987ebafe77aba6920645088fa12e609b52f55edfd545ede1c0a93ee1d6b91ed3ea84cb8db69cd067aaabe8ba973b366da61301b5527ec176a29e3ba30605311 WHIRLPOOL a936b180037de8b804ed15ae44620aadc0dfc42d238207547832f42e7f8dea3784017ec1e517b7b22a0273396a26cb16d333358a80923dc2219c747c4129ebf5
|
||||
DIST needrestart-2.9.tar.gz 49774 SHA256 812c9594a5a262524f354f2290d8f9cd623004b30222aaeb37faa8cc911bd89f SHA512 f3ed8c0312ec6ee40b7f74fb6a69eaec939c6af5d3a09fd62e59e426ac3fabd416db145eb3946e51f7fe53470c24aa8ccd3ad6aa1e5988195085456204153c81 WHIRLPOOL 577735033ad12178e6d1eafaa71a2e9f7d09eece84aa7970e19619767a823da9a6e872bd7e57fd2b0db5c6421f2690105e805c0450a3386ea92bc8b8625dc3d5
|
||||
DIST v2.8.tar.gz 46420 SHA256 33b4f734335987557c68a8c57ea070ac4d23a249fa8675260f0bc28769056cc8 SHA512 2a6e5616a412039e9057a655208a7c55ed611d0deee5ba4c1d25563bb2610bcbf2b6d2534b906fd729db2eee5b3891fdb3fd3bc647f4d6aa06e2a87173b69be7 WHIRLPOOL 4f9daf45ca1a034d6476cf0b387174665d6bf15a4f36cb86e565d6b3715227bf8f7e27f6af422b1ef53c4b07a76d7b36eea0852e2db2a9032679ecc0b04bfc15
|
||||
|
||||
@ -0,0 +1,41 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=6
|
||||
|
||||
if [[ ${PV} == "9999" ]] ; then
|
||||
EGIT_REPO_URI="git://github.com/liske/${PN}.git"
|
||||
inherit git-r3
|
||||
SRC_URI=""
|
||||
KEYWORDS=""
|
||||
else
|
||||
SRC_URI="https://github.com/liske/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
fi
|
||||
|
||||
DESCRIPTION="Restart daemons after library updates"
|
||||
HOMEPAGE="https://fiasko-nw.net/~thomas/tag/needrestart.html https://github.com/liske/needrestart"
|
||||
|
||||
SLOT="0"
|
||||
LICENSE="GPL-2+"
|
||||
|
||||
RDEPEND="
|
||||
>=sys-apps/sed-4.2.2
|
||||
dev-lang/perl:=
|
||||
dev-perl/libintl-perl
|
||||
dev-perl/Module-Find
|
||||
dev-perl/Module-ScanDeps
|
||||
dev-perl/Proc-ProcessTable
|
||||
dev-perl/Sort-Naturally
|
||||
dev-perl/TermReadKey
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
sys-devel/gettext
|
||||
"
|
||||
|
||||
src_install() {
|
||||
default
|
||||
doman man/*.1
|
||||
dodoc -r ex
|
||||
}
|
||||
@ -0,0 +1,11 @@
|
||||
--- sysklogd-1.5.1/syslogd.c
|
||||
+++ sysklogd-1.5.1/syslogd.c
|
||||
@@ -2094,7 +2094,7 @@
|
||||
(void) signal(SIGCHLD, reapchild); /* reset signal handler -ASP */
|
||||
wait ((int *)0);
|
||||
#else
|
||||
- union wait status;
|
||||
+ int status;
|
||||
|
||||
while (wait3(&status, WNOHANG, (struct rusage *) NULL) > 0)
|
||||
;
|
||||
@ -0,0 +1,70 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
|
||||
inherit eutils flag-o-matic toolchain-funcs
|
||||
|
||||
DEB_PV="1.5-6"
|
||||
DESCRIPTION="Standard log daemons"
|
||||
HOMEPAGE="http://www.infodrom.org/projects/sysklogd/"
|
||||
SRC_URI="http://www.infodrom.org/projects/sysklogd/download/${P}.tar.gz
|
||||
mirror://debian/pool/main/s/sysklogd/${PN}_${DEB_PV}.diff.gz"
|
||||
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
|
||||
IUSE="logrotate"
|
||||
RESTRICT="test"
|
||||
|
||||
DEPEND=""
|
||||
RDEPEND="dev-lang/perl
|
||||
sys-apps/debianutils"
|
||||
|
||||
DOCS=( ANNOUNCE CHANGES NEWS README.1st README.linux )
|
||||
|
||||
PATCHES=(
|
||||
"${WORKDIR}"/${PN}_${DEB_PV}.diff
|
||||
|
||||
"${FILESDIR}"/${PN}-1.5-debian-cron.patch
|
||||
"${FILESDIR}"/${PN}-1.5-build.patch
|
||||
|
||||
# CAEN/OWL security patches
|
||||
"${FILESDIR}"/${PN}-1.4.2-caen-owl-syslogd-bind.diff
|
||||
"${FILESDIR}"/${PN}-1.4.2-caen-owl-syslogd-drop-root.diff
|
||||
"${FILESDIR}"/${PN}-1.4.2-caen-owl-klogd-drop-root.diff
|
||||
|
||||
"${FILESDIR}"/${PN}-1.5-syslog-func-collision.patch #342601
|
||||
"${FILESDIR}"/${PN}-1.5-glibc-2.24.patch #604232
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
epatch "${PATCHES[@]}"
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
append-lfs-flags
|
||||
tc-export CC
|
||||
}
|
||||
|
||||
src_install() {
|
||||
dosbin syslogd klogd debian/syslog-facility debian/syslogd-listfiles
|
||||
doman *.[1-9] debian/syslogd-listfiles.8
|
||||
insinto /etc
|
||||
doins debian/syslog.conf
|
||||
if use logrotate ; then
|
||||
insinto /etc/logrotate.d
|
||||
newins "${FILESDIR}"/sysklogd.logrotate sysklogd
|
||||
else
|
||||
exeinto /etc/cron.daily
|
||||
newexe debian/cron.daily syslog
|
||||
exeinto /etc/cron.weekly
|
||||
newexe debian/cron.weekly syslog
|
||||
fi
|
||||
|
||||
einstalldocs
|
||||
|
||||
newinitd "${FILESDIR}"/sysklogd.rc7 sysklogd
|
||||
newconfd "${FILESDIR}"/sysklogd.confd sysklogd
|
||||
}
|
||||
@ -0,0 +1,81 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI="5"
|
||||
|
||||
inherit flag-o-matic eutils
|
||||
|
||||
DESCRIPTION="Use this to make tarballs :)"
|
||||
HOMEPAGE="https://www.gnu.org/software/tar/"
|
||||
SRC_URI="mirror://gnu/tar/${P}.tar.bz2
|
||||
mirror://gnu-alpha/tar/${P}.tar.bz2"
|
||||
|
||||
LICENSE="GPL-3+"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
IUSE="acl elibc_glibc minimal nls selinux static userland_GNU xattr"
|
||||
|
||||
RDEPEND="acl? ( virtual/acl )
|
||||
selinux? ( sys-libs/libselinux )"
|
||||
DEPEND="${RDEPEND}
|
||||
nls? ( >=sys-devel/gettext-0.10.35 )
|
||||
xattr? ( elibc_glibc? ( sys-apps/attr ) )"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${P}-extract-pathname-bypass-upstream.patch" #598334
|
||||
"${FILESDIR}/${P}-add-files.patch"
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
epatch "${PATCHES[@]}"
|
||||
epatch_user
|
||||
|
||||
if ! use userland_GNU ; then
|
||||
sed -i \
|
||||
-e 's:/backup\.sh:/gbackup.sh:' \
|
||||
scripts/{backup,dump-remind,restore}.in \
|
||||
|| die "sed non-GNU"
|
||||
fi
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
use static && append-ldflags -static
|
||||
FORCE_UNSAFE_CONFIGURE=1 \
|
||||
econf \
|
||||
--enable-backup-scripts \
|
||||
--bindir="${EPREFIX}"/bin \
|
||||
--libexecdir="${EPREFIX}"/usr/sbin \
|
||||
$(usex userland_GNU "" "--program-prefix=g") \
|
||||
$(use_with acl posix-acls) \
|
||||
$(use_enable nls) \
|
||||
$(use_with selinux) \
|
||||
$(use_with xattr xattrs)
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
|
||||
local p=$(usex userland_GNU "" "g")
|
||||
if [[ -z ${p} ]] ; then
|
||||
# a nasty yet required piece of baggage
|
||||
exeinto /etc
|
||||
doexe "${FILESDIR}"/rmt
|
||||
fi
|
||||
|
||||
# autoconf looks for gtar before tar (in configure scripts), hence
|
||||
# in Prefix it is important that it is there, otherwise, a gtar from
|
||||
# the host system (FreeBSD, Solaris, Darwin) will be found instead
|
||||
# of the Prefix provided (GNU) tar
|
||||
if use prefix ; then
|
||||
dosym tar /bin/gtar
|
||||
fi
|
||||
|
||||
mv "${ED}"/usr/sbin/${p}backup{,-tar} || die
|
||||
mv "${ED}"/usr/sbin/${p}restore{,-tar} || die
|
||||
|
||||
if use minimal ; then
|
||||
find "${ED}"/etc "${ED}"/*bin/ "${ED}"/usr/*bin/ \
|
||||
-type f -a '!' '(' -name tar -o -name ${p}tar ')' \
|
||||
-delete || die
|
||||
fi
|
||||
}
|
||||
@ -1,4 +1,4 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
@ -0,0 +1,36 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=6
|
||||
|
||||
inherit eutils
|
||||
|
||||
MY_PN=VBoxGuestAdditions
|
||||
MY_PV="${PV/beta/BETA}"
|
||||
MY_PV="${MY_PV/rc/RC}"
|
||||
MY_P=${MY_PN}_${MY_PV}
|
||||
|
||||
DESCRIPTION="CD image containing guest additions for VirtualBox"
|
||||
HOMEPAGE="http://www.virtualbox.org/"
|
||||
SRC_URI="http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.iso"
|
||||
|
||||
LICENSE="GPL-2+ LGPL-2.1+ MIT SGI-B-2.0 CDDL"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE=""
|
||||
RESTRICT="mirror"
|
||||
|
||||
RDEPEND="!app-emulation/virtualbox-bin
|
||||
!=app-emulation/virtualbox-9999"
|
||||
|
||||
S="${WORKDIR}"
|
||||
|
||||
src_unpack() {
|
||||
return 0
|
||||
}
|
||||
|
||||
src_install() {
|
||||
insinto /usr/share/${PN/-additions}
|
||||
newins "${DISTDIR}"/${MY_P}.iso ${MY_PN}.iso
|
||||
}
|
||||
@ -0,0 +1,288 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
|
||||
PYTHON_COMPAT=( python2_7 )
|
||||
|
||||
inherit eutils fdo-mime gnome2 pax-utils python-r1 udev unpacker versionator
|
||||
|
||||
MAIN_PV="$(get_version_component_range 1-3)"
|
||||
if [[ ${PV} = *_beta* ]] || [[ ${PV} = *_rc* ]] ; then
|
||||
MY_PV="${MAIN_PV}_$(get_version_component_range 5)"
|
||||
MY_PV="${MY_PV/beta/BETA}"
|
||||
MY_PV="${MY_PV/rc/RC}"
|
||||
else
|
||||
MY_PV="${MAIN_PV}"
|
||||
fi
|
||||
VBOX_BUILD_ID="$(get_version_component_range 4)"
|
||||
VBOX_PV="${MY_PV}-${VBOX_BUILD_ID}"
|
||||
MY_P="VirtualBox-${VBOX_PV}-Linux"
|
||||
# needed as sometimes the extpack gets another build ID
|
||||
EXTP_PV="${VBOX_PV}"
|
||||
EXTP_PN="Oracle_VM_VirtualBox_Extension_Pack"
|
||||
EXTP_P="${EXTP_PN}-${EXTP_PV}"
|
||||
# needed as sometimes the SDK gets another build ID
|
||||
SDK_PV="${VBOX_PV}"
|
||||
SDK_P="VirtualBoxSDK-${SDK_PV}"
|
||||
|
||||
DESCRIPTION="Family of powerful x86 virtualization products for enterprise as well as home use"
|
||||
HOMEPAGE="http://www.virtualbox.org/"
|
||||
SRC_URI="amd64? ( http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}_amd64.run )
|
||||
x86? ( http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}_x86.run )
|
||||
http://download.virtualbox.org/virtualbox/${MY_PV}/${EXTP_P}.vbox-extpack -> ${EXTP_P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-2 PUEL"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="+additions +chm headless python vboxwebsrv rdesktop-vrdp"
|
||||
RESTRICT="mirror"
|
||||
|
||||
if [[ "${PV}" != *beta* ]] ; then
|
||||
SRC_URI+="
|
||||
sdk? ( http://download.virtualbox.org/virtualbox/${MY_PV}/${SDK_P}.zip )"
|
||||
IUSE+=" sdk"
|
||||
fi
|
||||
|
||||
DEPEND="app-arch/unzip
|
||||
${PYTHON_DEPS}"
|
||||
|
||||
RDEPEND="!!app-emulation/virtualbox
|
||||
!app-emulation/virtualbox-additions
|
||||
~app-emulation/virtualbox-modules-${MAIN_PV}
|
||||
!headless? (
|
||||
dev-libs/glib
|
||||
media-libs/fontconfig
|
||||
media-libs/freetype
|
||||
media-libs/libpng
|
||||
media-libs/libsdl[X]
|
||||
x11-libs/libXcursor
|
||||
x11-libs/libXext
|
||||
x11-libs/libXfixes
|
||||
x11-libs/libXft
|
||||
x11-libs/libXi
|
||||
x11-libs/libXinerama
|
||||
x11-libs/libXrandr
|
||||
x11-libs/libXrender
|
||||
chm? ( dev-libs/expat )
|
||||
)
|
||||
dev-libs/libxml2
|
||||
sys-fs/lvm2
|
||||
x11-libs/libXau
|
||||
x11-libs/libX11
|
||||
x11-libs/libXt
|
||||
x11-libs/libXmu
|
||||
x11-libs/libSM
|
||||
x11-libs/libICE
|
||||
x11-libs/libXdmcp
|
||||
${PYTHON_DEPS}"
|
||||
|
||||
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
|
||||
S=${WORKDIR}
|
||||
|
||||
QA_PREBUILT="opt/VirtualBox/*"
|
||||
|
||||
PYTHON_UPDATER_IGNORE="1"
|
||||
|
||||
src_unpack() {
|
||||
unpack_makeself ${MY_P}_${ARCH}.run
|
||||
unpack ./VirtualBox.tar.bz2
|
||||
|
||||
mkdir "${S}"/${EXTP_PN} || die
|
||||
pushd "${S}"/${EXTP_PN} &>/dev/null || die
|
||||
unpack ${EXTP_P}.tar.gz
|
||||
popd &>/dev/null || die
|
||||
|
||||
if [[ "${PV}" != *beta* ]] && use sdk ; then
|
||||
unpack VirtualBoxSDK-${SDK_PV}.zip
|
||||
fi
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
:;
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
:;
|
||||
}
|
||||
|
||||
src_install() {
|
||||
# create virtualbox configurations files
|
||||
insinto /etc/vbox
|
||||
newins "${FILESDIR}/${PN}-config" vbox.cfg
|
||||
|
||||
if ! use headless ; then
|
||||
newmenu "${FILESDIR}"/${PN}.desktop-2 ${PN}.desktop
|
||||
|
||||
# set up symlinks (bug #572012)
|
||||
dosym /opt/VirtualBox/virtualbox.xml /usr/share/mime/packages/virtualbox.xml
|
||||
|
||||
local size ico icofile
|
||||
for size in 16 24 32 48 64 72 96 128 256 ; do
|
||||
pushd "${S}"/icons/${size}x${size} &>/dev/null || die
|
||||
if [[ -f "virtualbox.png" ]] ; then
|
||||
doicon -s ${size} virtualbox.png
|
||||
fi
|
||||
for ico in hdd ova ovf vbox{,-extpack} vdi vdh vmdk ; do
|
||||
icofile="virtualbox-${ico}.png"
|
||||
if [[ -f "${icofile}" ]] ; then
|
||||
doicon -s ${size} ${icofile}
|
||||
fi
|
||||
done
|
||||
popd &>/dev/null || die
|
||||
done
|
||||
doicon -s scalable "${S}"/icons/scalable/virtualbox.svg
|
||||
insinto /usr/share/pixmaps
|
||||
newins "${S}"/icons/48x48/virtualbox.png ${PN}.png
|
||||
fi
|
||||
|
||||
pushd "${S}"/${EXTP_PN} &>/dev/null || die
|
||||
insinto /opt/VirtualBox/ExtensionPacks/${EXTP_PN}
|
||||
doins -r linux.${ARCH}
|
||||
doins ExtPack* PXE-Intel.rom
|
||||
popd &>/dev/null || die
|
||||
rm -rf "${S}"/${EXTP_PN}
|
||||
|
||||
insinto /opt/VirtualBox
|
||||
dodir /opt/bin
|
||||
|
||||
doins UserManual.pdf
|
||||
|
||||
if [[ "${PV}" != *beta* ]] && use sdk ; then
|
||||
doins -r sdk
|
||||
fi
|
||||
|
||||
if use additions; then
|
||||
doins -r additions
|
||||
fi
|
||||
|
||||
if use vboxwebsrv; then
|
||||
doins vboxwebsrv
|
||||
fowners root:vboxusers /opt/VirtualBox/vboxwebsrv
|
||||
fperms 0750 /opt/VirtualBox/vboxwebsrv
|
||||
dosym /opt/VirtualBox/VBox.sh /opt/bin/vboxwebsrv
|
||||
newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
|
||||
newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
|
||||
fi
|
||||
|
||||
if use rdesktop-vrdp; then
|
||||
doins rdesktop-vrdp
|
||||
doins -r rdesktop-vrdp-keymaps
|
||||
fperms 0750 /opt/VirtualBox/rdesktop-vrdp
|
||||
dosym /opt/VirtualBox/rdesktop-vrdp /opt/bin/rdesktop-vrdp
|
||||
fi
|
||||
|
||||
if ! use headless && use chm; then
|
||||
doins kchmviewer VirtualBox.chm
|
||||
fowners root:vboxusers /opt/VirtualBox/kchmviewer
|
||||
fperms 0750 /opt/VirtualBox/kchmviewer
|
||||
fi
|
||||
|
||||
# This ebuild / package supports only py2.7. When py3 comes is unknown.
|
||||
# The compile phase makes VBoxPython2_7.so.
|
||||
# py3 support would presumably require a binary pre-compiled by py3.
|
||||
use python && doins VBoxPython.so VBoxPython2_7.so
|
||||
|
||||
rm -rf src rdesktop* deffiles install* routines.sh runlevel.sh \
|
||||
vboxdrv.sh VBox.sh VBox.png vboxnet.sh additions VirtualBox.desktop \
|
||||
VirtualBox.tar.bz2 LICENSE VBoxSysInfo.sh rdesktop* vboxwebsrv \
|
||||
webtest kchmviewer VirtualBox.chm vbox-create-usb-node.sh \
|
||||
90-vbox-usb.fdi uninstall.sh vboxshell.py vboxdrv-pardus.py \
|
||||
VBoxPython?_*.so
|
||||
|
||||
if use headless ; then
|
||||
rm -rf VBoxSDL VirtualBox VBoxKeyboard.so
|
||||
fi
|
||||
|
||||
doins -r * || die
|
||||
|
||||
# create symlinks for working around unsupported $ORIGIN/.. in VBoxC.so (setuid)
|
||||
dosym /opt/VirtualBox/VBoxVMM.so /opt/VirtualBox/components/VBoxVMM.so
|
||||
dosym /opt/VirtualBox/VBoxREM.so /opt/VirtualBox/components/VBoxREM.so
|
||||
dosym /opt/VirtualBox/VBoxRT.so /opt/VirtualBox/components/VBoxRT.so
|
||||
dosym /opt/VirtualBox/VBoxDDU.so /opt/VirtualBox/components/VBoxDDU.so
|
||||
dosym /opt/VirtualBox/VBoxXPCOM.so /opt/VirtualBox/components/VBoxXPCOM.so
|
||||
|
||||
local each
|
||||
for each in VBox{Manage,SVC,XPCOMIPCD,Tunctl,NetAdpCtl,NetDHCP,NetNAT,TestOGL,ExtPackHelperApp}; do
|
||||
fowners root:vboxusers /opt/VirtualBox/${each}
|
||||
fperms 0750 /opt/VirtualBox/${each}
|
||||
pax-mark -m "${D}"/opt/VirtualBox/${each}
|
||||
done
|
||||
# VBoxNetAdpCtl and VBoxNetDHCP binaries need to be suid root in any case..
|
||||
fperms 4750 /opt/VirtualBox/VBoxNetAdpCtl
|
||||
fperms 4750 /opt/VirtualBox/VBoxNetDHCP
|
||||
fperms 4750 /opt/VirtualBox/VBoxNetNAT
|
||||
|
||||
if ! use headless ; then
|
||||
# Hardened build: Mark selected binaries set-user-ID-on-execution
|
||||
for each in VBox{SDL,Headless} VirtualBox; do
|
||||
fowners root:vboxusers /opt/VirtualBox/${each}
|
||||
fperms 4510 /opt/VirtualBox/${each}
|
||||
pax-mark -m "${D}"/opt/VirtualBox/${each}
|
||||
done
|
||||
|
||||
dosym /opt/VirtualBox/VBox.sh /opt/bin/VirtualBox
|
||||
dosym /opt/VirtualBox/VBox.sh /opt/bin/VBoxSDL
|
||||
else
|
||||
# Hardened build: Mark selected binaries set-user-ID-on-execution
|
||||
fowners root:vboxusers /opt/VirtualBox/VBoxHeadless
|
||||
fperms 4510 /opt/VirtualBox/VBoxHeadless
|
||||
pax-mark -m "${D}"/opt/VirtualBox/VBoxHeadless
|
||||
fi
|
||||
|
||||
exeinto /opt/VirtualBox
|
||||
newexe "${FILESDIR}/${PN}-3-wrapper" "VBox.sh"
|
||||
fowners root:vboxusers /opt/VirtualBox/VBox.sh
|
||||
fperms 0750 /opt/VirtualBox/VBox.sh
|
||||
|
||||
dosym /opt/VirtualBox/VBox.sh /opt/bin/VBoxManage
|
||||
dosym /opt/VirtualBox/VBox.sh /opt/bin/VBoxVRDP
|
||||
dosym /opt/VirtualBox/VBox.sh /opt/bin/VBoxHeadless
|
||||
dosym /opt/VirtualBox/VBoxTunctl /opt/bin/VBoxTunctl
|
||||
|
||||
# set an env-variable for 3rd party tools
|
||||
echo -n "VBOX_APP_HOME=/opt/VirtualBox" > "${T}/90virtualbox"
|
||||
doenvd "${T}/90virtualbox"
|
||||
|
||||
local udevdir="$(get_udevdir)"
|
||||
insinto ${udevdir}/rules.d
|
||||
doins "${FILESDIR}"/10-virtualbox.rules
|
||||
sed "s@%UDEVDIR%@${udevdir}@" \
|
||||
-i "${D}"${udevdir}/rules.d/10-virtualbox.rules || die
|
||||
# move udev scripts into ${udevdir} (bug #372491)
|
||||
mv "${D}"/opt/VirtualBox/VBoxCreateUSBNode.sh "${D}"${udevdir} || die
|
||||
fperms 0750 ${udevdir}/VBoxCreateUSBNode.sh
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
fdo-mime_desktop_database_update
|
||||
|
||||
gnome2_icon_cache_update
|
||||
|
||||
udevadm control --reload-rules && udevadm trigger --subsystem-match=usb
|
||||
|
||||
elog ""
|
||||
if ! use headless ; then
|
||||
elog "To launch VirtualBox just type: \"VirtualBox\""
|
||||
elog ""
|
||||
fi
|
||||
elog "You must be in the vboxusers group to use VirtualBox."
|
||||
elog ""
|
||||
elog "For advanced networking setups you should emerge:"
|
||||
elog "net-misc/bridge-utils and sys-apps/usermode-utilities"
|
||||
elog ""
|
||||
elog "Please visit http://www.virtualbox.org/wiki/Editions for"
|
||||
elog "an overview about the different features of ${PN}"
|
||||
elog "and virtualbox-ose"
|
||||
if [ -e "${ROOT}/etc/udev/rules.d/10-virtualbox.rules" ] ; then
|
||||
elog ""
|
||||
elog "Please remove \"${ROOT}/etc/udev/rules.d/10-virtualbox.rules\""
|
||||
elog "or else USB in ${PN} won't work."
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
fdo-mime_desktop_database_update
|
||||
}
|
||||
@ -1,4 +1,4 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
@ -0,0 +1,43 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=6
|
||||
|
||||
inherit eutils multilib versionator
|
||||
|
||||
MAIN_PV="$(get_version_component_range 1-3)"
|
||||
if [[ ${PV} = *_beta* ]] || [[ ${PV} = *_rc* ]] ; then
|
||||
MY_PV="${MAIN_PV}_$(get_version_component_range 5)"
|
||||
DEP_PV="${MY_PV}"
|
||||
MY_PV="${MY_PV/beta/BETA}"
|
||||
MY_PV="${MY_PV/rc/RC}"
|
||||
else
|
||||
MY_PV="${MAIN_PV}"
|
||||
DEP_PV="${MAIN_PV}"
|
||||
fi
|
||||
VBOX_BUILD_ID="$(get_version_component_range 4)"
|
||||
MY_PN="Oracle_VM_VirtualBox_Extension_Pack"
|
||||
MY_P="${MY_PN}-${MY_PV}-${VBOX_BUILD_ID}"
|
||||
|
||||
DESCRIPTION="PUEL extensions for VirtualBox"
|
||||
HOMEPAGE="http://www.virtualbox.org/"
|
||||
SRC_URI="http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.vbox-extpack -> ${MY_P}.tar.gz"
|
||||
|
||||
LICENSE="PUEL"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE=""
|
||||
RESTRICT="mirror strip"
|
||||
|
||||
RDEPEND="~app-emulation/virtualbox-${DEP_PV}"
|
||||
|
||||
S="${WORKDIR}"
|
||||
|
||||
QA_PREBUILT="/usr/lib*/virtualbox/ExtensionPacks/${MY_PN}/.*"
|
||||
|
||||
src_install() {
|
||||
insinto /usr/$(get_libdir)/virtualbox/ExtensionPacks/${MY_PN}
|
||||
doins -r linux.${ARCH}
|
||||
doins ExtPack* PXE-Intel.rom
|
||||
}
|
||||
@ -1,4 +1,4 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
@ -0,0 +1,220 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=6
|
||||
|
||||
inherit eutils linux-mod systemd user toolchain-funcs
|
||||
|
||||
MY_PV="${PV/beta/BETA}"
|
||||
MY_PV="${MY_PV/rc/RC}"
|
||||
MY_P=VirtualBox-${MY_PV}
|
||||
DESCRIPTION="VirtualBox kernel modules and user-space tools for Gentoo guests"
|
||||
HOMEPAGE="http://www.virtualbox.org/"
|
||||
SRC_URI="http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="X"
|
||||
|
||||
RDEPEND="X? ( x11-apps/xrandr
|
||||
x11-apps/xrefresh
|
||||
x11-libs/libXmu
|
||||
x11-libs/libX11
|
||||
x11-libs/libXt
|
||||
x11-libs/libXext
|
||||
x11-libs/libXau
|
||||
x11-libs/libXdmcp
|
||||
x11-libs/libSM
|
||||
x11-libs/libICE
|
||||
x11-proto/glproto )
|
||||
sys-apps/dbus
|
||||
!!x11-drivers/xf86-input-virtualbox"
|
||||
DEPEND="${RDEPEND}
|
||||
>=dev-util/kbuild-0.1.9998_pre20131130
|
||||
>=dev-lang/yasm-0.6.2
|
||||
sys-devel/bin86
|
||||
sys-libs/pam
|
||||
sys-power/iasl
|
||||
X? ( x11-proto/renderproto )
|
||||
!X? ( x11-proto/xproto )"
|
||||
PDEPEND="X? ( ~x11-drivers/xf86-video-virtualbox-${PV} )"
|
||||
|
||||
BUILD_TARGETS="all"
|
||||
BUILD_TARGET_ARCH="${ARCH}"
|
||||
|
||||
S="${WORKDIR}/${MY_P}"
|
||||
|
||||
pkg_setup() {
|
||||
MODULE_NAMES="vboxguest(misc:${WORKDIR}/vboxguest:${WORKDIR}/vboxguest)
|
||||
vboxsf(misc:${WORKDIR}/vboxsf:${WORKDIR}/vboxsf)"
|
||||
use X && MODULE_NAMES+=" vboxvideo(misc:${WORKDIR}/vboxvideo::${WORKDIR}/vboxvideo)"
|
||||
|
||||
linux-mod_pkg_setup
|
||||
BUILD_PARAMS="KERN_DIR=${KV_OUT_DIR} KERNOUT=${KV_OUT_DIR}"
|
||||
enewgroup vboxguest
|
||||
enewuser vboxguest -1 /bin/sh /dev/null vboxguest
|
||||
# automount Error: VBoxServiceAutoMountWorker: Group "vboxsf" does not exist
|
||||
enewgroup vboxsf
|
||||
}
|
||||
|
||||
src_unpack() {
|
||||
unpack ${A}
|
||||
|
||||
# Create and unpack a tarball with the sources of the Linux guest
|
||||
# kernel modules, to include all the needed files
|
||||
"${S}"/src/VBox/Additions/linux/export_modules "${WORKDIR}/vbox-kmod.tar.gz"
|
||||
unpack ./vbox-kmod.tar.gz
|
||||
|
||||
# Remove shipped binaries (kBuild,yasm), see bug #232775
|
||||
cd "${S}"
|
||||
rm -rf kBuild/bin tools
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
# PaX fixes (see bug #298988)
|
||||
pushd "${WORKDIR}" &>/dev/null || die
|
||||
eapply "${FILESDIR}"/vboxguest-4.1.0-log-use-c99.patch
|
||||
popd &>/dev/null || die
|
||||
|
||||
# Disable things unused or splitted into separate ebuilds
|
||||
cp "${FILESDIR}/${PN}-5-localconfig" LocalConfig.kmk || die
|
||||
use X || echo "VBOX_WITH_X11_ADDITIONS :=" >> LocalConfig.kmk
|
||||
|
||||
# stupid new header references...
|
||||
for vboxheader in {product,revision,version}-generated.h ; do
|
||||
for mdir in vbox{guest,sf} ; do
|
||||
ln -sf "${S}"/out/linux.${ARCH}/release/${vboxheader} \
|
||||
"${WORKDIR}/${mdir}/${vboxheader}"
|
||||
done
|
||||
done
|
||||
|
||||
# Remove pointless GCC version limitations in check_gcc()
|
||||
sed -e "/\s*-o\s*\\\(\s*\$cc_maj\s*-eq\s*[5-9]\s*-a\s*\$cc_min\s*-gt\s*[0-5]\s*\\\)\s*\\\/d" \
|
||||
-i configure || die
|
||||
|
||||
eapply_user
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
# build the user-space tools, warnings are harmless
|
||||
local cmd=(
|
||||
./configure
|
||||
--nofatal
|
||||
--disable-xpcom
|
||||
--disable-sdl-ttf
|
||||
--disable-pulse
|
||||
--disable-alsa
|
||||
--with-gcc="$(tc-getCC)"
|
||||
--with-g++="$(tc-getCXX)"
|
||||
--target-arch=${ARCH}
|
||||
--with-linux="${KV_OUT_DIR}"
|
||||
--build-headless
|
||||
)
|
||||
echo "${cmd[@]}"
|
||||
"${cmd[@]}" || die "configure failed"
|
||||
source ./env.sh
|
||||
export VBOX_GCC_OPT="${CFLAGS} ${CPPFLAGS}"
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
MAKE="kmk" \
|
||||
emake TOOL_YASM_AS=yasm \
|
||||
VBOX_ONLY_ADDITIONS=1 \
|
||||
KBUILD_VERBOSE=2
|
||||
|
||||
# Now creating the kernel modules. We must do this _after_
|
||||
# we compiled the user-space tools as we need two of the
|
||||
# automatically generated header files. (>=3.2.0)
|
||||
linux-mod_src_compile
|
||||
}
|
||||
|
||||
src_install() {
|
||||
linux-mod_src_install
|
||||
|
||||
cd "${S}"/out/linux.${ARCH}/release/bin/additions || die
|
||||
|
||||
insinto /sbin
|
||||
newins mount.vboxsf mount.vboxsf
|
||||
fperms 4755 /sbin/mount.vboxsf
|
||||
|
||||
newinitd "${FILESDIR}"/${PN}-8.initd ${PN}
|
||||
|
||||
insinto /usr/sbin/
|
||||
newins VBoxService vboxguest-service
|
||||
fperms 0755 /usr/sbin/vboxguest-service
|
||||
|
||||
insinto /usr/bin
|
||||
doins VBoxControl
|
||||
fperms 0755 /usr/bin/VBoxControl
|
||||
|
||||
# VBoxClient user service and xrandr wrapper
|
||||
if use X ; then
|
||||
doins VBoxClient
|
||||
fperms 0755 /usr/bin/VBoxClient
|
||||
|
||||
pushd "${S}"/src/VBox/Additions/x11/Installer &>/dev/null \
|
||||
|| die
|
||||
newins 98vboxadd-xclient VBoxClient-all
|
||||
fperms 0755 /usr/bin/VBoxClient-all
|
||||
popd &>/dev/null || die
|
||||
fi
|
||||
|
||||
# udev rule for vboxdrv
|
||||
local udev_rules_dir="/lib/udev/rules.d"
|
||||
dodir ${udev_rules_dir}
|
||||
echo 'KERNEL=="vboxguest", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
|
||||
>> "${D}/${udev_rules_dir}/60-virtualbox-guest-additions.rules" \
|
||||
|| die
|
||||
echo 'KERNEL=="vboxuser", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
|
||||
>> "${D}/${udev_rules_dir}/60-virtualbox-guest-additions.rules" \
|
||||
|| die
|
||||
|
||||
# VBoxClient autostart file
|
||||
insinto /etc/xdg/autostart
|
||||
doins "${FILESDIR}"/vboxclient.desktop
|
||||
|
||||
# sample xorg.conf
|
||||
insinto /usr/share/doc/${PF}
|
||||
doins "${FILESDIR}"/xorg.conf.vbox
|
||||
|
||||
systemd_dounit "${FILESDIR}/${PN}.service"
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
linux-mod_pkg_postinst
|
||||
if ! use X ; then
|
||||
elog "use flag X is off, enable it to install the"
|
||||
elog "X Window System video driver."
|
||||
fi
|
||||
elog ""
|
||||
elog "Please add users to the \"vboxguest\" group so they can"
|
||||
elog "benefit from seamless mode, auto-resize and clipboard."
|
||||
elog ""
|
||||
elog "The vboxsf group has been added to make automount services work."
|
||||
elog "These services are part of the shared folders support."
|
||||
elog ""
|
||||
elog "Please add:"
|
||||
elog "/etc/init.d/${PN}"
|
||||
elog "to the default runlevel in order to start"
|
||||
elog "needed services."
|
||||
elog "To use the VirtualBox X driver, use the following"
|
||||
elog "file as your /etc/X11/xorg.conf:"
|
||||
elog " /usr/share/doc/${PF}/xorg.conf.vbox"
|
||||
elog ""
|
||||
elog "Also make sure you use the Mesa library for OpenGL:"
|
||||
elog " eselect opengl set xorg-x11"
|
||||
elog ""
|
||||
elog "An autostart .desktop file has been installed to start"
|
||||
elog "VBoxClient in desktop sessions."
|
||||
elog ""
|
||||
elog "You can mount shared folders with:"
|
||||
elog " mount -t vboxsf <shared_folder_name> <mount_point>"
|
||||
elog ""
|
||||
elog "Warning:"
|
||||
elog "this ebuild is only needed if you are running gentoo"
|
||||
elog "inside a VirtualBox Virtual Machine, you don't need"
|
||||
elog "it to run VirtualBox itself."
|
||||
elog ""
|
||||
}
|
||||
@ -0,0 +1,65 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
# XXX: the tarball here is just the kernel modules split out of the binary
|
||||
# package that comes from virtualbox-bin
|
||||
|
||||
EAPI=6
|
||||
|
||||
inherit eutils linux-mod user
|
||||
|
||||
MY_P=vbox-kernel-module-src-${PV}
|
||||
DESCRIPTION="Kernel Modules for Virtualbox"
|
||||
HOMEPAGE="http://www.virtualbox.org/"
|
||||
SRC_URI="https://dev.gentoo.org/~polynomial-c/virtualbox/${MY_P}.tar.xz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="pax_kernel"
|
||||
|
||||
RDEPEND="!=app-emulation/virtualbox-9999"
|
||||
|
||||
S=${WORKDIR}
|
||||
|
||||
BUILD_TARGETS="all"
|
||||
BUILD_TARGET_ARCH="${ARCH}"
|
||||
MODULE_NAMES="vboxdrv(misc:${S}) vboxnetflt(misc:${S}) vboxnetadp(misc:${S}) vboxpci(misc:${S})"
|
||||
|
||||
pkg_setup() {
|
||||
enewgroup vboxusers
|
||||
|
||||
CONFIG_CHECK="!TRIM_UNUSED_KSYMS"
|
||||
ERROR_TRIM_UNUSED_KSYMS="The kernel option CONFIG_TRIM_UNUSED_KSYMS removed kernel symbols that are needed by ${PN} to load correctly."
|
||||
|
||||
linux-mod_pkg_setup
|
||||
|
||||
BUILD_PARAMS="KERN_DIR=${KV_DIR} O=${KV_OUT_DIR} V=1 KBUILD_VERBOSE=1"
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
if kernel_is -ge 2 6 33 ; then
|
||||
# evil patch for new kernels - header moved
|
||||
grep -lR linux/autoconf.h * | xargs sed -i -e 's:<linux/autoconf.h>:<generated/autoconf.h>:'
|
||||
fi
|
||||
|
||||
if use pax_kernel && kernel_is -ge 3 0 0 ; then
|
||||
epatch "${FILESDIR}"/${PN}-4.1.4-pax-const.patch
|
||||
fi
|
||||
|
||||
default
|
||||
}
|
||||
|
||||
src_install() {
|
||||
linux-mod_src_install
|
||||
insinto /usr/lib/modules-load.d/
|
||||
doins "${FILESDIR}"/virtualbox.conf
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
linux-mod_pkg_postinst
|
||||
elog "If you are using sys-apps/openrc, please add \"vboxdrv\", \"vboxnetflt\","
|
||||
elog "\"vboxnetadp\" and \"vboxpci\" to:"
|
||||
elog " /etc/conf.d/modules"
|
||||
}
|
||||
@ -1,94 +0,0 @@
|
||||
Index: vbox/src/VBox/Devices/Storage/DevLsiLogicSCSI.cpp
|
||||
===================================================================
|
||||
--- vbox/src/VBox/Devices/Storage/DevLsiLogicSCSI.cpp (revision 64807)
|
||||
+++ vbox/src/VBox/Devices/Storage/DevLsiLogicSCSI.cpp (revision 64808)
|
||||
@@ -286,6 +286,12 @@
|
||||
PDMCRITSECT ReplyPostQueueCritSect;
|
||||
/** Critical section protecting the reply free queue. */
|
||||
PDMCRITSECT ReplyFreeQueueCritSect;
|
||||
+ /** Critical section protecting the request queue against
|
||||
+ * concurrent access from the guest. */
|
||||
+ PDMCRITSECT RequestQueueCritSect;
|
||||
+ /** Critical section protecting the reply free queue against
|
||||
+ * concurrent write access from the guest. */
|
||||
+ PDMCRITSECT ReplyFreeQueueWriteCritSect;
|
||||
|
||||
/** Pointer to the start of the reply free queue - R3. */
|
||||
R3PTRTYPE(volatile uint32_t *) pReplyFreeQueueBaseR3;
|
||||
@@ -1275,14 +1281,22 @@
|
||||
{
|
||||
case LSILOGIC_REG_REPLY_QUEUE:
|
||||
{
|
||||
+ int rc = PDMCritSectEnter(&pThis->ReplyFreeQueueWriteCritSect, VINF_IOM_R3_MMIO_WRITE);
|
||||
+ if (rc != VINF_SUCCESS)
|
||||
+ return rc;
|
||||
/* Add the entry to the reply free queue. */
|
||||
ASMAtomicWriteU32(&pThis->CTX_SUFF(pReplyFreeQueueBase)[pThis->uReplyFreeQueueNextEntryFreeWrite], u32);
|
||||
pThis->uReplyFreeQueueNextEntryFreeWrite++;
|
||||
pThis->uReplyFreeQueueNextEntryFreeWrite %= pThis->cReplyQueueEntries;
|
||||
+ PDMCritSectLeave(&pThis->ReplyFreeQueueWriteCritSect);
|
||||
break;
|
||||
}
|
||||
case LSILOGIC_REG_REQUEST_QUEUE:
|
||||
{
|
||||
+ int rc = PDMCritSectEnter(&pThis->RequestQueueCritSect, VINF_IOM_R3_MMIO_WRITE);
|
||||
+ if (rc != VINF_SUCCESS)
|
||||
+ return rc;
|
||||
+
|
||||
uint32_t uNextWrite = ASMAtomicReadU32(&pThis->uRequestQueueNextEntryFreeWrite);
|
||||
|
||||
ASMAtomicWriteU32(&pThis->CTX_SUFF(pRequestQueueBase)[uNextWrite], u32);
|
||||
@@ -1296,6 +1310,7 @@
|
||||
uNextWrite++;
|
||||
uNextWrite %= pThis->cRequestQueueEntries;
|
||||
ASMAtomicWriteU32(&pThis->uRequestQueueNextEntryFreeWrite, uNextWrite);
|
||||
+ PDMCritSectLeave(&pThis->RequestQueueCritSect);
|
||||
|
||||
/* Send notification to R3 if there is not one sent already. Do this
|
||||
* only if the worker thread is not sleeping or might go sleeping. */
|
||||
@@ -1309,7 +1324,7 @@
|
||||
PDMQueueInsert(pThis->CTX_SUFF(pNotificationQueue), pNotificationItem);
|
||||
#else
|
||||
LogFlowFunc(("Signal event semaphore\n"));
|
||||
- int rc = SUPSemEventSignal(pThis->pSupDrvSession, pThis->hEvtProcess);
|
||||
+ rc = SUPSemEventSignal(pThis->pSupDrvSession, pThis->hEvtProcess);
|
||||
AssertRC(rc);
|
||||
#endif
|
||||
}
|
||||
@@ -5304,6 +5319,8 @@
|
||||
|
||||
PDMR3CritSectDelete(&pThis->ReplyFreeQueueCritSect);
|
||||
PDMR3CritSectDelete(&pThis->ReplyPostQueueCritSect);
|
||||
+ PDMR3CritSectDelete(&pThis->RequestQueueCritSect);
|
||||
+ PDMR3CritSectDelete(&pThis->ReplyFreeQueueWriteCritSect);
|
||||
|
||||
RTMemFree(pThis->paDeviceStates);
|
||||
pThis->paDeviceStates = NULL;
|
||||
@@ -5470,6 +5487,14 @@
|
||||
if (RT_FAILURE(rc))
|
||||
return PDMDEV_SET_ERROR(pDevIns, rc, N_("LsiLogic: cannot create critical section for reply post queue"));
|
||||
|
||||
+ rc = PDMDevHlpCritSectInit(pDevIns, &pThis->RequestQueueCritSect, RT_SRC_POS, "%sRQ", szDevTag);
|
||||
+ if (RT_FAILURE(rc))
|
||||
+ return PDMDEV_SET_ERROR(pDevIns, rc, N_("LsiLogic: cannot create critical section for request queue"));
|
||||
+
|
||||
+ rc = PDMDevHlpCritSectInit(pDevIns, &pThis->ReplyFreeQueueWriteCritSect, RT_SRC_POS, "%sRFQW", szDevTag);
|
||||
+ if (RT_FAILURE(rc))
|
||||
+ return PDMDEV_SET_ERROR(pDevIns, rc, N_("LsiLogic: cannot create critical section for reply free queue write access"));
|
||||
+
|
||||
/*
|
||||
* Register the PCI device, it's I/O regions.
|
||||
*/
|
||||
Index: vbox/src/VBox/Devices/testcase/tstDeviceStructSizeRC.cpp
|
||||
===================================================================
|
||||
--- vbox/src/VBox/Devices/testcase/tstDeviceStructSizeRC.cpp (revision 64807)
|
||||
+++ vbox/src/VBox/Devices/testcase/tstDeviceStructSizeRC.cpp (revision 64808)
|
||||
@@ -1744,6 +1744,8 @@
|
||||
GEN_CHECK_OFF(LSILOGICSCSI, cRequestQueueEntries);
|
||||
GEN_CHECK_OFF(LSILOGICSCSI, ReplyPostQueueCritSect);
|
||||
GEN_CHECK_OFF(LSILOGICSCSI, ReplyFreeQueueCritSect);
|
||||
+ GEN_CHECK_OFF(LSILOGICSCSI, RequestQueueCritSect);
|
||||
+ GEN_CHECK_OFF(LSILOGICSCSI, ReplyFreeQueueWriteCritSect);
|
||||
GEN_CHECK_OFF(LSILOGICSCSI, pReplyFreeQueueBaseR3);
|
||||
GEN_CHECK_OFF(LSILOGICSCSI, pReplyPostQueueBaseR3);
|
||||
GEN_CHECK_OFF(LSILOGICSCSI, pRequestQueueBaseR3);
|
||||
@ -1 +0,0 @@
|
||||
INSTALL_DIR=/usr/MY_LIBDIR/virtualbox
|
||||
@ -0,0 +1,436 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=6
|
||||
|
||||
PYTHON_COMPAT=( python2_7 )
|
||||
inherit eutils fdo-mime flag-o-matic java-pkg-opt-2 linux-info multilib pax-utils python-single-r1 toolchain-funcs udev
|
||||
|
||||
MY_PV="${PV/beta/BETA}"
|
||||
MY_PV="${MY_PV/rc/RC}"
|
||||
MY_P=VirtualBox-${MY_PV}
|
||||
SRC_URI="http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2
|
||||
https://dev.gentoo.org/~polynomial-c/${PN}/patchsets/${PN}-5.0.16-patches-01.tar.xz"
|
||||
S="${WORKDIR}/${MY_P}"
|
||||
|
||||
DESCRIPTION="Family of powerful x86 virtualization products for enterprise and home use"
|
||||
HOMEPAGE="http://www.virtualbox.org/"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="alsa debug doc headless java libressl lvm pam pulseaudio +opengl python +qt4 +sdk +udev vboxwebsrv vnc"
|
||||
|
||||
RDEPEND="!app-emulation/virtualbox-bin
|
||||
~app-emulation/virtualbox-modules-${PV}
|
||||
dev-libs/libIDL
|
||||
>=dev-libs/libxslt-1.1.19
|
||||
net-misc/curl
|
||||
dev-libs/libxml2
|
||||
media-libs/libpng:0=
|
||||
media-libs/libvpx:0=
|
||||
sys-libs/zlib
|
||||
!headless? (
|
||||
media-libs/libsdl:0[X,video]
|
||||
x11-libs/libX11
|
||||
x11-libs/libXcursor
|
||||
x11-libs/libXext
|
||||
x11-libs/libXmu
|
||||
x11-libs/libXt
|
||||
opengl? ( virtual/opengl media-libs/freeglut )
|
||||
qt4? (
|
||||
dev-qt/qtgui:4
|
||||
dev-qt/qtcore:4
|
||||
opengl? ( dev-qt/qtopengl:4 )
|
||||
x11-libs/libXinerama
|
||||
)
|
||||
)
|
||||
java? ( >=virtual/jre-1.6:= )
|
||||
libressl? ( dev-libs/libressl:= )
|
||||
!libressl? ( dev-libs/openssl:0= )
|
||||
lvm? ( sys-fs/lvm2 )
|
||||
udev? ( >=virtual/udev-171 )
|
||||
vnc? ( >=net-libs/libvncserver-0.9.9 )"
|
||||
DEPEND="${RDEPEND}
|
||||
>=dev-util/kbuild-0.1.9998_pre20131130
|
||||
>=dev-lang/yasm-0.6.2
|
||||
sys-devel/bin86
|
||||
sys-libs/libcap
|
||||
sys-power/iasl
|
||||
virtual/pkgconfig
|
||||
alsa? ( >=media-libs/alsa-lib-1.0.13 )
|
||||
doc? (
|
||||
dev-texlive/texlive-basic
|
||||
dev-texlive/texlive-latex
|
||||
dev-texlive/texlive-latexrecommended
|
||||
dev-texlive/texlive-latexextra
|
||||
dev-texlive/texlive-fontsrecommended
|
||||
dev-texlive/texlive-fontsextra
|
||||
)
|
||||
!headless? ( x11-libs/libXinerama )
|
||||
java? ( >=virtual/jre-1.6:= )
|
||||
pam? ( sys-libs/pam )
|
||||
pulseaudio? ( media-sound/pulseaudio )
|
||||
vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] )
|
||||
${PYTHON_DEPS}"
|
||||
|
||||
QA_TEXTRELS_x86="usr/lib/virtualbox-ose/VBoxGuestPropSvc.so
|
||||
usr/lib/virtualbox/VBoxSDL.so
|
||||
usr/lib/virtualbox/VBoxSharedFolders.so
|
||||
usr/lib/virtualbox/VBoxDD2.so
|
||||
usr/lib/virtualbox/VBoxOGLrenderspu.so
|
||||
usr/lib/virtualbox/VBoxPython.so
|
||||
usr/lib/virtualbox/VBoxDD.so
|
||||
usr/lib/virtualbox/VBoxDDU.so
|
||||
usr/lib/virtualbox/VBoxREM64.so
|
||||
usr/lib/virtualbox/VBoxSharedClipboard.so
|
||||
usr/lib/virtualbox/VBoxHeadless.so
|
||||
usr/lib/virtualbox/VBoxRT.so
|
||||
usr/lib/virtualbox/VBoxREM.so
|
||||
usr/lib/virtualbox/VBoxSettings.so
|
||||
usr/lib/virtualbox/VBoxKeyboard.so
|
||||
usr/lib/virtualbox/VBoxSharedCrOpenGL.so
|
||||
usr/lib/virtualbox/VBoxVMM.so
|
||||
usr/lib/virtualbox/VirtualBox.so
|
||||
usr/lib/virtualbox/VBoxOGLhosterrorspu.so
|
||||
usr/lib/virtualbox/components/VBoxC.so
|
||||
usr/lib/virtualbox/components/VBoxSVCM.so
|
||||
usr/lib/virtualbox/components/VBoxDDU.so
|
||||
usr/lib/virtualbox/components/VBoxRT.so
|
||||
usr/lib/virtualbox/components/VBoxREM.so
|
||||
usr/lib/virtualbox/components/VBoxVMM.so
|
||||
usr/lib/virtualbox/VBoxREM32.so
|
||||
usr/lib/virtualbox/VBoxPython2_7.so
|
||||
usr/lib/virtualbox/VBoxXPCOMC.so
|
||||
usr/lib/virtualbox/VBoxOGLhostcrutil.so
|
||||
usr/lib/virtualbox/VBoxNetDHCP.so
|
||||
usr/lib/virtualbox/VBoxNetNAT.so"
|
||||
|
||||
REQUIRED_USE="
|
||||
java? ( sdk )
|
||||
python? ( sdk )
|
||||
vboxwebsrv? ( java )
|
||||
${PYTHON_REQUIRED_USE}
|
||||
"
|
||||
|
||||
pkg_setup() {
|
||||
if ! use headless && ! use qt4 ; then
|
||||
einfo "No USE=\"qt4\" selected, this build will not include"
|
||||
einfo "any Qt frontend."
|
||||
elif use headless && use qt4 ; then
|
||||
einfo "You selected USE=\"headless qt4\", defaulting to"
|
||||
einfo "USE=\"headless\", this build will not include any X11/Qt frontend."
|
||||
fi
|
||||
|
||||
if ! use opengl ; then
|
||||
einfo "No USE=\"opengl\" selected, this build will lack"
|
||||
einfo "the OpenGL feature."
|
||||
fi
|
||||
if ! use python ; then
|
||||
einfo "You have disabled the \"python\" USE flag. This will only"
|
||||
einfo "disable the python bindings being installed."
|
||||
fi
|
||||
java-pkg-opt-2_pkg_setup
|
||||
python-single-r1_pkg_setup
|
||||
|
||||
tc-ld-disable-gold #bug 488176
|
||||
tc-export CC CXX LD AR RANLIB
|
||||
export HOST_CC="$(tc-getBUILD_CC)"
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
# Remove shipped binaries (kBuild,yasm), see bug #232775
|
||||
rm -r kBuild/bin tools || die
|
||||
|
||||
# Remove pointless GCC version limitations in check_gcc()
|
||||
sed -e "/\s*-o\s*\\\(\s*\$cc_maj\s*-eq\s*[5-9]\s*-a\s*\$cc_min\s*-gt\s*[0-5]\s*\\\)\s*\\\/d" \
|
||||
-i configure || die
|
||||
|
||||
# Disable things unused or split into separate ebuilds
|
||||
sed -e "s@MY_LIBDIR@$(get_libdir)@" \
|
||||
"${FILESDIR}"/${PN}-5-localconfig > LocalConfig.kmk || die
|
||||
|
||||
# Respect LDFLAGS
|
||||
sed -e "s@_LDFLAGS\.${ARCH}*.*=@& ${LDFLAGS}@g" \
|
||||
-i Config.kmk src/libs/xpcom18a4/Config.kmk || die
|
||||
|
||||
# Do not use hard-coded ld (related to bug #488176)
|
||||
sed -e '/QUIET)ld /s@ld @$(LD) @' \
|
||||
-i src/VBox/Devices/PC/ipxe/Makefile.kmk || die
|
||||
|
||||
# Use PAM only when pam USE flag is enbaled (bug #376531)
|
||||
if ! use pam ; then
|
||||
elog "Disabling PAM removes the possibility to use the VRDP features."
|
||||
sed -i 's@^.*VBOX_WITH_PAM@#VBOX_WITH_PAM@' Config.kmk || die
|
||||
sed -i 's@\(.*/auth/Makefile.kmk.*\)@#\1@' \
|
||||
src/VBox/HostServices/Makefile.kmk || die
|
||||
fi
|
||||
|
||||
# add correct java path
|
||||
if use java ; then
|
||||
sed "s@/usr/lib/jvm/java-6-sun@$(java-config -O)@" \
|
||||
-i "${S}"/Config.kmk || die
|
||||
java-pkg-opt-2_src_prepare
|
||||
fi
|
||||
|
||||
if ! gcc-specs-pie ; then
|
||||
rm "${WORKDIR}/patches/050_${PN}-5.0.2-nopie.patch" || die
|
||||
fi
|
||||
|
||||
eapply "${WORKDIR}/patches"
|
||||
|
||||
eapply_user
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local myconf
|
||||
use alsa || myconf+=( --disable-alsa )
|
||||
use debug && myconf+=( --build-debug )
|
||||
use doc || myconf+=( --disable-docs )
|
||||
use java || myconf+=( --disable-java )
|
||||
use lvm || myconf+=( --disable-devmapper )
|
||||
use opengl || myconf+=( --disable-opengl )
|
||||
use pulseaudio || myconf+=( --disable-pulse )
|
||||
use python || myconf+=( --disable-python )
|
||||
use vboxwebsrv && myconf+=( --enable-webservice )
|
||||
use vnc && myconf+=( --enable-vnc )
|
||||
if ! use headless ; then
|
||||
use qt4 || myconf+=( --disable-qt4 )
|
||||
else
|
||||
myconf+=( --build-headless --disable-opengl )
|
||||
fi
|
||||
if use amd64 && ! has_multilib_profile ; then
|
||||
myconf+=( --disable-vmmraw )
|
||||
fi
|
||||
# not an autoconf script
|
||||
./configure \
|
||||
--with-gcc="$(tc-getCC)" \
|
||||
--with-g++="$(tc-getCXX)" \
|
||||
--disable-dbus \
|
||||
--disable-kmods \
|
||||
${myconf[@]} \
|
||||
|| die "configure failed"
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
source ./env.sh || die
|
||||
|
||||
# Force kBuild to respect C[XX]FLAGS and MAKEOPTS (bug #178529)
|
||||
# and strip all flags
|
||||
# strip-flags
|
||||
|
||||
MAKEJOBS=$(echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+')
|
||||
MAKELOAD=$(echo ${MAKEOPTS} | egrep -o '(\-l|\-\-load-average)(=?|[[:space:]]*)[[:digit:]]+') #'
|
||||
MAKEOPTS="${MAKEJOBS} ${MAKELOAD}"
|
||||
MAKE="kmk" emake \
|
||||
VBOX_BUILD_PUBLISHER=_Gentoo \
|
||||
TOOL_GCC3_CC="$(tc-getCC)" TOOL_GCC3_CXX="$(tc-getCXX)" \
|
||||
TOOL_GCC3_AS="$(tc-getCC)" TOOL_GCC3_AR="$(tc-getAR)" \
|
||||
TOOL_GCC3_LD="$(tc-getCXX)" TOOL_GCC3_LD_SYSMOD="$(tc-getLD)" \
|
||||
TOOL_GCC3_CFLAGS="${CFLAGS}" TOOL_GCC3_CXXFLAGS="${CXXFLAGS}" \
|
||||
VBOX_GCC_OPT="${CXXFLAGS}" \
|
||||
TOOL_YASM_AS=yasm KBUILD_VERBOSE=2 \
|
||||
all
|
||||
}
|
||||
|
||||
src_install() {
|
||||
local binpath="release"
|
||||
use debug && binpath="debug"
|
||||
cd "${S}"/out/linux.${ARCH}/${binpath}/bin || die
|
||||
|
||||
local vbox_inst_path="/usr/$(get_libdir)/${PN}" each fwfile
|
||||
|
||||
vbox_inst() {
|
||||
local binary="${1}"
|
||||
local perms="${2:-0750}"
|
||||
local path="${3:-${vbox_inst_path}}"
|
||||
|
||||
[[ -n "${binary}" ]] || die "vbox_inst: No binray given!"
|
||||
[[ ${perms} =~ ^[[:digit:]]+{4}$ ]] || die "vbox_inst: perms must consist of four digits."
|
||||
|
||||
insinto ${path}
|
||||
doins ${binary}
|
||||
fowners root:vboxusers ${path}/${binary}
|
||||
fperms ${perms} ${path}/${binary}
|
||||
}
|
||||
|
||||
# Create configuration files
|
||||
insinto /etc/vbox
|
||||
newins "${FILESDIR}/${PN}-4-config" vbox.cfg
|
||||
|
||||
# Set the right libdir
|
||||
sed -i \
|
||||
-e "s@MY_LIBDIR@$(get_libdir)@" \
|
||||
"${D}"/etc/vbox/vbox.cfg || die "vbox.cfg sed failed"
|
||||
|
||||
# Install the wrapper script
|
||||
exeinto ${vbox_inst_path}
|
||||
newexe "${FILESDIR}/${PN}-ose-5-wrapper" "VBox"
|
||||
fowners root:vboxusers ${vbox_inst_path}/VBox
|
||||
fperms 0750 ${vbox_inst_path}/VBox
|
||||
|
||||
# Install binaries and libraries
|
||||
insinto ${vbox_inst_path}
|
||||
doins -r components
|
||||
|
||||
# *.rc files for x86_64 are only available on multilib systems
|
||||
local rcfiles="*.rc"
|
||||
if use amd64 && ! has_multilib_profile ; then
|
||||
rcfiles=""
|
||||
fi
|
||||
for each in VBox{ExtPackHelperApp,Manage,SVC,Tunctl,XPCOMIPCD} *so *r0 ${rcfiles} ; do
|
||||
vbox_inst ${each}
|
||||
done
|
||||
|
||||
# These binaries need to be suid root in any case.
|
||||
for each in VBox{Headless,Net{AdpCtl,DHCP,NAT}} ; do
|
||||
vbox_inst ${each} 4750
|
||||
done
|
||||
|
||||
# Install EFI Firmware files (bug #320757)
|
||||
pushd "${S}"/src/VBox/Devices/EFI/FirmwareBin &>/dev/null || die
|
||||
for fwfile in VBoxEFI{32,64}.fd ; do
|
||||
vbox_inst ${fwfile} 0644
|
||||
done
|
||||
popd &>/dev/null || die
|
||||
|
||||
# VBoxSVC and VBoxManage need to be pax-marked (bug #403453)
|
||||
# VBoxXPCOMIPCD (bug #524202)
|
||||
for each in VBox{Headless,Manage,SVC,XPCOMIPCD} ; do
|
||||
pax-mark -m "${D}"${vbox_inst_path}/${each}
|
||||
done
|
||||
|
||||
# Symlink binaries to the shipped wrapper
|
||||
for each in vbox{headless,manage} VBox{Headless,Manage,VRDP} ; do
|
||||
dosym ${vbox_inst_path}/VBox /usr/bin/${each}
|
||||
done
|
||||
dosym ${vbox_inst_path}/VBoxTunctl /usr/bin/VBoxTunctl
|
||||
|
||||
# VRDPAuth only works with this (bug #351949)
|
||||
dosym VBoxAuth.so ${vbox_inst_path}/VRDPAuth.so
|
||||
|
||||
# set an env-variable for 3rd party tools
|
||||
echo -n "VBOX_APP_HOME=${vbox_inst_path}" > "${T}/90virtualbox"
|
||||
doenvd "${T}/90virtualbox"
|
||||
|
||||
if ! use headless ; then
|
||||
vbox_inst VBoxSDL 4750
|
||||
pax-mark -m "${D}"${vbox_inst_path}/VBoxSDL
|
||||
|
||||
for each in vboxsdl VBoxSDL ; do
|
||||
dosym ${vbox_inst_path}/VBox /usr/bin/${each}
|
||||
done
|
||||
|
||||
if use opengl && use qt4 ; then
|
||||
vbox_inst VBoxTestOGL
|
||||
pax-mark -m "${D}"${vbox_inst_path}/VBoxTestOGL
|
||||
fi
|
||||
|
||||
if use qt4 ; then
|
||||
vbox_inst VirtualBox 4750
|
||||
pax-mark -m "${D}"${vbox_inst_path}/VirtualBox
|
||||
|
||||
for each in virtualbox VirtualBox ; do
|
||||
dosym ${vbox_inst_path}/VBox /usr/bin/${each}
|
||||
done
|
||||
|
||||
insinto /usr/share/${PN}
|
||||
doins -r nls
|
||||
|
||||
newmenu "${FILESDIR}"/${PN}-ose.desktop-2 ${PN}.desktop
|
||||
fi
|
||||
|
||||
pushd "${S}"/src/VBox/Artwork/OSE &>/dev/null || die
|
||||
for size in 16 32 48 64 128 ; do
|
||||
newicon -s ${size} ${PN}-${size}px.png ${PN}.png
|
||||
done
|
||||
newicon ${PN}-48px.png ${PN}.png
|
||||
doicon -s scalable ${PN}.svg
|
||||
popd &>/dev/null || die
|
||||
fi
|
||||
|
||||
if use lvm ; then
|
||||
vbox_inst VBoxVolInfo 4750
|
||||
dosym ${vbox_inst_path}/VBoxVolInfo /usr/bin/VBoxVolInfo
|
||||
fi
|
||||
|
||||
if use sdk ; then
|
||||
insinto ${vbox_inst_path}
|
||||
doins -r sdk
|
||||
|
||||
if use java ; then
|
||||
java-pkg_regjar "${D}${vbox_inst_path}/sdk/bindings/xpcom/java/vboxjxpcom.jar"
|
||||
java-pkg_regso "${D}${vbox_inst_path}/libvboxjxpcom.so"
|
||||
fi
|
||||
fi
|
||||
|
||||
if use udev ; then
|
||||
# New way of handling USB device nodes for VBox (bug #356215)
|
||||
local udevdir="$(get_udevdir)"
|
||||
insinto ${udevdir}
|
||||
doins VBoxCreateUSBNode.sh
|
||||
fowners root:vboxusers ${udevdir}/VBoxCreateUSBNode.sh
|
||||
fperms 0750 ${udevdir}/VBoxCreateUSBNode.sh
|
||||
insinto ${udevdir}/rules.d
|
||||
sed "s@%UDEVDIR%@${udevdir}@" "${FILESDIR}"/10-virtualbox.rules \
|
||||
> "${T}"/10-virtualbox.rules || die
|
||||
doins "${T}"/10-virtualbox.rules
|
||||
fi
|
||||
|
||||
if use vboxwebsrv ; then
|
||||
vbox_inst vboxwebsrv
|
||||
dosym ${vbox_inst_path}/VBox /usr/bin/vboxwebsrv
|
||||
newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
|
||||
newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
fdo-mime_desktop_database_update
|
||||
|
||||
if use udev ; then
|
||||
udevadm control --reload-rules \
|
||||
&& udevadm trigger --subsystem-match=usb
|
||||
fi
|
||||
|
||||
if ! use headless && use qt4 ; then
|
||||
elog "To launch VirtualBox just type: \"virtualbox\"."
|
||||
fi
|
||||
elog "You must be in the vboxusers group to use VirtualBox."
|
||||
elog ""
|
||||
elog "The latest user manual is available for download at:"
|
||||
elog "http://download.virtualbox.org/virtualbox/${PV}/UserManual.pdf"
|
||||
elog ""
|
||||
elog "For advanced networking setups you should emerge:"
|
||||
elog "net-misc/bridge-utils and sys-apps/usermode-utilities"
|
||||
elog ""
|
||||
elog "IMPORTANT!"
|
||||
elog "If you upgrade from app-emulation/virtualbox-ose make sure to run"
|
||||
elog "\"env-update\" as root and logout and relogin as the user you wish"
|
||||
elog "to run ${PN} as."
|
||||
elog ""
|
||||
elog "Starting with version 4.0.0, ${PN} has USB-1 support."
|
||||
elog "For USB-2 support, PXE-boot ability and VRDP support please emerge"
|
||||
elog " app-emulation/virtualbox-extpack-oracle"
|
||||
elog "package."
|
||||
elog "Starting with version 5.0.0, ${PN} no longer has the \"additions\" and"
|
||||
elog "the \"extension\" USE flag. For installation of the guest additions ISO"
|
||||
elog "image, please emerge"
|
||||
elog " app-emulation/virtualbox-additions"
|
||||
elog "and for the USB2, USB3, VRDP and PXE boot ROM modules, please emerge"
|
||||
elog " app-emulation/virtualbox-extpack-oracle"
|
||||
if ! use udev ; then
|
||||
elog ""
|
||||
elog "WARNING!"
|
||||
elog "Without USE=udev, USB devices will likely not work in ${PN}."
|
||||
elif [ -e "${ROOT}/etc/udev/rules.d/10-virtualbox.rules" ] ; then
|
||||
elog ""
|
||||
elog "Please remove \"${ROOT}/etc/udev/rules.d/10-virtualbox.rules\""
|
||||
elog "or else USB in ${PN} won't work."
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
fdo-mime_desktop_database_update
|
||||
}
|
||||
@ -1,47 +0,0 @@
|
||||
# Copyright 1999-2009 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
inherit autotools eutils
|
||||
|
||||
DESCRIPTION="An ncurses based app to show a scrolling screen from the Matrix"
|
||||
HOMEPAGE="http://www.asty.org/cmatrix"
|
||||
SRC_URI="http://www.asty.org/${PN}/dist/${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="alpha amd64 hppa ppc ~ppc64 sparc x86"
|
||||
IUSE="X"
|
||||
|
||||
DEPEND="X? ( x11-apps/mkfontdir )
|
||||
sys-libs/ncurses"
|
||||
|
||||
src_unpack() {
|
||||
unpack ${A}
|
||||
# patch Makefile.am to make sure the fonts installations don't violate the
|
||||
# sandbox.
|
||||
cd "${S}"
|
||||
epatch "${FILESDIR}"/${P}-gentoo.patch
|
||||
if use X ; then
|
||||
epatch "${FILESDIR}"/${P}-fontdir.patch
|
||||
fi
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
src_install() {
|
||||
dodir /usr/share/consolefonts || die 'dodir failed'
|
||||
dodir /usr/lib/kbd/consolefonts || die 'dodir failed'
|
||||
if use X;then
|
||||
dodir /usr/share/fonts/misc || die 'dodir failed'
|
||||
fi
|
||||
emake DESTDIR="${D}" install || die 'emake install failed'
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
if use X; then
|
||||
if [ -d "${ROOT}"usr/share/fonts/misc ] ; then
|
||||
einfo ">>> Running mkfontdir on ${ROOT}usr/share/fonts/misc"
|
||||
mkfontdir "${ROOT}"usr/share/fonts/misc || die 'mkfontdir failed'
|
||||
fi
|
||||
fi
|
||||
}
|
||||
@ -0,0 +1,47 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=6
|
||||
|
||||
inherit toolchain-funcs
|
||||
|
||||
DESCRIPTION="list executables"
|
||||
HOMEPAGE="http://tools.suckless.org/lsx"
|
||||
SRC_URI="http://suckless.org/download/${P}.tar.gz"
|
||||
|
||||
LICENSE="MIT"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
|
||||
DOCS=( README )
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
sed -i \
|
||||
-e "s/.*strip.*//" \
|
||||
Makefile || die "sed failed"
|
||||
|
||||
sed -i \
|
||||
-e "s/CFLAGS = -Os/CFLAGS +=/" \
|
||||
-e "s/LDFLAGS =/LDFLAGS +=/" \
|
||||
config.mk || die "sed failed"
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake CC=$(tc-getCC)
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake DESTDIR="${D}" PREFIX="/usr" install
|
||||
|
||||
# collision with net-dialup/lrzsz
|
||||
mv "${D}/usr/bin/${PN}" "${D}/usr/bin/${PN}-suckless" || die
|
||||
|
||||
einstalldocs
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
elog "Run ${PN} with ${PN}-suckless"
|
||||
}
|
||||
@ -1,4 +1,5 @@
|
||||
DIST Catch-1.5.6.tar.gz 312250 SHA256 1749521eb5c4b6e81128f60d66b81b8328e76050599a497dc8b51a718d03faca SHA512 da4f9c300bc7d9de66be4e0b013d4c5719ee6e112c1b949963fecf55d89d75605bad16d4763ebb4dbaee51dc8c85d2aeb8e7826388204f9d8057233231ff7b9a WHIRLPOOL 38ffdf58959ccb5201621eb4c16b6415b7a892803bc9bdcc134e7f61d82b285b9dfea1f2cf55529c72e0f96dc32696646f0b2d03e8532b03f44de28c3016c7d6
|
||||
DIST Catch-1.5.7.tar.gz 312824 SHA256 9acabf466e64ef2d477d4ce8d16610db3556a58b150440025fb1b25c3fd6a85b SHA512 724e85fbcb1a5ff8e98ef04932f7c60f43c0deaf4e41e4790cb7c0d9ead7b2e9068c801b165c094d68373b906c9d2d09de269bd7065dbd0136ecbb18ced4ccff WHIRLPOOL b0ce83cc75bbe40f3531c898fc273101a9992f5b7b43b9a483bf694b7c2fb079808f4330795fa1ae8bb5052fd55feb656245fc503f43217b42cf6239b620b167
|
||||
DIST Catch-1.5.8.tar.gz 312892 SHA256 08761b1930b37118b568838fd40eb6d113063c35ca8a37128298edd5559403a7 SHA512 18553b877ea6cbb48255f48bf025efc02dbc26f7895bf8f68391bc3417ae737ffab55e6b05c9c91c3d501ff581276cfd7678510db3333c5aff884d99bc38fb93 WHIRLPOOL f3c030e2a5b4beefdd00eee75a55052a92f07948cd8ce29da46cd83cd0a61991ca6cbf0ccd2ff89beee701a136b082a043a4dab9c140fcd0095905f518d99b6d
|
||||
DIST Catch-1.6.0.tar.gz 290987 SHA256 83532346983c43963cf89a69c1544be493e6b4cccaf20975e53f5cf2239b73a9 SHA512 6a9fbffd76d1fe6e4a2523c87e6ec6efcae66fc9db6dc5876b2839cfdb7c9918e8dc21b9b5ac4a545677c333659107c45f788d9a251f9d3bdd7731fd404132fe WHIRLPOOL 58257b3729f74f39034d9c9dccf178d0fe25c64f6b43ff606c52a0c2a8779b0ecd4b38b561e402bf4af70a52267d9499d5f22aab34755f02e20e04de4b9894f5
|
||||
DIST catch-1.5.0.tar.gz 311787 SHA256 f694634bc56422f28d61052eedc29d43ea20e60a1726eda3ff9acc8fdfca3c08 SHA512 d7011cdfe6eca86aa081b5da371665be8687bcbb41f3702c3075bf01f73e1d2e00894a0917e6437a8735e730ff287a06e189ce94ea00e583ab7282065f25166d WHIRLPOOL 90d7d6d2f4b06169224385e0f2ec0de1312c454a0c7a2a14155f68fe30424e527cde91e5fb4ff9bd441fa846a7caabca023e591ce5837f6c65f0bbe106166401
|
||||
|
||||
@ -0,0 +1,35 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=6
|
||||
|
||||
inherit cmake-utils
|
||||
|
||||
DESCRIPTION="Modern C++ header-only framework for unit-tests"
|
||||
HOMEPAGE="https://github.com/philsquared/Catch"
|
||||
SRC_URI="https://github.com/philsquared/Catch/archive/v${PV}.tar.gz -> ${P^}.tar.gz"
|
||||
|
||||
LICENSE="Boost-1.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE=""
|
||||
|
||||
S=${WORKDIR}/${P^}
|
||||
|
||||
# CMake is only used to build & run tests, so override phases
|
||||
src_configure() { :; }
|
||||
src_compile() { :; }
|
||||
|
||||
src_test() {
|
||||
cmake-utils_src_configure
|
||||
cmake-utils_src_compile
|
||||
cmake-utils_src_test
|
||||
}
|
||||
|
||||
src_install() {
|
||||
# same location as used in fedora
|
||||
insinto /usr/include/catch
|
||||
doins -r include/.
|
||||
dodoc -r docs/.
|
||||
}
|
||||
@ -1,123 +0,0 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=2
|
||||
inherit eutils toolchain-funcs
|
||||
|
||||
# Map Gentoo IUSE expand vars to DirectFB drivers
|
||||
# echo `sed -n '/Possible gfxdrivers are:/,/^$/{/Possible/d;s:\[ *::;s:\].*::;s:,::g;p}' configure.in`
|
||||
I_TO_D_intel="i810,i830"
|
||||
I_TO_D_mga="matrox"
|
||||
I_TO_D_r128="ati128"
|
||||
I_TO_D_s3="unichrome"
|
||||
I_TO_D_sis="sis315"
|
||||
I_TO_D_via="cle266"
|
||||
# cyber5k davinci ep9x gl omap pxa3xx sh772x
|
||||
IUSE_VIDEO_CARDS=" intel mach64 mga neomagic nsc nvidia r128 radeon s3 savage sis tdfx via vmware"
|
||||
IUV=${IUSE_VIDEO_CARDS// / video_cards_}
|
||||
# echo `sed -n '/Possible inputdrivers are:/,/^$/{/\(Possible\|^input\)/d;s:\[ *::;s:\].*::;s:,::g;p}' configure.in`
|
||||
I_TO_D_elo2300="elo-input"
|
||||
I_TO_D_evdev="linuxinput"
|
||||
I_TO_D_mouse="ps2mouse serialmouse"
|
||||
# dbox2remote dreamboxremote gunze h3600_ts penmount sonypijogdial ucb1x00 wm97xx zytronic
|
||||
IUSE_INPUT_DEVICES=" dynapro elo2300 evdev joystick keyboard lirc mouse mutouch tslib"
|
||||
IUD=${IUSE_INPUT_DEVICES// / input_devices_}
|
||||
|
||||
DESCRIPTION="Thin library on top of the Linux framebuffer devices"
|
||||
HOMEPAGE="http://www.directfb.net/"
|
||||
SRC_URI="http://directfb.net/downloads/Core/${PN}-${PV:0:3}/${P}.tar.gz
|
||||
http://directfb.net/downloads/Old/${P}.tar.gz"
|
||||
|
||||
LICENSE="LGPL-2.1"
|
||||
SLOT="0"
|
||||
KEYWORDS="alpha amd64 arm hppa ia64 -mips ppc ppc64 sh -sparc x86"
|
||||
IUSE="debug doc fbcon gif jpeg cpu_flags_x86_mmx png sdl cpu_flags_x86_sse static-libs truetype v4l X zlib ${IUV} ${IUD}"
|
||||
|
||||
RDEPEND="sdl? ( media-libs/libsdl )
|
||||
gif? ( media-libs/giflib )
|
||||
png? ( media-libs/libpng )
|
||||
jpeg? ( virtual/jpeg )
|
||||
zlib? ( sys-libs/zlib )
|
||||
truetype? ( >=media-libs/freetype-2.0.1 )
|
||||
X? ( x11-libs/libXext x11-libs/libX11 )"
|
||||
DEPEND="${RDEPEND}
|
||||
X? ( x11-proto/xextproto x11-proto/xproto )"
|
||||
|
||||
src_prepare() {
|
||||
epatch \
|
||||
"${FILESDIR}"/${PN}-1.2.7-CFLAGS.patch \
|
||||
"${FILESDIR}"/${PN}-1.2.0-headers.patch \
|
||||
"${FILESDIR}"/${PN}-1.1.1-pkgconfig.patch \
|
||||
"${FILESDIR}"/${PN}-1.4.9-libpng-1.5.patch
|
||||
|
||||
# the media subdir uses sqrt(), so make sure it links in -lm
|
||||
sed -i \
|
||||
-e '/libdirectfb_media_la_LIBADD/s:$: -lm:' \
|
||||
src/media/Makefile.in || die
|
||||
|
||||
# Avoid invoking `ld` directly #300779
|
||||
find . -name Makefile.in -exec sed -i \
|
||||
'/[$](LD)/s:$(LD) -o $@ -r:$(CC) $(LDFLAGS) $(CFLAGS) -Wl,-r -nostdlib -o $@:' {} +
|
||||
}
|
||||
|
||||
driver_list() {
|
||||
local pfx=$1
|
||||
local dev devs map
|
||||
shift
|
||||
for dev in "$@" ; do
|
||||
use ${pfx}_${dev} || continue
|
||||
map="I_TO_D_${dev}"
|
||||
devs=${devs:+${devs},}${!map:-${dev}}
|
||||
done
|
||||
echo ${devs:-none}
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local sdlconf="--disable-sdl"
|
||||
if use sdl ; then
|
||||
# since SDL can link against DirectFB and trigger a
|
||||
# dependency loop, only link against SDL if it isn't
|
||||
# broken #61592
|
||||
echo 'int main(){}' > sdl-test.c
|
||||
$(tc-getCC) sdl-test.c -lSDL 2>/dev/null \
|
||||
&& sdlconf="--enable-sdl" \
|
||||
|| ewarn "Disabling SDL since libSDL.so is broken"
|
||||
fi
|
||||
|
||||
econf \
|
||||
--disable-dependency-tracking \
|
||||
$(use_enable static-libs static) \
|
||||
$(use_enable X x11) \
|
||||
$(use_enable fbcon fbdev) \
|
||||
$(use_enable cpu_flags_x86_mmx mmx) \
|
||||
$(use_enable cpu_flags_x86_sse sse) \
|
||||
$(use_enable jpeg) \
|
||||
$(use_enable png) \
|
||||
$(use_enable gif) \
|
||||
$(use_enable truetype freetype) \
|
||||
$(use_enable debug) \
|
||||
$(use_enable zlib) \
|
||||
--disable-video4linux \
|
||||
$(use_enable v4l video4linux2) \
|
||||
${sdlconf} \
|
||||
--with-gfxdrivers="$(driver_list video_cards ${IUSE_VIDEO_CARDS})" \
|
||||
--with-inputdrivers="$(driver_list input_devices ${IUSE_INPUT_DEVICES})" \
|
||||
--disable-vnc
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake DESTDIR="${D}" install || die "make install failed"
|
||||
dodoc fb.modes AUTHORS ChangeLog NEWS README* TODO
|
||||
use doc && dohtml -r docs/html/*
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
ewarn "Each DirectFB update breaks DirectFB related applications."
|
||||
ewarn "Please run \"revdep-rebuild\" which can be"
|
||||
ewarn "found by emerging the package 'gentoolkit'."
|
||||
ewarn
|
||||
ewarn "If you have an ALPS touchpad, then you might get your mouse"
|
||||
ewarn "unexpectedly set in absolute mode in all DirectFB applications."
|
||||
ewarn "This can be fixed by removing linuxinput from INPUT_DEVICES."
|
||||
}
|
||||
@ -1,2 +1 @@
|
||||
DIST DirectFB-1.4.9.tar.gz 3095137 SHA256 988a40dbc81fe1ecaf69a3581ed49bf4f6bbb584cb54de24cba154d3ada7a228 SHA512 ec7e03f9f3bfffafd0d84676b79845fabe59d61ac278adf4e3cd03562638529a24ff76bd606c881926cae335da00f71541e2245d0aecd4af957b95ea66c7d969 WHIRLPOOL 310c079e0f396828ddfdec0695e26a04fbea2a8a9fd90066212cf70e94a371c8b0f8b29141374db788ac247a92d01e19b0d1ddc36c78beefb6cef5aeefd173e1
|
||||
DIST DirectFB-1.7.6.tar.gz 5975444 SHA256 44f32bacfb842ea234599532f8481fe41b5bd2310d2bd101508eb3a5df26c9e1 SHA512 18cf1aad6c277a6de147a9b0aff1cd7408ddd7c7159ef21dab9a548db7399c681603624e7820b186a29e03edaa7737350a61e2abaec572887e9cc56658bf85a2 WHIRLPOOL 2868906bbd2b4e681c6702f164f7ba4f01a0f538aea0c744c6e77ce32b274a967232ef0046ec21b74c9c53c4824182e632159cca5ea0c7c27292cb258257d6a8
|
||||
|
||||
@ -1,22 +0,0 @@
|
||||
http://bugs.gentoo.org/200661
|
||||
|
||||
--- DirectFB/directfb-config.in
|
||||
+++ DirectFB/directfb-config.in
|
||||
@@ -306,7 +306,7 @@
|
||||
libs="$libs -ldirectfb -lfusion -ldirect @THREADLIB@"
|
||||
|
||||
if test -n "$echo_static"; then
|
||||
- libs="$libs @DYNLIB@ @ZLIB_LIBS@"
|
||||
+ libs="$libs @DYNLIB@ @ZLIB_LIBS@ @SYSFS_LIBS@"
|
||||
fi
|
||||
fi
|
||||
|
||||
--- DirectFB/directfb.pc.in
|
||||
+++ DirectFB/directfb.pc.in
|
||||
@@ -8,5 +8,5 @@
|
||||
Version: @VERSION@
|
||||
Requires: fusion direct
|
||||
Libs: -L${libdir} -ldirectfb @THREADLIB@ @OSX_LIBS@
|
||||
-Libs.private: -L${libdir} @DYNLIB@ @ZLIB_LIBS@
|
||||
+Libs.private: -L${libdir} @DYNLIB@ @ZLIB_LIBS@ @SYSFS_LIBS@
|
||||
Cflags: @THREADFLAGS@ -I@INCLUDEDIR@
|
||||
@ -1,16 +0,0 @@
|
||||
Don't rely on the kernel to tell us what the cpu target is ... we'll just
|
||||
use the default values all the time instead.
|
||||
|
||||
http://bugs.gentoo.org/152614
|
||||
|
||||
--- lib/direct/ppcasm_memcpy_cachable.S
|
||||
+++ lib/direct/ppcasm_memcpy_cachable.S
|
||||
@@ -34,8 +34,6 @@
|
||||
|
||||
#define __ASSEMBLY__
|
||||
|
||||
-#include <linux/config.h>
|
||||
-
|
||||
#if defined(CONFIG_8xx) || defined(CONFIG_403GCX)
|
||||
#define L1_CACHE_LINE_SIZE 16
|
||||
#define LG_L1_CACHE_LINE_SIZE 4
|
||||
@ -1,19 +0,0 @@
|
||||
--- DirectFB-1.2.7/configure
|
||||
+++ DirectFB-1.2.7/configure
|
||||
@@ -22953,8 +22953,6 @@
|
||||
CFLAGS=
|
||||
fi
|
||||
|
||||
-CFLAGS="-O3 -ffast-math -pipe $CFLAGS"
|
||||
-
|
||||
DFB_INTERNAL_CFLAGS="-D_GNU_SOURCE $DFB_INTERNAL_CFLAGS"
|
||||
|
||||
# Check whether --enable-extra-warnings was given.
|
||||
@@ -23622,7 +23620,6 @@
|
||||
fi
|
||||
|
||||
if test "$enable_debug" = "yes"; then
|
||||
- CFLAGS="$CFLAGS -g3 -fno-inline -Wno-inline"
|
||||
DIRECT_BUILD_DEBUG=1
|
||||
else
|
||||
DIRECT_BUILD_DEBUG=0
|
||||
@ -1,244 +0,0 @@
|
||||
From 83180b25e90721e717bf37c5332c22713508786e Mon Sep 17 00:00:00 2001
|
||||
From: Mike Frysinger <vapier@gentoo.org>
|
||||
Date: Sun, 20 Feb 2011 19:18:19 -0500
|
||||
Subject: [PATCH] png: add support for libpng 1.5.x
|
||||
|
||||
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
|
||||
---
|
||||
.../idirectfbimageprovider_png.c | 56 ++++++++++++-------
|
||||
1 files changed, 35 insertions(+), 21 deletions(-)
|
||||
|
||||
diff --git a/interfaces/IDirectFBImageProvider/idirectfbimageprovider_png.c b/interfaces/IDirectFBImageProvider/idirectfbimageprovider_png.c
|
||||
index 6d65ea3..7d82c5c 100644
|
||||
--- a/interfaces/IDirectFBImageProvider/idirectfbimageprovider_png.c
|
||||
+++ b/interfaces/IDirectFBImageProvider/idirectfbimageprovider_png.c
|
||||
@@ -207,7 +207,7 @@ Construct( IDirectFBImageProvider *thiz,
|
||||
if (!data->png_ptr)
|
||||
goto error;
|
||||
|
||||
- if (setjmp( data->png_ptr->jmpbuf )) {
|
||||
+ if (setjmp( png_jmpbuf( data->png_ptr ))) {
|
||||
D_ERROR( "ImageProvider/PNG: Error reading header!\n" );
|
||||
goto error;
|
||||
}
|
||||
@@ -292,7 +292,7 @@ IDirectFBImageProvider_PNG_RenderTo( IDirectFBImageProvider *thiz,
|
||||
rect = dst_data->area.wanted;
|
||||
}
|
||||
|
||||
- if (setjmp( data->png_ptr->jmpbuf )) {
|
||||
+ if (setjmp( png_jmpbuf( data->png_ptr ))) {
|
||||
D_ERROR( "ImageProvider/PNG: Error during decoding!\n" );
|
||||
|
||||
if (data->stage < STAGE_IMAGE)
|
||||
@@ -327,6 +327,7 @@ IDirectFBImageProvider_PNG_RenderTo( IDirectFBImageProvider *thiz,
|
||||
}
|
||||
else {
|
||||
CoreSurfaceBufferLock lock;
|
||||
+ png_byte bit_depth = png_get_bit_depth( data->png_ptr, data->info_ptr );
|
||||
|
||||
ret = dfb_surface_lock_buffer( dst_surface, CSBR_BACK, CSAID_CPU, CSAF_WRITE, &lock );
|
||||
if (ret)
|
||||
@@ -334,7 +335,7 @@ IDirectFBImageProvider_PNG_RenderTo( IDirectFBImageProvider *thiz,
|
||||
|
||||
switch (data->color_type) {
|
||||
case PNG_COLOR_TYPE_PALETTE:
|
||||
- if (dst_surface->config.format == DSPF_LUT8 && data->info_ptr->bit_depth == 8) {
|
||||
+ if (dst_surface->config.format == DSPF_LUT8 && bit_depth == 8) {
|
||||
/*
|
||||
* Special indexed PNG to LUT8 loading.
|
||||
*/
|
||||
@@ -377,7 +378,7 @@ IDirectFBImageProvider_PNG_RenderTo( IDirectFBImageProvider *thiz,
|
||||
}
|
||||
else {
|
||||
if (data->color_type == PNG_COLOR_TYPE_GRAY) {
|
||||
- int num = 1 << data->info_ptr->bit_depth;
|
||||
+ int num = 1 << bit_depth;
|
||||
|
||||
for (x=0; x<num; x++) {
|
||||
int value = x * 255 / (num - 1);
|
||||
@@ -386,7 +387,7 @@ IDirectFBImageProvider_PNG_RenderTo( IDirectFBImageProvider *thiz,
|
||||
}
|
||||
}
|
||||
|
||||
- switch (data->info_ptr->bit_depth) {
|
||||
+ switch (bit_depth) {
|
||||
case 8:
|
||||
for (y=0; y<data->height; y++) {
|
||||
u8 *S = data->image + data->pitch * y;
|
||||
@@ -441,7 +442,7 @@ IDirectFBImageProvider_PNG_RenderTo( IDirectFBImageProvider *thiz,
|
||||
|
||||
default:
|
||||
D_ERROR( "ImageProvider/PNG: Unsupported indexed bit depth %d!\n",
|
||||
- data->info_ptr->bit_depth );
|
||||
+ bit_depth );
|
||||
}
|
||||
|
||||
dfb_scale_linear_32( image_argb, data->width, data->height,
|
||||
@@ -594,16 +595,26 @@ png_info_callback( png_structp png_read_ptr,
|
||||
NULL, NULL, NULL );
|
||||
|
||||
if (png_get_valid( data->png_ptr, data->info_ptr, PNG_INFO_tRNS )) {
|
||||
+ png_bytep trans;
|
||||
+ png_color_16p trans_color;
|
||||
+ int num_trans;
|
||||
+
|
||||
+ png_get_tRNS( data->png_ptr, data->info_ptr, &trans, &num_trans, &trans_color );
|
||||
+
|
||||
data->color_keyed = true;
|
||||
|
||||
/* generate color key based on palette... */
|
||||
if (data->color_type == PNG_COLOR_TYPE_PALETTE) {
|
||||
u32 key;
|
||||
- png_colorp palette = data->info_ptr->palette;
|
||||
- png_bytep trans = data->info_ptr->trans_alpha;
|
||||
- int num_colors = MIN( MAXCOLORMAPSIZE,
|
||||
- data->info_ptr->num_palette );
|
||||
- u8 cmap[3][num_colors];
|
||||
+ png_colorp palette;
|
||||
+ int num_colors;
|
||||
+ u8 *cmap[3];
|
||||
+
|
||||
+ png_get_PLTE( data->png_ptr, data->info_ptr, &palette, &num_colors );
|
||||
+ num_colors = MIN( MAXCOLORMAPSIZE, num_colors );
|
||||
+ cmap[0] = alloca (num_colors);
|
||||
+ cmap[1] = alloca (num_colors);
|
||||
+ cmap[2] = alloca (num_colors);
|
||||
|
||||
for (i=0; i<num_colors; i++) {
|
||||
cmap[0][i] = palette[i].red;
|
||||
@@ -613,7 +624,7 @@ png_info_callback( png_structp png_read_ptr,
|
||||
|
||||
key = FindColorKey( num_colors, &cmap[0][0] );
|
||||
|
||||
- for (i=0; i<data->info_ptr->num_trans; i++) {
|
||||
+ for (i=0; i<num_trans; i++) {
|
||||
if (!trans[i]) {
|
||||
palette[i].red = (key & 0xff0000) >> 16;
|
||||
palette[i].green = (key & 0x00ff00) >> 8;
|
||||
@@ -625,20 +636,23 @@ png_info_callback( png_structp png_read_ptr,
|
||||
}
|
||||
else {
|
||||
/* ...or based on trans rgb value */
|
||||
- png_color_16p trans = &data->info_ptr->trans_color;
|
||||
-
|
||||
- data->color_key = (((trans->red & 0xff00) << 8) |
|
||||
- ((trans->green & 0xff00)) |
|
||||
- ((trans->blue & 0xff00) >> 8));
|
||||
+ data->color_key = (((trans_color->red & 0xff00) << 8) |
|
||||
+ ((trans_color->green & 0xff00)) |
|
||||
+ ((trans_color->blue & 0xff00) >> 8));
|
||||
}
|
||||
}
|
||||
|
||||
switch (data->color_type) {
|
||||
case PNG_COLOR_TYPE_PALETTE: {
|
||||
- png_colorp palette = data->info_ptr->palette;
|
||||
- png_bytep trans = data->info_ptr->trans_alpha;
|
||||
- int num_trans = data->info_ptr->num_trans;
|
||||
- int num_colors = MIN( MAXCOLORMAPSIZE, data->info_ptr->num_palette );
|
||||
+ png_colorp palette;
|
||||
+ png_bytep trans;
|
||||
+ png_color_16p trans_color;
|
||||
+ int num_trans;
|
||||
+ int num_colors;
|
||||
+
|
||||
+ png_get_PLTE( data->png_ptr, data->info_ptr, &palette, &num_colors );
|
||||
+ num_colors = MIN( MAXCOLORMAPSIZE, num_colors );
|
||||
+ png_get_tRNS( data->png_ptr, data->info_ptr, &trans, &num_trans, &trans_color );
|
||||
|
||||
for (i=0; i<num_colors; i++) {
|
||||
data->colors[i].a = (i < num_trans) ? trans[i] : 0xff;
|
||||
--
|
||||
1.7.4.1
|
||||
|
||||
From 7a2a36fada3ecdd7f48fcfd782a552598477a8f5 Mon Sep 17 00:00:00 2001
|
||||
From: Mike Frysinger <vapier@gentoo.org>
|
||||
Date: Sun, 20 Feb 2011 19:38:50 -0500
|
||||
Subject: [PATCH] tools: add support for libpng 1.5.x
|
||||
|
||||
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
|
||||
---
|
||||
tools/directfb-csource.c | 20 +++++++++++++-------
|
||||
tools/mkdfiff.c | 2 +-
|
||||
tools/mkdgifft.cpp | 2 +-
|
||||
3 files changed, 15 insertions(+), 9 deletions(-)
|
||||
|
||||
diff --git a/tools/directfb-csource.c b/tools/directfb-csource.c
|
||||
index 8f2cbf0..487ea3c 100644
|
||||
--- a/tools/directfb-csource.c
|
||||
+++ b/tools/directfb-csource.c
|
||||
@@ -338,7 +338,7 @@ static DFBResult load_image (const char *filename,
|
||||
if (!png_ptr)
|
||||
goto cleanup;
|
||||
|
||||
- if (setjmp (png_ptr->jmpbuf)) {
|
||||
+ if (setjmp (png_jmpbuf (png_ptr))) {
|
||||
if (desc->preallocated[0].data) {
|
||||
free (desc->preallocated[0].data);
|
||||
desc->preallocated[0].data = NULL;
|
||||
@@ -405,17 +405,22 @@ static DFBResult load_image (const char *filename,
|
||||
}
|
||||
|
||||
switch (src_format) {
|
||||
- case DSPF_LUT8:
|
||||
- if (info_ptr->num_palette) {
|
||||
+ case DSPF_LUT8: {
|
||||
+ png_colorp png_palette;
|
||||
+ int num_palette;
|
||||
+
|
||||
+ png_get_PLTE( png_ptr, info_ptr, &png_palette, &num_palette );
|
||||
+
|
||||
+ if (num_palette) {
|
||||
png_byte *alpha;
|
||||
int i, num;
|
||||
|
||||
- *palette_size = MIN (info_ptr->num_palette, 256);
|
||||
+ *palette_size = MIN (num_palette, 256);
|
||||
for (i = 0; i < *palette_size; i++) {
|
||||
palette[i].a = 0xFF;
|
||||
- palette[i].r = info_ptr->palette[i].red;
|
||||
- palette[i].g = info_ptr->palette[i].green;
|
||||
- palette[i].b = info_ptr->palette[i].blue;
|
||||
+ palette[i].r = png_palette[i].red;
|
||||
+ palette[i].g = png_palette[i].green;
|
||||
+ palette[i].b = png_palette[i].blue;
|
||||
}
|
||||
if (png_get_valid (png_ptr, info_ptr, PNG_INFO_tRNS)) {
|
||||
png_get_tRNS (png_ptr, info_ptr, &alpha, &num, NULL);
|
||||
@@ -424,6 +429,7 @@ static DFBResult load_image (const char *filename,
|
||||
}
|
||||
}
|
||||
break;
|
||||
+ }
|
||||
case DSPF_RGB32:
|
||||
png_set_filler (png_ptr, 0xFF,
|
||||
#ifdef WORDS_BIGENDIAN
|
||||
diff --git a/tools/mkdfiff.c b/tools/mkdfiff.c
|
||||
index 68a3b4f..edb58a7 100644
|
||||
--- a/tools/mkdfiff.c
|
||||
+++ b/tools/mkdfiff.c
|
||||
@@ -97,7 +97,7 @@ load_image (const char *filename,
|
||||
if (!png_ptr)
|
||||
goto cleanup;
|
||||
|
||||
- if (setjmp (png_ptr->jmpbuf)) {
|
||||
+ if (setjmp (png_jmpbuf (png_ptr))) {
|
||||
if (desc->preallocated[0].data) {
|
||||
free (desc->preallocated[0].data);
|
||||
desc->preallocated[0].data = NULL;
|
||||
diff --git a/tools/mkdgifft.cpp b/tools/mkdgifft.cpp
|
||||
index 96e4220..d4b6bf4 100644
|
||||
--- a/tools/mkdgifft.cpp
|
||||
+++ b/tools/mkdgifft.cpp
|
||||
@@ -595,7 +595,7 @@ load_image (const char *filename,
|
||||
if (!png_ptr)
|
||||
goto cleanup;
|
||||
|
||||
- if (setjmp (png_ptr->jmpbuf)) {
|
||||
+ if (setjmp (png_jmpbuf (png_ptr))) {
|
||||
if (desc->preallocated[0].data) {
|
||||
free (desc->preallocated[0].data);
|
||||
desc->preallocated[0].data = NULL;
|
||||
--
|
||||
1.7.4.1
|
||||
|
||||
@ -0,0 +1,55 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
inherit eutils udev
|
||||
|
||||
DESCRIPTION="Library to handle input devices in Wayland"
|
||||
HOMEPAGE="https://www.freedesktop.org/wiki/Software/libinput/"
|
||||
SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
|
||||
|
||||
LICENSE="MIT"
|
||||
SLOT="0/10"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
|
||||
IUSE="input_devices_wacom test"
|
||||
# Tests require write access to udev rules directory which is a no-no for live system.
|
||||
# Other tests are just about logs, exported symbols and autotest of the test library.
|
||||
RESTRICT="test"
|
||||
|
||||
RDEPEND="
|
||||
input_devices_wacom? ( >=dev-libs/libwacom-0.12 )
|
||||
>=dev-libs/libevdev-0.4
|
||||
>=sys-libs/mtdev-1.1
|
||||
virtual/libudev
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
virtual/pkgconfig"
|
||||
# test? (
|
||||
# >=dev-libs/check-0.9.10
|
||||
# dev-util/valgrind
|
||||
# sys-libs/libunwind )
|
||||
|
||||
src_prepare() {
|
||||
# Doc handling in kinda strange but everything
|
||||
# is available in the tarball already.
|
||||
sed -e 's/^\(SUBDIRS =.*\)doc\(.*\)$/\1\2/' \
|
||||
-i Makefile.am Makefile.in || die
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
# gui can be built but will not be installed
|
||||
# building documentation silently fails with graphviz syntax errors
|
||||
econf \
|
||||
--disable-documentation \
|
||||
--disable-event-gui \
|
||||
$(use_enable input_devices_wacom libwacom) \
|
||||
$(use_enable test tests) \
|
||||
--with-udev-dir="$(get_udevdir)"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake install DESTDIR="${D}"
|
||||
dodoc -r doc/html
|
||||
prune_libtool_files
|
||||
}
|
||||
@ -0,0 +1,21 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=6
|
||||
DIST_AUTHOR=KMX
|
||||
DIST_VERSION=0.19
|
||||
inherit perl-module
|
||||
|
||||
DESCRIPTION='Digital Signature Algorithm using OpenSSL'
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="libressl"
|
||||
|
||||
RDEPEND="
|
||||
!libressl? ( dev-libs/openssl:0 )
|
||||
libressl? ( dev-libs/libressl )
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
virtual/perl-ExtUtils-MakeMaker
|
||||
"
|
||||
@ -1,2 +1,3 @@
|
||||
DIST Crypt-OpenSSL-DSA-0.15.tar.gz 7688 SHA256 fe75c0436155e2ed5948c3ee2b4f844cf4c5ae54a07d1a931d09640d175eff34 SHA512 bbc9d3eb487fca1c97a5b843e6d109da0559582ef9063daf9272ff748a5443421a8c81532e522280eaf9434cf79cd9856b6051fcf0ae8ad39ead2dc0f66842dc WHIRLPOOL 96c571f4d7a4a7fd8c270a1f7b81f88e420c17f0a9fb5a65ded3aa5dfb28eebc44a61ef5541e813b7b75715554974020dccf3661062a84df5a82b9b25f7b1109
|
||||
DIST Crypt-OpenSSL-DSA-0.18.tar.gz 9178 SHA256 ab4ae301b4835676aa6d2d7d36f882472a21795b68f42441a6ad6f2bbe228080 SHA512 00d7026158a96fcd276aa61ddd5f16b110d223723d9e8823659febdf55be9f1cae7ae0c4c0c7e9314148cc042fb57c0f62b6d34b56e2fa1c41832bf6d72d3b3d WHIRLPOOL 2fbaa77ca96b4bb5fc1abf68f4fa0d5cd4b81bd7b7e3a486b1f84980c80b70c250d13aa5ea88c02f575f54b96ea6717dd79fb89a8c7d921b8101bb82c8652899
|
||||
DIST Crypt-OpenSSL-DSA-0.19.tar.gz 9244 SHA256 ca3c06fb3c9e3895acf7bdc02300335987776fe90fee96d74d230b93b22be00a SHA512 92306a04dc821b7b5f81331c362c6d478df8c118c1cb62591cf7b369029a67dbdd2798e239cead8f1faf2b79e259e906b70ea8fbc38b457b1eb897468d61c839 WHIRLPOOL 3a23877a44acf70509e2c31febfe973e9a805cd5d5e6a093a8c8739fe271a1b823b38a7d57993977bf97cce7eaec4f9a4c2c5bc5dd441f0b282dced0020b8266
|
||||
|
||||
@ -1,49 +0,0 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=6
|
||||
|
||||
DIST_A_EXT=tgz
|
||||
DIST_AUTHOR=RSAVAGE
|
||||
DIST_VERSION=2.20
|
||||
inherit perl-module
|
||||
|
||||
DESCRIPTION="GraphViz - Interface to the GraphViz graphing tool"
|
||||
|
||||
LICENSE="Artistic-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="test"
|
||||
|
||||
RDEPEND="
|
||||
media-gfx/graphviz
|
||||
virtual/perl-Carp
|
||||
>=virtual/perl-Getopt-Long-2.340.0
|
||||
virtual/perl-IO
|
||||
>=dev-perl/IPC-Run-0.600.0
|
||||
>=dev-perl/libwww-perl-6
|
||||
>=dev-perl/Parse-RecDescent-1.965.1
|
||||
>=virtual/perl-Time-HiRes-1.510.0
|
||||
>=dev-perl/XML-Twig-3.380.0
|
||||
>=dev-perl/XML-XPath-1.130.0
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
>=dev-perl/Module-Build-0.421.100
|
||||
>=dev-perl/File-Which-1.90.0
|
||||
test? (
|
||||
>=virtual/perl-Test-Simple-1.1.14
|
||||
)
|
||||
"
|
||||
|
||||
src_install() {
|
||||
perl-module_src_install
|
||||
|
||||
insinto /usr/share/doc/${PF}/examples
|
||||
doins "${S}"/examples/*
|
||||
}
|
||||
|
||||
src_test() {
|
||||
perl_rm_files t/pod.t
|
||||
perl-module_src_test
|
||||
}
|
||||
@ -1,3 +1,2 @@
|
||||
DIST GraphViz-2.19.tgz 86529 SHA256 27c7761d18ca739a5e35b9e55135b1f3c6f399a474116216037405826d781ce3 SHA512 2b566b0fc83ca48fe39cf677db6934045f1a35e821348be5b23c9cacd687e192fdfbb55a64a0d69084fbd0582dbca1b94a7fa6f52ec5bedbcf75e7d851e8672b WHIRLPOOL 9f49b57a319c99b55ac7be86cde3fa4f67127a7940ca93c0cc978880a7ea993dd4fafc688873410d4a775093447720ea341fed736a7c0375f84c70ddbaa7c559
|
||||
DIST GraphViz-2.20.tgz 86556 SHA256 23eec8c7e0bfada7b1a172b79e87bdd759fc3360c594159fdc228578aff41a5c SHA512 799651d0643bb326927d749b9ca6f35977d7b9ec4ff044a5b965229a3e9b773c7227b5f24cacf2b765f73126b68529cd75a84c7a646b5009e374c485ce4bb5ac WHIRLPOOL f6030ef3e7d256f3b9473277dacdecea0728db8b21c6e9cba4ede1b8874aadc062a8341959ff6b5e30d8d6fd63fe7bf660ee4143a061a248385b3802d5259772
|
||||
DIST GraphViz-2.23.tgz 95297 SHA256 7207f9279377cd7d6c21e72412f12522a305fd655ed9dcffd184038f4f7639dc SHA512 3b5f431c6436477674b06ed94bd977a5135800fe26dd8a307ef681b16009dec5b423861c1c11c9583d0c7f5b8920fec1f2469977ffd19dbfc88aa97fd180ee0f WHIRLPOOL 1c745e8566f6e4195e50eb5d39fbf80b2788dfc507157b5f91171d40ab6c82177a85bed77a8f9b76fa2380bf6813716cc5992902e49496007a405ee3eb565d9e
|
||||
DIST GraphViz-2.24.tgz 95475 SHA256 d95efac4cdeedb18283100efe3e00c59c1add524d9ce88c1c8a358359122f5ad SHA512 b37d1303c243a306443d5adf35d597f4e259cedaa7956d80bdb47cba811ce94e63da6b42a23d192fa9da628d999f1c023911f3f956a575aeabe673f77f3f01d9 WHIRLPOOL fb80ea2af412054e2c291ee5fc834cab9eb81c46301e26ba6c55b6b0187a36608ce26827cccb37b9da0a2054afa8c44c831b9a1db892862c9388b37452e915a9
|
||||
|
||||
@ -1,2 +1,3 @@
|
||||
DIST Regexp-Common-2013031301.tar.gz 115724 SHA256 729a8198d264aa64ecbb233ff990507f97fbb66bda746b95f3286f50f5f25c84 SHA512 2fad761c169be76771856938a53f28dab232cb44cea4e22f56869754633f9a38f94568096ac0f21a885e6dd11049f401c8957b04929eee6802b8454c4fe4f62a WHIRLPOOL 6879d3f4ec48f55554b8f41d1de56f541156182eaa7f257a0ee76ee21c81a78e5fa9270da296da2ce97490cb6c67d0e6815a3b32ec152e6a3cc6e561b864443c
|
||||
DIST Regexp-Common-2016020301.tar.gz 119181 SHA256 ccdcb6ca034b2948f2efa042c75aff9edee355b800a81943432efcca95fa7e59 SHA512 20b773015b6c604e5811ea030802605a9e71c9049342a8b88e4d45de310a2f7df468ac4c5b79102870abc290777bccadf380299c64c944aa6fe01f31596a9da0 WHIRLPOOL ce56276ef7b25d5f98a7249630a2c69bb3d78ab028ad18ed39e903d3ee7100e457b54526f63ef101909f25a2b622321d49b3e3592615c764bdc421e42954878f
|
||||
DIST Regexp-Common-2016060801.tar.gz 237712 SHA256 fc2fc178facf0292974d6511bad677dd038fe60d7ac118e3b83a1ca9e98a8403 SHA512 2c1ab9c6efd412d9b071ef80ccfb11fb5de5e4d9d8973efd5f34ad50bf046766ec9fa2851c151a05a3418d07e3ae35e80bb023e41346cb7362c9aee462eb047a WHIRLPOOL 6638a47df9de9108f30a5d40aede1eb18fef68f03fa5a2b1145dc3bd6c8290671150074624b4e3669acbe5656fcf1ce1c7023fe8dee2ea00f6518dd35fdd903d
|
||||
|
||||
@ -0,0 +1,24 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=6
|
||||
|
||||
inherit versionator
|
||||
|
||||
DIST_AUTHOR=ABIGAIL
|
||||
DIST_VERSION=$(get_major_version)
|
||||
|
||||
inherit perl-module
|
||||
|
||||
DESCRIPTION="Provide commonly requested regular expressions"
|
||||
|
||||
LICENSE="|| ( Artistic Artistic-2 MIT BSD )"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~arm ~x86"
|
||||
IUSE="test"
|
||||
|
||||
DEPEND="
|
||||
virtual/perl-ExtUtils-MakeMaker
|
||||
test? ( dev-perl/Test-Regexp )
|
||||
"
|
||||
@ -1 +0,0 @@
|
||||
DIST ffmpeg-php-0.6.0.tbz2 275557 SHA256 ec8a9847e0f4d5101a5afedb7dac318e9a13f099865215ae99d08d56add9b141 SHA512 837c854870886486683cf9d3ac2de376f0b4067487d68d4f5c685dd0bd4d306e406334821140bd1fab2d48105e7ee17956db70f2f70fb9bec4dcea14a2104127 WHIRLPOOL b390017ae6d7db3a7e40847468abfb9c151571e878545d02550c854d1f319add693cf87afe3391b03f3f2399a78ac225c0dcc28cdfbac2b58baa8ba8ef871605
|
||||
@ -1,48 +0,0 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI="5"
|
||||
|
||||
PHP_EXT_NAME="ffmpeg"
|
||||
PHP_EXT_INI="yes"
|
||||
PHP_EXT_ZENDEXT="no"
|
||||
|
||||
USE_PHP="php5-6 php5-5 php5-4"
|
||||
|
||||
inherit php-ext-source-r2 eutils
|
||||
|
||||
KEYWORDS="amd64 x86"
|
||||
|
||||
DESCRIPTION="PHP extension that provides access to movie info"
|
||||
HOMEPAGE="https://sourceforge.net/projects/ffmpeg-php/"
|
||||
SRC_URI="mirror://sourceforge/ffmpeg-php/${P}.tbz2"
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
IUSE=""
|
||||
|
||||
DEPEND="virtual/ffmpeg
|
||||
dev-lang/php:*[gd]"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
# The test breaks with the test movie, but it the same code works fine with
|
||||
# other movies
|
||||
|
||||
RESTRICT="test"
|
||||
|
||||
DOCS="CREDITS ChangeLog EXPERIMENTAL TODO"
|
||||
|
||||
src_prepare() {
|
||||
for slot in $(php_get_slots) ; do
|
||||
cd "${WORKDIR}/${slot}"
|
||||
epatch "${FILESDIR}/${P}-avutil50.patch"
|
||||
epatch "${FILESDIR}/${P}-ffmpeg.patch"
|
||||
epatch "${FILESDIR}/${P}-log.patch"
|
||||
epatch "${FILESDIR}/${P}-php5-4.patch"
|
||||
epatch "${FILESDIR}/${P}-ffincludes.patch"
|
||||
epatch "${FILESDIR}/${P}-ffmpeg1.patch"
|
||||
epatch "${FILESDIR}/${P}-api.patch"
|
||||
epatch "${FILESDIR}/${P}-libav10.patch"
|
||||
done
|
||||
php-ext-source-r2_src_prepare
|
||||
}
|
||||
@ -1,49 +0,0 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI="5"
|
||||
|
||||
PHP_EXT_NAME="ffmpeg"
|
||||
PHP_EXT_INI="yes"
|
||||
PHP_EXT_ZENDEXT="no"
|
||||
|
||||
USE_PHP="php5-6 php5-5 php5-4"
|
||||
|
||||
inherit php-ext-source-r2 eutils
|
||||
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
|
||||
DESCRIPTION="PHP extension that provides access to movie info"
|
||||
HOMEPAGE="https://sourceforge.net/projects/ffmpeg-php/"
|
||||
SRC_URI="mirror://sourceforge/ffmpeg-php/${P}.tbz2"
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
IUSE="libav"
|
||||
|
||||
DEPEND="libav? ( media-video/libav:0= )
|
||||
!libav? ( media-video/ffmpeg:0= )
|
||||
dev-lang/php:*[gd]"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
# The test breaks with the test movie, but it the same code works fine with
|
||||
# other movies
|
||||
|
||||
RESTRICT="test"
|
||||
|
||||
DOCS="CREDITS ChangeLog EXPERIMENTAL TODO"
|
||||
|
||||
src_prepare() {
|
||||
for slot in $(php_get_slots) ; do
|
||||
cd "${WORKDIR}/${slot}"
|
||||
epatch "${FILESDIR}/${P}-avutil50.patch"
|
||||
epatch "${FILESDIR}/${P}-ffmpeg.patch"
|
||||
epatch "${FILESDIR}/${P}-log.patch"
|
||||
epatch "${FILESDIR}/${P}-php5-4.patch"
|
||||
epatch "${FILESDIR}/${P}-ffincludes.patch"
|
||||
epatch "${FILESDIR}/${P}-ffmpeg1.patch"
|
||||
epatch "${FILESDIR}/${P}-api.patch"
|
||||
epatch "${FILESDIR}/${P}-libav10.patch"
|
||||
done
|
||||
php-ext-source-r2_src_prepare
|
||||
}
|
||||
@ -1,74 +0,0 @@
|
||||
diff --git a/ffmpeg_movie.c b/ffmpeg_movie.c
|
||||
index 0ce2c0f..6b77eb5 100644
|
||||
--- a/ffmpeg_movie.c
|
||||
+++ b/ffmpeg_movie.c
|
||||
@@ -39,6 +39,7 @@
|
||||
#include "ext/standard/info.h"
|
||||
|
||||
#include <libavcodec/avcodec.h>
|
||||
+#include <libavcodec/version.h>
|
||||
#include <libavformat/avformat.h>
|
||||
#include <libavutil/pixfmt.h>
|
||||
#include <libavutil/pixdesc.h>
|
||||
@@ -252,17 +257,17 @@ static int _php_open_movie_file(ff_movie_context *ffmovie_ctx,
|
||||
char* filename)
|
||||
{
|
||||
if (ffmovie_ctx->fmt_ctx) {
|
||||
- av_close_input_file(ffmovie_ctx->fmt_ctx);
|
||||
+ avformat_close_input(&ffmovie_ctx->fmt_ctx);
|
||||
ffmovie_ctx->fmt_ctx = NULL;
|
||||
}
|
||||
|
||||
/* open the file with generic libav function */
|
||||
if (avformat_open_input(&ffmovie_ctx->fmt_ctx, filename, NULL, NULL) < 0) {
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* decode the first frames to get the stream parameters. */
|
||||
- av_find_stream_info(ffmovie_ctx->fmt_ctx);
|
||||
+ avformat_find_stream_info(ffmovie_ctx->fmt_ctx, NULL);
|
||||
|
||||
return 0;
|
||||
}
|
||||
@@ -416,7 +421,7 @@ static void _php_free_ffmpeg_movie(zend_rsrc_list_entry *rsrc TSRMLS_DC)
|
||||
}
|
||||
}
|
||||
|
||||
- av_close_input_file(ffmovie_ctx->fmt_ctx);
|
||||
+ avformat_close_input(&ffmovie_ctx->fmt_ctx);
|
||||
|
||||
efree(ffmovie_ctx);
|
||||
}
|
||||
@@ -440,7 +445,7 @@ static void _php_free_ffmpeg_pmovie(zend_rsrc_list_entry *rsrc TSRMLS_DC)
|
||||
}
|
||||
}
|
||||
|
||||
- av_close_input_file(ffmovie_ctx->fmt_ctx);
|
||||
+ avformat_close_input(&ffmovie_ctx->fmt_ctx);
|
||||
|
||||
free(ffmovie_ctx);
|
||||
}
|
||||
@@ -512,7 +517,7 @@ static AVCodecContext* _php_get_decoder_context(ff_movie_context *ffmovie_ctx,
|
||||
GET_CODEC_PTR(ffmovie_ctx->fmt_ctx->streams[stream_index]->codec);
|
||||
|
||||
/* open the decoder */
|
||||
- if (avcodec_open(ffmovie_ctx->codec_ctx[stream_index], decoder) < 0) {
|
||||
+ if (avcodec_open2(ffmovie_ctx->codec_ctx[stream_index], decoder, NULL) < 0) {
|
||||
zend_error(E_WARNING, "Could not open codec for %s", _php_get_filename(ffmovie_ctx));
|
||||
return NULL;
|
||||
}
|
||||
@@ -966,12 +967,14 @@ static const char* _php_get_codec_name(ff_movie_context *ffmovie_ctx, int type)
|
||||
/* Copied from libavcodec/utils.c::avcodec_string */
|
||||
if (p) {
|
||||
codec_name = p->name;
|
||||
+#ifdef FF_API_SUB_ID
|
||||
if (decoder_ctx->codec_id == CODEC_ID_MP3) {
|
||||
if (decoder_ctx->sub_id == 2)
|
||||
codec_name = "mp2";
|
||||
else if (decoder_ctx->sub_id == 1)
|
||||
codec_name = "mp1";
|
||||
}
|
||||
+#endif
|
||||
} else if (decoder_ctx->codec_id == CODEC_ID_MPEG2TS) {
|
||||
/* fake mpeg2 transport stream codec (currently not registered) */
|
||||
codec_name = "mpeg2ts";
|
||||
@ -1,31 +0,0 @@
|
||||
Index: ffmpeg-php-0.6.0/ffmpeg_frame.c
|
||||
===================================================================
|
||||
--- ffmpeg-php-0.6.0.orig/ffmpeg_frame.c
|
||||
+++ ffmpeg-php-0.6.0/ffmpeg_frame.c
|
||||
@@ -333,7 +333,7 @@ FFMPEG_PHP_METHOD(ffmpeg_frame, toGDImag
|
||||
|
||||
GET_FRAME_RESOURCE(getThis(), ff_frame);
|
||||
|
||||
- _php_convert_frame(ff_frame, PIX_FMT_RGBA32);
|
||||
+ _php_convert_frame(ff_frame, PIX_FMT_RGB32);
|
||||
|
||||
return_value->value.lval = _php_get_gd_image(ff_frame->width,
|
||||
ff_frame->height);
|
||||
@@ -418,7 +418,7 @@ FFMPEG_PHP_METHOD(ffmpeg_frame, ffmpeg_f
|
||||
|
||||
/* create a an av_frame and allocate space for it */
|
||||
frame = avcodec_alloc_frame();
|
||||
- avpicture_alloc((AVPicture*)frame, PIX_FMT_RGBA32, width, height);
|
||||
+ avpicture_alloc((AVPicture*)frame, PIX_FMT_RGB32, width, height);
|
||||
|
||||
/* copy the gd image to the av_frame */
|
||||
_php_gd_image_to_avframe(gd_img, frame, width, height);
|
||||
@@ -429,7 +429,7 @@ FFMPEG_PHP_METHOD(ffmpeg_frame, ffmpeg_f
|
||||
/* set the ffpmeg_frame's properties */
|
||||
ff_frame->width = width;
|
||||
ff_frame->height = height;
|
||||
- ff_frame->pixel_format = PIX_FMT_RGBA32;
|
||||
+ ff_frame->pixel_format = PIX_FMT_RGB32;
|
||||
break;
|
||||
default:
|
||||
zend_error(E_ERROR, "Invalid argument\n");
|
||||
@ -1,115 +0,0 @@
|
||||
Incldue properly FFmpeg headers.
|
||||
https://bugs.gentoo.org/show_bug.cgi?id=461438
|
||||
|
||||
Index: php5.3/config.m4
|
||||
===================================================================
|
||||
--- php5.3.orig/config.m4
|
||||
+++ php5.3/config.m4
|
||||
@@ -31,15 +31,8 @@ if test "$PHP_FFMPEG" != "no"; then
|
||||
FFMPEG_INC_FOUND=$i/include
|
||||
break
|
||||
elif test -f $i/include/libavcodec/avcodec.h; then
|
||||
- dnl ffmpeg svn revision 12194 and newer put each header in its own dir
|
||||
- dnl so we have to include them all.
|
||||
- PHP_ADD_INCLUDE($i/include/libavcodec/)
|
||||
- PHP_ADD_INCLUDE($i/include/libavformat/)
|
||||
- PHP_ADD_INCLUDE($i/include/libavutil/)
|
||||
- PHP_ADD_INCLUDE($i/include/libswscale/)
|
||||
- PHP_ADD_INCLUDE($i/include/libavfilter/)
|
||||
- PHP_ADD_INCLUDE($i/include/libavdevice/)
|
||||
- FFMPEG_INC_FOUND=$i/include/libavcodec
|
||||
+ PHP_ADD_INCLUDE($i/include)
|
||||
+ FFMPEG_INC_FOUND=$i/include
|
||||
break
|
||||
fi
|
||||
done
|
||||
Index: php5.3/ffmpeg-php.c
|
||||
===================================================================
|
||||
--- php5.3.orig/ffmpeg-php.c
|
||||
+++ php5.3/ffmpeg-php.c
|
||||
@@ -39,11 +39,11 @@
|
||||
|
||||
#include "php.h"
|
||||
|
||||
-#include <avcodec.h>
|
||||
-#include <avformat.h>
|
||||
+#include <libavcodec/avcodec.h>
|
||||
+#include <libavformat/avformat.h>
|
||||
|
||||
#if HAVE_SWSCALER
|
||||
-#include <swscale.h>
|
||||
+#include <libswscale/swscale.h>
|
||||
#endif
|
||||
|
||||
#include "php_ini.h"
|
||||
Index: php5.3/ffmpeg_errorhandler.c
|
||||
===================================================================
|
||||
--- php5.3.orig/ffmpeg_errorhandler.c
|
||||
+++ php5.3/ffmpeg_errorhandler.c
|
||||
@@ -34,7 +34,7 @@
|
||||
*/
|
||||
|
||||
#include "php.h"
|
||||
-#include <avcodec.h>
|
||||
+#include <libavcodec/avcodec.h>
|
||||
|
||||
/* {{{ ffmpeg_errorhandler()
|
||||
*/
|
||||
Index: php5.3/ffmpeg_frame.h
|
||||
===================================================================
|
||||
--- php5.3.orig/ffmpeg_frame.h
|
||||
+++ php5.3/ffmpeg_frame.h
|
||||
@@ -38,8 +38,8 @@
|
||||
|
||||
#include "php_version.h"
|
||||
|
||||
-#include <avcodec.h>
|
||||
-#include <avformat.h>
|
||||
+#include <libavcodec/avcodec.h>
|
||||
+#include <libavformat/avformat.h>
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include "config.h"
|
||||
Index: php5.3/ffmpeg_movie.c
|
||||
===================================================================
|
||||
--- php5.3.orig/ffmpeg_movie.c
|
||||
+++ php5.3/ffmpeg_movie.c
|
||||
@@ -34,9 +34,9 @@
|
||||
#include "php_globals.h"
|
||||
#include "ext/standard/info.h"
|
||||
|
||||
-#include <avcodec.h>
|
||||
-#include <avformat.h>
|
||||
-#include <pixdesc.h>
|
||||
+#include <libavcodec/avcodec.h>
|
||||
+#include <libavformat/avformat.h>
|
||||
+#include <libavutil/pixdesc.h>
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include "config.h"
|
||||
Index: php5.3/ffmpeg_tools.c
|
||||
===================================================================
|
||||
--- php5.3.orig/ffmpeg_tools.c
|
||||
+++ php5.3/ffmpeg_tools.c
|
||||
@@ -42,7 +42,7 @@
|
||||
#include "ffmpeg_tools.h"
|
||||
|
||||
#ifdef HAVE_SWSCALER
|
||||
-#include <swscale.h>
|
||||
+#include <libswscale/swscale.h>
|
||||
#endif
|
||||
|
||||
/* {{{ ffmpeg_img_convert()
|
||||
Index: php5.3/ffmpeg_tools.h
|
||||
===================================================================
|
||||
--- php5.3.orig/ffmpeg_tools.h
|
||||
+++ php5.3/ffmpeg_tools.h
|
||||
@@ -36,7 +36,7 @@
|
||||
#ifndef FFMPEG_TOOLS_H
|
||||
#define FFMPEG_TOOLS_H
|
||||
|
||||
-#include <avcodec.h>
|
||||
+#include <libavcodec/avcodec.h>
|
||||
|
||||
int ffmpeg_img_convert(
|
||||
AVPicture *dst, int dst_pix_fmt,
|
||||
@ -1,350 +0,0 @@
|
||||
Index: work/php5.3/ffmpeg_movie.c
|
||||
===================================================================
|
||||
--- work.orig/php5.3/ffmpeg_movie.c
|
||||
+++ work/php5.3/ffmpeg_movie.c
|
||||
@@ -36,6 +36,7 @@
|
||||
|
||||
#include <avcodec.h>
|
||||
#include <avformat.h>
|
||||
+#include <pixdesc.h>
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include "config.h"
|
||||
@@ -67,6 +68,9 @@
|
||||
#define GET_CODEC_FIELD(codec, field) codec.field
|
||||
#define GET_CODEC_PTR(codec) &codec
|
||||
#endif
|
||||
+#ifndef MAX_STREAMS
|
||||
+#define MAX_STREAMS 20
|
||||
+#endif
|
||||
|
||||
typedef struct {
|
||||
AVFormatContext *fmt_ctx;
|
||||
@@ -149,7 +153,7 @@ static int _php_get_stream_index(AVForma
|
||||
*/
|
||||
static AVStream *_php_get_video_stream(AVFormatContext *fmt_ctx)
|
||||
{
|
||||
- int i = _php_get_stream_index(fmt_ctx, CODEC_TYPE_VIDEO);
|
||||
+ int i = _php_get_stream_index(fmt_ctx, AVMEDIA_TYPE_VIDEO);
|
||||
|
||||
return i < 0 ? NULL : fmt_ctx->streams[i];
|
||||
}
|
||||
@@ -162,7 +166,7 @@ static AVStream *_php_get_video_stream(A
|
||||
*/
|
||||
static AVStream *_php_get_audio_stream(AVFormatContext *fmt_ctx)
|
||||
{
|
||||
- int i = _php_get_stream_index(fmt_ctx, CODEC_TYPE_AUDIO);
|
||||
+ int i = _php_get_stream_index(fmt_ctx, AVMEDIA_TYPE_AUDIO);
|
||||
|
||||
return i < 0 ? NULL : fmt_ctx->streams[i];
|
||||
}
|
||||
@@ -481,7 +485,7 @@ static AVCodecContext* _php_get_decoder_
|
||||
stream_index = _php_get_stream_index(ffmovie_ctx->fmt_ctx, stream_type);
|
||||
if (stream_index < 0) {
|
||||
// FIXME: factor out the conditional.
|
||||
- if (stream_type == CODEC_TYPE_VIDEO) {
|
||||
+ if (stream_type == AVMEDIA_TYPE_VIDEO) {
|
||||
zend_error(E_WARNING, "Can't find video stream in %s",
|
||||
_php_get_filename(ffmovie_ctx));
|
||||
return NULL;
|
||||
@@ -519,17 +523,26 @@ static AVCodecContext* _php_get_decoder_
|
||||
}
|
||||
/* }}} */
|
||||
|
||||
+static const char* get_metadata(AVDictionary *metadata, const char* val){
|
||||
+ AVDictionaryEntry *ade;
|
||||
+ ade = av_dict_get(metadata, val, NULL, 0 );
|
||||
+ if(ade == NULL) return "";
|
||||
+ return ade->value;
|
||||
+}
|
||||
+
|
||||
|
||||
/* {{{ proto string getComment()
|
||||
*/
|
||||
FFMPEG_PHP_METHOD(ffmpeg_movie, getComment)
|
||||
{
|
||||
ff_movie_context *ffmovie_ctx;
|
||||
+ const char* val;
|
||||
|
||||
GET_MOVIE_RESOURCE(ffmovie_ctx);
|
||||
+
|
||||
+ val = get_metadata(ffmovie_ctx->fmt_ctx->metadata, "COMMENT");
|
||||
|
||||
- RETURN_STRINGL(ffmovie_ctx->fmt_ctx->comment,
|
||||
- strlen(ffmovie_ctx->fmt_ctx->comment), 1);
|
||||
+ RETURN_STRINGL(val, strlen(val), 1);
|
||||
}
|
||||
/* }}} */
|
||||
|
||||
@@ -540,11 +553,12 @@ FFMPEG_PHP_METHOD(ffmpeg_movie, getComme
|
||||
FFMPEG_PHP_METHOD(ffmpeg_movie, getTitle)
|
||||
{
|
||||
ff_movie_context *ffmovie_ctx;
|
||||
+ const char* val;
|
||||
|
||||
GET_MOVIE_RESOURCE(ffmovie_ctx);
|
||||
|
||||
- RETURN_STRINGL(ffmovie_ctx->fmt_ctx->title,
|
||||
- strlen(ffmovie_ctx->fmt_ctx->title), 1);
|
||||
+ val = get_metadata(ffmovie_ctx->fmt_ctx->metadata, "TITLE");
|
||||
+ RETURN_STRINGL(val, strlen(val), 1);
|
||||
}
|
||||
/* }}} */
|
||||
|
||||
@@ -555,11 +569,12 @@ FFMPEG_PHP_METHOD(ffmpeg_movie, getTitle
|
||||
FFMPEG_PHP_METHOD(ffmpeg_movie, getAuthor)
|
||||
{
|
||||
ff_movie_context *ffmovie_ctx;
|
||||
+ const char* val;
|
||||
|
||||
GET_MOVIE_RESOURCE(ffmovie_ctx);
|
||||
|
||||
- RETURN_STRINGL(ffmovie_ctx->fmt_ctx->author,
|
||||
- strlen(ffmovie_ctx->fmt_ctx->author), 1);
|
||||
+ val = get_metadata(ffmovie_ctx->fmt_ctx->metadata, "ARTIST");
|
||||
+ RETURN_STRINGL(val, strlen(val), 1);
|
||||
}
|
||||
/* }}} */
|
||||
|
||||
@@ -569,11 +584,12 @@ FFMPEG_PHP_METHOD(ffmpeg_movie, getAutho
|
||||
FFMPEG_PHP_METHOD(ffmpeg_movie, getCopyright)
|
||||
{
|
||||
ff_movie_context *ffmovie_ctx;
|
||||
+ const char* val;
|
||||
|
||||
GET_MOVIE_RESOURCE(ffmovie_ctx);
|
||||
|
||||
- RETURN_STRINGL(ffmovie_ctx->fmt_ctx->copyright,
|
||||
- strlen(ffmovie_ctx->fmt_ctx->copyright), 1);
|
||||
+ val = get_metadata(ffmovie_ctx->fmt_ctx->metadata, "COPYRIGHT");
|
||||
+ RETURN_STRINGL(val, strlen(val), 1);
|
||||
}
|
||||
/* }}} */
|
||||
|
||||
@@ -584,11 +600,12 @@ FFMPEG_PHP_METHOD(ffmpeg_movie, getCopyr
|
||||
FFMPEG_PHP_METHOD(ffmpeg_movie, getAlbum)
|
||||
{
|
||||
ff_movie_context *ffmovie_ctx;
|
||||
+ const char* val;
|
||||
|
||||
GET_MOVIE_RESOURCE(ffmovie_ctx);
|
||||
|
||||
- RETURN_STRINGL(ffmovie_ctx->fmt_ctx->album,
|
||||
- strlen(ffmovie_ctx->fmt_ctx->album), 1);
|
||||
+ val = get_metadata(ffmovie_ctx->fmt_ctx->metadata, "ALBUM");
|
||||
+ RETURN_STRINGL(val, strlen(val), 1);
|
||||
}
|
||||
/* }}} */
|
||||
|
||||
@@ -598,11 +615,12 @@ FFMPEG_PHP_METHOD(ffmpeg_movie, getAlbum
|
||||
FFMPEG_PHP_METHOD(ffmpeg_movie, getGenre)
|
||||
{
|
||||
ff_movie_context *ffmovie_ctx;
|
||||
+ const char* val;
|
||||
|
||||
GET_MOVIE_RESOURCE(ffmovie_ctx);
|
||||
|
||||
- RETURN_STRINGL(ffmovie_ctx->fmt_ctx->genre,
|
||||
- strlen(ffmovie_ctx->fmt_ctx->genre), 1);
|
||||
+ val = get_metadata(ffmovie_ctx->fmt_ctx->metadata, "GENRE");
|
||||
+ RETURN_STRINGL(val, strlen(val), 1);
|
||||
}
|
||||
/* }}} */
|
||||
|
||||
@@ -613,10 +631,12 @@ FFMPEG_PHP_METHOD(ffmpeg_movie, getGenre
|
||||
FFMPEG_PHP_METHOD(ffmpeg_movie, getTrackNumber)
|
||||
{
|
||||
ff_movie_context *ffmovie_ctx;
|
||||
+ const char* val;
|
||||
|
||||
GET_MOVIE_RESOURCE(ffmovie_ctx);
|
||||
|
||||
- RETURN_LONG(ffmovie_ctx->fmt_ctx->track);
|
||||
+ val = get_metadata(ffmovie_ctx->fmt_ctx->metadata, "TRACK");
|
||||
+ RETURN_STRINGL(val, strlen(val), 1);
|
||||
}
|
||||
/* }}} */
|
||||
|
||||
@@ -626,10 +646,12 @@ FFMPEG_PHP_METHOD(ffmpeg_movie, getTrack
|
||||
FFMPEG_PHP_METHOD(ffmpeg_movie, getYear)
|
||||
{
|
||||
ff_movie_context *ffmovie_ctx;
|
||||
+ const char* val;
|
||||
|
||||
GET_MOVIE_RESOURCE(ffmovie_ctx);
|
||||
|
||||
- RETURN_LONG(ffmovie_ctx->fmt_ctx->year);
|
||||
+ val = get_metadata(ffmovie_ctx->fmt_ctx->metadata, "DATE");
|
||||
+ RETURN_STRINGL(val, strlen(val), 1);
|
||||
}
|
||||
/* }}} */
|
||||
|
||||
@@ -675,7 +697,7 @@ static float _php_get_framerate(ff_movie
|
||||
}
|
||||
|
||||
#if LIBAVCODEC_BUILD > 4753
|
||||
- if (GET_CODEC_FIELD(st->codec, codec_type) == CODEC_TYPE_VIDEO){
|
||||
+ if (GET_CODEC_FIELD(st->codec, codec_type) == AVMEDIA_TYPE_VIDEO){
|
||||
if (st->r_frame_rate.den && st->r_frame_rate.num) {
|
||||
rate = av_q2d(st->r_frame_rate);
|
||||
} else {
|
||||
@@ -807,7 +829,7 @@ static long _php_get_framenumber(ff_movi
|
||||
{
|
||||
AVCodecContext *decoder_ctx = NULL;
|
||||
|
||||
- decoder_ctx = _php_get_decoder_context(ffmovie_ctx, CODEC_TYPE_VIDEO);
|
||||
+ decoder_ctx = _php_get_decoder_context(ffmovie_ctx, AVMEDIA_TYPE_VIDEO);
|
||||
if (!decoder_ctx) {
|
||||
return 0;
|
||||
}
|
||||
@@ -847,7 +869,7 @@ static int _php_get_pixelformat(ff_movie
|
||||
{
|
||||
AVCodecContext *decoder_ctx;
|
||||
|
||||
- decoder_ctx = _php_get_decoder_context(ffmovie_ctx, CODEC_TYPE_VIDEO);
|
||||
+ decoder_ctx = _php_get_decoder_context(ffmovie_ctx, AVMEDIA_TYPE_VIDEO);
|
||||
|
||||
return decoder_ctx ? decoder_ctx->pix_fmt : 0;
|
||||
}
|
||||
@@ -865,7 +887,7 @@ FFMPEG_PHP_METHOD(ffmpeg_movie, getPixel
|
||||
GET_MOVIE_RESOURCE(ffmovie_ctx);
|
||||
|
||||
pix_fmt = _php_get_pixelformat(ffmovie_ctx);
|
||||
- fmt = avcodec_get_pix_fmt_name(pix_fmt);
|
||||
+ fmt = av_get_pix_fmt_name(pix_fmt);
|
||||
|
||||
if (fmt) {
|
||||
/* cast const to non-const to keep compiler from complaining,
|
||||
@@ -960,7 +982,7 @@ static const char* _php_get_codec_name(f
|
||||
codec_name = decoder_ctx->codec_name;
|
||||
} else {
|
||||
/* output avi tags */
|
||||
- if (decoder_ctx->codec_type == CODEC_TYPE_VIDEO) {
|
||||
+ if (decoder_ctx->codec_type == AVMEDIA_TYPE_VIDEO) {
|
||||
snprintf(buf1, sizeof(buf1), "%c%c%c%c",
|
||||
decoder_ctx->codec_tag & 0xff,
|
||||
(decoder_ctx->codec_tag >> 8) & 0xff,
|
||||
@@ -986,7 +1008,7 @@ FFMPEG_PHP_METHOD(ffmpeg_movie, getVideo
|
||||
|
||||
GET_MOVIE_RESOURCE(ffmovie_ctx);
|
||||
|
||||
- codec_name = (char*)_php_get_codec_name(ffmovie_ctx, CODEC_TYPE_VIDEO);
|
||||
+ codec_name = (char*)_php_get_codec_name(ffmovie_ctx, AVMEDIA_TYPE_VIDEO);
|
||||
|
||||
if (codec_name) {
|
||||
RETURN_STRINGL(codec_name, strlen(codec_name), 1);
|
||||
@@ -1006,7 +1028,7 @@ FFMPEG_PHP_METHOD(ffmpeg_movie, getAudio
|
||||
|
||||
GET_MOVIE_RESOURCE(ffmovie_ctx);
|
||||
|
||||
- codec_name = (char*)_php_get_codec_name(ffmovie_ctx, CODEC_TYPE_AUDIO);
|
||||
+ codec_name = (char*)_php_get_codec_name(ffmovie_ctx, AVMEDIA_TYPE_AUDIO);
|
||||
|
||||
if (codec_name) {
|
||||
RETURN_STRINGL(codec_name, strlen(codec_name), 1);
|
||||
@@ -1026,7 +1048,7 @@ FFMPEG_PHP_METHOD(ffmpeg_movie, getVideo
|
||||
|
||||
GET_MOVIE_RESOURCE(ffmovie_ctx);
|
||||
|
||||
- stream_id= _php_get_stream_index(ffmovie_ctx->fmt_ctx, CODEC_TYPE_VIDEO);
|
||||
+ stream_id= _php_get_stream_index(ffmovie_ctx->fmt_ctx, AVMEDIA_TYPE_VIDEO);
|
||||
|
||||
if( stream_id == -1 )
|
||||
{
|
||||
@@ -1048,7 +1070,7 @@ FFMPEG_PHP_METHOD(ffmpeg_movie, getAudio
|
||||
|
||||
GET_MOVIE_RESOURCE(ffmovie_ctx);
|
||||
|
||||
- stream_id= _php_get_stream_index(ffmovie_ctx->fmt_ctx, CODEC_TYPE_AUDIO);
|
||||
+ stream_id= _php_get_stream_index(ffmovie_ctx->fmt_ctx, AVMEDIA_TYPE_AUDIO);
|
||||
|
||||
if( stream_id == -1 )
|
||||
{
|
||||
@@ -1086,7 +1108,7 @@ FFMPEG_PHP_METHOD(ffmpeg_movie, getAudio
|
||||
|
||||
GET_MOVIE_RESOURCE(ffmovie_ctx);
|
||||
|
||||
- channels = _php_get_codec_channels(ffmovie_ctx, CODEC_TYPE_AUDIO);
|
||||
+ channels = _php_get_codec_channels(ffmovie_ctx, AVMEDIA_TYPE_AUDIO);
|
||||
|
||||
if (channels) {
|
||||
RETURN_LONG(channels);
|
||||
@@ -1122,7 +1144,7 @@ FFMPEG_PHP_METHOD(ffmpeg_movie, getAudio
|
||||
|
||||
GET_MOVIE_RESOURCE(ffmovie_ctx);
|
||||
|
||||
- sample_rate = _php_get_codec_sample_rate(ffmovie_ctx, CODEC_TYPE_AUDIO);
|
||||
+ sample_rate = _php_get_codec_sample_rate(ffmovie_ctx, AVMEDIA_TYPE_AUDIO);
|
||||
|
||||
if (sample_rate) {
|
||||
RETURN_LONG(sample_rate);
|
||||
@@ -1158,7 +1180,7 @@ FFMPEG_PHP_METHOD(ffmpeg_movie, getAudio
|
||||
|
||||
GET_MOVIE_RESOURCE(ffmovie_ctx);
|
||||
|
||||
- bit_rate = _php_get_codec_bit_rate(ffmovie_ctx, CODEC_TYPE_AUDIO);
|
||||
+ bit_rate = _php_get_codec_bit_rate(ffmovie_ctx, AVMEDIA_TYPE_AUDIO);
|
||||
|
||||
if (bit_rate) {
|
||||
RETURN_LONG(bit_rate);
|
||||
@@ -1178,7 +1200,7 @@ FFMPEG_PHP_METHOD(ffmpeg_movie, getVideo
|
||||
|
||||
GET_MOVIE_RESOURCE(ffmovie_ctx);
|
||||
|
||||
- bit_rate = _php_get_codec_bit_rate(ffmovie_ctx, CODEC_TYPE_VIDEO);
|
||||
+ bit_rate = _php_get_codec_bit_rate(ffmovie_ctx, AVMEDIA_TYPE_VIDEO);
|
||||
|
||||
if (bit_rate) {
|
||||
RETURN_LONG(bit_rate);
|
||||
@@ -1201,7 +1223,7 @@ static AVFrame* _php_read_av_frame(ff_mo
|
||||
int got_frame;
|
||||
|
||||
video_stream = _php_get_stream_index(ffmovie_ctx->fmt_ctx,
|
||||
- CODEC_TYPE_VIDEO);
|
||||
+ AVMEDIA_TYPE_VIDEO);
|
||||
if (video_stream < 0) {
|
||||
return NULL;
|
||||
}
|
||||
@@ -1212,11 +1234,10 @@ static AVFrame* _php_read_av_frame(ff_mo
|
||||
while (av_read_frame(ffmovie_ctx->fmt_ctx, &packet) >= 0) {
|
||||
if (packet.stream_index == video_stream) {
|
||||
|
||||
- avcodec_decode_video(decoder_ctx, frame, &got_frame,
|
||||
- packet.data, packet.size);
|
||||
+ avcodec_decode_video2(decoder_ctx, frame, &got_frame, &packet);
|
||||
|
||||
if (got_frame) {
|
||||
- *is_keyframe = (packet.flags & PKT_FLAG_KEY);
|
||||
+ *is_keyframe = (packet.flags & AV_PKT_FLAG_KEY);
|
||||
*pts = packet.pts;
|
||||
av_free_packet(&packet);
|
||||
return frame;
|
||||
@@ -1243,7 +1264,7 @@ static AVFrame* _php_get_av_frame(ff_mov
|
||||
AVCodecContext *decoder_ctx = NULL;
|
||||
AVFrame *frame = NULL;
|
||||
|
||||
- decoder_ctx = _php_get_decoder_context(ffmovie_ctx, CODEC_TYPE_VIDEO);
|
||||
+ decoder_ctx = _php_get_decoder_context(ffmovie_ctx, AVMEDIA_TYPE_VIDEO);
|
||||
if (decoder_ctx == NULL) {
|
||||
return NULL;
|
||||
}
|
||||
@@ -1279,9 +1300,7 @@ static AVFrame* _php_get_av_frame(ff_mov
|
||||
wanted_frame != GETFRAME_NEXTFRAME &&
|
||||
wanted_frame - ffmovie_ctx->frame_number >
|
||||
decoder_ctx->gop_size + 1) {
|
||||
- decoder_ctx->hurry_up = 1;
|
||||
- } else {
|
||||
- decoder_ctx->hurry_up = 0;
|
||||
+ decoder_ctx->skip_frame = AVDISCARD_BIDIR;
|
||||
}
|
||||
ffmovie_ctx->frame_number++;
|
||||
|
||||
@@ -1440,7 +1459,7 @@ static double _php_get_sample_aspect_rat
|
||||
AVCodecContext *decoder_ctx;
|
||||
|
||||
|
||||
- decoder_ctx = _php_get_decoder_context(ffmovie_ctx, CODEC_TYPE_VIDEO);
|
||||
+ decoder_ctx = _php_get_decoder_context(ffmovie_ctx, AVMEDIA_TYPE_VIDEO);
|
||||
if (!decoder_ctx) {
|
||||
return -1;
|
||||
}
|
||||
@ -1,30 +0,0 @@
|
||||
Fix runtime with ffmpeg-1.
|
||||
https://bugs.gentoo.org/show_bug.cgi?id=461438
|
||||
|
||||
Index: php5.3/ffmpeg-php.c
|
||||
===================================================================
|
||||
--- php5.3.orig/ffmpeg-php.c
|
||||
+++ php5.3/ffmpeg-php.c
|
||||
@@ -90,9 +90,6 @@ PHP_INI_END()
|
||||
*/
|
||||
PHP_MINIT_FUNCTION(ffmpeg)
|
||||
{
|
||||
- /* must be called before using avcodec libraries. */
|
||||
- avcodec_init();
|
||||
-
|
||||
/* register all codecs */
|
||||
av_register_all();
|
||||
|
||||
Index: php5.3/ffmpeg_movie.c
|
||||
===================================================================
|
||||
--- php5.3.orig/ffmpeg_movie.c
|
||||
+++ php5.3/ffmpeg_movie.c
|
||||
@@ -259,7 +259,7 @@ static int _php_open_movie_file(ff_movie
|
||||
}
|
||||
|
||||
/* open the file with generic libav function */
|
||||
- if (av_open_input_file(&ffmovie_ctx->fmt_ctx, filename, NULL, 0, NULL) < 0) {
|
||||
+ if (avformat_open_input(&ffmovie_ctx->fmt_ctx, filename, NULL, NULL) < 0) {
|
||||
return 1;
|
||||
}
|
||||
|
||||
@ -1,44 +0,0 @@
|
||||
diff -aurN a/ffmpeg_movie.c b/ffmpeg_movie.c
|
||||
--- a/ffmpeg_movie.c 2015-06-22 19:46:01.220498329 -0400
|
||||
+++ b/ffmpeg_movie.c 2015-06-22 20:44:26.802671398 -0400
|
||||
@@ -697,7 +697,16 @@
|
||||
return rate;
|
||||
}
|
||||
|
||||
-#if LIBAVCODEC_BUILD > 4753
|
||||
+#if LIBAVCODEC_BUILD > 3604480 /* libav-10 */
|
||||
+ if (GET_CODEC_FIELD(st->codec, codec_type) == AVMEDIA_TYPE_VIDEO){
|
||||
+ if (st->avg_frame_rate.den && st->avg_frame_rate.num) {
|
||||
+ rate = av_q2d(st->avg_frame_rate);
|
||||
+ } else {
|
||||
+ rate = 1 / av_q2d(GET_CODEC_FIELD(st->codec, time_base));
|
||||
+ }
|
||||
+ }
|
||||
+ return (float)rate;
|
||||
+#elif LIBAVCODEC_BUILD > 4753
|
||||
if (GET_CODEC_FIELD(st->codec, codec_type) == AVMEDIA_TYPE_VIDEO){
|
||||
if (st->r_frame_rate.den && st->r_frame_rate.num) {
|
||||
rate = av_q2d(st->r_frame_rate);
|
||||
@@ -980,14 +980,22 @@
|
||||
if (p) {
|
||||
codec_name = p->name;
|
||||
#ifdef FF_API_SUB_ID
|
||||
+#if LIBAVCODEC_BUILD > 3604480 /* libav-10 */
|
||||
+ if (decoder_ctx->codec_id == AV_CODEC_ID_MP3) {
|
||||
+#else
|
||||
if (decoder_ctx->codec_id == CODEC_ID_MP3) {
|
||||
+#endif
|
||||
if (decoder_ctx->sub_id == 2)
|
||||
codec_name = "mp2";
|
||||
else if (decoder_ctx->sub_id == 1)
|
||||
codec_name = "mp1";
|
||||
}
|
||||
#endif
|
||||
+#if LIBAVCODEC_BUILD > 3604480 /* libav-10 */
|
||||
+ } else if (decoder_ctx->codec_id == AV_CODEC_ID_MPEG2TS) {
|
||||
+#else
|
||||
} else if (decoder_ctx->codec_id == CODEC_ID_MPEG2TS) {
|
||||
+#endif
|
||||
/* fake mpeg2 transport stream codec (currently not registered) */
|
||||
codec_name = "mpeg2ts";
|
||||
} else if (decoder_ctx->codec_name[0] != '\0') {
|
||||
@ -1,12 +0,0 @@
|
||||
Index: work/php5.3/ffmpeg-php.c
|
||||
===================================================================
|
||||
--- work.orig/php5.3/ffmpeg-php.c
|
||||
+++ work/php5.3/ffmpeg-php.c
|
||||
@@ -101,6 +101,7 @@ PHP_MINIT_FUNCTION(ffmpeg)
|
||||
if (INI_BOOL("ffmpeg.show_warnings")) {
|
||||
av_log_set_callback(ffmpeg_errorhandler);
|
||||
}
|
||||
+ else av_log_set_level(AV_LOG_QUIET);
|
||||
|
||||
register_ffmpeg_movie_class(module_number);
|
||||
register_ffmpeg_frame_class(module_number);
|
||||
@ -1,29 +0,0 @@
|
||||
--- ffmpeg-php-0.6.0.orig/ffmpeg_movie.c.bak 2013-02-24 16:44:31.162791000 +0200
|
||||
+++ ffmpeg-php-0.6.0/ffmpeg_movie.c 2013-02-24 16:45:20.632791000 +0200
|
||||
@@ -308,7 +308,7 @@
|
||||
}
|
||||
|
||||
if (persistent) {
|
||||
- list_entry *le;
|
||||
+ zend_rsrc_list_entry *le;
|
||||
/* resolve the fully-qualified path name to use as the hash key */
|
||||
fullpath = expand_filepath(filename, NULL TSRMLS_CC);
|
||||
|
||||
@@ -343,7 +343,7 @@
|
||||
}
|
||||
|
||||
} else { /* no existing persistant movie, create one */
|
||||
- list_entry new_le;
|
||||
+ zend_rsrc_list_entry new_le;
|
||||
ffmovie_ctx = _php_alloc_ffmovie_ctx(1);
|
||||
|
||||
if (_php_open_movie_file(ffmovie_ctx, filename)) {
|
||||
@@ -357,7 +357,7 @@
|
||||
new_le.ptr = ffmovie_ctx;
|
||||
|
||||
if (FAILURE == zend_hash_update(&EG(persistent_list), hashkey,
|
||||
- hashkey_length+1, (void *)&new_le, sizeof(list_entry),
|
||||
+ hashkey_length+1, (void *)&new_le, sizeof(zend_rsrc_list_entry),
|
||||
NULL)) {
|
||||
php_error_docref(NULL TSRMLS_CC, E_WARNING,
|
||||
"Failed to register persistent resource");
|
||||
@ -1,11 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="project">
|
||||
<email>php-bugs@gentoo.org</email>
|
||||
<name>PHP</name>
|
||||
</maintainer>
|
||||
<upstream>
|
||||
<remote-id type="sourceforge">ffmpeg-php</remote-id>
|
||||
</upstream>
|
||||
</pkgmetadata>
|
||||
@ -1,19 +1,17 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
EAPI=6
|
||||
|
||||
USE_PHP="php5-6 php5-5 php5-4"
|
||||
USE_PHP="php5-6"
|
||||
|
||||
inherit php-ext-pecl-r2
|
||||
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
inherit php-ext-pecl-r3
|
||||
|
||||
DESCRIPTION="RRDtool bindings for PHP"
|
||||
LICENSE="BSD"
|
||||
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
|
||||
DEPEND=">=net-analyzer/rrdtool-1.4.5-r1[graph]"
|
||||
DEPEND="net-analyzer/rrdtool[graph]"
|
||||
RDEPEND="${DEPEND}"
|
||||
@ -1,23 +1,21 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
EAPI=6
|
||||
|
||||
# Define 5.6 here to have the {,REQUIRED_}USE generated
|
||||
USE_PHP="php7-0 php5-6"
|
||||
USE_PHP="php5-6 php7-0"
|
||||
|
||||
inherit php-ext-pecl-r2
|
||||
inherit php-ext-pecl-r3
|
||||
|
||||
# But we really only build 7.0
|
||||
USE_PHP="php7-0"
|
||||
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
|
||||
DESCRIPTION="RRDtool bindings for PHP"
|
||||
LICENSE="BSD"
|
||||
|
||||
SLOT="7"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
|
||||
DEPEND=">=net-analyzer/rrdtool-1.4.5-r1[graph]"
|
||||
DEPEND="net-analyzer/rrdtool[graph]"
|
||||
RDEPEND="${DEPEND} php_targets_php5-6? ( ${CATEGORY}/${PN}:0 )"
|
||||
@ -1,3 +1,2 @@
|
||||
DIST xdebug-2.2.6.tgz 256161 SHA256 6dd1cba0605e75009331aa3625a19ef49ade5a75aa9fe2ff8a818108d2cce84e SHA512 18deac94f8f9c102dce83ed1accd0831e5b8c2f5d47ea60f89c8b493e5e180d0dfa153065089e1081276db8960ff2ea4082103f228f9191c572888180efa6f82 WHIRLPOOL 0e152ea5740bc8ca8cc6d0178bb59556f98ba0722a0b3cdaeecdc5aa551324cadf5f1c11b215058cf890c16eb7e9e108919a389a6c89d60a469396a20cc083ed
|
||||
DIST xdebug-2.4.1.tgz 265542 SHA256 23c8786e0f5aae67b1e5035972bfff282710fb84c483887cebceb8ef5bbdf8ef SHA512 64b345b4809fb0f020eb8fe7a0826056a64728ec9565bbb2d0e717ac7b3ca8aa0856b91c2ba47a7435b7500c5efa643682f245d6cd9d0a537f8bb9ab0d5cea3a WHIRLPOOL cad7d081414d5a55fb95e4cb6ae5d808f5c6b54e1c16ba78274fadf9b32dd10e60ecab3d09d420462b7c95f7d9364d9f886fe7732a21284c635e70c24259a610
|
||||
DIST xdebug-2.5.0.tgz 267640 SHA256 8bd6ad1e64948308e3e3a7437292f154b11e25acaf31b0d59d83bda18af0890d SHA512 75b1dbf32059eebb6ea3fb6ebb50ab26d73f8ce2964be1fec41ecfd9ae3d8bd55b6997daf03727b28b91ba06d08734865158bed6f038a46f00a1da5424ce5fe6 WHIRLPOOL 01901c73cf6d4ca8803a21eee8e1b5fcc668de75f0cb4318f6637a2d3a93e050664ee4dfa03ec0281e154e1e7660dc084b1b75c4b0451e1b4bab3db5ff00ea71
|
||||
|
||||
@ -1,30 +0,0 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
|
||||
KEYWORDS="amd64 ~hppa ppc ppc64 x86"
|
||||
|
||||
MY_PV="${PV/_/}"
|
||||
MY_PV="${MY_PV/rc/RC}"
|
||||
|
||||
DESCRIPTION="Xdebug client for the Common Debugger Protocol (DBGP)"
|
||||
HOMEPAGE="http://www.xdebug.org/"
|
||||
SRC_URI="http://pecl.php.net/get/xdebug-${MY_PV}.tgz"
|
||||
LICENSE="Xdebug"
|
||||
SLOT="0"
|
||||
IUSE="libedit"
|
||||
|
||||
S="${WORKDIR}/xdebug-${MY_PV}/debugclient"
|
||||
|
||||
DEPEND="libedit? ( dev-libs/libedit )"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
src_configure() {
|
||||
econf $(use_with libedit)
|
||||
}
|
||||
|
||||
src_install() {
|
||||
newbin debugclient xdebug
|
||||
}
|
||||
@ -1,3 +1,2 @@
|
||||
DIST xdebug-2.2.6.tgz 256161 SHA256 6dd1cba0605e75009331aa3625a19ef49ade5a75aa9fe2ff8a818108d2cce84e SHA512 18deac94f8f9c102dce83ed1accd0831e5b8c2f5d47ea60f89c8b493e5e180d0dfa153065089e1081276db8960ff2ea4082103f228f9191c572888180efa6f82 WHIRLPOOL 0e152ea5740bc8ca8cc6d0178bb59556f98ba0722a0b3cdaeecdc5aa551324cadf5f1c11b215058cf890c16eb7e9e108919a389a6c89d60a469396a20cc083ed
|
||||
DIST xdebug-2.4.1.tgz 265542 SHA256 23c8786e0f5aae67b1e5035972bfff282710fb84c483887cebceb8ef5bbdf8ef SHA512 64b345b4809fb0f020eb8fe7a0826056a64728ec9565bbb2d0e717ac7b3ca8aa0856b91c2ba47a7435b7500c5efa643682f245d6cd9d0a537f8bb9ab0d5cea3a WHIRLPOOL cad7d081414d5a55fb95e4cb6ae5d808f5c6b54e1c16ba78274fadf9b32dd10e60ecab3d09d420462b7c95f7d9364d9f886fe7732a21284c635e70c24259a610
|
||||
DIST xdebug-2.5.0.tgz 267640 SHA256 8bd6ad1e64948308e3e3a7437292f154b11e25acaf31b0d59d83bda18af0890d SHA512 75b1dbf32059eebb6ea3fb6ebb50ab26d73f8ce2964be1fec41ecfd9ae3d8bd55b6997daf03727b28b91ba06d08734865158bed6f038a46f00a1da5424ce5fe6 WHIRLPOOL 01901c73cf6d4ca8803a21eee8e1b5fcc668de75f0cb4318f6637a2d3a93e050664ee4dfa03ec0281e154e1e7660dc084b1b75c4b0451e1b4bab3db5ff00ea71
|
||||
|
||||
@ -1,89 +0,0 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI="5"
|
||||
PHP_EXT_NAME="xdebug"
|
||||
PHP_EXT_INI="yes"
|
||||
PHP_EXT_ZENDEXT="yes"
|
||||
|
||||
USE_PHP="php5-6 php5-5 php5-4"
|
||||
|
||||
MY_PV="${PV/_/}"
|
||||
MY_PV="${MY_PV/rc/RC}"
|
||||
|
||||
S="${WORKDIR}/${PN}-${MY_PV}"
|
||||
|
||||
inherit php-ext-source-r2
|
||||
|
||||
KEYWORDS="amd64 ~hppa ppc ppc64 x86"
|
||||
|
||||
DESCRIPTION="A PHP debugging and profiling extension"
|
||||
HOMEPAGE="http://www.xdebug.org/"
|
||||
SRC_URI="http://pecl.php.net/get/${PN}-${MY_PV}.tgz"
|
||||
LICENSE="Xdebug"
|
||||
SLOT="0"
|
||||
IUSE=""
|
||||
|
||||
DEPEND=""
|
||||
RDEPEND="${DEPEND}
|
||||
~dev-php/xdebug-client-${PV}"
|
||||
|
||||
src_install() {
|
||||
dodoc NEWS README CREDITS
|
||||
php-ext-source-r2_src_install
|
||||
|
||||
php-ext-source-r2_addtoinifiles "xdebug.auto_trace" '"0"'
|
||||
php-ext-source-r2_addtoinifiles "xdebug.trace_output_dir" '"/tmp"'
|
||||
php-ext-source-r2_addtoinifiles "xdebug.trace_output_name" '"trace.%c"'
|
||||
php-ext-source-r2_addtoinifiles "xdebug.trace_format" '"0"'
|
||||
php-ext-source-r2_addtoinifiles "xdebug.trace_options" '"0"'
|
||||
php-ext-source-r2_addtoinifiles "xdebug.collect_includes" '"1"'
|
||||
php-ext-source-r2_addtoinifiles "xdebug.collect_params" '"0"'
|
||||
php-ext-source-r2_addtoinifiles "xdebug.collect_return" '"0"'
|
||||
php-ext-source-r2_addtoinifiles "xdebug.collect_vars" '"0"'
|
||||
php-ext-source-r2_addtoinifiles "xdebug.default_enable" '"1"'
|
||||
php-ext-source-r2_addtoinifiles "xdebug.extended_info" '"1"'
|
||||
php-ext-source-r2_addtoinifiles "xdebug.manual_url" '"http://www.php.net"'
|
||||
php-ext-source-r2_addtoinifiles "xdebug.max_nesting_level" '"100"'
|
||||
php-ext-source-r2_addtoinifiles "xdebug.show_exception_trace" '"0"'
|
||||
php-ext-source-r2_addtoinifiles "xdebug.show_local_vars" '"0"'
|
||||
php-ext-source-r2_addtoinifiles "xdebug.show_mem_delta" '"0"'
|
||||
php-ext-source-r2_addtoinifiles "xdebug.dump.COOKIE" '"NULL"'
|
||||
php-ext-source-r2_addtoinifiles "xdebug.dump.ENV" '"NULL"'
|
||||
php-ext-source-r2_addtoinifiles "xdebug.dump.FILES" '"NULL"'
|
||||
php-ext-source-r2_addtoinifiles "xdebug.dump.GET" '"NULL"'
|
||||
php-ext-source-r2_addtoinifiles "xdebug.dump.POST" '"NULL"'
|
||||
php-ext-source-r2_addtoinifiles "xdebug.dump.REQUEST" '"NULL"'
|
||||
php-ext-source-r2_addtoinifiles "xdebug.dump.SERVER" '"NULL"'
|
||||
php-ext-source-r2_addtoinifiles "xdebug.dump.SESSION" '"NULL"'
|
||||
php-ext-source-r2_addtoinifiles "xdebug.dump_globals" '"1"'
|
||||
php-ext-source-r2_addtoinifiles "xdebug.dump_once" '"1"'
|
||||
php-ext-source-r2_addtoinifiles "xdebug.dump_undefined" '"0"'
|
||||
php-ext-source-r2_addtoinifiles "xdebug.profiler_enable" '"0"'
|
||||
php-ext-source-r2_addtoinifiles "xdebug.profiler_output_dir" '"/tmp"'
|
||||
php-ext-source-r2_addtoinifiles "xdebug.profiler_output_name" '"cachegrind.out.%p"'
|
||||
php-ext-source-r2_addtoinifiles "xdebug.profiler_enable_trigger" '"0"'
|
||||
php-ext-source-r2_addtoinifiles "xdebug.profiler_append" '"0"'
|
||||
php-ext-source-r2_addtoinifiles "xdebug.profiler_aggregate" '"0"'
|
||||
php-ext-source-r2_addtoinifiles "xdebug.remote_enable" '"0"'
|
||||
php-ext-source-r2_addtoinifiles "xdebug.remote_handler" '"dbgp"'
|
||||
php-ext-source-r2_addtoinifiles "xdebug.remote_host" '"localhost"'
|
||||
php-ext-source-r2_addtoinifiles "xdebug.remote_mode" '"req"'
|
||||
php-ext-source-r2_addtoinifiles "xdebug.remote_port" '"9000"'
|
||||
php-ext-source-r2_addtoinifiles "xdebug.remote_autostart" '"0"'
|
||||
php-ext-source-r2_addtoinifiles "xdebug.remote_log" '""'
|
||||
php-ext-source-r2_addtoinifiles "xdebug.idekey" '""'
|
||||
php-ext-source-r2_addtoinifiles "xdebug.var_display_max_data" '"512"'
|
||||
php-ext-source-r2_addtoinifiles "xdebug.var_display_max_depth" '"2"'
|
||||
php-ext-source-r2_addtoinifiles "xdebug.var_display_max_children" '"128"'
|
||||
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
ewarn "We have set xdebug.default_enable to 0 (off), as xdebug can be"
|
||||
ewarn "installed as a dependency, and not all users will want xdebug to be"
|
||||
ewarn "enabled by default. If you want to enable it, you should edit the"
|
||||
ewarn "ini file and set xdebug.default_enable to 1. Alternatively you can"
|
||||
ewarn "call xdebug_enable() in your code."
|
||||
}
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue