We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] the patch for described problems

SDL2-master-fixes.patch (text/plain), 6.71 KB, created by Rafał Mużyło on 2015-12-19 13:09:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rafał Mużyło

Created: 2015-12-19 13:09:35 UTC

Size: 6.71 KB

patch

obsolete

>diff -dupr SDL-a20484c998da-old/configure.in SDL2-a20484c998da/configure.in
>--- SDL-a20484c998da-old/configure.in	2015-12-11 21:41:59.000000000 +0100
>+++ SDL2-a20484c998da/configure.in	2015-12-14 11:09:01.377622757 +0100
>@@ -276,7 +276,7 @@ if test x$enable_libc = xyes; then
>     AC_CHECK_LIB(iconv, iconv_open, [LIBS="$LIBS -liconv"; EXTRA_LDFLAGS="$EXTRA_LDFLAGS -liconv"])
>     AC_CHECK_FUNCS(iconv)
> 
>-    AC_CHECK_MEMBER(struct sigaction.sa_sigaction,[AC_DEFINE(HAVE_SA_SIGACTION)], ,[#include <signal.h>])
>+    AC_CHECK_MEMBER(struct sigaction.sa_sigaction,[AC_DEFINE(HAVE_SA_SIGACTION, 1, [ ])], ,[#include <signal.h>])
> fi
> 
> dnl AC_CHECK_SIZEOF(void*)
>@@ -1326,8 +1326,8 @@ CheckNativeClient()
>           #endif
>         ],[
>         ],[
>-        AC_DEFINE(SDL_VIDEO_DRIVER_NACL)
>-        AC_DEFINE(SDL_AUDIO_DRIVER_NACL)
>+        AC_DEFINE(SDL_VIDEO_DRIVER_NACL, 1, [ ])
>+        AC_DEFINE(SDL_AUDIO_DRIVER_NACL, 1, [ ])
>         AC_DEFINE(HAVE_POW, 1, [ ])
>         AC_DEFINE(HAVE_OPENGLES2, 1, [ ])
>         AC_DEFINE(SDL_VIDEO_OPENGL_ES2, 1, [ ])
>@@ -1466,7 +1466,7 @@ AC_HELP_STRING([--enable-x11-shared], [d
>             ],[
>             ],[
>             have_const_param_XextAddDisplay=yes
>-            AC_DEFINE(SDL_VIDEO_DRIVER_X11_CONST_PARAM_XEXTADDDISPLAY)
>+            AC_DEFINE(SDL_VIDEO_DRIVER_X11_CONST_PARAM_XEXTADDDISPLAY, 1, [ ])
>             ])
>             AC_MSG_RESULT($have_const_param_XextAddDisplay)
> 
>@@ -1484,7 +1484,7 @@ XGetEventData(display, cookie);
> XFreeEventData(display, cookie);
>             ],[
>                 have_XGenericEvent=yes
>-                AC_DEFINE(SDL_VIDEO_DRIVER_X11_SUPPORTS_GENERIC_EVENTS)
>+                AC_DEFINE(SDL_VIDEO_DRIVER_X11_SUPPORTS_GENERIC_EVENTS, 1, [ ])
>             ])
>             AC_MSG_RESULT($have_XGenericEvent)
> 
>@@ -1598,7 +1598,7 @@ int event_type = XI_TouchBegin;
> XITouchClassInfo *t;
>             	],[
>             	have_xinput2_multitouch=yes
>-            	AC_DEFINE(SDL_VIDEO_DRIVER_X11_XINPUT2_SUPPORTS_MULTITOUCH)
>+            	AC_DEFINE(SDL_VIDEO_DRIVER_X11_XINPUT2_SUPPORTS_MULTITOUCH, 1, [ ])
>                 SUMMARY_video_x11="${SUMMARY_video_x11} xinput2_multitouch"
>             	])
>             	AC_MSG_RESULT($have_xinput2_multitouch)
>@@ -2451,7 +2451,7 @@ AC_HELP_STRING([--enable-pthread-sem], [
>                   sem_timedwait(NULL, NULL);
>                 ],[
>                 have_sem_timedwait=yes
>-                AC_DEFINE(HAVE_SEM_TIMEDWAIT)
>+                AC_DEFINE(HAVE_SEM_TIMEDWAIT, 1, [ ])
>                 ])
>                 AC_MSG_RESULT($have_sem_timedwait)
>             fi
>@@ -3456,16 +3456,16 @@ VERSION_DEPENDS=`echo "$VERSION_DEPENDS"
> 
> SDLMAIN_OBJECTS=`echo $SDLMAIN_SOURCES`
> SDLMAIN_DEPENDS=`echo $SDLMAIN_SOURCES`
>-SDLMAIN_OBJECTS=`echo "$SDLMAIN_OBJECTS" | sed 's,[[^ ]]*/$[[^ ]]*$\.c,$(objects)/\1.o,g'`
>+SDLMAIN_OBJECTS=`echo "$SDLMAIN_OBJECTS" | sed 's,[[^ ]]*/$[[^ ]]*$\.c,$(objects)/\1.lo,g'`
> SDLMAIN_DEPENDS=`echo "$SDLMAIN_DEPENDS" | sed "s,\$[[^ ]]*\$/\$[[^ ]]*\$\\.c,\\\\
>-\\$(objects)/\\2.o: \\1/\\2.c\\\\
>+\\$(objects)/\\2.lo: \\1/\\2.c\\\\
> 	\\$(RUN_CMD_CC)\\$(LIBTOOL) --tag=CC --mode=compile \\$(CC) \\$(CFLAGS) \\$(EXTRA_CFLAGS) $DEPENDENCY_TRACKING_OPTIONS -c \\$< -o \\$@,g"`
> 
> SDLTEST_OBJECTS=`echo $SDLTEST_SOURCES`
> SDLTEST_DEPENDS=`echo $SDLTEST_SOURCES`
>-SDLTEST_OBJECTS=`echo "$SDLTEST_OBJECTS" | sed 's,[[^ ]]*/$[[^ ]]*$\.c,$(objects)/\1.o,g'`
>+SDLTEST_OBJECTS=`echo "$SDLTEST_OBJECTS" | sed 's,[[^ ]]*/$[[^ ]]*$\.c,$(objects)/\1.lo,g'`
> SDLTEST_DEPENDS=`echo "$SDLTEST_DEPENDS" | sed "s,\$[[^ ]]*\$/\$[[^ ]]*\$\\.c,\\\\
>-\\$(objects)/\\2.o: \\1/\\2.c\\\\
>+\\$(objects)/\\2.lo: \\1/\\2.c\\\\
> 	\\$(RUN_CMD_CC)\\$(LIBTOOL) --tag=CC --mode=compile \\$(CC) \\$(CFLAGS) \\$(EXTRA_CFLAGS) $DEPENDENCY_TRACKING_OPTIONS -c \\$< -o \\$@,g"`
> 
> # Set runtime shared library paths as needed
>diff -dupr SDL-a20484c998da-old/Makefile.in SDL2-a20484c998da/Makefile.in
>--- SDL-a20484c998da-old/Makefile.in	2015-12-11 21:41:59.000000000 +0100
>+++ SDL2-a20484c998da/Makefile.in	2015-12-14 11:47:58.158594824 +0100
>@@ -33,10 +33,10 @@ TARGET  = libSDL2.la
> OBJECTS = @OBJECTS@
> VERSION_OBJECTS = @VERSION_OBJECTS@
> 
>-SDLMAIN_TARGET = libSDL2main.a
>+SDLMAIN_TARGET = libSDL2main.la
> SDLMAIN_OBJECTS = @SDLMAIN_OBJECTS@
> 
>-SDLTEST_TARGET = libSDL2_test.a
>+SDLTEST_TARGET = libSDL2_test.la
> SDLTEST_OBJECTS = @SDLTEST_OBJECTS@
> 
> SRC_DIST = *.txt acinclude Android.mk autogen.sh android-project build-scripts cmake cmake_uninstall.cmake.in configure configure.in debian docs include Makefile.* sdl2-config.cmake.in sdl2-config.in sdl2.m4 sdl2.pc.in SDL2.spec.in src test VisualC.html VisualC VisualC-WinRT Xcode Xcode-iOS
>@@ -141,12 +141,10 @@ $(objects)/$(TARGET): $(OBJECTS) $(VERSI
> 	$(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) -o $@ $(OBJECTS) $(VERSION_OBJECTS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS)
> 
> $(objects)/$(SDLMAIN_TARGET): $(SDLMAIN_OBJECTS)
>-	$(RUN_CMD_AR)$(AR) cru $@ $(SDLMAIN_OBJECTS)
>-	$(RUN_CMD_RANLIB)$(RANLIB) $@
>+	$(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) -static -o $@ $(SDLMAIN_OBJECTS) -rpath $(DESTDIR)$(libdir)
> 
> $(objects)/$(SDLTEST_TARGET): $(SDLTEST_OBJECTS)
>-	$(RUN_CMD_AR)$(AR) cru $@ $(SDLTEST_OBJECTS)
>-	$(RUN_CMD_RANLIB)$(RANLIB) $@
>+	$(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) -static -o $@ $(SDLTEST_OBJECTS) -rpath $(DESTDIR)$(libdir)
> 
> install: all install-bin install-hdrs install-lib install-data
> install-bin:
>@@ -167,10 +165,8 @@ install-hdrs: update-revision
> install-lib: $(objects) $(objects)/$(TARGET) $(objects)/$(SDLMAIN_TARGET) $(objects)/$(SDLTEST_TARGET)
> 	$(SHELL) $(auxdir)/mkinstalldirs $(DESTDIR)$(libdir)
> 	$(LIBTOOL) --mode=install $(INSTALL) $(objects)/$(TARGET) $(DESTDIR)$(libdir)/$(TARGET)
>-	$(INSTALL) -m 644 $(objects)/$(SDLMAIN_TARGET) $(DESTDIR)$(libdir)/$(SDLMAIN_TARGET)
>-	$(RANLIB) $(DESTDIR)$(libdir)/$(SDLMAIN_TARGET)
>-	$(INSTALL) -m 644 $(objects)/$(SDLTEST_TARGET) $(DESTDIR)$(libdir)/$(SDLTEST_TARGET)
>-	$(RANLIB) $(DESTDIR)$(libdir)/$(SDLTEST_TARGET)
>+	$(LIBTOOL) --mode=install $(INSTALL) $(objects)/$(SDLMAIN_TARGET) $(DESTDIR)$(libdir)/$(SDLMAIN_TARGET)
>+	$(LIBTOOL) --mode=install $(INSTALL) $(objects)/$(SDLTEST_TARGET) $(DESTDIR)$(libdir)/$(SDLTEST_TARGET)
> install-data:
> 	$(SHELL) $(auxdir)/mkinstalldirs $(DESTDIR)$(datadir)/aclocal
> 	$(INSTALL) -m 644 $(srcdir)/sdl2.m4 $(DESTDIR)$(datadir)/aclocal/sdl2.m4
>diff -dupr SDL-a20484c998da-old/sdl2-config.cmake.in SDL2-a20484c998da/sdl2-config.cmake.in
>--- SDL-a20484c998da-old/sdl2-config.cmake.in	2015-12-11 21:41:59.000000000 +0100
>+++ SDL2-a20484c998da/sdl2-config.cmake.in	2015-12-14 11:55:26.541408690 +0100
>@@ -2,7 +2,7 @@
> 
> set(prefix "@prefix@") 
> set(exec_prefix "@exec_prefix@")
>-set(libdir "@libdir")
>+set(libdir "@libdir@")
> set(SDL2_PREFIX "@prefix@")
> set(SDL2_EXEC_PREFIX "@prefix@")
> set(SDL2_LIBDIR "@libdir@")

Actions: View | Diff

Attachments on bug 3208: 2341

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.