CVS commit: pkgsrc/emulators

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/emulators
From: "Nia Alarie" <nia%netbsd.org@localhost>
Date: Wed, 1 Apr 2020 10:08:15 +0000

Module Name:    pkgsrc
Committed By:   nia
Date:           Wed Apr  1 10:08:15 UTC 2020

Modified Files:
        pkgsrc/emulators/snes9x: Makefile Makefile.common distinfo
        pkgsrc/emulators/snes9x-gtk: Makefile options.mk
        pkgsrc/emulators/snes9x/patches: patch-unix_configure

Log Message:
snes9x: Use minizip. Add wayland and portaudio options to the gtk variant.

Bump PKGREVISION


To generate a diff of this commit:
cvs rdiff -u -r1.58 -r1.59 pkgsrc/emulators/snes9x/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/emulators/snes9x/Makefile.common
cvs rdiff -u -r1.24 -r1.25 pkgsrc/emulators/snes9x/distinfo
cvs rdiff -u -r1.74 -r1.75 pkgsrc/emulators/snes9x-gtk/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/emulators/snes9x-gtk/options.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/emulators/snes9x/patches/patch-unix_configure

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

Modified files:

Index: pkgsrc/emulators/snes9x/Makefile
diff -u pkgsrc/emulators/snes9x/Makefile:1.58 pkgsrc/emulators/snes9x/Makefile:1.59
--- pkgsrc/emulators/snes9x/Makefile:1.58       Tue Jan  1 22:16:14 2019
+++ pkgsrc/emulators/snes9x/Makefile    Wed Apr  1 10:08:15 2020
@@ -1,4 +1,6 @@
-# $NetBSD: Makefile,v 1.58 2019/01/01 22:16:14 nia Exp $
+# $NetBSD: Makefile,v 1.59 2020/04/01 10:08:15 nia Exp $
+
+PKGREVISION=   1
 
 .include "../../emulators/snes9x/Makefile.common"
 
@@ -7,11 +9,15 @@ COMMENT=      Super Nintendo Entertainment Sy
 
 CONFIGURE_DIRS=                unix
 BUILD_DIRS=            unix
-USE_TOOLS+=            gmake
+
 GNU_CONFIGURE=         yes
 
+USE_TOOLS+=            gmake pkg-config
+
 CONFIGURE_ARGS+=       --enable-netplay
 
+CONFIGURE_ARGS+=       --with-system-zip
+
 .include "../../mk/oss.buildlink3.mk"
 
 .if ${OSS_TYPE} != "none"
@@ -45,7 +51,7 @@ do-install:
        ${INSTALL_MAN} ${WRKSRC}/unix/docs/readme_unix.html \
            ${DESTDIR}${PREFIX}/share/doc/snes9x
 
-.include "../../mk/libusb.buildlink3.mk"
+.include "../../archivers/minizip/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../x11/libSM/buildlink3.mk"

Index: pkgsrc/emulators/snes9x/Makefile.common
diff -u pkgsrc/emulators/snes9x/Makefile.common:1.4 pkgsrc/emulators/snes9x/Makefile.common:1.5
--- pkgsrc/emulators/snes9x/Makefile.common:1.4 Thu Apr 25 13:06:58 2019
+++ pkgsrc/emulators/snes9x/Makefile.common     Wed Apr  1 10:08:15 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.4 2019/04/25 13:06:58 nia Exp $
+# $NetBSD: Makefile.common,v 1.5 2020/04/01 10:08:15 nia Exp $
 
 # used by emulators/libretro-snes9x/Makefile
 # used by emulators/snes9x/Makefile
@@ -14,5 +14,4 @@ GITHUB_TAG=           ${SNES9X_VERSION}
 HOMEPAGE=              http://www.snes9x.com/
 LICENSE=               snes9x-license
 
-EXTRACT_USING=         bsdtar
 USE_LANGUAGES=         c c++11

