commit: 9e50352f9d4ba3c92ae9182e3e1bfaef119752a1 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Tue Feb 27 20:34:22 2018 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Tue Feb 27 20:36:01 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e50352f
media-video/qx11grab: Remove last-rited package media-video/qx11grab/Manifest | 1 - .../qx11grab/files/qx11grab-0.4.12-ffmpeg3.patch | 22 --------- media-video/qx11grab/metadata.xml | 8 ---- media-video/qx11grab/qx11grab-0.4.12.ebuild | 55 ---------------------- profiles/package.mask | 5 -- 5 files changed, 91 deletions(-) diff --git a/media-video/qx11grab/Manifest b/media-video/qx11grab/Manifest deleted file mode 100644 index 86e7357e47a..00000000000 --- a/media-video/qx11grab/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST qx11grab-0.4.12.tar.xz 392304 BLAKE2B d202770b719622f9fc89ae152ea821410fa7160fc757e55a8ea2dc15c93962a6c405ae4911916d829e66a343b33e73823b13ab4cd66ff0dce9dc9d101b741c16 SHA512 6731d2bfc4fa889cf14da597408d86ddb68a33c5ed1ede3f4c49ed2746cebb71c2dd23cab17c2c03e52a60cfbbce928519a21d86fb5572fd88934e8bdf29cdb9 diff --git a/media-video/qx11grab/files/qx11grab-0.4.12-ffmpeg3.patch b/media-video/qx11grab/files/qx11grab-0.4.12-ffmpeg3.patch deleted file mode 100644 index a5d20ed5161..00000000000 --- a/media-video/qx11grab/files/qx11grab-0.4.12-ffmpeg3.patch +++ /dev/null @@ -1,22 +0,0 @@ -Index: qx11grab-0.4.12/src/avoptions/avoptions.cpp -=================================================================== ---- qx11grab-0.4.12.orig/src/avoptions/avoptions.cpp -+++ qx11grab-0.4.12/src/avoptions/avoptions.cpp -@@ -178,14 +178,14 @@ namespace QX11Grab - { - QList<FFOption> list; - avcodec_register_all(); -- for ( int i = 0; i < PIX_FMT_NB; i++ ) -+ int i = 0; -+ for ( const AVPixFmtDescriptor* pix_desc = av_pix_fmt_desc_next(NULL); pix_desc != NULL; pix_desc = av_pix_fmt_desc_next(pix_desc)) - { -- const AVPixFmtDescriptor* pix_desc = &av_pix_fmt_descriptors[ static_cast<PixelFormat> ( i ) ]; - if ( ! pix_desc->name ) - continue; - - FFOption opt; -- opt.id = i; -+ opt.id = i++; - opt.name = QString::fromUtf8 ( pix_desc->name ); - opt.value = QVariant ( pix_desc->name ); - /*: ToolTip */ diff --git a/media-video/qx11grab/metadata.xml b/media-video/qx11grab/metadata.xml deleted file mode 100644 index 17237689dcf..00000000000 --- a/media-video/qx11grab/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>q...@gentoo.org</email> - <name>Gentoo Qt Project</name> - </maintainer> -</pkgmetadata> diff --git a/media-video/qx11grab/qx11grab-0.4.12.ebuild b/media-video/qx11grab/qx11grab-0.4.12.ebuild deleted file mode 100644 index 236df54b6bc..00000000000 --- a/media-video/qx11grab/qx11grab-0.4.12.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit cmake-utils - -DESCRIPTION="X11 desktop video grabber tray" -HOMEPAGE="http://qx11grab.hjcms.de/" -SRC_URI="http://qx11grab.hjcms.de/downloads/${PV}/${P}.tar.xz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="libav opengl pulseaudio" - -RDEPEND=" - dev-libs/qjson - >=dev-qt/qtcore-4.7.4:4 - >=dev-qt/qtdbus-4.7.4:4 - >=dev-qt/qtgui-4.7.4:4[accessibility] - >=media-libs/alsa-lib-1.0.26 - >=media-libs/fontconfig-2.4 - >=media-libs/freetype-2.4:2 - >=sys-apps/dbus-1.6.4 - >=x11-libs/libX11-1.3.4 - >=x11-libs/libXrandr-1.3 - libav? ( >=media-video/libav-9:0=[X,encode,truetype] ) - !libav? ( >=media-video/ffmpeg-1.1:0=[X,encode,truetype] ) - opengl? ( >=dev-qt/qtopengl-4.7.4:4 ) - pulseaudio? ( media-sound/pulseaudio ) -" -DEPEND="${RDEPEND} - virtual/pkgconfig -" -PDEPEND="virtual/freedesktop-icon-theme" - -PATCHES=( "${FILESDIR}/${P}-ffmpeg3.patch" ) - -src_prepare() { - cmake-utils_src_prepare - - # install docs into standard Gentoo location - sed -i -e "/DESTINATION share/ s:\${CMAKE_PROJECT_NAME}:doc/${PF}:" \ - CMakeLists.txt || die -} - -src_configure() { - local mycmakeargs=( - -DENABLE_KDE_SUPPORT=OFF - $(cmake-utils_use_enable opengl) - $(cmake-utils_use_enable pulseaudio PULSE) - ) - cmake-utils_src_configure -} diff --git a/profiles/package.mask b/profiles/package.mask index 7b439193555..b1486eb9346 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -221,11 +221,6 @@ media-sound/qpitch # Has different symbols. Known to cause issues with i3bar/swaybar. media-fonts/fontawesome:0/5 -# Michael Palimaka <kensing...@gentoo.org> (25 Jan 2018) -# Requires dead Qt 4. Dead upstream. -# Masked for removal in 30 days. Bug #644532. -media-video/qx11grab - # Andreas Sturmlechner <ast...@gentoo.org> (22 Jan 2018) # Depends on deprecated Qt4, upstream is slowly doing a qml port. # Masked for removal in 60 days. Revisit bug #645504 before deciding