* [ptxdist] [PATCH] sdl2: Version bump. 2.0.16 -> 2.0.20. @ 2022-02-09 21:15 Christian Melki 2022-02-09 21:15 ` [ptxdist] [PATCH] sdl2-ttf: Version bump. 2.0.15 -> 2.0.18 Christian Melki 2022-02-14 12:43 ` [ptxdist] [APPLIED] sdl2: Version bump. 2.0.16 -> 2.0.20 Michael Olbrich 0 siblings, 2 replies; 4+ messages in thread From: Christian Melki @ 2022-02-09 21:15 UTC (permalink / raw) To: ptxdist https://www.libsdl.org/tmp/SDL/WhatsNew.txt * Remove --enable-sdl-dlopen configure option, not used any more. Signed-off-by: Christian Melki <christian.melki@t2data.com> --- rules/sdl2.make | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/rules/sdl2.make b/rules/sdl2.make index 774a33d2f..0489ded86 100644 --- a/rules/sdl2.make +++ b/rules/sdl2.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_SDL2) += sdl2 # # Paths and names # -SDL2_VERSION := 2.0.16 -SDL2_MD5 := 98b8a1535a757ea1d03ae44e2fb20247 +SDL2_VERSION := 2.0.20 +SDL2_MD5 := a53acc02e1cca98c4123229069b67c9e SDL2 := SDL2-$(SDL2_VERSION) SDL2_SUFFIX := tar.gz SDL2_URL := https://www.libsdl.org/release/$(SDL2).$(SDL2_SUFFIX) @@ -131,7 +131,6 @@ SDL2_CONF_OPT := \ --disable-directx \ --$(call ptx/endis,PTXCONF_SDL2_XORG)-xinput \ --disable-wasapi \ - --enable-sdl-dlopen \ --enable-hidapi \ --disable-hidapi-libusb \ --enable-clock_gettime \ -- 2.30.2 _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de ^ permalink raw reply [flat|nested] 4+ messages in thread
* [ptxdist] [PATCH] sdl2-ttf: Version bump. 2.0.15 -> 2.0.18. 2022-02-09 21:15 [ptxdist] [PATCH] sdl2: Version bump. 2.0.16 -> 2.0.20 Christian Melki @ 2022-02-09 21:15 ` Christian Melki 2022-02-14 12:43 ` [ptxdist] [APPLIED] " Michael Olbrich 2022-02-14 12:43 ` [ptxdist] [APPLIED] sdl2: Version bump. 2.0.16 -> 2.0.20 Michael Olbrich 1 sibling, 1 reply; 4+ messages in thread From: Christian Melki @ 2022-02-09 21:15 UTC (permalink / raw) To: ptxdist https://github.com/libsdl-org/SDL_ttf/releases/tag/release-2.0.18 * License seems to be zlib, not unknown. * Correct some minor whitespace issues. Signed-off-by: Christian Melki <christian.melki@t2data.com> --- rules/sdl2-ttf.make | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/rules/sdl2-ttf.make b/rules/sdl2-ttf.make index 161dbf838..1f649e166 100644 --- a/rules/sdl2-ttf.make +++ b/rules/sdl2-ttf.make @@ -14,14 +14,16 @@ PACKAGES-$(PTXCONF_SDL2_TTF) += sdl2-ttf # # Paths and names # -SDL2_TTF_VERSION := 2.0.15 -SDL2_TTF_MD5 := 04fe06ff7623d7bdcb704e82f5f88391 +SDL2_TTF_VERSION := 2.0.18 +SDL2_TTF_MD5 := 86d3023ad3fab597203022f856cff103 SDL2_TTF := SDL2_ttf-$(SDL2_TTF_VERSION) -SDL2_TTF_SUFFIX := tar.gz +SDL2_TTF_SUFFIX := tar.gz SDL2_TTF_URL := https://www.libsdl.org/projects/SDL_ttf/release/$(SDL2_TTF).$(SDL2_TTF_SUFFIX) -SDL2_TTF_SOURCE := $(SRCDIR)/$(SDL2_TTF).$(SDL2_TTF_SUFFIX) +SDL2_TTF_SOURCE := $(SRCDIR)/$(SDL2_TTF).$(SDL2_TTF_SUFFIX) SDL2_TTF_DIR := $(BUILDDIR)/$(SDL2_TTF) -SDL2_TTF_LICENSE := unknown +SDL2_TTF_LICENSE := zlib +SDL2_TTF_LICENSE_FILES := \ + file://COPYING.txt;md5=e98cfd01ca78f683e9d035795810ce87 # ---------------------------------------------------------------------------- # Prepare @@ -29,8 +31,7 @@ SDL2_TTF_LICENSE := unknown SDL2_TTF_CONF_TOOL := autoconf SDL2_TTF_CONF_OPT := \ - $(CROSS_AUTOCONF_USR) \ - --$(call ptx/endis,PTXCONF_SDL2_OPENGL)-opengl + $(CROSS_AUTOCONF_USR) ifdef PTXCONF_SDL2_PULSEAUDIO SDL2_TTF_LDFLAGS := \ -- 2.30.2 _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [ptxdist] [APPLIED] sdl2-ttf: Version bump. 2.0.15 -> 2.0.18. 2022-02-09 21:15 ` [ptxdist] [PATCH] sdl2-ttf: Version bump. 2.0.15 -> 2.0.18 Christian Melki @ 2022-02-14 12:43 ` Michael Olbrich 0 siblings, 0 replies; 4+ messages in thread From: Michael Olbrich @ 2022-02-14 12:43 UTC (permalink / raw) To: ptxdist; +Cc: Christian Melki Thanks, applied as ecdb401adb0e17cb779758a6f18cddac9e02e0c0. Michael [sent from post-receive hook] On Mon, 14 Feb 2022 13:43:44 +0100, Christian Melki <christian.melki@t2data.com> wrote: > https://github.com/libsdl-org/SDL_ttf/releases/tag/release-2.0.18 > > * License seems to be zlib, not unknown. > * Correct some minor whitespace issues. > > Signed-off-by: Christian Melki <christian.melki@t2data.com> > Message-Id: <20220209211524.3384121-2-christian.melki@t2data.com> > [mol: don't forget the patches] > Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> > > diff --git a/patches/SDL2_ttf-2.0.15/0001-configure-make-opengl-support-switchable.patch b/patches/SDL2_ttf-2.0.18/0001-configure-make-opengl-support-switchable.patch > similarity index 66% > rename from patches/SDL2_ttf-2.0.15/0001-configure-make-opengl-support-switchable.patch > rename to patches/SDL2_ttf-2.0.18/0001-configure-make-opengl-support-switchable.patch > index dd347096320e..95d04c40c595 100644 > --- a/patches/SDL2_ttf-2.0.15/0001-configure-make-opengl-support-switchable.patch > +++ b/patches/SDL2_ttf-2.0.18/0001-configure-make-opengl-support-switchable.patch > @@ -4,16 +4,16 @@ Subject: [PATCH] configure: make opengl support switchable > > Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de> > --- > - configure.in | 7 +++++++ > + configure.ac | 7 +++++++ > 1 file changed, 7 insertions(+) > > -diff --git a/configure.in b/configure.in > -index 32b3a9139efd..d77bab0c0069 100644 > ---- a/configure.in > -+++ b/configure.in > -@@ -105,6 +105,12 @@ AM_PATH_SDL2($SDL_VERSION, > - CFLAGS="$CFLAGS $SDL_CFLAGS" > - LIBS="$LIBS $SDL_LIBS" > +diff --git a/configure.ac b/configure.ac > +index cb2a65ee83b7..7123a7c564b4 100644 > +--- a/configure.ac > ++++ b/configure.ac > +@@ -232,6 +232,12 @@ CheckVisibilityHidden() > + } > + CheckVisibilityHidden > > +dnl Check to see if OpenGL support is desired > +AC_ARG_ENABLE(opengl, > @@ -23,12 +23,12 @@ index 32b3a9139efd..d77bab0c0069 100644 > +if test x$enable_opengl = xyes; then > dnl Check for OpenGL > case "$host" in > - *-*-cygwin* | *-*-mingw32*) > -@@ -157,6 +163,7 @@ else > + *-*-cygwin* | *-*-mingw*) > +@@ -282,6 +288,7 @@ else > GL_LIBS="" > fi > AC_SUBST([GL_LIBS]) > +fi > AC_SUBST([MATHLIB]) > AC_SUBST([WINDRES]) > - > + AC_SUBST([TTF_CFLAGS]) > diff --git a/patches/SDL2_ttf-2.0.15/autogen.sh b/patches/SDL2_ttf-2.0.18/autogen.sh > similarity index 100% > rename from patches/SDL2_ttf-2.0.15/autogen.sh > rename to patches/SDL2_ttf-2.0.18/autogen.sh > diff --git a/patches/SDL2_ttf-2.0.15/series b/patches/SDL2_ttf-2.0.18/series > similarity index 100% > rename from patches/SDL2_ttf-2.0.15/series > rename to patches/SDL2_ttf-2.0.18/series > diff --git a/rules/sdl2-ttf.make b/rules/sdl2-ttf.make > index 161dbf838431..1f649e166b3d 100644 > --- a/rules/sdl2-ttf.make > +++ b/rules/sdl2-ttf.make > @@ -14,14 +14,16 @@ PACKAGES-$(PTXCONF_SDL2_TTF) += sdl2-ttf > # > # Paths and names > # > -SDL2_TTF_VERSION := 2.0.15 > -SDL2_TTF_MD5 := 04fe06ff7623d7bdcb704e82f5f88391 > +SDL2_TTF_VERSION := 2.0.18 > +SDL2_TTF_MD5 := 86d3023ad3fab597203022f856cff103 > SDL2_TTF := SDL2_ttf-$(SDL2_TTF_VERSION) > -SDL2_TTF_SUFFIX := tar.gz > +SDL2_TTF_SUFFIX := tar.gz > SDL2_TTF_URL := https://www.libsdl.org/projects/SDL_ttf/release/$(SDL2_TTF).$(SDL2_TTF_SUFFIX) > -SDL2_TTF_SOURCE := $(SRCDIR)/$(SDL2_TTF).$(SDL2_TTF_SUFFIX) > +SDL2_TTF_SOURCE := $(SRCDIR)/$(SDL2_TTF).$(SDL2_TTF_SUFFIX) > SDL2_TTF_DIR := $(BUILDDIR)/$(SDL2_TTF) > -SDL2_TTF_LICENSE := unknown > +SDL2_TTF_LICENSE := zlib > +SDL2_TTF_LICENSE_FILES := \ > + file://COPYING.txt;md5=e98cfd01ca78f683e9d035795810ce87 > > # ---------------------------------------------------------------------------- > # Prepare > @@ -29,8 +31,7 @@ SDL2_TTF_LICENSE := unknown > > SDL2_TTF_CONF_TOOL := autoconf > SDL2_TTF_CONF_OPT := \ > - $(CROSS_AUTOCONF_USR) \ > - --$(call ptx/endis,PTXCONF_SDL2_OPENGL)-opengl > + $(CROSS_AUTOCONF_USR) > > ifdef PTXCONF_SDL2_PULSEAUDIO > SDL2_TTF_LDFLAGS := \ _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [ptxdist] [APPLIED] sdl2: Version bump. 2.0.16 -> 2.0.20. 2022-02-09 21:15 [ptxdist] [PATCH] sdl2: Version bump. 2.0.16 -> 2.0.20 Christian Melki 2022-02-09 21:15 ` [ptxdist] [PATCH] sdl2-ttf: Version bump. 2.0.15 -> 2.0.18 Christian Melki @ 2022-02-14 12:43 ` Michael Olbrich 1 sibling, 0 replies; 4+ messages in thread From: Michael Olbrich @ 2022-02-14 12:43 UTC (permalink / raw) To: ptxdist; +Cc: Christian Melki Thanks, applied as b9a928b84acbb4d04e2a1c38c7a38916bdfe29d7. Michael [sent from post-receive hook] On Mon, 14 Feb 2022 13:43:43 +0100, Christian Melki <christian.melki@t2data.com> wrote: > https://www.libsdl.org/tmp/SDL/WhatsNew.txt > > * Remove --enable-sdl-dlopen configure option, not used any more. > > Signed-off-by: Christian Melki <christian.melki@t2data.com> > Message-Id: <20220209211524.3384121-1-christian.melki@t2data.com> > Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> > > diff --git a/rules/sdl2.make b/rules/sdl2.make > index 774a33d2fcce..0489ded86160 100644 > --- a/rules/sdl2.make > +++ b/rules/sdl2.make > @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_SDL2) += sdl2 > # > # Paths and names > # > -SDL2_VERSION := 2.0.16 > -SDL2_MD5 := 98b8a1535a757ea1d03ae44e2fb20247 > +SDL2_VERSION := 2.0.20 > +SDL2_MD5 := a53acc02e1cca98c4123229069b67c9e > SDL2 := SDL2-$(SDL2_VERSION) > SDL2_SUFFIX := tar.gz > SDL2_URL := https://www.libsdl.org/release/$(SDL2).$(SDL2_SUFFIX) > @@ -131,7 +131,6 @@ SDL2_CONF_OPT := \ > --disable-directx \ > --$(call ptx/endis,PTXCONF_SDL2_XORG)-xinput \ > --disable-wasapi \ > - --enable-sdl-dlopen \ > --enable-hidapi \ > --disable-hidapi-libusb \ > --enable-clock_gettime \ _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-02-14 12:46 UTC | newest] Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2022-02-09 21:15 [ptxdist] [PATCH] sdl2: Version bump. 2.0.16 -> 2.0.20 Christian Melki 2022-02-09 21:15 ` [ptxdist] [PATCH] sdl2-ttf: Version bump. 2.0.15 -> 2.0.18 Christian Melki 2022-02-14 12:43 ` [ptxdist] [APPLIED] " Michael Olbrich 2022-02-14 12:43 ` [ptxdist] [APPLIED] sdl2: Version bump. 2.0.16 -> 2.0.20 Michael Olbrich
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox