community/io to 2017.06.08-1

community/io/0001-remove-msse2.patch

@@ -0,0 +1,24 @@
+From 8e247bed77173287efa8f572a58e951a460700d0 Mon Sep 17 00:00:00 2001
+From: Kevin Mihelich <kevin@archlinuxarm.org>
+Date: Fri, 9 Jun 2017 12:02:03 -0600
+Subject: [PATCH] remove -msse2
+
+---
+ CMakeLists.txt | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e6d19e53..21151add 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -39,7 +39,6 @@ IF(CMAKE_COMPILER_IS_GNUCC)
+ 	SET(CMAKE_BUILD_TYPE_DebugFast)
+ 	SET(CMAKE_CXX_FLAGS_DEBUGFAST "-g -O0")
+ 	SET(CMAKE_C_FLAGS_DEBUGFAST "-g -O0")
+-	SET(CMAKE_C_FLAGS "-msse2")
+ 	if(NOT CMAKE_BUILD_TYPE)
+ 	        SET(CMAKE_BUILD_TYPE "DebugFast")
+ 	endif(NOT CMAKE_BUILD_TYPE)
+-- 
+2.12.0
+

community/io/PATCH-Fix-for-inlining-in-C11-mode.patch

@@ -1,57 +0,0 @@
-From 2ab9505240c7d32ea5cb4d367c86af0146ac0b7c Mon Sep 17 00:00:00 2001
-From: Peter Hull <peterhull90@gmail.com>
-Date: Sun, 24 Jan 2016 13:19:27 +0000
-Subject: [PATCH] Fix for inlining in C11 mode
-
----
- libs/basekit/source/Common_inline.h | 36 ++++++++++++++++++++++++------------
- 1 file changed, 24 insertions(+), 12 deletions(-)
-
-diff --git a/libs/basekit/source/Common_inline.h b/libs/basekit/source/Common_inline.h
-index a4086d7..19f8d47 100755
---- a/libs/basekit/source/Common_inline.h
-+++ b/libs/basekit/source/Common_inline.h
-@@ -117,19 +117,31 @@ Kudos to Daniel A. Koepke
- 	#endif 
- 	
- #elif defined(__linux__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__)
--
--	#ifdef IO_IN_C_FILE
--		// in .c 
--		#define IO_DECLARE_INLINES
--		#define IOINLINE inline
--		#define IOINLINE_RECURSIVE inline
-+	#ifdef __GNUC_STDC_INLINE__
-+		#ifdef IO_IN_C_FILE
-+			// in .c
-+			#define IO_DECLARE_INLINES
-+			#define IOINLINE
-+			#define IOINLINE_RECURSIVE
-+		#else
-+			// in .h
-+			#define IO_DECLARE_INLINES
-+			#define IOINLINE inline
-+			#define IOINLINE_RECURSIVE inline
-+		#endif
- 	#else
--		// in .h 
--		#define IO_DECLARE_INLINES
--		#define IOINLINE extern inline
--		#define IOINLINE_RECURSIVE extern inline
--	#endif 
--	
-+		#ifdef IO_IN_C_FILE
-+			// in .c
-+			#define IO_DECLARE_INLINES
-+			#define IOINLINE inline
-+			#define IOINLINE_RECURSIVE inline
-+		#else
-+			// in .h
-+			#define IO_DECLARE_INLINES
-+			#define IOINLINE extern inline
-+			#define IOINLINE_RECURSIVE extern inline
-+		#endif
-+	#endif
- #else
- 
- 	#ifdef IO_IN_C_FILE

community/io/PATCH-added--msse2-to-compile-flags-for.patch

@@ -1,23 +0,0 @@
-From 2ca83eac52092eb297b7f3cee3d6057377e57c67 Mon Sep 17 00:00:00 2001
-From: Peter Hull <peterhull90@gmail.com>
-Date: Mon, 25 Jan 2016 09:21:13 +0000
-Subject: [PATCH] Added -msse2 to compile flags for all sources. Under GCC 5
- it's needed, otherwise compiling UArray_math.c fails.
-
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 7e3a3bc..e6d19e5 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -39,7 +39,7 @@ IF(CMAKE_COMPILER_IS_GNUCC)
- 	SET(CMAKE_BUILD_TYPE_DebugFast)
- 	SET(CMAKE_CXX_FLAGS_DEBUGFAST "-g -O0")
- 	SET(CMAKE_C_FLAGS_DEBUGFAST "-g -O0")
--
-+	SET(CMAKE_C_FLAGS "-msse2")
- 	if(NOT CMAKE_BUILD_TYPE)
- 	        SET(CMAKE_BUILD_TYPE "DebugFast")
- 	endif(NOT CMAKE_BUILD_TYPE)

community/io/PKGBUILD

@@ -3,45 +3,39 @@
 # Contributor: Gergely Imreh <imrehg@gmail.com>
 
 # ALARM: Kevin Mihelich <kevin@archlinuxarm.org>
-#  - don't patch PATCH-added--msse2-to-compile-flags-for.patch
+#  - remove -msse2
 
 pkgname=io
-pkgver=2015.11.11
-pkgrel=7
+pkgver=2017.06.08
+pkgrel=1
 pkgdesc='IO programming language'
 arch=('x86_64' 'i686')
 url='http://iolanguage.com/'
 license=('BSD')
-depends=('pcre' 'libsndfile' 'libxmu' 'freetype2' 'libedit' 'libxml2' 'libtiff' 'libevent' 'yajl' 'libmariadbclient' 'lzo' 'libpng' 'python2' 'util-linux' 'freeglut' 'libjpeg-turbo' 'libtheora')
+depends=('pcre' 'libsndfile' 'libxmu' 'freetype2' 'libedit' 'libxml2' 'libtiff' 'libevent' 'yajl' 'libmariadbclient' 'lzo' 'libpng' 'python2' 'util-linux' 'freeglut' 'libjpeg-turbo' 'libtheora' 'python')
 makedepends=('cmake' 'git')
 options=('!makeflags' '!buildflags')
-source=("git://github.com/stevedekorte/io#tag=$pkgver"
-        'PATCH-Fix-for-inlining-in-C11-mode.patch'
-        'PATCH-added--msse2-to-compile-flags-for.patch')
-md5sums=('SKIP'
-         'a3bab046cbc4be88ec95bb22c28abab3'
-         '83552f6cabb4224cbcdcc01cb3bd4b90')
+source=("git+https://github.com/stevedekorte/io#commit=5fffec7cbe9679632ff793befacedd92f79d7f0f"
+        '0001-remove-msse2.patch')
+sha256sums=('SKIP'
+            '3b34ae67b11c64c9633a70506551e8021fedb17c91eb3f9f5e4c8e78711708a3')
 
 prepare() {
+  sed -i "s:20151111:${pkgver//./}:" io/libs/iovm/source/IoVersion.h
   cd io
-  patch -p1 -i../PATCH-Fix-for-inlining-in-C11-mode.patch
-  #patch -p1 -i../PATCH-added--msse2-to-compile-flags-for.patch
+  git apply ../0001-remove-msse2.patch
 }
 
 build() {
-  cd io
-  sed -i "s:20140919:${pkgver//./}:" libs/iovm/source/IoVersion.h
   mkdir -p build
   cd build
-  cmake -DCMAKE_INSTALL_PREFIX=/usr ..
-  make
+  cmake ../io -DCMAKE_INSTALL_PREFIX=/usr
 }
 
 package() {
-  cd io
-  make -C build DESTDIR="$pkgdir" install
-  install -Dm644 license/bsd_license.txt \
+  DESTDIR="$pkgdir" make -C build install
+  install -Dm644 io/license/bsd_license.txt \
     "$pkgdir/usr/share/licenses/$pkgname/bsd_license.txt"
 }
 
-# vim:set ts=2 sw=2 et:
+# vim: ts=2 sw=2 et: