commit: fd64bb4af33d08486e260d5f635bc30c26e31fbc Author: Yury Martynov <email <AT> linxon <DOT> ru> AuthorDate: Sun May 3 12:45:39 2020 +0000 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> CommitDate: Wed May 6 11:51:00 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd64bb4a
media-video/qmplay2: bump to 20.05.02 Closes: https://bugs.gentoo.org/720682 Package-Manager: Portage-2.3.89, Repoman-2.3.20 Signed-off-by: Yury Martynov <email <AT> linxon.ru> Closes: https://github.com/gentoo/gentoo/pull/15626 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> media-video/qmplay2/Manifest | 1 + media-video/qmplay2/metadata.xml | 5 +- ...qmplay2-9999.ebuild => qmplay2-20.05.02.ebuild} | 88 ++++++++++++---------- media-video/qmplay2/qmplay2-9999.ebuild | 88 ++++++++++++---------- 4 files changed, 99 insertions(+), 83 deletions(-) diff --git a/media-video/qmplay2/Manifest b/media-video/qmplay2/Manifest index 279bf12fa38..55994dfc468 100644 --- a/media-video/qmplay2/Manifest +++ b/media-video/qmplay2/Manifest @@ -1 +1,2 @@ +DIST QMPlay2-src-20.05.02.tar.xz 1553364 BLAKE2B f436a8e970278d47ef1ade86d07fd3460c2628d7f93c238093425779f896c44b3e0c7b4c6a40ffc8b79f1749563016cb62ac853c94b236859287066bfbdbe59f SHA512 b587d80128c334450552b2a6f0fa4c7426409b4d7a7bcca2065f83eab3e2f8b7ecc0df92f50fa276f42c84a201222cae2dd7f5c3f4bbdabf321895212db936b6 DIST qmplay2-19.12.19.tar.gz 1285009 BLAKE2B e4f644513ac0e7d33574e4b1b157dfe775222df74ba5041099e9bcaa87f8b052880dfd2c19005380783d9ca7b2bdbf7aedb233e12e2af839d40af224981d593e SHA512 a03d70c5bd3b2644810b9ec5fd39bd0340ddcc460646228a2799053a27117a54ead09f046b58ff7e0ae2cd959a92980cf8336a12d49ef297e1de30dd32f604a0 diff --git a/media-video/qmplay2/metadata.xml b/media-video/qmplay2/metadata.xml index 9d4d0d19d76..0a9ff717a2a 100644 --- a/media-video/qmplay2/metadata.xml +++ b/media-video/qmplay2/metadata.xml @@ -22,16 +22,19 @@ <flag name="avresample">Use libavresample instead of libswresample</flag> <flag name="cdio">Build with AudioCD module</flag> <flag name="cuvid">Build with CUVID module</flag> - <flag name="extensions">Build with Extensions module</flag> + <flag name="extensions">Build with Extensions module and enable other plugins</flag> <flag name="gme">Build Chiptune with GME support</flag> <flag name="inputs">Build with Inputs module</flag> <flag name="lastfm">Build with LastFM support</flag> + <flag name="libass">Build with SSA/ASS subtitles rendering support</flag> <flag name="lyrics">Build with lyrics support</flag> <flag name="mediabrowser">Build with MediaBrowser support</flag> <flag name="mpris2">Build Extensions with MPRIS2 support</flag> <flag name="notifications">Build additional notifications module</flag> <flag name="sid">Build Chiptune with SIDPLAY support</flag> + <flag name="shaders">Compile Vulkan shaders using <pkg>media-libs/shaderc</pkg></flag> <flag name="videofilters">Build with VideoFilters module</flag> <flag name="visualizations">Build with Visualizations module</flag> + <flag name="vulkan">Build with Vulkan support</flag> </use> </pkgmetadata> diff --git a/media-video/qmplay2/qmplay2-9999.ebuild b/media-video/qmplay2/qmplay2-20.05.02.ebuild similarity index 66% copy from media-video/qmplay2/qmplay2-9999.ebuild copy to media-video/qmplay2/qmplay2-20.05.02.ebuild index 62cc3038bdd..9556ffd4007 100644 --- a/media-video/qmplay2/qmplay2-9999.ebuild +++ b/media-video/qmplay2/qmplay2-20.05.02.ebuild @@ -12,55 +12,57 @@ if [[ ${PV} == *9999 ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/zaps166/QMPlay2"; else - SRC_URI="https://github.com/zaps166/QMPlay2/archive/${PV}.tar.gz -> ${P}.tar.gz" + SRC_URI="https://github.com/zaps166/QMPlay2/releases/download/${PV}/QMPlay2-src-${PV}.tar.xz"; KEYWORDS="~amd64 ~x86" - S="${WORKDIR}/QMPlay2-${PV}" + S="${WORKDIR}/QMPlay2-src-${PV}" fi LICENSE="LGPL-3" SLOT="0" -IUSE="avdevice +audiofilters avresample +alsa cdio cuvid dbus +extensions - +ffmpeg gme inputs +lastfm libass lyrics mediabrowser modplug mpris2 - notifications opengl portaudio pulseaudio sid svg taglib vaapi vdpau - +videofilters visualizations xv" +IUSE="avdevice +audiofilters +alsa cdio cuvid dbus extensions + gme inputs libass modplug notifications opengl portaudio + pulseaudio sid shaders vaapi vdpau +videofilters visualizations vulkan xv" REQUIRED_USE=" audiofilters? ( || ( alsa portaudio pulseaudio ) ) - avdevice? ( ffmpeg ) - avresample? ( ffmpeg ) - lastfm? ( extensions ) - lyrics? ( extensions ) - mediabrowser? ( extensions ) - mpris2? ( extensions dbus ) - vaapi? ( ffmpeg opengl ) - vdpau? ( ffmpeg )" + extensions? ( dbus ) + shaders? ( vulkan )" RDEPEND=" - alsa? ( media-libs/alsa-lib ) - cdio? ( dev-libs/libcdio[cddb] ) dev-qt/qtcore:5 + dev-qt/qtsvg:5 + dev-qt/qtwidgets:5 + dev-qt/qtx11extras:5 + media-video/ffmpeg || ( dev-qt/qtgui:5[X(-)] dev-qt/qtgui:5[xcb(-)] ) - dev-qt/qtwidgets:5 - dev-qt/qtx11extras:5 + alsa? ( media-libs/alsa-lib ) + cdio? ( dev-libs/libcdio[cddb] ) dbus? ( dev-qt/qtdbus:5 ) - ffmpeg? ( media-video/ffmpeg ) + extensions? ( + dev-qt/qtdeclarative:5 + media-libs/taglib + ) gme? ( media-libs/game-music-emu ) libass? ( media-libs/libass ) - mediabrowser? ( dev-qt/qtdeclarative:5 ) opengl? ( virtual/opengl ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-sound/pulseaudio ) sid? ( media-libs/libsidplayfp ) - svg? ( dev-qt/qtsvg:5 ) - taglib? ( media-libs/taglib ) + shaders? ( media-libs/shaderc ) vaapi? ( - >=media-video/ffmpeg-4.1.0[vaapi] - x11-libs/libva[drm,opengl] ) + >=media-video/ffmpeg-4.1.3[vaapi] + x11-libs/libva[drm,opengl] + ) vdpau? ( media-video/ffmpeg[vdpau] ) + videofilters? ( dev-qt/qtconcurrent:5 ) + vulkan? ( + >=dev-qt/qtgui-5.14.1:5[vulkan] + >=media-libs/vulkan-loader-1.2.133 + ) xv? ( x11-libs/libXv )" DEPEND="${RDEPEND}" @@ -81,25 +83,29 @@ src_prepare() { src_configure() { local mycmakeargs=( # core + -DUSE_LINK_TIME_OPTIMIZATION=false -DUSE_ALSA=$(usex alsa) -DUSE_AUDIOCD=$(usex cdio) - -DUSE_AVRESAMPLE=$(usex avresample) -DUSE_FREEDESKTOP_NOTIFICATIONS=$(usex dbus) # https://github.com/zaps166/QMPlay2/issues/134 -DUSE_LIBASS=$(usex libass) -DUSE_NOTIFY=$(usex notifications) - -DUSE_OPENGL2=$(usex opengl) + -DUSE_OPENGL=$(usex opengl) + -DUSE_VULKAN=$(usex vulkan) + -DUSE_GLSLC=$(usex shaders) -DUSE_XVIDEO=$(usex xv) # ffmpeg - -DUSE_FFMPEG=$(usex ffmpeg) -DUSE_FFMPEG_AVDEVICE=$(usex avdevice) -DUSE_FFMPEG_VAAPI=$(usex vaapi) -DUSE_FFMPEG_VDPAU=$(usex vdpau) + # chiptune + -DUSE_CHIPTUNE_GME=$(usex gme) + -DUSE_CHIPTUNE_SID=$(usex sid) + # modules -DUSE_AUDIOFILTERS=$(usex audiofilters) -DUSE_CUVID=$(usex cuvid) - -DUSE_EXTENSIONS=$(usex extensions) -DUSE_INPUTS=$(usex inputs) -DUSE_MODPLUG=$(usex modplug) -DUSE_PORTAUDIO=$(usex portaudio) @@ -107,24 +113,24 @@ src_configure() { -DUSE_VIDEOFILTERS=$(usex videofilters) -DUSE_VISUALIZATIONS=$(usex visualizations) - # gui - -DUSE_TAGLIB=$(usex taglib) - - # chiptune - -DUSE_CHIPTUNE_GME=$(usex gme) - -DUSE_CHIPTUNE_SID=$(usex sid) - # extensions - -DUSE_LASTFM=$(usex lastfm) - -DUSE_LYRICS=$(usex lyrics) - -DUSE_MEDIABROWSER=$(usex mediabrowser) - -DUSE_MPRIS2=$(usex mpris2) + -DUSE_EXTENSIONS=$(usex extensions) + -DUSE_TAGLIB=$(usex extensions) + -DUSE_LASTFM=$(usex extensions) + -DUSE_LYRICS=$(usex extensions) + -DUSE_MEDIABROWSER=$(usex extensions) + -DUSE_MPRIS2=$(usex extensions) ) + # find and link vulkan libs permanently + if use vulkan; then + mycmakeargs+=( -DQMVK_FIND_VULKAN=true ) + fi + if [[ ${PV} == *9999 ]]; then - mycmakeargs+=( USE_GIT_VERSION=ON ) + mycmakeargs+=( USE_GIT_VERSION=true ) else - mycmakeargs+=( USE_GIT_VERSION=OFF ) + mycmakeargs+=( USE_GIT_VERSION=false ) fi cmake_src_configure diff --git a/media-video/qmplay2/qmplay2-9999.ebuild b/media-video/qmplay2/qmplay2-9999.ebuild index 62cc3038bdd..9556ffd4007 100644 --- a/media-video/qmplay2/qmplay2-9999.ebuild +++ b/media-video/qmplay2/qmplay2-9999.ebuild @@ -12,55 +12,57 @@ if [[ ${PV} == *9999 ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/zaps166/QMPlay2"; else - SRC_URI="https://github.com/zaps166/QMPlay2/archive/${PV}.tar.gz -> ${P}.tar.gz" + SRC_URI="https://github.com/zaps166/QMPlay2/releases/download/${PV}/QMPlay2-src-${PV}.tar.xz"; KEYWORDS="~amd64 ~x86" - S="${WORKDIR}/QMPlay2-${PV}" + S="${WORKDIR}/QMPlay2-src-${PV}" fi LICENSE="LGPL-3" SLOT="0" -IUSE="avdevice +audiofilters avresample +alsa cdio cuvid dbus +extensions - +ffmpeg gme inputs +lastfm libass lyrics mediabrowser modplug mpris2 - notifications opengl portaudio pulseaudio sid svg taglib vaapi vdpau - +videofilters visualizations xv" +IUSE="avdevice +audiofilters +alsa cdio cuvid dbus extensions + gme inputs libass modplug notifications opengl portaudio + pulseaudio sid shaders vaapi vdpau +videofilters visualizations vulkan xv" REQUIRED_USE=" audiofilters? ( || ( alsa portaudio pulseaudio ) ) - avdevice? ( ffmpeg ) - avresample? ( ffmpeg ) - lastfm? ( extensions ) - lyrics? ( extensions ) - mediabrowser? ( extensions ) - mpris2? ( extensions dbus ) - vaapi? ( ffmpeg opengl ) - vdpau? ( ffmpeg )" + extensions? ( dbus ) + shaders? ( vulkan )" RDEPEND=" - alsa? ( media-libs/alsa-lib ) - cdio? ( dev-libs/libcdio[cddb] ) dev-qt/qtcore:5 + dev-qt/qtsvg:5 + dev-qt/qtwidgets:5 + dev-qt/qtx11extras:5 + media-video/ffmpeg || ( dev-qt/qtgui:5[X(-)] dev-qt/qtgui:5[xcb(-)] ) - dev-qt/qtwidgets:5 - dev-qt/qtx11extras:5 + alsa? ( media-libs/alsa-lib ) + cdio? ( dev-libs/libcdio[cddb] ) dbus? ( dev-qt/qtdbus:5 ) - ffmpeg? ( media-video/ffmpeg ) + extensions? ( + dev-qt/qtdeclarative:5 + media-libs/taglib + ) gme? ( media-libs/game-music-emu ) libass? ( media-libs/libass ) - mediabrowser? ( dev-qt/qtdeclarative:5 ) opengl? ( virtual/opengl ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-sound/pulseaudio ) sid? ( media-libs/libsidplayfp ) - svg? ( dev-qt/qtsvg:5 ) - taglib? ( media-libs/taglib ) + shaders? ( media-libs/shaderc ) vaapi? ( - >=media-video/ffmpeg-4.1.0[vaapi] - x11-libs/libva[drm,opengl] ) + >=media-video/ffmpeg-4.1.3[vaapi] + x11-libs/libva[drm,opengl] + ) vdpau? ( media-video/ffmpeg[vdpau] ) + videofilters? ( dev-qt/qtconcurrent:5 ) + vulkan? ( + >=dev-qt/qtgui-5.14.1:5[vulkan] + >=media-libs/vulkan-loader-1.2.133 + ) xv? ( x11-libs/libXv )" DEPEND="${RDEPEND}" @@ -81,25 +83,29 @@ src_prepare() { src_configure() { local mycmakeargs=( # core + -DUSE_LINK_TIME_OPTIMIZATION=false -DUSE_ALSA=$(usex alsa) -DUSE_AUDIOCD=$(usex cdio) - -DUSE_AVRESAMPLE=$(usex avresample) -DUSE_FREEDESKTOP_NOTIFICATIONS=$(usex dbus) # https://github.com/zaps166/QMPlay2/issues/134 -DUSE_LIBASS=$(usex libass) -DUSE_NOTIFY=$(usex notifications) - -DUSE_OPENGL2=$(usex opengl) + -DUSE_OPENGL=$(usex opengl) + -DUSE_VULKAN=$(usex vulkan) + -DUSE_GLSLC=$(usex shaders) -DUSE_XVIDEO=$(usex xv) # ffmpeg - -DUSE_FFMPEG=$(usex ffmpeg) -DUSE_FFMPEG_AVDEVICE=$(usex avdevice) -DUSE_FFMPEG_VAAPI=$(usex vaapi) -DUSE_FFMPEG_VDPAU=$(usex vdpau) + # chiptune + -DUSE_CHIPTUNE_GME=$(usex gme) + -DUSE_CHIPTUNE_SID=$(usex sid) + # modules -DUSE_AUDIOFILTERS=$(usex audiofilters) -DUSE_CUVID=$(usex cuvid) - -DUSE_EXTENSIONS=$(usex extensions) -DUSE_INPUTS=$(usex inputs) -DUSE_MODPLUG=$(usex modplug) -DUSE_PORTAUDIO=$(usex portaudio) @@ -107,24 +113,24 @@ src_configure() { -DUSE_VIDEOFILTERS=$(usex videofilters) -DUSE_VISUALIZATIONS=$(usex visualizations) - # gui - -DUSE_TAGLIB=$(usex taglib) - - # chiptune - -DUSE_CHIPTUNE_GME=$(usex gme) - -DUSE_CHIPTUNE_SID=$(usex sid) - # extensions - -DUSE_LASTFM=$(usex lastfm) - -DUSE_LYRICS=$(usex lyrics) - -DUSE_MEDIABROWSER=$(usex mediabrowser) - -DUSE_MPRIS2=$(usex mpris2) + -DUSE_EXTENSIONS=$(usex extensions) + -DUSE_TAGLIB=$(usex extensions) + -DUSE_LASTFM=$(usex extensions) + -DUSE_LYRICS=$(usex extensions) + -DUSE_MEDIABROWSER=$(usex extensions) + -DUSE_MPRIS2=$(usex extensions) ) + # find and link vulkan libs permanently + if use vulkan; then + mycmakeargs+=( -DQMVK_FIND_VULKAN=true ) + fi + if [[ ${PV} == *9999 ]]; then - mycmakeargs+=( USE_GIT_VERSION=ON ) + mycmakeargs+=( USE_GIT_VERSION=true ) else - mycmakeargs+=( USE_GIT_VERSION=OFF ) + mycmakeargs+=( USE_GIT_VERSION=false ) fi cmake_src_configure
