Date: Fri, 30 Oct 2015 10:45:41 +0000 (UTC) From: Alexey Dokuchaev <danfe@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r400495 - in head/emulators/desmume: . files Message-ID: <201510301045.t9UAjfAu076942@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: danfe Date: Fri Oct 30 10:45:41 2015 New Revision: 400495 URL: https://svnweb.freebsd.org/changeset/ports/400495 Log: - Update to version 0.9.11 - Use sysconf(3) to get number of active CPUs instead of sysctl(3) and thus clean up the patch - Remove BROKEN_ia64 statement at it makes little use these days as ia64 was never a first-class citizen in FreeBSD and officially killed in -CURRENT for a while now PR: 203426 Submitted by: maintainer Modified: head/emulators/desmume/Makefile head/emulators/desmume/distinfo head/emulators/desmume/files/patch-src_utils_task.cpp Modified: head/emulators/desmume/Makefile ============================================================================== --- head/emulators/desmume/Makefile Fri Oct 30 10:44:26 2015 (r400494) +++ head/emulators/desmume/Makefile Fri Oct 30 10:45:41 2015 (r400495) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= desmume -PORTVERSION= 0.9.10 -PORTREVISION= 3 +PORTVERSION= 0.9.11 CATEGORIES= emulators MASTER_SITES= SF @@ -29,6 +28,4 @@ CFLAGS+= -I${LOCALBASE}/include -L${LOCA -DHAVE_LIBGDKGLEXT_X11_1_0 -DHAVE_GL_GL_H -DHAVE_GL_GLU_H CXXFLAGS+= ${CFLAGS} -BROKEN_ia64= Does not compile on ia64 - .include <bsd.port.mk> Modified: head/emulators/desmume/distinfo ============================================================================== --- head/emulators/desmume/distinfo Fri Oct 30 10:44:26 2015 (r400494) +++ head/emulators/desmume/distinfo Fri Oct 30 10:45:41 2015 (r400495) @@ -1,2 +1,2 @@ -SHA256 (desmume-0.9.10.tar.gz) = 8900a7a1fc849fdd33b014748dd97a6cda4c32548b8d2e06511e6ed8d5ba7445 -SIZE (desmume-0.9.10.tar.gz) = 4141586 +SHA256 (desmume-0.9.11.tar.gz) = 3ab34ba6cc009566245025c1dd94bf449b6a1b416d24387cb42e183c78e38896 +SIZE (desmume-0.9.11.tar.gz) = 5359305 Modified: head/emulators/desmume/files/patch-src_utils_task.cpp ============================================================================== --- head/emulators/desmume/files/patch-src_utils_task.cpp Fri Oct 30 10:44:26 2015 (r400494) +++ head/emulators/desmume/files/patch-src_utils_task.cpp Fri Oct 30 10:45:41 2015 (r400495) @@ -1,22 +1,26 @@ ---- src/utils/task.cpp.orig 2013-11-28 01:37:27.373159000 +0100 -+++ src/utils/task.cpp 2013-12-14 19:49:02.000000000 +0100 -@@ -26,6 +26,7 @@ - #if defined HOST_LINUX || defined HOST_DARWIN +--- src/utils/task.cpp.orig 2015-10-30 09:34:37 UTC ++++ src/utils/task.cpp +@@ -23,9 +23,9 @@ + #include <windows.h> + #else + #include <pthread.h> +-#if defined HOST_LINUX ++#if defined HOST_LINUX || defined HOST_BSD #include <unistd.h> - #elif defined HOST_BSD -+#include <iostream> +-#elif defined HOST_BSD || defined HOST_DARWIN ++#elif defined HOST_DARWIN #include <sys/sysctl.h> #endif #endif // HOST_WINDOWS -@@ -41,9 +42,8 @@ +@@ -37,9 +37,9 @@ int getOnlineCores (void) + SYSTEM_INFO sysinfo; + GetSystemInfo(&sysinfo); + return sysinfo.dwNumberOfProcessors; +-#elif defined HOST_LINUX ++#elif defined HOST_LINUX || defined HOST_BSD return sysconf(_SC_NPROCESSORS_ONLN); - #elif defined HOST_BSD +-#elif defined HOST_BSD || defined HOST_DARWIN ++#elif defined HOST_DARWIN int cores; -- const int mib[4] = { CTL_HW, HW_NCPU, 0, 0 }; -- const size_t len = sizeof(cores); -- sysctl(mib, 2, &cores, &len, NULL, 0); -+ size_t len = sizeof(cores); -+ sysctlbyname("hw.ncpu", &cores, &len, NULL, 0); - return (cores < 1) ? 1 : cores; - #else - return 1; + int mib[4] = { CTL_HW, HW_NCPU, 0, 0 }; + size_t len = sizeof(cores); //don't make this const, i guess sysctl can't take a const *
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201510301045.t9UAjfAu076942>