From dff324de37629b0d48267492245b95c39d708ef9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Thu, 15 May 2014 08:29:58 -0300 Subject: stuntrally-data-libre-2.3-1: updating version --- libre/stuntrally-data-libre/PKGBUILD | 31 +- libre/stuntrally-data-libre/libre.patch | 792 +++++++++++++++++++++++++++++--- 2 files changed, 741 insertions(+), 82 deletions(-) (limited to 'libre') diff --git a/libre/stuntrally-data-libre/PKGBUILD b/libre/stuntrally-data-libre/PKGBUILD index 80bd44b01..e0daa36d3 100644 --- a/libre/stuntrally-data-libre/PKGBUILD +++ b/libre/stuntrally-data-libre/PKGBUILD @@ -3,35 +3,34 @@ pkgname=stuntrally-data-libre _pkgname=stuntrally-data -pkgver=2.2.1 +pkgver=2.3 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') -mksource=("$_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 ) -source=("https://repo.parabolagnulinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz") +mksource=("$_pkgname-$pkgver.tar.gz::https://github.com/stuntrally/stuntrally/archive/${pkgver}.tar.gz") +source=("https://repo.parabolagnulinux.org/other/$pkgname/$pkgname-$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 -mksha256sums=('305b5f498ab150e4cf1fd1d47410ea04ad3cf439b60278ea2b73a01278d9ca51' - '45e9c976964e22348530a99a99c0dac30bc766d2f9edbe1a83a7b6791850d565' - '89eed28f625758a22460f2cea67547d2ea6cffa2bef8133083077b1753cf2b64') -sha256sums=('3159f8e2b33d5685fb3e7320ab8ce4a60a35830a4dac7b9c3c8aeebf9a38f8d5') +mksha256sums=('828ea8e4a8ea73005e88ef015cb9808cc75d0cb50693a0f4a7d8b09edd0765fd') +sha256sums=('2973aa09cd68541784d1df7b5f9f0e29a307078b5a9b33ad467880ebf8f832fb' + '8da6396abb569fbcf312095a96c2b7cfa92f510900d32b7d7e2fcd9478a7216f' + 'a155c170ff33dd92f4720c2f1214195eea6e5dab774a0939979599ab85f974d8') mksource() { - # patch some data files and remove nonfree data files + # remove nonfree data files cd "${srcdir}/stuntrally-${pkgver}/" - 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}} - - cd "${srcdir}/tracks-${pkgver}/" + rm -v data/trees2/tree*.mesh +} - rm -rv {detroit,ruudskogen,virginia,weekend} +prepare() { + # remove nonfree references + patch -Np0 -i "${srcdir}/libre.patch" } build() { diff --git a/libre/stuntrally-data-libre/libre.patch b/libre/stuntrally-data-libre/libre.patch index d55a4e54a..4fd576b2f 100644 --- a/libre/stuntrally-data-libre/libre.patch +++ b/libre/stuntrally-data-libre/libre.patch @@ -1,72 +1,732 @@ -diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt -index c43ef18..aa6373e 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 ghosts grass gui hud loading materials materials2 objects particles road road_s 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 skies skies_s sounds terrain2 trees-old trees) - install(DIRECTORY ${datadir} DESTINATION ${SHARE_INSTALL}) - endforeach() - -diff --git a/data/grass/_grass.txt b/data/grass/_grass.txt -index 787737e..84197af 100644 ---- a/data/grass/_grass.txt -+++ b/data/grass/_grass.txt -@@ -10,10 +10,3 @@ http://opengameart.org/content/plants-textures-pack-03 - http://opengameart.org/content/plants-textures-pack-04 - - many colored by CryHam for SR -- ------ Old --grassJungle.png rest is colored +diff --git stuntrally-2.3.orig/data/trees/collisions.xml stuntrally-2.3/data/trees/collisions.xml +index 58f6040..8536573 100644 +--- stuntrally-2.3.orig/data/trees/collisions.xml ++++ stuntrally-2.3/data/trees/collisions.xml +@@ -70,76 +70,7 @@ + + + +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- + +- +- +- +- +- +- + + + +@@ -175,13 +106,6 @@ + + + +- +- +- +- +- +- +- + + +