summaryrefslogtreecommitdiff
path: root/media-video
diff options
context:
space:
mode:
Diffstat (limited to 'media-video')
-rw-r--r--media-video/Manifest.gzbin29769 -> 29763 bytes
-rw-r--r--media-video/avidemux/Manifest2
-rw-r--r--media-video/avidemux/avidemux-9999.ebuild20
-rw-r--r--media-video/openshot/Manifest6
-rw-r--r--media-video/openshot/openshot-1.4.3-r1.ebuild60
-rw-r--r--media-video/openshot/openshot-2.2.0.ebuild55
-rw-r--r--media-video/openshot/openshot-2.3.4.ebuild51
-rw-r--r--media-video/vlc/Manifest9
-rw-r--r--media-video/vlc/metadata.xml3
-rw-r--r--media-video/vlc/vlc-2.2.6-r2.ebuild6
-rw-r--r--media-video/vlc/vlc-2.2.9999.ebuild18
-rw-r--r--media-video/vlc/vlc-3.0.9999.ebuild473
-rw-r--r--media-video/vlc/vlc-9999.ebuild194
13 files changed, 607 insertions, 290 deletions
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 9718936d096b..b1545783f87b 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
Binary files differ
diff --git a/media-video/avidemux/Manifest b/media-video/avidemux/Manifest
index 1abbd0d14703..25b4f50a690c 100644
--- a/media-video/avidemux/Manifest
+++ b/media-video/avidemux/Manifest
@@ -1,4 +1,4 @@
DIST avidemux_2.6.20.tar.gz 20172362 SHA256 03c6cb7fc9eb74688b4fcd5eb654ed7b9c4ffc717a72cc09b08a2d10cdc7ef9f SHA512 d01d0fc24a3004770bd3923c2debc4fa2752eb71df08cfe423746b9c44a2562ca01d82965ed2563b99572a4bed8034b79487199ce330208b51a3b7f87ccf7103 WHIRLPOOL 2e2dc21bed49eeb0cdfefe75fe51f6a84226e7e8e80b063bc0b3d8711a6b91db710611dc0ec06575be69ec8e24f2f9e5b5eb363b9c095267729e85e162a4ce38
EBUILD avidemux-2.6.20.ebuild 4429 BLAKE2B fe55520ebcf116160744bb155bf26d2e3047aa7294fa6fa1be5ca39a891fafcb8677de2b7ac97f29ec9334f14d33ec0a66c2c6a95ba04ff92797935ef9ddd74c SHA512 bfb165003b197c1bd6ce6579cc5ef2ef6e974087bb66589cf7f72d50f0f0fe0521bfa9f1cec00cc3abb9f2a03b87bc046c6c0fb94ab0f58176afc5581d92acee
-EBUILD avidemux-9999.ebuild 4429 BLAKE2B fe55520ebcf116160744bb155bf26d2e3047aa7294fa6fa1be5ca39a891fafcb8677de2b7ac97f29ec9334f14d33ec0a66c2c6a95ba04ff92797935ef9ddd74c SHA512 bfb165003b197c1bd6ce6579cc5ef2ef6e974087bb66589cf7f72d50f0f0fe0521bfa9f1cec00cc3abb9f2a03b87bc046c6c0fb94ab0f58176afc5581d92acee
+EBUILD avidemux-9999.ebuild 4273 BLAKE2B 7770fa9c525a7f3cf7d1937c7278a65c9942eac2502e76b11cd7ec8c53894276348a16aa70ccd0dafb676cb9b2cd8a9ebe1d4e766b46b51cdfb11297d88349d1 SHA512 34141d9cd63135e71adb7a338341a7d5e4e4d0b5d3e93b2840287184654e978482199eb8c6dcd629c2a1a857a8d3ee41633188e71f34c0266af3a3f2ed85db55
MISC metadata.xml 489 BLAKE2B 51c28e4d932facf14fe99d0d18e736f16c754961e8fde468505f03c989e8ec3cb9afab9c916752468a5f9f0a07ad8d25da01e64cb987cfed1db835f657512b1e SHA512 7a1b885e05a9bb6684583dcaefc5853903330bbcfc6b1e07b76cde7405894d94e0f095fcfe18bc33bc24c1bbf260814c9ebb8219397e0e861a2fb5977361bc4d
diff --git a/media-video/avidemux/avidemux-9999.ebuild b/media-video/avidemux/avidemux-9999.ebuild
index 72ad632f6969..752f66972be5 100644
--- a/media-video/avidemux/avidemux-9999.ebuild
+++ b/media-video/avidemux/avidemux-9999.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI="6"
+EAPI=6
PLOCALES="ca cs de el es fr it ja pt_BR ru sr sr@latin tr"
@@ -13,7 +13,7 @@ HOMEPAGE="http://fixounet.free.fr/${PN}"
# Multiple licenses because of all the bundled stuff.
LICENSE="GPL-1 GPL-2 MIT PSF-2 public-domain"
SLOT="2.6"
-IUSE="debug opengl nls nvenc qt4 qt5 sdl vaapi vdpau xv"
+IUSE="debug opengl nls nvenc qt5 sdl vaapi vdpau xv"
if [[ ${PV} == *9999* ]] ; then
MY_P="${P}"
@@ -28,17 +28,15 @@ fi
DEPEND="
~media-libs/avidemux-core-${PV}:${SLOT}[nls?,sdl?,vaapi?,vdpau?,xv?,nvenc?]
+ nvenc? ( amd64? ( media-video/nvidia_video_sdk:0 ) )
opengl? ( virtual/opengl:0 )
- qt4? ( >=dev-qt/qtgui-4.8.3:4 )
qt5? ( dev-qt/qtgui:5 )
vaapi? ( x11-libs/libva:0 )
- nvenc? ( amd64? ( media-video/nvidia_video_sdk:0 ) )
"
-RDEPEND="
- $DEPEND
+RDEPEND="${DEPEND}
nls? ( virtual/libintl:0 )
"
-PDEPEND="~media-libs/avidemux-plugins-${PV}:${SLOT}[opengl?,qt4?,qt5?]"
+PDEPEND="~media-libs/avidemux-plugins-${PV}:${SLOT}[opengl?,qt5?]"
S="${WORKDIR}/${MY_P}"
@@ -46,7 +44,7 @@ src_prepare() {
default
processes="buildCli:avidemux/cli"
- if use qt4 || use qt5 ; then
+ if use qt5 ; then
processes+=" buildQt4:avidemux/qt4"
fi
@@ -139,10 +137,6 @@ src_install() {
cd "${S}" || die "Can't enter source folder."
newicon ${PN}_icon.png ${PN}-2.6.png
- if [[ -f "${ED}"/usr/bin/avidemux3_qt4 ]] ; then
- fperms +x /usr/bin/avidemux3_qt4
- fi
-
if [[ -f "${ED}"/usr/bin/avidemux3_qt5 ]] ; then
fperms +x /usr/bin/avidemux3_qt5
fi
@@ -151,7 +145,7 @@ src_install() {
fperms +x /usr/bin/avidemux3_jobs_qt5
fi
- if use qt4 || use qt5 ; then
+ if use qt5 ; then
domenu ${PN}-2.6.desktop
fi
}
diff --git a/media-video/openshot/Manifest b/media-video/openshot/Manifest
index da3c2161b41b..1d800ad2a5fe 100644
--- a/media-video/openshot/Manifest
+++ b/media-video/openshot/Manifest
@@ -1,9 +1,3 @@
-DIST openshot-1.4.3.tar.gz 31990991 SHA256 5bebf1c59a8667b0263599544f2d23ce6be3ab79ce24a85b766e1e39cab859d0 SHA512 f3221c3e508ccf61d4fd2771de47f42ddb1a78996853011ee336e8ccf842a0fd97707a60c677e1465a89e6eb67911b6eb98b002959f8a29ac9e31924bbb6fcda WHIRLPOOL 4fd8d5b5db2923c8b7349032847087b9cf4ccdbade206c5c6cc9aac27ace6e99c6053bd1184cf14b20c80b4f666baf356798a5b6a8d6c7c737a9a986894943af
-DIST openshot-qt-2.2.0.tar.gz 94924926 SHA256 8de6e193784af3b9149ea13c0552d4556df33396452360d5f9ac30682148e6f7 SHA512 696a95fe1438b8a62261c41e5d495ef1e5107c5e4ee0ab80a980ba5e0e3b7fb5002f1bb780120f9f46a9f3c1fed2de858b61dc38d897bd4235358d617b2406b0 WHIRLPOOL 08a8861b8893c94821bc4dfbf81bfa54101fb34af1f30f15cb26b284f1970bc9d2901e05f7b3a1f159a0690806e64c2ca345f3a56d37f016ec17e1db3e7d6204
-DIST openshot-qt-2.3.4.tar.gz 60646277 SHA256 b110eb144a3d3dcfe08f112c66ccc9265620b6fcf540cb690441bc47bf91eaec SHA512 06faaaf1e3e3d996fafca8c7bde5a7fe8b9c66efb03c85448ab19bba85508d7c6334ba43a1368b20d7608cd34526c653e1956aa51ce05099be314538682fd484 WHIRLPOOL dbed47fa4b9d220c75b8cec2e314beca4ba5f2cca687d016b3950aedd93e6e6f1b4d243ddf31b41d5a22d652f2257f725b6e4b85a2882ad1d5938409e1469b20
DIST openshot-qt-2.4.0.tar.gz 60710408 SHA256 ca6b746671c931dd76af93f31fe3d85ce7f122002013b3a24e45e8222fdbb348 SHA512 95778effa5b02a467c44741384b0f43bf90343d4f450d5fcc2319ff1c3bee212338435dd8c781e0ff111a704aacdce3dbfb6bdcf62afa1f59bbb0668b58074ca WHIRLPOOL 7d0736a2b58fee3af6a54c65da89b8c33b7bdb73d73d708e3e0b48865c981b4f5fa1ec43a9d521e25b72242b1c75cb06731382edbcdc1f5f1575ab8ed5fa752c
-EBUILD openshot-1.4.3-r1.ebuild 1579 BLAKE2B bbb9c345fa90c70153ed349a3536253dd2aa02acca4d47f160541752249e181db7909d23b67f5114d13a3c08bfaa2e57768f240d3f11a99703d3b5a4be106cac SHA512 04836459956b6950f799f2eb0974849c51ce0c1fc7640b21211eeaf5f05231439141421ce3a9afb87cb7976880cde47bb316c07c2209905e19bba830dc3a08f6
-EBUILD openshot-2.2.0.ebuild 1203 BLAKE2B d6ae369f957070e0e82d5519b5d6c0bc34ab49e47168db817d8cae6e834c17ebdccd0dec6df64b7262d2bba681ea4bebd8e0bb23df0a9d1432951edbfc89339f SHA512 8caeb2192ebd50d822467cacff2036c805fbe6489fa965d88ad2ce0d65dcd0c37d3cd621000b92b0d9b90fdce598f3ba82b1cb1d6d3fd8426ac2dd761cf494ff
-EBUILD openshot-2.3.4.ebuild 1211 BLAKE2B 3b8efeeddf3f46226235feed37239a4f0db0b1dfa76634018ff37dcad32ab467066c066320ec0b6fc327d7321ac8d0086420cea18b2adfd7ba11b8da8cbfae7c SHA512 953a544be29b8fc3c5a849e3da7dedd40fcde1414113ac03715a8e614535f185821de84b64674198f2b69a103b59aff0a4b623b27ac648fdcccad1c6df093eef
EBUILD openshot-2.4.0.ebuild 1242 BLAKE2B 97e10ff3e272f0678e41debb82a0c085704cf63603e9154179085f162f188457bb0f902ac136ced581944ae92565f14c2a61ade57b74a7e64ca96e1722d621ea SHA512 4c00b5c765d7583bb6a7d6ef03bd1d3bc49109419b8e513ded52a81ad105c464d6316c7f42cf2d0d8bdf1ed7c6e5f2a96d11c40b85ebefc4b39391b29b2551bd
MISC metadata.xml 487 BLAKE2B dc721eeb1c4ab6880cd9a5cc1c8c0a032303f0c56ff4312f723c364978b4338e3acaecc887a5617e1d691d69bb3415d92dd9cc812da161f303f33381422f7e42 SHA512 3b1dc5bc39de8b46ccea5497b228675c7d379ec627e12630d8914d9d35e316f4818bc165551dd271b24d377b3bcc2b97d528b43219765460058d123bde078149
diff --git a/media-video/openshot/openshot-1.4.3-r1.ebuild b/media-video/openshot/openshot-1.4.3-r1.ebuild
deleted file mode 100644
index 144217aa0706..000000000000
--- a/media-video/openshot/openshot-1.4.3-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_REQ_USE=xml
-PYTHON_COMPAT=( python2_7 )
-
-inherit versionator distutils-r1 python-r1 fdo-mime
-
-DESCRIPTION="Free, open-source, non-linear video editor to create and edit videos and movies"
-HOMEPAGE="http://www.openshotvideo.com"
-SRC_URI="https://launchpad.net/${PN}/$(get_version_component_range 1-2)/${PV}/+download/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-
-IUSE="+python +ffmpeg libav"
-REQUIRED_USE="|| ( python ffmpeg )"
-
-RDEPEND="
- dev-python/pygoocanvas[${PYTHON_USEDEP}]
- dev-python/pygtk[${PYTHON_USEDEP}]
- dev-python/pyxdg[${PYTHON_USEDEP}]
- dev-python/pillow[${PYTHON_USEDEP}]
- >=media-libs/mlt-0.8.2[ffmpeg,frei0r,gtk,melt,python,sdl,xml]
- ffmpeg? (
- libav? ( media-video/libav:=[encode,sdl,x264,mp3,theora,vpx] )
- !libav? ( media-video/ffmpeg:0=[encode,sdl,x264,mp3,theora,vpx] )
- )
- python? (
- dev-python/httplib2[${PYTHON_USEDEP}]
- dev-python/librsvg-python
- )
- x11-libs/gtk+:2
-"
-
-src_prepare() {
- sed -ie '/launcher/,+1d' setup.py || die
- sed -ie '/FAILED = /,$d' setup.py || die
-
- # Fix up launchers to not throw an error.
- sed -i 's/\(from \)\(openshot import main\)/\1openshot.\2/' bin/openshot || die
- sed -i 's/\(from \)\(openshot_render import main\)/\1openshot.\2/' bin/openshot-render || die
-}
-
-python_install() {
- distutils-r1_python_install
-}
-
-pkg_postinst() {
- fdo-mime_mime_database_update
- fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
- fdo-mime_mime_database_update
- fdo-mime_desktop_database_update
-}
diff --git a/media-video/openshot/openshot-2.2.0.ebuild b/media-video/openshot/openshot-2.2.0.ebuild
deleted file mode 100644
index baf9025ad1ee..000000000000
--- a/media-video/openshot/openshot-2.2.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_REQ_USE=xml
-PYTHON_COMPAT=( python3_{4,5} )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1 gnome2-utils versionator xdg
-
-MY_PN="${PN}-qt"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Free, open-source, non-linear video editor to create and edit videos and movies"
-HOMEPAGE="http://www.openshot.org/ https://launchpad.net/openshot"
-SRC_URI="https://launchpad.net/${PN}/$(get_version_component_range 1-2)/${PV}/+download/${MY_P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="1"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
- dev-python/PyQt5[svg,webkit,${PYTHON_USEDEP}]
- media-libs/libopenshot[python,${PYTHON_USEDEP}]
- dev-python/httplib2[${PYTHON_USEDEP}]
- dev-python/pyzmq[${PYTHON_USEDEP}]
-"
-DEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}"
-
-src_prepare() {
- # prevent setup.py from trying to update MIME databases
- sed -i 's/^ROOT =.*/ROOT = False/' setup.py || die
- xdg_src_prepare
- distutils-r1_src_prepare
-}
-
-pkg_preinst() {
- xdg_pkg_preinst
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- xdg_pkg_postrm
- gnome2_icon_cache_update
-}
diff --git a/media-video/openshot/openshot-2.3.4.ebuild b/media-video/openshot/openshot-2.3.4.ebuild
deleted file mode 100644
index 6b1bf1de7174..000000000000
--- a/media-video/openshot/openshot-2.3.4.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_REQ_USE=xml
-PYTHON_COMPAT=( python3_{4,5,6} )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1 gnome2-utils versionator xdg-utils
-
-MY_PN="${PN}-qt"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Free, open-source, non-linear video editor to create and edit videos and movies"
-HOMEPAGE="http://www.openshot.org/ https://launchpad.net/openshot"
-SRC_URI="https://launchpad.net/${PN}/$(get_version_component_range 1-2)/${PV}/+download/${MY_P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="1"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
- dev-python/PyQt5[svg,webkit,${PYTHON_USEDEP}]
- >=media-libs/libopenshot-0.1.7[python,${PYTHON_USEDEP}]
- dev-python/httplib2[${PYTHON_USEDEP}]
- dev-python/pyzmq[${PYTHON_USEDEP}]
-"
-DEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}"
-
-src_prepare() {
- default
- # prevent setup.py from trying to update MIME databases
- sed -i 's/^ROOT =.*/ROOT = False/' setup.py || die
-}
-
-pkg_postinst() {
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
- gnome2_icon_cache_update
-}
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index bf3f6b1658f5..0a79d236ad61 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -11,8 +11,9 @@ AUX vlc-2.2.4-relax_ffmpeg.patch 1686 BLAKE2B f802c5ae95962036fe3fcfa67e725ac5a5
AUX vlc-2.2.6-decoder-lock-scope.patch 973 BLAKE2B 7fb92001311b61d35b4f029da55e308c248d1e052178769eb106739b86a6c4d45a01ca5e111a2d710a5676b5437c81a481fb0125038da33eed43eb9c1d05dc4f SHA512 b6d360f4eb6923332a67605118c5a47ed2e54bedcc68625eb5f78313e971da66ab19998f3037dcc0ce588287da1510c93cf68247c47ae25d0b1305af931794e3
AUX vlc-9999-libva-1.2.1-compat.patch 291 BLAKE2B ed2e146e43ab65474d8e20f87f79b97b6a504a762375347223d759b605e20d210fd62d967160ba43cc10a1730409d7d06d71ad95c0aaf37bb05caa320ad35213 SHA512 47b9d3f7a5e7c90045acac3b3253feb927da26646b6a457655669c1ab18f6a0e027160285695dc06642e6117ed1fcd87db90ae1f409e8fee737a2a41e80e1968
DIST vlc-2.2.6.tar.xz 22198720 BLAKE2B a3d5d75551908a92c894ca18b36fd165ea0d6a99d1729c311f2051dfe1dd5eb7bf5045b08652e7a1d335212416a3e2d077f37157c7ae4773a5ecc2c49e39f5a6 SHA512 9aff5922eb8b3c6a24e6153c367b0170dbc67602ae3e9304f52d2da00c9081d66cc98abd722b7c95b6c7d2e6cc7c86f21f9cba42c7d4bf29ca97d0f2d3553f8d
-EBUILD vlc-2.2.6-r2.ebuild 15044 BLAKE2B 9988d763c4ef0017c16e21872c776e27eaee14787ff5b3a7b4201334683f0df91146ab82b80cf18123271bcaaf7b7974fc9b1cee05acc40f6750702694b06b3f SHA512 15a86d738cc81fb894c5724fc2ab91c7bfdd1a878d0c353253100f7ad648d2f4b2fe75a6e84977287aa25d01d46e7ce59e8974fae187679d509d3e32c8fc2d8a
+EBUILD vlc-2.2.6-r2.ebuild 14784 BLAKE2B 8212c8d850ed6e18bce445a822430162e54ed627d0096c2220bac6d7acf25b57fd72259dafa7d195e8de6d91772c95a294dd71af9099cfa6e0cd77d48cb61506 SHA512 a8477ed01d2873c678a273f7d3422623fdea76757a92d5d5f352f6e5a7a48181b5ccfda2d5acafbba5abb4125a3004a07486c8134e55860579eff2a8d047ceeb
EBUILD vlc-2.2.6.ebuild 15519 BLAKE2B cbc55f76288176d91b8e53b188778aa1f50b42942a60aafe9c9fc0278a6da13a04b8acaa0d7dcd76b0f1b54ad23b7048c76f07cca0ccd478659fb94492a6257a SHA512 ba381af8546d8d55b4394dd0db2859146f3fc0c015ac50767f945a38c3abb3034d1ff98b5a0793d4a201e694477ac8d1fd3d092b8274e09170a200a49ff13e94
-EBUILD vlc-2.2.9999.ebuild 15040 BLAKE2B 95ff6305466d2b25375a77f34ec69382fe9b20edb672f9083cdcd72b84a8194c06baf9a2c278bce1a8d3a34922c68733c33b79b5b74cb43a691b54e8c9bf921b SHA512 ee3bc1da6893c579be1b47cea17094a0d48ebcc23b462ae53f60fd227b582e2a09a9aa3f80be88a4b38789e4d38b3d659138daaf9cbe034598e200da8df503c5
-EBUILD vlc-9999.ebuild 14306 BLAKE2B de76c0992dcbd8bcba51ef7706c90fcec47f3e0cf94d912d7ede4987f90e81fc53b7394f21b2b7ddd1e335ae3ff6d450243b59f65259af206f88af176314192d SHA512 f303ba6573d1d0c64155649178d3ee57b5db0d6fefcf0cf322ceaa56e8c4f669111da0a31af9f5b29fc054773102037399c978c35a7f75e7aa6e6a9756cf62fb
-MISC metadata.xml 6325 BLAKE2B 3665fcc2e92d1738052df6054676a8dbc9b32d6e8061338d5c780f87d4802f21c7126d6b6e6e61a9164161a1b493b5094abded00c8a8b78b216c54c96a9f116a SHA512 737cc412a5b4832df066631792744c3e8cecd217634af6cc8feed4c0ab89a3ba324312af73c6da545eeb7f861896c0237c0f47397cdfbcd6cf08de33293e1ea9
+EBUILD vlc-2.2.9999.ebuild 14996 BLAKE2B 1c1ad7d5a425cc9a2ca3a863a29753e681e961c3882fd78ad23fae24be810f066a6e9b0e9d2298fe08b84a7cb4b6ebdfd2bb453a428e66d8f487dcd49c39b12e SHA512 f52b224bf2b1a8e7e6e72195bbdf0c60b77f3a7859402f695ee5e67b301e21278c89a0ed8f3064001fd4a7e1bcc6a0fb2a1871c5e0a1037fa7f38e549f586d39
+EBUILD vlc-3.0.9999.ebuild 13205 BLAKE2B 8551cc524e8931b47744f4727a251006c43c159748bcf668fdf78b966b49bc8e355c4c2d16a418558495742cb16f167aab445b92c573623945d016d62614d251 SHA512 c298e87670eb6dfdf2e94d24a695fd2edefb5229a3d90355333e7be9c43f56c9ed653df29e5960c092033c373c27225ce597a6ae8a500ba0be69073d185aa793
+EBUILD vlc-9999.ebuild 13205 BLAKE2B 8551cc524e8931b47744f4727a251006c43c159748bcf668fdf78b966b49bc8e355c4c2d16a418558495742cb16f167aab445b92c573623945d016d62614d251 SHA512 c298e87670eb6dfdf2e94d24a695fd2edefb5229a3d90355333e7be9c43f56c9ed653df29e5960c092033c373c27225ce597a6ae8a500ba0be69073d185aa793
+MISC metadata.xml 6560 BLAKE2B 7a079c7b3d008646d49c8669834fccb7e78cf2ab88e0eb2671c571f91f012ab8b33989ef2035e35b55c585c1bdc930e9a5fd7d26c7f1a2fc7cab819fca54f21f SHA512 ed19d0f4e3349e13ef9967911c16a4b6569cefa97169ad79d7a9510ca88965c9e8fefcd593ceb2e5b0c31e82ad92e9513ff36460eddf3605d2250d285b19530f
diff --git a/media-video/vlc/metadata.xml b/media-video/vlc/metadata.xml
index 688bffbb09ad..7f79c863655f 100644
--- a/media-video/vlc/metadata.xml
+++ b/media-video/vlc/metadata.xml
@@ -6,6 +6,8 @@
<name>Gentoo Video project</name>
</maintainer>
<use>
+ <flag name="aom">Enables experimental support for AV1 codec</flag>
+ <flag name="archive">Enables support for libarchive stream extractor</flag>
<flag name="atmo">Enables support for AtmoLight (homebrew Ambient Lighting Technology)</flag>
<flag name="audioqueue">Enables AudioQueue audio module for Mac OS X.</flag>
<flag name="avcodec">Enables libavcodec support for video/audio encoding/decoding. libavcodec is part of FFmpeg.</flag>
@@ -39,6 +41,7 @@
<flag name="macosx-qtkit">Enables Mac OS X qtkit module: qtcapture (video) and qtsound (audio) module.</flag>
<flag name="matroska">Enables matroska support using reference libraries (fallback on other existing matroska support if disabled, i.e., matroska enabled FFmpeg)</flag>
<flag name="mpeg">Add libmpeg2 support for mpeg-1 and mpeg-2 video streams</flag>
+ <flag name="nfs">Enables support for nfs protocol via <pkg>net-fs/libnfs</pkg></flag>
<flag name="omxil">Enables OpenMAX Integration Layer codec module.</flag>
<flag name="optimisememory">Enable optimisation for memory rather than performance.</flag>
<flag name="opencv">Enabled OpenCV (computer vision) filter module.</flag>
diff --git a/media-video/vlc/vlc-2.2.6-r2.ebuild b/media-video/vlc/vlc-2.2.6-r2.ebuild
index 26fdf96987e1..7cf4885b897d 100644
--- a/media-video/vlc/vlc-2.2.6-r2.ebuild
+++ b/media-video/vlc/vlc-2.2.6-r2.ebuild
@@ -194,12 +194,6 @@ PATCHES=(
# Fix build system mistake.
"${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.patch
- # Patch up incompatibilities and reconfigure autotools.
-# "${FILESDIR}"/${PN}-9999-libva-1.2.1-compat.patch
-
- # Fix up broken audio when skipping using a fixed reversed bisected commit.
-# "${FILESDIR}"/${PN}-2.1.0-TomWij-bisected-PA-broken-underflow.patch
-
# Bug #541678
"${FILESDIR}"/qt4-select.patch
diff --git a/media-video/vlc/vlc-2.2.9999.ebuild b/media-video/vlc/vlc-2.2.9999.ebuild
index 4bb7346a5f85..10af743665ee 100644
--- a/media-video/vlc/vlc-2.2.9999.ebuild
+++ b/media-video/vlc/vlc-2.2.9999.ebuild
@@ -21,7 +21,7 @@ else
fi
KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd"
fi
-inherit autotools flag-o-matic toolchain-funcs versionator virtualx ${SCM}
+inherit autotools flag-o-matic gnome2-utils toolchain-funcs versionator virtualx xdg-utils ${SCM}
DESCRIPTION="VLC media player - Video player and streamer"
HOMEPAGE="https://www.videolan.org/vlc/"
@@ -194,12 +194,6 @@ PATCHES=(
# Fix build system mistake.
"${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.patch
- # Patch up incompatibilities and reconfigure autotools.
- "${FILESDIR}"/${PN}-9999-libva-1.2.1-compat.patch
-
- # Fix up broken audio when skipping using a fixed reversed bisected commit.
- "${FILESDIR}"/${PN}-2.1.0-TomWij-bisected-PA-broken-underflow.patch
-
# Bug #541678
"${FILESDIR}"/qt4-select.patch
@@ -480,4 +474,14 @@ pkg_postinst() {
ewarn "Please run /usr/$(get_libdir)/vlc/vlc-cache-gen manually"
ewarn "If you do not do it, vlc will take a long time to load."
fi
+
+ gnome2_icon_cache_update
+ xdg_mimeinfo_database_update
+ xdg_desktop_database_update
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+ xdg_mimeinfo_database_update
+ xdg_desktop_database_update
}
diff --git a/media-video/vlc/vlc-3.0.9999.ebuild b/media-video/vlc/vlc-3.0.9999.ebuild
new file mode 100644
index 000000000000..a91223922ac3
--- /dev/null
+++ b/media-video/vlc/vlc-3.0.9999.ebuild
@@ -0,0 +1,473 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PV="${PV/_/-}"
+MY_PV="${MY_PV/-beta/-test}"
+MY_P="${PN}-${MY_PV}"
+if [[ ${PV} = *9999 ]] ; then
+ if [[ ${PV%.9999} != ${PV} ]] ; then
+ EGIT_REPO_URI="https://git.videolan.org/git/vlc/vlc-${PV%.9999}.git"
+ else
+ EGIT_REPO_URI="https://git.videolan.org/git/vlc.git"
+ fi
+ SCM="git-r3"
+else
+ if [[ ${MY_P} = ${P} ]] ; then
+ SRC_URI="https://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.xz"
+ else
+ SRC_URI="https://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.xz"
+ fi
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd"
+fi
+inherit autotools flag-o-matic gnome2-utils toolchain-funcs versionator virtualx xdg-utils ${SCM}
+
+DESCRIPTION="VLC media player - Video player and streamer"
+HOMEPAGE="https://www.videolan.org/vlc/"
+
+LICENSE="LGPL-2.1 GPL-2"
+SLOT="0/5-8" # vlc - vlccore
+
+IUSE="a52 aalib alsa altivec aom archive +avcodec +avformat bidi bluray cddb
+ chromaprint chromecast dbus dc1394 debug directx dts dvb +dvbpsi dvd
+ dxva2 elibc_glibc +encode faad fdk fluidsynth +ffmpeg flac fontconfig +gcrypt
+ gme gnutls gstreamer ieee1394 jack jpeg kate libass libav libcaca
+ libnotify +libsamplerate libtiger linsys libtar lirc live lua
+ macosx-notifications macosx-qtkit matroska cpu_flags_x86_mmx modplug mp3
+ mpeg mtp musepack ncurses neon nfs ogg omxil opencv opengl optimisememory opus
+ png postproc projectm pulseaudio +qt5 rdp rtsp run-as-root samba
+ schroedinger sdl-image sftp shout sid skins speex cpu_flags_x86_sse svg
+ +swscale taglib theora tremor truetype twolame udev upnp vaapi v4l vcd vdpau
+ vlm vnc vorbis vpx wma-fixed +X x264 x265 +xcb xml xv zeroconf zvbi
+"
+REQUIRED_USE="
+ aalib? ( X )
+ bidi? ( truetype )
+ dvb? ( dvbpsi )
+ dxva2? ( avcodec )
+ ffmpeg? ( avcodec avformat swscale )
+ fontconfig? ( truetype )
+ gnutls? ( gcrypt )
+ libcaca? ( X )
+ libtar? ( skins )
+ libtiger? ( kate )
+ skins? ( qt5 truetype X xml )
+ vaapi? ( avcodec X )
+ vdpau? ( X )
+ vlm? ( encode )
+ xv? ( xcb )
+"
+RDEPEND="
+ dev-libs/libgpg-error:0
+ net-dns/libidn:0
+ sys-libs/zlib:0[minizip]
+ virtual/libintl:0
+ a52? ( >=media-libs/a52dec-0.7.4-r3:0 )
+ aalib? ( media-libs/aalib:0 )
+ alsa? ( >=media-libs/alsa-lib-1.0.24:0 )
+ aom? ( media-libs/libaom:= )
+ archive? ( app-arch/libarchive:= )
+ avcodec? (
+ !libav? ( media-video/ffmpeg:0= )
+ libav? ( media-video/libav:0= )
+ )
+ avformat? (
+ !libav? ( media-video/ffmpeg:0= )
+ libav? ( media-video/libav:0= )
+ )
+ bidi? ( dev-libs/fribidi:0 )
+ bluray? ( >=media-libs/libbluray-0.6.2:0= )
+ cddb? ( >=media-libs/libcddb-1.2:0 )
+ chromaprint? ( >=media-libs/chromaprint-0.6:0 )
+ chromecast? ( >=dev-libs/protobuf-2.5.0 )
+ dbus? ( >=sys-apps/dbus-1.6:0 )
+ dc1394? (
+ >=media-libs/libdc1394-2.1:2
+ >=sys-libs/libraw1394-2.0.1:0
+ )
+ dts? ( >=media-libs/libdca-0.0.5:0 )
+ dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:0= )
+ dvd? (
+ >=media-libs/libdvdnav-4.9:0
+ >=media-libs/libdvdread-4.9:0
+ )
+ elibc_glibc? ( >=sys-libs/glibc-2.8:2.2 )
+ faad? ( >=media-libs/faad2-2.6.1:0 )
+ fdk? ( media-libs/fdk-aac:0 )
+ flac? (
+ >=media-libs/flac-1.1.2:0
+ >=media-libs/libogg-1:0
+ )
+ fluidsynth? ( >=media-sound/fluidsynth-1.1.2:0 )
+ fontconfig? ( media-libs/fontconfig:1.0 )
+ gcrypt? ( >=dev-libs/libgcrypt-1.6.0:0= )
+ gme? ( media-libs/game-music-emu:0 )
+ gnutls? ( net-libs/gnutls:0 )
+ gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 )
+ ieee1394? (
+ >=sys-libs/libavc1394-0.5.3:0
+ >=sys-libs/libraw1394-2.0.1:0
+ )
+ jack? ( virtual/jack )
+ jpeg? ( virtual/jpeg:0 )
+ kate? ( >=media-libs/libkate-0.3:0 )
+ libass? (
+ media-libs/fontconfig:1.0
+ >=media-libs/libass-0.9.8:0=
+ )
+ libcaca? ( >=media-libs/libcaca-0.99_beta14:0 )
+ libnotify? (
+ dev-libs/glib:2
+ x11-libs/gdk-pixbuf:2
+ x11-libs/gtk+:2
+ x11-libs/libnotify:0
+ )
+ libsamplerate? ( media-libs/libsamplerate:0 )
+ libtar? ( >=dev-libs/libtar-1.2.11-r3:0 )
+ libtiger? ( >=media-libs/libtiger-0.3.1:0 )
+ linsys? ( >=media-libs/zvbi-0.2.28:0 )
+ lirc? ( app-misc/lirc:0 )
+ live? ( >=media-plugins/live-2011.12.23:0 )
+ lua? ( >=dev-lang/lua-5.1:0 )
+ matroska? (
+ >=dev-libs/libebml-1:0=
+ >=media-libs/libmatroska-1:0=
+ )
+ modplug? ( media-libs/libmodplug:0 )
+ mp3? ( media-libs/libmad:0 )
+ mpeg? ( >=media-libs/libmpeg2-0.3.2:0 )
+ mtp? ( >=media-libs/libmtp-1:0 )
+ musepack? ( >=media-sound/musepack-tools-444:0 )
+ ncurses? ( sys-libs/ncurses:0=[unicode] )
+ nfs? ( >=net-fs/libnfs-0.10.0:= )
+ ogg? ( >=media-libs/libogg-1:0 )
+ opencv? ( >media-libs/opencv-2:0= )
+ opengl? (
+ virtual/opengl:0
+ >=x11-libs/libX11-1.3.99.901:0
+ )
+ opus? ( >=media-libs/opus-1.0.3:0 )
+ png? ( media-libs/libpng:0= )
+ postproc? (
+ !libav? ( >=media-video/ffmpeg-3.1.3:0= )
+ libav? ( media-libs/libpostproc:0= )
+ )
+ projectm? (
+ media-fonts/dejavu:0
+ media-libs/libprojectm:0
+ )
+ pulseaudio? ( >=media-sound/pulseaudio-1:0 )
+ qt5? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtsvg:5
+ dev-qt/qtwidgets:5
+ X? ( dev-qt/qtx11extras:5 )
+ )
+ rdp? ( =net-misc/freerdp-1*:0=[client] )
+ samba? ( >=net-fs/samba-4.0.0:0[client] )
+ schroedinger? ( >=media-libs/schroedinger-1.0.10:0 )
+ sdl-image? ( >=media-libs/sdl-image-1.2.10:0 )
+ sftp? ( net-libs/libssh2:0 )
+ shout? ( >=media-libs/libshout-2.1:0 )
+ sid? ( media-libs/libsidplay:2 )
+ skins? (
+ x11-libs/libXext:0
+ x11-libs/libXinerama:0
+ x11-libs/libXpm:0
+ )
+ speex? (
+ >=media-libs/speex-1.2.0:0
+ media-libs/speexdsp:0
+ )
+ svg? (
+ >=gnome-base/librsvg-2.9:2
+ >=x11-libs/cairo-1.13.1:0
+ )
+ swscale? (
+ !libav? ( media-video/ffmpeg:0= )
+ libav? ( media-video/libav:0= )
+ )
+ taglib? ( >=media-libs/taglib-1.9:0 )
+ theora? ( media-libs/libtheora:0 )
+ tremor? ( media-libs/tremor:0 )
+ truetype? (
+ media-libs/freetype:2
+ virtual/ttf-fonts:0
+ !fontconfig? ( media-fonts/dejavu:0 )
+ )
+ twolame? ( media-sound/twolame:0 )
+ udev? ( virtual/udev:0 )
+ upnp? ( net-libs/libupnp:0 )
+ v4l? ( media-libs/libv4l:0 )
+ vaapi? (
+ x11-libs/libva:0[X,drm]
+ !libav? ( >=media-video/ffmpeg-3.1.3:0=[vaapi] )
+ libav? ( media-video/libav:0=[vaapi] )
+ )
+ vcd? ( >=dev-libs/libcdio-0.78.2:0 )
+ vdpau? (
+ x11-libs/libvdpau:0
+ !libav? ( media-video/ffmpeg:0= )
+ libav? ( >=media-video/libav-10:0= )
+ )
+ vnc? ( >=net-libs/libvncserver-0.9.9:0 )
+ vorbis? ( media-libs/libvorbis:0 )
+ vpx? ( media-libs/libvpx:0= )
+ X? ( x11-libs/libX11:0 )
+ x264? ( media-libs/x264:0= )
+ x265? ( media-libs/x265:0= )
+ xcb? (
+ x11-libs/libxcb:0
+ x11-libs/xcb-util:0
+ x11-libs/xcb-util-keysyms:0
+ )
+ xml? ( dev-libs/libxml2:2 )
+ zeroconf? ( >=net-dns/avahi-0.6:0[dbus] )
+ zvbi? ( media-libs/zvbi:0 )
+"
+DEPEND="${RDEPEND}
+ app-arch/xz-utils:0
+ >=sys-devel/gettext-0.19.8:*
+ virtual/pkgconfig:*
+ amd64? ( dev-lang/yasm:* )
+ x86? ( dev-lang/yasm:* )
+ xcb? ( x11-proto/xproto:0 )
+"
+
+PATCHES=(
+ # Fix build system mistake.
+ "${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.patch
+
+ # Bug #593460
+ "${FILESDIR}"/${PN}-2.2.4-libav-11.7.patch
+)
+
+DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt )
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+ default
+
+ # Bootstrap when we are on a git checkout.
+ if [[ ${PV} = *9999 ]] ; then
+ ./bootstrap
+ fi
+
+ # Make it build with libtool 1.5
+ rm m4/lt* m4/libtool.m4 || die
+
+ # We are not in a real git checkout due to the absence of a .git directory.
+ touch src/revision.txt || die
+
+ # Don't use --started-from-file when not using dbus.
+ if ! use dbus ; then
+ sed -i 's/ --started-from-file//' share/vlc.desktop.in || die
+ fi
+
+ eautoreconf
+
+ # Disable automatic running of tests.
+ find . -name 'Makefile.in' -exec sed -i 's/\(..*\)check-TESTS/\1/' {} \; || die
+}
+
+src_configure() {
+ local myconf
+
+ # Compatibility fix for Samba 4.
+ use samba && append-cppflags "-I/usr/include/samba-4.0"
+
+ # We need to disable -fstack-check if use >=gcc 4.8.0. bug #499996
+ use x86 && append-cflags $(test-flags-CC -fno-stack-check)
+
+ # VLC now requires C++11 after commit 4b1c9dcdda0bbff801e47505ff9dfd3f274eb0d8
+ append-cxxflags -std=c++11
+
+ # FIXME: Needs libresid-builder from libsidplay:2 which is in another directory...
+ append-ldflags "-L/usr/$(get_libdir)/sidplay/builders/"
+
+ if use truetype || use projectm ; then
+ local dejavu="/usr/share/fonts/dejavu/"
+ myconf="--with-default-font=${dejavu}/DejaVuSans.ttf \
+ --with-default-font-family=Sans \
+ --with-default-monospace-font=${dejavu}/DejaVuSansMono.ttf
+ --with-default-monospace-font-family=Monospace"
+ fi
+
+ econf \
+ ${myconf} \
+ --enable-vlc \
+ --docdir=/usr/share/doc/${PF} \
+ --disable-dependency-tracking \
+ --disable-optimizations \
+ --disable-update-check \
+ --enable-fast-install \
+ --enable-screen \
+ $(use_enable a52) \
+ $(use_enable aalib aa) \
+ $(use_enable alsa) \
+ $(use_enable altivec) \
+ $(use_enable aom) \
+ $(use_enable archive) \
+ $(use_enable avcodec) \
+ $(use_enable avformat) \
+ $(use_enable bidi fribidi) \
+ $(use_enable bluray) \
+ $(use_enable cddb libcddb) \
+ $(use_enable chromaprint) \
+ $(use_enable chromecast) \
+ $(use_enable dbus) \
+ $(use_enable directx) \
+ $(use_enable dc1394) \
+ $(use_enable debug) \
+ $(use_enable dts dca) \
+ $(use_enable dvbpsi) \
+ $(use_enable dvd dvdread) $(use_enable dvd dvdnav) \
+ $(use_enable dxva2) \
+ $(use_enable encode sout) \
+ $(use_enable faad) \
+ $(use_enable fdk fdkaac) \
+ $(use_enable flac) \
+ $(use_enable fluidsynth) \
+ $(use_enable fontconfig) \
+ $(use_enable gcrypt libgcrypt) \
+ $(use_enable gme) \
+ $(use_enable gnutls) \
+ $(use_enable gstreamer gst-decode) \
+ $(use_enable ieee1394 dv1394) \
+ $(use_enable jack) \
+ $(use_enable jpeg) \
+ $(use_enable kate) \
+ $(use_enable libass) \
+ $(use_enable libcaca caca) \
+ $(use_enable libnotify notify) \
+ $(use_enable libsamplerate samplerate) \
+ $(use_enable libtar) \
+ $(use_enable libtiger tiger) \
+ $(use_enable linsys) \
+ $(use_enable lirc) \
+ $(use_enable live live555) \
+ $(use_enable lua) \
+ $(use_enable macosx-notifications osx-notifications) \
+ $(use_enable macosx-qtkit) \
+ $(use_enable cpu_flags_x86_mmx mmx) \
+ $(use_enable modplug mod) \
+ $(use_enable mp3 mad) \
+ $(use_enable mpeg libmpeg2) \
+ $(use_enable mtp) \
+ $(use_enable musepack mpc) \
+ $(use_enable ncurses) \
+ $(use_enable neon) \
+ $(use_enable ogg) $(use_enable ogg) \
+ $(use_enable omxil) \
+ $(use_enable omxil omxil-vout) \
+ $(use_enable opencv) \
+ $(use_enable opus) \
+ $(use_enable optimisememory optimize-memory) \
+ $(use_enable png) \
+ $(use_enable postproc) \
+ $(use_enable projectm) \
+ $(use_enable pulseaudio pulse) \
+ $(use_enable qt5 qt) \
+ $(use_enable rdp freerdp) \
+ $(use_enable rtsp realrtsp) \
+ $(use_enable run-as-root) \
+ $(use_enable samba smbclient) \
+ $(use_enable schroedinger) \
+ $(use_enable sdl-image) \
+ $(use_enable sid) \
+ $(use_enable sftp) \
+ $(use_enable shout) \
+ $(use_enable skins skins2) \
+ $(use_enable speex) \
+ $(use_enable cpu_flags_x86_sse sse) \
+ $(use_enable svg) \
+ $(use_enable svg svgdec) \
+ $(use_enable swscale) \
+ $(use_enable taglib) \
+ $(use_enable theora) \
+ $(use_enable tremor) \
+ $(use_enable truetype freetype) \
+ $(use_enable twolame) \
+ $(use_enable udev) \
+ $(use_enable upnp) \
+ $(use_enable v4l v4l2) \
+ $(use_enable vaapi libva) \
+ $(use_enable vcd) \
+ $(use_enable vdpau) \
+ $(use_enable vlm) \
+ $(use_enable vnc) \
+ $(use_enable vorbis) \
+ $(use_enable vpx) \
+ $(use_enable wma-fixed) \
+ $(use_with X x) \
+ $(use_enable x264) \
+ $(use_enable xcb) \
+ $(use_enable xml libxml2) \
+ $(use_enable xv xvideo) \
+ $(use_enable x265) \
+ $(use_enable zeroconf avahi) \
+ $(use_enable zvbi) $(use_enable !zvbi telx) \
+ --disable-asdcp \
+ --disable-coverage \
+ --disable-cprof \
+ --disable-crystalhd \
+ --disable-decklink \
+ --disable-gles2 \
+ --disable-goom \
+ --disable-kai \
+ --disable-kva \
+ --disable-libplacebo \
+ --disable-maintainer-mode \
+ --disable-merge-ffmpeg \
+ --disable-mfx \
+ --disable-mmal \
+ --disable-opensles \
+ --disable-oss \
+ --disable-rpi-omxil \
+ --disable-shine \
+ --disable-sndio \
+ --disable-spatialaudio \
+ --disable-srt \
+ --disable-vsxu \
+ --disable-wasapi
+
+ # ^ We don't have these disabled libraries in the Portage tree yet.
+
+ # _FORTIFY_SOURCE is set to 2 in config.h, which is also the default value on Gentoo.
+ # Other values of _FORTIFY_SOURCE may break the build (bug 523144), so definition should not be removed from config.h.
+ # To prevent redefinition warnings, we undefine _FORTIFY_SOURCE at the very start of config.h file
+ sed -i '1i#undef _FORTIFY_SOURCE' "${S}"/config.h || die
+}
+
+src_test() {
+ virtx emake check-TESTS
+}
+
+src_install() {
+ default
+ find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+ if [[ "$ROOT" = "/" ]] && [[ -x "/usr/$(get_libdir)/vlc/vlc-cache-gen" ]] ; then
+ einfo "Running /usr/$(get_libdir)/vlc/vlc-cache-gen on /usr/$(get_libdir)/vlc/plugins/"
+ "/usr/$(get_libdir)/vlc/vlc-cache-gen" "/usr/$(get_libdir)/vlc/plugins/"
+ else
+ ewarn "We cannot run vlc-cache-gen (most likely ROOT!=/)"
+ ewarn "Please run /usr/$(get_libdir)/vlc/vlc-cache-gen manually"
+ ewarn "If you do not do it, vlc will take a long time to load."
+ fi
+
+ gnome2_icon_cache_update
+ xdg_mimeinfo_database_update
+ xdg_desktop_database_update
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+ xdg_mimeinfo_database_update
+ xdg_desktop_database_update
+}
diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild
index c406ba1759e9..a91223922ac3 100644
--- a/media-video/vlc/vlc-9999.ebuild
+++ b/media-video/vlc/vlc-9999.ebuild
@@ -21,7 +21,7 @@ else
fi
KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd"
fi
-inherit autotools flag-o-matic toolchain-funcs versionator virtualx ${SCM}
+inherit autotools flag-o-matic gnome2-utils toolchain-funcs versionator virtualx xdg-utils ${SCM}
DESCRIPTION="VLC media player - Video player and streamer"
HOMEPAGE="https://www.videolan.org/vlc/"
@@ -29,15 +29,15 @@ HOMEPAGE="https://www.videolan.org/vlc/"
LICENSE="LGPL-2.1 GPL-2"
SLOT="0/5-8" # vlc - vlccore
-IUSE="a52 aalib alsa altivec +audioqueue +avcodec +avformat bidi bluray cddb
- chromaprint chromecast dbus dc1394 debug directfb directx dts dvb +dvbpsi dvd
+IUSE="a52 aalib alsa altivec aom archive +avcodec +avformat bidi bluray cddb
+ chromaprint chromecast dbus dc1394 debug directx dts dvb +dvbpsi dvd
dxva2 elibc_glibc +encode faad fdk fluidsynth +ffmpeg flac fontconfig +gcrypt
- gme gnutls gstreamer httpd ieee1394 jack jpeg kate libass libav libcaca
- libnotify +libsamplerate libtiger linsys libtar lirc live lua macosx-eyetv
+ gme gnutls gstreamer ieee1394 jack jpeg kate libass libav libcaca
+ libnotify +libsamplerate libtiger linsys libtar lirc live lua
macosx-notifications macosx-qtkit matroska cpu_flags_x86_mmx modplug mp3
- mpeg mtp musepack ncurses neon ogg omxil opencv opengl optimisememory opus
- png postproc projectm pulseaudio qt4 +qt5 rdp rtsp run-as-root samba
- schroedinger sdl sdl-image sftp shout sid skins speex cpu_flags_x86_sse svg
+ mpeg mtp musepack ncurses neon nfs ogg omxil opencv opengl optimisememory opus
+ png postproc projectm pulseaudio +qt5 rdp rtsp run-as-root samba
+ schroedinger sdl-image sftp shout sid skins speex cpu_flags_x86_sse svg
+swscale taglib theora tremor truetype twolame udev upnp vaapi v4l vcd vdpau
vlm vnc vorbis vpx wma-fixed +X x264 x265 +xcb xml xv zeroconf zvbi
"
@@ -49,14 +49,10 @@ REQUIRED_USE="
ffmpeg? ( avcodec avformat swscale )
fontconfig? ( truetype )
gnutls? ( gcrypt )
- httpd? ( lua )
libcaca? ( X )
libtar? ( skins )
libtiger? ( kate )
- qt4? ( X )
- qt5? ( X )
- sdl? ( X )
- skins? ( truetype X xml || ( qt4 qt5 ) )
+ skins? ( qt5 truetype X xml )
vaapi? ( avcodec X )
vdpau? ( X )
vlm? ( encode )
@@ -70,6 +66,8 @@ RDEPEND="
a52? ( >=media-libs/a52dec-0.7.4-r3:0 )
aalib? ( media-libs/aalib:0 )
alsa? ( >=media-libs/alsa-lib-1.0.24:0 )
+ aom? ( media-libs/libaom:= )
+ archive? ( app-arch/libarchive:= )
avcodec? (
!libav? ( media-video/ffmpeg:0= )
libav? ( media-video/libav:0= )
@@ -84,28 +82,47 @@ RDEPEND="
chromaprint? ( >=media-libs/chromaprint-0.6:0 )
chromecast? ( >=dev-libs/protobuf-2.5.0 )
dbus? ( >=sys-apps/dbus-1.6:0 )
- dc1394? ( >=sys-libs/libraw1394-2.0.1:0 >=media-libs/libdc1394-2.1:2 )
- directfb? ( dev-libs/DirectFB:0 sys-libs/zlib:0 )
+ dc1394? (
+ >=media-libs/libdc1394-2.1:2
+ >=sys-libs/libraw1394-2.0.1:0
+ )
dts? ( >=media-libs/libdca-0.0.5:0 )
dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:0= )
- dvd? ( >=media-libs/libdvdread-4.9:0 >=media-libs/libdvdnav-4.9:0 )
+ dvd? (
+ >=media-libs/libdvdnav-4.9:0
+ >=media-libs/libdvdread-4.9:0
+ )
elibc_glibc? ( >=sys-libs/glibc-2.8:2.2 )
faad? ( >=media-libs/faad2-2.6.1:0 )
fdk? ( media-libs/fdk-aac:0 )
- flac? ( >=media-libs/libogg-1:0 >=media-libs/flac-1.1.2:0 )
+ flac? (
+ >=media-libs/flac-1.1.2:0
+ >=media-libs/libogg-1:0
+ )
fluidsynth? ( >=media-sound/fluidsynth-1.1.2:0 )
fontconfig? ( media-libs/fontconfig:1.0 )
gcrypt? ( >=dev-libs/libgcrypt-1.6.0:0= )
gme? ( media-libs/game-music-emu:0 )
- gnutls? ( >=net-libs/gnutls-3.2.0:0 )
+ gnutls? ( net-libs/gnutls:0 )
gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 )
- ieee1394? ( >=sys-libs/libraw1394-2.0.1:0 >=sys-libs/libavc1394-0.5.3:0 )
+ ieee1394? (
+ >=sys-libs/libavc1394-0.5.3:0
+ >=sys-libs/libraw1394-2.0.1:0
+ )
jack? ( virtual/jack )
jpeg? ( virtual/jpeg:0 )
kate? ( >=media-libs/libkate-0.3:0 )
- libass? ( >=media-libs/libass-0.9.8:0= media-libs/fontconfig:1.0 )
+ libass? (
+ media-libs/fontconfig:1.0
+ >=media-libs/libass-0.9.8:0=
+ )
libcaca? ( >=media-libs/libcaca-0.99_beta14:0 )
- libnotify? ( x11-libs/libnotify:0 x11-libs/gtk+:2 x11-libs/gdk-pixbuf:2 dev-libs/glib:2 )
+ libnotify? (
+ dev-libs/glib:2
+ x11-libs/gdk-pixbuf:2
+ x11-libs/gtk+:2
+ x11-libs/libnotify:0
+ )
libsamplerate? ( media-libs/libsamplerate:0 )
libtar? ( >=dev-libs/libtar-1.2.11-r3:0 )
libtiger? ( >=media-libs/libtiger-0.3.1:0 )
@@ -113,48 +130,75 @@ RDEPEND="
lirc? ( app-misc/lirc:0 )
live? ( >=media-plugins/live-2011.12.23:0 )
lua? ( >=dev-lang/lua-5.1:0 )
- matroska? ( >=dev-libs/libebml-1:0= >=media-libs/libmatroska-1:0= )
- modplug? ( >=media-libs/libmodplug-0.8.4:0 !~media-libs/libmodplug-0.8.8 )
+ matroska? (
+ >=dev-libs/libebml-1:0=
+ >=media-libs/libmatroska-1:0=
+ )
+ modplug? ( media-libs/libmodplug:0 )
mp3? ( media-libs/libmad:0 )
mpeg? ( >=media-libs/libmpeg2-0.3.2:0 )
mtp? ( >=media-libs/libmtp-1:0 )
musepack? ( >=media-sound/musepack-tools-444:0 )
ncurses? ( sys-libs/ncurses:0=[unicode] )
+ nfs? ( >=net-fs/libnfs-0.10.0:= )
ogg? ( >=media-libs/libogg-1:0 )
opencv? ( >media-libs/opencv-2:0= )
- opengl? ( virtual/opengl:0 >=x11-libs/libX11-1.3.99.901:0 )
+ opengl? (
+ virtual/opengl:0
+ >=x11-libs/libX11-1.3.99.901:0
+ )
opus? ( >=media-libs/opus-1.0.3:0 )
- png? ( media-libs/libpng:0= sys-libs/zlib:0 )
+ png? ( media-libs/libpng:0= )
postproc? (
!libav? ( >=media-video/ffmpeg-3.1.3:0= )
libav? ( media-libs/libpostproc:0= )
)
- projectm? ( media-libs/libprojectm:0 media-fonts/dejavu:0 )
+ projectm? (
+ media-fonts/dejavu:0
+ media-libs/libprojectm:0
+ )
pulseaudio? ( >=media-sound/pulseaudio-1:0 )
- !qt5? ( qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 ) )
- qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 )
+ qt5? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtsvg:5
+ dev-qt/qtwidgets:5
+ X? ( dev-qt/qtx11extras:5 )
+ )
rdp? ( =net-misc/freerdp-1*:0=[client] )
- samba? ( >=net-fs/samba-4.0.0_alpha1:0[client] )
+ samba? ( >=net-fs/samba-4.0.0:0[client] )
schroedinger? ( >=media-libs/schroedinger-1.0.10:0 )
- sdl? ( >=media-libs/libsdl-1.2.10:0
- sdl-image? ( >=media-libs/sdl-image-1.2.10:0 sys-libs/zlib:0 ) )
+ sdl-image? ( >=media-libs/sdl-image-1.2.10:0 )
sftp? ( net-libs/libssh2:0 )
shout? ( >=media-libs/libshout-2.1:0 )
sid? ( media-libs/libsidplay:2 )
- skins? ( x11-libs/libXext:0 x11-libs/libXpm:0 x11-libs/libXinerama:0 )
- speex? ( >=media-libs/speex-1.2.0:0 media-libs/speexdsp:0 )
- svg? ( >=gnome-base/librsvg-2.9:2 >=x11-libs/cairo-1.13.1:0 )
+ skins? (
+ x11-libs/libXext:0
+ x11-libs/libXinerama:0
+ x11-libs/libXpm:0
+ )
+ speex? (
+ >=media-libs/speex-1.2.0:0
+ media-libs/speexdsp:0
+ )
+ svg? (
+ >=gnome-base/librsvg-2.9:2
+ >=x11-libs/cairo-1.13.1:0
+ )
swscale? (
!libav? ( media-video/ffmpeg:0= )
libav? ( media-video/libav:0= )
)
- taglib? ( >=media-libs/taglib-1.9:0 sys-libs/zlib:0 )
- theora? ( >=media-libs/libtheora-1.0_beta3:0 )
+ taglib? ( >=media-libs/taglib-1.9:0 )
+ theora? ( media-libs/libtheora:0 )
tremor? ( media-libs/tremor:0 )
- truetype? ( media-libs/freetype:2 virtual/ttf-fonts:0
- !fontconfig? ( media-fonts/dejavu:0 ) )
+ truetype? (
+ media-libs/freetype:2
+ virtual/ttf-fonts:0
+ !fontconfig? ( media-fonts/dejavu:0 )
+ )
twolame? ( media-sound/twolame:0 )
- udev? ( >=virtual/udev-142:0 )
+ udev? ( virtual/udev:0 )
upnp? ( net-libs/libupnp:0 )
v4l? ( media-libs/libv4l:0 )
vaapi? (
@@ -174,14 +218,18 @@ RDEPEND="
X? ( x11-libs/libX11:0 )
x264? ( media-libs/x264:0= )
x265? ( media-libs/x265:0= )
- xcb? ( x11-libs/libxcb:0 x11-libs/xcb-util:0 x11-libs/xcb-util-keysyms:0 )
+ xcb? (
+ x11-libs/libxcb:0
+ x11-libs/xcb-util:0
+ x11-libs/xcb-util-keysyms:0
+ )
xml? ( dev-libs/libxml2:2 )
zeroconf? ( >=net-dns/avahi-0.6:0[dbus] )
zvbi? ( media-libs/zvbi:0 )
"
DEPEND="${RDEPEND}
app-arch/xz-utils:0
- >=sys-devel/gettext-0.19.6:*
+ >=sys-devel/gettext-0.19.8:*
virtual/pkgconfig:*
amd64? ( dev-lang/yasm:* )
x86? ( dev-lang/yasm:* )
@@ -192,12 +240,6 @@ PATCHES=(
# Fix build system mistake.
"${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.patch
- # Patch up incompatibilities and reconfigure autotools.
- "${FILESDIR}"/${PN}-9999-libva-1.2.1-compat.patch
-
- # Fix up broken audio when skipping using a fixed reversed bisected commit.
- "${FILESDIR}"/${PN}-2.1.0-TomWij-bisected-PA-broken-underflow.patch
-
# Bug #593460
"${FILESDIR}"/${PN}-2.2.4-libav-11.7.patch
)
@@ -206,35 +248,16 @@ DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt )
S="${WORKDIR}/${MY_P}"
-src_unpack() {
- if [[ ${PV} = *9999 ]] ; then
- git-r3_src_unpack
- else
- unpack ${A}
- fi
-}
-
src_prepare() {
default
- # Remove unnecessary warnings about unimplemented pragmas on gcc for now.
- # Need to recheck this with gcc 4.9 and every subsequent minor bump of gcc.
- #
- # config.h:792: warning: ignoring #pragma STDC FENV_ACCESS [-Wunknown-pragmas]
- # config.h:793: warning: ignoring #pragma STDC FP_CONTRACT [-Wunknown-pragmas]
- #
- # https://gcc.gnu.org/c99status.html
- if tc-is-gcc ; then
- sed -i 's/ifndef __FAST_MATH__/if 0/g' configure.ac || die
- fi
-
# Bootstrap when we are on a git checkout.
if [[ ${PV} = *9999 ]] ; then
./bootstrap
fi
# Make it build with libtool 1.5
- rm -f m4/lt* m4/libtool.m4 || die
+ rm m4/lt* m4/libtool.m4 || die
# We are not in a real git checkout due to the absence of a .git directory.
touch src/revision.txt || die
@@ -248,14 +271,6 @@ src_prepare() {
# Disable automatic running of tests.
find . -name 'Makefile.in' -exec sed -i 's/\(..*\)check-TESTS/\1/' {} \; || die
-
- # If qtchooser is installed, it may break the build, because moc,rcc and uic binaries for wrong qt
- # version may be used. Setting QT_SELECT environment variable will enforce correct binaries.
- if use qt5; then
- export QT_SELECT=qt5
- elif use qt4; then
- export QT_SELECT=qt4
- fi
}
src_configure() {
@@ -281,10 +296,6 @@ src_configure() {
--with-default-monospace-font-family=Monospace"
fi
- if use qt4 || use qt5 ; then
- myconf+=" --enable-qt"
- fi
-
econf \
${myconf} \
--enable-vlc \
@@ -298,7 +309,8 @@ src_configure() {
$(use_enable aalib aa) \
$(use_enable alsa) \
$(use_enable altivec) \
- $(use_enable audioqueue) \
+ $(use_enable aom) \
+ $(use_enable archive) \
$(use_enable avcodec) \
$(use_enable avformat) \
$(use_enable bidi fribidi) \
@@ -307,7 +319,6 @@ src_configure() {
$(use_enable chromaprint) \
$(use_enable chromecast) \
$(use_enable dbus) \
- $(use_enable directfb) \
$(use_enable directx) \
$(use_enable dc1394) \
$(use_enable debug) \
@@ -325,7 +336,6 @@ src_configure() {
$(use_enable gme) \
$(use_enable gnutls) \
$(use_enable gstreamer gst-decode) \
- $(use_enable httpd) \
$(use_enable ieee1394 dv1394) \
$(use_enable jack) \
$(use_enable jpeg) \
@@ -340,7 +350,6 @@ src_configure() {
$(use_enable lirc) \
$(use_enable live live555) \
$(use_enable lua) \
- $(use_enable macosx-eyetv) \
$(use_enable macosx-notifications osx-notifications) \
$(use_enable macosx-qtkit) \
$(use_enable cpu_flags_x86_mmx mmx) \
@@ -361,12 +370,12 @@ src_configure() {
$(use_enable postproc) \
$(use_enable projectm) \
$(use_enable pulseaudio pulse) \
+ $(use_enable qt5 qt) \
$(use_enable rdp freerdp) \
$(use_enable rtsp realrtsp) \
$(use_enable run-as-root) \
$(use_enable samba smbclient) \
$(use_enable schroedinger) \
- $(use_enable sdl) \
$(use_enable sdl-image) \
$(use_enable sid) \
$(use_enable sftp) \
@@ -406,11 +415,11 @@ src_configure() {
--disable-cprof \
--disable-crystalhd \
--disable-decklink \
- --disable-gles1 \
--disable-gles2 \
--disable-goom \
--disable-kai \
--disable-kva \
+ --disable-libplacebo \
--disable-maintainer-mode \
--disable-merge-ffmpeg \
--disable-mfx \
@@ -420,7 +429,8 @@ src_configure() {
--disable-rpi-omxil \
--disable-shine \
--disable-sndio \
- --disable-vda \
+ --disable-spatialaudio \
+ --disable-srt \
--disable-vsxu \
--disable-wasapi
@@ -444,10 +454,20 @@ src_install() {
pkg_postinst() {
if [[ "$ROOT" = "/" ]] && [[ -x "/usr/$(get_libdir)/vlc/vlc-cache-gen" ]] ; then
einfo "Running /usr/$(get_libdir)/vlc/vlc-cache-gen on /usr/$(get_libdir)/vlc/plugins/"
- "/usr/$(get_libdir)/vlc/vlc-cache-gen" -f "/usr/$(get_libdir)/vlc/plugins/"
+ "/usr/$(get_libdir)/vlc/vlc-cache-gen" "/usr/$(get_libdir)/vlc/plugins/"
else
ewarn "We cannot run vlc-cache-gen (most likely ROOT!=/)"
ewarn "Please run /usr/$(get_libdir)/vlc/vlc-cache-gen manually"
ewarn "If you do not do it, vlc will take a long time to load."
fi
+
+ gnome2_icon_cache_update
+ xdg_mimeinfo_database_update
+ xdg_desktop_database_update
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+ xdg_mimeinfo_database_update
+ xdg_desktop_database_update
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-13 20:35:00 +0000