pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/devel/SDL2 SDL2: update to 2.24.1
details: https://anonhg.NetBSD.org/pkgsrc/rev/abd64bc5080d
branches: trunk
changeset: 387105:abd64bc5080d
user: nia <nia%pkgsrc.org@localhost>
date: Sat Oct 22 16:30:49 2022 +0000
description:
SDL2: update to 2.24.1
General
Fixed shader compilation issues using the OpenGL ES2 renderer
Fixed configure tests failing when using clang 15
macOS
Fixed new windows setting the SDL_WINDOW_BORDERLESS flag incorrectly
Fixed audio race condition on shutdown
Fixed crash if there are no input devices available
FreeBSD
Fixed building with libusb not dynamically loaded, enabling HIDAPI support
diffstat:
devel/SDL2/Makefile | 15 +-----
devel/SDL2/distinfo | 12 ++--
devel/SDL2/patches/patch-configure | 78 +++++++++++++++++++++++++++++++++-
devel/SDL2/patches/patch-configure.ac | 26 ++++++++++-
4 files changed, 105 insertions(+), 26 deletions(-)
diffs (180 lines):
diff -r 057439f953c4 -r abd64bc5080d devel/SDL2/Makefile
--- a/devel/SDL2/Makefile Sat Oct 22 16:00:38 2022 +0000
+++ b/devel/SDL2/Makefile Sat Oct 22 16:30:49 2022 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.68 2022/09/11 12:51:05 wiz Exp $
+# $NetBSD: Makefile,v 1.69 2022/10/22 16:30:49 nia Exp $
-DISTNAME= SDL2-2.24.0
-PKGREVISION= 2
+DISTNAME= SDL2-2.24.1
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GITHUB:=libsdl-org/}
GITHUB_PROJECT= SDL
@@ -17,16 +16,6 @@
USE_TOOLS+= gmake pkg-config
GNU_CONFIGURE= yes
-.include "../../mk/bsd.prefs.mk"
-.if ${OPSYS} == "NetBSD"
-SUBST_CLASSES+= gsort
-SUBST_STAGE.gsort= pre-configure
-SUBST_MESSAGE.gsort= BSD sort has no -V option
-SUBST_FILES.gsort+= configure
-SUBST_FILES.gsort+= configure.ac
-SUBST_SED.gsort+= -e 's,sort -V,sort,g'
-.endif
-
# Let pkgsrc handle the rpath.
CONFIGURE_ARGS+= --disable-rpath
diff -r 057439f953c4 -r abd64bc5080d devel/SDL2/distinfo
--- a/devel/SDL2/distinfo Sat Oct 22 16:00:38 2022 +0000
+++ b/devel/SDL2/distinfo Sat Oct 22 16:30:49 2022 +0000
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.53 2022/08/24 13:09:34 ryoon Exp $
+$NetBSD: distinfo,v 1.54 2022/10/22 16:30:49 nia Exp $
-BLAKE2s (SDL2-2.24.0.tar.gz) = 87aa504e5485612a5c5adedd1115ced216710258ec62122cd5f3c7539f50724d
-SHA512 (SDL2-2.24.0.tar.gz) = 5735bfc7b22f1780f80cc89f62a14ca809fe1280298d172f92dde74400db1f5378f8d3eae8834e886d3ca4f5ae6f1074d66c5c956613cf9e0cce961738514212
-Size (SDL2-2.24.0.tar.gz) = 7520541 bytes
-SHA1 (patch-configure) = 0eb358082bf3b61ee53c9887a6616b5f008ba8cc
-SHA1 (patch-configure.ac) = 8681cc974c43353713c59dff85ae912910c88ae5
+BLAKE2s (SDL2-2.24.1.tar.gz) = 52bdf935c23a0ea10886033778ef5f79e79b03e13304daadd1d8e620dc986729
+SHA512 (SDL2-2.24.1.tar.gz) = 2af719bdbdd923ddd3845fe7fcaa9dd9e2b6db7bb47d59dbcd726e97291b1c232c8a2a95dbee9033142f00d53c7cf23248067846cfe5441b1a3bc7bf9eb93b9e
+Size (SDL2-2.24.1.tar.gz) = 7523849 bytes
+SHA1 (patch-configure) = bcb8830c4fa46d2bb597ba6c769c4671b0aa35f2
+SHA1 (patch-configure.ac) = f01a715d7854b36d430fb35e16bf11dfa4eaaccc
diff -r 057439f953c4 -r abd64bc5080d devel/SDL2/patches/patch-configure
--- a/devel/SDL2/patches/patch-configure Sat Oct 22 16:00:38 2022 +0000
+++ b/devel/SDL2/patches/patch-configure Sat Oct 22 16:30:49 2022 +0000
@@ -1,10 +1,80 @@
-$NetBSD: patch-configure,v 1.10 2022/08/24 13:09:34 ryoon Exp $
+$NetBSD: patch-configure,v 1.11 2022/10/22 16:30:49 nia Exp $
+* Remove non-portable sort usage.
* Found iconv function in libc. Fix Libs.private=-liconv in sdl2.pc.
---- configure.orig 2022-08-23 14:36:41.507122435 +0000
+--- configure.orig 2022-10-04 23:48:35.000000000 +0000
+++ configure
-@@ -20006,7 +20006,48 @@ then :
+@@ -17902,59 +17902,6 @@ if test -z "$AWK" ; then
+ as_fn_error $? "*** awk not found, aborting" "$LINENO" 5
+ fi
+
+-for ac_prog in gsort sort
+-do
+- # Extract the first word of "$ac_prog", so it can be a program name with args.
+-set dummy $ac_prog; ac_word=$2
+-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-printf %s "checking for $ac_word... " >&6; }
+-if test ${ac_cv_prog_SORT+y}
+-then :
+- printf %s "(cached) " >&6
+-else $as_nop
+- if test -n "$SORT"; then
+- ac_cv_prog_SORT="$SORT" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- case $as_dir in #(((
+- '') as_dir=./ ;;
+- */) ;;
+- *) as_dir=$as_dir/ ;;
+- esac
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+- ac_cv_prog_SORT="$ac_prog"
+- printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+- break 2
+- fi
+-done
+- done
+-IFS=$as_save_IFS
+-
+-fi
+-fi
+-SORT=$ac_cv_prog_SORT
+-if test -n "$SORT"; then
+- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $SORT" >&5
+-printf "%s\n" "$SORT" >&6; }
+-else
+- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-printf "%s\n" "no" >&6; }
+-fi
+-
+-
+- test -n "$SORT" && break
+-done
+-test -n "$SORT" || SORT="false"
+-
+-if ! "$SORT" -V </dev/null >/dev/null
+-then :
+- as_fn_error $? "GNU sort(1) is required" "$LINENO" 5
+-fi
+-
+ # Check whether --enable-largefile was given.
+ if test ${enable_largefile+y}
+ then :
+@@ -18284,7 +18231,7 @@ find_lib()
+ host_lib_path="/usr/$base_libdir /usr/local/$base_libdir"
+ fi
+ for path in $env_lib_path $gcc_bin_path $gcc_lib_path $host_lib_path; do
+- lib=`ls -- $path/$1 2>/dev/null | sed 's,.*/,,' | "$SORT" -V -r | $AWK 'BEGIN{FS="."}{ print NF, $0 }' | "$SORT" -n -s | sed 's,[0-9]* ,,' | head -1`
++ lib=`ls -- $path/$1 2>/dev/null | sed 's,.*/,,' | "$SORT" -r | $AWK 'BEGIN{FS="."}{ print NF, $0 }' | "$SORT" -n -s | sed 's,[0-9]* ,,' | head -1`
+ if test x$lib != x; then
+ echo $lib
+ return
+@@ -19883,7 +19830,48 @@ then :
fi
@@ -54,7 +124,7 @@
printf %s "checking for iconv_open in -liconv... " >&6; }
if test ${ac_cv_lib_iconv_iconv_open+y}
then :
-@@ -20046,6 +20087,7 @@ then :
+@@ -19923,6 +19911,7 @@ then :
LIBS="$LIBS -liconv"; EXTRA_LDFLAGS="$EXTRA_LDFLAGS -liconv"
fi
diff -r 057439f953c4 -r abd64bc5080d devel/SDL2/patches/patch-configure.ac
--- a/devel/SDL2/patches/patch-configure.ac Sat Oct 22 16:00:38 2022 +0000
+++ b/devel/SDL2/patches/patch-configure.ac Sat Oct 22 16:30:49 2022 +0000
@@ -1,10 +1,30 @@
-$NetBSD: patch-configure.ac,v 1.1 2022/08/24 13:09:34 ryoon Exp $
+$NetBSD: patch-configure.ac,v 1.2 2022/10/22 16:30:49 nia Exp $
+* Remove non-portable sort usage.
* Found iconv function in libc. Fix Libs.private=-liconv in sdl2.pc.
---- configure.ac.orig 2022-08-19 15:46:21.000000000 +0000
+--- configure.ac.orig 2022-10-04 23:48:35.000000000 +0000
+++ configure.ac
-@@ -352,7 +352,10 @@ dnl Checks for library functions.
+@@ -70,9 +70,6 @@ if [ test -z "$AWK" ]; then
+ AC_MSG_ERROR([*** awk not found, aborting])
+ fi
+
+-AC_CHECK_PROGS([SORT], [gsort sort], [false])
+-AS_IF([! "$SORT" -V </dev/null >/dev/null], [AC_MSG_ERROR([GNU sort(1) is required])])
+-
+ dnl 64-bit file offsets if possible unless --disable-largefile is specified
+ AC_SYS_LARGEFILE
+
+@@ -189,7 +186,7 @@ find_lib()
+ host_lib_path="/usr/$base_libdir /usr/local/$base_libdir"
+ fi
+ for path in $env_lib_path $gcc_bin_path $gcc_lib_path $host_lib_path; do
+- lib=[`ls -- $path/$1 2>/dev/null | sed 's,.*/,,' | "$SORT" -V -r | $AWK 'BEGIN{FS="."}{ print NF, $0 }' | "$SORT" -n -s | sed 's,[0-9]* ,,' | head -1`]
++ lib=[`ls -- $path/$1 2>/dev/null | sed 's,.*/,,' | "$SORT" -r | $AWK 'BEGIN{FS="."}{ print NF, $0 }' | "$SORT" -n -s | sed 's,[0-9]* ,,' | head -1`]
+ if test x$lib != x; then
+ echo $lib
+ return
+@@ -347,7 +344,10 @@ dnl Checks for library functions.
AC_CHECK_LIB(m, pow, [LIBS="$LIBS -lm"; EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lm"])
AC_CHECK_FUNCS(acos acosf asin asinf atan atanf atan2 atan2f ceil ceilf copysign copysignf cos cosf exp expf fabs fabsf floor floorf trunc truncf fmod fmodf log logf log10 log10f lround lroundf
pow powf round roundf scalbn scalbnf sin sinf sqrt sqrtf tan tanf)
Home |
Main Index |
Thread Index |
Old Index