diff --git a/srcpkgs/yquake2/patches/build.patch b/srcpkgs/yquake2/patches/build.patch index 9eafc83de45..dfb387f695e 100644 --- a/srcpkgs/yquake2/patches/build.patch +++ b/srcpkgs/yquake2/patches/build.patch @@ -1,20 +1,20 @@ ---- Makefile.orig 2016-06-26 08:34:49.136904943 +0200 -+++ Makefile 2016-06-26 08:35:46.448588504 +0200 -@@ -154,7 +154,7 @@ CFLAGS := -O2 -fno-strict-aliasing -fomi +--- Makefile.orig 2017-06-27 19:08:03.195849277 +0200 ++++ Makefile 2017-06-27 19:09:14.208045274 +0200 +@@ -160,7 +160,7 @@ -Wall -pipe -g -fwrapv CFLAGS += $(OSX_ARCH) else --CFLAGS := -O2 -fno-strict-aliasing -fomit-frame-pointer \ -+CFLAGS += -O2 -fno-strict-aliasing -fomit-frame-pointer \ +-CFLAGS := -std=gnu99 -O2 -fno-strict-aliasing \ ++CFLAGS += -std=gnu99 -O2 -fno-strict-aliasing \ -Wall -pipe -g -ggdb -MMD -fwrapv endif -@@ -227,7 +227,7 @@ endif +@@ -237,7 +237,7 @@ # Base LDFLAGS. - ifeq ($(OSTYPE),Linux) + ifeq ($(YQ2_OSTYPE),Linux) -LDFLAGS := -L/usr/lib -lm -ldl -rdynamic +LDFLAGS += -L/usr/lib -lm -ldl -rdynamic - else ifeq ($(OSTYPE),FreeBSD) + else ifeq ($(YQ2_OSTYPE),FreeBSD) LDFLAGS := -L/usr/local/lib -lm - else ifeq ($(OSTYPE),OpenBSD) + else ifeq ($(YQ2_OSTYPE),OpenBSD) diff --git a/srcpkgs/yquake2/template b/srcpkgs/yquake2/template index 5b8edbbc10a..c3fe628efae 100644 --- a/srcpkgs/yquake2/template +++ b/srcpkgs/yquake2/template @@ -1,6 +1,6 @@ # Template file for 'yquake2' pkgname=yquake2 -version=6.00 +version=7.01 revision=1 only_for_archs="i686 i686-musl x86_64 x86_64-musl" wrksrc="quake2-${version}" @@ -13,16 +13,21 @@ maintainer="Juan RP " license="GPL-2" homepage="http://www.yamagi.org/quake2/" distfiles="http://deponie.yamagi.org/quake2/quake2-${version}.tar.xz" -checksum=37b6bb7a21d43b17f66ef908b172a3b918b967fafba59c13eecb147d75c45d4c +checksum=972f77867093b3c162dfb28ca930585cb71d1b7b183d676d8659d2fc97137ef7 do_build() { - make ${makejobs} WITH_SYSTEMWIDE=yes WITH_SYSTEMDIR=/usr/share/${pkgname} + make ${makejobs} WITH_SYSTEMWIDE=yes WITH_SYSTEMDIR=/usr/lib/${pkgname} } do_install() { - vbin release/quake2 ${pkgname} + vmkdir usr/lib/${pkgname} + vcopy release/quake2 usr/lib/${pkgname}/${pkgname} + vmkdir usr/bin + ln -sf /usr/lib/${pkgname}/${pkgname} ${DESTDIR}/usr/bin vbin release/q2ded ${pkgname}-q2ded - vinstall release/baseq2/game.so 644 usr/share/${pkgname}/baseq2 + vinstall release/ref_gl3.so 644 usr/lib/${pkgname} + vinstall release/ref_gl1.so 644 usr/lib/${pkgname} + vinstall release/baseq2/game.so 644 usr/lib/${pkgname}/baseq2 vinstall stuff/yq2.cfg 644 usr/share/doc/${pkgname} vinstall ${FILESDIR}/${pkgname}.desktop 644 usr/share/applications vinstall stuff/icon/Quake2.png 644 usr/share/pixmaps ${pkgname}.png