CVS commit: pkgsrc/emulators/libretro-desmume

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Sun May 12 09:49:39 UTC 2019

Modified Files:
        pkgsrc/emulators/libretro-desmume: Makefile distinfo
Added Files:
        pkgsrc/emulators/libretro-desmume/patches: patch-desmume_src_wifi.cpp

Log Message:
libretro-desmume: Fix build with older libpcap, hopefully properly this time.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 pkgsrc/emulators/libretro-desmume/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/emulators/libretro-desmume/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/emulators/libretro-desmume/patches/patch-desmume_src_wifi.cpp

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

Modified files:

Index: pkgsrc/emulators/libretro-desmume/Makefile
diff -u pkgsrc/emulators/libretro-desmume/Makefile:1.8 pkgsrc/emulators/libretro-desmume/Makefile:1.9
--- pkgsrc/emulators/libretro-desmume/Makefile:1.8      Thu May  9 14:39:09 2019
+++ pkgsrc/emulators/libretro-desmume/Makefile  Sun May 12 09:49:39 2019
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2019/05/09 14:39:09 nia Exp $
+# $NetBSD: Makefile,v 1.9 2019/05/12 09:49:39 nia Exp $
 
 DISTNAME=      libretro-desmume-20190426
+PKGREVISION=   1
 CATEGORIES=    emulators
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=libretro/}
 GITHUB_PROJECT=        desmume
@@ -21,10 +22,6 @@ USE_LANGUAGES=       c c++
 
 CXXFLAGS+=     -D__STDC_FORMAT_MACROS
 
-# fix build with libpcap-1.8.1
-# see issues/58
-CXXFLAGS+=     -DHAVE_REMOTE
-
 .if !empty(MACHINE_ARCH:M*arm*)
 CXXFLAGS+=     -marm
 CXXFLAGS+=     -DUSE_POSIX_MEMALIGN -D__RETRO_ARM__

Index: pkgsrc/emulators/libretro-desmume/distinfo
diff -u pkgsrc/emulators/libretro-desmume/distinfo:1.3 pkgsrc/emulators/libretro-desmume/distinfo:1.4
--- pkgsrc/emulators/libretro-desmume/distinfo:1.3      Thu May  9 14:39:09 2019
+++ pkgsrc/emulators/libretro-desmume/distinfo  Sun May 12 09:49:39 2019
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.3 2019/05/09 14:39:09 nia Exp $
+$NetBSD: distinfo,v 1.4 2019/05/12 09:49:39 nia Exp $
 
 SHA1 (libretro-desmume-20190426-3069551c2e1de633c333739cca8bb7108ca3d3e9.tar.gz) = f2003af3cc07234de3e24650f25ded9736059c23
 RMD160 (libretro-desmume-20190426-3069551c2e1de633c333739cca8bb7108ca3d3e9.tar.gz) = ab9560820d9b90f5fed4bf5a65c12079b24f0f61
 SHA512 (libretro-desmume-20190426-3069551c2e1de633c333739cca8bb7108ca3d3e9.tar.gz) = 
985e723d6d4f0af2755f6439db6a61b9269e440f5490522913d2bef9170cb1294cf912a1fa16584570807a27cf221992b2b1c29c75f3c654e27d2b91d499666a
 Size (libretro-desmume-20190426-3069551c2e1de633c333739cca8bb7108ca3d3e9.tar.gz) = 11403327 bytes
 SHA1 (patch-desmume_src_frontend_libretro_Makefile.libretro) = 8d43c8c404e0a828d79ce7d16265e95ec70c4525
+SHA1 (patch-desmume_src_wifi.cpp) = ea853cf0ec45130779faf4477bc97272c6ea4674

Added files:

Index: pkgsrc/emulators/libretro-desmume/patches/patch-desmume_src_wifi.cpp
diff -u /dev/null pkgsrc/emulators/libretro-desmume/patches/patch-desmume_src_wifi.cpp:1.1
--- /dev/null   Sun May 12 09:49:39 2019
+++ pkgsrc/emulators/libretro-desmume/patches/patch-desmume_src_wifi.cpp        Sun May 12 09:49:39 2019
@@ -0,0 +1,15 @@
+$NetBSD: patch-desmume_src_wifi.cpp,v 1.1 2019/05/12 09:49:39 nia Exp $
+
+https://github.com/libretro/desmume/issues/58
+
+--- desmume/src/wifi.cpp.orig  2019-04-26 20:09:47.000000000 +0000
++++ desmume/src/wifi.cpp
+@@ -59,7 +59,7 @@
+ 
+ // Some platforms need HAVE_REMOTE to work with libpcap, but
+ // Apple platforms are not among them.
+-#ifndef __APPLE__
++#if !defined( __APPLE__) && !defined(__LIBRETRO__)
+       #define HAVE_REMOTE
+ #endif
+