3 files changed, 45 insertions, 23 deletions
diff --git a/libre/calibre-libre/PKGBUILD b/libre/calibre-libre/PKGBUILD
index af128c250..1d08b5634 100644
--- a/libre/calibre-libre/PKGBUILD
+++ b/libre/calibre-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 94576 2013-07-27 12:09:03Z jelle $
+# $Id: PKGBUILD 95317 2013-08-09 09:19:46Z jelle $
 # Maintainer: jelle van der Waa <jelle@vdwaa.nl>
 # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
@@ -9,8 +9,8 @@
 
 _pkgname=calibre
 pkgname=calibre-libre
-pkgver=0.9.41
-pkgrel=1
+pkgver=0.9.43
+pkgrel=2
 pkgdesc="Ebook management application, with unar support included and nonfree fonts removed"
 arch=('i686' 'x86_64' 'mips64el') 
 url="http://calibre-ebook.com/"
@@ -30,9 +30,10 @@ install=calibre.install
 source=("http://sourceforge.net/projects/calibre/files/${pkgver}/calibre-${pkgver}.tar.xz"
         'desktop_integration.patch'
         'calibre-mount-helper')
-md5sums=('2037b44c90a66e97823a637edfa194ca'
+md5sums=('63e78929c62ae838b767c95b0830eb31'
          '8353d1878c5a498b3e49eddef473605f'
          '675cd87d41342119827ef706055491e7')
+
 prepare(){
   cd "${srcdir}/${_pkgname}"
   #rm -rf src/{cherrypy,pyPdf}
diff --git a/libre/stuntrally-data-libre/PKGBUILD b/libre/stuntrally-data-libre/PKGBUILD
index 52e5783bf..fd5d175be 100644
--- a/libre/stuntrally-data-libre/PKGBUILD
+++ b/libre/stuntrally-data-libre/PKGBUILD
@@ -3,49 +3,70 @@
 
 pkgname=stuntrally-data-libre
 _pkgname=stuntrally-data
-pkgver=2.0
+pkgver=2.1
 pkgrel=1
 pkgdesc="Stunt Rally game with track editor, based on VDrift (data files), without nonfree data files"
 arch=('any')
 license=('GPL3' 'custom')
 url="http://code.google.com/p/vdrift-ogre"
+makedepends=('cmake' 'boost' 'libvorbis' 'mygui' 'sdl2' 'enet' 'hicolor-icon-theme' 'libxcursor')
+source=("$_pkgname-$pkgver.tar.gz::https://github.com/stuntrally/stuntrally/archive/${pkgver}.tar.gz"
+        "$_pkgname-tracks-$pkgver.tar.gz::https://github.com/stuntrally/tracks/archive/${pkgver}.tar.gz"
+        libre.patch )
 replaces=$_pkgname
 conflicts=$_pkgname
 provides=$_pkgname=$pkgver
-makedepends=('cmake' 'boost' 'libvorbis' 'mygui' 'sdl' 'enet' 'hicolor-icon-theme' 'libxcursor')
-source=(StuntRally-$pkgver-sources.tar.xz::http://sourceforge.net/projects/stuntrally/files/$pkgver/StuntRally-$pkgver-sources.tar.xz/download
-        libre.patch )
-md5sums=('22eb331c4401a0ed03e7a9e916fdb60c'
-         'e96df3ba70d6fd0949bb92f4dd609497')
+sha256sums=('d987e8c05ed1f3f54468e75e2c1f68a9a4c59ceefa7429130d4f800b28821ae0'
+            'a1ab9b11d9f5b6c4aa8e5a9028f5994e21446d96fda5762e427365e21cfe3d0e'
+            '8cf24da76bed18fd03a3166ba8b8da93be87a7e49b8aebe4135b8e0b1a36eb8a')
 prepare() {
   # patch some data files and remove nonfree data files
-  cd $srcdir/StuntRally-$pkgver-sources
+  cd "${srcdir}/stuntrally-${pkgver}/"
+
+  patch -Np1 -i "${srcdir}/libre.patch"
 
-  patch -Np1 -i $srcdir/libre.patch
+  rm -rv "data/"{grass/grassJungle.png,sounds/{0{1,2,3,4,5,6,7,8,9},1{0,1,2},boost,dirt{1,2},mud{1,_cont},scrap,screech,terrain{1,2,3,4,5},water{1,2,3,_cont}}.wav,terrain,trees2,cars/{3S,CT,M3,NS,TC6,XM}}
 
-  rm -rv "data/"{grass/grassJungle.png,sounds/{0{1,2,3,4,5,6,7,8,9},1{0,1,2},boost,dirt{1,2},mud{1,_cont},scrap,screech,terrain{1,2,3,4,5},water{1,2,3,_cont}}.wav,terrain,trees2,cars/{3S,CT,M3,NS,TC6,XM},tracks/{detroit,ruudskogen,virginia,weekend}}
+  cd "${srcdir}/tracks-${pkgver}/"
+
+  rm -rv {detroit,ruudskogen,virginia,weekend}
 }
 
 build() {
   # build the sources
-  cd $srcdir/StuntRally-$pkgver-sources
+  cd "${srcdir}/stuntrally-${pkgver}/"
 
+  rm -rf build
   mkdir build && cd build
 
   cmake .. \
       -DCMAKE_INSTALL_PREFIX="/usr" \
       -DSHARE_INSTALL="share/stuntrally"
   make
+
+  # build the tracks
+  cd "${srcdir}/tracks-${pkgver}/"
+
+  rm -rf build
+  mkdir build && cd build
+
+  cmake .. \
+      -DCMAKE_INSTALL_PREFIX="/usr"
+  make
 }
 
 package() {
   #install the sources
-  cd $srcdir/StuntRally-$pkgver-sources/build
-  make DESTDIR="$pkgdir" install
+  cd "${srcdir}/stuntrally-${pkgver}/build/"
+  make DESTDIR="${pkgdir}" install
+
+  # install the tracks
+  cd "${srcdir}/tracks-${pkgver}/build"
+  make DESTDIR="${pkgdir}/usr/share/stuntrally/" install
 
   # clean up
-  rm -rf "$pkgdir/usr/share/stuntrally/tracks/build"
-  rm -rf "$pkgdir/usr/share/icons"
-  rm -rf "$pkgdir/usr/share/applications"
-  rm -rf "$pkgdir/usr/bin"
+  rm -rf "${pkgdir}/usr/share/stuntrally/tracks/build"
+  rm -rf "${pkgdir}/usr/share/icons"
+  rm -rf "${pkgdir}/usr/share/applications"
+  rm -rf "${pkgdir}/usr/bin"
 }
diff --git a/libre/stuntrally-data-libre/libre.patch b/libre/stuntrally-data-libre/libre.patch
index 642188f05..f7f176a77 100644
--- a/libre/stuntrally-data-libre/libre.patch
+++ b/libre/stuntrally-data-libre/libre.patch
@@ -1,13 +1,13 @@
 diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
-index e01fc1b..853ebf7 100644
+index eb7fc89..d1b670f 100644
 --- a/data/CMakeLists.txt
 +++ b/data/CMakeLists.txt
 @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 2.8)
  
  # Install data files
  # TODO: make this use all data/* subdirs without tracks, not entered by hand ..
--foreach(datadir  cars carsim compositor editor fonts grass gui hud loading materials materials2 objects particles road road_s RTShaderLib skies skies_s sounds terrain terrain2 trees-old trees trees2)
-+foreach(datadir  cars carsim compositor editor fonts grass gui hud loading materials materials2 objects particles road road_s RTShaderLib skies skies_s sounds terrain2 trees-old trees)
+-foreach(datadir  cars carsim compositor editor fonts ghosts grass gui hud loading materials materials2 objects particles road road_s RTShaderLib skies skies_s sounds terrain terrain2 trees-old trees trees2)
++foreach(datadir  cars carsim compositor editor fonts ghosts grass gui hud loading materials materials2 objects particles road road_s RTShaderLib skies skies_s sounds terrain2 trees-old trees)
  	install(DIRECTORY ${datadir} DESTINATION ${SHARE_INSTALL})
  endforeach()