Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/qx11grab/, profiles/, media-video/qx11grab/files/
Date: Tue, 27 Feb 2018 20:36:21
Message-Id: 1519763761.9e50352f9d4ba3c92ae9182e3e1bfaef119752a1.asturm@gentoo
1 commit: 9e50352f9d4ba3c92ae9182e3e1bfaef119752a1
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Tue Feb 27 20:34:22 2018 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Tue Feb 27 20:36:01 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e50352f
7
8 media-video/qx11grab: Remove last-rited package
9
10 media-video/qx11grab/Manifest | 1 -
11 .../qx11grab/files/qx11grab-0.4.12-ffmpeg3.patch | 22 ---------
12 media-video/qx11grab/metadata.xml | 8 ----
13 media-video/qx11grab/qx11grab-0.4.12.ebuild | 55 ----------------------
14 profiles/package.mask | 5 --
15 5 files changed, 91 deletions(-)
16
17 diff --git a/media-video/qx11grab/Manifest b/media-video/qx11grab/Manifest
18 deleted file mode 100644
19 index 86e7357e47a..00000000000
20 --- a/media-video/qx11grab/Manifest
21 +++ /dev/null
22 @@ -1 +0,0 @@
23 -DIST qx11grab-0.4.12.tar.xz 392304 BLAKE2B d202770b719622f9fc89ae152ea821410fa7160fc757e55a8ea2dc15c93962a6c405ae4911916d829e66a343b33e73823b13ab4cd66ff0dce9dc9d101b741c16 SHA512 6731d2bfc4fa889cf14da597408d86ddb68a33c5ed1ede3f4c49ed2746cebb71c2dd23cab17c2c03e52a60cfbbce928519a21d86fb5572fd88934e8bdf29cdb9
24
25 diff --git a/media-video/qx11grab/files/qx11grab-0.4.12-ffmpeg3.patch b/media-video/qx11grab/files/qx11grab-0.4.12-ffmpeg3.patch
26 deleted file mode 100644
27 index a5d20ed5161..00000000000
28 --- a/media-video/qx11grab/files/qx11grab-0.4.12-ffmpeg3.patch
29 +++ /dev/null
30 @@ -1,22 +0,0 @@
31 -Index: qx11grab-0.4.12/src/avoptions/avoptions.cpp
32 -===================================================================
33 ---- qx11grab-0.4.12.orig/src/avoptions/avoptions.cpp
34 -+++ qx11grab-0.4.12/src/avoptions/avoptions.cpp
35 -@@ -178,14 +178,14 @@ namespace QX11Grab
36 - {
37 - QList<FFOption> list;
38 - avcodec_register_all();
39 -- for ( int i = 0; i < PIX_FMT_NB; i++ )
40 -+ int i = 0;
41 -+ for ( const AVPixFmtDescriptor* pix_desc = av_pix_fmt_desc_next(NULL); pix_desc != NULL; pix_desc = av_pix_fmt_desc_next(pix_desc))
42 - {
43 -- const AVPixFmtDescriptor* pix_desc = &av_pix_fmt_descriptors[ static_cast<PixelFormat> ( i ) ];
44 - if ( ! pix_desc->name )
45 - continue;
46 -
47 - FFOption opt;
48 -- opt.id = i;
49 -+ opt.id = i++;
50 - opt.name = QString::fromUtf8 ( pix_desc->name );
51 - opt.value = QVariant ( pix_desc->name );
52 - /*: ToolTip */
53
54 diff --git a/media-video/qx11grab/metadata.xml b/media-video/qx11grab/metadata.xml
55 deleted file mode 100644
56 index 17237689dcf..00000000000
57 --- a/media-video/qx11grab/metadata.xml
58 +++ /dev/null
59 @@ -1,8 +0,0 @@
60 -<?xml version="1.0" encoding="UTF-8"?>
61 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
62 -<pkgmetadata>
63 - <maintainer type="project">
64 - <email>qt@g.o</email>
65 - <name>Gentoo Qt Project</name>
66 - </maintainer>
67 -</pkgmetadata>
68
69 diff --git a/media-video/qx11grab/qx11grab-0.4.12.ebuild b/media-video/qx11grab/qx11grab-0.4.12.ebuild
70 deleted file mode 100644
71 index 236df54b6bc..00000000000
72 --- a/media-video/qx11grab/qx11grab-0.4.12.ebuild
73 +++ /dev/null
74 @@ -1,55 +0,0 @@
75 -# Copyright 1999-2017 Gentoo Foundation
76 -# Distributed under the terms of the GNU General Public License v2
77 -
78 -EAPI=5
79 -
80 -inherit cmake-utils
81 -
82 -DESCRIPTION="X11 desktop video grabber tray"
83 -HOMEPAGE="http://qx11grab.hjcms.de/"
84 -SRC_URI="http://qx11grab.hjcms.de/downloads/${PV}/${P}.tar.xz"
85 -
86 -LICENSE="GPL-3"
87 -SLOT="0"
88 -KEYWORDS="amd64 x86"
89 -IUSE="libav opengl pulseaudio"
90 -
91 -RDEPEND="
92 - dev-libs/qjson
93 - >=dev-qt/qtcore-4.7.4:4
94 - >=dev-qt/qtdbus-4.7.4:4
95 - >=dev-qt/qtgui-4.7.4:4[accessibility]
96 - >=media-libs/alsa-lib-1.0.26
97 - >=media-libs/fontconfig-2.4
98 - >=media-libs/freetype-2.4:2
99 - >=sys-apps/dbus-1.6.4
100 - >=x11-libs/libX11-1.3.4
101 - >=x11-libs/libXrandr-1.3
102 - libav? ( >=media-video/libav-9:0=[X,encode,truetype] )
103 - !libav? ( >=media-video/ffmpeg-1.1:0=[X,encode,truetype] )
104 - opengl? ( >=dev-qt/qtopengl-4.7.4:4 )
105 - pulseaudio? ( media-sound/pulseaudio )
106 -"
107 -DEPEND="${RDEPEND}
108 - virtual/pkgconfig
109 -"
110 -PDEPEND="virtual/freedesktop-icon-theme"
111 -
112 -PATCHES=( "${FILESDIR}/${P}-ffmpeg3.patch" )
113 -
114 -src_prepare() {
115 - cmake-utils_src_prepare
116 -
117 - # install docs into standard Gentoo location
118 - sed -i -e "/DESTINATION share/ s:\${CMAKE_PROJECT_NAME}:doc/${PF}:" \
119 - CMakeLists.txt || die
120 -}
121 -
122 -src_configure() {
123 - local mycmakeargs=(
124 - -DENABLE_KDE_SUPPORT=OFF
125 - $(cmake-utils_use_enable opengl)
126 - $(cmake-utils_use_enable pulseaudio PULSE)
127 - )
128 - cmake-utils_src_configure
129 -}
130
131 diff --git a/profiles/package.mask b/profiles/package.mask
132 index 7b439193555..b1486eb9346 100644
133 --- a/profiles/package.mask
134 +++ b/profiles/package.mask
135 @@ -221,11 +221,6 @@ media-sound/qpitch
136 # Has different symbols. Known to cause issues with i3bar/swaybar.
137 media-fonts/fontawesome:0/5
138
139 -# Michael Palimaka <kensington@g.o> (25 Jan 2018)
140 -# Requires dead Qt 4. Dead upstream.
141 -# Masked for removal in 30 days. Bug #644532.
142 -media-video/qx11grab
143 -
144 # Andreas Sturmlechner <asturm@g.o> (22 Jan 2018)
145 # Depends on deprecated Qt4, upstream is slowly doing a qml port.
146 # Masked for removal in 60 days. Revisit bug #645504 before deciding