mirror of
https://git.FreeBSD.org/ports.git
synced 2024-12-24 04:33:24 +00:00
- 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
This commit is contained in:
parent
5936e660d2
commit
50b3884364
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=400495
@ -2,8 +2,7 @@
|
|||||||
# $FreeBSD$
|
# $FreeBSD$
|
||||||
|
|
||||||
PORTNAME= desmume
|
PORTNAME= desmume
|
||||||
PORTVERSION= 0.9.10
|
PORTVERSION= 0.9.11
|
||||||
PORTREVISION= 3
|
|
||||||
CATEGORIES= emulators
|
CATEGORIES= emulators
|
||||||
MASTER_SITES= SF
|
MASTER_SITES= SF
|
||||||
|
|
||||||
@ -29,6 +28,4 @@ CFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib -DGTKGLEXT_AVAILABLE \
|
|||||||
-DHAVE_LIBGDKGLEXT_X11_1_0 -DHAVE_GL_GL_H -DHAVE_GL_GLU_H
|
-DHAVE_LIBGDKGLEXT_X11_1_0 -DHAVE_GL_GL_H -DHAVE_GL_GLU_H
|
||||||
CXXFLAGS+= ${CFLAGS}
|
CXXFLAGS+= ${CFLAGS}
|
||||||
|
|
||||||
BROKEN_ia64= Does not compile on ia64
|
|
||||||
|
|
||||||
.include <bsd.port.mk>
|
.include <bsd.port.mk>
|
||||||
|
@ -1,2 +1,2 @@
|
|||||||
SHA256 (desmume-0.9.10.tar.gz) = 8900a7a1fc849fdd33b014748dd97a6cda4c32548b8d2e06511e6ed8d5ba7445
|
SHA256 (desmume-0.9.11.tar.gz) = 3ab34ba6cc009566245025c1dd94bf449b6a1b416d24387cb42e183c78e38896
|
||||||
SIZE (desmume-0.9.10.tar.gz) = 4141586
|
SIZE (desmume-0.9.11.tar.gz) = 5359305
|
||||||
|
@ -1,22 +1,26 @@
|
|||||||
--- src/utils/task.cpp.orig 2013-11-28 01:37:27.373159000 +0100
|
--- src/utils/task.cpp.orig 2015-10-30 09:34:37 UTC
|
||||||
+++ src/utils/task.cpp 2013-12-14 19:49:02.000000000 +0100
|
+++ src/utils/task.cpp
|
||||||
@@ -26,6 +26,7 @@
|
@@ -23,9 +23,9 @@
|
||||||
#if defined HOST_LINUX || defined HOST_DARWIN
|
#include <windows.h>
|
||||||
|
#else
|
||||||
|
#include <pthread.h>
|
||||||
|
-#if defined HOST_LINUX
|
||||||
|
+#if defined HOST_LINUX || defined HOST_BSD
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#elif defined HOST_BSD
|
-#elif defined HOST_BSD || defined HOST_DARWIN
|
||||||
+#include <iostream>
|
+#elif defined HOST_DARWIN
|
||||||
#include <sys/sysctl.h>
|
#include <sys/sysctl.h>
|
||||||
#endif
|
#endif
|
||||||
#endif // HOST_WINDOWS
|
#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);
|
return sysconf(_SC_NPROCESSORS_ONLN);
|
||||||
#elif defined HOST_BSD
|
-#elif defined HOST_BSD || defined HOST_DARWIN
|
||||||
|
+#elif defined HOST_DARWIN
|
||||||
int cores;
|
int cores;
|
||||||
- const int mib[4] = { CTL_HW, HW_NCPU, 0, 0 };
|
int mib[4] = { CTL_HW, HW_NCPU, 0, 0 };
|
||||||
- const size_t len = sizeof(cores);
|
size_t len = sizeof(cores); //don't make this const, i guess sysctl can't take a const *
|
||||||
- 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;
|
|
||||||
|
Loading…
Reference in New Issue
Block a user