Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=mcirstabumps.git;a=commitdiff;h=82aa6e285a7e71f29d1b15c00be5d02a5c556235

commit 82aa6e285a7e71f29d1b15c00be5d02a5c556235
Author: Marius Cirsta <[email protected]>
Date:   Mon May 25 03:55:48 2015 +0300

freeorion-0.4.5_pre-1-x86_64

* version bump
* rebuild with boost 1.58.0

diff --git a/source/games-extra/freeorion/FrugalBuild 
b/source/games-extra/freeorion/FrugalBuild
index 1d9f282..25ee601 100644
--- a/source/games-extra/freeorion/FrugalBuild
+++ b/source/games-extra/freeorion/FrugalBuild
@@ -3,7 +3,7 @@


pkgname=freeorion
-pkgver=0.4.3
+pkgver=0.4.5_pre
pkgrel=1
pkgdesc="Free Clone of Master of Orion. Static linked version."
url="http://freeorion.org/";
@@ -11,22 +11,19 @@ _F_desktop_name="Freeorion"
_F_desktop_desc="Free MMO Clone"
_F_desktop_icon="/usr/share/pixmaps/$pkgname.png"
_F_desktop_categories="Game;StrategyGame;"
-_F_cd_path="${pkgname}-${pkgver}/FreeOrion"
_F_cmake_confopts="-DRELEASE_COMPILE_FLAGS=-DNDEBUG"
archs=('i686' 'x86_64')
groups=('games-extra')
-depends=('fmod' 'sdl>=1.2.14' 'openal' 'libvorbis' 'python' 'freealut' 
'bullet' 'ogre>=1.8.1-2' \
-                       'libpng>=1.4' 'libjpeg' 'libtiff' 'freetype2' 'ois')
-makedepends=('boost>=1.50.0')
+depends=('fmod' 'sdl2>=2.0.3' 'openal' 'libvorbis' 'python' 'freealut' 
'bullet' 'ogre>=1.8.1-2' \
+        'glew' 'libpng>=1.4' 'libjpeg' 'libtiff' 'freetype2' 'ois')
+makedepends=('boost>=1.58.0')
replaces=('gigi')
conflicts=('gigi')
Finclude cmake
-up2date="lynx --dump http://www.freeorion.org/index.php/Compile | grep -m1 
'FreeOrion v' | sed 's/.*FreeOrion v\([\.0-9]*\)/\1/'"
-source=(http://gentoo.inode.at/distfiles/${pkgname}-${pkgver}.tar.bz2 \
-       $pkgname.png build_fixes.patch)
-sha1sums=('5e9f5df57ba08759b59026ad9a97e44cad89d613' \
-          '51d7d9a9e9e9555f2646e693f0e48d28a5f06f2e' \
-          '6169bde548984c7398c5b90bb78fbbc602cc136b')
+#up2date="lynx --dump http://www.freeorion.org/index.php/Compile | grep -m1 
'FreeOrion v' | sed 's/.*FreeOrion v\([\.0-9]*\)/\1/'"
+up2date="Flasttar http://gentoo.inode.at/distfiles/";
+source=(http://gentoo.inode.at/distfiles/${pkgname}-${pkgver}.tar.bz2)
+sha1sums=('7b74d3bc1a228b03afa9dd7ffd6283b8b0ad86cb')

build()
{
@@ -35,24 +32,6 @@ build()
Fsed 'set(FreeOrion_WC_REVISION ???)' 'set(FreeOrion_WC_REVISION "")' 
CMakeLists.txt
Fsed 'set(FreeOrion_BUILDSYS "CMake")' 'set(FreeOrion_BUILDSYS "")' 
CMakeLists.txt

-       #and change the wrapper script for our paths
-       Fsed '${FO_TRACE} ${FO_GDB_ARGS} ./freeorion  --resource-dir ./default 
\$@' \
-            '${FO_TRACE} ${FO_GDB_ARGS} /usr/lib/freeorion/freeorion 
--resource-dir /usr/lib/freeorion/default \$@' \
-            loki_setup/freeorion-wrapper
-       Fsed 'ROOT=`dirname ${ME}`/application' 'ROOT="/usr/lib/freeorion/"' 
loki_setup/freeorion-wrapper
-
CMake_build
-
-       #now we need to move this to the propper dirs
-       Fmkdir usr/lib/$pkgname
-       Fmv usr/default usr/lib/$pkgname/
-       Fmv usr/freeorion* usr/lib/$pkgname
-       Fcp ${_F_cd_path}/*.cfg usr/lib/$pkgname
-        Frm usr/default
-       Fmkdir usr/bin
-       Fexe ${_F_cd_path}/loki_setup/freeorion-wrapper usr/bin/$pkgname
-       Finstall 644  ${_F_cd_path}/build/ogre_plugins.cfg 
usr/lib/$pkgname/ogre_plugins.cfg
-       Ficon $pkgname.png
-       Fdesktop2
}
# optimization OK
diff --git a/source/games-extra/freeorion/build_fixes.patch 
b/source/games-extra/freeorion/build_fixes.patch
deleted file mode 100644
index 49a2e69..0000000
--- a/source/games-extra/freeorion/build_fixes.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- FreeOrion/CMakeLists.txt   2013-12-25 19:10:54.000000000 +0200
-+++ FreeOrion.new/CMakeLists.txt       2013-12-25 15:39:59.000000000 +0200
-@@ -93,6 +93,8 @@
-
- find_package(OGRE)
-
-+find_package(Threads REQUIRED)
-+
- configure_file(
-     ${CMAKE_SOURCE_DIR}/ogre_plugins.cfg.in
-     ${CMAKE_BINARY_DIR}/ogre_plugins.cfg
-@@ -254,6 +256,7 @@
-     )
- endif ()
-
-+install(TARGETS freeorioncommon DESTINATION lib)
- ########################################
- # Packaging                            #
- ########################################
---- FreeOrion/parse/CMakeLists.txt     2013-06-30 21:19:06.000000000 +0300
-+++ FreeOrion.new/parse/CMakeLists.txt 2013-12-25 15:04:15.000000000 +0200
-@@ -55,3 +55,5 @@
- if (BUILD_TESTS)
-     add_subdirectory(test)
- endif ()
-+
-+install(TARGETS freeorionparse DESTINATION lib)
diff --git a/source/games-extra/freeorion/freeorion.png 
b/source/games-extra/freeorion/freeorion.png
deleted file mode 100644
index 0eb0a36..0000000
Binary files a/source/games-extra/freeorion/freeorion.png and /dev/null differ
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to