root
7 years ago
parent
97a8e424db
commit
2609f523cb
@ -1,3 +1,2 @@
|
|||||||
DIST ebuild-mode-1.31.tar.xz 29492 SHA256 09bcea9ede052bf33bde402f472340570fb8eff67196cd69d4ea4820d84edf0e SHA512 8e4868a40966d5b56573425fe41d638ef1bc10a1161759218c22d33cbeb67ed3e1c75553c58a1f1c9e3ff0d2d8b25794404909a2bd19e76be93a037f8f3a0581 WHIRLPOOL d256a716baa2a276e62790e8996815e608c22e6bb2072f62a4089cc8b594d9e5470f7d574c33c23cc6817c74d59d1927e7591f8d8150985641ba61c50d6335c2
|
DIST ebuild-mode-1.31.tar.xz 29492 SHA256 09bcea9ede052bf33bde402f472340570fb8eff67196cd69d4ea4820d84edf0e SHA512 8e4868a40966d5b56573425fe41d638ef1bc10a1161759218c22d33cbeb67ed3e1c75553c58a1f1c9e3ff0d2d8b25794404909a2bd19e76be93a037f8f3a0581 WHIRLPOOL d256a716baa2a276e62790e8996815e608c22e6bb2072f62a4089cc8b594d9e5470f7d574c33c23cc6817c74d59d1927e7591f8d8150985641ba61c50d6335c2
|
||||||
DIST ebuild-mode-1.35.tar.xz 30404 SHA256 d35d67b4332b35aa20f7b4a5827f6bd0a5680df922a65735fa983ec20c9b6999 SHA512 d12ab98d6a0ca46b85de31b9f409e8fbf91343f6104b7b93f78dc7f5356992f48a362227e74f7157f100a28edc197e60aff877574cb6b98d30e707378c70bda9 WHIRLPOOL 7f54709cc4b490bfd9a236ad4e5b541c1434942a816d4e8f6e8602c22f57ca5732eddd316daffc3137fb07712556a575fd0707d149db7c3a713720c07faa931b
|
|
||||||
DIST ebuild-mode-1.37.tar.xz 30816 SHA256 f7368a8757036874dde542c69c26b824fe3da5241098f89a6b7d7e2665cbbf1d SHA512 1d570b213ad0c6eef8817f69c99c0862703b9bddc24477234dde542b697ba372a06bbe8e4a91179a7d528b720a7dbfc13bb92c8ea0a4d3b3b8684fa4ee0065c0 WHIRLPOOL 75928f5965bdfe66733e203588f01ab3b5de67a5958d33f41069d0793842bd9617ab0904ab71f95aeae04e0aa2f55646e4c545d6199cc1d357140b8fd1a714ab
|
DIST ebuild-mode-1.37.tar.xz 30816 SHA256 f7368a8757036874dde542c69c26b824fe3da5241098f89a6b7d7e2665cbbf1d SHA512 1d570b213ad0c6eef8817f69c99c0862703b9bddc24477234dde542b697ba372a06bbe8e4a91179a7d528b720a7dbfc13bb92c8ea0a4d3b3b8684fa4ee0065c0 WHIRLPOOL 75928f5965bdfe66733e203588f01ab3b5de67a5958d33f41069d0793842bd9617ab0904ab71f95aeae04e0aa2f55646e4c545d6199cc1d357140b8fd1a714ab
|
||||||
|
|||||||
@ -1,20 +0,0 @@
|
|||||||
# Copyright 1999-2017 Gentoo Foundation
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
|
|
||||||
EAPI=6
|
|
||||||
|
|
||||||
inherit readme.gentoo-r1 elisp
|
|
||||||
|
|
||||||
DESCRIPTION="Emacs modes for editing ebuilds and other Gentoo specific files"
|
|
||||||
HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Emacs"
|
|
||||||
SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
|
|
||||||
|
|
||||||
LICENSE="GPL-2+"
|
|
||||||
SLOT="0"
|
|
||||||
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
|
|
||||||
|
|
||||||
DOCS="ChangeLog keyword-generation.sh"
|
|
||||||
ELISP_TEXINFO="${PN}.texi"
|
|
||||||
SITEFILE="50${PN}-gentoo-1.31.el"
|
|
||||||
DOC_CONTENTS="Some optional features may require installation of additional
|
|
||||||
packages, like app-portage/gentoolkit-dev for echangelog."
|
|
||||||
@ -1,39 +0,0 @@
|
|||||||
config/bash/Makefile.am | 8 ++++----
|
|
||||||
config/bash/lxc.in | 2 --
|
|
||||||
2 files changed, 4 insertions(+), 6 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/config/bash/Makefile.am b/config/bash/Makefile.am
|
|
||||||
index b1768c9..3fbbe8e 100644
|
|
||||||
--- a/config/bash/Makefile.am
|
|
||||||
+++ b/config/bash/Makefile.am
|
|
||||||
@@ -2,12 +2,12 @@ EXTRA_DIST = lxc
|
|
||||||
|
|
||||||
if ENABLE_BASH
|
|
||||||
install-bash:
|
|
||||||
- $(MKDIR_P) $(DESTDIR)$(sysconfdir)/bash_completion.d/
|
|
||||||
- $(INSTALL_DATA) lxc $(DESTDIR)$(sysconfdir)/bash_completion.d/
|
|
||||||
+ $(MKDIR_P) $(DESTDIR)$(datarootdir)/bash-completion/completions/
|
|
||||||
+ $(INSTALL_DATA) lxc $(DESTDIR)$(datarootdir)/bash-completion/completions/
|
|
||||||
|
|
||||||
uninstall-bash:
|
|
||||||
- rm -f $(DESTDIR)$(sysconfdir)/bash_completion.d/lxc
|
|
||||||
- rmdir $(DESTDIR)$(sysconfdir)/bash_completion.d/ || :
|
|
||||||
+ rm -f $(DESTDIR)$(datarootdir)/bash-completion/completions/lxc
|
|
||||||
+ rmdir $(DESTDIR)$(datarootdir)/bash-completion/ || :
|
|
||||||
|
|
||||||
install-data-local: install-bash
|
|
||||||
uninstall-local: uninstall-bash
|
|
||||||
diff --git a/config/bash/lxc.in b/config/bash/lxc.in
|
|
||||||
index 18fd48f..8fff725 100644
|
|
||||||
--- a/config/bash/lxc.in
|
|
||||||
+++ b/config/bash/lxc.in
|
|
||||||
@@ -1,4 +1,3 @@
|
|
||||||
-have lxc-start && {
|
|
||||||
_lxc_names() {
|
|
||||||
COMPREPLY=( $( compgen -W "$( lxc-ls )" "$cur" ) )
|
|
||||||
}
|
|
||||||
@@ -100,4 +99,3 @@ have lxc-start && {
|
|
||||||
|
|
||||||
complete -o default -F _lxc-generic-o lxc-clone
|
|
||||||
complete -o default -F _lxc-generic-o lxc-start-ephemeral
|
|
||||||
-}
|
|
||||||
@ -1,2 +1,3 @@
|
|||||||
|
DIST go-flags-460c7bb0abd6e927f2767cadc91aa6ef776a98b4.tar.gz 54792 SHA256 382dbeca4e436aa1717c9a413fc53197eb3f94fbbb0b2ba3b0d1a405c9262504 SHA512 d8c748a2617d0997ad69d64530289dc53a310381ba101b942d3e7df04ef9fd79e1d26879c485cb6e8e5c710f42411dbe5b4b157cfd36a511a19c88d336f34fea WHIRLPOOL fb23a71928c1d3d1cdbb1fecaadfed843b986d2f76a9ca57b171d80051f81a886ec7d8b292b0e054d69ed9e2fd55c1f544767332334655cd01a6c83633d6e711
|
||||||
DIST lxd-2.11.tar.bz2 2407968 SHA256 829643811a711c8e3c118274d517091b4fbd4701b760e46d7f53fcc4d356455d SHA512 8269a20e0c0c0f3a3a247af15fcda3aa764cd2353d8a7aa9183646dbf19a080ce09bf31ff91a9faca3eda494460a788deabdb145a59c2aa1861f2df89c43294b WHIRLPOOL ba12b4c41969e17b5f9beaa7908ca7be18d3ce35ae27c762a556fe6d59f48962cf0ccaecc512887d40338e6e26ccdc2cdf6c89d87fd1b2028fb5e04f3a74b639
|
DIST lxd-2.11.tar.bz2 2407968 SHA256 829643811a711c8e3c118274d517091b4fbd4701b760e46d7f53fcc4d356455d SHA512 8269a20e0c0c0f3a3a247af15fcda3aa764cd2353d8a7aa9183646dbf19a080ce09bf31ff91a9faca3eda494460a788deabdb145a59c2aa1861f2df89c43294b WHIRLPOOL ba12b4c41969e17b5f9beaa7908ca7be18d3ce35ae27c762a556fe6d59f48962cf0ccaecc512887d40338e6e26ccdc2cdf6c89d87fd1b2028fb5e04f3a74b639
|
||||||
DIST lxd-2.8.tar.bz2 2317466 SHA256 57f08bd3c26ea4f32453aa163b502301ae0a80716d6de56b069eeebb35850011 SHA512 fdf906add25ab0b79ea7669ad569873a256f0cfc220ed816b0dc2c9b1e525a19e2606678d90d50c4f548b4322a2896d4c12069337f9571a9a4f6646fb6f673a5 WHIRLPOOL 049f3664e60e8f6fd98c8403db31db6e1dd5f6efed2e74b9007f9f99a4b337e9f58852253d226fc294c4bc964dd6d5d732a8a386606f206a74d83a32470dc1d3
|
DIST lxd-2.8.tar.bz2 2317466 SHA256 57f08bd3c26ea4f32453aa163b502301ae0a80716d6de56b069eeebb35850011 SHA512 fdf906add25ab0b79ea7669ad569873a256f0cfc220ed816b0dc2c9b1e525a19e2606678d90d50c4f548b4322a2896d4c12069337f9571a9a4f6646fb6f673a5 WHIRLPOOL 049f3664e60e8f6fd98c8403db31db6e1dd5f6efed2e74b9007f9f99a4b337e9f58852253d226fc294c4bc964dd6d5d732a8a386606f206a74d83a32470dc1d3
|
||||||
|
|||||||
@ -1 +1 @@
|
|||||||
DIST JDBC.3.00.JC3.tar 18447872 SHA256 b8a894c0aff02bd690d2082cb4e0e4d2f8e73ff59e3cbdafd28562346902ced7
|
DIST JDBC.3.00.JC3.tar 18447872 SHA256 b8a894c0aff02bd690d2082cb4e0e4d2f8e73ff59e3cbdafd28562346902ced7 SHA512 1f5d0848964b6e805ea735745e8af94664b55dcdf8de664d649b0b261eeac5f36ed0a6cff9bbfdd70b3b574c28b988013c97b1c2011fbcb51f21262f8dda0525 WHIRLPOOL 242e88daa3b3f7b4fbd9611e28ad3e979098d4ab3fd1f2f188843bb60301a7c1b71f20bfcb84da7ce8a9b2e0da75d2d6afc32cab878f4195955571707e6e239c
|
||||||
|
|||||||
@ -1 +1,2 @@
|
|||||||
DIST ferret-0.11.8.6.gem 617984 SHA256 c1d1bc3fe18d0496f02d11c925683c87ab994fd6e096b3ebac1652e3514e6d6e SHA512 bc545dc86abf7e818791f4f280025fd0a6ca3aad66fc4f4c6a532e995d718ee4adcdace15538cd35e068887ade059c874d8b6d72f5b02f98829d6db44b019c59 WHIRLPOOL ca148404fe29a3cf8b2e550ef73aa99dcf32654cb060f2e3d0c378e995733f8a4dadcd6f7bad6597c398caba39e06d9db0b6292ac87c23f0740f83a55da9d10c
|
DIST ferret-0.11.8.6.gem 617984 SHA256 c1d1bc3fe18d0496f02d11c925683c87ab994fd6e096b3ebac1652e3514e6d6e SHA512 bc545dc86abf7e818791f4f280025fd0a6ca3aad66fc4f4c6a532e995d718ee4adcdace15538cd35e068887ade059c874d8b6d72f5b02f98829d6db44b019c59 WHIRLPOOL ca148404fe29a3cf8b2e550ef73aa99dcf32654cb060f2e3d0c378e995733f8a4dadcd6f7bad6597c398caba39e06d9db0b6292ac87c23f0740f83a55da9d10c
|
||||||
|
DIST ferret-0.11.8.7.gem 608768 SHA256 9b22927618fbc76579665ea4cc4133edeeff8d31c2b974507f59078042048363 SHA512 ac7cafa25ade9741e0eb95d7372f6dd7ce4ea82368c69ace536b852fd5cc435d05764041ba1bddcc6098665c6e1aa7a12ac9739e45362007f726f3e7a8124df1 WHIRLPOOL 2a6a0fd154385def37243f039024e4d88c232cb42d8e0a397f16f359c0789e5dbc801ece938f0ee1a274c5b29ce02e0b330056178e4bac24a2a372b056a810b1
|
||||||
|
|||||||
@ -0,0 +1,52 @@
|
|||||||
|
# Copyright 1999-2017 Gentoo Foundation
|
||||||
|
# Distributed under the terms of the GNU General Public License v2
|
||||||
|
|
||||||
|
EAPI=5
|
||||||
|
|
||||||
|
USE_RUBY="ruby21 ruby22 ruby23 ruby24"
|
||||||
|
|
||||||
|
RUBY_FAKEGEM_NAME="ferret"
|
||||||
|
|
||||||
|
RUBY_FAKEGEM_RECIPE_TEST="none"
|
||||||
|
|
||||||
|
RUBY_FAKEGEM_TASK_DOC="doc"
|
||||||
|
RUBY_FAKEGEM_DOCDIR="doc/api"
|
||||||
|
|
||||||
|
RUBY_FAKEGEM_EXTRADOC="CHANGELOG RELEASE_CHANGES RELEASE_NOTES README.md TODO TUTORIAL.md"
|
||||||
|
|
||||||
|
inherit multilib ruby-fakegem
|
||||||
|
|
||||||
|
MY_P="${P/ruby-/}"
|
||||||
|
DESCRIPTION="A ruby indexing/searching library"
|
||||||
|
HOMEPAGE="https://github.com/jkraemer/ferret"
|
||||||
|
LICENSE="MIT"
|
||||||
|
SLOT="0"
|
||||||
|
KEYWORDS="~amd64 ~x86"
|
||||||
|
IUSE=""
|
||||||
|
|
||||||
|
RDEPEND+=" app-arch/bzip2"
|
||||||
|
DEPEND+=" app-arch/bzip2"
|
||||||
|
|
||||||
|
all_ruby_prepare() {
|
||||||
|
# Remove bundled bzlib code and use system version instead.
|
||||||
|
rm ext/BZLIB* ext/bzlib* || die
|
||||||
|
sed -i -e '14i $LDFLAGS += " -lbz2 "' ext/extconf.rb || die
|
||||||
|
|
||||||
|
# Avoid test known to fail upstream:
|
||||||
|
# https://github.com/jkraemer/ferret/issues/2
|
||||||
|
sed -i -e '/test_adding_long_url/,/^ end/ s:^:#:' \
|
||||||
|
test/unit/index/tc_index_writer.rb || die
|
||||||
|
}
|
||||||
|
|
||||||
|
each_ruby_configure() {
|
||||||
|
${RUBY} -Cext extconf.rb || die
|
||||||
|
}
|
||||||
|
|
||||||
|
each_ruby_compile() {
|
||||||
|
emake -Cext CFLAGS="${CFLAGS} -fPIC" archflag="${LDFLAGS}" V=1
|
||||||
|
cp ext/ferret_ext$(get_modname) lib/ || die
|
||||||
|
}
|
||||||
|
|
||||||
|
each_ruby_test() {
|
||||||
|
${RUBY} -Ilib test/test_all.rb || die
|
||||||
|
}
|
||||||
@ -1 +1,2 @@
|
|||||||
DIST file-tail-1.1.1.gem 23040 SHA256 1094d5b2b424a4c38abdda767238737f0122590e2ab07c7278c196ba65c0ce3d SHA512 fa9fc8a0826ca001ba775110a534dbe9f5474ad43d60a2fc3b67badaced170b099a5dab3a6499415d9ffcc493c37436b7a964d34268de053ae6d8acfe55fa42d WHIRLPOOL 37c622ef107c25d4f7cc72ffe0f06ed1c40637d5495ddd382d5e4281167811612edeb66c284f7fa1b04b04515870d2a049752f1929eb98133fc9377b51b5df88
|
DIST file-tail-1.1.1.gem 23040 SHA256 1094d5b2b424a4c38abdda767238737f0122590e2ab07c7278c196ba65c0ce3d SHA512 fa9fc8a0826ca001ba775110a534dbe9f5474ad43d60a2fc3b67badaced170b099a5dab3a6499415d9ffcc493c37436b7a964d34268de053ae6d8acfe55fa42d WHIRLPOOL 37c622ef107c25d4f7cc72ffe0f06ed1c40637d5495ddd382d5e4281167811612edeb66c284f7fa1b04b04515870d2a049752f1929eb98133fc9377b51b5df88
|
||||||
|
DIST file-tail-1.2.0.gem 19968 SHA256 152f6ca64c009c754b89f06e7636ead96e5b55413641021402118ca66b6b43d9 SHA512 ac20e5e855144f7462ef0471be08ab56e521a7b22117f1653e06624e1d81ac11d047a21a6979476bc8547dd88d90f25e51052950148acbe3ea64bdd3c35e1da3 WHIRLPOOL bfaf1a5ffb35e5fb636b7a625c074228065e2a4c6e8ca9bb8c7434bf41e215310301f7eb23d4b24b4fdcc4eb3529e069d179a50ce4146d02e499d237eff2bac4
|
||||||
|
|||||||
@ -0,0 +1,32 @@
|
|||||||
|
# Copyright 1999-2017 Gentoo Foundation
|
||||||
|
# Distributed under the terms of the GNU General Public License v2
|
||||||
|
|
||||||
|
EAPI=5
|
||||||
|
|
||||||
|
USE_RUBY="ruby21 ruby22 ruby23 ruby24"
|
||||||
|
|
||||||
|
RUBY_FAKEGEM_RECIPE_TEST="none"
|
||||||
|
|
||||||
|
RUBY_FAKEGEM_RECIPE_DOC="rdoc"
|
||||||
|
RUBY_FAKEGEM_DOC_SOURCES="lib README.md"
|
||||||
|
|
||||||
|
RUBY_FAKEGEM_EXTRADOC="CHANGES README.md"
|
||||||
|
|
||||||
|
RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
|
||||||
|
|
||||||
|
inherit ruby-fakegem
|
||||||
|
|
||||||
|
DESCRIPTION="A small ruby library that allows it to 'tail' files in Ruby"
|
||||||
|
HOMEPAGE="https://flori.github.com/file-tail"
|
||||||
|
|
||||||
|
LICENSE="GPL-2"
|
||||||
|
SLOT="0"
|
||||||
|
KEYWORDS="~amd64 ~x86"
|
||||||
|
IUSE=""
|
||||||
|
|
||||||
|
ruby_add_rdepend "=dev-ruby/tins-1*"
|
||||||
|
ruby_add_bdepend "test? ( >=dev-ruby/test-unit-2.5.1-r1 )"
|
||||||
|
|
||||||
|
each_ruby_test() {
|
||||||
|
ruby-ng_testrb-2 -Ilib tests/*_test.rb
|
||||||
|
}
|
||||||
@ -1 +1,2 @@
|
|||||||
DIST bluez-alsa-1.1.0.tar.gz 73676 SHA256 93396e581c196f9283d5907c7b8059ded21f5ec75a58f1c96f01d9ba295f5179 SHA512 167fa45994b57b0b44d5827762638d36ef782d7789c229e5c1ca99b59c13636dc53161cd45bec41e61890acd38b44d20778bc2085385582329a1c666530b21f1 WHIRLPOOL 2faba9fbd57fac2a519fe382c8a98654159a51819fea11da93ea3e198d31e51d3357bf2effa9df31713c2f201717dbd395a721efa81c9000a4da15df7e542a70
|
DIST bluez-alsa-1.1.0.tar.gz 73676 SHA256 93396e581c196f9283d5907c7b8059ded21f5ec75a58f1c96f01d9ba295f5179 SHA512 167fa45994b57b0b44d5827762638d36ef782d7789c229e5c1ca99b59c13636dc53161cd45bec41e61890acd38b44d20778bc2085385582329a1c666530b21f1 WHIRLPOOL 2faba9fbd57fac2a519fe382c8a98654159a51819fea11da93ea3e198d31e51d3357bf2effa9df31713c2f201717dbd395a721efa81c9000a4da15df7e542a70
|
||||||
|
DIST bluez-alsa-1.2.0.tar.gz 63662 SHA256 0a7a27e8cf135ec6bb30ea1a2365736681ced7d8293003c274fa78319f936838 SHA512 a6bf0068b3fb88acaa11990db411f1d3be7ad19219e7bdfd091fe81acc2ba5d5992dfb377e4fcc332ac330bb7e5ab5e4f4a9cee3e700e366fd983e81a272a5b4 WHIRLPOOL 5f4e3469b72dd375b946bb551edf318ec20e47490ec93d5fd54b0980a49a3b54f66f59f3bd65c65ce019d00f6808aa306025f0f0c045049d8fb62d7ff25f5f51
|
||||||
|
|||||||
@ -0,0 +1,58 @@
|
|||||||
|
# Copyright 1999-2017 Gentoo Foundation
|
||||||
|
# Distributed under the terms of the GNU General Public License v2
|
||||||
|
|
||||||
|
EAPI=6
|
||||||
|
inherit autotools eutils multilib-minimal
|
||||||
|
|
||||||
|
DESCRIPTION="Bluetooth Audio ALSA Backend"
|
||||||
|
HOMEPAGE="https://github.com/Arkq/bluez-alsa"
|
||||||
|
|
||||||
|
if [[ ${PV} == "9999" ]] ; then
|
||||||
|
inherit git-r3
|
||||||
|
EGIT_REPO_URI="https://github.com/Arkq/${PN}"
|
||||||
|
else
|
||||||
|
SRC_URI="https://github.com/Arkq/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
|
||||||
|
KEYWORDS="~amd64 ~x86"
|
||||||
|
fi
|
||||||
|
|
||||||
|
LICENSE="MIT"
|
||||||
|
SLOT="0"
|
||||||
|
IUSE="aac debug hcitop"
|
||||||
|
|
||||||
|
RDEPEND=">=dev-libs/glib-2.16[dbus,${MULTILIB_USEDEP}]
|
||||||
|
>=media-libs/alsa-lib-1.0[${MULTILIB_USEDEP}]
|
||||||
|
>=media-libs/sbc-1.2[${MULTILIB_USEDEP}]
|
||||||
|
>=net-wireless/bluez-5[${MULTILIB_USEDEP}]
|
||||||
|
aac? ( >=media-libs/fdk-aac-0.1.1[${MULTILIB_USEDEP}] )
|
||||||
|
hcitop? (
|
||||||
|
dev-libs/libbsd
|
||||||
|
sys-libs/ncurses:0=
|
||||||
|
)"
|
||||||
|
DEPEND="${RDEPEND}
|
||||||
|
net-libs/ortp
|
||||||
|
virtual/pkgconfig"
|
||||||
|
|
||||||
|
src_prepare() {
|
||||||
|
default
|
||||||
|
eautoreconf
|
||||||
|
}
|
||||||
|
|
||||||
|
multilib_src_configure() {
|
||||||
|
ECONF_SOURCE="${S}" \
|
||||||
|
econf \
|
||||||
|
$(use_enable aac) \
|
||||||
|
$(use_enable debug) \
|
||||||
|
$(multilib_native_use_enable hcitop)
|
||||||
|
}
|
||||||
|
|
||||||
|
multilib_src_install_all() {
|
||||||
|
default
|
||||||
|
prune_libtool_files --modules
|
||||||
|
|
||||||
|
newinitd "${FILESDIR}"/bluealsa-init.d bluealsa
|
||||||
|
newconfd "${FILESDIR}"/bluealsa-conf.d bluealsa
|
||||||
|
}
|
||||||
|
|
||||||
|
pkg_postinst() {
|
||||||
|
elog "Users can use this service when they are members of the \"audio\" group."
|
||||||
|
}
|
||||||
@ -1,3 +1,4 @@
|
|||||||
DIST ffmpeg-2.8.10.tar.bz2 8585304 SHA256 d1ce1a73503dce6e2b1e208cb93a2a8a7e89f9c64357ddc3e4da3cab33dea9c9 SHA512 1ca8b0060361c49de201afc463bcd7c9340f09bbd116dff2539653bc36411d60cdf667874d2ec51664e141ee7a7be8bebc94e158687cb97db6bdfa40f00ec193 WHIRLPOOL 4ff9271290c138ad5caa50835da9fd6685fabf5a589cb6c068cfff6698ded948d93e9d40656dca3b516f9e591119d204e6283d57f7d2f0747a4f7ef9b322ebce
|
DIST ffmpeg-2.8.10.tar.bz2 8585304 SHA256 d1ce1a73503dce6e2b1e208cb93a2a8a7e89f9c64357ddc3e4da3cab33dea9c9 SHA512 1ca8b0060361c49de201afc463bcd7c9340f09bbd116dff2539653bc36411d60cdf667874d2ec51664e141ee7a7be8bebc94e158687cb97db6bdfa40f00ec193 WHIRLPOOL 4ff9271290c138ad5caa50835da9fd6685fabf5a589cb6c068cfff6698ded948d93e9d40656dca3b516f9e591119d204e6283d57f7d2f0747a4f7ef9b322ebce
|
||||||
DIST ffmpeg-2.8.11.tar.bz2 8582471 SHA256 9987e0f6b1f66311390f807a0c18ad9c90652b5097cff17b3dcbeabdd89f8d32 SHA512 60749897dccde1ff2840be9679f6e10118c7313bbeb1b07bb36acf7f311010f484259df9a4a43e60373726de9d6b54675e1961cc7b40646107142f8f42ea1601 WHIRLPOOL 4b71d63a1bbd63ebaa90b3c581f5d2c38e1a74c37044ad80fbf44b857d3d76722d3833da53575aa744779d9dd9a3dc0e41e9706611ba0899ab23c91ad17caa5f
|
DIST ffmpeg-2.8.11.tar.bz2 8582471 SHA256 9987e0f6b1f66311390f807a0c18ad9c90652b5097cff17b3dcbeabdd89f8d32 SHA512 60749897dccde1ff2840be9679f6e10118c7313bbeb1b07bb36acf7f311010f484259df9a4a43e60373726de9d6b54675e1961cc7b40646107142f8f42ea1601 WHIRLPOOL 4b71d63a1bbd63ebaa90b3c581f5d2c38e1a74c37044ad80fbf44b857d3d76722d3833da53575aa744779d9dd9a3dc0e41e9706611ba0899ab23c91ad17caa5f
|
||||||
DIST ffmpeg-3.2.4.tar.bz2 9612274 SHA256 c0fa3593a2e9e96ace3c1757900094437ad96d1d6ca19f057c378b5f394496a4 SHA512 ba5004d0f2659faa139c7dbf2f0fc6bab1d4e017d919f4ac271a5d2e8e4a3478909176e3a4d1ad33ddf2f62ab28dd9e00ce9be1399efb7cb3276dde79134cdaa WHIRLPOOL e97a19541f990f86b8adbdc3fd20115258e5644b98a5c7f4e075f8f1320881da33fb9be969d8a5e20d79eea4c63b1c9510841b5cf0d5b479408ff231d3ba69cc
|
DIST ffmpeg-3.2.4.tar.bz2 9612274 SHA256 c0fa3593a2e9e96ace3c1757900094437ad96d1d6ca19f057c378b5f394496a4 SHA512 ba5004d0f2659faa139c7dbf2f0fc6bab1d4e017d919f4ac271a5d2e8e4a3478909176e3a4d1ad33ddf2f62ab28dd9e00ce9be1399efb7cb3276dde79134cdaa WHIRLPOOL e97a19541f990f86b8adbdc3fd20115258e5644b98a5c7f4e075f8f1320881da33fb9be969d8a5e20d79eea4c63b1c9510841b5cf0d5b479408ff231d3ba69cc
|
||||||
|
DIST ffmpeg-3.3.tar.bz2 9930192 SHA256 21e08647c9e740a4d3b85bf455b31d079fe0faba9555fa9329230e8541cf6bdc SHA512 2e6f06966362a70afa1f8ff3ba1d35896cd120d09633a4aa3d7190b2007c2a8537f944dada7b1fe26af844d17f5ecfd7ea92ac815b5bf54f5cacd7d90c963d70 WHIRLPOOL 0d5b0b45fd1c018e43e962cb5f0fd32d333caf1ef351029435267ce21232d548fb1c841046668f03c3721a703d3cf8f699e3da16e4e866ffa0fe1e883ff95f1f
|
||||||
|
|||||||
@ -0,0 +1,460 @@
|
|||||||
|
# Copyright 1999-2017 Gentoo Foundation
|
||||||
|
# Distributed under the terms of the GNU General Public License v2
|
||||||
|
|
||||||
|
EAPI=6
|
||||||
|
|
||||||
|
# Subslot: libavutil major.libavcodec major.libavformat major
|
||||||
|
# Since FFmpeg ships several libraries, subslot is kind of limited here.
|
||||||
|
# Most consumers will use those three libraries, if a "less used" library
|
||||||
|
# changes its soname, consumers will have to be rebuilt the old way
|
||||||
|
# (preserve-libs).
|
||||||
|
# If, for example, a package does not link to libavformat and only libavformat
|
||||||
|
# changes its ABI then this package will be rebuilt needlessly. Hence, such a
|
||||||
|
# package is free _not_ to := depend on FFmpeg but I would strongly encourage
|
||||||
|
# doing so since such a case is unlikely.
|
||||||
|
FFMPEG_SUBSLOT=55.57.57
|
||||||
|
|
||||||
|
SCM=""
|
||||||
|
if [ "${PV#9999}" != "${PV}" ] ; then
|
||||||
|
SCM="git-r3"
|
||||||
|
EGIT_REPO_URI="git://source.ffmpeg.org/ffmpeg.git"
|
||||||
|
fi
|
||||||
|
|
||||||
|
inherit eutils flag-o-matic multilib multilib-minimal toolchain-funcs ${SCM}
|
||||||
|
|
||||||
|
DESCRIPTION="Complete solution to record, convert and stream audio and video. Includes libavcodec"
|
||||||
|
HOMEPAGE="http://ffmpeg.org/"
|
||||||
|
if [ "${PV#9999}" != "${PV}" ] ; then
|
||||||
|
SRC_URI=""
|
||||||
|
elif [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot
|
||||||
|
SRC_URI="mirror://gentoo/${P}.tar.bz2"
|
||||||
|
else # Release
|
||||||
|
SRC_URI="http://ffmpeg.org/releases/${P/_/-}.tar.bz2"
|
||||||
|
fi
|
||||||
|
FFMPEG_REVISION="${PV#*_p}"
|
||||||
|
|
||||||
|
SLOT="0/${FFMPEG_SUBSLOT}"
|
||||||
|
LICENSE="
|
||||||
|
!gpl? ( LGPL-2.1 )
|
||||||
|
gpl? ( GPL-2 )
|
||||||
|
amr? (
|
||||||
|
gpl? ( GPL-3 )
|
||||||
|
!gpl? ( LGPL-3 )
|
||||||
|
)
|
||||||
|
gmp? (
|
||||||
|
gpl? ( GPL-3 )
|
||||||
|
!gpl? ( LGPL-3 )
|
||||||
|
)
|
||||||
|
encode? (
|
||||||
|
amrenc? (
|
||||||
|
gpl? ( GPL-3 )
|
||||||
|
!gpl? ( LGPL-3 )
|
||||||
|
)
|
||||||
|
)
|
||||||
|
samba? ( GPL-3 )
|
||||||
|
"
|
||||||
|
if [ "${PV#9999}" = "${PV}" ] ; then
|
||||||
|
KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Options to use as use_enable in the foo[:bar] form.
|
||||||
|
# This will feed configure with $(use_enable foo bar)
|
||||||
|
# or $(use_enable foo foo) if no :bar is set.
|
||||||
|
# foo is added to IUSE.
|
||||||
|
FFMPEG_FLAG_MAP=(
|
||||||
|
+bzip2:bzlib cpudetection:runtime-cpudetect debug gcrypt gnutls gmp
|
||||||
|
+gpl +hardcoded-tables +iconv lzma +network openssl +postproc
|
||||||
|
samba:libsmbclient sdl:ffplay sdl:sdl2 vaapi vdpau X:xlib xcb:libxcb
|
||||||
|
xcb:libxcb-shm xcb:libxcb-xfixes +zlib
|
||||||
|
# libavdevice options
|
||||||
|
cdio:libcdio iec61883:libiec61883 ieee1394:libdc1394 libcaca openal
|
||||||
|
opengl
|
||||||
|
# indevs
|
||||||
|
libv4l:libv4l2 pulseaudio:libpulse
|
||||||
|
# decoders
|
||||||
|
amr:libopencore-amrwb amr:libopencore-amrnb fdk:libfdk-aac
|
||||||
|
jpeg2k:libopenjpeg bluray:libbluray celt:libcelt gme:libgme gsm:libgsm
|
||||||
|
mmal modplug:libmodplug opus:libopus libilbc librtmp ssh:libssh
|
||||||
|
schroedinger:libschroedinger speex:libspeex vorbis:libvorbis vpx:libvpx
|
||||||
|
zvbi:libzvbi
|
||||||
|
# libavfilter options
|
||||||
|
bs2b:libbs2b chromaprint flite:libflite frei0r
|
||||||
|
fribidi:libfribidi fontconfig ladspa libass truetype:libfreetype
|
||||||
|
rubberband:librubberband sofalizer:netcdf zeromq:libzmq zimg:libzimg
|
||||||
|
# libswresample options
|
||||||
|
libsoxr
|
||||||
|
# Threads; we only support pthread for now but ffmpeg supports more
|
||||||
|
+threads:pthreads
|
||||||
|
)
|
||||||
|
|
||||||
|
# Same as above but for encoders, i.e. they do something only with USE=encode.
|
||||||
|
FFMPEG_ENCODER_FLAG_MAP=(
|
||||||
|
amrenc:libvo-amrwbenc mp3:libmp3lame
|
||||||
|
kvazaar:libkvazaar nvenc:nvenc
|
||||||
|
openh264:libopenh264 snappy:libsnappy theora:libtheora twolame:libtwolame
|
||||||
|
wavpack:libwavpack webp:libwebp x264:libx264 x265:libx265 xvid:libxvid
|
||||||
|
)
|
||||||
|
|
||||||
|
IUSE="
|
||||||
|
alsa doc +encode jack oss pic static-libs test v4l
|
||||||
|
${FFMPEG_FLAG_MAP[@]%:*}
|
||||||
|
${FFMPEG_ENCODER_FLAG_MAP[@]%:*}
|
||||||
|
"
|
||||||
|
|
||||||
|
# Strings for CPU features in the useflag[:configure_option] form
|
||||||
|
# if :configure_option isn't set, it will use 'useflag' as configure option
|
||||||
|
ARM_CPU_FEATURES=( armv5te armv6 armv6t2 neon armvfp:vfp )
|
||||||
|
ARM_CPU_REQUIRED_USE="arm64? ( armvfp neon )"
|
||||||
|
MIPS_CPU_FEATURES=( mipsdspr1 mipsdspr2 mipsfpu )
|
||||||
|
PPC_CPU_FEATURES=( altivec )
|
||||||
|
X86_CPU_FEATURES_RAW=( 3dnow:amd3dnow 3dnowext:amd3dnowext aes:aesni avx:avx avx2:avx2 fma3:fma3 fma4:fma4 mmx:mmx mmxext:mmxext sse:sse sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4 sse4_2:sse42 xop:xop )
|
||||||
|
X86_CPU_FEATURES=( ${X86_CPU_FEATURES_RAW[@]/#/cpu_flags_x86_} )
|
||||||
|
X86_CPU_REQUIRED_USE="
|
||||||
|
cpu_flags_x86_avx2? ( cpu_flags_x86_avx )
|
||||||
|
cpu_flags_x86_fma4? ( cpu_flags_x86_avx )
|
||||||
|
cpu_flags_x86_fma3? ( cpu_flags_x86_avx )
|
||||||
|
cpu_flags_x86_xop? ( cpu_flags_x86_avx )
|
||||||
|
cpu_flags_x86_avx? ( cpu_flags_x86_sse4_2 )
|
||||||
|
cpu_flags_x86_aes? ( cpu_flags_x86_sse4_2 )
|
||||||
|
cpu_flags_x86_sse4_2? ( cpu_flags_x86_sse4_1 )
|
||||||
|
cpu_flags_x86_sse4_1? ( cpu_flags_x86_ssse3 )
|
||||||
|
cpu_flags_x86_ssse3? ( cpu_flags_x86_sse3 )
|
||||||
|
cpu_flags_x86_sse3? ( cpu_flags_x86_sse2 )
|
||||||
|
cpu_flags_x86_sse2? ( cpu_flags_x86_sse )
|
||||||
|
cpu_flags_x86_sse? ( cpu_flags_x86_mmxext )
|
||||||
|
cpu_flags_x86_mmxext? ( cpu_flags_x86_mmx )
|
||||||
|
cpu_flags_x86_3dnowext? ( cpu_flags_x86_3dnow )
|
||||||
|
cpu_flags_x86_3dnow? ( cpu_flags_x86_mmx )
|
||||||
|
"
|
||||||
|
|
||||||
|
IUSE="${IUSE}
|
||||||
|
${ARM_CPU_FEATURES[@]%:*}
|
||||||
|
${MIPS_CPU_FEATURES[@]%:*}
|
||||||
|
${PPC_CPU_FEATURES[@]%:*}
|
||||||
|
${X86_CPU_FEATURES[@]%:*}
|
||||||
|
"
|
||||||
|
|
||||||
|
CPU_REQUIRED_USE="
|
||||||
|
${ARM_CPU_REQUIRED_USE}
|
||||||
|
${X86_CPU_REQUIRED_USE}
|
||||||
|
"
|
||||||
|
|
||||||
|
# "$(tc-arch):XXX" form where XXX_CPU_FEATURES are the cpu features that apply to
|
||||||
|
# $(tc-arch).
|
||||||
|
CPU_FEATURES_MAP="
|
||||||
|
arm:ARM
|
||||||
|
arm64:ARM
|
||||||
|
mips:MIPS
|
||||||
|
ppc:PPC
|
||||||
|
ppc64:PPC
|
||||||
|
x86:X86
|
||||||
|
amd64:X86
|
||||||
|
"
|
||||||
|
|
||||||
|
FFTOOLS=( aviocat cws2fws ffescape ffeval ffhash fourcc2pixfmt graph2dot ismindex pktdumper qt-faststart sidxindex trasher )
|
||||||
|
IUSE="${IUSE} ${FFTOOLS[@]/#/+fftools_}"
|
||||||
|
|
||||||
|
RDEPEND="
|
||||||
|
alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
|
||||||
|
amr? ( >=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}] )
|
||||||
|
bluray? ( >=media-libs/libbluray-0.3.0-r1:=[${MULTILIB_USEDEP}] )
|
||||||
|
bs2b? ( >=media-libs/libbs2b-3.1.0-r1[${MULTILIB_USEDEP}] )
|
||||||
|
bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
|
||||||
|
cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}] )
|
||||||
|
celt? ( >=media-libs/celt-0.11.1-r1[${MULTILIB_USEDEP}] )
|
||||||
|
chromaprint? ( >=media-libs/chromaprint-1.2-r1[${MULTILIB_USEDEP}] )
|
||||||
|
encode? (
|
||||||
|
amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] )
|
||||||
|
kvazaar? ( media-libs/kvazaar[${MULTILIB_USEDEP}] )
|
||||||
|
mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] )
|
||||||
|
nvenc? ( media-video/nvidia_video_sdk )
|
||||||
|
openh264? ( >=media-libs/openh264-1.4.0-r1[${MULTILIB_USEDEP}] )
|
||||||
|
snappy? ( >=app-arch/snappy-1.1.2-r1[${MULTILIB_USEDEP}] )
|
||||||
|
theora? (
|
||||||
|
>=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}]
|
||||||
|
>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
|
||||||
|
)
|
||||||
|
twolame? ( >=media-sound/twolame-0.3.13-r1[${MULTILIB_USEDEP}] )
|
||||||
|
wavpack? ( >=media-sound/wavpack-4.60.1-r1[${MULTILIB_USEDEP}] )
|
||||||
|
webp? ( >=media-libs/libwebp-0.3.0[${MULTILIB_USEDEP}] )
|
||||||
|
x264? ( >=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}] )
|
||||||
|
x265? ( >=media-libs/x265-1.6:=[${MULTILIB_USEDEP}] )
|
||||||
|
xvid? ( >=media-libs/xvid-1.3.2-r1[${MULTILIB_USEDEP}] )
|
||||||
|
)
|
||||||
|
fdk? ( >=media-libs/fdk-aac-0.1.3:=[${MULTILIB_USEDEP}] )
|
||||||
|
flite? ( >=app-accessibility/flite-1.4-r4[${MULTILIB_USEDEP}] )
|
||||||
|
fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
|
||||||
|
frei0r? ( media-plugins/frei0r-plugins )
|
||||||
|
fribidi? ( >=dev-libs/fribidi-0.19.6[${MULTILIB_USEDEP}] )
|
||||||
|
gcrypt? ( >=dev-libs/libgcrypt-1.6:0=[${MULTILIB_USEDEP}] )
|
||||||
|
gme? ( >=media-libs/game-music-emu-0.6.0[${MULTILIB_USEDEP}] )
|
||||||
|
gmp? ( >=dev-libs/gmp-6:0=[${MULTILIB_USEDEP}] )
|
||||||
|
gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[${MULTILIB_USEDEP}] )
|
||||||
|
gsm? ( >=media-sound/gsm-1.0.13-r1[${MULTILIB_USEDEP}] )
|
||||||
|
iconv? ( >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] )
|
||||||
|
iec61883? (
|
||||||
|
>=media-libs/libiec61883-1.2.0-r1[${MULTILIB_USEDEP}]
|
||||||
|
>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
|
||||||
|
>=sys-libs/libavc1394-0.5.4-r1[${MULTILIB_USEDEP}]
|
||||||
|
)
|
||||||
|
ieee1394? (
|
||||||
|
>=media-libs/libdc1394-2.2.1[${MULTILIB_USEDEP}]
|
||||||
|
>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
|
||||||
|
)
|
||||||
|
jack? ( virtual/jack[${MULTILIB_USEDEP}] )
|
||||||
|
jpeg2k? ( >=media-libs/openjpeg-2:2[${MULTILIB_USEDEP}] )
|
||||||
|
libass? ( >=media-libs/libass-0.10.2:=[${MULTILIB_USEDEP}] )
|
||||||
|
libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[${MULTILIB_USEDEP}] )
|
||||||
|
libilbc? ( >=media-libs/libilbc-2[${MULTILIB_USEDEP}] )
|
||||||
|
libsoxr? ( >=media-libs/soxr-0.1.0[${MULTILIB_USEDEP}] )
|
||||||
|
libv4l? ( >=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}] )
|
||||||
|
lzma? ( >=app-arch/xz-utils-5.0.5-r1[${MULTILIB_USEDEP}] )
|
||||||
|
mmal? ( media-libs/raspberrypi-userland )
|
||||||
|
modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] )
|
||||||
|
openal? ( >=media-libs/openal-1.15.1[${MULTILIB_USEDEP}] )
|
||||||
|
opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
|
||||||
|
openssl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
|
||||||
|
opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] )
|
||||||
|
pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
|
||||||
|
librtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
|
||||||
|
rubberband? ( >=media-libs/rubberband-1.8.1-r1[${MULTILIB_USEDEP}] )
|
||||||
|
samba? ( >=net-fs/samba-3.6.23-r1[${MULTILIB_USEDEP}] )
|
||||||
|
schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[${MULTILIB_USEDEP}] )
|
||||||
|
sdl? ( media-libs/libsdl2[sound,video,${MULTILIB_USEDEP}] )
|
||||||
|
sofalizer? (
|
||||||
|
>=sci-libs/netcdf-4.3.2-r1[hdf5]
|
||||||
|
>=sci-libs/hdf5-1.8.18[hl]
|
||||||
|
)
|
||||||
|
speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
|
||||||
|
ssh? ( >=net-libs/libssh-0.5.5[${MULTILIB_USEDEP}] )
|
||||||
|
truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
|
||||||
|
vaapi? ( >=x11-libs/libva-1.2.1-r1[${MULTILIB_USEDEP}] )
|
||||||
|
vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] )
|
||||||
|
vorbis? (
|
||||||
|
>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
|
||||||
|
>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
|
||||||
|
)
|
||||||
|
vpx? ( >=media-libs/libvpx-1.4.0:=[${MULTILIB_USEDEP}] )
|
||||||
|
X? (
|
||||||
|
>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
|
||||||
|
>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
|
||||||
|
>=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}]
|
||||||
|
)
|
||||||
|
xcb? ( >=x11-libs/libxcb-1.4[${MULTILIB_USEDEP}] )
|
||||||
|
zeromq? ( >=net-libs/zeromq-4.1.6 )
|
||||||
|
zimg? ( >=media-libs/zimg-2.4:=[${MULTILIB_USEDEP}] )
|
||||||
|
zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
|
||||||
|
zvbi? ( >=media-libs/zvbi-0.2.35[${MULTILIB_USEDEP}] )
|
||||||
|
!media-video/qt-faststart
|
||||||
|
postproc? ( !media-libs/libpostproc )
|
||||||
|
"
|
||||||
|
|
||||||
|
DEPEND="${RDEPEND}
|
||||||
|
>=sys-devel/make-3.81
|
||||||
|
doc? ( sys-apps/texinfo )
|
||||||
|
>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
|
||||||
|
ladspa? ( >=media-libs/ladspa-sdk-1.13-r2[${MULTILIB_USEDEP}] )
|
||||||
|
cpu_flags_x86_mmx? ( >=dev-lang/yasm-1.2 )
|
||||||
|
test? ( net-misc/wget sys-devel/bc )
|
||||||
|
v4l? ( sys-kernel/linux-headers )
|
||||||
|
"
|
||||||
|
|
||||||
|
RDEPEND="${RDEPEND}
|
||||||
|
abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3
|
||||||
|
!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
|
||||||
|
|
||||||
|
# Code requiring FFmpeg to be built under gpl license
|
||||||
|
GPL_REQUIRED_USE="
|
||||||
|
postproc? ( gpl )
|
||||||
|
frei0r? ( gpl )
|
||||||
|
cdio? ( gpl )
|
||||||
|
samba? ( gpl )
|
||||||
|
encode? (
|
||||||
|
x264? ( gpl )
|
||||||
|
x265? ( gpl )
|
||||||
|
xvid? ( gpl )
|
||||||
|
X? ( !xcb? ( gpl ) )
|
||||||
|
)
|
||||||
|
"
|
||||||
|
REQUIRED_USE="
|
||||||
|
libv4l? ( v4l )
|
||||||
|
fftools_cws2fws? ( zlib )
|
||||||
|
test? ( encode )
|
||||||
|
${GPL_REQUIRED_USE}
|
||||||
|
${CPU_REQUIRED_USE}"
|
||||||
|
RESTRICT="
|
||||||
|
gpl? ( openssl? ( bindist ) fdk? ( bindist ) )
|
||||||
|
"
|
||||||
|
|
||||||
|
S=${WORKDIR}/${P/_/-}
|
||||||
|
|
||||||
|
MULTILIB_WRAPPED_HEADERS=(
|
||||||
|
/usr/include/libavutil/avconfig.h
|
||||||
|
)
|
||||||
|
|
||||||
|
src_prepare() {
|
||||||
|
if [[ "${PV%_p*}" != "${PV}" ]] ; then # Snapshot
|
||||||
|
export revision=git-N-${FFMPEG_REVISION}
|
||||||
|
fi
|
||||||
|
default
|
||||||
|
}
|
||||||
|
|
||||||
|
multilib_src_configure() {
|
||||||
|
local myconf=( ${EXTRA_FFMPEG_CONF} )
|
||||||
|
|
||||||
|
local ffuse=( "${FFMPEG_FLAG_MAP[@]}" )
|
||||||
|
use openssl && use gpl && myconf+=( --enable-nonfree )
|
||||||
|
use samba && myconf+=( --enable-version3 )
|
||||||
|
|
||||||
|
# Encoders
|
||||||
|
if use encode ; then
|
||||||
|
ffuse+=( "${FFMPEG_ENCODER_FLAG_MAP[@]}" )
|
||||||
|
|
||||||
|
# Licensing.
|
||||||
|
if use amrenc ; then
|
||||||
|
myconf+=( --enable-version3 )
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
myconf+=( --disable-encoders )
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Indevs
|
||||||
|
use v4l || myconf+=( --disable-indev=v4l2 --disable-outdev=v4l2 )
|
||||||
|
for i in alsa oss jack ; do
|
||||||
|
use ${i} || myconf+=( --disable-indev=${i} )
|
||||||
|
done
|
||||||
|
|
||||||
|
# Outdevs
|
||||||
|
for i in alsa oss sdl ; do
|
||||||
|
use ${i} || myconf+=( --disable-outdev=${i} )
|
||||||
|
done
|
||||||
|
|
||||||
|
# Decoders
|
||||||
|
use amr && myconf+=( --enable-version3 )
|
||||||
|
use gmp && myconf+=( --enable-version3 )
|
||||||
|
use fdk && use gpl && myconf+=( --enable-nonfree )
|
||||||
|
|
||||||
|
for i in "${ffuse[@]#+}" ; do
|
||||||
|
myconf+=( $(use_enable ${i%:*} ${i#*:}) )
|
||||||
|
done
|
||||||
|
|
||||||
|
# (temporarily) disable non-multilib deps
|
||||||
|
if ! multilib_is_native_abi; then
|
||||||
|
for i in frei0r netcdf libzmq ; do
|
||||||
|
myconf+=( --disable-${i} )
|
||||||
|
done
|
||||||
|
fi
|
||||||
|
|
||||||
|
# CPU features
|
||||||
|
for i in ${CPU_FEATURES_MAP} ; do
|
||||||
|
if [ "$(tc-arch)" = "${i%:*}" ] ; then
|
||||||
|
local var="${i#*:}_CPU_FEATURES[@]"
|
||||||
|
for j in ${!var} ; do
|
||||||
|
use ${j%:*} || myconf+=( --disable-${j#*:} )
|
||||||
|
done
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
|
||||||
|
if use pic ; then
|
||||||
|
myconf+=( --enable-pic )
|
||||||
|
# disable asm code if PIC is required
|
||||||
|
# as the provided asm decidedly is not PIC for x86.
|
||||||
|
[[ ${ABI} == x86 ]] && myconf+=( --disable-asm )
|
||||||
|
fi
|
||||||
|
[[ ${ABI} == x32 ]] && myconf+=( --disable-asm ) #427004
|
||||||
|
|
||||||
|
# Try to get cpu type based on CFLAGS.
|
||||||
|
# Bug #172723
|
||||||
|
# We need to do this so that features of that CPU will be better used
|
||||||
|
# If they contain an unknown CPU it will not hurt since ffmpeg's configure
|
||||||
|
# will just ignore it.
|
||||||
|
for i in $(get-flag mcpu) $(get-flag march) ; do
|
||||||
|
[[ ${i} = native ]] && i="host" # bug #273421
|
||||||
|
myconf+=( --cpu=${i} )
|
||||||
|
break
|
||||||
|
done
|
||||||
|
|
||||||
|
# LTO support, bug #566282
|
||||||
|
is-flagq "-flto*" && myconf+=( "--enable-lto" )
|
||||||
|
|
||||||
|
# Mandatory configuration
|
||||||
|
myconf=(
|
||||||
|
--enable-avfilter
|
||||||
|
--enable-avresample
|
||||||
|
--disable-stripping
|
||||||
|
"${myconf[@]}"
|
||||||
|
)
|
||||||
|
|
||||||
|
# cross compile support
|
||||||
|
if tc-is-cross-compiler ; then
|
||||||
|
myconf+=( --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}- )
|
||||||
|
case ${CHOST} in
|
||||||
|
*freebsd*)
|
||||||
|
myconf+=( --target-os=freebsd )
|
||||||
|
;;
|
||||||
|
*mingw32*)
|
||||||
|
myconf+=( --target-os=mingw32 )
|
||||||
|
;;
|
||||||
|
*linux*)
|
||||||
|
myconf+=( --target-os=linux )
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
fi
|
||||||
|
|
||||||
|
# doc
|
||||||
|
myconf+=(
|
||||||
|
$(multilib_native_use_enable doc)
|
||||||
|
$(multilib_native_use_enable doc htmlpages)
|
||||||
|
$(multilib_native_enable manpages)
|
||||||
|
)
|
||||||
|
|
||||||
|
set -- "${S}/configure" \
|
||||||
|
--prefix="${EPREFIX}/usr" \
|
||||||
|
--libdir="${EPREFIX}/usr/$(get_libdir)" \
|
||||||
|
--shlibdir="${EPREFIX}/usr/$(get_libdir)" \
|
||||||
|
--docdir="${EPREFIX}/usr/share/doc/${PF}/html" \
|
||||||
|
--mandir="${EPREFIX}/usr/share/man" \
|
||||||
|
--enable-shared \
|
||||||
|
--cc="$(tc-getCC)" \
|
||||||
|
--cxx="$(tc-getCXX)" \
|
||||||
|
--ar="$(tc-getAR)" \
|
||||||
|
--optflags="${CFLAGS}" \
|
||||||
|
$(use_enable static-libs static) \
|
||||||
|
"${myconf[@]}"
|
||||||
|
echo "${@}"
|
||||||
|
"${@}" || die
|
||||||
|
}
|
||||||
|
|
||||||
|
multilib_src_compile() {
|
||||||
|
emake V=1
|
||||||
|
|
||||||
|
if multilib_is_native_abi; then
|
||||||
|
for i in "${FFTOOLS[@]}" ; do
|
||||||
|
if use fftools_${i} ; then
|
||||||
|
emake V=1 tools/${i}
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
multilib_src_install() {
|
||||||
|
emake V=1 DESTDIR="${D}" install install-doc
|
||||||
|
|
||||||
|
if multilib_is_native_abi; then
|
||||||
|
for i in "${FFTOOLS[@]}" ; do
|
||||||
|
if use fftools_${i} ; then
|
||||||
|
dobin tools/${i}
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
multilib_src_install_all() {
|
||||||
|
dodoc Changelog README.md CREDITS doc/*.txt doc/APIchanges
|
||||||
|
[ -f "RELEASE_NOTES" ] && dodoc "RELEASE_NOTES"
|
||||||
|
}
|
||||||
|
|
||||||
|
multilib_src_test() {
|
||||||
|
LD_LIBRARY_PATH="${BUILD_DIR}/libpostproc:${BUILD_DIR}/libswscale:${BUILD_DIR}/libswresample:${BUILD_DIR}/libavcodec:${BUILD_DIR}/libavdevice:${BUILD_DIR}/libavfilter:${BUILD_DIR}/libavformat:${BUILD_DIR}/libavutil:${BUILD_DIR}/libavresample" \
|
||||||
|
emake V=1 fate
|
||||||
|
}
|
||||||
@ -1 +1 @@
|
|||||||
Fri, 14 Apr 2017 03:09:48 +0000
|
Fri, 14 Apr 2017 11:09:49 +0000
|
||||||
|
|||||||
@ -1 +1 @@
|
|||||||
Fri, 14 Apr 2017 03:09:48 +0000
|
Fri, 14 Apr 2017 11:09:49 +0000
|
||||||
|
|||||||
@ -1,12 +0,0 @@
|
|||||||
DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
|
|
||||||
DEPEND=>=virtual/emacs-23
|
|
||||||
DESCRIPTION=Emacs modes for editing ebuilds and other Gentoo specific files
|
|
||||||
EAPI=6
|
|
||||||
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Emacs
|
|
||||||
KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
|
|
||||||
LICENSE=GPL-2+
|
|
||||||
RDEPEND=>=virtual/emacs-23
|
|
||||||
SLOT=0
|
|
||||||
SRC_URI=https://dev.gentoo.org/~ulm/emacs/ebuild-mode-1.35.tar.xz
|
|
||||||
_eclasses_=elisp 571fd9c6c9d8b71c8461bb9f33e135ab elisp-common 19ff54b35acd0bf2a14831a308a57753 readme.gentoo-r1 6f03e110529650f57fc7d1fb908b8986
|
|
||||||
_md5_=994e35633c78cff9ba0023473d5580b6
|
|
||||||
@ -0,0 +1,14 @@
|
|||||||
|
DEFINED_PHASES=compile configure install prepare setup test unpack
|
||||||
|
DEPEND=app-arch/bzip2 ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
|
||||||
|
DESCRIPTION=A ruby indexing/searching library
|
||||||
|
EAPI=5
|
||||||
|
HOMEPAGE=https://github.com/jkraemer/ferret
|
||||||
|
IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
|
||||||
|
KEYWORDS=~amd64 ~x86
|
||||||
|
LICENSE=MIT
|
||||||
|
RDEPEND=app-arch/bzip2 ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
|
||||||
|
REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
|
||||||
|
SLOT=0
|
||||||
|
SRC_URI=mirror://rubygems/ferret-0.11.8.7.gem
|
||||||
|
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 epunt-cxx f8073339d152f56626493f43d8ba4691 estack 5ac2a138d0b33354b764d84f9e835db8 eutils e7491451996e8b54c3caeb713285b0fb java-utils-2 1971a6927fcd7ec839f7e12b28a24bdd ltprune 2770eed66a9b8ef944714cd0e968182e multilib 0236be304ee52e7f179ed2f337075515 ruby-fakegem e081b7d03e9e4ab4beba3ea9f44468d1 ruby-ng 2abd9e38aac141db06ae38bf32e748cd ruby-utils e9d0baddf239294b286da449ae7ac6a3 toolchain-funcs 6eb35f81556258a4bc9182ad3dfd58ee versionator c80ccf29e90adea7c5cae94b42eb76d0
|
||||||
|
_md5_=e8921ebdb9c30839f7ac755e9b2473e1
|
||||||
@ -0,0 +1,14 @@
|
|||||||
|
DEFINED_PHASES=compile configure install prepare setup test unpack
|
||||||
|
DEPEND=test? ( ruby_targets_ruby21? ( =dev-ruby/tins-1*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( =dev-ruby/tins-1*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( =dev-ruby/tins-1*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( =dev-ruby/tins-1*[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
|
||||||
|
DESCRIPTION=A small ruby library that allows it to 'tail' files in Ruby
|
||||||
|
EAPI=5
|
||||||
|
HOMEPAGE=https://flori.github.com/file-tail
|
||||||
|
IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
|
||||||
|
KEYWORDS=~amd64 ~x86
|
||||||
|
LICENSE=GPL-2
|
||||||
|
RDEPEND=ruby_targets_ruby21? ( =dev-ruby/tins-1*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( =dev-ruby/tins-1*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( =dev-ruby/tins-1*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( =dev-ruby/tins-1*[ruby_targets_ruby24] ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
|
||||||
|
REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
|
||||||
|
SLOT=0
|
||||||
|
SRC_URI=mirror://rubygems/file-tail-1.2.0.gem
|
||||||
|
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 epunt-cxx f8073339d152f56626493f43d8ba4691 estack 5ac2a138d0b33354b764d84f9e835db8 eutils e7491451996e8b54c3caeb713285b0fb java-utils-2 1971a6927fcd7ec839f7e12b28a24bdd ltprune 2770eed66a9b8ef944714cd0e968182e multilib 0236be304ee52e7f179ed2f337075515 ruby-fakegem e081b7d03e9e4ab4beba3ea9f44468d1 ruby-ng 2abd9e38aac141db06ae38bf32e748cd ruby-utils e9d0baddf239294b286da449ae7ac6a3 toolchain-funcs 6eb35f81556258a4bc9182ad3dfd58ee versionator c80ccf29e90adea7c5cae94b42eb76d0
|
||||||
|
_md5_=f598b44db529f410daae92737e1d7331
|
||||||
@ -1,14 +1,14 @@
|
|||||||
DEFINED_PHASES=compile configure install prepare setup test unpack
|
DEFINED_PHASES=compile configure install prepare setup test unpack
|
||||||
DEPEND=test? ( ~net-analyzer/rrdtool-1.5.5[graph] ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
|
DEPEND=test? ( ~net-analyzer/rrdtool-1.5.5[graph] ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 )
|
||||||
DESCRIPTION=Ruby bindings for rrdtool
|
DESCRIPTION=Ruby bindings for rrdtool
|
||||||
EAPI=5
|
EAPI=5
|
||||||
HOMEPAGE=http://oss.oetiker.ch/rrdtool/
|
HOMEPAGE=http://oss.oetiker.ch/rrdtool/
|
||||||
IUSE=graph test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22
|
IUSE=graph test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24
|
||||||
KEYWORDS=alpha amd64 ~arm hppa ~mips ~ppc ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris
|
KEYWORDS=alpha amd64 ~arm hppa ~mips ~ppc ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris
|
||||||
LICENSE=GPL-2
|
LICENSE=GPL-2
|
||||||
RDEPEND=~net-analyzer/rrdtool-1.5.5[graph=] ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
|
RDEPEND=~net-analyzer/rrdtool-1.5.5[graph=] ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 )
|
||||||
REQUIRED_USE=test? ( graph ) || ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
|
REQUIRED_USE=test? ( graph ) || ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
|
||||||
SLOT=0
|
SLOT=0
|
||||||
SRC_URI=http://oss.oetiker.ch/rrdtool/pub/rrdtool-1.5.5.tar.gz
|
SRC_URI=http://oss.oetiker.ch/rrdtool/pub/rrdtool-1.5.5.tar.gz
|
||||||
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 epunt-cxx f8073339d152f56626493f43d8ba4691 estack 5ac2a138d0b33354b764d84f9e835db8 eutils e7491451996e8b54c3caeb713285b0fb java-utils-2 1971a6927fcd7ec839f7e12b28a24bdd ltprune 2770eed66a9b8ef944714cd0e968182e multilib 0236be304ee52e7f179ed2f337075515 ruby-ng 2abd9e38aac141db06ae38bf32e748cd ruby-utils e9d0baddf239294b286da449ae7ac6a3 toolchain-funcs 6eb35f81556258a4bc9182ad3dfd58ee versionator c80ccf29e90adea7c5cae94b42eb76d0
|
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 epunt-cxx f8073339d152f56626493f43d8ba4691 estack 5ac2a138d0b33354b764d84f9e835db8 eutils e7491451996e8b54c3caeb713285b0fb java-utils-2 1971a6927fcd7ec839f7e12b28a24bdd ltprune 2770eed66a9b8ef944714cd0e968182e multilib 0236be304ee52e7f179ed2f337075515 ruby-ng 2abd9e38aac141db06ae38bf32e748cd ruby-utils e9d0baddf239294b286da449ae7ac6a3 toolchain-funcs 6eb35f81556258a4bc9182ad3dfd58ee versionator c80ccf29e90adea7c5cae94b42eb76d0
|
||||||
_md5_=bcba2f57c31c4e936ea44b77f3bd084d
|
_md5_=a19cb99380e28db85f86b76d6254b678
|
||||||
|
|||||||
@ -1,14 +1,14 @@
|
|||||||
DEFINED_PHASES=compile configure install prepare setup test unpack
|
DEFINED_PHASES=compile configure install prepare setup test unpack
|
||||||
DEPEND=test? ( ~net-analyzer/rrdtool-1.6.0[graph] ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
|
DEPEND=test? ( ~net-analyzer/rrdtool-1.6.0[graph] ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 )
|
||||||
DESCRIPTION=Ruby bindings for rrdtool
|
DESCRIPTION=Ruby bindings for rrdtool
|
||||||
EAPI=5
|
EAPI=5
|
||||||
HOMEPAGE=http://oss.oetiker.ch/rrdtool/
|
HOMEPAGE=http://oss.oetiker.ch/rrdtool/
|
||||||
IUSE=graph test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22
|
IUSE=graph test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24
|
||||||
KEYWORDS=alpha ~amd64 arm hppa ~mips ppc ppc64 ~s390 ~sh x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris
|
KEYWORDS=alpha ~amd64 arm hppa ~mips ppc ppc64 ~s390 ~sh x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris
|
||||||
LICENSE=GPL-2
|
LICENSE=GPL-2
|
||||||
RDEPEND=~net-analyzer/rrdtool-1.6.0[graph=] ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
|
RDEPEND=~net-analyzer/rrdtool-1.6.0[graph=] ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 )
|
||||||
REQUIRED_USE=test? ( graph ) || ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
|
REQUIRED_USE=test? ( graph ) || ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
|
||||||
SLOT=0
|
SLOT=0
|
||||||
SRC_URI=http://oss.oetiker.ch/rrdtool/pub/rrdtool-1.6.0.tar.gz
|
SRC_URI=http://oss.oetiker.ch/rrdtool/pub/rrdtool-1.6.0.tar.gz
|
||||||
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 epunt-cxx f8073339d152f56626493f43d8ba4691 estack 5ac2a138d0b33354b764d84f9e835db8 eutils e7491451996e8b54c3caeb713285b0fb java-utils-2 1971a6927fcd7ec839f7e12b28a24bdd ltprune 2770eed66a9b8ef944714cd0e968182e multilib 0236be304ee52e7f179ed2f337075515 ruby-ng 2abd9e38aac141db06ae38bf32e748cd ruby-utils e9d0baddf239294b286da449ae7ac6a3 toolchain-funcs 6eb35f81556258a4bc9182ad3dfd58ee versionator c80ccf29e90adea7c5cae94b42eb76d0
|
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 epunt-cxx f8073339d152f56626493f43d8ba4691 estack 5ac2a138d0b33354b764d84f9e835db8 eutils e7491451996e8b54c3caeb713285b0fb java-utils-2 1971a6927fcd7ec839f7e12b28a24bdd ltprune 2770eed66a9b8ef944714cd0e968182e multilib 0236be304ee52e7f179ed2f337075515 ruby-ng 2abd9e38aac141db06ae38bf32e748cd ruby-utils e9d0baddf239294b286da449ae7ac6a3 toolchain-funcs 6eb35f81556258a4bc9182ad3dfd58ee versionator c80ccf29e90adea7c5cae94b42eb76d0
|
||||||
_md5_=939fb81218abf6a60d53263540bf9fe1
|
_md5_=8f4c191eaee43eedc175ccf7256342a9
|
||||||
|
|||||||
@ -0,0 +1,13 @@
|
|||||||
|
DEFINED_PHASES=compile configure install postinst prepare test
|
||||||
|
DEPEND=>=dev-libs/glib-2.16[dbus,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/alsa-lib-1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/sbc-1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-wireless/bluez-5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] aac? ( >=media-libs/fdk-aac-0.1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) hcitop? ( dev-libs/libbsd sys-libs/ncurses:0= ) net-libs/ortp virtual/pkgconfig >=app-portage/elt-patches-20170317 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
|
||||||
|
DESCRIPTION=Bluetooth Audio ALSA Backend
|
||||||
|
EAPI=6
|
||||||
|
HOMEPAGE=https://github.com/Arkq/bluez-alsa
|
||||||
|
IUSE=aac debug hcitop abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
|
||||||
|
KEYWORDS=~amd64 ~x86
|
||||||
|
LICENSE=MIT
|
||||||
|
RDEPEND=>=dev-libs/glib-2.16[dbus,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/alsa-lib-1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/sbc-1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-wireless/bluez-5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] aac? ( >=media-libs/fdk-aac-0.1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) hcitop? ( dev-libs/libbsd sys-libs/ncurses:0= )
|
||||||
|
SLOT=0
|
||||||
|
SRC_URI=https://github.com/Arkq/bluez-alsa/archive/v1.2.0.tar.gz -> bluez-alsa-1.2.0.tar.gz
|
||||||
|
_eclasses_=autotools 7027963e8e8cc12c91117bdb9225dc26 epatch 8233751dc5105a6ae8fcd86ce2bb0247 epunt-cxx f8073339d152f56626493f43d8ba4691 estack 5ac2a138d0b33354b764d84f9e835db8 eutils e7491451996e8b54c3caeb713285b0fb libtool e32ea84bf82cf8987965b574672dba93 ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 0236be304ee52e7f179ed2f337075515 multilib-build eed53a6313267c9fbcd35fc384bd0087 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 toolchain-funcs 6eb35f81556258a4bc9182ad3dfd58ee
|
||||||
|
_md5_=c22019c2ab07ebf235210d138c24cf8d
|
||||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@ -1,9 +1,9 @@
|
|||||||
DEFINED_PHASES=install
|
DEFINED_PHASES=-
|
||||||
DESCRIPTION=Miscellaneous helpers for AIX (currently just ldd)
|
DESCRIPTION=Miscellaneous helpers for AIX (currently just ldd)
|
||||||
EAPI=0
|
EAPI=6
|
||||||
HOMEPAGE=https://www.gentoo.org/proj/en/gentoo-alt/prefix/
|
HOMEPAGE=https://prefix.gentoo.org
|
||||||
KEYWORDS=~ppc-aix
|
KEYWORDS=~ppc-aix
|
||||||
LICENSE=GPL-2
|
LICENSE=GPL-2
|
||||||
SLOT=0
|
SLOT=0
|
||||||
SRC_URI=https://dev.gentoo.org/~haubi/distfiles/aix-miscutils-0.1.1671.tar.bz2
|
SRC_URI=https://dev.gentoo.org/~haubi/distfiles/aix-miscutils-0.1.1671.tar.bz2
|
||||||
_md5_=a857a2ae3f43eef1c4659601ced391c0
|
_md5_=1c2bccde4e14912210ab525e2840aa5b
|
||||||
|
|||||||
@ -1,10 +1,10 @@
|
|||||||
DEFINED_PHASES=install
|
DEFINED_PHASES=install unpack
|
||||||
DESCRIPTION=Chained EPREFIX utilities and wrappers
|
DESCRIPTION=Chained EPREFIX utilities and wrappers
|
||||||
EAPI=0
|
EAPI=6
|
||||||
HOMEPAGE=https://dev.gentoo.org/~haubi
|
HOMEPAGE=https://dev.gentoo.org/~haubi
|
||||||
KEYWORDS=~ppc-aix ~x86-linux ~sparc-solaris ~x86-solaris ~x86-winnt
|
KEYWORDS=~ppc-aix ~x86-linux ~sparc-solaris ~x86-solaris ~x86-winnt
|
||||||
LICENSE=GPL-3
|
LICENSE=GPL-3
|
||||||
RDEPEND=sys-devel/gcc-config
|
RDEPEND=sys-devel/gcc-config
|
||||||
SLOT=0
|
SLOT=0
|
||||||
_eclasses_=prefix df8265631f8bf5f5df387e9b987121f9
|
_eclasses_=prefix df8265631f8bf5f5df387e9b987121f9
|
||||||
_md5_=d6eeac257b12c3ea88d75df5e72f7ad0
|
_md5_=7223b5840b2fd70d1c9132826e55a41c
|
||||||
|
|||||||
@ -1,10 +1,10 @@
|
|||||||
DEFINED_PHASES=compile install postinst
|
DEFINED_PHASES=compile install postinst
|
||||||
DESCRIPTION=pgrep(1) and pkill(1) for Darwin
|
DESCRIPTION=pgrep(1) and pkill(1) for Darwin
|
||||||
EAPI=3
|
EAPI=6
|
||||||
HOMEPAGE=https://sourceforge.net/p/pkilldarwin/code/ci/default/tree/
|
HOMEPAGE=https://sourceforge.net/p/pkilldarwin/code/ci/default/tree/
|
||||||
KEYWORDS=~ppc-macos ~x86-macos ~x64-macos
|
KEYWORDS=~ppc-macos ~x86-macos ~x64-macos
|
||||||
LICENSE=BSD
|
LICENSE=BSD
|
||||||
SLOT=0
|
SLOT=0
|
||||||
SRC_URI=https://www.gentoo.org/~grobian/distfiles/pkill-darwin-1.0.tar.xz
|
SRC_URI=https://www.gentoo.org/~grobian/distfiles/pkill-darwin-1.0.tar.xz
|
||||||
_eclasses_=multilib 0236be304ee52e7f179ed2f337075515 toolchain-funcs 6eb35f81556258a4bc9182ad3dfd58ee
|
_eclasses_=multilib 0236be304ee52e7f179ed2f337075515 toolchain-funcs 6eb35f81556258a4bc9182ad3dfd58ee
|
||||||
_md5_=30d461b19879a1af222118af5690b274
|
_md5_=dead2bd4bcb9fd17727935a9306acc1e
|
||||||
|
|||||||
@ -1 +1 @@
|
|||||||
Fri, 14 Apr 2017 03:09:48 +0000
|
Fri, 14 Apr 2017 11:09:49 +0000
|
||||||
|
|||||||
@ -1 +1 @@
|
|||||||
Fri Apr 14 03:09:48 UTC 2017
|
Fri Apr 14 11:09:49 UTC 2017
|
||||||
|
|||||||
@ -1 +1 @@
|
|||||||
Fri, 14 Apr 2017 03:30:01 +0000
|
Fri, 14 Apr 2017 11:30:01 +0000
|
||||||
|
|||||||
@ -1 +1 @@
|
|||||||
1492139101 Fri 14 Apr 2017 03:05:01 AM UTC
|
1492167901 Fri 14 Apr 2017 11:05:01 AM UTC
|
||||||
|
|||||||
@ -1 +1 @@
|
|||||||
Fri, 14 Apr 2017 03:09:48 +0000
|
Fri, 14 Apr 2017 11:09:49 +0000
|
||||||
|
|||||||
@ -0,0 +1,214 @@
|
|||||||
|
From 0459a285ca0159d45e73da8bd1164edb5c57cde3 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Andrei Belov <defanator@gmail.com>
|
||||||
|
Date: Wed, 22 Mar 2017 07:50:57 +0300
|
||||||
|
Subject: [PATCH] feature: nginx 1.11.11+ can now build with this module.
|
||||||
|
|
||||||
|
Note: nginx 1.11.11+ are still not an officially supported target yet.
|
||||||
|
More work needed.
|
||||||
|
|
||||||
|
Closes openresty/lua-nginx-module#1016
|
||||||
|
|
||||||
|
See also:
|
||||||
|
http://hg.nginx.org/nginx/rev/e662cbf1b932
|
||||||
|
---
|
||||||
|
src/ngx_http_lua_common.h | 6 ++++
|
||||||
|
src/ngx_http_lua_headers.c | 68 ++++++++++++++++++++++++++++++++++++++++++++++
|
||||||
|
src/ngx_http_lua_headers.h | 3 ++
|
||||||
|
src/ngx_http_lua_module.c | 13 ++++++++-
|
||||||
|
4 files changed, 89 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/src/ngx_http_lua_common.h b/src/ngx_http_lua_common.h
|
||||||
|
index 079a4dc..f37d776 100644
|
||||||
|
--- a/src/ngx_http_lua_common.h
|
||||||
|
+++ b/src/ngx_http_lua_common.h
|
||||||
|
@@ -199,6 +199,12 @@ struct ngx_http_lua_main_conf_s {
|
||||||
|
of reqeusts */
|
||||||
|
ngx_uint_t malloc_trim_req_count;
|
||||||
|
|
||||||
|
+#if nginx_version >= 1011011
|
||||||
|
+ /* the following 2 fields are only used by ngx.req.raw_headers() for now */
|
||||||
|
+ ngx_buf_t **busy_buf_ptrs;
|
||||||
|
+ ngx_int_t busy_buf_ptr_count;
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
unsigned requires_header_filter:1;
|
||||||
|
unsigned requires_body_filter:1;
|
||||||
|
unsigned requires_capture_filter:1;
|
||||||
|
diff --git a/src/ngx_http_lua_headers.c b/src/ngx_http_lua_headers.c
|
||||||
|
index 2392598..6700ce8 100644
|
||||||
|
--- a/src/ngx_http_lua_headers.c
|
||||||
|
+++ b/src/ngx_http_lua_headers.c
|
||||||
|
@@ -26,6 +26,9 @@ static int ngx_http_lua_ngx_req_get_headers(lua_State *L);
|
||||||
|
static int ngx_http_lua_ngx_req_header_clear(lua_State *L);
|
||||||
|
static int ngx_http_lua_ngx_req_header_set(lua_State *L);
|
||||||
|
static int ngx_http_lua_ngx_resp_get_headers(lua_State *L);
|
||||||
|
+#if nginx_version >= 1011011
|
||||||
|
+void ngx_http_lua_ngx_raw_header_cleanup(void *data);
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
|
||||||
|
static int
|
||||||
|
@@ -77,6 +80,11 @@ ngx_http_lua_ngx_req_raw_header(lua_State *L)
|
||||||
|
size_t size;
|
||||||
|
ngx_buf_t *b, *first = NULL;
|
||||||
|
ngx_int_t i, j;
|
||||||
|
+#if nginx_version >= 1011011
|
||||||
|
+ ngx_buf_t **bb;
|
||||||
|
+ ngx_chain_t *cl;
|
||||||
|
+ ngx_http_lua_main_conf_t *lmcf;
|
||||||
|
+#endif
|
||||||
|
ngx_connection_t *c;
|
||||||
|
ngx_http_request_t *r, *mr;
|
||||||
|
ngx_http_connection_t *hc;
|
||||||
|
@@ -93,6 +101,10 @@ ngx_http_lua_ngx_req_raw_header(lua_State *L)
|
||||||
|
return luaL_error(L, "no request object found");
|
||||||
|
}
|
||||||
|
|
||||||
|
+#if nginx_version >= 1011011
|
||||||
|
+ lmcf = ngx_http_get_module_main_conf(r, ngx_http_lua_module);
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
ngx_http_lua_check_fake_request(L, r);
|
||||||
|
|
||||||
|
mr = r->main;
|
||||||
|
@@ -109,8 +121,13 @@ ngx_http_lua_ngx_req_raw_header(lua_State *L)
|
||||||
|
dd("hc->nbusy: %d", (int) hc->nbusy);
|
||||||
|
|
||||||
|
if (hc->nbusy) {
|
||||||
|
+#if nginx_version >= 1011011
|
||||||
|
+ dd("hc->busy: %p %p %p %p", hc->busy->buf->start, hc->busy->buf->pos,
|
||||||
|
+ hc->busy->buf->last, hc->busy->buf->end);
|
||||||
|
+#else
|
||||||
|
dd("hc->busy: %p %p %p %p", hc->busy[0]->start, hc->busy[0]->pos,
|
||||||
|
hc->busy[0]->last, hc->busy[0]->end);
|
||||||
|
+#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
dd("request line: %p %p", mr->request_line.data,
|
||||||
|
@@ -146,9 +163,37 @@ ngx_http_lua_ngx_req_raw_header(lua_State *L)
|
||||||
|
dd("size: %d", (int) size);
|
||||||
|
|
||||||
|
if (hc->nbusy) {
|
||||||
|
+#if nginx_version >= 1011011
|
||||||
|
+ if (hc->nbusy > lmcf->busy_buf_ptr_count) {
|
||||||
|
+ if (lmcf->busy_buf_ptrs) {
|
||||||
|
+ ngx_free(lmcf->busy_buf_ptrs);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ lmcf->busy_buf_ptrs = ngx_alloc(hc->nbusy * sizeof(ngx_buf_t *),
|
||||||
|
+ r->connection->log);
|
||||||
|
+
|
||||||
|
+ if (lmcf->busy_buf_ptrs == NULL) {
|
||||||
|
+ return luaL_error(L, "no memory");
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ lmcf->busy_buf_ptr_count = hc->nbusy;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ bb = lmcf->busy_buf_ptrs;
|
||||||
|
+ for (cl = hc->busy; cl; cl = cl->next) {
|
||||||
|
+ *bb++ = cl->buf;
|
||||||
|
+ }
|
||||||
|
+#endif
|
||||||
|
b = NULL;
|
||||||
|
+
|
||||||
|
+#if nginx_version >= 1011011
|
||||||
|
+ bb = lmcf->busy_buf_ptrs;
|
||||||
|
+ for (i = hc->nbusy; i > 0; i--) {
|
||||||
|
+ b = bb[i - 1];
|
||||||
|
+#else
|
||||||
|
for (i = 0; i < hc->nbusy; i++) {
|
||||||
|
b = hc->busy[i];
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
dd("busy buf: %d: [%.*s]", (int) i, (int) (b->pos - b->start),
|
||||||
|
b->start);
|
||||||
|
@@ -223,8 +268,15 @@ ngx_http_lua_ngx_req_raw_header(lua_State *L)
|
||||||
|
}
|
||||||
|
|
||||||
|
if (hc->nbusy) {
|
||||||
|
+
|
||||||
|
+#if nginx_version >= 1011011
|
||||||
|
+ bb = lmcf->busy_buf_ptrs;
|
||||||
|
+ for (i = hc->nbusy - 1; i >= 0; i--) {
|
||||||
|
+ b = bb[i];
|
||||||
|
+#else
|
||||||
|
for (i = 0; i < hc->nbusy; i++) {
|
||||||
|
b = hc->busy[i];
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
if (!found) {
|
||||||
|
if (b != first) {
|
||||||
|
@@ -1431,4 +1483,20 @@ ngx_http_lua_ffi_get_resp_header(ngx_http_request_t *r,
|
||||||
|
#endif /* NGX_LUA_NO_FFI_API */
|
||||||
|
|
||||||
|
|
||||||
|
+#if nginx_version >= 1011011
|
||||||
|
+void
|
||||||
|
+ngx_http_lua_ngx_raw_header_cleanup(void *data)
|
||||||
|
+{
|
||||||
|
+ ngx_http_lua_main_conf_t *lmcf;
|
||||||
|
+
|
||||||
|
+ lmcf = (ngx_http_lua_main_conf_t *) data;
|
||||||
|
+
|
||||||
|
+ if (lmcf->busy_buf_ptrs) {
|
||||||
|
+ ngx_free(lmcf->busy_buf_ptrs);
|
||||||
|
+ lmcf->busy_buf_ptrs = NULL;
|
||||||
|
+ }
|
||||||
|
+}
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
+
|
||||||
|
/* vi:set ft=c ts=4 sw=4 et fdm=marker: */
|
||||||
|
diff --git a/src/ngx_http_lua_headers.h b/src/ngx_http_lua_headers.h
|
||||||
|
index 39f1114..ee4d21c 100644
|
||||||
|
--- a/src/ngx_http_lua_headers.h
|
||||||
|
+++ b/src/ngx_http_lua_headers.h
|
||||||
|
@@ -15,6 +15,9 @@
|
||||||
|
void ngx_http_lua_inject_resp_header_api(lua_State *L);
|
||||||
|
void ngx_http_lua_inject_req_header_api(lua_State *L);
|
||||||
|
void ngx_http_lua_create_headers_metatable(ngx_log_t *log, lua_State *L);
|
||||||
|
+#if nginx_version >= 1011011
|
||||||
|
+void ngx_http_lua_ngx_raw_header_cleanup(void *data);
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
|
||||||
|
#endif /* _NGX_HTTP_LUA_HEADERS_H_INCLUDED_ */
|
||||||
|
diff --git a/src/ngx_http_lua_module.c b/src/ngx_http_lua_module.c
|
||||||
|
index 3dc2817..875f933 100644
|
||||||
|
--- a/src/ngx_http_lua_module.c
|
||||||
|
+++ b/src/ngx_http_lua_module.c
|
||||||
|
@@ -28,6 +28,7 @@
|
||||||
|
#include "ngx_http_lua_ssl_certby.h"
|
||||||
|
#include "ngx_http_lua_ssl_session_storeby.h"
|
||||||
|
#include "ngx_http_lua_ssl_session_fetchby.h"
|
||||||
|
+#include "ngx_http_lua_headers.h"
|
||||||
|
|
||||||
|
|
||||||
|
static void *ngx_http_lua_create_main_conf(ngx_conf_t *cf);
|
||||||
|
@@ -624,7 +625,7 @@ ngx_http_lua_init(ngx_conf_t *cf)
|
||||||
|
volatile ngx_cycle_t *saved_cycle;
|
||||||
|
ngx_http_core_main_conf_t *cmcf;
|
||||||
|
ngx_http_lua_main_conf_t *lmcf;
|
||||||
|
-#ifndef NGX_LUA_NO_FFI_API
|
||||||
|
+#if !defined(NGX_LUA_NO_FFI_API) || nginx_version >= 1011011
|
||||||
|
ngx_pool_cleanup_t *cln;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
@@ -716,6 +717,16 @@ ngx_http_lua_init(ngx_conf_t *cf)
|
||||||
|
cln->handler = ngx_http_lua_sema_mm_cleanup;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
+#if nginx_version >= 1011011
|
||||||
|
+ cln = ngx_pool_cleanup_add(cf->pool, 0);
|
||||||
|
+ if (cln == NULL) {
|
||||||
|
+ return NGX_ERROR;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ cln->data = lmcf;
|
||||||
|
+ cln->handler = ngx_http_lua_ngx_raw_header_cleanup;
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
if (lmcf->lua == NULL) {
|
||||||
|
dd("initializing lua vm");
|
||||||
|
|
||||||
@ -1,46 +0,0 @@
|
|||||||
Upstream: https://github.com/openresty/lua-nginx-module/pull/1017
|
|
||||||
|
|
||||||
--- a/src/ngx_http_lua_headers.c
|
|
||||||
+++ b/src/ngx_http_lua_headers.c
|
|
||||||
@@ -77,6 +77,9 @@ ngx_http_lua_ngx_req_raw_header(lua_State *L)
|
|
||||||
size_t size;
|
|
||||||
ngx_buf_t *b, *first = NULL;
|
|
||||||
ngx_int_t i, j;
|
|
||||||
+#if defined(nginx_version) && nginx_version >= 1011011
|
|
||||||
+ ngx_chain_t *cl;
|
|
||||||
+#endif
|
|
||||||
ngx_connection_t *c;
|
|
||||||
ngx_http_request_t *r, *mr;
|
|
||||||
ngx_http_connection_t *hc;
|
|
||||||
@@ -147,8 +150,15 @@ ngx_http_lua_ngx_req_raw_header(lua_State *L)
|
|
||||||
|
|
||||||
if (hc->nbusy) {
|
|
||||||
b = NULL;
|
|
||||||
+
|
|
||||||
+#if defined(nginx_version) && nginx_version >= 1011011
|
|
||||||
+ for (cl = hc->busy; cl; /* void */) {
|
|
||||||
+ b = cl->buf;
|
|
||||||
+ cl = cl->next;
|
|
||||||
+#else
|
|
||||||
for (i = 0; i < hc->nbusy; i++) {
|
|
||||||
b = hc->busy[i];
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
dd("busy buf: %d: [%.*s]", (int) i, (int) (b->pos - b->start),
|
|
||||||
b->start);
|
|
||||||
@@ -223,8 +233,15 @@ ngx_http_lua_ngx_req_raw_header(lua_State *L)
|
|
||||||
}
|
|
||||||
|
|
||||||
if (hc->nbusy) {
|
|
||||||
+
|
|
||||||
+#if defined(nginx_version) && nginx_version >= 1011011
|
|
||||||
+ for (cl = hc->busy; cl; /* void */) {
|
|
||||||
+ b = cl->buf;
|
|
||||||
+ cl = cl->next;
|
|
||||||
+#else
|
|
||||||
for (i = 0; i < hc->nbusy; i++) {
|
|
||||||
b = hc->busy[i];
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
if (!found) {
|
|
||||||
if (b != first) {
|
|
||||||
Loading…
Reference in new issue