Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/arm-elf-binutils/PKGBUILD
	community/bird/PKGBUILD
	community/cantata/PKGBUILD
	community/dbmail/PKGBUILD
	community/ekg2/PKGBUILD
	community/ffmpeg-compat/PKGBUILD
	community/gigedit/PKGBUILD
	community/gimp-refocus/PKGBUILD
	community/gmime24/PKGBUILD
	community/gmpc/PKGBUILD
	community/gnash/PKGBUILD
	community/id3lib-rcc/PKGBUILD
	community/linuxsampler/PKGBUILD
	community/lwm/PKGBUILD
	community/midori/PKGBUILD
	community/mplayer2/PKGBUILD
	community/mtpaint/PKGBUILD
	community/nestopia/PKGBUILD
	community/preload/PKGBUILD
	community/projectm/PKGBUILD
	community/rusxmms/PKGBUILD
	community/taglib-rcc/PKGBUILD
	community/the_silver_searcher/PKGBUILD
	community/xnee/PKGBUILD
	core/libgcrypt/PKGBUILD
	core/libusbx/PKGBUILD
	core/mkinitcpio-busybox/PKGBUILD
	extra/a2ps/PKGBUILD
	extra/a52dec/PKGBUILD
	extra/abook/PKGBUILD
	extra/avidemux/PKGBUILD
	extra/bzflag/PKGBUILD
	extra/cln/PKGBUILD
	extra/exempi/PKGBUILD
	extra/ffmpeg/PKGBUILD
	extra/fluxter/PKGBUILD
	extra/fontforge/PKGBUILD
	extra/glib/PKGBUILD
	extra/gnet/PKGBUILD
	extra/gnome-vfs/PKGBUILD
	extra/gnutls/PKGBUILD
	extra/gstreamer0.10-ugly/PKGBUILD
	extra/gtk/PKGBUILD
	extra/idnkit/PKGBUILD
	extra/ilmbase/PKGBUILD
	extra/imake/PKGBUILD
	extra/kdenetwork/PKGBUILD
	extra/libdatrie/PKGBUILD
	extra/libmbim/PKGBUILD
	extra/libmp3splt/PKGBUILD
	extra/libqmi/PKGBUILD
	extra/libtxc_dxtn/PKGBUILD
	extra/libxfont/PKGBUILD
	extra/mesa/PKGBUILD
	extra/modemmanager/PKGBUILD
	extra/nedit/PKGBUILD
	extra/nmap/PKGBUILD
	extra/openexr/PKGBUILD
	extra/purple-plugin-pack/PKGBUILD
	extra/qemu/PKGBUILD
	extra/qtwebkit/PKGBUILD
	extra/subversion/PKGBUILD
	extra/transmission/PKGBUILD
	extra/truecrypt/PKGBUILD
	extra/vigra/PKGBUILD
	extra/virtuoso/PKGBUILD
	extra/vlc/PKGBUILD
	extra/wireshark/PKGBUILD
	extra/wxmaxima/PKGBUILD
	extra/x264/PKGBUILD
	extra/xorg-iceauth/PKGBUILD
	extra/xorg-mkfontscale/PKGBUILD
	extra/xorg-xfd/PKGBUILD
	libre/abuse-libre/PKGBUILD
	libre/clementine-libre/PKGBUILD
	libre/linux-libre/PKGBUILD

2 files changed, 123 insertions, 0 deletions

diff --git a/libre/stuntrally-data-libre/PKGBUILD b/libre/stuntrally-data-libre/PKGBUILD
new file mode 100644
index 000000000..52e5783bf
--- /dev/null
+++ b/libre/stuntrally-data-libre/PKGBUILD
@@ -0,0 +1,51 @@
+# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+
+pkgname=stuntrally-data-libre
+_pkgname=stuntrally-data
+pkgver=2.0
+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"
+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')
+prepare() {
+  # patch some data files and remove nonfree data files
+  cd $srcdir/StuntRally-$pkgver-sources
+
+  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},tracks/{detroit,ruudskogen,virginia,weekend}}
+}
+
+build() {
+  # build the sources
+  cd $srcdir/StuntRally-$pkgver-sources
+
+  mkdir build && cd build
+
+  cmake .. \
+      -DCMAKE_INSTALL_PREFIX="/usr" \
+      -DSHARE_INSTALL="share/stuntrally"
+  make
+}
+
+package() {
+  #install the sources
+  cd $srcdir/StuntRally-$pkgver-sources/build
+  make DESTDIR="$pkgdir" 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"
+}
diff --git a/libre/stuntrally-data-libre/libre.patch b/libre/stuntrally-data-libre/libre.patch
new file mode 100644
index 000000000..642188f05
--- /dev/null
+++ b/libre/stuntrally-data-libre/libre.patch
@@ -0,0 +1,72 @@
+diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
+index e01fc1b..853ebf7 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)
+ 	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