Author: goneri Date: 2009-04-19 17:51:05 +0000 (Sun, 19 Apr 2009) New Revision: 9631
Added: packages/trunk/openarena/debian/patches/40_kfreebsd.diff Modified: packages/trunk/openarena/debian/changelog packages/trunk/openarena/debian/patches/series packages/trunk/openarena/debian/rules Log: fix FTBFS on kFreeBSD, thanks Cyril Brulebois (#413617) Modified: packages/trunk/openarena/debian/changelog =================================================================== --- packages/trunk/openarena/debian/changelog 2009-04-19 14:07:24 UTC (rev 9630) +++ packages/trunk/openarena/debian/changelog 2009-04-19 17:51:05 UTC (rev 9631) @@ -1,3 +1,9 @@ +openarena (0.8.1-4) unstable; urgency=low + + * fix FTBFS on kFreeBSD, thanks Cyril Brulebois (#413617) + + -- Gonéri Le Bouder <[email protected]> Sun, 19 Apr 2009 19:49:34 +0200 + openarena (0.8.1-3) unstable; urgency=low * Turn on BUILD_CLIENT_SMP (Closes: #517894) Added: packages/trunk/openarena/debian/patches/40_kfreebsd.diff =================================================================== --- packages/trunk/openarena/debian/patches/40_kfreebsd.diff (rev 0) +++ packages/trunk/openarena/debian/patches/40_kfreebsd.diff 2009-04-19 17:51:05 UTC (rev 9631) @@ -0,0 +1,31 @@ +--- openarena-0.8.1.orig/Makefile ++++ openarena-0.8.1/Makefile +@@ -4,7 +4,7 @@ + # GNU Make required + # + +-COMPILE_PLATFORM=$(shell uname|sed -e s/_.*//|tr '[:upper:]' '[:lower:]') ++COMPILE_PLATFORM=$(shell uname|sed -e s/_.*//|tr '[:upper:]' '[:lower:]'|sed -e 's/\//_/g') + + COMPILE_ARCH=$(shell uname -m | sed -e s/i.86/i386/) + +@@ -213,7 +213,7 @@ + INSTALL=install + MKDIR=mkdir + +-ifeq ($(PLATFORM),linux) ++ifneq (,findstring($(PLATFORM),linux gnu_kfreebsd)) + + ifeq ($(ARCH),alpha) + ARCH=alpha +--- openarena-0.8.1.orig/code/qcommon/q_platform.h ++++ openarena-0.8.1/code/qcommon/q_platform.h +@@ -120,7 +120,7 @@ + + //================================================================= LINUX === + +-#ifdef __linux__ ++#if defined(__linux__) || defined(__FreeBSD_kernel__) + + #include <endian.h> + Modified: packages/trunk/openarena/debian/patches/series =================================================================== --- packages/trunk/openarena/debian/patches/series 2009-04-19 14:07:24 UTC (rev 9630) +++ packages/trunk/openarena/debian/patches/series 2009-04-19 17:51:05 UTC (rev 9631) @@ -2,3 +2,4 @@ 10_remove_upstream_build_flags.diff #20_dont_build_shipped_jpeg.diff 30_link_against_local_libspeex.diff +40_kfreebsd.diff Modified: packages/trunk/openarena/debian/rules =================================================================== --- packages/trunk/openarena/debian/rules 2009-04-19 14:07:24 UTC (rev 9630) +++ packages/trunk/openarena/debian/rules 2009-04-19 17:51:05 UTC (rev 9631) @@ -2,6 +2,7 @@ #export DH_VERBOSE=1 # copied from ioq3 make scripts +Q3OS=$(shell uname|sed -e s/_.*//|tr '[:upper:]' '[:lower:]'|sed -e 's/\//_/g') Q3ARCH=$(shell uname -m | sed -e s/i.86/i386/) CFLAGS += -fsigned-char @@ -16,6 +17,7 @@ USE_VOIP=1 \ USE_INTERNAL_SPEEX=0 \ BUILD_CLIENT_SMP=1 \ + USE_LOCAL_HEADERS=0 \ DEFAULT_BASEDIR=/usr/share/games/openarena touch $@ @@ -44,8 +46,8 @@ dh_testroot dh_clean -k mkdir -p debian/tmp - cp build/release-linux-$(Q3ARCH)/openarena.$(Q3ARCH) debian/tmp/openarena - cp build/release-linux-$(Q3ARCH)/oa_ded.$(Q3ARCH) debian/tmp/openarena-server + cp build/release-$(Q3OS)-$(Q3ARCH)/openarena.$(Q3ARCH) debian/tmp/openarena + cp build/release-$(Q3OS)-$(Q3ARCH)/oa_ded.$(Q3ARCH) debian/tmp/openarena-server uudecode -o openarena128.png debian/oa128.png.uu convert -scale 32x32 openarena128.png openarena32.xpm dh_install _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
