commit: 9b390096f78b1a6c1dd2956f2218d39e0688336f Author: Samuel Bernardo <samuelbernardo.mail <AT> gmail <DOT> com> AuthorDate: Sat May 26 11:58:17 2018 +0000 Commit: Samuel Bernardo <samuelbernardo.mail <AT> gmail <DOT> com> CommitDate: Sat May 26 11:58:17 2018 +0000 URL: https://gitweb.gentoo.org/repo/user/ssnb.git/commit/?id=9b390096
update qmplay2 media-video/qmplay2/Manifest | 6 +- ...ay2-17.12.31.ebuild => qmplay2-18.04.01.ebuild} | 0 media-video/qmplay2/qmplay2-9999.ebuild | 98 +++++++++++----------- 3 files changed, 50 insertions(+), 54 deletions(-) diff --git a/media-video/qmplay2/Manifest b/media-video/qmplay2/Manifest index 9647d28..01fb02d 100644 --- a/media-video/qmplay2/Manifest +++ b/media-video/qmplay2/Manifest @@ -1,4 +1,4 @@ AUX qmplay2-dbus.patch 436 BLAKE2B 1cd09c5abc68a0e956dda8796dd430e99c39ff633f23c9c348907f7125b7beecbb5f4e628d228d477c0909b4a7d44a360be7b9c11d02dedeeaf1b6f5b6b3d527 SHA512 5bdfe1dbd10a4343b11e279014162964d5032969f06b7fb41fb73e6f9fba1a1914efdc5e5083257308f7310e22fe38e3b7656fd82acda3857a5614bfa15ca4ec -DIST QMPlay2-src-17.12.31.tar.xz 980692 BLAKE2B f3ac981563ff0416bf0dc487e221e4aa48684f49716e10a2008694bf4740a89213809b53526a1ee43fafd12ae7bf549a5b4645e69c24cde0370981d748f833af SHA512 e0398df0daeb55c294a21deb175391253fee1fe7ebb255ba05960a59564b99004f7c299d8c3af652bb6bb40f8173e4d129c9a4bbda3efa9fafc375c77ba95f01 -EBUILD qmplay2-17.12.31.ebuild 3039 BLAKE2B 3ade242ebdab21451fc3bf535f71b35a5adc8746c09c3e20f5cc02a0647d217263db9fad5cee0bb7dbeb00d257cddf9052f0e83c1403c452e143744dc4274e21 SHA512 0b3269d72ee909c260e3a5beb745240d00dd0c5af7c4b9d714267b02296972d8366f3adcd72c6f177047e8c45571649512b5ca7cb4d35ae3d48e5da4061f2c10 -EBUILD qmplay2-9999.ebuild 3039 BLAKE2B 3ade242ebdab21451fc3bf535f71b35a5adc8746c09c3e20f5cc02a0647d217263db9fad5cee0bb7dbeb00d257cddf9052f0e83c1403c452e143744dc4274e21 SHA512 0b3269d72ee909c260e3a5beb745240d00dd0c5af7c4b9d714267b02296972d8366f3adcd72c6f177047e8c45571649512b5ca7cb4d35ae3d48e5da4061f2c10 +DIST QMPlay2-src-18.04.01.tar.xz 1007840 BLAKE2B 30b07872c2ffcdaaabe4beba6ef6b34c9dfdb052291a3853bac9dfe514cc92746c71a8ad40f11720776064890339147d80619fd0b3193aa14c99ae8e9e8edbfb SHA512 7c313a55dbb629b09b60eb2e2915c47ac4c095b3cf48c748e93465010d2afd5ffb70116c95558e469b8b1890aa33980e1f6813d015866d8df8b9fa97f5b66e7c +EBUILD qmplay2-18.04.01.ebuild 2860 BLAKE2B d957c9d1489798230e52effa7cc39830d85806862a77df2537fcc8b4efa3c253f9cbf5ab87cf813de7ee7c59a35a82f3556e4acf91b0866e5f133184cfda1cb6 SHA512 bd038ea6b975efb95b1e6c2e1f892c35f33ebe54cc9782a658d1039e254ceb449bb1f3d3438091deda96b0b7a123e4ac2076e5d532d2fea89530a4fc0e619c34 +EBUILD qmplay2-9999.ebuild 2860 BLAKE2B d957c9d1489798230e52effa7cc39830d85806862a77df2537fcc8b4efa3c253f9cbf5ab87cf813de7ee7c59a35a82f3556e4acf91b0866e5f133184cfda1cb6 SHA512 bd038ea6b975efb95b1e6c2e1f892c35f33ebe54cc9782a658d1039e254ceb449bb1f3d3438091deda96b0b7a123e4ac2076e5d532d2fea89530a4fc0e619c34 diff --git a/media-video/qmplay2/qmplay2-17.12.31.ebuild b/media-video/qmplay2/qmplay2-18.04.01.ebuild similarity index 100% rename from media-video/qmplay2/qmplay2-17.12.31.ebuild rename to media-video/qmplay2/qmplay2-18.04.01.ebuild diff --git a/media-video/qmplay2/qmplay2-9999.ebuild b/media-video/qmplay2/qmplay2-9999.ebuild index 6a4d079..b17eaeb 100644 --- a/media-video/qmplay2/qmplay2-9999.ebuild +++ b/media-video/qmplay2/qmplay2-9999.ebuild @@ -1,63 +1,67 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id$ EAPI=6 -PLOCALES="de es fr pl ru zh" -inherit cmake-utils l10n +PLOCALES="de es fr hu pl ru uk zh" + +inherit cmake-utils l10n xdg MY_PN="QMPlay2" DESCRIPTION="Qt-based video player, which can play all formats and stream" HOMEPAGE="https://github.com/zaps166/${MY_PN}"; + if [[ ${PV} == 9999 ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/zaps166/${MY_PN}.git"; KEYWORDS="" else - inherit versionator - MY_PV=$(replace_version_separator 3 '-') - - SRC_URI="https://github.com/zaps166/${MY_PN}/releases/download/${MY_PV}/${MY_PN}-src-${MY_PV}.tar.xz"; + SRC_URI="https://github.com/zaps166/${MY_PN}/releases/download/${PV}/${MY_PN}-src-${PV}.tar.xz"; KEYWORDS="~amd64 ~x86" S=${WORKDIR}/${MY_PN}-src-${PV} fi -LICENSE="LGPL" +LICENSE="LGPL-3" SLOT="0" -IUSE="alsa cdio +ffmpeg gme jemalloc libass modplug mpris opengl portaudio -pulseaudio qt4 +qt5 sid taglib vaapi vdpau +xv" -IUSE="${IUSE} +avdevice -avresample +audiofilters cuvid extensions inputs lastfm notifications prostopleer soundcloud +videofilters visualizations wbijam" + +CHIPTUNE=( gme sid ) +CORE=( avresample libass ) +EXTENSIONS=( animeodcinki datmusic lastfm tekstowo wbijam ) +FFMPEG=( avdevice vaapi vdpau ) +GUI=( jemalloc taglib ) +MODULES=( alsa audiofilters cuvid extensions ffmpeg inputs modplug portaudio pulseaudio videofilters visualizations ) + +IUSE="${CHIPTUNE[@]} ${CORE[@]} ${EXTENSIONS[@]} ${FFMPEG[@]} ${GUI[@]} ${MODULES[@]} cdio dbus libav mpris notifications opengl xv" REQUIRED_USE=" - ^^ ( qt4 qt5 ) + animeodcinki? ( extensions ) avdevice? ( ffmpeg ) + datmusic? ( extensions ) + lastfm? ( extensions ) mpris? ( extensions ) + tekstowo? ( extensions ) vaapi? ( ffmpeg ) vdpau? ( ffmpeg ) + wbijam? ( extensions ) " RDEPEND=" - media-libs/mesa - >=media-video/ffmpeg-2.2.0:= + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + dbus? ( dev-qt/qtdbus:5 ) gme? ( media-libs/game-music-emu ) cdio? ( dev-libs/libcdio[cddb] ) jemalloc? ( dev-libs/jemalloc ) libass? ( media-libs/libass ) + libav? ( media-video/libav:= ) + !libav? ( media-video/ffmpeg:= ) + mpris? ( dev-qt/qtdbus:5 ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-sound/pulseaudio ) - qt4? ( - dev-qt/qtcore:4 - dev-qt/qtgui:4 - opengl? ( dev-qt/qtopengl:4 ) - ) - qt5? ( - >=dev-qt/qtcore-5.6.1:5 - >=dev-qt/qtgui-5.6.1:5 - >=dev-qt/qtwidgets-5.6.1:5 - ) sid? ( media-libs/libsidplayfp ) - taglib? ( >=media-libs/taglib-1.9.1 ) + taglib? ( media-libs/taglib ) vaapi? ( x11-libs/libva[opengl,X] ) vdpau? ( x11-libs/libvdpau ) xv? ( x11-libs/libXv ) @@ -66,53 +70,45 @@ DEPEND="${RDEPEND} dev-qt/linguist-tools:5 " -CMAKE_MIN_VERSION="2.8.11" -DOCS=( AUTHORS ChangeLog README.md ) - -PATCHES=( - "${FILESDIR}/qmplay2-dbus.patch" -) +CMAKE_MIN_VERSION="3.1" src_prepare() { - if [[ ${PV} == 9999 ]]; then - default - else - if declare -p PATCHES | grep -q "^declare -a "; then - [[ -n ${PATCHES[@]} ]] && eapply "${PATCHES[@]}" || die "Error: failed to apply ebuild patches ${PATCHES}!" - else - [[ -n ${PATCHES} ]] && eapply ${PATCHES} || die "Error: failed to apply ebuild patches ${PATCHES}!" - fi - eapply_user - fi + l10n_find_plocales_changes "${S}/lang" "" '.ts' + + # Delete Ubuntu Unity shortcut group + sed -i -e '/X-Ayatana-Desktop-Shortcuts/,$d' \ + src/gui/Unix/QMPlay2.desktop || die + + cmake-utils_src_prepare } src_configure() { local mycmakeargs=( -DLANGUAGES="$(l10n_get_locales)" -DUSE_AUDIOCD=$(usex cdio) - -DUSE_NOTIFIES=$(usex notifications) + -DUSE_FREEDESKTOP_NOTIFICATIONS=$(usex dbus) + -DUSE_MPRIS2=$(usex mpris) + -DUSE_NOTIFY=$(usex notifications) -DUSE_OPENGL2=$(usex opengl) -DUSE_XVIDEO=$(usex xv) ) - if use extensions; then - mycmakeargs+=( -DUSE_MPRIS2=$(usex mpris) ) + if [[ ${PV} == 9999 ]]; then + mycmakeargs+=( USE_GIT_VERSION=ON ) + else + mycmakeargs+=( USE_GIT_VERSION=OFF ) fi - for x in {alsa,ffmpeg,jemalloc,libass,modplug,portaudio,pulseaudio,qt5,taglib}; do - mycmakeargs+=( -DUSE_${x^^}=$(usex $x) ) - done - - for x in {avresample,audiofilters,cuvid,extensions,inputs,lastfm,prostopleer,soundcloud,videofilters,visualizations,wbijam}; do + for x in ${CORE[@]} ${EXTENSIONS[@]} ${GUI[@]} ${MODULES[@]}; do mycmakeargs+=( -DUSE_${x^^}=$(usex $x) ) done - for x in {gme,sid}; do + for x in ${CHIPTUNE[@]}; do mycmakeargs+=( -DUSE_CHIPTUNE_${x^^}=$(usex $x) ) done if use ffmpeg; then - for x in {avdevice,vaapi,vdpau}; do + for x in ${FFMPEG[@]}; do mycmakeargs+=( -DUSE_FFMPEG_${x^^}=$(usex $x) ) done fi
