Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: profiles/, media-gfx/videorbits/files/, media-gfx/videorbits/
Date: Tue, 30 Mar 2021 09:25:12
Message-Id: 1617096231.c24344b6d652a33ab0689a7d960b260cb20e807b.soap@gentoo
1 commit: c24344b6d652a33ab0689a7d960b260cb20e807b
2 Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr>
3 AuthorDate: Tue Mar 30 09:23:51 2021 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Tue Mar 30 09:23:51 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c24344b6
7
8 media-gfx/videorbits: Remove last-rited pkg
9
10 Closes: https://bugs.gentoo.org/772812
11 Closes: https://bugs.gentoo.org/731038
12 Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr>
13 Signed-off-by: David Seifert <soap <AT> gentoo.org>
14
15 media-gfx/videorbits/Manifest | 1 -
16 .../files/videorbits-2.201-libpng15.patch | 30 ------------------
17 .../files/videorbits-2.205-fix-buildsystem.patch | 19 -----------
18 ...videorbits-2.205-qa-implicit-declarations.patch | 23 --------------
19 .../files/videorbits-2.205-remove-bits-nan.patch | 35 --------------------
20 media-gfx/videorbits/metadata.xml | 8 -----
21 media-gfx/videorbits/videorbits-2.205.ebuild | 37 ----------------------
22 profiles/package.mask | 6 ----
23 8 files changed, 159 deletions(-)
24
25 diff --git a/media-gfx/videorbits/Manifest b/media-gfx/videorbits/Manifest
26 deleted file mode 100644
27 index 71e2e446426..00000000000
28 --- a/media-gfx/videorbits/Manifest
29 +++ /dev/null
30 @@ -1 +0,0 @@
31 -DIST videorbits-2.205.tgz 672377 BLAKE2B e111d48c3a7e8c3fc1bf878249a07c799879fa3c68e8555c539fd4089800fd7695f1758188295f65aa62fababfc6cc3c534abae384eb820f80bb1bbe0eb4b92d SHA512 faad5a7ab98167d67b7748b4b9aca1ced0e802ed85cba55ba9966d08c48045daa8fef8d387c576dcfa50ace8c4962bb0043bb83e3ba741844ede67d331e4fbf8
32
33 diff --git a/media-gfx/videorbits/files/videorbits-2.201-libpng15.patch b/media-gfx/videorbits/files/videorbits-2.201-libpng15.patch
34 deleted file mode 100644
35 index f87132b0be4..00000000000
36 --- a/media-gfx/videorbits/files/videorbits-2.201-libpng15.patch
37 +++ /dev/null
38 @@ -1,30 +0,0 @@
39 ---- videorbits-2.205/src/simple_png_read.c
40 -+++ videorbits-2.205/src/simple_png_read.c
41 -@@ -92,7 +92,7 @@
42 - return -1;
43 - }
44 -
45 -- if (setjmp(png_ptr->jmpbuf)) {
46 -+ if (setjmp(png_jmpbuf(png_ptr))) {
47 - fprintf(stderr, "simple_png_read: error (internal)\n");
48 - png_destroy_read_struct(&png_ptr, &info_ptr, &end_info);
49 - fclose(fp);
50 -@@ -226,7 +226,7 @@
51 - return -1;
52 - }
53 -
54 -- if (setjmp(png_ptr->jmpbuf)) {
55 -+ if (setjmp(png_jmpbuf(png_ptr))) {
56 - fprintf(stderr, "simple_png_read_header: error\n");
57 - png_destroy_read_struct(&png_ptr, &info_ptr, &end_info);
58 - fclose(fp);
59 ---- videorbits-2.205/src/simple_png_write.c
60 -+++ videorbits-2.205/src/simple_png_write.c
61 -@@ -18,6 +18,7 @@
62 - #include <stdio.h>
63 - #include <stdlib.h>
64 - #include <png.h>
65 -+#include <zlib.h>
66 -
67 - int simple_png_write_rgba(
68 - char *filename,
69
70 diff --git a/media-gfx/videorbits/files/videorbits-2.205-fix-buildsystem.patch b/media-gfx/videorbits/files/videorbits-2.205-fix-buildsystem.patch
71 deleted file mode 100644
72 index 8d2359232bc..00000000000
73 --- a/media-gfx/videorbits/files/videorbits-2.205-fix-buildsystem.patch
74 +++ /dev/null
75 @@ -1,19 +0,0 @@
76 -Fix installation paths.
77 -
78 ---- videorbits-2.205/images/Makefile.am
79 -+++ videorbits-2.205/images/Makefile.am
80 -@@ -1,4 +1,4 @@
81 --imagesdir = $(prefix)/images
82 --images_DATA= v04.pgm v06.pgm
83 -+images_dir = $(datadir)/videorbits/images
84 -+images__DATA= v04.pgm v06.pgm
85 -
86 -
87 ---- videorbits-2.205/lookuptables/Makefile.am
88 -+++ videorbits-2.205/lookuptables/Makefile.am
89 -@@ -1,3 +1,3 @@
90 --lookuptablesdir = $(prefix)/lookuptables
91 --lookuptables_DATA=powLookup22.txt powLookup47.txt Kodak_DCS260_response_function
92 -+lookuptables_dir = $(datadir)/videorbits/lookuptables
93 -+lookuptables__DATA=powLookup22.txt powLookup47.txt Kodak_DCS260_response_function
94 -
95
96 diff --git a/media-gfx/videorbits/files/videorbits-2.205-qa-implicit-declarations.patch b/media-gfx/videorbits/files/videorbits-2.205-qa-implicit-declarations.patch
97 deleted file mode 100644
98 index 1e46ccf5651..00000000000
99 --- a/media-gfx/videorbits/files/videorbits-2.205-qa-implicit-declarations.patch
100 +++ /dev/null
101 @@ -1,23 +0,0 @@
102 -Fix implicit declarations caused by missing headers and
103 -failures caused by -Werror=format-security checks
104 -
105 ---- videorbits-2.205/src/pchirp2nocrop.c
106 -+++ videorbits-2.205/src/pchirp2nocrop.c
107 -@@ -1,5 +1,6 @@
108 - #include <stdlib.h>
109 - #include <math.h>
110 -+#include <string.h>
111 - #include "PNMImageOffsetable.h"
112 - #include "mat_util.h"
113 - #include "boundingbox.h"
114 ---- videorbits-2.205/src/par.c
115 -+++ videorbits-2.205/src/par.c
116 -@@ -111,7 +111,7 @@
117 -
118 - /* - - Write file-type number - - */
119 - sprintf(magic_number, "P%d\n", data_type);
120 -- fprintf(file_ptr, magic_number);
121 -+ fprintf(file_ptr, "%s", magic_number);
122 -
123 - /* - - put comments - - */ /* !!!!!! break up long comments */
124 - fprintf(file_ptr, "# %s\n", comments);
125
126 diff --git a/media-gfx/videorbits/files/videorbits-2.205-remove-bits-nan.patch b/media-gfx/videorbits/files/videorbits-2.205-remove-bits-nan.patch
127 deleted file mode 100644
128 index 822b8dd8167..00000000000
129 --- a/media-gfx/videorbits/files/videorbits-2.205-remove-bits-nan.patch
130 +++ /dev/null
131 @@ -1,35 +0,0 @@
132 -From 27db38e20d2f1c685c9a4aa01cfbde96b0555d80 Mon Sep 17 00:00:00 2001
133 -From: Harri Nieminen <moikkis@×××××.com>
134 -Date: Tue, 27 Mar 2018 19:45:19 +0300
135 -Subject: [PATCH] Don't include bits/nan.h
136 -
137 ----
138 - src/cement.c | 1 -
139 - src/cementinit.c | 1 -
140 - 2 files changed, 2 deletions(-)
141 -
142 -diff --git a/src/cement.c b/src/cement.c
143 -index 3dfb6f9..23c424c 100644
144 ---- a/src/cement.c
145 -+++ b/src/cement.c
146 -@@ -1,7 +1,6 @@
147 - #include <stdlib.h>
148 - #include <stdio.h>
149 - #include <math.h>
150 --#include <bits/nan.h>
151 - #include <limits.h>
152 - #include <string.h>
153 - #include <errno.h>
154 -diff --git a/src/cementinit.c b/src/cementinit.c
155 -index 95850d9..afa160e 100644
156 ---- a/src/cementinit.c
157 -+++ b/src/cementinit.c
158 -@@ -1,5 +1,4 @@
159 - #include <math.h>
160 --#include <bits/nan.h>
161 - /* NB: supposedly nan.h is included from math.h when -std=c99 is on the
162 - * gcc compile line but that doesn't work so its included it directly.
163 - * Not having this line makes nan become unreliable, sometime it is
164 ---
165 -2.16.3
166 -
167
168 diff --git a/media-gfx/videorbits/metadata.xml b/media-gfx/videorbits/metadata.xml
169 deleted file mode 100644
170 index e416281791b..00000000000
171 --- a/media-gfx/videorbits/metadata.xml
172 +++ /dev/null
173 @@ -1,8 +0,0 @@
174 -<?xml version="1.0" encoding="UTF-8"?>
175 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
176 -<pkgmetadata>
177 - <!-- maintainer-needed -->
178 - <upstream>
179 - <remote-id type="sourceforge">comparametric</remote-id>
180 - </upstream>
181 -</pkgmetadata>
182
183 diff --git a/media-gfx/videorbits/videorbits-2.205.ebuild b/media-gfx/videorbits/videorbits-2.205.ebuild
184 deleted file mode 100644
185 index 6628294ba74..00000000000
186 --- a/media-gfx/videorbits/videorbits-2.205.ebuild
187 +++ /dev/null
188 @@ -1,37 +0,0 @@
189 -# Copyright 1999-2019 Gentoo Authors
190 -# Distributed under the terms of the GNU General Public License v2
191 -
192 -EAPI=6
193 -
194 -inherit autotools
195 -
196 -DESCRIPTION="a collection of programs for creating high dynamic range images"
197 -HOMEPAGE="http://comparametric.sourceforge.net/"
198 -SRC_URI="mirror://sourceforge/comparametric/${P}.tgz"
199 -
200 -LICENSE="GPL-2"
201 -SLOT="0"
202 -KEYWORDS="amd64 ppc x86"
203 -IUSE=""
204 -
205 -RDEPEND="x11-libs/libX11
206 - sys-libs/zlib
207 - media-libs/libpng:0=
208 - virtual/jpeg:0
209 - sci-libs/fftw:2.1
210 - media-libs/netpbm"
211 -DEPEND="${RDEPEND}"
212 -
213 -PATCHES=(
214 - "${FILESDIR}/${PN}-2.201-libpng15.patch"
215 - "${FILESDIR}/${P}-qa-implicit-declarations.patch"
216 - "${FILESDIR}/${P}-fix-buildsystem.patch"
217 - "${FILESDIR}/${P}-remove-bits-nan.patch"
218 -)
219 -DOCS=( AUTHORS README README.MORE )
220 -
221 -src_prepare() {
222 - default
223 - mv configure.{in,ac} || die
224 - eautoreconf
225 -}
226
227 diff --git a/profiles/package.mask b/profiles/package.mask
228 index 6a93394ed9f..2cc93e82abe 100644
229 --- a/profiles/package.mask
230 +++ b/profiles/package.mask
231 @@ -405,12 +405,6 @@ dev-scheme/greg
232 # packaged. Removal on 2021-03-27. Bug #683358, #696476, #741936.
233 sys-auth/authenticator
234
235 -# David Seifert <soap@g.o> (2021-02-25)
236 -# Last release in 2006, no other distro carries this anymore,
237 -# blocks sci-libs/fftw:2.1 removal, no revdeps.
238 -# Removal on 2021-03-27. Bug #731038, #772812.
239 -media-gfx/videorbits
240 -
241 # Sam James <sam@g.o> (2021-02-18)
242 # 0.9.27 included a regression wrt deletes
243 # bug #768948