pcr/collada-dom: updated to 2.4.4

2 files changed, 60 insertions, 37 deletions

diff --git a/pcr/collada-dom/0001-fix-return-type-thanks-to-22.patch b/pcr/collada-dom/0001-fix-return-type-thanks-to-22.patch
new file mode 100644
index 000000000..eb3b944e2
--- /dev/null
+++ b/pcr/collada-dom/0001-fix-return-type-thanks-to-22.patch
@@ -0,0 +1,25 @@
+From 8e65676c1cbecde1c0c4d8c2e1cfb20fc49c410b Mon Sep 17 00:00:00 2001
+From: rosen <rosen.diankov@mujin.co.jp>
+Date: Wed, 24 Feb 2016 12:49:14 +0900
+Subject: [PATCH] fix return type thanks to #22
+
+---
+ dom/src/dae/daeMetaGroup.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/dom/src/dae/daeMetaGroup.cpp b/dom/src/dae/daeMetaGroup.cpp
+index 25fd9cc..c34ac4c 100644
+--- a/dom/src/dae/daeMetaGroup.cpp
++++ b/dom/src/dae/daeMetaGroup.cpp
+@@ -26,7 +26,7 @@ daeElement *daeMetaGroup::placeElement( daeElement *parent, daeElement *child, d
+ 	(void)offset;
+ 	daeString nm = child->getElementName();
+ 	if ( findChild( nm ) == NULL ) {
+-		return false;
++		return NULL;
+ 	}
+ 	daeElementRef el;
+ 
+-- 
+2.8.2
+
diff --git a/pcr/collada-dom/PKGBUILD b/pcr/collada-dom/PKGBUILD
index 77d674064..a4a492ed6 100644
--- a/pcr/collada-dom/PKGBUILD
+++ b/pcr/collada-dom/PKGBUILD
@@ -1,47 +1,45 @@
-# Maintainer: Márcio Silva <coadde@hyperbola.info>
-
-pkgname=collada-dom
-pkgver=2.4.0
-pkgrel=4
-pkgdesc="An API that provides a C++ object representation of a ${pkgname::7} XML instance document"
-url=http://sourceforge.net/projects/$pkgname
+# Maintainer (AUR): Zachary Koesters <zkoesters@utdallas.edu>
+
+# parabola changes and rationale:
+#  - corrected used license
+#  - fixed arch array
+#  - added minizip dependency
+
+pkgname="collada-dom"
+provides=("colladadom")
+pkgver=2.4.4
+pkgrel=1
+pkgdesc="An API that provides a C++ object representation of a COLLADA XML instance document."
+url="https://github.com/rdiankov/collada-dom/tree/v2.4.4"
 license=('MIT')
-arch=(
-  x86_64
-  i686
-)
-depends=(
-  boost-libs
-  libxml2
-  pcre
-)
-makedepends=(
-  boost
-  cmake
-)
-source=("http://downloads.sf.net/$pkgname/$pkgname-$pkgver-libsrc.tgz")
-sha512sums=('4c8cdc159acc89564b46615a0bc73a5ba84a1a5aa41d38661cd0e33a705ce5fd032e9a308fc89f93ec10620892067d757cbff8f1b9ce53da7626ea0e27b0eda5')
+arch=("x86_64" "i686" "armv7h")
+depends=("libxml2"
+         "boost-libs"
+         "pcre"
+         "minizip")
+makedepends=("cmake"
+             "boost")
+source=("https://github.com/rdiankov/${pkgname}/archive/v${pkgver}.tar.gz"
+        "0001-fix-return-type-thanks-to-22.patch")
+sha256sums=("0dfa494827faa971310c871535b319cadbd0c2d6958ee11b303c61a55a5a437a"
+            "921742c7ad1094e1f25281869860b16cbab9d1fb0cb718fb32e0775861bdb13c")
 
 prepare() {
-  cd $srcdir/$pkgname-$pkgver-libsrc
-
-  [[ -d build ]] && rm -vr build
-  mkdir -v build
+    cd "${pkgname}-${pkgver}"
+    patch -Np1 < ../0001-fix-return-type-thanks-to-22.patch
 }
 
 build() {
-  cd $srcdir/$pkgname-$pkgver-libsrc/build
-  cmake .. -DCMAKE_INSTALL_PREFIX=/usr
-  make
+    cd "${pkgname}-${pkgver}"
+    cmake \
+        -DCMAKE_INSTALL_PREFIX=/usr \
+        "../${pkgname}-${pkgver}"
+    make
 }
 
 package() {
-  cd $srcdir/$pkgname-$pkgver-libsrc/build
-  make DESTDIR=$pkgdir install
-
-  a=$pkgdir/usr/share/licenses/$pkgname
-
-  install -vd $a && cp -va ../{dom/license.txt,License_Folder/license_e.txt} $a
+    cd "${pkgname}-${pkgver}"
+    install -Dm644 "licenses/license_e.txt" \
+        "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+    make DESTDIR="${pkgdir}" install
 }
-
-# vim:set ts=2 sw=2 et: