diff options
author | jmcneill <jmcneill@pkgsrc.org> | 2015-11-17 18:14:07 +0000 |
---|---|---|
committer | jmcneill <jmcneill@pkgsrc.org> | 2015-11-17 18:14:07 +0000 |
commit | 91d008ed890724d70e525df816718b6336f4528a (patch) | |
tree | 0fb7bfbb5d3f353d7af0d65cc6dbd3ebb34e822e | |
parent | 1cdbddde41fab655355ee57cfce2a01bab1103bb (diff) | |
download | pkgsrc-91d008ed890724d70e525df816718b6336f4528a.tar.gz |
enable NEON for armv7
-rw-r--r-- | multimedia/kodi/distinfo | 6 | ||||
-rw-r--r-- | multimedia/kodi/patches/patch-configure.ac | 8 | ||||
-rw-r--r-- | multimedia/kodi/patches/patch-xbmc_utils_CPUInfo.cpp | 21 |
3 files changed, 28 insertions, 7 deletions
diff --git a/multimedia/kodi/distinfo b/multimedia/kodi/distinfo index 06ecdc09973..c9c336b5586 100644 --- a/multimedia/kodi/distinfo +++ b/multimedia/kodi/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.4 2015/11/17 16:43:10 christos Exp $ +$NetBSD: distinfo,v 1.5 2015/11/17 18:14:07 jmcneill Exp $ SHA1 (15.2-Isengard.tar.gz) = 4acb4a60eadc7289f873cff5add31693b9520cba RMD160 (15.2-Isengard.tar.gz) = d81d3f15783b2b69920ea85d7e04f01872f2d85f @@ -7,7 +7,7 @@ Size (15.2-Isengard.tar.gz) = 61484128 bytes SHA1 (patch-Makefile.in) = 10fa432a7b2dc53bdfa3f679890a343db3cca304 SHA1 (patch-bootstrap) = 179a827d07d8a5ca6566ac247a167197652384f6 SHA1 (patch-codegenerator.mk) = faf908bf1614f68f3a67faa9ac3139d5851daf95 -SHA1 (patch-configure.ac) = d2f7b746ce1af5c441dd789bb63166917cd45114 +SHA1 (patch-configure.ac) = 5b19831d7a120261f7c5a42b86c55f14428afa46 SHA1 (patch-lib_cximage-6.0_CxImage_DllInterface.cpp) = 7f0d2d6fb46aa99d1889609e257b0978e72e1c6c SHA1 (patch-lib_cximage-6.0_CxImage_ximage.h) = da60aeaaa22daefaf6b91bff602ce15618e4c5a0 SHA1 (patch-lib_cximage-6.0_CxImage_ximainfo.cpp) = 2457e20bfec3d0dc12edee3679167f092555b153 @@ -42,7 +42,7 @@ SHA1 (patch-xbmc_storage_MediaManager.cpp) = 5a816d5c6b060a99aa498f6f9b62571873d SHA1 (patch-xbmc_system.h) = 10738c487ed6c2de066483cc077ad05037132da8 SHA1 (patch-xbmc_system__gl.h) = e2b8e3d57c6d838020163cf56e8f868c959af937 SHA1 (patch-xbmc_threads_platform_pthreads_ThreadImpl.cpp) = f8853a8ace422d9ab088be89b5562da552edcc7a -SHA1 (patch-xbmc_utils_CPUInfo.cpp) = f593e3d799e4451cbdf80ae8069f072495fbfbb4 +SHA1 (patch-xbmc_utils_CPUInfo.cpp) = 2137bcb33418b64fe75c0eecb6487db2b6afc6ef SHA1 (patch-xbmc_utils_CharsetConverter.cpp) = 420a1e39d24c38dca2a8702a22b8cf67ef04dd3f SHA1 (patch-xbmc_utils_Stopwatch.cpp) = fd2b8f7112e89ce164a0329ea3ee389f85705d1f SHA1 (patch-xbmc_utils_SystemInfo.cpp) = 751ca3390422387cea4dc0f240bb55eeb9e077a5 diff --git a/multimedia/kodi/patches/patch-configure.ac b/multimedia/kodi/patches/patch-configure.ac index 9152876ec1e..8839e900520 100644 --- a/multimedia/kodi/patches/patch-configure.ac +++ b/multimedia/kodi/patches/patch-configure.ac @@ -1,8 +1,8 @@ -$NetBSD: patch-configure.ac,v 1.2 2015/11/17 16:43:10 christos Exp $ +$NetBSD: patch-configure.ac,v 1.3 2015/11/17 18:14:07 jmcneill Exp $ --- configure.ac.orig 2015-10-19 06:31:15.000000000 +0000 +++ configure.ac -@@ -641,6 +641,23 @@ case $host in +@@ -641,6 +641,25 @@ case $host in ARCH="x86_64-freebsd" MAKE="gmake" ;; @@ -17,16 +17,18 @@ $NetBSD: patch-configure.ac,v 1.2 2015/11/17 16:43:10 christos Exp $ + armv6-*-netbsd*) + ARCH="arm-netbsd" + MAKE="gmake" ++ use_arch="arm" + ;; + armv7-*-netbsd*) + ARCH="arm-netbsd" + MAKE="gmake" ++ use_arch="arm" + use_neon=yes + ;; arm-apple-darwin*) use_joystick=no use_neon=yes -@@ -1540,6 +1557,9 @@ if test "x$use_samba" != "xno"; then +@@ -1540,6 +1559,9 @@ if test "x$use_samba" != "xno"; then USE_LIBSMBCLIENT=1 fi diff --git a/multimedia/kodi/patches/patch-xbmc_utils_CPUInfo.cpp b/multimedia/kodi/patches/patch-xbmc_utils_CPUInfo.cpp index 2d91e9df86a..7d9c159c718 100644 --- a/multimedia/kodi/patches/patch-xbmc_utils_CPUInfo.cpp +++ b/multimedia/kodi/patches/patch-xbmc_utils_CPUInfo.cpp @@ -1,4 +1,4 @@ -$NetBSD: patch-xbmc_utils_CPUInfo.cpp,v 1.1 2015/11/17 14:56:07 jmcneill Exp $ +$NetBSD: patch-xbmc_utils_CPUInfo.cpp,v 1.2 2015/11/17 18:14:07 jmcneill Exp $ --- xbmc/utils/CPUInfo.cpp.orig 2015-10-19 06:31:15.000000000 +0000 +++ xbmc/utils/CPUInfo.cpp @@ -38,3 +38,22 @@ $NetBSD: patch-xbmc_utils_CPUInfo.cpp,v 1.1 2015/11/17 14:56:07 jmcneill Exp $ #else if (m_fProcStat == NULL) return false; +@@ -931,6 +935,18 @@ bool CCPUInfo::HasNeon() + #elif defined(TARGET_DARWIN_IOS) + has_neon = 1; + ++#elif defined(TARGET_NETBSD) && defined(__ARM_NEON__) ++ if (has_neon == -1) ++ { ++ has_neon = 0; ++ int flag; ++ size_t len = sizeof(flag); ++ if (sysctlbyname("machdep.neon_present", &flag, &len, NULL, 0) == 0) ++ { ++ has_neon = 1; ++ } ++ } ++ + #elif defined(TARGET_LINUX) && defined(__ARM_NEON__) + if (has_neon == -1) + { |