Index: pkgsrc/emulators/snes9x/distinfo
diff -u pkgsrc/emulators/snes9x/distinfo:1.24 pkgsrc/emulators/snes9x/distinfo:1.25
--- pkgsrc/emulators/snes9x/distinfo:1.24       Thu Apr 25 13:06:58 2019
+++ pkgsrc/emulators/snes9x/distinfo    Wed Apr  1 10:08:15 2020
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.24 2019/04/25 13:06:58 nia Exp $
+$NetBSD: distinfo,v 1.25 2020/04/01 10:08:15 nia Exp $
 
 SHA1 (snes9x-1.60.tar.gz) = 96422e0257312dcbb4591ec3b9f83bef5a92e1b8
 RMD160 (snes9x-1.60.tar.gz) = c42d3f7c1fce0b6901c8f65dc07a626d9b58c873
 SHA512 (snes9x-1.60.tar.gz) = 840b006a8fbd479fd5ceb2d94af4ef6470c5e27a3e6c8ddb0dffc8d3e51f465669144cd428bfce28b2ed4f68e70d8f252f2d8a2cae602ba797791d7e483c14c9
 Size (snes9x-1.60.tar.gz) = 2863228 bytes
-SHA1 (patch-unix_configure) = 9df9a805141396583bceb35bea1bda157ed3ed6b
+SHA1 (patch-unix_configure) = dcfc4d8c2e2527fc91a1abb0d04a96a15e6a65c8
 SHA1 (patch-unix_unix.cpp) = 4ef289037fcd7a540b021ead7d906800c932e1bc

Index: pkgsrc/emulators/snes9x-gtk/Makefile
diff -u pkgsrc/emulators/snes9x-gtk/Makefile:1.74 pkgsrc/emulators/snes9x-gtk/Makefile:1.75
--- pkgsrc/emulators/snes9x-gtk/Makefile:1.74   Fri Mar 27 07:55:40 2020
+++ pkgsrc/emulators/snes9x-gtk/Makefile        Wed Apr  1 10:08:15 2020
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.74 2020/03/27 07:55:40 nia Exp $
+# $NetBSD: Makefile,v 1.75 2020/04/01 10:08:15 nia Exp $
 
-PKGREVISION= 5
+PKGREVISION= 6
 .include "../../emulators/snes9x/Makefile.common"
 
 PKGNAME=       snes9x-gtk-${SNES9X_VERSION}
@@ -14,9 +14,6 @@ USE_TOOLS+=   gawk
 
 CONFIGURE_DIRS=        gtk
 
-MESON_ARGS+=   -Dsystem-zip=false
-MESON_ARGS+=   -Dportaudio=false
-
 BUILD_DEPENDS+=        gettext-m4-[0-9]*:../../devel/gettext-m4
 
 .include "../../mk/oss.buildlink3.mk"
@@ -37,6 +34,7 @@ LDFLAGS.SunOS+=               -lsocket -lnsl
 
 .include "options.mk"
 .include "../../devel/meson/build.mk"
+.include "../../archivers/minizip/buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/SDL2/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"

Index: pkgsrc/emulators/snes9x-gtk/options.mk
diff -u pkgsrc/emulators/snes9x-gtk/options.mk:1.3 pkgsrc/emulators/snes9x-gtk/options.mk:1.4
--- pkgsrc/emulators/snes9x-gtk/options.mk:1.3  Tue Mar  5 12:12:31 2019
+++ pkgsrc/emulators/snes9x-gtk/options.mk      Wed Apr  1 10:08:15 2020
@@ -1,12 +1,26 @@
-# $NetBSD: options.mk,v 1.3 2019/03/05 12:12:31 nia Exp $
+# $NetBSD: options.mk,v 1.4 2020/04/01 10:08:15 nia Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.snes9x-gtk
-PKG_SUPPORTED_OPTIONS=         alsa opengl pulseaudio
+PKG_SUPPORTED_OPTIONS=         alsa opengl pulseaudio portaudio wayland
+
 PKG_OPTIONS_REQUIRED_GROUPS=   gtk
 PKG_OPTIONS_GROUP.gtk=         gtk2 gtk3
+
 PKG_SUGGESTED_OPTIONS+=                gtk3 opengl
 PKG_SUGGESTED_OPTIONS.Linux+=  alsa
 
+.include "../../mk/oss.buildlink3.mk"
+
+.if ${OPSYS} != "Linux" && ${OSS_TYPE} == "none"
+PKG_SUGGESTED_OPTIONS+=                portaudio
+.endif
+
+.include "../../devel/wayland/platform.mk"
+
+.if ${PLATFORM_SUPPORTS_WAYLAND} == "yes"
+PKG_SUGGESTED_OPTIONS+=                wayland
+.endif
+
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Malsa)
@@ -42,3 +56,17 @@ MESON_ARGS+= -Dpulseaudio=true
 .else
 MESON_ARGS+=   -Dpulseaudio=false
 .endif
+
+.if !empty(PKG_OPTIONS:Mportaudio)
+.include "../../audio/portaudio/buildlink3.mk"
+MESON_ARGS+=   -Dportaudio=true
+.else
+MESON_ARGS+=   -Dportaudio=false
+.endif
+
+.if !empty(PKG_OPTIONS:Mwayland)
+.include "../../devel/wayland/buildlink3.mk"
+MESON_ARGS+=   -Dwayland=true
+.else
+MESON_ARGS+=   -Dwayland=false
+.endif

Index: pkgsrc/emulators/snes9x/patches/patch-unix_configure
diff -u pkgsrc/emulators/snes9x/patches/patch-unix_configure:1.1 pkgsrc/emulators/snes9x/patches/patch-unix_configure:1.2
--- pkgsrc/emulators/snes9x/patches/patch-unix_configure:1.1    Tue Jan  1 22:16:14 2019
+++ pkgsrc/emulators/snes9x/patches/patch-unix_configure        Wed Apr  1 10:08:15 2020
@@ -1,18 +1,28 @@
-$NetBSD: patch-unix_configure,v 1.1 2019/01/01 22:16:14 nia Exp $
+$NetBSD: patch-unix_configure,v 1.2 2020/04/01 10:08:15 nia Exp $
 
 !Linux sometimes has OSS.
 
---- unix/configure.orig        2018-12-16 17:04:59.000000000 +0000
+--- unix/configure.orig        2019-04-23 18:57:18.000000000 +0000
 +++ unix/configure
-@@ -6301,12 +6301,12 @@ $as_echo "yes" >&6; }
- $as_echo "no" >&6; }
-               { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Your OS is not Linux. Build without sound support." >&5
- $as_echo "$as_me: WARNING: Your OS is not Linux. Build without sound support." >&2;}
--              enable_sound="no"
-       fi
- fi
+@@ -6291,22 +6291,8 @@ fi
+ 
  
  if test "x$enable_sound" = "xyes"; then
+-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether sound is supported on this platform" >&5
+-$as_echo_n "checking whether sound is supported on this platform... " >&6; }
+-      if test "x$snes9x_cv_linux_os" = "xyes"; then
+-              { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+-$as_echo "yes" >&6; }
+-      else
+-              { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-              { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Your OS is not Linux. Build without sound support." >&5
+-$as_echo "$as_me: WARNING: Your OS is not Linux. Build without sound support." >&2;}
+-              enable_sound="no"
+-      fi
+-fi
+-
+-if test "x$enable_sound" = "xyes"; then
        ac_fn_cxx_check_header_mongrel "$LINENO" "pthread.h" "ac_cv_header_pthread_h" "$ac_includes_default"
 +              S9XLIBS="$S9XLIBS $LIBOSSAUDIO"
  if test "x$ac_cv_header_pthread_h" = xyes; then :

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/mail/offlineimap
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/mail/offlineimap
Indexes:

Home | Main Index | Thread Index | Old Index