1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
|
$NetBSD: patch-buildconfig_config__unix.py,v 1.3 2022/07/27 19:05:58 wiz Exp $
Detect X11R6 or X11R7; avoid localbase overriding search.
Use correct libpng.
Disable portmidi and porttime; porttime is a part of portmidi.
--- buildconfig/config_unix.py.orig 2019-04-25 06:14:17.000000000 +0000
+++ buildconfig/config_unix.py
@@ -148,12 +148,12 @@ def main(sdl2=False):
#these get prefixes with '/usr' and '/usr/local' or the $LOCALBASE
if sdl2:
- origincdirs = ['/include', '/include/SDL2']
- origlibdirs = ['/lib','/lib64','/X11R6/lib',
+ origincdirs = ['/include', '/include/SDL2', '/X11R6/include', '/X11R7/include']
+ origlibdirs = ['/lib','/lib64','/X11R6/lib', '/X11R7/lib',
'/lib/i386-linux-gnu', '/lib/x86_64-linux-gnu']
else:
origincdirs = ['/include', '/include/SDL', '/include/SDL']
- origlibdirs = ['/lib','/lib64','/X11R6/lib']
+ origlibdirs = ['/lib','/lib64','/X11R6/lib','/X11R7/lib']
if 'ORIGLIBDIRS' in os.environ and os.environ['ORIGLIBDIRS'] != "":
origlibdirs = os.environ['ORIGLIBDIRS'].split(":")
@@ -216,13 +216,12 @@ def main(sdl2=False):
#Dependency('GFX', 'SDL_gfxPrimitives.h', 'libSDL_gfx.so', ['SDL_gfx']),
]
DEPS.extend([
- Dependency('PNG', 'png.h', 'libpng', ['png']),
+ Dependency('PNG', 'png.h', 'libpng16', ['png16']),
Dependency('JPEG', 'jpeglib.h', 'libjpeg', ['jpeg']),
Dependency('SCRAP', '', 'libX11', ['X11']),
#Dependency('GFX', 'SDL_gfxPrimitives.h', 'libSDL_gfx.so', ['SDL_gfx']),
])
- is_freebsd = platform.system() == 'FreeBSD'
- if not is_freebsd:
+ if False:
porttime_dep = get_porttime_dep()
DEPS.append(
Dependency('PORTMIDI', 'portmidi.h', 'libportmidi.so', ['portmidi'])
@@ -243,8 +242,8 @@ def main(sdl2=False):
incdirs += ["/usr/local"+d for d in origincdirs]
libdirs += ["/usr/local"+d for d in origlibdirs]
if localbase:
- incdirs = [localbase+d for d in origincdirs]
- libdirs = [localbase+d for d in origlibdirs]
+ incdirs += [localbase+d for d in origincdirs]
+ libdirs += [localbase+d for d in origlibdirs]
for arg in DEPS[0].cflags.split():
if arg[:2] == '-I':
|
