[arch-commits] Commit in opencollada/repos/community-x86_64 (5 files)

[Sven-Hendrik Haase]

    Date: Sunday, September 30, 2018 @ 02:26:11
  Author: svenstaro
Revision: 388071

archrelease: copy trunk to community-x86_64

Added:
  opencollada/repos/community-x86_64/PKGBUILD
    (from rev 388070, opencollada/trunk/PKGBUILD)
  opencollada/repos/community-x86_64/opencollada.conf
    (from rev 388070, opencollada/trunk/opencollada.conf)
  opencollada/repos/community-x86_64/pcre.patch
    (from rev 388070, opencollada/trunk/pcre.patch)
Deleted:
  opencollada/repos/community-x86_64/PKGBUILD
  opencollada/repos/community-x86_64/opencollada.conf

------------------+
 PKGBUILD         |   85 ++++++++++++++++++++++++++++-------------------------
 opencollada.conf |    2 -
 pcre.patch       |   14 ++++++++
 3 files changed, 61 insertions(+), 40 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2018-09-30 02:26:03 UTC (rev 388070)
+++ PKGBUILD	2018-09-30 02:26:11 UTC (rev 388071)
@@ -1,39 +0,0 @@
-# $Id$
-# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
-pkgname=opencollada
-pkgver=1.6.59
-pkgrel=1
-epoch=1
-pkgdesc="Stream based reader and writer library for COLLADA files"
-arch=(i686 x86_64)
-url="https://github.com/KhronosGroup/OpenCOLLADA"
-license=('GPL')
-depends=('libxml2' 'pcre')
-makedepends=('git' 'cmake')
-source=('opencollada.conf'
-        "git://github.com/KhronosGroup/OpenCOLLADA.git#tag=v${pkgver}")
-md5sums=('5f7e9d79ab86756648b648ee5ed6ce1d'
-         'SKIP')
-
-build() {
-  cd "$srcdir"/OpenCOLLADA
-
-  [[ -d build ]] && rm -r build
-  mkdir build && cd build
-
-  cmake .. \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DUSE_SHARED=ON \
-    -DUSE_STATIC=OFF
-  make
-}
-
-package() {
-  cd "$srcdir"/OpenCOLLADA/build
-
-  make DESTDIR=$pkgdir install
-
-  install -Dm644 $srcdir/opencollada.conf $pkgdir/etc/ld.so.conf.d/opencollada.conf
-}
-
-# vim:set ts=2 sw=2 et:

Copied: opencollada/repos/community-x86_64/PKGBUILD (from rev 388070, opencollada/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2018-09-30 02:26:11 UTC (rev 388071)
@@ -0,0 +1,46 @@
+# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
+pkgname=opencollada
+pkgver=1.6.63
+pkgrel=1
+epoch=1
+pkgdesc="Stream based reader and writer library for COLLADA files"
+arch=(x86_64)
+url="https://github.com/KhronosGroup/OpenCOLLADA"
+license=('GPL')
+depends=('libxml2' 'pcre')
+makedepends=('git' 'cmake')
+source=('opencollada.conf'
+        'pcre.patch'
+        "git://github.com/KhronosGroup/OpenCOLLADA.git#tag=v${pkgver}")
+sha256sums=('2fc9656a2b881ca4528416daa91fc525adaa97d73e96a18b41aa7856270eba1f'
+            'f37a7cbadcaa06b70133f76c509c61bdcf13715bc13aed11b5db83ef594813b3'
+            'SKIP')
+
+prepare() {
+  cd "$srcdir"/OpenCOLLADA
+
+  patch -Np1 -i "$srcdir"/pcre.patch
+}
+
+build() {
+  cd "$srcdir"/OpenCOLLADA
+
+  [[ -d build ]] && rm -r build
+  mkdir build && cd build
+
+  cmake .. \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DUSE_SHARED=ON \
+    -DUSE_STATIC=OFF
+  make
+}
+
+package() {
+  cd "$srcdir"/OpenCOLLADA/build
+
+  make DESTDIR=$pkgdir install
+
+  install -Dm644 $srcdir/opencollada.conf $pkgdir/etc/ld.so.conf.d/opencollada.conf
+}
+
+# vim:set ts=2 sw=2 et:

Deleted: opencollada.conf
===================================================================
--- opencollada.conf	2018-09-30 02:26:03 UTC (rev 388070)
+++ opencollada.conf	2018-09-30 02:26:11 UTC (rev 388071)
@@ -1 +0,0 @@
-/usr/lib/opencollada

Copied: opencollada/repos/community-x86_64/opencollada.conf (from rev 388070, opencollada/trunk/opencollada.conf)
===================================================================
--- opencollada.conf	                        (rev 0)
+++ opencollada.conf	2018-09-30 02:26:11 UTC (rev 388071)
@@ -0,0 +1 @@
+/usr/lib/opencollada

Copied: opencollada/repos/community-x86_64/pcre.patch (from rev 388070, opencollada/trunk/pcre.patch)
===================================================================
--- pcre.patch	                        (rev 0)
+++ pcre.patch	2018-09-30 02:26:11 UTC (rev 388071)
@@ -0,0 +1,14 @@
+diff --git a/COLLADABaseUtils/include/COLLADABUPcreCompiledPattern.h b/COLLADABaseUtils/include/COLLADABUPcreCompiledPattern.h
+index 22f2598b..269c50ca 100644
+--- a/COLLADABaseUtils/include/COLLADABUPcreCompiledPattern.h
++++ b/COLLADABaseUtils/include/COLLADABUPcreCompiledPattern.h
+@@ -13,8 +13,7 @@
+ 
+ #include "COLLADABUPrerequisites.h"
+ 
+-struct real_pcre;
+-typedef struct real_pcre pcre;
++#include "pcre.h"
+ 
+ 
+ namespace COLLADABU