diff --git a/srcpkgs/ufoai-data b/srcpkgs/ufoai-data deleted file mode 120000 index 92362c4dbe5..00000000000 --- a/srcpkgs/ufoai-data +++ /dev/null @@ -1 +0,0 @@ -ufoai \ No newline at end of file diff --git a/srcpkgs/ufoai/patches/kill-pangox.patch b/srcpkgs/ufoai/patches/kill-pangox.patch new file mode 100644 index 00000000000..c72a37648b5 --- /dev/null +++ b/srcpkgs/ufoai/patches/kill-pangox.patch @@ -0,0 +1,39 @@ +--- src/tools/radiant/libs/gtkutil/glfont.cpp.orig 2020-10-10 12:51:38.707431160 +0700 ++++ src/tools/radiant/libs/gtkutil/glfont.cpp 2020-10-10 12:51:59.843621038 +0700 +@@ -26,35 +26,7 @@ + + GLFont glfont_create (const std::string& font_string) + { +- GLuint font_list_base = glGenLists(256); +- gint font_height = 0; +- +- PangoFontDescription* font_desc = pango_font_description_from_string(font_string.c_str()); +- +- PangoFont* font = gdk_gl_font_use_pango_font(font_desc, 0, 256, font_list_base); +- +- if (font != 0) { +- PangoFontMetrics* font_metrics = pango_font_get_metrics(font, 0); +- +- font_height = pango_font_metrics_get_ascent(font_metrics) + pango_font_metrics_get_descent(font_metrics); +- font_height = PANGO_PIXELS(font_height); +- +- pango_font_metrics_unref(font_metrics); +- } else { +- globalErrorStream() << "Failed to initialize font " << font_string << "\n"; +- pango_font_description_free(font_desc); +- return GLFont(-1, -1); +- } +- +- pango_font_description_free(font_desc); +- +- // fix for pango/gtkglext metrix bug +- if (font_height > 16) +- font_height = 16; +- +- globalOutputStream() << "Use font " << font_string << "\n"; +- +- return GLFont(font_list_base, font_height); ++ return GLFont(-1, -1); + } + + void glfont_release (GLFont& font) diff --git a/srcpkgs/ufoai/patches/sdl2_gl_orthof.patch b/srcpkgs/ufoai/patches/sdl2_gl_orthof.patch new file mode 100644 index 00000000000..3d9ffd070ce --- /dev/null +++ b/srcpkgs/ufoai/patches/sdl2_gl_orthof.patch @@ -0,0 +1,17 @@ +SDL_opengl.h dosen't have the nessecary headers. GL/gl.h has the parts +of SDL_opengl.h needed for SDL_opengl_glext.h, then include +SDL_opengl_glext.h which has the *f functions. + +--- src/client/renderer/r_gl.h 2020-10-08 07:50:29.818581990 +1100 ++++ src/client/renderer/r_gl.h 2020-10-08 07:52:16.805006133 +1100 +@@ -29,7 +29,8 @@ + #include "../../ports/android/r_gles_android.h" + #include + #else +-#include ++#include ++#include + #endif + + inline void R_DrawArrays (GLint first, GLsizei count) { + diff --git a/srcpkgs/ufoai/template b/srcpkgs/ufoai/template index 6463d2c47c6..18fd7317619 100644 --- a/srcpkgs/ufoai/template +++ b/srcpkgs/ufoai/template @@ -1,28 +1,31 @@ # Template file for 'ufoai' pkgname=ufoai version=2.5 -revision=2 +revision=3 create_wrksrc=yes build_style=gnu-makefile -hostmakedepends="pkg-config" +hostmakedepends="pkg-config gettext" makedepends="MesaLib-devel glu-devel libjpeg-turbo-devel libvorbis-devel libopenal-devel xvidcore-devel libtheora-devel SDL2_image-devel SDL2_mixer-devel SDL2_ttf-devel libcurl-devel gtkglext-devel gtksourceview2-devel" -depends="ufoai-data>=${version} ca-certificates" +depends="ca-certificates" short_desc="UFO Alien Invasion" maintainer="Jürgen Buchmüller " -license="GPL-2" +license="GPL-2.0-or-later" homepage="http://ufoai.org/" distfiles=" ${SOURCEFORGE_SITE}/${pkgname}/UFO_AI%202.x/${version}/${pkgname}-${version}-source.tar.bz2 ${SOURCEFORGE_SITE}/${pkgname}/UFO_AI%202.x/${version}/${pkgname}-${version}-data.tar" checksum="0c7cc3bc9efeb276f71cbe6ee8ff7c76f98d183de79f1a069fa63059cf182a8f 5e706a424aff6a2ea30a4c798129d6304e897387eadf808528129b512b7dcdb0" -broken="ELF in /usr/share" +replaces="ufoai-data>=0" +ignore_elf_dirs="/usr/share/ufoai" +broken="game doesn't work" # suppress a lot of warnings CXXFLAGS="-Wno-cast-align -Wno-cast-qual -Wno-inline" +LDFLAGS="-lX11" post_extract() { cd ${wrksrc} @@ -67,15 +70,6 @@ post_install() { sed -i ${DESTDIR}/usr/share/applications/* -e "s;/usr/games/;;" } -ufoai-data_package() { - short_desc+=" - data files" - archs=noarch - pkg_install() { - vmove usr/share/ufoai/base/*.pk3 - vmove usr/share/ufoai/base/i18n - } -} - ufoai-radiant_package() { short_desc+=" - map editor" depends="${sourcepkg}>=${version}_${revision}"