stuntrally-data-libre: fix libre.patch

2 files changed, 82 insertions, 4 deletions

diff --git a/libre/stuntrally-data-libre/PKGBUILD b/libre/stuntrally-data-libre/PKGBUILD
index b7544661c..c244e55a1 100644
--- a/libre/stuntrally-data-libre/PKGBUILD
+++ b/libre/stuntrally-data-libre/PKGBUILD
@@ -18,7 +18,7 @@ conflicts=$_pkgname
 provides=$_pkgname=$pkgver
 sha256sums=('305b5f498ab150e4cf1fd1d47410ea04ad3cf439b60278ea2b73a01278d9ca51'
             '45e9c976964e22348530a99a99c0dac30bc766d2f9edbe1a83a7b6791850d565'
-            '8cf24da76bed18fd03a3166ba8b8da93be87a7e49b8aebe4135b8e0b1a36eb8a')
+            '463dca1cddd422acef1066a6df65e692ce53382dba93d7caeb4ac43a81b719e1')
 prepare() {
   # patch some data files and remove nonfree data files
   cd "${srcdir}/stuntrally-${pkgver}/"
diff --git a/libre/stuntrally-data-libre/libre.patch b/libre/stuntrally-data-libre/libre.patch
index f7f176a77..1c2189aab 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 eb7fc89..d1b670f 100644
+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 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)
+-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()
  
@@ -70,3 +70,81 @@ index 2cab386..eb4e086 100644
 -
 -  boost
 -nathanshadow  thruster-level-ii
+diff --git a/stuntrally-2.2.1/libre.patch b/libre.patch
+new file mode 100644
+index 0000000..f7f176a
+--- /dev/null
++++ b/libre.patch
+@@ -0,0 +1,72 @@
++diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
++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 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()
++ 
++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
++-
++-This grass texture included with PagedGeometry was kindly provided by
++-Agnisola Philippe (http://www.blitz3dfr.com/portal_joomla/) for 
++-commercial or non-commercial use.
++diff --git a/data/sounds/_sounds_info.txt b/data/sounds/_sounds_info.txt
++index 2cab386..eb4e086 100644
++--- a/data/sounds/_sounds_info.txt
+++++ b/data/sounds/_sounds_info.txt
++@@ -7,39 +7,3 @@ grass
++ gravel
++ tire_squeal
++ wind
++-
++--- new sounds from
++-http://www.freesound.org/
++-
++-various smaller cuts, from:
++-[author  soundname]
++-
++-  metal hits 01..12:
++-halleck  metal-medium-hit
++-halleck  metal-hits-medium-1
++-halleck  metal-hits-light-1
++-halleck  metal-thump
++-sagetyrtle  crash-1
++-sagetyrtle  crash-2
++-halleck  big-metal-side-impact-1
++-halleck  big-metal-side-impact-2
++-halleck  metal-crash-1
++-  metal scrap,screech
++-halleck  metal-roll-cage-hits-heavy
++-halleck  metal-screech-and-scraping
++-
++-  water,mud:
++-cgeffex  large-splashes
++-
++-  mud_cont, water_cont
++-justinbw  water-spigget-onto-mud-1
++-justinbw  water-spigget-onto-mud-2
++-
++-  terrain,dirt:
++-halleck  hit-with-dirt-spray-1
++-halleck  hit-with-dirt-spray-1-body
++-halleck  hit-with-dirt-spray-2-body
++-halleck  hit-with-dirt-spray-3
++-
++-  boost
++-nathanshadow  thruster-level-ii