| 1 |
commit: 9b390096f78b1a6c1dd2956f2218d39e0688336f |
| 2 |
Author: Samuel Bernardo <samuelbernardo.mail <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sat May 26 11:58:17 2018 +0000 |
| 4 |
Commit: Samuel Bernardo <samuelbernardo.mail <AT> gmail <DOT> com> |
| 5 |
CommitDate: Sat May 26 11:58:17 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/user/ssnb.git/commit/?id=9b390096 |
| 7 |
|
| 8 |
update qmplay2 |
| 9 |
|
| 10 |
media-video/qmplay2/Manifest | 6 +- |
| 11 |
...ay2-17.12.31.ebuild => qmplay2-18.04.01.ebuild} | 0 |
| 12 |
media-video/qmplay2/qmplay2-9999.ebuild | 98 +++++++++++----------- |
| 13 |
3 files changed, 50 insertions(+), 54 deletions(-) |
| 14 |
|
| 15 |
diff --git a/media-video/qmplay2/Manifest b/media-video/qmplay2/Manifest |
| 16 |
index 9647d28..01fb02d 100644 |
| 17 |
--- a/media-video/qmplay2/Manifest |
| 18 |
+++ b/media-video/qmplay2/Manifest |
| 19 |
@@ -1,4 +1,4 @@ |
| 20 |
AUX qmplay2-dbus.patch 436 BLAKE2B 1cd09c5abc68a0e956dda8796dd430e99c39ff633f23c9c348907f7125b7beecbb5f4e628d228d477c0909b4a7d44a360be7b9c11d02dedeeaf1b6f5b6b3d527 SHA512 5bdfe1dbd10a4343b11e279014162964d5032969f06b7fb41fb73e6f9fba1a1914efdc5e5083257308f7310e22fe38e3b7656fd82acda3857a5614bfa15ca4ec |
| 21 |
-DIST QMPlay2-src-17.12.31.tar.xz 980692 BLAKE2B f3ac981563ff0416bf0dc487e221e4aa48684f49716e10a2008694bf4740a89213809b53526a1ee43fafd12ae7bf549a5b4645e69c24cde0370981d748f833af SHA512 e0398df0daeb55c294a21deb175391253fee1fe7ebb255ba05960a59564b99004f7c299d8c3af652bb6bb40f8173e4d129c9a4bbda3efa9fafc375c77ba95f01 |
| 22 |
-EBUILD qmplay2-17.12.31.ebuild 3039 BLAKE2B 3ade242ebdab21451fc3bf535f71b35a5adc8746c09c3e20f5cc02a0647d217263db9fad5cee0bb7dbeb00d257cddf9052f0e83c1403c452e143744dc4274e21 SHA512 0b3269d72ee909c260e3a5beb745240d00dd0c5af7c4b9d714267b02296972d8366f3adcd72c6f177047e8c45571649512b5ca7cb4d35ae3d48e5da4061f2c10 |
| 23 |
-EBUILD qmplay2-9999.ebuild 3039 BLAKE2B 3ade242ebdab21451fc3bf535f71b35a5adc8746c09c3e20f5cc02a0647d217263db9fad5cee0bb7dbeb00d257cddf9052f0e83c1403c452e143744dc4274e21 SHA512 0b3269d72ee909c260e3a5beb745240d00dd0c5af7c4b9d714267b02296972d8366f3adcd72c6f177047e8c45571649512b5ca7cb4d35ae3d48e5da4061f2c10 |
| 24 |
+DIST QMPlay2-src-18.04.01.tar.xz 1007840 BLAKE2B 30b07872c2ffcdaaabe4beba6ef6b34c9dfdb052291a3853bac9dfe514cc92746c71a8ad40f11720776064890339147d80619fd0b3193aa14c99ae8e9e8edbfb SHA512 7c313a55dbb629b09b60eb2e2915c47ac4c095b3cf48c748e93465010d2afd5ffb70116c95558e469b8b1890aa33980e1f6813d015866d8df8b9fa97f5b66e7c |
| 25 |
+EBUILD qmplay2-18.04.01.ebuild 2860 BLAKE2B d957c9d1489798230e52effa7cc39830d85806862a77df2537fcc8b4efa3c253f9cbf5ab87cf813de7ee7c59a35a82f3556e4acf91b0866e5f133184cfda1cb6 SHA512 bd038ea6b975efb95b1e6c2e1f892c35f33ebe54cc9782a658d1039e254ceb449bb1f3d3438091deda96b0b7a123e4ac2076e5d532d2fea89530a4fc0e619c34 |
| 26 |
+EBUILD qmplay2-9999.ebuild 2860 BLAKE2B d957c9d1489798230e52effa7cc39830d85806862a77df2537fcc8b4efa3c253f9cbf5ab87cf813de7ee7c59a35a82f3556e4acf91b0866e5f133184cfda1cb6 SHA512 bd038ea6b975efb95b1e6c2e1f892c35f33ebe54cc9782a658d1039e254ceb449bb1f3d3438091deda96b0b7a123e4ac2076e5d532d2fea89530a4fc0e619c34 |
| 27 |
|
| 28 |
diff --git a/media-video/qmplay2/qmplay2-17.12.31.ebuild b/media-video/qmplay2/qmplay2-18.04.01.ebuild |
| 29 |
similarity index 100% |
| 30 |
rename from media-video/qmplay2/qmplay2-17.12.31.ebuild |
| 31 |
rename to media-video/qmplay2/qmplay2-18.04.01.ebuild |
| 32 |
|
| 33 |
diff --git a/media-video/qmplay2/qmplay2-9999.ebuild b/media-video/qmplay2/qmplay2-9999.ebuild |
| 34 |
index 6a4d079..b17eaeb 100644 |
| 35 |
--- a/media-video/qmplay2/qmplay2-9999.ebuild |
| 36 |
+++ b/media-video/qmplay2/qmplay2-9999.ebuild |
| 37 |
@@ -1,63 +1,67 @@ |
| 38 |
-# Copyright 1999-2016 Gentoo Foundation |
| 39 |
+# Copyright 1999-2018 Gentoo Foundation |
| 40 |
# Distributed under the terms of the GNU General Public License v2 |
| 41 |
-# $Id$ |
| 42 |
|
| 43 |
EAPI=6 |
| 44 |
-PLOCALES="de es fr pl ru zh" |
| 45 |
|
| 46 |
-inherit cmake-utils l10n |
| 47 |
+PLOCALES="de es fr hu pl ru uk zh" |
| 48 |
+ |
| 49 |
+inherit cmake-utils l10n xdg |
| 50 |
|
| 51 |
MY_PN="QMPlay2" |
| 52 |
|
| 53 |
DESCRIPTION="Qt-based video player, which can play all formats and stream" |
| 54 |
HOMEPAGE="https://github.com/zaps166/${MY_PN}" |
| 55 |
+ |
| 56 |
if [[ ${PV} == 9999 ]]; then |
| 57 |
inherit git-r3 |
| 58 |
EGIT_REPO_URI="https://github.com/zaps166/${MY_PN}.git" |
| 59 |
KEYWORDS="" |
| 60 |
else |
| 61 |
- inherit versionator |
| 62 |
- MY_PV=$(replace_version_separator 3 '-') |
| 63 |
- |
| 64 |
- SRC_URI="https://github.com/zaps166/${MY_PN}/releases/download/${MY_PV}/${MY_PN}-src-${MY_PV}.tar.xz" |
| 65 |
+ SRC_URI="https://github.com/zaps166/${MY_PN}/releases/download/${PV}/${MY_PN}-src-${PV}.tar.xz" |
| 66 |
KEYWORDS="~amd64 ~x86" |
| 67 |
S=${WORKDIR}/${MY_PN}-src-${PV} |
| 68 |
fi |
| 69 |
|
| 70 |
-LICENSE="LGPL" |
| 71 |
+LICENSE="LGPL-3" |
| 72 |
SLOT="0" |
| 73 |
-IUSE="alsa cdio +ffmpeg gme jemalloc libass modplug mpris opengl portaudio -pulseaudio qt4 +qt5 sid taglib vaapi vdpau +xv" |
| 74 |
-IUSE="${IUSE} +avdevice -avresample +audiofilters cuvid extensions inputs lastfm notifications prostopleer soundcloud +videofilters visualizations wbijam" |
| 75 |
+ |
| 76 |
+CHIPTUNE=( gme sid ) |
| 77 |
+CORE=( avresample libass ) |
| 78 |
+EXTENSIONS=( animeodcinki datmusic lastfm tekstowo wbijam ) |
| 79 |
+FFMPEG=( avdevice vaapi vdpau ) |
| 80 |
+GUI=( jemalloc taglib ) |
| 81 |
+MODULES=( alsa audiofilters cuvid extensions ffmpeg inputs modplug portaudio pulseaudio videofilters visualizations ) |
| 82 |
+ |
| 83 |
+IUSE="${CHIPTUNE[@]} ${CORE[@]} ${EXTENSIONS[@]} ${FFMPEG[@]} ${GUI[@]} ${MODULES[@]} cdio dbus libav mpris notifications opengl xv" |
| 84 |
|
| 85 |
REQUIRED_USE=" |
| 86 |
- ^^ ( qt4 qt5 ) |
| 87 |
+ animeodcinki? ( extensions ) |
| 88 |
avdevice? ( ffmpeg ) |
| 89 |
+ datmusic? ( extensions ) |
| 90 |
+ lastfm? ( extensions ) |
| 91 |
mpris? ( extensions ) |
| 92 |
+ tekstowo? ( extensions ) |
| 93 |
vaapi? ( ffmpeg ) |
| 94 |
vdpau? ( ffmpeg ) |
| 95 |
+ wbijam? ( extensions ) |
| 96 |
" |
| 97 |
|
| 98 |
RDEPEND=" |
| 99 |
- media-libs/mesa |
| 100 |
- >=media-video/ffmpeg-2.2.0:= |
| 101 |
+ dev-qt/qtcore:5 |
| 102 |
+ dev-qt/qtgui:5 |
| 103 |
+ dev-qt/qtwidgets:5 |
| 104 |
+ dbus? ( dev-qt/qtdbus:5 ) |
| 105 |
gme? ( media-libs/game-music-emu ) |
| 106 |
cdio? ( dev-libs/libcdio[cddb] ) |
| 107 |
jemalloc? ( dev-libs/jemalloc ) |
| 108 |
libass? ( media-libs/libass ) |
| 109 |
+ libav? ( media-video/libav:= ) |
| 110 |
+ !libav? ( media-video/ffmpeg:= ) |
| 111 |
+ mpris? ( dev-qt/qtdbus:5 ) |
| 112 |
portaudio? ( media-libs/portaudio ) |
| 113 |
pulseaudio? ( media-sound/pulseaudio ) |
| 114 |
- qt4? ( |
| 115 |
- dev-qt/qtcore:4 |
| 116 |
- dev-qt/qtgui:4 |
| 117 |
- opengl? ( dev-qt/qtopengl:4 ) |
| 118 |
- ) |
| 119 |
- qt5? ( |
| 120 |
- >=dev-qt/qtcore-5.6.1:5 |
| 121 |
- >=dev-qt/qtgui-5.6.1:5 |
| 122 |
- >=dev-qt/qtwidgets-5.6.1:5 |
| 123 |
- ) |
| 124 |
sid? ( media-libs/libsidplayfp ) |
| 125 |
- taglib? ( >=media-libs/taglib-1.9.1 ) |
| 126 |
+ taglib? ( media-libs/taglib ) |
| 127 |
vaapi? ( x11-libs/libva[opengl,X] ) |
| 128 |
vdpau? ( x11-libs/libvdpau ) |
| 129 |
xv? ( x11-libs/libXv ) |
| 130 |
@@ -66,53 +70,45 @@ DEPEND="${RDEPEND} |
| 131 |
dev-qt/linguist-tools:5 |
| 132 |
" |
| 133 |
|
| 134 |
-CMAKE_MIN_VERSION="2.8.11" |
| 135 |
-DOCS=( AUTHORS ChangeLog README.md ) |
| 136 |
- |
| 137 |
-PATCHES=( |
| 138 |
- "${FILESDIR}/qmplay2-dbus.patch" |
| 139 |
-) |
| 140 |
+CMAKE_MIN_VERSION="3.1" |
| 141 |
|
| 142 |
src_prepare() { |
| 143 |
- if [[ ${PV} == 9999 ]]; then |
| 144 |
- default |
| 145 |
- else |
| 146 |
- if declare -p PATCHES | grep -q "^declare -a "; then |
| 147 |
- [[ -n ${PATCHES[@]} ]] && eapply "${PATCHES[@]}" || die "Error: failed to apply ebuild patches ${PATCHES}!" |
| 148 |
- else |
| 149 |
- [[ -n ${PATCHES} ]] && eapply ${PATCHES} || die "Error: failed to apply ebuild patches ${PATCHES}!" |
| 150 |
- fi |
| 151 |
- eapply_user |
| 152 |
- fi |
| 153 |
+ l10n_find_plocales_changes "${S}/lang" "" '.ts' |
| 154 |
+ |
| 155 |
+ # Delete Ubuntu Unity shortcut group |
| 156 |
+ sed -i -e '/X-Ayatana-Desktop-Shortcuts/,$d' \ |
| 157 |
+ src/gui/Unix/QMPlay2.desktop || die |
| 158 |
+ |
| 159 |
+ cmake-utils_src_prepare |
| 160 |
} |
| 161 |
|
| 162 |
src_configure() { |
| 163 |
local mycmakeargs=( |
| 164 |
-DLANGUAGES="$(l10n_get_locales)" |
| 165 |
-DUSE_AUDIOCD=$(usex cdio) |
| 166 |
- -DUSE_NOTIFIES=$(usex notifications) |
| 167 |
+ -DUSE_FREEDESKTOP_NOTIFICATIONS=$(usex dbus) |
| 168 |
+ -DUSE_MPRIS2=$(usex mpris) |
| 169 |
+ -DUSE_NOTIFY=$(usex notifications) |
| 170 |
-DUSE_OPENGL2=$(usex opengl) |
| 171 |
-DUSE_XVIDEO=$(usex xv) |
| 172 |
) |
| 173 |
|
| 174 |
- if use extensions; then |
| 175 |
- mycmakeargs+=( -DUSE_MPRIS2=$(usex mpris) ) |
| 176 |
+ if [[ ${PV} == 9999 ]]; then |
| 177 |
+ mycmakeargs+=( USE_GIT_VERSION=ON ) |
| 178 |
+ else |
| 179 |
+ mycmakeargs+=( USE_GIT_VERSION=OFF ) |
| 180 |
fi |
| 181 |
|
| 182 |
- for x in {alsa,ffmpeg,jemalloc,libass,modplug,portaudio,pulseaudio,qt5,taglib}; do |
| 183 |
- mycmakeargs+=( -DUSE_${x^^}=$(usex $x) ) |
| 184 |
- done |
| 185 |
- |
| 186 |
- for x in {avresample,audiofilters,cuvid,extensions,inputs,lastfm,prostopleer,soundcloud,videofilters,visualizations,wbijam}; do |
| 187 |
+ for x in ${CORE[@]} ${EXTENSIONS[@]} ${GUI[@]} ${MODULES[@]}; do |
| 188 |
mycmakeargs+=( -DUSE_${x^^}=$(usex $x) ) |
| 189 |
done |
| 190 |
|
| 191 |
- for x in {gme,sid}; do |
| 192 |
+ for x in ${CHIPTUNE[@]}; do |
| 193 |
mycmakeargs+=( -DUSE_CHIPTUNE_${x^^}=$(usex $x) ) |
| 194 |
done |
| 195 |
|
| 196 |
if use ffmpeg; then |
| 197 |
- for x in {avdevice,vaapi,vdpau}; do |
| 198 |
+ for x in ${FFMPEG[@]}; do |
| 199 |
mycmakeargs+=( -DUSE_FFMPEG_${x^^}=$(usex $x) ) |
| 200 |
done |
| 201 |
fi |
Archives