Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: profiles/arch/ia64/, profiles/arch/amd64-fbsd/, profiles/, profiles/arch/arm/, ...
Date: Sat, 28 Jul 2018 12:08:34
Message-Id: 1532779698.50a4c86ddd462ac5c556423b54a9039b8e55d7f4.mgorny@gentoo
1 commit: 50a4c86ddd462ac5c556423b54a9039b8e55d7f4
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Sat Jul 28 12:07:22 2018 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sat Jul 28 12:08:18 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50a4c86d
7
8 dev-libs/DirectFB: Remove last-rited pkg
9
10 Closes: https://bugs.gentoo.org/606194
11
12 dev-libs/DirectFB/DirectFB-1.7.6-r1.ebuild | 201 ---------------------
13 dev-libs/DirectFB/Manifest | 1 -
14 ...x-compiler-error-when-building-for-thumb2.patch | 50 -----
15 .../DirectFB/files/DirectFB-1.6.3-pkgconfig.patch | 22 ---
16 .../DirectFB/files/DirectFB-1.6.3-setregion.patch | 85 ---------
17 dev-libs/DirectFB/files/DirectFB-1.7.1-build.patch | 27 ---
18 dev-libs/DirectFB/files/DirectFB-1.7.5-flags.patch | 63 -------
19 .../DirectFB/files/DirectFB-1.7.6-cle266.patch | 13 --
20 .../DirectFB/files/DirectFB-1.7.6-idivine.patch | 57 ------
21 dev-libs/DirectFB/files/DirectFB-1.7.6-tslib.patch | 33 ----
22 dev-libs/DirectFB/metadata.xml | 44 -----
23 profiles/arch/amd64-fbsd/use.mask | 4 -
24 profiles/arch/arm/package.use.mask | 4 -
25 profiles/arch/arm64/package.use.mask | 4 -
26 profiles/arch/arm64/use.mask | 4 -
27 profiles/arch/ia64/package.use.mask | 4 -
28 profiles/package.mask | 4 -
29 17 files changed, 620 deletions(-)
30
31 diff --git a/dev-libs/DirectFB/DirectFB-1.7.6-r1.ebuild b/dev-libs/DirectFB/DirectFB-1.7.6-r1.ebuild
32 deleted file mode 100644
33 index 8c921ad2850..00000000000
34 --- a/dev-libs/DirectFB/DirectFB-1.7.6-r1.ebuild
35 +++ /dev/null
36 @@ -1,201 +0,0 @@
37 -# Copyright 1999-2018 Gentoo Foundation
38 -# Distributed under the terms of the GNU General Public License v2
39 -
40 -EAPI=5
41 -inherit autotools eutils toolchain-funcs
42 -
43 -# Map Gentoo IUSE expand vars to DirectFB drivers
44 -# echo `sed -n '/Possible gfxdrivers are:/,/^$/{/Possible/d;s:\[ *::;s:\].*::;s:,::g;p}' configure.in`
45 -I_TO_D_intel="i810,i830"
46 -I_TO_D_mga="matrox"
47 -I_TO_D_r128="ati128"
48 -I_TO_D_via="cle266"
49 -# cyber5k davinci ep9x omap pxa3xx sh772x savage pvr2d
50 -IUSE_VIDEO_CARDS=" intel mga nvidia r128 radeon tdfx via vmware"
51 -IUV=${IUSE_VIDEO_CARDS// / video_cards_}
52 -# echo `sed -n '/Possible inputdrivers are:/,/^$/{/\(Possible\|^input\)/d;s:\[ *::;s:\].*::;s:,::g;p}' configure.in`
53 -I_TO_D_elo2300="elo-input"
54 -I_TO_D_evdev="linuxinput"
55 -I_TO_D_mouse="ps2mouse,serialmouse"
56 -# dbox2remote dreamboxremote gunze h3600_ts penmount sonypijogdial ucb1x00 wm97xx zytronic
57 -IUSE_INPUT_DEVICES=" dynapro elo2300 evdev joystick keyboard lirc mouse tslib"
58 -IUD=${IUSE_INPUT_DEVICES// / input_devices_}
59 -
60 -DESCRIPTION="Thin library on top of the Linux framebuffer devices"
61 -HOMEPAGE="http://www.directfb.net/"
62 -SRC_URI="http://directfb.net/downloads/Core/${PN}-${PV:0:3}/${P}.tar.gz
63 - http://directfb.net/downloads/Old/${P}.tar.gz"
64 -
65 -LICENSE="LGPL-2.1"
66 -SLOT="0"
67 -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 -mips ppc ppc64 sh -sparc x86"
68 -IUSE="alsa bmp cddb debug divine drmkms +dynload doc egl fbcon fusiondale fusionsound gif gles2 gstreamer imlib2 input_hub jpeg jpeg2k mad cpu_flags_x86_mmx mng mpeg2 mpeg3 multicore opengl oss png pnm sawman sdl cpu_flags_x86_sse static-libs swfdec tiff timidity tremor truetype v4l vdpau vorbis webp X xine zlib ${IUV} ${IUD}"
69 -REQUIRED_USE="gles2? ( opengl )"
70 -
71 -# ffmpeg useflag broken
72 -# ffmpeg? ( virtual/ffmpeg )
73 -# $(use_enable ffmpeg) \
74 -RDEPEND="
75 - alsa? ( media-libs/alsa-lib )
76 - cddb? ( media-libs/libcddb )
77 - drmkms? ( x11-libs/libdrm[libkms] )
78 - gif? ( media-libs/giflib )
79 - gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 )
80 - imlib2? ( media-libs/imlib2 )
81 - jpeg? ( virtual/jpeg:0= )
82 - jpeg2k? ( media-libs/jasper:=[jpeg] )
83 - mad? ( media-libs/libmad )
84 - mng? ( media-libs/libmng )
85 - mpeg3? ( media-libs/libmpeg3 )
86 - opengl? ( media-libs/mesa[gbm,egl?,gles2?] x11-libs/libdrm )
87 - png? ( media-libs/libpng:0= )
88 - sdl? ( media-libs/libsdl )
89 - tiff? ( media-libs/tiff:0 )
90 - timidity? (
91 - media-libs/libtimidity
92 - media-sound/timidity++
93 - )
94 - tremor? ( media-libs/tremor )
95 - truetype? ( >=media-libs/freetype-2.0.1 )
96 - vdpau? ( x11-libs/libX11 x11-libs/libXext x11-libs/libvdpau )
97 - vorbis? ( media-libs/libvorbis )
98 - webp? ( media-libs/libwebp )
99 - X? ( x11-libs/libXext x11-libs/libX11 )
100 - xine? ( media-libs/xine-lib[vdpau?] )
101 - zlib? ( sys-libs/zlib ) "
102 -DEPEND="${RDEPEND}"
103 -
104 -src_prepare() {
105 - epatch \
106 - "${FILESDIR}"/${PN}-1.7.5-flags.patch \
107 - "${FILESDIR}"/${PN}-1.6.3-pkgconfig.patch \
108 - "${FILESDIR}"/${PN}-1.7.1-build.patch \
109 - "${FILESDIR}"/${PN}-1.6.3-setregion.patch \
110 - "${FILESDIR}"/${PN}-1.6.3-atomic-fix-compiler-error-when-building-for-thumb2.patch \
111 - "${FILESDIR}"/${PN}-1.7.6-cle266.patch \
112 - "${FILESDIR}"/${PN}-1.7.6-idivine.patch \
113 - "${FILESDIR}"/${PN}-1.7.6-tslib.patch
114 - sed -i \
115 - -e '/#define RASPBERRY_PI/d' \
116 - systems/egl/egl_system.c || die #497124
117 - sed -i \
118 - -e '/^CXXFLAGS=.*-Werror-implicit-function-declaration/d' \
119 - configure.in || die #526196
120 -
121 - mv configure.{in,ac} || die
122 - eautoreconf
123 -}
124 -
125 -driver_list() {
126 - local pfx=$1
127 - local dev devs map
128 - shift
129 - for dev in "$@" ; do
130 - use ${pfx}_${dev} || continue
131 - map="I_TO_D_${dev}"
132 - devs=${devs:+${devs},}${!map:-${dev}}
133 - done
134 - echo ${devs:-none}
135 -}
136 -
137 -src_configure() {
138 - local myaudio="wave"
139 - use alsa && myaudio+=",alsa"
140 - use oss && myaudio+=",oss"
141 -
142 - local sdlconf="--disable-sdl"
143 - if use sdl ; then
144 - # since SDL can link against DirectFB and trigger a
145 - # dependency loop, only link against SDL if it isn't
146 - # broken #61592
147 - echo 'int main(){}' > sdl-test.c
148 - $(tc-getCC) sdl-test.c -lSDL 2>/dev/null \
149 - && sdlconf="--enable-sdl" \
150 - || ewarn "Disabling SDL since libSDL.so is broken"
151 - fi
152 -
153 - # fix --with-gfxdrivers= logic, because opengl, vdpau and gles2 are no video_cards
154 - local gfxdrivers="$(driver_list video_cards ${IUSE_VIDEO_CARDS})"
155 - use opengl && gfxdrivers="${gfxdrivers},gl"
156 - use vdpau && gfxdrivers="${gfxdrivers},vdpau"
157 - use gles2 && gfxdrivers="${gfxdrivers},gles2"
158 - gfxdrivers="$(echo ${gfxdrivers} | sed 's/none,//')"
159 -
160 - # fix --with-inputdrivers= logic, don't know where to put "input_hub"
161 - local inputdrivers="$(driver_list input_devices ${IUSE_INPUT_DEVICES})"
162 - use input_hub && inputdrivers="${inputdrivers},input_hub"
163 - inputdrivers="$(echo ${inputdrivers} | sed 's/none,//')"
164 -
165 - # The xine-vdpau flag requires a custom patch to xine-lib which we don't carry:
166 - # http://git.directfb.org/?p=extras/DirectFB-extra.git;a=blob;f=interfaces/IDirectFBVideoProvider/xine-lib-1.2-vdpau-hooks.patch;hb=HEAD
167 - econf \
168 - $(use_enable static-libs static) \
169 - $(use_enable X x11) \
170 - $(use_enable divine) \
171 - $(use_enable sawman) \
172 - $(use_enable fusiondale) \
173 - $(use_enable fusionsound) \
174 - $(use_enable fbcon fbdev) \
175 - $(use_enable cpu_flags_x86_mmx mmx) \
176 - $(use_enable cpu_flags_x86_sse sse) \
177 - $(use_enable egl) \
178 - $(use_enable egl idirectfbgl-egl) \
179 - $(use_enable jpeg) \
180 - $(use_enable png) \
181 - $(use_enable mng) \
182 - $(use_enable gstreamer) \
183 - $(use_enable gif) \
184 - $(use_enable tiff) \
185 - $(use_enable imlib2) \
186 - $(use_enable pnm) \
187 - --disable-svg \
188 - $(use_enable mpeg2) \
189 - $(use_enable mpeg3 libmpeg3) \
190 - --disable-flash \
191 - $(use_enable xine) \
192 - --disable-xine-vdpau \
193 - --disable-ffmpeg \
194 - $(use_enable bmp) \
195 - $(use_enable jpeg2k jpeg2000) \
196 - --disable-openquicktime \
197 - --disable-avifile \
198 - $(use_enable truetype freetype) \
199 - $(use_enable webp) \
200 - $(use_enable debug) \
201 - $(use_enable zlib) \
202 - --disable-video4linux \
203 - $(use_enable v4l video4linux2) \
204 - $(use_enable vdpau x11vdpau) \
205 - $(use_enable multicore) \
206 - $(use_enable dynload) \
207 - $(use_enable opengl mesa) \
208 - $(use_enable drmkms) \
209 - --with-fs-drivers="${myaudio}" \
210 - $(use_with timidity) \
211 - --with-wave \
212 - $(use_with vorbis) \
213 - $(use_with tremor) \
214 - $(use_with mad) \
215 - $(use_with cddb cdda) \
216 - --with-playlist \
217 - ${sdlconf} \
218 - --with-gfxdrivers="${gfxdrivers}" \
219 - --with-inputdrivers="${inputdrivers}" \
220 - --disable-vnc
221 -}
222 -
223 -src_install() {
224 - default
225 - dodoc fb.modes
226 - use doc && dohtml -r docs/html/*
227 -}
228 -
229 -pkg_postinst() {
230 - ewarn "Each DirectFB update breaks DirectFB related applications."
231 - ewarn "Please run \"revdep-rebuild\" which can be"
232 - ewarn "found by emerging the package 'gentoolkit'."
233 - ewarn
234 - ewarn "If you have an ALPS touchpad, then you might get your mouse"
235 - ewarn "unexpectedly set in absolute mode in all DirectFB applications."
236 - ewarn "This can be fixed by removing linuxinput from INPUT_DEVICES."
237 -}
238
239 diff --git a/dev-libs/DirectFB/Manifest b/dev-libs/DirectFB/Manifest
240 deleted file mode 100644
241 index b16caa3db92..00000000000
242 --- a/dev-libs/DirectFB/Manifest
243 +++ /dev/null
244 @@ -1 +0,0 @@
245 -DIST DirectFB-1.7.6.tar.gz 5975444 BLAKE2B c28f95ed73b79766c377a5440517dc83fb5c11264c7d3b6c1ebebee0dd44bec21afc778032aa03af111ea2839dfbbbd26d33f86f46b61eff3e0036377d97dbbc SHA512 18cf1aad6c277a6de147a9b0aff1cd7408ddd7c7159ef21dab9a548db7399c681603624e7820b186a29e03edaa7737350a61e2abaec572887e9cc56658bf85a2
246
247 diff --git a/dev-libs/DirectFB/files/DirectFB-1.6.3-atomic-fix-compiler-error-when-building-for-thumb2.patch b/dev-libs/DirectFB/files/DirectFB-1.6.3-atomic-fix-compiler-error-when-building-for-thumb2.patch
248 deleted file mode 100644
249 index 06f56fed39d..00000000000
250 --- a/dev-libs/DirectFB/files/DirectFB-1.6.3-atomic-fix-compiler-error-when-building-for-thumb2.patch
251 +++ /dev/null
252 @@ -1,50 +0,0 @@
253 -From 253e1d0d10bdece158f8f68dc48c19ab57d2da29 Mon Sep 17 00:00:00 2001
254 -From: Mandeep Singh Baines <msb@××××××××.org>
255 -Date: Mon, 18 Mar 2013 19:03:36 -0700
256 -Subject: [PATCH] atomic: fix compiler error when building for thumb2
257 -
258 -Fixed the following error:
259 -
260 -{standard input}: Assembler messages:
261 -{standard input}:179: Error: thumb conditional instruction should be in IT block
262 --- `strexeq r4,r1,[r2]'
263 -{standard input}:283: Error: thumb conditional instruction should be in IT block
264 --- `strexeq r1,r4,[r2]'
265 -{standard input}:379: Error: thumb conditional instruction should be in IT block
266 --- `strexeq r1,r2,[r0]'
267 -make[4]: *** [fifo.lo] Error 1
268 -
269 -Fix was to add the appropriate it block.
270 -
271 -While I was at it, I optimized the code a bit by:
272 -
273 -1) Moved the mov instruction above the ldrex to minimize the number
274 -of instructions between the ldex and strex as recommeded here:
275 -http://infocenter.arm.com/help/index.jsp?topic=/com.arm.doc.dui0552a/BABFFBJB.html
276 -2) Saved 4 bytes by replacing mov with movs and teq with cmp.
277 -
278 -Signed-off-by: Mandeep Singh Baines <msb@××××××××.org>
279 ----
280 - lib/direct/atomic.h | 5 +++--
281 - 1 file changed, 3 insertions(+), 2 deletions(-)
282 -
283 -diff --git a/lib/direct/atomic.h b/lib/direct/atomic.h
284 -index 94cb0c9..8dc0dfb 100644
285 ---- a/lib/direct/atomic.h
286 -+++ b/lib/direct/atomic.h
287 -@@ -191,9 +191,10 @@ static inline int _D__atomic_cmpxchg(volatile int *ptr, int old, int _new)
288 -
289 - do {
290 - __asm__ __volatile__("@ atomic_cmpxchg\n"
291 -+ "movs %0, #0\n"
292 - "ldrex %1, [%2]\n"
293 -- "mov %0, #0\n"
294 -- "teq %1, %3\n"
295 -+ "cmp %1, %3\n"
296 -+ "it eq\n"
297 - "strexeq %0, %4, [%2]\n"
298 - : "=&r" (res), "=&r" (oldval)
299 - : "r" (ptr), "Ir" (old), "r" (_new)
300 ---
301 -1.7.12.4
302 -
303
304 diff --git a/dev-libs/DirectFB/files/DirectFB-1.6.3-pkgconfig.patch b/dev-libs/DirectFB/files/DirectFB-1.6.3-pkgconfig.patch
305 deleted file mode 100644
306 index 2c71bc96f9e..00000000000
307 --- a/dev-libs/DirectFB/files/DirectFB-1.6.3-pkgconfig.patch
308 +++ /dev/null
309 @@ -1,22 +0,0 @@
310 -http://bugs.gentoo.org/200661
311 -
312 ---- DirectFB/directfb-config.in
313 -+++ DirectFB/directfb-config.in
314 -@@ -300,7 +300,7 @@
315 - libs="$libs -ldirectfb -lfusion -ldirect @THREADLIB@"
316 -
317 - if test -n "$echo_static"; then
318 -- libs="$libs @DYNLIB@ @ZLIB_LIBS@"
319 -+ libs="$libs @DYNLIB@ @ZLIB_LIBS@ @SYSFS_LIBS@"
320 - fi
321 - fi
322 -
323 ---- DirectFB/directfb.pc.in
324 -+++ DirectFB/directfb.pc.in
325 -@@ -9,5 +9,5 @@
326 - Version: @VERSION@
327 - Requires: @DEP_VOODOO@ fusion direct
328 - Libs: -L${libdir} -ldirectfb @THREADLIB@ @OSX_LIBS@
329 --Libs.private: -L${libdir} @LIBM@ @DYNLIB@ @ZLIB_LIBS@
330 -+Libs.private: -L${libdir} @LIBM@ @DYNLIB@ @ZLIB_LIBS@ @SYSFS_LIBS@
331 - Cflags: @THREADFLAGS@ -I@INCLUDEDIR@
332
333 diff --git a/dev-libs/DirectFB/files/DirectFB-1.6.3-setregion.patch b/dev-libs/DirectFB/files/DirectFB-1.6.3-setregion.patch
334 deleted file mode 100644
335 index 8d25a51920d..00000000000
336 --- a/dev-libs/DirectFB/files/DirectFB-1.6.3-setregion.patch
337 +++ /dev/null
338 @@ -1,85 +0,0 @@
339 -https://build.opensuse.org/package/view_file?expand=1&file=DirectFB-setregion.patch&package=DirectFB&project=openSUSE%3AFactory
340 -
341 ---- gfxdrivers/cyber5k/cyber5k.c
342 -+++ gfxdrivers/cyber5k/cyber5k.c
343 -@@ -636,7 +636,8 @@ osdSetRegion( CoreLayer
344 - CoreLayerRegionConfigFlags updated,
345 - CoreSurface *surface,
346 - CorePalette *palette,
347 -- CoreSurfaceBufferLock *lock )
348 -+ CoreSurfaceBufferLock *left_lock,
349 -+ CoreSurfaceBufferLock *right_lock )
350 - {
351 - DFBResult ret;
352 -
353 -@@ -644,7 +645,7 @@ osdSetRegion( CoreLayer
354 - ret = oldPrimaryFuncs.SetRegion( layer, oldPrimaryDriverData,
355 - layer_data, region_data,
356 - config, updated, surface,
357 -- palette, lock );
358 -+ palette, left_lock, right_lock );
359 - if (ret)
360 - return ret;
361 -
362 ---- gfxdrivers/radeon/radeon_crtc1.c
363 -+++ gfxdrivers/radeon/radeon_crtc1.c
364 -@@ -147,14 +147,15 @@ crtc1SetRegion( CoreLayer
365 - CoreLayerRegionConfigFlags updated,
366 - CoreSurface *surface,
367 - CorePalette *palette,
368 -- CoreSurfaceBufferLock *lock )
369 -+ CoreSurfaceBufferLock *left_lock,
370 -+ CoreSurfaceBufferLock *right_lock )
371 - {
372 -
373 - if (updated & ~CLRCF_OPTIONS) {
374 - return OldPrimaryLayerFuncs.SetRegion( layer,
375 - OldPrimaryLayerDriverData,
376 - layer_data, region_data,
377 -- config, updated, surface, palette, lock );
378 -+ config, updated, surface, palette, left_lock, right_lock );
379 - }
380 -
381 - return DFB_OK;
382 ---- gfxdrivers/cle266/uc_primary.c
383 -+++ gfxdrivers/cle266/uc_primary.c
384 -@@ -138,7 +138,8 @@ osdSetRegion( CoreLayer
385 - CoreLayerRegionConfigFlags updated,
386 - CoreSurface *surface,
387 - CorePalette *palette,
388 -- CoreSurfaceBufferLock *lock )
389 -+ CoreSurfaceBufferLock *left_lock,
390 -+ CoreSurfaceBufferLock *right_lock )
391 - {
392 - DFBResult ret;
393 - UcDriverData *ucdrv = (UcDriverData*) driver_data;
394 -@@ -147,7 +148,7 @@ osdSetRegion( CoreLayer
395 - ret = ucOldPrimaryFuncs.SetRegion( layer, ucOldPrimaryDriverData,
396 - layer_data, region_data,
397 - config, updated, surface,
398 -- palette, lock );
399 -+ palette, left_lock, right_lock );
400 - if (ret)
401 - return ret;
402 -
403 ---- gfxdrivers/unichrome/uc_primary.c
404 -+++ gfxdrivers/unichrome/uc_primary.c
405 -@@ -135,7 +135,8 @@ osdSetRegion( CoreLayer
406 - CoreLayerRegionConfigFlags updated,
407 - CoreSurface *surface,
408 - CorePalette *palette,
409 -- CoreSurfaceBufferLock *lock )
410 -+ CoreSurfaceBufferLock *left_lock,
411 -+ CoreSurfaceBufferLock *right_lock )
412 - {
413 - DFBResult ret;
414 - UcDriverData *ucdrv = (UcDriverData*) driver_data;
415 -@@ -144,7 +145,7 @@ osdSetRegion( CoreLayer
416 - ret = ucOldPrimaryFuncs.SetRegion( layer, ucOldPrimaryDriverData,
417 - layer_data, region_data,
418 - config, updated, surface,
419 -- palette, lock );
420 -+ palette, left_lock, right_lock );
421 - if (ret)
422 - return ret;
423 -
424
425 diff --git a/dev-libs/DirectFB/files/DirectFB-1.7.1-build.patch b/dev-libs/DirectFB/files/DirectFB-1.7.1-build.patch
426 deleted file mode 100644
427 index 28c92eb79b0..00000000000
428 --- a/dev-libs/DirectFB/files/DirectFB-1.7.1-build.patch
429 +++ /dev/null
430 @@ -1,27 +0,0 @@
431 -Author: hasufell <hasufell@g.o>
432 -Date: Sat Dec 28 23:52:03 2013 +0100
433 -
434 - * INCLUDES is deprecated, use AM_CPPFLAGS instead
435 - * add missing SVG_CFLAGS
436 -
437 ---- a/interfaces/IDirectFBImageProvider/Makefile.am
438 -+++ b/interfaces/IDirectFBImageProvider/Makefile.am
439 -@@ -77,15 +77,14 @@ else
440 - FFMPEG_PROVIDER_LTLIB =
441 - endif
442 -
443 --INCLUDES = \
444 -+AM_CPPFLAGS = \
445 - -I$(top_builddir)/include \
446 - -I$(top_builddir)/lib \
447 - -I$(top_builddir)/src \
448 - -I$(top_srcdir)/include \
449 - -I$(top_srcdir)/lib \
450 -- -I$(top_srcdir)/src
451 --
452 --AM_CPPFLAGS = -DDATADIR=\"${RUNTIME_SYSROOT}@DATADIR@\" $(LIBJPEG_CFLAGS) $(LIBPNG_CFLAGS) $(FFMPEG_CFLAGS)
453 -+ -I$(top_srcdir)/src \
454 -+ -DDATADIR=\"${RUNTIME_SYSROOT}@DATADIR@\" $(LIBJPEG_CFLAGS) $(LIBPNG_CFLAGS) $(FFMPEG_CFLAGS) $(SVG_CFLAGS)
455 -
456 - idirectfbimageprovider_LTLIBRARIES = \
457 - libidirectfbimageprovider_dfiff.la \
458
459 diff --git a/dev-libs/DirectFB/files/DirectFB-1.7.5-flags.patch b/dev-libs/DirectFB/files/DirectFB-1.7.5-flags.patch
460 deleted file mode 100644
461 index 485cd1934fc..00000000000
462 --- a/dev-libs/DirectFB/files/DirectFB-1.7.5-flags.patch
463 +++ /dev/null
464 @@ -1,63 +0,0 @@
465 -Author: hasufell <hasufell@g.o>
466 -Date: Sat Dec 28 23:48:53 2013 +0100
467 -
468 - * respect system flags
469 - * remove Werror, it breaks the build
470 -
471 ---- a/configure.in
472 -+++ b/configure.in
473 -@@ -194,12 +194,7 @@ AM_CONDITIONAL(X11VDPAU_CORE, test "$enable_x11vdpau" = "yes")
474 - AC_CHECK_HEADERS(linux/compiler.h linux/unistd.h asm/page.h signal.h)
475 -
476 -
477 --dnl Clear default CFLAGS
478 --if test x"$CFLAGS" = x"-g -O2"; then
479 -- CFLAGS=
480 --fi
481 --
482 --CFLAGS="-ffast-math -pipe $CFLAGS"
483 -+CFLAGS="-ffast-math $CFLAGS"
484 -
485 - DFB_INTERNAL_CFLAGS="-D_GNU_SOURCE $DFB_INTERNAL_CFLAGS"
486 -
487 -@@ -467,7 +462,7 @@ AC_ARG_ENABLE(debug,
488 - [enable debugging @<:@default=no@:>@]),
489 - [], [enable_debug=no])
490 - if test "$enable_debug" = "yes"; then
491 -- CFLAGS="-g3 -O0 -fno-inline -Wno-inline $CFLAGS"
492 -+ CFLAGS="-fno-inline -Wno-inline $CFLAGS"
493 - DIRECT_BUILD_DEBUG=1
494 - else
495 - DIRECT_BUILD_DEBUG=0
496 -@@ -483,13 +478,8 @@ AC_ARG_ENABLE(debug-support,
497 - [], [enable_debug_support=yes])
498 - if test "$enable_debug_support" = "yes" || test "$enable_debug" = "yes"; then
499 - enable_debug_support=yes
500 -- if test "$enable_debug" = "no"; then
501 -- CFLAGS="-g2 $CFLAGS"
502 -- fi
503 -- CFLAGS="-O3 $CFLAGS"
504 - DIRECT_BUILD_DEBUGS=1
505 - else
506 -- CFLAGS="-O3 -g0 $CFLAGS"
507 - DIRECT_BUILD_DEBUGS=0
508 - fi
509 - AM_CONDITIONAL(ENABLE_DEBUGS, test "$enable_debug_support" = "yes")
510 -@@ -2750,8 +2750,6 @@
511 -
512 - AS_AC_EXPAND(SYSCONFDIR, $sysconfdir)
513 -
514 --CFLAGS="$CFLAGS -Werror-implicit-function-declaration"
515 --
516 - AC_ARG_ENABLE(extra-warnings,
517 - AC_HELP_STRING([--enable-extra-warnings],
518 - [enable extra warnings @<:@default=no@:>@]),
519 -@@ -2761,7 +2759,7 @@
520 - fi
521 -
522 - if test "$GCC" = "yes"; then
523 -- CFLAGS="-Wall -Wstrict-prototypes -Wmissing-prototypes -Wno-strict-aliasing -Werror-implicit-function-declaration $CFLAGS"
524 -+ CFLAGS="-Wall -Wstrict-prototypes -Wmissing-prototypes -Wno-strict-aliasing $CFLAGS"
525 - CXXFLAGS="-Wall -Wno-strict-aliasing -std=$CXXSTD $CXXFLAGS"
526 - fi
527 -
528
529 diff --git a/dev-libs/DirectFB/files/DirectFB-1.7.6-cle266.patch b/dev-libs/DirectFB/files/DirectFB-1.7.6-cle266.patch
530 deleted file mode 100644
531 index ff72f5339db..00000000000
532 --- a/dev-libs/DirectFB/files/DirectFB-1.7.6-cle266.patch
533 +++ /dev/null
534 @@ -1,13 +0,0 @@
535 -https://bugs.gentoo.org/527986
536 -
537 ---- a/gfxdrivers/cle266/uc_overlay.c 2015-02-10 15:26:24.931309401 -0800
538 -+++ b/gfxdrivers/cle266/uc_overlay.c 2015-02-10 15:26:47.229309401 -0800
539 -@@ -246,7 +246,7 @@
540 - dfb_surface_flip(surface, false);
541 -
542 - ucovl->field = 0;
543 -- ucovl->lock = lock;
544 -+ ucovl->lock = left_lock;
545 -
546 - ret = uc_ovl_update(ucdrv, ucovl, UC_OVL_FLIP, surface, left_lock);
547 - if (ret)
548
549 diff --git a/dev-libs/DirectFB/files/DirectFB-1.7.6-idivine.patch b/dev-libs/DirectFB/files/DirectFB-1.7.6-idivine.patch
550 deleted file mode 100644
551 index 561db23aeed..00000000000
552 --- a/dev-libs/DirectFB/files/DirectFB-1.7.6-idivine.patch
553 +++ /dev/null
554 @@ -1,57 +0,0 @@
555 ---- lib/divine/idivine.h.orig
556 -+++ lib/divine/idivine.h
557 -@@ -0,0 +1,54 @@
558 -+/*
559 -+ (c) Copyright 2012-2013 DirectFB integrated media GmbH
560 -+ (c) Copyright 2001-2013 The world wide DirectFB Open Source Community (directfb.org)
561 -+ (c) Copyright 2000-2004 Convergence (integrated media) GmbH
562 -+
563 -+ All rights reserved.
564 -+
565 -+ Written by Denis Oliver Kropp <dok@××××××××.org>,
566 -+ Andreas Shimokawa <andi@××××××××.org>,
567 -+ Marek Pikarski <mass@××××××××.org>,
568 -+ Sven Neumann <neo@××××××××.org>,
569 -+ Ville Syrjälä <syrjala@×××.fi> and
570 -+ Claudio Ciccani <klan@××××××××.net>.
571 -+
572 -+ This library is free software; you can redistribute it and/or
573 -+ modify it under the terms of the GNU Lesser General Public
574 -+ License as published by the Free Software Foundation; either
575 -+ version 2 of the License, or (at your option) any later version.
576 -+
577 -+ This library is distributed in the hope that it will be useful,
578 -+ but WITHOUT ANY WARRANTY; without even the implied warranty of
579 -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
580 -+ Lesser General Public License for more details.
581 -+
582 -+ You should have received a copy of the GNU Lesser General Public
583 -+ License along with this library; if not, write to the
584 -+ Free Software Foundation, Inc., 59 Temple Place - Suite 330,
585 -+ Boston, MA 02111-1307, USA.
586 -+*/
587 -+
588 -+
589 -+
590 -+#ifndef __IDIVINE_H__
591 -+#define __IDIVINE_H__
592 -+
593 -+#include <divine.h>
594 -+
595 -+/*
596 -+ * private data struct of IDiVine
597 -+ */
598 -+typedef struct {
599 -+ int ref; /* reference counter */
600 -+
601 -+ DiVine *divine;
602 -+} IDiVine_data;
603 -+
604 -+/*
605 -+ * IDiVine constructor/destructor
606 -+ */
607 -+DFBResult IDiVine_Construct( IDiVine *thiz );
608 -+
609 -+void IDiVine_Destruct ( IDiVine *thiz );
610 -+
611 -+#endif
612
613 diff --git a/dev-libs/DirectFB/files/DirectFB-1.7.6-tslib.patch b/dev-libs/DirectFB/files/DirectFB-1.7.6-tslib.patch
614 deleted file mode 100644
615 index 3315968bc09..00000000000
616 --- a/dev-libs/DirectFB/files/DirectFB-1.7.6-tslib.patch
617 +++ /dev/null
618 @@ -1,33 +0,0 @@
619 -https://github.com/deniskropp/DirectFB/pull/6
620 -https://bugs.gentoo.org/567294
621 -
622 -From 5c7c4b197b9d04587b05624db4cfca6503adb3ff Mon Sep 17 00:00:00 2001
623 -From: Mike Frysinger <vapier@g.o>
624 -Date: Thu, 8 Dec 2016 16:47:34 -0500
625 -Subject: [PATCH] configure: fix tslib version check
626 -
627 -The tslib version is 1.0, not 1.0.0. Trying to check for the latter
628 -fails when using pkg-config:
629 -$ pkg-config --exists --print-errors "tslib-1.0 >= 1.0"
630 -$ pkg-config --exists --print-errors "tslib-1.0 >= 1.0.0"
631 -Requested 'tslib-1.0 >= 1.0.0' but version of tslib is 1.0
632 ----
633 - configure.in | 2 +-
634 - 1 file changed, 1 insertion(+), 1 deletion(-)
635 -
636 -diff --git a/configure.in b/configure.in
637 -index 6143cd393699..12a65fdc4f52 100644
638 ---- a/configure.in
639 -+++ b/configure.in
640 -@@ -2561,7 +2561,7 @@ fi
641 -
642 - enable_tslib=no
643 - if test "$checkfor_tslib" = "yes"; then
644 -- PKG_CHECK_MODULES([TSLIB], [tslib-1.0 >= 1.0.0], [enable_tslib=yes], [enable_tslib=no])
645 -+ PKG_CHECK_MODULES([TSLIB], [tslib-1.0 >= 1.0], [enable_tslib=yes], [enable_tslib=no])
646 - if test "$enable_tslib" = "no"; then
647 - PKG_CHECK_MODULES([TSLIB], [tslib-0.0], [enable_tslib=yes], [enable_tslib=no
648 - AC_MSG_WARN([*** no tslib -- tslib driver will not be built.])])
649 ---
650 -2.11.0.rc2
651 -
652
653 diff --git a/dev-libs/DirectFB/metadata.xml b/dev-libs/DirectFB/metadata.xml
654 deleted file mode 100644
655 index aaac930ef7b..00000000000
656 --- a/dev-libs/DirectFB/metadata.xml
657 +++ /dev/null
658 @@ -1,44 +0,0 @@
659 -<?xml version="1.0" encoding="UTF-8"?>
660 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
661 -<pkgmetadata>
662 - <maintainer type="project">
663 - <email>graphics@g.o</email>
664 - <name>Gentoo Graphics Project</name>
665 - </maintainer>
666 - <longdescription>
667 - DirectFB is a thin library that provides hardware graphics
668 - acceleration, input device handling and abstraction, integrated
669 - windowing system with support for translucent windows and
670 - multiple display layers on top of the Linux Framebuffer Device.
671 - It is a complete hardware abstraction layer with software
672 - fallbacks for every graphics operation that is not supported
673 - by the underlying hardware. DirectFB adds graphical power to
674 - embedded systems and sets a new standard for graphics under
675 - Linux.
676 - </longdescription>
677 - <use>
678 - <flag name="bmp">build BMP image provider</flag>
679 - <flag name="divine">enable DiVine</flag>
680 - <flag name="drmkms">build with DRM/KMS support</flag>
681 - <flag name="dynload">enable dynload support</flag>
682 - <flag name="egl">build with EGL support</flag>
683 - <flag name="fusiondale">enable FusionDale</flag>
684 - <flag name="fusionsound">enable FusionSound</flag>
685 - <flag name="gles2">build gles2 gfxdriver</flag>
686 - <flag name="imlib2">build Imlib2 image provider</flag>
687 - <flag name="input_hub">provides an asynchronous interface
688 - to the input devices available and those being
689 - added/removed</flag>
690 - <flag name="mpeg2">build MPEG2 image provider</flag>
691 - <flag name="mpeg3">build Libmpeg3 video provider</flag>
692 - <flag name="multicore">enable multicore support</flag>
693 - <flag name="pnm">build PNM (PBM/PGM/PPM) image provider</flag>
694 - <flag name="sawman">enable SaWMan (window manager and
695 - application manager)</flag>
696 - <flag name="swfdec">build Swfdec (Flash decoder) video
697 - provider</flag>
698 - <flag name="tremor">build Ogg/Vorbis music provider using
699 - Tremor</flag>
700 - <flag name="webp">build WebP image provider</flag>
701 - </use>
702 -</pkgmetadata>
703
704 diff --git a/profiles/arch/amd64-fbsd/use.mask b/profiles/arch/amd64-fbsd/use.mask
705 index 763749f7d4b..4bca0e5e6c2 100644
706 --- a/profiles/arch/amd64-fbsd/use.mask
707 +++ b/profiles/arch/amd64-fbsd/use.mask
708 @@ -61,10 +61,6 @@ audit
709 # google-perftools does not work on FreeBSD.
710 tcmalloc
711
712 -# Michał Górny <mgorny@g.o> (19 Feb 2018)
713 -# dev-libs/DirectFB is not keyworded here.
714 -directfb
715 -
716 # Michał Górny <mgorny@g.o> (17 Feb 2018)
717 # libraw is not keyworded here.
718 raw
719
720 diff --git a/profiles/arch/arm/package.use.mask b/profiles/arch/arm/package.use.mask
721 index 29dc28e4a7e..8b26a8794e8 100644
722 --- a/profiles/arch/arm/package.use.mask
723 +++ b/profiles/arch/arm/package.use.mask
724 @@ -352,10 +352,6 @@ net-im/prosody jit
725 # rjb doesn't work on arm, so no java hacks for metasploit
726 net-analyzer/metasploit java
727
728 -# Julian Ospald <hasufell@g.o> (04 Jan 2014)
729 -# no keyword for media-libs/swfdec and media-libs/libtimidity
730 ->=dev-libs/DirectFB-1.7.1 timidity swfdec
731 -
732 # Markus Meier <maekke@g.o> (26 Dec 2013)
733 # Unkeyworded deps, bug #488724
734 app-office/gnumeric libgda
735
736 diff --git a/profiles/arch/arm64/package.use.mask b/profiles/arch/arm64/package.use.mask
737 index 42b0f00fdef..48cd36f1113 100644
738 --- a/profiles/arch/arm64/package.use.mask
739 +++ b/profiles/arch/arm64/package.use.mask
740 @@ -360,10 +360,6 @@ dev-libs/efl physics
741 # gcj-6.3 won't bootstrap icedtea 7
742 >=sys-devel/gcc-6 gcj
743
744 -# Julian Ospald <hasufell@g.o> (04 Jan 2014)
745 -# no keyword for media-libs/swfdec and media-libs/libtimidity
746 ->=dev-libs/DirectFB-1.7.1 timidity swfdec
747 -
748 # Markus Meier <maekke@g.o> (26 Dec 2013)
749 # Unkeyworded deps, bug #488724
750 app-office/gnumeric libgda
751
752 diff --git a/profiles/arch/arm64/use.mask b/profiles/arch/arm64/use.mask
753 index edbebc0d7c8..eb20ce81e8d 100644
754 --- a/profiles/arch/arm64/use.mask
755 +++ b/profiles/arch/arm64/use.mask
756 @@ -62,10 +62,6 @@ gps
757 # x11-misc/colord not tested on arm64 yet
758 colord
759
760 -# Mart Raudsepp <leio@g.o> (05 Feb 2017)
761 -# dev-libs/DirectFB not tested on arm64 (and we probably don't want it)
762 -directfb
763 -
764 # Mart Raudsepp <leio@g.o> (04 Feb 2017)
765 # net-fs/samba not tested on arm64 yet
766 samba
767
768 diff --git a/profiles/arch/ia64/package.use.mask b/profiles/arch/ia64/package.use.mask
769 index 537ec65697c..7961ffd22c5 100644
770 --- a/profiles/arch/ia64/package.use.mask
771 +++ b/profiles/arch/ia64/package.use.mask
772 @@ -255,10 +255,6 @@ dev-util/dbus-test-runner test
773 # Missing keywords, bug #478254
774 gnome-base/gnome classic extras
775
776 -# Julian Ospald <hasufell@g.o> (04 Jan 2014)
777 -# no keyword for media-libs/tremor
778 ->=dev-libs/DirectFB-1.7.1 tremor
779 -
780 # Pacho Ramos <pacho@g.o> (02 Dec 2013)
781 # Missing keywords, bug #493156
782 media-libs/libgphoto2 serial
783
784 diff --git a/profiles/package.mask b/profiles/package.mask
785 index a2a2687321c..60c767bb582 100644
786 --- a/profiles/package.mask
787 +++ b/profiles/package.mask
788 @@ -227,10 +227,6 @@ dev-java/sun-jacc-api
789 dev-java/jdom-jaxen
790 =dev-java/jdom-1.0-r4
791
792 -# Pacho Ramos <pacho@g.o> (17 Jun 2018)
793 -# Upstream dead for a long time, bug #606194. Removal in a month.
794 -dev-libs/DirectFB
795 -
796 # Pacho Ramos <pacho@g.o> (17 Jun 2018)
797 # Dead since 2013, not compatible with latest profiles (#642568). Removal in
798 # a month