Re: Maintainer update for sdl2 to 2.0.10
[...]
> WANTLIB= m pthread sndio usbhid samplerate
> -# GL/X11/Xext/Xrender/Xrandr are dlopen'd by SDL
> -WANTLIB+= GL X11 Xau Xdmcp Xext Xrandr Xrender xcb
> +# GL/Xau/Xdmcp/vulkan are dlopen'd by SDL
> +WANTLIB+= GL X11 Xau xcb Xcursor Xdmcp Xext Xfixes Xi Xinerama
> +WANTLIB+=Xrandr Xrender Xss Xxf86vm vulkan
>
> -LIB_DEPENDS= audio/libsamplerate
> +LIB_DEPENDS= audio/libsamplerate \
> + graphics/vulkan-loader
After discussion with brynet@ I realized that adding vulkan which is an
optional runtime dependency that is dlopen'd will break sdl2 on several
architectures - aarch64, mips*.
Therefore, new diff below that removes vulkan from WANTLIB and
vulkan-loader from LIB_DEPENDS.
ok?
Index: Makefile
===
RCS file: /cvs/ports/devel/sdl2/Makefile,v
retrieving revision 1.27
diff -u -p -r1.27 Makefile
--- Makefile12 Jul 2019 20:46:01 - 1.27
+++ Makefile20 Sep 2019 20:41:27 -
@@ -2,14 +2,13 @@
COMMENT= cross-platform multimedia library
-V= 2.0.9
-REVISION= 0
+V= 2.0.10
DISTNAME= SDL2-${V}
PKGNAME= sdl2-${V}
CATEGORIES=devel
MASTER_SITES= https://www.libsdl.org/release/
-SHARED_LIBS= SDL20.6 # 0.9
+SHARED_LIBS= SDL20.7 # 0.10
HOMEPAGE= https://www.libsdl.org/
@@ -19,8 +18,9 @@ MAINTAINER= Thomas Frohwein
Index: distinfo
===
RCS file: /cvs/ports/devel/sdl2/distinfo,v
retrieving revision 1.8
diff -u -p -r1.8 distinfo
--- distinfo3 Jan 2019 17:55:08 - 1.8
+++ distinfo20 Sep 2019 20:41:27 -
@@ -1,2 +1,2 @@
-SHA256 (SDL2-2.0.9.tar.gz) = JVGG3GduzQwdvxDsiizF1oabUHnYo4GUwq7N/1SzJLE=
-SIZE (SDL2-2.0.9.tar.gz) = 5246942
+SHA256 (SDL2-2.0.10.tar.gz) = tGVsE6Hw0AI64vSpzwjskv/7Rk4PJCODN3hBWbi5HVc=
+SIZE (SDL2-2.0.10.tar.gz) = 5550762
Index: patches/patch-Makefile_in
===
RCS file: /cvs/ports/devel/sdl2/patches/patch-Makefile_in,v
retrieving revision 1.6
diff -u -p -r1.6 patch-Makefile_in
--- patches/patch-Makefile_in 3 Jan 2019 17:55:08 - 1.6
+++ patches/patch-Makefile_in 20 Sep 2019 20:41:27 -
@@ -3,12 +3,12 @@ $OpenBSD: patch-Makefile_in,v 1.6 2019/0
Index: Makefile.in
--- Makefile.in.orig
+++ Makefile.in
-@@ -123,7 +123,7 @@ LT_AGE = @LT_AGE@
+@@ -125,7 +125,7 @@ LT_AGE = @LT_AGE@
LT_CURRENT = @LT_CURRENT@
LT_RELEASE = @LT_RELEASE@
LT_REVISION = @LT_REVISION@
-LT_LDFLAGS = -no-undefined -rpath $(libdir) -release $(LT_RELEASE)
-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+LT_LDFLAGS = -no-undefined -rpath $(DESTDIR)$(libdir) -version-info
$(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
- all: $(srcdir)/configure Makefile $(objects) $(objects)/$(TARGET)
$(objects)/$(SDLMAIN_TARGET) $(objects)/$(SDLTEST_TARGET)
+ all: $(srcdir)/configure Makefile $(objects)/$(TARGET)
$(objects)/$(SDLMAIN_TARGET) $(objects)/$(SDLTEST_TARGET)
Index: patches/patch-src_SDL_c
===
RCS file: /cvs/ports/devel/sdl2/patches/patch-src_SDL_c,v
retrieving revision 1.2
diff -u -p -r1.2 patch-src_SDL_c
--- patches/patch-src_SDL_c 3 Jan 2019 17:55:08 - 1.2
+++ patches/patch-src_SDL_c 20 Sep 2019 20:41:27 -
@@ -7,7 +7,7 @@ until OpenBSD support has been rolled ou
Index: src/SDL.c
--- src/SDL.c.orig
+++ src/SDL.c
-@@ -228,8 +228,6 @@ SDL_InitSubSystem(Uint32 flags)
+@@ -227,8 +227,6 @@ SDL_InitSubSystem(Uint32 flags)
}
}
SDL_PrivateSubsystemRefCountIncr(SDL_INIT_HAPTIC);
@@ -16,7 +16,7 @@ Index: src/SDL.c
#endif
}
-@@ -449,7 +447,7 @@ SDL_GetPlatform()
+@@ -453,7 +451,7 @@ SDL_GetPlatform()
#elif __NETBSD__
return "NetBSD";
#elif __OPENBSD__
Index: patches/patch-src_joystick_SDL_gamecontroller_c
===
RCS file:
/cvs/ports/devel/sdl2/patches/patch-src_joystick_SDL_gamecontroller_c,v
retrieving revision 1.3
diff -u -p -r1.3 patch-src_joystick_SDL_gamecontroller_c
--- patches/patch-src_joystick_SDL_gamecontroller_c 3 Jan 2019 17:55:08
- 1.3
+++ patches/patch-src_joystick_SDL_gamecontroller_c 20 Sep 2019 20:41:27
-
@@ -1,15 +1,26 @@
-$OpenBSD: patch-src_joystick_SDL_gamecontroller_c,v 1.3 2019/01/03 17:55:08
thfr Exp $
+$OpenBSD$
enable GameController API the Linux fallback way (by posing as Xbox360
controller)
also disable checking string "Xbox 360 Wireless Receiver", so for now
everything will be Xbox360 controller (works with generic joysticks)
map to SDL_GAMECONTROLLERCONFIG envvar if available
+Use layout for XBox360 controller to maximize compatibility because
+many controllers use this mapping
Index: src/joystick/SDL_gamecontroller.c
--- src/joystick/SDL_gamecontroller.c.orig
+++
Maintainer update for sdl2 to 2.0.10
Hi,
The diff below updates SDL2 to 2.0.10. This includes bug fixes,
improved performance due to batched rendering... Release notes at [1].
Bump minor because of addition of added dynamic export changes [2].
The patch for SDL_sysjoystick.c has been upstreamed.
The configuration now needs '--disable-{libsamplerate,sndio,x11}-shared'
to not switch to just dlopening at runtime.
Tested with most consumers without any regressions. Details at [3].
ok?
[1] https://discourse.libsdl.org/t/sdl-2-0-10-released/26429
[2] https://thfr.info/pub/sdl2-2.0.10-check_sym.txt
[3] https://thfr.info/pub/sdl2-2.0.10-consumers_testing.txt
Index: Makefile
===
RCS file: /cvs/ports/devel/sdl2/Makefile,v
retrieving revision 1.27
diff -u -p -r1.27 Makefile
--- Makefile12 Jul 2019 20:46:01 - 1.27
+++ Makefile20 Sep 2019 20:26:10 -
@@ -2,14 +2,13 @@
COMMENT= cross-platform multimedia library
-V= 2.0.9
-REVISION= 0
+V= 2.0.10
DISTNAME= SDL2-${V}
PKGNAME= sdl2-${V}
CATEGORIES=devel
MASTER_SITES= https://www.libsdl.org/release/
-SHARED_LIBS= SDL20.6 # 0.9
+SHARED_LIBS= SDL20.7 # 0.10
HOMEPAGE= https://www.libsdl.org/
@@ -19,10 +18,12 @@ MAINTAINER= Thomas Frohwein
Index: distinfo
===
RCS file: /cvs/ports/devel/sdl2/distinfo,v
retrieving revision 1.8
diff -u -p -r1.8 distinfo
--- distinfo3 Jan 2019 17:55:08 - 1.8
+++ distinfo20 Sep 2019 20:26:10 -
@@ -1,2 +1,2 @@
-SHA256 (SDL2-2.0.9.tar.gz) = JVGG3GduzQwdvxDsiizF1oabUHnYo4GUwq7N/1SzJLE=
-SIZE (SDL2-2.0.9.tar.gz) = 5246942
+SHA256 (SDL2-2.0.10.tar.gz) = tGVsE6Hw0AI64vSpzwjskv/7Rk4PJCODN3hBWbi5HVc=
+SIZE (SDL2-2.0.10.tar.gz) = 5550762
Index: patches/patch-Makefile_in
===
RCS file: /cvs/ports/devel/sdl2/patches/patch-Makefile_in,v
retrieving revision 1.6
diff -u -p -r1.6 patch-Makefile_in
--- patches/patch-Makefile_in 3 Jan 2019 17:55:08 - 1.6
+++ patches/patch-Makefile_in 20 Sep 2019 20:26:10 -
@@ -3,12 +3,12 @@ $OpenBSD: patch-Makefile_in,v 1.6 2019/0
Index: Makefile.in
--- Makefile.in.orig
+++ Makefile.in
-@@ -123,7 +123,7 @@ LT_AGE = @LT_AGE@
+@@ -125,7 +125,7 @@ LT_AGE = @LT_AGE@
LT_CURRENT = @LT_CURRENT@
LT_RELEASE = @LT_RELEASE@
LT_REVISION = @LT_REVISION@
-LT_LDFLAGS = -no-undefined -rpath $(libdir) -release $(LT_RELEASE)
-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+LT_LDFLAGS = -no-undefined -rpath $(DESTDIR)$(libdir) -version-info
$(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
- all: $(srcdir)/configure Makefile $(objects) $(objects)/$(TARGET)
$(objects)/$(SDLMAIN_TARGET) $(objects)/$(SDLTEST_TARGET)
+ all: $(srcdir)/configure Makefile $(objects)/$(TARGET)
$(objects)/$(SDLMAIN_TARGET) $(objects)/$(SDLTEST_TARGET)
Index: patches/patch-src_SDL_c
===
RCS file: /cvs/ports/devel/sdl2/patches/patch-src_SDL_c,v
retrieving revision 1.2
diff -u -p -r1.2 patch-src_SDL_c
--- patches/patch-src_SDL_c 3 Jan 2019 17:55:08 - 1.2
+++ patches/patch-src_SDL_c 20 Sep 2019 20:26:10 -
@@ -7,7 +7,7 @@ until OpenBSD support has been rolled ou
Index: src/SDL.c
--- src/SDL.c.orig
+++ src/SDL.c
-@@ -228,8 +228,6 @@ SDL_InitSubSystem(Uint32 flags)
+@@ -227,8 +227,6 @@ SDL_InitSubSystem(Uint32 flags)
}
}
SDL_PrivateSubsystemRefCountIncr(SDL_INIT_HAPTIC);
@@ -16,7 +16,7 @@ Index: src/SDL.c
#endif
}
-@@ -449,7 +447,7 @@ SDL_GetPlatform()
+@@ -453,7 +451,7 @@ SDL_GetPlatform()
#elif __NETBSD__
return "NetBSD";
#elif __OPENBSD__
Index: patches/patch-src_joystick_SDL_gamecontroller_c
===
RCS file:
/cvs/ports/devel/sdl2/patches/patch-src_joystick_SDL_gamecontroller_c,v
retrieving revision 1.3
diff -u -p -r1.3 patch-src_joystick_SDL_gamecontroller_c
--- patches/patch-src_joystick_SDL_gamecontroller_c 3 Jan 2019 17:55:08
- 1.3
+++ patches/patch-src_joystick_SDL_gamecontroller_c 20 Sep 2019 20:26:10
-
@@ -1,15 +1,26 @@
-$OpenBSD: patch-src_joystick_SDL_gamecontroller_c,v 1.3 2019/01/03 17:55:08
thfr Exp $
+$OpenBSD$
enable GameController API the Linux fallback way (by posing as Xbox360
controller)
also disable checking string "Xbox 360 Wireless Receiver", so for now
everything will be Xbox360 controller (works with generic joysticks)
map to SDL_GAMECONTROLLERCONFIG envvar if available
+Use layout for XBox360 controller to maximize compatibility because
+many controllers use this mapping
Index: src/joystick/SDL_gamecontroller.c
--- src/joystick/SDL_gamecontroller.c.orig
+++ src/joystick/SDL_gamecontroller.c
-@@ -1008,17 +1008,23 @@ static ControllerMapping_t
