mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2025-07-19 15:29:08 +02:00
be8c765c7c
There is new patch-status QA check in oe-core: https://git.openembedded.org/openembedded-core/commit/?id=76a685bfcf927593eac67157762a53259089ea8a This is temporary work around just to hide _many_ warnings from optional patch-status (if you add it to WARN_QA). This just added Upstream-Status: Pending everywhere without actually investigating what's the proper status. This is just to hide current QA warnings and to catch new .patch files being added without Upstream-Status, but the number of Pending patches is now terrible: 5 (26%) meta-xfce 6 (50%) meta-perl 15 (42%) meta-webserver 21 (36%) meta-gnome 25 (57%) meta-filesystems 26 (43%) meta-initramfs 45 (45%) meta-python 47 (55%) meta-multimedia 312 (63%) meta-networking 756 (61%) meta-oe Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
41 lines
1.2 KiB
Diff
41 lines
1.2 KiB
Diff
Upstream-Status: Pending
|
|
|
|
--- a/setup.py
|
|
+++ b/setup.py
|
|
@@ -695,7 +695,18 @@ def determine_gl_flags():
|
|
c_options['use_x11'] = True
|
|
c_options['use_egl'] = True
|
|
else:
|
|
- flags['libraries'] = ['GL']
|
|
+ if cross_sysroot:
|
|
+ flags['include_dirs'] = [cross_sysroot + '/usr/include']
|
|
+ flags['library_dirs'] = [cross_sysroot + '/usr/lib']
|
|
+
|
|
+ if c_options['use_opengl_es2']:
|
|
+ print("using GLESv2 libraries")
|
|
+ flags['libraries'] = ['GLESv2']
|
|
+ else:
|
|
+ flags['libraries'] = ['GL']
|
|
+
|
|
+
|
|
+ print("cross_sysroot: " + str(cross_sysroot))
|
|
return flags, base_flags
|
|
|
|
|
|
@@ -723,14 +734,13 @@ def determine_sdl2():
|
|
sdl_inc = join(include, 'SDL2')
|
|
if isdir(sdl_inc):
|
|
sdl2_paths.append(sdl_inc)
|
|
- sdl2_paths.extend(['/usr/local/include/SDL2', '/usr/include/SDL2'])
|
|
|
|
flags['include_dirs'] = sdl2_paths
|
|
flags['extra_link_args'] = []
|
|
flags['extra_compile_args'] = []
|
|
flags['library_dirs'] = (
|
|
sdl2_paths if sdl2_paths else
|
|
- ['/usr/local/lib/'])
|
|
+ [''])
|
|
|
|
if sdl2_flags:
|
|
flags = merge(flags, sdl2_flags)
|