CVS commit: pkgsrc/devel/SDL2

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/devel/SDL2
From: "Ryo ONODERA" <ryoon%netbsd.org@localhost>
Date: Wed, 24 Aug 2022 13:09:34 +0000

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Wed Aug 24 13:09:34 UTC 2022

Modified Files:
        pkgsrc/devel/SDL2: Makefile buildlink3.mk distinfo
Added Files:
        pkgsrc/devel/SDL2/patches: patch-configure patch-configure.ac

Log Message:
SDL2: Fix pkg-config .pc file and fix pulseaudio option

* Bump PKGREVISION.
* sdl2.pc has -liconv in Libs.private and it is incorrect.
  Detect iconv function in libc.
* Fix pulseaudio option by disabling shared link.
* Add pulseaudio support to buildlink3.mk to fix fonts/SDL2_ttf
  when pulseaudio option is enable in devel/SDL2.


To generate a diff of this commit:
cvs rdiff -u -r1.66 -r1.67 pkgsrc/devel/SDL2/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/devel/SDL2/buildlink3.mk
cvs rdiff -u -r1.52 -r1.53 pkgsrc/devel/SDL2/distinfo
cvs rdiff -u -r0 -r1.10 pkgsrc/devel/SDL2/patches/patch-configure
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/SDL2/patches/patch-configure.ac

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/SDL2/Makefile
diff -u pkgsrc/devel/SDL2/Makefile:1.66 pkgsrc/devel/SDL2/Makefile:1.67
--- pkgsrc/devel/SDL2/Makefile:1.66     Mon Aug 22 10:51:11 2022
+++ pkgsrc/devel/SDL2/Makefile  Wed Aug 24 13:09:34 2022
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.66 2022/08/22 10:51:11 wiz Exp $
+# $NetBSD: Makefile,v 1.67 2022/08/24 13:09:34 ryoon Exp $
 
 DISTNAME=      SDL2-2.24.0
+PKGREVISION=   1
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=libsdl-org/}
 GITHUB_PROJECT=        SDL
@@ -16,12 +17,23 @@ USE_LIBTOOL=        yes
 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
 
 # Explicitly link against libraries.
 CONFIGURE_ARGS+=       --disable-alsa-shared
 CONFIGURE_ARGS+=       --disable-jack-shared
+CONFIGURE_ARGS+=       --disable-pulseaudio-shared
 CONFIGURE_ARGS+=       --disable-libsamplerate-shared
 CONFIGURE_ARGS+=       --disable-wayland-shared
 CONFIGURE_ARGS+=       --disable-x11-shared

Index: pkgsrc/devel/SDL2/buildlink3.mk
diff -u pkgsrc/devel/SDL2/buildlink3.mk:1.15 pkgsrc/devel/SDL2/buildlink3.mk:1.16
--- pkgsrc/devel/SDL2/buildlink3.mk:1.15        Thu Aug 11 05:08:07 2022
+++ pkgsrc/devel/SDL2/buildlink3.mk     Wed Aug 24 13:09:34 2022
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.15 2022/08/11 05:08:07 gutteridge Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2022/08/24 13:09:34 ryoon Exp $
 
 BUILDLINK_TREE+=       SDL2
 
@@ -21,6 +21,10 @@ pkgbase := SDL2
 .include "../../audio/jack/buildlink3.mk"
 .endif
 
+.if ${PKG_BUILD_OPTIONS.SDL2:Mpulseaudio}
+.include "../../audio/pulseaudio/buildlink3.mk"
+.endif
+
 .if ${PKG_BUILD_OPTIONS.SDL2:Mnas}
 .include "../../audio/nas/buildlink3.mk"
 .endif

Index: pkgsrc/devel/SDL2/distinfo
diff -u pkgsrc/devel/SDL2/distinfo:1.52 pkgsrc/devel/SDL2/distinfo:1.53
--- pkgsrc/devel/SDL2/distinfo:1.52     Mon Aug 22 10:51:11 2022
+++ pkgsrc/devel/SDL2/distinfo  Wed Aug 24 13:09:34 2022
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.52 2022/08/22 10:51:11 wiz Exp $
+$NetBSD: distinfo,v 1.53 2022/08/24 13:09:34 ryoon 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

