Update to 0.9.1

2 files changed, 28 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c5d390df1ea7..084e91698d81 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = oggvideotools
 	pkgdesc = A collection of tools for manipulating Ogg video files
-	pkgver = 0.8a
+	pkgver = 0.9.1
 	pkgrel = 1
 	url = http://dev.streamnik.de/oggvideotools.html
 	arch = i686
@@ -8,12 +8,13 @@ pkgbase = oggvideotools
 	license = GPL
 	makedepends = cmake
 	makedepends = pkgconfig
+	makedepends = boost
 	depends = gd
 	depends = libtheora
 	depends = libvorbis
 	depends = sdl
-	source = http://downloads.sourceforge.net/project/oggvideotools/oggvideotools/oggvideotools-0.8a/oggvideotools-0.8a.tar.gz
-	md5sums = e7fcfcc4e91187f7a2ca4aea26c2ce64
+	source = https://downloads.sourceforge.net/oggvideotools/oggvideotools-0.9.1.tar.bz2
+	sha256sums = d9dbf7897b7cea98612209d80b9127473c97d6ee6cb0dccfc2b38fe3e8e29523
 
 pkgname = oggvideotools
 
diff --git a/PKGBUILD b/PKGBUILD
index 9728096cdd84..ac6bb2dbee24 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,33 +2,42 @@
 # Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org>
 
 pkgname=oggvideotools
-pkgver=0.8a
+pkgver=0.9.1
 pkgrel=1
 pkgdesc="A collection of tools for manipulating Ogg video files"
 arch=('i686' 'x86_64')
 url="http://dev.streamnik.de/oggvideotools.html"
 license=('GPL')
 depends=('gd' 'libtheora' 'libvorbis' 'sdl')
-makedepends=('cmake' 'pkgconfig')
-source=(http://downloads.sourceforge.net/project/$pkgname/$pkgname/$pkgname-$pkgver/$pkgname-$pkgver.tar.gz)
-md5sums=('e7fcfcc4e91187f7a2ca4aea26c2ce64')
+makedepends=('cmake' 'pkgconfig' 'boost')
+source=(https://downloads.sourceforge.net/oggvideotools/oggvideotools-$pkgver.tar.bz2)
+sha256sums=('d9dbf7897b7cea98612209d80b9127473c97d6ee6cb0dccfc2b38fe3e8e29523')
+
+prepare() {
+  [[ -d build ]] && rm -rf build
+  mkdir build
+
+  sed -i '8i #include <cstring>' oggvideotools-0.9.1/src/base/test/decoderTest.cpp
+}
 
 build() {
-  cd $pkgname-$pkgver
+  cd build
 
-  cmake . -DCMAKE_INSTALL_PREFIX=/usr
+  cmake ../$pkgname-$pkgver \
+    -DCMAKE_INSTALL_PREFIX=/usr
+  make
 }
 
 package() {
-  cd $pkgname-$pkgver
+  cd build
+
+  make DESTDIR="$pkgdir" install
 
-  for _f in Cat Cut Dump Length Silence Slideshow Transcode; do
-    sed -i '24a #else' ./src/ogg${_f}.cpp
-    sed -i '25a #include <unistd.h>' ./src/ogg${_f}.cpp
-  done
+  # /usr/sbin is a symlink to /usr/bin
+  mv "$pkgdir"/usr/sbin/* "$pkgdir"/usr/bin
+  rm -r "$pkgdir"/usr/sbin
 
-  make DESTDIR="${pkgdir}" install
-#man pages location fix
-  install -d "${pkgdir}"/usr/share
-  mv "${pkgdir}"/usr/man "${pkgdir}"/usr/share
+  # man pages location fix
+  install -d "$pkgdir"/usr/share
+  mv "$pkgdir"/usr/man "$pkgdir"/usr/share
 }