Added some patches for easier install

5 files changed, 40 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7de1a2c4b8a1..0924ad32dcfe 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -12,6 +12,7 @@ pkgbase = vegastrike-git
 	depends = python
 	depends = freeglut
 	depends = gtk2
+	depends = libvorbis
 	depends = openal
 	depends = sdl
 	depends = glu
diff --git a/PKGBUILD b/PKGBUILD
index 6c2fa839a299..e9055a764549 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@ pkgdesc="A spaceflight simulator in massive universe"
 arch=('i686' 'x86_64')
 url="www.vega-strike.org"
 license=('GPL')
-depends=('boost-libs' 'python' 'freeglut' 'gtk2' 'openal' 'sdl' 'glu' 'vegastrike-data')
+depends=('boost-libs' 'python' 'freeglut' 'gtk2' 'libvorbis' 'openal' 'sdl' 'glu' 'vegastrike-data')
 #optdepends=('vegastrike-data: original dataset')
 makedepends=('git' 'cmake')
 provides=('vegastrike')
@@ -25,9 +25,13 @@ pkgver() {
 prepare(){
 mkdir -p build
 patch -Np1 -i ../python3_compile.patch
+patch -Np1 -i ../vegastrike_install.patch
+patch -Np1 -i ../vegasettings_install.patch
+patch -Np1 -i ../mesh_tool_install.patch
 }
 
 build(){
+export DATA_DIR=/usr/share/vegastrike
 	cd build
 	cmake ../Vega-Strike-Engine-Source/engine/ \
 	-DCMAKE_BUILD_TYPE=Release \
@@ -38,7 +42,8 @@ build(){
 }
 
 package() {
-mkdir -p "${pkgdir}"/usr/bin
-  cd build
-  cp -vp {vegastrike,setup/vegasettings,objconv/mesh_tool} "${pkgdir}"/usr/bin
+#mkdir -p "${pkgdir}"/usr/bin
+#  cd build
+#  cp -vp {vegastrike,setup/vegasettings,objconv/mesh_tool} "${pkgdir}"/usr/bin
+make -C build DESTDIR="${pkgdir}" install
 }
diff --git a/mesh_tool_install.patch b/mesh_tool_install.patch
new file mode 100644
index 000000000000..bf8c178408c1
--- /dev/null
+++ b/mesh_tool_install.patch
@@ -0,0 +1,8 @@
+--- src/Vega-Strike-Engine-Source/engine/objconv/CMakeLists.txt.orig	2020-06-17 09:32:16.811021115 +0200
++++ src/Vega-Strike-Engine-Source/engine/objconv/CMakeLists.txt	2020-06-17 09:40:23.923412625 +0200
+@@ -59,3 +59,5 @@
+ ENDIF (OGRE_FOUND AND NOT USE_SYSTEM_BOOST)
+ 
+ TARGET_LINK_LIBRARIES(mesh_tool ${MSH_LIBS})
++
++INSTALL(TARGETS mesh_tool DESTINATION bin)
diff --git a/vegasettings_install.patch b/vegasettings_install.patch
new file mode 100644
index 000000000000..502808ffacec
--- /dev/null
+++ b/vegasettings_install.patch
@@ -0,0 +1,11 @@
+--- src/Vega-Strike-Engine-Source/engine/setup/CMakeLists.txt.orig	2020-06-17 09:28:36.348748984 +0200
++++ src/Vega-Strike-Engine-Source/engine/setup/CMakeLists.txt	2020-06-17 09:41:47.556144351 +0200
+@@ -12,6 +12,8 @@
+ 
+     ADD_EXECUTABLE(vegasettings ${VEGASETTINGS_SOURCES})
+ 
++    INSTALL(TARGETS vegasettings DESTINATION bin)
++
+     #find GTK2
+     FIND_PACKAGE(GTK2 REQUIRED)
+     IF (GTK2_FOUND)
diff --git a/vegastrike_install.patch b/vegastrike_install.patch
new file mode 100644
index 000000000000..acf6da002ead
--- /dev/null
+++ b/vegastrike_install.patch
@@ -0,0 +1,11 @@
+--- src/Vega-Strike-Engine-Source/engine/CMakeLists.txt.orig	2020-06-17 08:18:19.562336282 +0200
++++ src/Vega-Strike-Engine-Source/engine/CMakeLists.txt	2020-06-17 08:20:30.666476756 +0200
+@@ -1070,6 +1070,8 @@
+     vorbisfile_LIBRARY
+ )
+ 
++INSTALL(TARGETS vegastrike DESTINATION bin)
++
+ SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "3D OpenGL spaceflight simulator")
+ SET(CPACK_PACKAGE_VENDOR "Vega Strike")
+ SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/../README.md")