Added files:

Index: pkgsrc/devel/SDL2/patches/patch-configure
diff -u /dev/null pkgsrc/devel/SDL2/patches/patch-configure:1.10
--- /dev/null   Wed Aug 24 13:09:34 2022
+++ pkgsrc/devel/SDL2/patches/patch-configure   Wed Aug 24 13:09:34 2022
@@ -0,0 +1,64 @@
+$NetBSD: patch-configure,v 1.10 2022/08/24 13:09:34 ryoon Exp $
+
+* Found iconv function in libc. Fix Libs.private=-liconv in sdl2.pc.
+
+--- configure.orig     2022-08-23 14:36:41.507122435 +0000
++++ configure
+@@ -20006,7 +20006,48 @@ then :
+ fi
+ 
+ 
+-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for iconv_open in -liconv" >&5
++    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for iconv_open in -lc" >&5
++printf %s "checking for iconv_open in -lc... " >&6; }
++if test ${ac_cv_lib_c_iconv_open+y}
++then :
++  printf %s "(cached) " >&6
++else $as_nop
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lc  $LIBS"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
++char iconv_open ();
++int
++main (void)
++{
++return iconv_open ();
++  ;
++  return 0;
++}
++_ACEOF
++if ac_fn_c_try_link "$LINENO"
++then :
++  ac_cv_lib_c_iconv_open=yes
++else $as_nop
++  ac_cv_lib_c_iconv_open=no
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.beam \
++    conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_iconv_open" >&5
++printf "%s\n" "$ac_cv_lib_c_iconv_open" >&6; }
++if test "x$ac_cv_lib_c_iconv_open" = xyes
++then :
++  found_libc_iconv=yes
++fi
++
++    if test x$found_libc_iconv != xyes; then
++      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for iconv_open in -liconv" >&5
+ printf %s "checking for iconv_open in -liconv... " >&6; }
+ if test ${ac_cv_lib_iconv_iconv_open+y}
+ then :
+@@ -20046,6 +20087,7 @@ then :
+   LIBS="$LIBS -liconv"; EXTRA_LDFLAGS="$EXTRA_LDFLAGS -liconv"
+ fi
+ 
++    fi
+     ac_fn_c_check_func "$LINENO" "iconv" "ac_cv_func_iconv"
+ if test "x$ac_cv_func_iconv" = xyes
+ then :

Index: pkgsrc/devel/SDL2/patches/patch-configure.ac
diff -u /dev/null pkgsrc/devel/SDL2/patches/patch-configure.ac:1.1
--- /dev/null   Wed Aug 24 13:09:34 2022
+++ pkgsrc/devel/SDL2/patches/patch-configure.ac        Wed Aug 24 13:09:34 2022
@@ -0,0 +1,18 @@
+$NetBSD: patch-configure.ac,v 1.1 2022/08/24 13:09:34 ryoon Exp $
+
+* 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
+@@ -352,7 +352,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)
+ 
+-    AC_CHECK_LIB(iconv, iconv_open, [LIBS="$LIBS -liconv"; EXTRA_LDFLAGS="$EXTRA_LDFLAGS -liconv"])
++    AC_CHECK_LIB(c, iconv_open, found_libc_iconv=yes)
++    if test x$found_libc_iconv != xyes; then
++      AC_CHECK_LIB(iconv, iconv_open, [LIBS="$LIBS -liconv"; EXTRA_LDFLAGS="$EXTRA_LDFLAGS -liconv"])
++    fi
+     AC_CHECK_FUNCS(iconv)
+ 
+     AC_CHECK_MEMBER(struct sigaction.sa_sigaction,[AC_DEFINE([HAVE_SA_SIGACTION], 1, [ ])], ,[#include <signal.h>])

Prev by Date: CVS commit: pkgsrc/misc/libreoffice
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/misc/libreoffice
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index