root
8 years ago
parent
1540181264
commit
51315ebfb2
@ -0,0 +1,17 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=6
|
||||
|
||||
inherit vim-plugin
|
||||
|
||||
DESCRIPTION="vim plugin: library for alias creation"
|
||||
HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=746"
|
||||
LICENSE="GPL-2"
|
||||
KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~sparc ~x86"
|
||||
IUSE=""
|
||||
|
||||
VIM_PLUGIN_HELPTEXT=\
|
||||
"This plugin provides library functions and is not intended to be used
|
||||
directly by the user."
|
||||
@ -1,2 +1 @@
|
||||
DIST detectindent-1.0.tar.bz2 1919 SHA256 7ba327295df68583786221f6d87032ae8bf6d7f0eb76262b279722eb4aa35d7e SHA512 5ff01feb65f28428a9df76013d301ed703461ad0c929a3397304f0604fe776dbac4c0f441b2a15661f8f1ace4b25b04e8fc742204e550f5dad844461cba421cd WHIRLPOOL 02ea5436bb0d6413f615906aeee3281f2a72c6814eda87e1f7bfe69f69409f7ffa2e8ccdf81adef625a0366fcc07115c44379b3b6fff7db6795d0be85e506947
|
||||
DIST detectindent-1.0_p20150908.tar.xz 2788 SHA256 2f2e124777940f1efc621e50a679956650348305cf76be8e5c35c0a17b64c041 SHA512 d828d04871e6eeeaa11c109e137fbe70a3b7fa265f569e45d77b8b185f380a200b009aa0a2f0825afdbf344b12d7b8922050c4788decadcb7640bbe3fe9ca8de WHIRLPOOL a7b3c70476a3c35ebb4dbe9bae24307a4f3ed56f0e4e160b6f2f55045a96941a6d4d99ac6513f23af27fda0a8bb98c893588e9261709e7267f75706f0447de8d
|
||||
|
||||
@ -1,13 +0,0 @@
|
||||
# Copyright 1999-2010 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
inherit vim-plugin
|
||||
|
||||
DESCRIPTION="vim plugin: automatically detect file indent settings"
|
||||
HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=1171"
|
||||
LICENSE="vim"
|
||||
KEYWORDS="amd64 ~hppa ~mips ppc sparc x86"
|
||||
IUSE=""
|
||||
|
||||
VIM_PLUGIN_HELPFILES="detectindent.txt"
|
||||
@ -0,0 +1,23 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=6
|
||||
|
||||
inherit vim-plugin
|
||||
|
||||
DESCRIPTION="vim plugin: EBNF (ISO/IEC 14997) file syntax highlighting"
|
||||
HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=545"
|
||||
LICENSE="vim"
|
||||
KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
|
||||
IUSE=""
|
||||
|
||||
VIM_PLUGIN_HELPTEXT=\
|
||||
"This plugin provides syntax highlighting for EBNF (ISO/IEC 14997) files."
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
# don't use hi link, bug #101799.
|
||||
sed -i -e 's,hi link,hi def link,' syntax/ebnf.vim || die "sed failed"
|
||||
}
|
||||
@ -0,0 +1,31 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=6
|
||||
|
||||
inherit vim-plugin
|
||||
|
||||
DESCRIPTION="vim plugin: show location marks visually"
|
||||
HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=152"
|
||||
|
||||
LICENSE="public-domain"
|
||||
KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~sparc ~x86"
|
||||
IUSE=""
|
||||
|
||||
VIM_PLUGIN_HELPFILES="showmarks.txt"
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
mkdir "${S}"/doc || die "can't make doc dir"
|
||||
|
||||
# This plugin uses an 'automatic HelpExtractor' variant. This causes
|
||||
# problems for us during the unmerge. Fortunately, sed can fix this
|
||||
# for us.
|
||||
sed -e '1,/^" HelpExtractorDoc:$/d' \
|
||||
"${S}"/plugin/showmarks.vim > "${S}"/doc/showmarks.txt \
|
||||
|| die "help extraction failed"
|
||||
sed -i -e '/^" HelpExtractor:$/,$d' "${S}"/plugin/showmarks.vim \
|
||||
|| die "help extract remove failed"
|
||||
}
|
||||
@ -0,0 +1,15 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=6
|
||||
|
||||
inherit vim-plugin
|
||||
|
||||
DESCRIPTION="vim plugin: linking in plaintext"
|
||||
HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=293"
|
||||
LICENSE="GPL-2"
|
||||
KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
|
||||
IUSE=""
|
||||
|
||||
VIM_PLUGIN_HELPFILES="thlnk thlnk-reference-manual"
|
||||
@ -0,0 +1,71 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=6
|
||||
|
||||
inherit multilib
|
||||
|
||||
BV=0.18.7-1
|
||||
BV_AMD64=${BV}-linux-x86_64
|
||||
BV_X86=${BV}-linux-i686
|
||||
|
||||
DESCRIPTION="The Crystal Programming Language"
|
||||
HOMEPAGE="http://crystal-lang.org"
|
||||
SRC_URI="https://github.com/crystal-lang/crystal/archive/${PV}.tar.gz -> ${P}.tar.gz
|
||||
amd64? ( https://github.com/crystal-lang/crystal/releases/download/${PV}/crystal-${BV_AMD64}.tar.gz )
|
||||
x86? ( https://github.com/crystal-lang/crystal/releases/download/${PV}/crystal-${BV_X86}.tar.gz )"
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64"
|
||||
IUSE="doc examples +xml +yaml"
|
||||
|
||||
# dev-libs/boehm-gc[static-libs] dependency problem, check the issue: https://github.com/manastech/crystal/issues/1382
|
||||
DEPEND="
|
||||
>=sys-devel/llvm-3.8.0
|
||||
dev-libs/boehm-gc[static-libs,threads]
|
||||
dev-libs/libatomic_ops
|
||||
dev-libs/libevent
|
||||
dev-libs/libpcre
|
||||
sys-libs/libunwind
|
||||
dev-libs/pcl
|
||||
dev-libs/gmp:0
|
||||
"
|
||||
RDEPEND="${DEPEND}
|
||||
xml? ( dev-libs/libxml2 )
|
||||
yaml? ( dev-libs/libyaml )
|
||||
"
|
||||
|
||||
src_compile() {
|
||||
emake \
|
||||
release=1 \
|
||||
threads=4 \
|
||||
PATH="${WORKDIR}"/${PN}-${BV}/bin:"${PATH}" \
|
||||
CRYSTAL_PATH=src \
|
||||
CRYSTAL_CONFIG_VERSION=${PV} \
|
||||
CRYSTAL_CONFIG_PATH="libs:${EPREFIX}/usr/$(get_libdir)/crystal"
|
||||
use doc && emake doc
|
||||
}
|
||||
|
||||
src_test() {
|
||||
emake spec \
|
||||
CRYSTAL_PATH=src \
|
||||
CRYSTAL_CONFIG_VERSION=${PV}
|
||||
}
|
||||
|
||||
src_install() {
|
||||
insinto /usr/$(get_libdir)/crystal
|
||||
doins -r src/.
|
||||
dobin .build/crystal
|
||||
|
||||
insinto /usr/share/zsh/site-functions
|
||||
newins etc/completion.zsh _crystal
|
||||
|
||||
use examples && dodoc -r samples
|
||||
|
||||
if use doc ; then
|
||||
docinto api
|
||||
dodoc -r doc/.
|
||||
fi
|
||||
}
|
||||
@ -0,0 +1 @@
|
||||
DIST configshell-1.6.tar.gz 37246 SHA256 e132fefa763b01c9443f299ae7b124041ffb7cc9c529e419d9c4116a94b85dd9 SHA512 04eeabfbe36f8845eb21cfe2b41a6a82d029ca23fe821ecfbf94d321fb8c9cc20f3d374b385cb20e00fd34a59feb364400d724e973174d9be90dad35813da0e0 WHIRLPOOL 6ebdb8d9b511945c8c065264d15c75ba2cf2bbfffac8b82c1c6b97bc224725898a6c7da9f65638a490a7d547f913a664b796eeda06658cf83982c408af2f8984
|
||||
@ -0,0 +1,31 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=6
|
||||
|
||||
PYTHON_COMPAT=( python2_7 )
|
||||
|
||||
inherit distutils-r1
|
||||
|
||||
DESCRIPTION="ConfigShell Community Edition for target_core_mod/ConfigFS"
|
||||
HOMEPAGE="http://linux-iscsi.org/wiki/targetcli"
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
IUSE=""
|
||||
|
||||
if [[ ${PV} == 9999 ]]; then
|
||||
inherit git-r3
|
||||
EGIT_REPO_URI="git://github.com/Datera/${PN}.git
|
||||
https://github.com/Datera/${PN}.git"
|
||||
KEYWORDS=""
|
||||
else
|
||||
SRC_URI="https://github.com/Datera/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
|
||||
KEYWORDS="~amd64"
|
||||
fi
|
||||
|
||||
DEPEND="dev-python/epydoc[${PYTHON_USEDEP}]
|
||||
dev-python/pyparsing[${PYTHON_USEDEP}]"
|
||||
RDEPEND="${DEPEND}
|
||||
dev-python/urwid[${PYTHON_USEDEP}]"
|
||||
@ -1,25 +1,31 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
EAPI=6
|
||||
|
||||
EGIT_REPO_URI="git://linux-iscsi.org/${PN}.git"
|
||||
PYTHON_COMPAT=( python2_7 )
|
||||
|
||||
inherit distutils-r1 git-r3
|
||||
inherit distutils-r1
|
||||
|
||||
DESCRIPTION="ConfigShell Community Edition for target_core_mod/ConfigFS"
|
||||
HOMEPAGE="http://linux-iscsi.org/"
|
||||
SRC_URI=""
|
||||
HOMEPAGE="http://linux-iscsi.org/wiki/targetcli"
|
||||
|
||||
LICENSE="AGPL-3"
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS=""
|
||||
IUSE=""
|
||||
|
||||
DEPEND="
|
||||
dev-python/epydoc[${PYTHON_USEDEP}]
|
||||
dev-python/simpleparse[${PYTHON_USEDEP}]
|
||||
"
|
||||
RDEPEND="${DEPEND}"
|
||||
if [[ ${PV} == 9999 ]]; then
|
||||
inherit git-r3
|
||||
EGIT_REPO_URI="git://github.com/Datera/${PN}.git
|
||||
https://github.com/Datera/${PN}.git"
|
||||
KEYWORDS=""
|
||||
else
|
||||
SRC_URI="https://github.com/Datera/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
|
||||
KEYWORDS="~amd64"
|
||||
fi
|
||||
|
||||
DEPEND="dev-python/epydoc[${PYTHON_USEDEP}]
|
||||
dev-python/pyparsing[${PYTHON_USEDEP}]"
|
||||
RDEPEND="${DEPEND}
|
||||
dev-python/urwid[${PYTHON_USEDEP}]"
|
||||
|
||||
@ -0,0 +1 @@
|
||||
DIST rtslib-3.0_pre4.tar.gz 63988 SHA256 1e4359d3897ccee0c6345f8d63292f2c8f71500f242baca12772877fbe25bda8 SHA512 5b4ff3dbaa379f177e08d0ffb54b575e7637c9ebf9ad98cdb2db2b93cde623d0c3a29c3ec9eb0a5542964438d8d5342691f483e2fdb81b7f1f64f37c701e0063 WHIRLPOOL 6ea742a6c756b8c473ef12f017ffc0ecdf2c9dae28f2169b1db99e5ac30f36806414b73c0bcb1e3c191582ae8bfd4ffc9cf15151537ad4354f15cc9c9dc8fa06
|
||||
@ -0,0 +1,42 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=6
|
||||
|
||||
PYTHON_COMPAT=( python2_7 )
|
||||
|
||||
inherit distutils-r1
|
||||
|
||||
DESCRIPTION="RTSLib Community Edition for target_core_mod/ConfigFS"
|
||||
HOMEPAGE="http://linux-iscsi.org/wiki/targetcli"
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
IUSE=""
|
||||
|
||||
if [[ ${PV} == 9999 ]]; then
|
||||
inherit git-r3
|
||||
EGIT_REPO_URI="git://github.com/Datera/${PN}.git
|
||||
https://github.com/Datera/${PN}.git"
|
||||
KEYWORDS=""
|
||||
else
|
||||
MY_PV=${PV/_/-}
|
||||
SRC_URI="https://github.com/Datera/${PN}/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz"
|
||||
S="${WORKDIR}/${PN}-${MY_PV}"
|
||||
KEYWORDS="~amd64"
|
||||
fi
|
||||
|
||||
DEPEND="dev-python/configobj[${PYTHON_USEDEP}]
|
||||
dev-python/ipaddr[${PYTHON_USEDEP}]
|
||||
dev-python/netifaces[${PYTHON_USEDEP}]
|
||||
dev-python/pyparsing[${PYTHON_USEDEP}]
|
||||
!dev-python/rtslib-fb"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
src_install() {
|
||||
distutils-r1_src_install
|
||||
keepdir /var/target/fabric
|
||||
insinto /var/target/fabric
|
||||
doins specs/*.spec
|
||||
}
|
||||
@ -1,3 +1,4 @@
|
||||
DIST shards-0.6.1.tar.gz 26505 SHA256 8e7d179a499a2fca895b534c6204e2e34828e6a645e48f83f08fbefcd6a03951 SHA512 fc1e32cf459a5c448ef780601b9515cd331fc40d3f6f0666e71e218a62e202e0d4f642f5e82660529d24145a5ed5f5cbf2fdc6fc251421850d9c7ac1ebcf4d07 WHIRLPOOL 0bf8ef2de47b6dd6be728c489b7ac9ff8101a51329d956ac2d1ad21ac9322442646d624b5b6e9baee5f1738326e3a5e039b94b5057ce6a2a5223a04db226b5a6
|
||||
DIST shards-0.6.2.tar.gz 26589 SHA256 11d22086d736598efa87eea558e7b304d538372f017fce9bb21476e40c586110 SHA512 baeebe496ea52c93313e9a550a8f1dda225674ca49e9e2b2660b059a8e7cd6a148085d33d5c70a46d2d4c7db9260f841a634c079cc590576a6d98c9308fb1100 WHIRLPOOL 944c3265aab2a7dc2e9261f68ea250b77f16ce16dd8fead8521ae367edd41b7998b624db6b1526759da60b52f6a6f02d710f9657021dd4e9ea494248ab620b6d
|
||||
DIST shards-0.6.3.tar.gz 26826 SHA256 5245aebb21af0a5682123732e4f4d476e7aa6910252fb3ffe4be60ee8df03ac2 SHA512 c9ef7f41dc1feb223fbaa22bc60546a6152eae44ecead6afc3ca5ed68ffb8640444efdf7817dc77f6507200993b6213293e24e006ebb483e804342b877d81c78 WHIRLPOOL 4863edf4f12871e16378a0e0854c508e7daae63ffebbeb1e0b37ba6e2d80ddd1121ae10ae8724505a49ae40bfb371c875acff9231c16a1d447d6d1573dd385f1
|
||||
DIST shards-0.6.4.tar.gz 26916 SHA256 5972f1b40bb3253319f564dee513229f82b0dcb8eea1502ae7dc483a9c6da5a0 SHA512 56475ab8287f469ec0b97d9ad7fcc36e75da8a4cd3fbddadfaf0156b6b0ede25331634bb3b41fa3e4b3c46adcd881838fe56c56de6e5bbf30d03e3106458e820 WHIRLPOOL 9ec386622e56a2cd3e8e494f68f1855365b8699fb229548d92e10794c421775ee855bbc0c236f5bdb1bb57406acbfa816234ae6d0785d16d5bf795fa186d8e64
|
||||
|
||||
@ -0,0 +1,23 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=6
|
||||
|
||||
DESCRIPTION="Dependency manager for the Crystal language"
|
||||
HOMEPAGE="https://github.com/crystal-lang/shards"
|
||||
SRC_URI="https://github.com/crystal-lang/shards/archive/v${PV}.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64"
|
||||
|
||||
DEPEND="
|
||||
>dev-lang/crystal-0.11.1[yaml]
|
||||
"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
src_install() {
|
||||
dobin bin/${PN}
|
||||
dodoc README.md
|
||||
}
|
||||
@ -1,2 +1,3 @@
|
||||
DIST unifont-8.0.01.tar.gz 19157156 SHA256 4b20bfc6412bce9302cd321f39d7c0185c3c69f9deaf9ab7ea89c4e105fbcb9c SHA512 171b8caff9d2f821fa0759a55d102edcaf23be592c0619c8148c95aac353834bf096591710e9dedf18aa6c1dde051d1caee5c7b2b3a0d302ae9ab64bcfd731a5 WHIRLPOOL c72637d4549ce476a6327160e589137a9e9c24bdabd3a341a08b7d91bdee2208bc49b0cedc11ca43a0cdef50123b09148f9fde2b1c073b12005140cc091e9c0a
|
||||
DIST unifont-9.0.01.tar.gz 18287287 SHA256 2bd54b92aa31e1bf9d6a03023150fc3d5989ff6b9aa650c7892429ad4ca7e493 SHA512 ff9de0293c7ee6394b9de5c41b43cfe797051222f27010871d44aa7a626d7db880f253679b7ff88c2b3621de42b67c3b1f0c97db37e7cf13ad72855acb55192a WHIRLPOOL f3091bf7785d3dbed0fd198ef683f3e07f0f854f71f92928193f212df6387a3486866d15982b2df9cdfd989a9cfd0617b42ba235df1a062ca786a3fdd8662507
|
||||
DIST unifont-9.0.02.tar.gz 14727178 SHA256 1513d2403e1ea338a6df2d89c6a40cab39790e8ab52e89e5f8bf22bdc46546eb SHA512 74693fb9e7fdf6cbdb8b71cfeeb8106ea1d52b663def9c29f5b8c62660badd30d624be4b85bc9ca39c47d9d13cef19b1e40c76af361b82fbf3092895d0d48050 WHIRLPOOL a0cffe0edf9e5b184eac3c190434c81c70205951ed8593a90f9c3c4ab040536a2335f338a9f2ccdbef7d622b5a6c4005e9bbe90a0baf9a6920add37f9afb69b2
|
||||
|
||||
@ -0,0 +1,61 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=6
|
||||
|
||||
inherit font toolchain-funcs
|
||||
|
||||
DESCRIPTION="GNU Unifont - a Pan-Unicode X11 bitmap iso10646 font"
|
||||
HOMEPAGE="http://unifoundry.com/"
|
||||
SRC_URI="mirror://gnu/${PN}/${P}/${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
|
||||
IUSE="fontforge utils"
|
||||
|
||||
DEPEND="
|
||||
fontforge? (
|
||||
app-text/bdf2psf
|
||||
dev-lang/perl
|
||||
dev-perl/GD[png(-)]
|
||||
media-gfx/fontforge
|
||||
x11-apps/bdftopcf
|
||||
)
|
||||
"
|
||||
RDEPEND="
|
||||
utils? (
|
||||
dev-lang/perl
|
||||
dev-perl/GD[png(-)]
|
||||
)
|
||||
"
|
||||
|
||||
src_prepare() {
|
||||
sed -i -e 's/install -s/install/' src/Makefile || die
|
||||
default
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
if use fontforge || use utils; then
|
||||
tc-export CC
|
||||
makeargs=(
|
||||
CFLAGS="${CFLAGS}"
|
||||
BUILDFONT=$(usex fontforge 1 '')
|
||||
)
|
||||
emake -j1 "${makeargs[@]}"
|
||||
fi
|
||||
}
|
||||
|
||||
src_install() {
|
||||
makeargs+=(
|
||||
DESTDIR="${ED%/}"
|
||||
PCFDEST="${ED%/}${FONTDIR}"
|
||||
TTFDEST="${ED%/}${FONTDIR}"
|
||||
USRDIR=usr
|
||||
)
|
||||
use utils || makeargs+=( -C font )
|
||||
emake -j1 "${makeargs[@]}" install
|
||||
font_xfont_config
|
||||
font_fontconfig
|
||||
}
|
||||
@ -1,7 +1,5 @@
|
||||
DIST mpv-0.17.0-patches-06.tar.gz 14418 SHA256 a0fcf861ed50686f35556a9334581e1d735f2910f834d1885b9940bd90d7525c SHA512 0bbd040df7d59e30e5c0b37b6966e5f24bd9041b3916a68b68f97a1f2aa3c2447a2dc873742d779f8ebfe599aeef6474c542f8acc7cd2fdf871d89b6b458452b WHIRLPOOL 38ab169a92b0d2c8266e459037c152ca841440231ba5dda2c2153dbee2f5a6e2193351d8f7e01e9eb6110fd21687deb1f39ea765e35dc8c69db358c45ff3c25e
|
||||
DIST mpv-0.17.0.tar.gz 2882629 SHA256 602cd2b0f5fc7e43473234fbb96e3f7bbb6418f15eb8fa720d9433cce31eba6e SHA512 fb79738a16dbc12b60199a68836aca121a800958af4eaf6c2bdf1114bde36c156bafc232e814045a16fd738d2de1e2d8392bc98507961e5a73fa692e270dc7a2 WHIRLPOOL 704133b4033a5a2be8db92a4f1e52397d5b261a99a035d38e33b91d2c478e0e9bfcb2ba0e24ee03d37fffe693b275f50f7f1e453263a5afe61e8944f51eefa61
|
||||
DIST mpv-0.18.0.tar.gz 2758960 SHA256 b656638d4f6bce2621baaacb60d8be384aa492fcd86dfd43996aaa2c16fee02b SHA512 5a899ea680b4da6d668a6e77a254e623bafef16f376ee46639e40f151da5a000de84b382f2b07f3a1e87b60fc8e524132767fdf243e36474966af11a88277437 WHIRLPOOL c491e61cb2d7f453cfc23605120048e81c2b7621b8d9591cad6415d3b550f55db6a6c8c6f90d27c7ce214ff89f92a9861d202b457c2de25c5b7de11d8d1d40af
|
||||
DIST mpv-0.19.0.tar.gz 2770618 SHA256 3df5811942cd1d71f48eb4720092fdafec11885bf6dd6d1d3e6413f32e5d67e2 SHA512 11a1318e0bcf937635e8f83bba615998c7a89ceb0fb0829cef9f510c215d142b205b5c26c617e95d95dfcfc3fbd212cee58cab2dae0b8b8250a44e998d18380f WHIRLPOOL bb1c016a51bae0a512f3383f252cf661414d6375e31d8a08a3885f2450cd772e38d102f26ffecfc6fec1b469f64b33f027dcc5c0e7ca22f171c074e628310bd3
|
||||
DIST mpv-0.20.0.tar.gz 2775740 SHA256 fe6ec9d2ded5ce84b963f54b812d579d04f944f4a737f3ae639c4d5d9e842b56 SHA512 6b00bde2aa802cbc104a7c3e85dc0165010113f9942f881b023434f8ead04a2cb5486cd3dd32c14ea86c54ed9a2b976124bd007e8e40e3d8754c48bb33c4b512 WHIRLPOOL 336d12c3309ef099fa16331859b599beaa556acefa467b8a74761291faecdcb56f3f01137dd12ffbbc4a41c3f2e60212163deccc498d065c0d944ed9adc26f8a
|
||||
DIST mpv-0.9.2.tar.gz 2701306 SHA256 c0148f55dbd17705f49bb496d0ce374419de62e1b17195d91409d7727cbd4751 SHA512 4f652a8e78d65b0ef44a06287b05250dfdfbce4cf5a6e21d3b446eedec268d83cf98afcc687272e2da2cfac9e9f69a303847dffdfd45cecdd4273b943ce50967 WHIRLPOOL 1512bacc2ce50e875770c76106a1bb2bc1d0cc5f6e2bdce91ff8c5cfc8bf13ffb48519858a5fa2a7d57880820dc12e5eb20f34ab71eca5d76ec303618da8f3fe
|
||||
DIST waf-1.8.12 97567 SHA256 01bf2beab2106d1558800c8709bc2c8e496d3da4a2ca343fe091f22fca60c98b SHA512 8e47112abb134f965f15a27a600b4453cad3075afb5dadc17f2f6dac33d80ec68b679ac0ebc5f8a0245cbd07ae9fc7b899e69afc1bd021cce74e7af2ab457939 WHIRLPOOL c36d37c2d8c08e4048b4800f511611af5cf534304fcb58388ca491ff308bfcbcdd959d153edfd6ff8c118404e7293d8b786e43b07486139bf915a82aa75d792b
|
||||
DIST waf-1.8.4 96179 SHA256 f02035fa5d8814f33f19b2b20d43822ddef6bb39b955ca196c2a247a1f9ffaa8 SHA512 3a132d8b1cba0af0e3df046c0204c5df706fae4e0fac41cf74b53f6cdea6210ed798671c7a3cb3fee70573aacab16d4c0cc699cc4b7aa74c8a416346c5513f4c WHIRLPOOL fe8d7f42e5118a1f9490a0c9add1355c969185376b57d0bab024068dd6e7364632d862bf9432e1209165c5313ae843479ef334f4bd6285db05dfebff9a1b640e
|
||||
|
||||
@ -1,300 +0,0 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=6
|
||||
|
||||
PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
|
||||
PYTHON_REQ_USE='threads(+)'
|
||||
|
||||
WAF_PV=1.8.12
|
||||
|
||||
inherit eutils fdo-mime gnome2-utils pax-utils python-any-r1 toolchain-funcs waf-utils
|
||||
|
||||
DESCRIPTION="Media player based on MPlayer and mplayer2"
|
||||
HOMEPAGE="https://mpv.io/"
|
||||
|
||||
if [[ ${PV} != *9999* ]]; then
|
||||
SRC_URI="
|
||||
https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz -> ${P}.tar.gz
|
||||
https://dev.gentoo.org/~wraeth/distfiles/${P}-patches-06.tar.gz
|
||||
"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
|
||||
DOCS=( RELEASE_NOTES )
|
||||
else
|
||||
EGIT_REPO_URI="git://github.com/mpv-player/mpv.git"
|
||||
inherit git-r3
|
||||
fi
|
||||
SRC_URI+=" https://waf.io/waf-${WAF_PV}"
|
||||
DOCS+=( CONTRIBUTING.md README.md )
|
||||
|
||||
# See Copyright in sources and Gentoo bug 506946. Waf is BSD, libmpv is ISC.
|
||||
LICENSE="GPL-2+ BSD ISC"
|
||||
SLOT="0"
|
||||
IUSE="aqua +alsa archive bluray cdda +cli coreaudio doc drm dvb dvd +egl +enca
|
||||
encode gbm +iconv jack jpeg lcms +libass libav libcaca libguess libmpv lua
|
||||
luajit openal +opengl oss pulseaudio raspberry-pi rubberband samba -sdl
|
||||
selinux test uchardet v4l vaapi vdpau vf-dlopen wayland +X xinerama
|
||||
+xscreensaver +xv zsh-completion"
|
||||
|
||||
REQUIRED_USE="
|
||||
|| ( cli libmpv )
|
||||
aqua? ( opengl )
|
||||
egl? ( || ( gbm X wayland ) )
|
||||
enca? ( iconv )
|
||||
gbm? ( drm egl )
|
||||
lcms? ( || ( opengl egl ) )
|
||||
libguess? ( iconv )
|
||||
luajit? ( lua )
|
||||
uchardet? ( iconv )
|
||||
v4l? ( || ( alsa oss ) )
|
||||
vaapi? ( || ( gbm X wayland ) )
|
||||
vdpau? ( X )
|
||||
wayland? ( egl )
|
||||
xinerama? ( X )
|
||||
xscreensaver? ( X )
|
||||
xv? ( X )
|
||||
zsh-completion? ( cli )
|
||||
"
|
||||
|
||||
COMMON_DEPEND="
|
||||
!libav? ( >=media-video/ffmpeg-2.4:0=[encode?,threads,vaapi?,vdpau?] )
|
||||
libav? ( >=media-video/libav-11:0=[encode?,threads,vaapi?,vdpau?] )
|
||||
sys-libs/zlib
|
||||
alsa? ( >=media-libs/alsa-lib-1.0.18 )
|
||||
archive? ( >=app-arch/libarchive-3.0.0:= )
|
||||
bluray? ( >=media-libs/libbluray-0.3.0 )
|
||||
cdda? ( dev-libs/libcdio-paranoia )
|
||||
drm? ( x11-libs/libdrm )
|
||||
dvb? ( virtual/linuxtv-dvb-headers )
|
||||
dvd? (
|
||||
>=media-libs/libdvdnav-4.2.0
|
||||
>=media-libs/libdvdread-4.1.0
|
||||
)
|
||||
egl? ( media-libs/mesa[egl,gbm(-)?,wayland(-)?] )
|
||||
iconv? (
|
||||
virtual/libiconv
|
||||
enca? ( app-i18n/enca )
|
||||
libguess? ( >=app-i18n/libguess-1.0 )
|
||||
uchardet? ( dev-libs/uchardet )
|
||||
)
|
||||
jack? ( virtual/jack )
|
||||
jpeg? ( virtual/jpeg:0 )
|
||||
lcms? ( >=media-libs/lcms-2.6:2 )
|
||||
libass? (
|
||||
>=media-libs/libass-0.12.1:=[fontconfig,harfbuzz]
|
||||
virtual/ttf-fonts
|
||||
)
|
||||
libcaca? ( >=media-libs/libcaca-0.99_beta18 )
|
||||
lua? (
|
||||
!luajit? ( <dev-lang/lua-5.3:= )
|
||||
luajit? ( dev-lang/luajit:2 )
|
||||
)
|
||||
openal? ( >=media-libs/openal-1.13 )
|
||||
opengl? ( !aqua? ( virtual/opengl ) )
|
||||
pulseaudio? ( media-sound/pulseaudio )
|
||||
raspberry-pi? (
|
||||
>=media-libs/raspberrypi-userland-0_pre20160305-r1
|
||||
media-libs/mesa[egl,gles2]
|
||||
)
|
||||
rubberband? ( >=media-libs/rubberband-1.8.0 )
|
||||
samba? ( net-fs/samba )
|
||||
sdl? ( media-libs/libsdl2[sound,threads,video,X?,wayland?] )
|
||||
v4l? ( media-libs/libv4l )
|
||||
vaapi? ( >=x11-libs/libva-1.4.0[drm?,X?,wayland?] )
|
||||
wayland? (
|
||||
>=dev-libs/wayland-1.6.0
|
||||
>=x11-libs/libxkbcommon-0.3.0
|
||||
)
|
||||
X? (
|
||||
x11-libs/libX11
|
||||
x11-libs/libXext
|
||||
>=x11-libs/libXrandr-1.2.0
|
||||
opengl? ( x11-libs/libXdamage )
|
||||
vdpau? ( >=x11-libs/libvdpau-0.2 )
|
||||
xinerama? ( x11-libs/libXinerama )
|
||||
xscreensaver? ( x11-libs/libXScrnSaver )
|
||||
xv? ( x11-libs/libXv )
|
||||
)
|
||||
"
|
||||
DEPEND="${COMMON_DEPEND}
|
||||
${PYTHON_DEPS}
|
||||
>=dev-lang/perl-5.8
|
||||
dev-python/docutils
|
||||
virtual/pkgconfig
|
||||
doc? ( dev-python/rst2pdf )
|
||||
test? ( >=dev-util/cmocka-1.0.0 )
|
||||
"
|
||||
RDEPEND="${COMMON_DEPEND}
|
||||
selinux? ( sec-policy/selinux-mplayer )
|
||||
"
|
||||
|
||||
pkg_pretend() {
|
||||
if [[ ${MERGE_TYPE} != "binary" ]] && ! tc-has-tls && use vaapi && use egl; then
|
||||
die "Your compiler lacks C++11 TLS support. Use GCC>=4.8.0 or Clang>=3.3."
|
||||
fi
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
cp "${DISTDIR}/waf-${WAF_PV}" "${S}"/waf || die
|
||||
chmod +x "${S}"/waf || die
|
||||
default_src_prepare
|
||||
EPATCH_SUFFIX=patch EPATCH_FORCE=yes epatch "${WORKDIR}/${PV}"
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local mywafargs=(
|
||||
--confdir="${EPREFIX}/etc/${PN}"
|
||||
--docdir="${EPREFIX}/usr/share/doc/${PF}"
|
||||
|
||||
--disable-gpl3 # Unclear license info. See Gentoo bug 571728.
|
||||
|
||||
$(usex cli '' '--disable-cplayer')
|
||||
$(use_enable libmpv libmpv-shared)
|
||||
|
||||
# See deep down below for build-date.
|
||||
--disable-libmpv-static
|
||||
--disable-static-build
|
||||
--disable-optimize # Don't add '-O2' to CFLAGS.
|
||||
--disable-debug-build # Don't add '-g' to CFLAGS.
|
||||
|
||||
$(use_enable doc html-build)
|
||||
$(use_enable doc pdf-build)
|
||||
$(use_enable vf-dlopen vf-dlopen-filters)
|
||||
$(use_enable zsh-completion zsh-comp)
|
||||
$(use_enable test)
|
||||
|
||||
$(use_enable iconv)
|
||||
$(use_enable samba libsmbclient)
|
||||
$(use_enable lua)
|
||||
$(usex luajit '--lua=luajit' '')
|
||||
$(use_enable libass)
|
||||
$(use_enable libass libass-osd)
|
||||
$(use_enable encode encoding)
|
||||
$(use_enable bluray libbluray)
|
||||
$(use_enable dvd dvdread)
|
||||
$(use_enable dvd dvdnav)
|
||||
$(use_enable cdda)
|
||||
$(use_enable enca)
|
||||
$(use_enable libguess)
|
||||
$(use_enable uchardet)
|
||||
$(use_enable rubberband)
|
||||
$(use_enable lcms lcms2)
|
||||
--disable-vapoursynth # Only available in overlays.
|
||||
--disable-vapoursynth-lazy
|
||||
$(use_enable archive libarchive)
|
||||
|
||||
--enable-libavdevice
|
||||
|
||||
# Audio outputs:
|
||||
$(use_enable sdl sdl2) # Listed under audio, but also includes video.
|
||||
--disable-sdl1
|
||||
$(use_enable oss oss-audio)
|
||||
--disable-rsound # Only available in overlays.
|
||||
$(use_enable pulseaudio pulse)
|
||||
$(use_enable jack)
|
||||
$(use_enable openal)
|
||||
--disable-opensles
|
||||
$(use_enable alsa)
|
||||
$(use_enable coreaudio)
|
||||
|
||||
# Video outputs:
|
||||
$(use_enable aqua cocoa)
|
||||
$(use_enable drm)
|
||||
$(use_enable gbm)
|
||||
$(use_enable wayland)
|
||||
$(use_enable X x11)
|
||||
$(use_enable xscreensaver xss)
|
||||
$(use_enable X xext)
|
||||
$(use_enable xv)
|
||||
$(use_enable xinerama)
|
||||
$(use_enable X xrandr)
|
||||
$(usex opengl "$(use_enable aqua gl-cocoa)" '--disable-gl-cocoa')
|
||||
$(usex opengl "$(use_enable X gl-x11)" '--disable-gl-x11')
|
||||
$(usex egl "$(use_enable X egl-x11)" '--disable-egl-x11')
|
||||
$(usex egl "$(use_enable gbm egl-drm)" '--disable-egl-drm')
|
||||
$(use_enable wayland gl-wayland)
|
||||
$(use_enable vdpau)
|
||||
$(usex vdpau "$(use_enable opengl vdpau-gl-x11)" '--disable-vdpau-gl-x11')
|
||||
$(use_enable vaapi) # See below for vaapi-glx, vaapi-x-egl.
|
||||
$(usex vaapi "$(use_enable X vaapi-x11)" '--disable-vaapi-x11')
|
||||
$(usex vaapi "$(use_enable wayland vaapi-wayland)" '--disable-vaapi-wayland')
|
||||
$(usex vaapi "$(use_enable gbm vaapi-drm)" '--disable-vaapi-drm')
|
||||
$(use_enable libcaca caca)
|
||||
$(use_enable jpeg)
|
||||
--disable-android
|
||||
$(use_enable raspberry-pi rpi)
|
||||
$(usex libmpv "$(use_enable opengl plain-gl)" '--disable-plain-gl')
|
||||
|
||||
# HWaccels:
|
||||
# Automagic Video Toolbox HW acceleration. See Gentoo bug 577332.
|
||||
$(use_enable vaapi vaapi-hwaccel)
|
||||
# Automagic VDPAU HW acceleration. See Gentoo bug 558870.
|
||||
|
||||
# TV features:
|
||||
$(use_enable v4l tv)
|
||||
$(use_enable v4l tv-v4l2)
|
||||
$(use_enable v4l libv4l2)
|
||||
$(use_enable v4l audio-input)
|
||||
$(use_enable dvb dvbin)
|
||||
|
||||
# Miscellaneous features:
|
||||
--disable-apple-remote # Needs testing first. See Gentoo bug 577332.
|
||||
)
|
||||
|
||||
if use vaapi && use X; then
|
||||
mywafargs+=(
|
||||
$(use_enable opengl vaapi-glx)
|
||||
$(use_enable egl vaapi-x-egl)
|
||||
)
|
||||
fi
|
||||
|
||||
# Create reproducible non-live builds.
|
||||
[[ ${PV} != *9999* ]] && mywafargs+=(--disable-build-date)
|
||||
|
||||
waf-utils_src_configure "${mywafargs[@]}"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
waf-utils_src_install
|
||||
|
||||
if use cli && use luajit; then
|
||||
pax-mark -m "${ED}"usr/bin/${PN}
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_preinst() {
|
||||
gnome2_icon_savelist
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
fdo-mime_desktop_database_update
|
||||
gnome2_icon_cache_update
|
||||
|
||||
# bash-completion < 2.3-r1 already installs (mostly broken) mpv completion.
|
||||
if use cli && ! has_version '<app-shells/bash-completion-2.3-r1' && \
|
||||
! has_version 'app-shells/mpv-bash-completion'; then
|
||||
elog "If you want to have command-line completion via bash-completion,"
|
||||
elog "please install app-shells/mpv-bash-completion."
|
||||
fi
|
||||
|
||||
if use cli && [[ -n ${REPLACING_VERSIONS} ]] && \
|
||||
has_version 'app-shells/mpv-bash-completion'; then
|
||||
elog "If command-line completion doesn't work after mpv update,"
|
||||
elog "please rebuild app-shells/mpv-bash-completion."
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
fdo-mime_desktop_database_update
|
||||
gnome2_icon_cache_update
|
||||
}
|
||||
|
||||
src_test() {
|
||||
cd "${S}"/build/test || die
|
||||
for test in *; do
|
||||
if [[ -x ${test} ]]; then
|
||||
./"${test}" || die "Test suite failed"
|
||||
fi
|
||||
done
|
||||
}
|
||||
@ -0,0 +1,160 @@
|
||||
Index: vlc-2.2.4/configure.ac
|
||||
===================================================================
|
||||
--- vlc-2.2.4.orig/configure.ac
|
||||
+++ vlc-2.2.4/configure.ac
|
||||
@@ -2323,8 +2323,8 @@ AC_ARG_ENABLE(avcodec,
|
||||
[ --enable-avcodec libavcodec codec (default enabled)])
|
||||
AS_IF([test "${enable_avcodec}" != "no"], [
|
||||
PKG_CHECK_MODULES(AVCODEC,[libavcodec >= 53.34.0 libavutil >= 51.22.0], [
|
||||
- PKG_CHECK_EXISTS([libavutil < 55],, [
|
||||
- AC_MSG_ERROR([libavutil versions 55 and later are not supported.])
|
||||
+ PKG_CHECK_EXISTS([libavutil < 56],, [
|
||||
+ AC_MSG_ERROR([libavutil versions 56 and later are not supported.])
|
||||
])
|
||||
VLC_SAVE_FLAGS
|
||||
CPPFLAGS="${CPPFLAGS} ${AVCODEC_CFLAGS}"
|
||||
Index: vlc-2.2.4/modules/codec/avcodec/audio.c
|
||||
===================================================================
|
||||
--- vlc-2.2.4.orig/modules/codec/avcodec/audio.c
|
||||
+++ vlc-2.2.4/modules/codec/avcodec/audio.c
|
||||
@@ -39,8 +39,6 @@
|
||||
#include <libavcodec/avcodec.h>
|
||||
#include <libavutil/mem.h>
|
||||
|
||||
-#include <libavutil/audioconvert.h>
|
||||
-
|
||||
#include "avcodec.h"
|
||||
|
||||
/*****************************************************************************
|
||||
Index: vlc-2.2.4/modules/codec/avcodec/encoder.c
|
||||
===================================================================
|
||||
--- vlc-2.2.4.orig/modules/codec/avcodec/encoder.c
|
||||
+++ vlc-2.2.4/modules/codec/avcodec/encoder.c
|
||||
@@ -41,7 +41,6 @@
|
||||
#include <vlc_cpu.h>
|
||||
|
||||
#include <libavcodec/avcodec.h>
|
||||
-#include <libavutil/audioconvert.h>
|
||||
|
||||
#include "avcodec.h"
|
||||
#include "avcommon.h"
|
||||
@@ -311,7 +310,7 @@ int OpenEncoder( vlc_object_t *p_this )
|
||||
else if( !GetFfmpegCodec( p_enc->fmt_out.i_codec, &i_cat, &i_codec_id,
|
||||
&psz_namecodec ) )
|
||||
{
|
||||
- if( FindFfmpegChroma( p_enc->fmt_out.i_codec ) == PIX_FMT_NONE )
|
||||
+ if( FindFfmpegChroma( p_enc->fmt_out.i_codec ) == AV_PIX_FMT_NONE )
|
||||
return VLC_EGENERIC; /* handed chroma output */
|
||||
|
||||
i_cat = VIDEO_ES;
|
||||
@@ -555,7 +554,7 @@ int OpenEncoder( vlc_object_t *p_this )
|
||||
|
||||
if( p_codec->pix_fmts )
|
||||
{
|
||||
- const enum PixelFormat *p = p_codec->pix_fmts;
|
||||
+ const enum AVPixelFormat *p = p_codec->pix_fmts;
|
||||
for( ; *p != -1; p++ )
|
||||
{
|
||||
if( *p == p_context->pix_fmt ) break;
|
||||
@@ -1017,7 +1016,7 @@ errmsg:
|
||||
}
|
||||
}
|
||||
|
||||
- p_sys->frame = avcodec_alloc_frame();
|
||||
+ p_sys->frame = av_frame_alloc();
|
||||
if( !p_sys->frame )
|
||||
{
|
||||
goto error;
|
||||
@@ -1088,7 +1087,7 @@ static block_t *EncodeVideo( encoder_t *
|
||||
AVFrame *frame = NULL;
|
||||
if( likely(p_pict) ) {
|
||||
frame = p_sys->frame;
|
||||
- avcodec_get_frame_defaults( frame );
|
||||
+ av_frame_unref( frame );
|
||||
for( i_plane = 0; i_plane < p_pict->i_planes; i_plane++ )
|
||||
{
|
||||
p_sys->frame->data[i_plane] = p_pict->p[i_plane].p_pixels;
|
||||
@@ -1329,7 +1328,7 @@ static block_t *handle_delay_buffer( enc
|
||||
//How much we need to copy from new packet
|
||||
const int leftover = leftover_samples * p_sys->p_context->channels * p_sys->i_sample_bytes;
|
||||
|
||||
- avcodec_get_frame_defaults( p_sys->frame );
|
||||
+ av_frame_unref( p_sys->frame );
|
||||
p_sys->frame->format = p_sys->p_context->sample_fmt;
|
||||
p_sys->frame->nb_samples = leftover_samples + p_sys->i_samples_delay;
|
||||
|
||||
@@ -1451,7 +1450,7 @@ static block_t *EncodeAudio( encoder_t *
|
||||
while( ( p_aout_buf->i_nb_samples >= p_sys->i_frame_size ) ||
|
||||
( p_sys->b_variable && p_aout_buf->i_nb_samples ) )
|
||||
{
|
||||
- avcodec_get_frame_defaults( p_sys->frame );
|
||||
+ av_frame_unref( p_sys->frame );
|
||||
if( p_sys->b_variable )
|
||||
p_sys->frame->nb_samples = p_aout_buf->i_nb_samples;
|
||||
else
|
||||
Index: vlc-2.2.4/modules/codec/avcodec/vaapi.c
|
||||
===================================================================
|
||||
--- vlc-2.2.4.orig/modules/codec/avcodec/vaapi.c
|
||||
+++ vlc-2.2.4/modules/codec/avcodec/vaapi.c
|
||||
@@ -598,7 +598,7 @@ static int Create( vlc_va_t *p_va, AVCod
|
||||
return err;
|
||||
|
||||
/* Only VLD supported */
|
||||
- p_va->pix_fmt = PIX_FMT_VAAPI_VLD;
|
||||
+ p_va->pix_fmt = AV_PIX_FMT_VAAPI_VLD;
|
||||
p_va->setup = Setup;
|
||||
p_va->get = Get;
|
||||
p_va->release = Release;
|
||||
Index: vlc-2.2.4/modules/codec/avcodec/video.c
|
||||
===================================================================
|
||||
--- vlc-2.2.4.orig/modules/codec/avcodec/video.c
|
||||
+++ vlc-2.2.4/modules/codec/avcodec/video.c
|
||||
@@ -108,8 +108,8 @@ static int lavc_GetFrame(struct AVCodecC
|
||||
static int ffmpeg_GetFrameBuf ( struct AVCodecContext *, AVFrame * );
|
||||
static void ffmpeg_ReleaseFrameBuf( struct AVCodecContext *, AVFrame * );
|
||||
#endif
|
||||
-static enum PixelFormat ffmpeg_GetFormat( AVCodecContext *,
|
||||
- const enum PixelFormat * );
|
||||
+static enum AVPixelFormat ffmpeg_GetFormat( AVCodecContext *,
|
||||
+ const enum AVPixelFormat * );
|
||||
|
||||
static uint32_t ffmpeg_CodecTag( vlc_fourcc_t fcc )
|
||||
{
|
||||
@@ -234,7 +234,7 @@ int InitVideoDec( decoder_t *p_dec, AVCo
|
||||
p_sys->p_codec = p_codec;
|
||||
p_sys->i_codec_id = i_codec_id;
|
||||
p_sys->psz_namecodec = psz_namecodec;
|
||||
- p_sys->p_ff_pic = avcodec_alloc_frame();
|
||||
+ p_sys->p_ff_pic = av_frame_alloc();
|
||||
p_sys->b_delayed_open = true;
|
||||
p_sys->p_va = NULL;
|
||||
vlc_sem_init( &p_sys->sem_mt, 0 );
|
||||
@@ -446,7 +446,7 @@ int InitVideoDec( decoder_t *p_dec, AVCo
|
||||
if( ffmpeg_OpenCodec( p_dec ) < 0 )
|
||||
{
|
||||
msg_Err( p_dec, "cannot open codec (%s)", p_sys->psz_namecodec );
|
||||
- avcodec_free_frame( &p_sys->p_ff_pic );
|
||||
+ av_frame_free( &p_sys->p_ff_pic );
|
||||
vlc_sem_destroy( &p_sys->sem_mt );
|
||||
free( p_sys );
|
||||
return VLC_EGENERIC;
|
||||
@@ -826,7 +826,7 @@ void EndVideoDec( decoder_t *p_dec )
|
||||
wait_mt( p_sys );
|
||||
|
||||
if( p_sys->p_ff_pic )
|
||||
- avcodec_free_frame( &p_sys->p_ff_pic );
|
||||
+ av_frame_free( &p_sys->p_ff_pic );
|
||||
|
||||
if( p_sys->p_va )
|
||||
vlc_va_Delete( p_sys->p_va );
|
||||
@@ -1313,8 +1313,8 @@ static void ffmpeg_ReleaseFrameBuf( stru
|
||||
}
|
||||
#endif
|
||||
|
||||
-static enum PixelFormat ffmpeg_GetFormat( AVCodecContext *p_context,
|
||||
- const enum PixelFormat *pi_fmt )
|
||||
+static enum AVPixelFormat ffmpeg_GetFormat( AVCodecContext *p_context,
|
||||
+ const enum AVPixelFormat *pi_fmt )
|
||||
{
|
||||
decoder_t *p_dec = p_context->opaque;
|
||||
decoder_sys_t *p_sys = p_dec->p_sys;
|
||||
@ -0,0 +1,45 @@
|
||||
commit b8869f97ea66ac7ec9912a74c2e8b5e15daf7752
|
||||
Author: Rafaël Carré <funman@videolan.org>
|
||||
Date: Fri Feb 26 00:36:26 2016 +0000
|
||||
|
||||
Relax requirements for FFmpeg hwaccel
|
||||
|
||||
It doesn't error out anymore since 5edd1f62ca1
|
||||
|
||||
Index: vlc-2.2.4/configure.ac
|
||||
===================================================================
|
||||
--- vlc-2.2.4.orig/configure.ac
|
||||
+++ vlc-2.2.4/configure.ac
|
||||
@@ -2383,7 +2383,9 @@ AS_IF([test "${have_vaapi}" = "yes" -a "
|
||||
case "${avfork}" in
|
||||
ffmpeg)
|
||||
PKG_CHECK_EXISTS([libavcodec >= 57.10.100], [
|
||||
- AC_MSG_ERROR([VA API requires FFmpeg libavcodec < 57.10 or libav.])
|
||||
+ PKG_CHECK_EXISTS([libavcodec <= 57.12.100], [
|
||||
+ AC_MSG_ERROR([VA API requires FFmpeg libavcodec < 57.10 or > 57.12 or libav.])
|
||||
+ ])
|
||||
])
|
||||
;;
|
||||
esac
|
||||
@@ -2417,7 +2419,9 @@ AS_IF([test "${enable_dxva2}" != "no"],
|
||||
case "${avfork}" in
|
||||
ffmpeg)
|
||||
PKG_CHECK_EXISTS([libavcodec >= 57.10.100], [
|
||||
- AC_MSG_ERROR([DXVA2 requires FFmpeg libavcodec < 57.10 or libav.])
|
||||
+ PKG_CHECK_EXISTS([libavcodec <= 57.12.100], [
|
||||
+ AC_MSG_ERROR([DXVA2 requires FFmpeg libavcodec < 57.10 or > 57.12 or libav.])
|
||||
+ ])
|
||||
])
|
||||
;;
|
||||
esac
|
||||
@@ -3181,7 +3185,9 @@ AS_IF([test "${have_vdpau}" = "yes" -a "
|
||||
libav) av_vdpau_ver="55.26.0" ;;
|
||||
ffmpeg) av_vdpau_ver="55.42.100"
|
||||
PKG_CHECK_EXISTS([libavcodec >= 57.10.100], [
|
||||
- AC_MSG_ERROR([VDPAU requires FFmpeg libavcodec < 57.10 or libav.])
|
||||
+ PKG_CHECK_EXISTS([libavcodec <= 57.12.100], [
|
||||
+ AC_MSG_ERROR([VDPAU requires FFmpeg libavcodec < 57.10 or > 57.12 or libav.])
|
||||
+ ])
|
||||
])
|
||||
;;
|
||||
esac
|
||||
@ -1 +1 @@
|
||||
Fri, 02 Sep 2016 10:05:49 +0000
|
||||
Fri, 02 Sep 2016 19:10:35 +0000
|
||||
|
||||
@ -1 +1 @@
|
||||
Fri, 02 Sep 2016 10:05:49 +0000
|
||||
Fri, 02 Sep 2016 19:10:36 +0000
|
||||
|
||||
@ -0,0 +1,12 @@
|
||||
DEFINED_PHASES=install postinst postrm
|
||||
DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
|
||||
DESCRIPTION=vim plugin: library for alias creation
|
||||
EAPI=6
|
||||
HOMEPAGE=http://www.vim.org/scripts/script.php?script_id=746
|
||||
KEYWORDS=~alpha ~amd64 ~ia64 ~mips ~ppc ~sparc ~x86
|
||||
LICENSE=GPL-2
|
||||
RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
|
||||
SLOT=0
|
||||
SRC_URI=mirror://gentoo/cmdalias-3.0.tar.bz2 https://dev.gentoo.org/~radhermit/vim/cmdalias-3.0.tar.bz2
|
||||
_eclasses_=vim-doc 1b0813c9dadf2431c96854a8d46f5eaf vim-plugin cba1cae8a355e4e89cbd2615aed3b1d5
|
||||
_md5_=f85a22e59e96471704fca231feabb563
|
||||
@ -1,12 +0,0 @@
|
||||
DEFINED_PHASES=install postinst postrm
|
||||
DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
|
||||
DESCRIPTION=vim plugin: automatically detect file indent settings
|
||||
EAPI=0
|
||||
HOMEPAGE=http://www.vim.org/scripts/script.php?script_id=1171
|
||||
KEYWORDS=amd64 ~hppa ~mips ppc sparc x86
|
||||
LICENSE=vim
|
||||
RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
|
||||
SLOT=0
|
||||
SRC_URI=mirror://gentoo/detectindent-1.0.tar.bz2 https://dev.gentoo.org/~radhermit/vim/detectindent-1.0.tar.bz2
|
||||
_eclasses_=vim-doc 1b0813c9dadf2431c96854a8d46f5eaf vim-plugin cba1cae8a355e4e89cbd2615aed3b1d5
|
||||
_md5_=28a92e20211cab191f4f8065cd619e9e
|
||||
@ -0,0 +1,12 @@
|
||||
DEFINED_PHASES=install postinst postrm prepare
|
||||
DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
|
||||
DESCRIPTION=vim plugin: EBNF (ISO/IEC 14997) file syntax highlighting
|
||||
EAPI=6
|
||||
HOMEPAGE=http://www.vim.org/scripts/script.php?script_id=545
|
||||
KEYWORDS=~alpha ~amd64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
|
||||
LICENSE=vim
|
||||
RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
|
||||
SLOT=0
|
||||
SRC_URI=mirror://gentoo/ebnf-syntax-1.1.tar.bz2 https://dev.gentoo.org/~radhermit/vim/ebnf-syntax-1.1.tar.bz2
|
||||
_eclasses_=vim-doc 1b0813c9dadf2431c96854a8d46f5eaf vim-plugin cba1cae8a355e4e89cbd2615aed3b1d5
|
||||
_md5_=217a8529114a7238b606a6231365b151
|
||||
@ -0,0 +1,12 @@
|
||||
DEFINED_PHASES=install postinst postrm prepare
|
||||
DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
|
||||
DESCRIPTION=vim plugin: show location marks visually
|
||||
EAPI=6
|
||||
HOMEPAGE=http://www.vim.org/scripts/script.php?script_id=152
|
||||
KEYWORDS=~alpha ~amd64 ~ia64 ~mips ~ppc ~sparc ~x86
|
||||
LICENSE=public-domain
|
||||
RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
|
||||
SLOT=0
|
||||
SRC_URI=mirror://gentoo/showmarks-2.2.tar.bz2 https://dev.gentoo.org/~radhermit/vim/showmarks-2.2.tar.bz2
|
||||
_eclasses_=vim-doc 1b0813c9dadf2431c96854a8d46f5eaf vim-plugin cba1cae8a355e4e89cbd2615aed3b1d5
|
||||
_md5_=c024b57fe0902c893083c2147121952c
|
||||
@ -0,0 +1,12 @@
|
||||
DEFINED_PHASES=install postinst postrm
|
||||
DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
|
||||
DESCRIPTION=vim plugin: linking in plaintext
|
||||
EAPI=6
|
||||
HOMEPAGE=http://www.vim.org/scripts/script.php?script_id=293
|
||||
KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86
|
||||
LICENSE=GPL-2
|
||||
RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
|
||||
SLOT=0
|
||||
SRC_URI=mirror://gentoo/thlnk-1.2.1.tar.bz2 https://dev.gentoo.org/~radhermit/vim/thlnk-1.2.1.tar.bz2
|
||||
_eclasses_=vim-doc 1b0813c9dadf2431c96854a8d46f5eaf vim-plugin cba1cae8a355e4e89cbd2615aed3b1d5
|
||||
_md5_=3f1637865853445f0d9cba1af9bd79ef
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue