Attachment #187182 for bug #223018

Lines 17-24 GNU_CONFIGURE= yes Link Here

(-)w/devel/sdl20/Makefile (-5 / +40 lines)
17	USES= gmake iconv libtool localbase:ldflags pathfix pkgconfig	17	USES= gmake iconv libtool localbase:ldflags pathfix pkgconfig
18	USE_LDCONFIG= yes	18	USE_LDCONFIG= yes
19		19
20	CONFIGURE_ARGS+= --disable-video-opengles \	20	CONFIGURE_ARGS+= --disable-altivec \
21	--disable-altivec \
22	--disable-arts \	21	--disable-arts \
23	--enable-diskaudio \	22	--enable-diskaudio \
24	--enable-dummyaudio \	23	--enable-dummyaudio \
Lines 59-65 OPTIONS_DEFINE= ALSA ASM DLOPEN ESOUND JACK NAS OSS SAMPLERATE \ Link Here
59	SDL_CPUINFO SDL_EVENTS SDL_FILE SDL_HAPTIC \	58	SDL_CPUINFO SDL_EVENTS SDL_FILE SDL_HAPTIC \
60	SDL_JOYSTICK SDL_LOADSO SDL_POWER SDL_RENDER \	59	SDL_JOYSTICK SDL_LOADSO SDL_POWER SDL_RENDER \
61	SDL_THREADS SDL_TIMERS SDL_VIDEO VIDEO_KMSDRM \	60	SDL_THREADS SDL_TIMERS SDL_VIDEO VIDEO_KMSDRM \
62	VIDEO_OPENGL VIDEO_X11	61	VIDEO_OPENGL VIDEO_X11 VIDEO_OPENGLES2 \
		62	VIDEO_WAYLAND
63	OPTIONS_DEFAULT= ASM DLOPEN OSS PTHREADS SDL_ATOMIC SDL_AUDIO \	63	OPTIONS_DEFAULT= ASM DLOPEN OSS PTHREADS SDL_ATOMIC SDL_AUDIO \
64	SDL_CPUINFO SDL_EVENTS SDL_FILE SDL_HAPTIC \	64	SDL_CPUINFO SDL_EVENTS SDL_FILE SDL_HAPTIC \
65	SDL_JOYSTICK SDL_LOADSO SDL_POWER SDL_RENDER \	65	SDL_JOYSTICK SDL_LOADSO SDL_POWER SDL_RENDER \
Lines 88-96 SDL_RENDER_DESC= Enable the SDL Render subsystem Link Here
88	SDL_THREADS_DESC= Enable the SDL Threads subsystem	88	SDL_THREADS_DESC= Enable the SDL Threads subsystem
89	SDL_TIMERS_DESC= Enable the SDL Timers subsystem	89	SDL_TIMERS_DESC= Enable the SDL Timers subsystem
90	SDL_VIDEO_DESC= Enable the SDL Video subsystem	90	SDL_VIDEO_DESC= Enable the SDL Video subsystem
91	VIDEO_KMSDRM_DESC= KMSDRM rendering support	91	VIDEO_KMSDRM_DESC= KMSDRM display support
92	VIDEO_OPENGL_DESC= OpenGL rendering support	92	VIDEO_OPENGL_DESC= OpenGL rendering support
93	VIDEO_X11_DESC= X11 rendering support	93	VIDEO_X11_DESC= X11 display support
		94	VIDEO_OPENGLES2_DESC= OpenGL ES 2.x rendering support
		95	VIDEO_WAYLAND_DESC= Wayland display support
94		96
95	ASM_CONFIGURE_ENABLE= assembly	97	ASM_CONFIGURE_ENABLE= assembly
96	DLOPEN_CONFIGURE_ENABLE= sdl-dlopen	98	DLOPEN_CONFIGURE_ENABLE= sdl-dlopen
Lines 228-233 CONFIGURE_ARGS+= --disable-video-x11 \ Link Here
228	--disable-video-x11-vm	230	--disable-video-x11-vm
229	.endif	231	.endif
230		232
		233	.if ${PORT_OPTIONS:MVIDEO_OPENGLES2}
		234	.if !${PORT_OPTIONS:MSDL_VIDEO}
		235	IGNORE= option VIDEO_OPENGLES2 requires SDL_VIDEO
		236	.endif
		237	CONFIGURE_ARGS+= --enable-video-opengles \
		238	--enable-video-opengles2
		239	USE_GL+= glesv2
		240	.else
		241	CONFIGURE_ARGS+= --disable-video-opengles \
		242	--disable-video-opengles2
		243	.endif
		244
		245	.if ${PORT_OPTIONS:MVIDEO_WAYLAND}
		246	.if !${PORT_OPTIONS:MSDL_VIDEO}
		247	IGNORE= option VIDEO_WAYLAND requires SDL_VIDEO
		248	.endif
		249	.if !${PORT_OPTIONS:MVIDEO_OPENGLES2}
		250	IGNORE= option VIDEO_WAYLAND requires VIDEO_OPENGLES2
		251	.endif
		252	CONFIGURE_ARGS+= --enable-video-wayland \
		253	--enable-wayland-shared
		254	LIB_DEPENDS+= libwayland-client.so:graphics/wayland \
		255	libwayland-cursor.so:graphics/wayland \
		256	libwayland-egl.so:graphics/mesa-libs \
		257	libxkbcommon.so:x11/libxkbcommon
		258	BUILD_DEPENDS+= wayland-protocols>=1.7:graphics/wayland-protocols \
		259	wayland-scanner:graphics/wayland \
		260	gsed:textproc/gsed
		261	.else
		262	CONFIGURE_ARGS+= --disable-video-wayland \
		263	--disable-wayland-shared
		264	.endif
		265
231	.include <bsd.port.pre.mk>	266	.include <bsd.port.pre.mk>
232		267
233	.if !empty(ICONV_LIB)	268	.if !empty(ICONV_LIB)




--- configure.orig	2017-09-22 18:51:01 UTC
+++ configure
@@ -16701,13 +16701,13 @@ fi
 done
 
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv_open in -liconv" >&5
-$as_echo_n "checking for iconv_open in -liconv... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv_open in " >&5
+$as_echo_n "checking for iconv_open in ... " >&6; }
 if ${ac_cv_lib_iconv_iconv_open+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-liconv  $LIBS"
+LIBS="  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -16738,7 +16738,7 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_iconv_iconv_open" >&5
 $as_echo "$ac_cv_lib_iconv_iconv_open" >&6; }
 if test "x$ac_cv_lib_iconv_iconv_open" = xyes; then :
-  LIBS="$LIBS -liconv"; EXTRA_LDFLAGS="$EXTRA_LDFLAGS -liconv"
+  LIBS="$LIBS "; EXTRA_LDFLAGS="$EXTRA_LDFLAGS "
 fi
 
     for ac_func in iconv
@@ -17186,7 +17186,7 @@ main ()
 {
 
         void *p = 0;
-        _m_prefetch(p);
+        __builtin_prefetch(p);
 
   ;
   return 0;
@@ -23779,7 +23779,6 @@ case "$host" in
         CheckFcitx
         case $ARCH in
           linux)
-              CheckInputEvents
               CheckInputKD
           ;;
         esac
@@ -24298,7 +24297,7 @@ $as_echo "#define SDL_VIDEO_RENDER_OGL_ES 1" >>confdef
 $as_echo "#define SDL_VIDEO_RENDER_OGL_ES2 1" >>confdefs.h
 
         SOURCES="$SOURCES $srcdir/src/video/uikit/*.m"
-        EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lm -liconv -lobjc"
+        EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lm  -lobjc"
         EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,AVFoundation"
         EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,AudioToolbox"
         EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,CoreAudio"
@@ -24402,7 +24401,6 @@ $as_echo "#define SDL_TIMER_UNIX 1" >>confdefs.h
         CheckNativeClient
         CheckDummyAudio
         CheckDummyVideo
-        CheckInputEvents
         CheckPTHREAD
 
         # Set up files for the timer library
@@ -24551,9 +24549,9 @@ if test x$video_wayland = xyes; then
     WAYLAND_CORE_PROTOCOL_SOURCE='$(gen)/wayland-protocol.c'
     WAYLAND_CORE_PROTOCOL_HEADER='$(gen)/wayland-client-protocol.h'
     WAYLAND_PROTOCOLS_UNSTABLE_SOURCES=`echo $WAYLAND_PROTOCOLS_UNSTABLE |\
-        sed 's,[^ ]\+,\\$(gen)/&-protocol.c,g'`
+        gsed 's,[^ ]\+,\\$(gen)/&-protocol.c,g'`
     WAYLAND_PROTOCOLS_UNSTABLE_HEADERS=`echo $WAYLAND_PROTOCOLS_UNSTABLE |\
-        sed 's,[^ ]\+,\\$(gen)/&-client-protocol.h,g'`
+        gsed 's,[^ ]\+,\\$(gen)/&-client-protocol.h,g'`
     GEN_SOURCES="$GEN_SOURCES $WAYLAND_CORE_PROTOCOL_SOURCE $WAYLAND_PROTOCOLS_UNSTABLE_SOURCES"
     GEN_HEADERS="$GEN_HEADERS $WAYLAND_CORE_PROTOCOL_HEADER $WAYLAND_PROTOCOLS_UNSTABLE_HEADERS"
 
@@ -24568,23 +24566,23 @@ $WAYLAND_CORE_PROTOCOL_HEADER: $WAYLAND_CORE_PROTOCOL_
 	\$(RUN_CMD_GEN)\$(WAYLAND_SCANNER) client-header \$< \$@"
 
     WAYLAND_CORE_PROTOCOL_OBJECT="
-\$(objects)/`echo $WAYLAND_CORE_PROTOCOL_SOURCE | sed 's/\$(gen)\/\(.*\).c$/\1.lo/'`: $WAYLAND_CORE_PROTOCOL_SOURCE
+\$(objects)/`echo $WAYLAND_CORE_PROTOCOL_SOURCE | gsed 's/\$(gen)\/\(.*\).c$/\1.lo/'`: $WAYLAND_CORE_PROTOCOL_SOURCE
 	\$(RUN_CMD_CC)\$(LIBTOOL) --tag=CC --mode=compile \$(CC) \$(CFLAGS) \$(EXTRA_CFLAGS) $DEPENDENCY_TRACKING_OPTIONS -c \$< -o \$@"
 
     WAYLAND_PROTOCOLS_CLIENT_HEADER_UNSTABLE_DEPENDS=`for p in $WAYLAND_PROTOCOLS_UNSTABLE;\
-        do echo ; echo \$p | sed\
+        do echo ; echo \$p | gsed\
         "s,^\\([a-z\\-]\\+\\)-unstable-\\(v[0-9]\+\\)\$,\\$(gen)/&-client-protocol.h: $WAYLAND_PROTOCOLS_DIR/unstable/\1/&.xml\\\\
 	\\$(SHELL) \\$(auxdir)/mkinstalldirs \\$(gen)\\\\
 	\\$(RUN_CMD_GEN)\\$(WAYLAND_SCANNER) client-header \\$< \\$@," ; done`
 
     WAYLAND_PROTOCOLS_CODE_UNSTABLE_DEPENDS=`for p in $WAYLAND_PROTOCOLS_UNSTABLE;\
-        do echo ; echo \$p | sed\
+        do echo ; echo \$p | gsed\
         "s,^\\([a-z\\-]\\+\\)-unstable-\\(v[0-9]\+\\)\$,\\$(gen)/&-protocol.c: $WAYLAND_PROTOCOLS_DIR/unstable/\1/&.xml\\\\
 	\\$(SHELL) \\$(auxdir)/mkinstalldirs \\$(gen)\\\\
 	\\$(RUN_CMD_GEN)\\$(WAYLAND_SCANNER) code \\$< \\$@," ; done`
 
     WAYLAND_PROTOCOLS_OBJECTS_UNSTABLE=`for p in $WAYLAND_PROTOCOLS_UNSTABLE;\
-        do echo ; echo \$p | sed\
+        do echo ; echo \$p | gsed\
         "s,^\\([a-z\\-]\\+\\)-unstable-\\(v[0-9]\+\\)\$,\\\$(objects)/&-protocol.lo: \\$(gen)/&-protocol.c \\$(gen)/&-client-protocol.h\\\\
 	\\$(RUN_CMD_CC)\\$(LIBTOOL) --tag=CC --mode=compile \\$(CC) \\$(CFLAGS) \\$(EXTRA_CFLAGS) $DEPENDENCY_TRACKING_OPTIONS -c \\$< -o \\$@," ; done`
 

Return to bug 223018

Added Link Here

(-)w/devel/sdl20/files/patch-configure (+102 lines)
1	--- configure.orig 2017-09-22 18:51:01 UTC
2	+++ configure
3	@@ -16701,13 +16701,13 @@ fi
4	done
5
6
7	- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv_open in -liconv" >&5
8	-$as_echo_n "checking for iconv_open in -liconv... " >&6; }
9	+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv_open in " >&5
10	+$as_echo_n "checking for iconv_open in ... " >&6; }
11	if ${ac_cv_lib_iconv_iconv_open+:} false; then :
12	$as_echo_n "(cached) " >&6
13	else
14	ac_check_lib_save_LIBS=$LIBS
15	-LIBS="-liconv $LIBS"
16	+LIBS=" $LIBS"
17	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
18	/* end confdefs.h. */
19
20	@@ -16738,7 +16738,7 @@ fi
21	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_iconv_iconv_open" >&5
22	$as_echo "$ac_cv_lib_iconv_iconv_open" >&6; }
23	if test "x$ac_cv_lib_iconv_iconv_open" = xyes; then :
24	- LIBS="$LIBS -liconv"; EXTRA_LDFLAGS="$EXTRA_LDFLAGS -liconv"
25	+ LIBS="$LIBS "; EXTRA_LDFLAGS="$EXTRA_LDFLAGS "
26	fi
27
28	for ac_func in iconv
29	@@ -17186,7 +17186,7 @@ main ()
30	{
31
32	void *p = 0;
33	- _m_prefetch(p);
34	+ __builtin_prefetch(p);
35
36	;
37	return 0;
38	@@ -23779,7 +23779,6 @@ case "$host" in
39	CheckFcitx
40	case $ARCH in
41	linux)
42	- CheckInputEvents
43	CheckInputKD
44	;;
45	esac
46	@@ -24298,7 +24297,7 @@ $as_echo "#define SDL_VIDEO_RENDER_OGL_ES 1" >>confdef
47	$as_echo "#define SDL_VIDEO_RENDER_OGL_ES2 1" >>confdefs.h
48
49	SOURCES="$SOURCES $srcdir/src/video/uikit/*.m"
50	- EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lm -liconv -lobjc"
51	+ EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lm -lobjc"
52	EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,AVFoundation"
53	EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,AudioToolbox"
54	EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,CoreAudio"
55	@@ -24402,7 +24401,6 @@ $as_echo "#define SDL_TIMER_UNIX 1" >>confdefs.h
56	CheckNativeClient
57	CheckDummyAudio
58	CheckDummyVideo
59	- CheckInputEvents
60	CheckPTHREAD
61
62	# Set up files for the timer library
63	@@ -24551,9 +24549,9 @@ if test x$video_wayland = xyes; then
64	WAYLAND_CORE_PROTOCOL_SOURCE='$(gen)/wayland-protocol.c'
65	WAYLAND_CORE_PROTOCOL_HEADER='$(gen)/wayland-client-protocol.h'
66	WAYLAND_PROTOCOLS_UNSTABLE_SOURCES=`echo $WAYLAND_PROTOCOLS_UNSTABLE \|\
67	- sed 's,[^ ]\+,\\$(gen)/&-protocol.c,g'`
68	+ gsed 's,[^ ]\+,\\$(gen)/&-protocol.c,g'`
69	WAYLAND_PROTOCOLS_UNSTABLE_HEADERS=`echo $WAYLAND_PROTOCOLS_UNSTABLE \|\
70	- sed 's,[^ ]\+,\\$(gen)/&-client-protocol.h,g'`
71	+ gsed 's,[^ ]\+,\\$(gen)/&-client-protocol.h,g'`
72	GEN_SOURCES="$GEN_SOURCES $WAYLAND_CORE_PROTOCOL_SOURCE $WAYLAND_PROTOCOLS_UNSTABLE_SOURCES"
73	GEN_HEADERS="$GEN_HEADERS $WAYLAND_CORE_PROTOCOL_HEADER $WAYLAND_PROTOCOLS_UNSTABLE_HEADERS"
74
75	@@ -24568,23 +24566,23 @@ $WAYLAND_CORE_PROTOCOL_HEADER: $WAYLAND_CORE_PROTOCOL_
76	\$(RUN_CMD_GEN)\$(WAYLAND_SCANNER) client-header \$< \$@"
77
78	WAYLAND_CORE_PROTOCOL_OBJECT="
79	-\$(objects)/`echo $WAYLAND_CORE_PROTOCOL_SOURCE \| sed 's/\$(gen)\/\(.*\).c$/\1.lo/'`: $WAYLAND_CORE_PROTOCOL_SOURCE
80	+\$(objects)/`echo $WAYLAND_CORE_PROTOCOL_SOURCE \| gsed 's/\$(gen)\/\(.*\).c$/\1.lo/'`: $WAYLAND_CORE_PROTOCOL_SOURCE
81	\$(RUN_CMD_CC)\$(LIBTOOL) --tag=CC --mode=compile \$(CC) \$(CFLAGS) \$(EXTRA_CFLAGS) $DEPENDENCY_TRACKING_OPTIONS -c \$< -o \$@"
82
83	WAYLAND_PROTOCOLS_CLIENT_HEADER_UNSTABLE_DEPENDS=`for p in $WAYLAND_PROTOCOLS_UNSTABLE;\
84	- do echo ; echo \$p \| sed\
85	+ do echo ; echo \$p \| gsed\
86	"s,^\\([a-z\\-]\\+\\)-unstable-\\(v[0-9]\+\\)\$,\\$(gen)/&-client-protocol.h: $WAYLAND_PROTOCOLS_DIR/unstable/\1/&.xml\\\\
87	\\$(SHELL) \\$(auxdir)/mkinstalldirs \\$(gen)\\\\
88	\\$(RUN_CMD_GEN)\\$(WAYLAND_SCANNER) client-header \\$< \\$@," ; done`
89
90	WAYLAND_PROTOCOLS_CODE_UNSTABLE_DEPENDS=`for p in $WAYLAND_PROTOCOLS_UNSTABLE;\
91	- do echo ; echo \$p \| sed\
92	+ do echo ; echo \$p \| gsed\
93	"s,^\\([a-z\\-]\\+\\)-unstable-\\(v[0-9]\+\\)\$,\\$(gen)/&-protocol.c: $WAYLAND_PROTOCOLS_DIR/unstable/\1/&.xml\\\\
94	\\$(SHELL) \\$(auxdir)/mkinstalldirs \\$(gen)\\\\
95	\\$(RUN_CMD_GEN)\\$(WAYLAND_SCANNER) code \\$< \\$@," ; done`
96
97	WAYLAND_PROTOCOLS_OBJECTS_UNSTABLE=`for p in $WAYLAND_PROTOCOLS_UNSTABLE;\
98	- do echo ; echo \$p \| sed\
99	+ do echo ; echo \$p \| gsed\
100	"s,^\\([a-z\\-]\\+\\)-unstable-\\(v[0-9]\+\\)\$,\\\$(objects)/&-protocol.lo: \\$(gen)/&-protocol.c \\$(gen)/&-client-protocol.h\\\\
101	\\$(RUN_CMD_CC)\\$(LIBTOOL) --tag=CC --mode=compile \\$(CC) \\$(CFLAGS) \\$(EXTRA_CFLAGS) $DEPENDENCY_TRACKING_OPTIONS -c \\$< -o \\$@," ; done`
102