1 |
commit: ea35d574fd21f9f8d1cfa681e6dc6a298bd7ffab |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Apr 9 14:08:33 2019 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Apr 9 14:10:44 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea35d574 |
7 |
|
8 |
media-sound/karlyriceditor: Remove last-rited pkg |
9 |
|
10 |
Closes: https://bugs.gentoo.org/673352 |
11 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
12 |
|
13 |
media-sound/karlyriceditor/Manifest | 1 - |
14 |
.../files/karlyriceditor-2.2-ffmpeg-4.patch | 34 ------------------ |
15 |
.../karlyriceditor/karlyriceditor-2.2-r1.ebuild | 41 ---------------------- |
16 |
media-sound/karlyriceditor/metadata.xml | 15 -------- |
17 |
profiles/package.mask | 5 --- |
18 |
5 files changed, 96 deletions(-) |
19 |
|
20 |
diff --git a/media-sound/karlyriceditor/Manifest b/media-sound/karlyriceditor/Manifest |
21 |
deleted file mode 100644 |
22 |
index f8ffc53a170..00000000000 |
23 |
--- a/media-sound/karlyriceditor/Manifest |
24 |
+++ /dev/null |
25 |
@@ -1 +0,0 @@ |
26 |
-DIST karlyriceditor-2.2.tar.gz 280119 BLAKE2B 1cfd3c681e7f8c52b0e67fdff96bf929ef86aa607615be832907b3d933628b8cfe2d94066acfe1739aa83c0dfc4884de7063180dc3e4acb54fb73eadfbbd2a66 SHA512 bce3aed1402c8fff3e04940527773d2855d3d67e47b159478c53e63eaadfbb70df3f4fbefb75490cc17b750455e1359963468ce14dd504f37219e1268a213103 |
27 |
|
28 |
diff --git a/media-sound/karlyriceditor/files/karlyriceditor-2.2-ffmpeg-4.patch b/media-sound/karlyriceditor/files/karlyriceditor-2.2-ffmpeg-4.patch |
29 |
deleted file mode 100644 |
30 |
index b7ae9d6e90b..00000000000 |
31 |
--- a/media-sound/karlyriceditor/files/karlyriceditor-2.2-ffmpeg-4.patch |
32 |
+++ /dev/null |
33 |
@@ -1,34 +0,0 @@ |
34 |
-Description: Fix FTBFS with FFmpeg 4.0 |
35 |
-Author: James Cowgill <jcowgill@××××××.org> |
36 |
-Bug-Debian: https://bugs.debian.org/888377 |
37 |
---- |
38 |
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ |
39 |
---- a/src/ffmpegvideoencoder.cpp |
40 |
-+++ b/src/ffmpegvideoencoder.cpp |
41 |
-@@ -345,7 +345,7 @@ av_log_set_level(AV_LOG_VERBOSE); |
42 |
- |
43 |
- // Enable interlacing if needed |
44 |
- if ( m_videoformat->flags & VIFO_INTERLACED ) |
45 |
-- videoCodecCtx->flags |= CODEC_FLAG_INTERLACED_DCT; |
46 |
-+ videoCodecCtx->flags |= AV_CODEC_FLAG_INTERLACED_DCT; |
47 |
- |
48 |
- // Enable multithreaded encoding: breaks FLV! |
49 |
- //videoCodecCtx->thread_count = 4; |
50 |
-@@ -373,7 +373,7 @@ av_log_set_level(AV_LOG_VERBOSE); |
51 |
- |
52 |
- // If we have a global header for the format, no need to duplicate the codec info in each keyframe |
53 |
- if ( outputFormatCtx->oformat->flags & AVFMT_GLOBALHEADER ) |
54 |
-- videoCodecCtx->flags |= CODEC_FLAG_GLOBAL_HEADER; |
55 |
-+ videoCodecCtx->flags |= AV_CODEC_FLAG_GLOBAL_HEADER; |
56 |
- |
57 |
- // Open the codec |
58 |
- if ( ( err = avcodec_open2( videoCodecCtx, videoCodec, 0 )) < 0 ) |
59 |
-@@ -463,7 +463,7 @@ av_log_set_level(AV_LOG_VERBOSE); |
60 |
- audioCodecCtx->time_base.den = m_profile->sampleRate; |
61 |
- |
62 |
- if ( outputFormatCtx->oformat->flags & AVFMT_GLOBALHEADER ) |
63 |
-- audioCodecCtx->flags |= CODEC_FLAG_GLOBAL_HEADER; |
64 |
-+ audioCodecCtx->flags |= AV_CODEC_FLAG_GLOBAL_HEADER; |
65 |
- |
66 |
- // Since different audio codecs support different sample formats, look up which one is supported by this specific codec |
67 |
- if ( isAudioSampleFormatSupported( audioCodec->sample_fmts, AV_SAMPLE_FMT_FLTP ) ) |
68 |
|
69 |
diff --git a/media-sound/karlyriceditor/karlyriceditor-2.2-r1.ebuild b/media-sound/karlyriceditor/karlyriceditor-2.2-r1.ebuild |
70 |
deleted file mode 100644 |
71 |
index a0b4b5ff69a..00000000000 |
72 |
--- a/media-sound/karlyriceditor/karlyriceditor-2.2-r1.ebuild |
73 |
+++ /dev/null |
74 |
@@ -1,41 +0,0 @@ |
75 |
-# Copyright 1999-2018 Gentoo Foundation |
76 |
-# Distributed under the terms of the GNU General Public License v2 |
77 |
- |
78 |
-EAPI=6 |
79 |
- |
80 |
-inherit desktop qmake-utils |
81 |
- |
82 |
-DESCRIPTION="Application to edit and synchronize lyrics with karaoke songs in various formats" |
83 |
-HOMEPAGE="https://www.ulduzsoft.com/linux/karaoke-lyrics-editor/" |
84 |
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" |
85 |
- |
86 |
-LICENSE="GPL-3+" |
87 |
-SLOT="0" |
88 |
-KEYWORDS="~amd64 ~x86" |
89 |
-IUSE="libav" |
90 |
- |
91 |
-RDEPEND=" |
92 |
- dev-libs/openssl:0= |
93 |
- dev-qt/qtcore:5 |
94 |
- dev-qt/qtgui:5 |
95 |
- dev-qt/qtmultimedia:5 |
96 |
- dev-qt/qtwidgets:5 |
97 |
- libav? ( media-video/libav:= ) |
98 |
- !libav? ( media-video/ffmpeg:0= ) |
99 |
-" |
100 |
-DEPEND="${RDEPEND} |
101 |
- virtual/pkgconfig |
102 |
-" |
103 |
- |
104 |
-PATCHES=( "${FILESDIR}/${P}-ffmpeg-4.patch" ) |
105 |
- |
106 |
-src_configure() { |
107 |
- eqmake5 "${PN}.pro" |
108 |
-} |
109 |
- |
110 |
-src_install() { |
111 |
- dodoc Changelog |
112 |
- dobin bin/${PN} |
113 |
- doicon packages/${PN}.png |
114 |
- make_desktop_entry ${PN} 'Karaoke Lyrics Editor' |
115 |
-} |
116 |
|
117 |
diff --git a/media-sound/karlyriceditor/metadata.xml b/media-sound/karlyriceditor/metadata.xml |
118 |
deleted file mode 100644 |
119 |
index 12706d20e54..00000000000 |
120 |
--- a/media-sound/karlyriceditor/metadata.xml |
121 |
+++ /dev/null |
122 |
@@ -1,15 +0,0 @@ |
123 |
-<?xml version="1.0" encoding="UTF-8"?> |
124 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
125 |
-<pkgmetadata> |
126 |
- <maintainer type="project"> |
127 |
- <email>sound@g.o</email> |
128 |
- <name>Gentoo Sound project</name> |
129 |
- </maintainer> |
130 |
- <maintainer type="project"> |
131 |
- <email>qt@g.o</email> |
132 |
- <name>Gentoo Qt Project</name> |
133 |
- </maintainer> |
134 |
- <upstream> |
135 |
- <remote-id type="sourceforge">karlyriceditor</remote-id> |
136 |
- </upstream> |
137 |
-</pkgmetadata> |
138 |
|
139 |
diff --git a/profiles/package.mask b/profiles/package.mask |
140 |
index 274ce3c1b7c..e38fc24709f 100644 |
141 |
--- a/profiles/package.mask |
142 |
+++ b/profiles/package.mask |
143 |
@@ -674,11 +674,6 @@ dev-python/pytest-capturelog |
144 |
# Removal in 30 days. Bug #679030. |
145 |
app-arch/star |
146 |
|
147 |
-# Michael Palimaka <kensington@g.o> (07 Mar 2019) |
148 |
-# Fails to build with ffmpeg-4 (bug #673352). Dead upstream. |
149 |
-# Masked for removal in 30 days. |
150 |
-media-sound/karlyriceditor |
151 |
- |
152 |
# Eray Aslan <eras@g.o> (01 Mar 2019) |
153 |
# Mask experimental software |
154 |
=mail-mta/postfix-3.5* |