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