summarylogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.SRCINFO20
-rw-r--r--PKGBUILD40
-rw-r--r--commandline.txt7
-rw-r--r--fteqw-mingl.desktop9
-rw-r--r--fteqw-vk.desktop9
-rw-r--r--fteqw.desktop (renamed from fteqw-gl.desktop)6
6 files changed, 27 insertions, 64 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 08c8b3e8e9b3..e46e31f6388c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,38 +1,36 @@
pkgbase = ftequake
pkgdesc = FTE QuakeWorld. Engine for Quake 1,2,3 and Hexen 2
- pkgver = r5054
- pkgrel = 1
+ pkgver = r5529
+ pkgrel = 2
url = http://fte.triptohell.info
arch = i686
arch = x86_64
license = GPL
makedepends = ecasound
makedepends = libjpeg-turbo
+ makedepends = libxkbcommon
+ makedepends = speex
+ makedepends = opus
makedepends = libogg
makedepends = libpng
makedepends = libvorbis
makedepends = vulkan-validation-layers
makedepends = zlib
makedepends = mesa
+ makedepends = freetype2
makedepends = subversion
depends = libpng
depends = sdl2
depends = vulkan-validation-layers
provides = ftequake
conflicts = ftequake-svn
- source = svn+http://svn.code.sf.net/p/fteqw/code/trunk#revision=r5054
- source = fteqw-gl.desktop
- source = fteqw-mingl.desktop
+ source = svn+http://svn.code.sf.net/p/fteqw/code/trunk#revision=r5529
+ source = fteqw.desktop
source = fteqw-sv.desktop
- source = fteqw-vk.desktop
- source = commandline.txt
source = fteqw.png
md5sums = SKIP
- md5sums = a52ba6f48f20168d89f5f374f57c4176
- md5sums = dde36db22cb52b3b805677907c286e11
+ md5sums = 38b6927a580ea7fa64f161bea8dc6240
md5sums = b5157c36cc9c0231c6cbac0e566d8784
- md5sums = c6cc686b4df148f2d77ee315a267faf8
- md5sums = 8dd76f7027810a6d20fa1db654151e9a
md5sums = 0c1246661ff0e3c27ed0f31ae65bb6ea
pkgname = ftequake
diff --git a/PKGBUILD b/PKGBUILD
index 8ad9d82e831e..1da82598aa7e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,59 +1,49 @@
-# Maintainer : Michael DeGuzis <mdeguzis@gmail.com>
+# Maintainer : Original Maintainer <mdeguzis@gmail.com>
+# Maintainer : Zachary Freed <theconfuzzleddude@gmail.com>
pkgname=ftequake
_svndir=trunk
-pkgver=r5054
-pkgrel=1
+pkgver=r5529
+pkgrel=2
pkgdesc="FTE QuakeWorld. Engine for Quake 1,2,3 and Hexen 2"
arch=('i686' 'x86_64')
url="http://fte.triptohell.info"
license=('GPL')
-makedepends=('ecasound' 'libjpeg-turbo' 'libogg' 'libpng'
- 'libvorbis' 'vulkan-validation-layers' 'zlib' 'mesa'
+makedepends=('ecasound' 'libjpeg-turbo' 'libxkbcommon' 'speex' 'opus' 'libogg' 'libpng'
+ 'libvorbis' 'vulkan-validation-layers' 'zlib' 'mesa' 'freetype2'
'subversion')
depends=('libpng' 'sdl2' 'vulkan-validation-layers')
conflicts=('ftequake-svn')
provides=('ftequake')
source=("svn+http://svn.code.sf.net/p/fteqw/code/trunk#revision=$pkgver"
- 'fteqw-gl.desktop'
- 'fteqw-mingl.desktop'
+ 'fteqw.desktop'
'fteqw-sv.desktop'
- 'fteqw-vk.desktop'
- 'commandline.txt'
'fteqw.png')
-md5sums=('SKIP'
- 'a52ba6f48f20168d89f5f374f57c4176'
- 'dde36db22cb52b3b805677907c286e11'
- 'b5157c36cc9c0231c6cbac0e566d8784'
- 'c6cc686b4df148f2d77ee315a267faf8'
- '8dd76f7027810a6d20fa1db654151e9a'
- '0c1246661ff0e3c27ed0f31ae65bb6ea')
+md5sums=('SKIP'
+ '38b6927a580ea7fa64f161bea8dc6240'
+ 'b5157c36cc9c0231c6cbac0e566d8784'
+ '0c1246661ff0e3c27ed0f31ae65bb6ea')
build() {
cd $_svndir
- make -C engine sv-rel gl-rel mingl-rel qcc-rel vk-rel
+ make -C engine dbg CFLAGS+=' -fcommon'
}
package() {
- cd $srcdir/$_svndir/engine/release
+ cd "$srcdir/$_svndir/engine/debug"
install -Dm755 fteqcc "$pkgdir"/usr/bin/fteqcc
- install -Dm755 fteqw-gl "$pkgdir"/usr/bin/fteqw-gl
- install -Dm755 fteqw-mingl "$pkgdir"/usr/bin/fteqw-mingl
+ install -Dm755 fteqw "$pkgdir"/usr/bin/fteqw
install -Dm755 fteqw-sv "$pkgdir"/usr/bin/fteqw-sv
- install -Dm755 fteqw-vk "$pkgdir"/usr/bin/fteqw-vk
- install -Dm644 $startdir/fteqw-gl.desktop "$pkgdir"/usr/share/applications/fteqw-gl.desktop
- install -Dm644 $startdir/fteqw-mingl.desktop "$pkgdir"/usr/share/applications/fteqw-mingl.desktop
+ install -Dm644 $startdir/fteqw.desktop "$pkgdir"/usr/share/applications/fteqw.desktop
install -Dm644 $startdir/fteqw-sv.desktop "$pkgdir"/usr/share/applications/fteqw-sv.desktop
- install -Dm644 $startdir/fteqw-vk.desktop "$pkgdir"/usr/share/applications/fteqw-vk.desktop
install -Dm644 $startdir/fteqw.png $pkgdir/usr/share/pixmaps/fteqw.png
- install -Dm644 $startdir/commandline.txt "$pkgdir"/usr/share/games/fteqw
}
diff --git a/commandline.txt b/commandline.txt
deleted file mode 100644
index 3da93f3070fc..000000000000
--- a/commandline.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-gl-* = OpenGL & Dedicated Server
-mingl-* = Minimalistic OpenGL
-d3d-* = Direct3D (only available on Windows machines)
-m-* = Merged (Direct3D, OpenGL & Dedicated Server)
-sv-* = Dedicated Server
-
-note * is rel or dbg or profile. rel = release, dbg = debug, profile = profiling (release with profiling support).
diff --git a/fteqw-mingl.desktop b/fteqw-mingl.desktop
deleted file mode 100644
index fd575bfedcd5..000000000000
--- a/fteqw-mingl.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=FTE Quake (Minimal OpenGL)
-Comment=FTE Quake OpenGL, minimalistic OpenGL
-Exec=/usr/bin/fteqw-mingl
-Icon=/usr/share/pixmaps/fteqw.png
-Terminal=false
-Type=Application
-Categories=Game;
-MimeType=x-scheme-handler/steam;
diff --git a/fteqw-vk.desktop b/fteqw-vk.desktop
deleted file mode 100644
index 25d9251d864a..000000000000
--- a/fteqw-vk.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=FTE Quake (Vulkan)
-Comment=FTE Quake OpenGL using the Vulkan API
-Exec=/usr/bin/fteqw-vk
-Icon=/usr/share/pixmaps/fteqw.png
-Terminal=false
-Type=Application
-Categories=Game;
-MimeType=x-scheme-handler/steam;
diff --git a/fteqw-gl.desktop b/fteqw.desktop
index d06d8d27b480..1656c1535031 100644
--- a/fteqw-gl.desktop
+++ b/fteqw.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
-Name=FTE Quake (OpenGL)
-Comment=FTE Quake OpenGL
-Exec=/usr/bin/fteqw-gl
+Name=FTE Quake
+Comment=FTE Quake
+Exec=/usr/bin/fteqw
Icon=/usr/share/pixmaps/fteqw.png
Terminal=false
Type=Application