Hello community, here is the log from the commit of package ioquake3 for openSUSE:Factory checked in at 2020-11-29 12:31:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ioquake3 (Old) and /work/SRC/openSUSE:Factory/.ioquake3.new.5913 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ioquake3" Sun Nov 29 12:31:34 2020 rev:4 rq:851499 version:1.36+git.20201117 Changes: -------- --- /work/SRC/openSUSE:Factory/ioquake3/ioquake3.changes 2020-04-29 20:54:45.333324040 +0200 +++ /work/SRC/openSUSE:Factory/.ioquake3.new.5913/ioquake3.changes 2020-11-29 12:33:35.218315237 +0100 @@ -1,0 +2,18 @@ +Sat Nov 28 09:06:52 UTC 2020 - Carsten Ziepke <[email protected]> + +- Update to version 1.36+git.20201117 + - Add C syntax highlighting to readme + - Update README.md + - Merge pull request #447 from HappyFacade/patch-1 + - Simplify glsl -> C stringification + - Make LCC path resolution more robust + - GitHub Actions setup + - Remove old CI system configurations + - Add status badge to README + - Fix shader stringify + - Run apt-get update before installing deps + - Avoid platform sed differences + - Merge pull request #436 from Calinou/default-texturemode-mipmap-linear + - [sdl] Turn tentative definition into actual definition + +------------------------------------------------------------------- Old: ---- ioquake3-1.36+git.20200211.tar.xz New: ---- ioquake3-1.36+git.20201117.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ioquake3.spec ++++++ --- /var/tmp/diff_new_pack.KpJFqw/_old 2020-11-29 12:33:35.650315674 +0100 +++ /var/tmp/diff_new_pack.KpJFqw/_new 2020-11-29 12:33:35.654315678 +0100 @@ -26,7 +26,7 @@ %endif Name: ioquake3 # don't forget to change the version in the win32 spec file as well! -Version: 1.36+git.20200211 +Version: 1.36+git.20201117 Release: 0 Summary: Quake III License: GPL-2.0-or-later ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.KpJFqw/_old 2020-11-29 12:33:35.686315711 +0100 +++ /var/tmp/diff_new_pack.KpJFqw/_new 2020-11-29 12:33:35.686315711 +0100 @@ -1,4 +1,6 @@ <servicedata> -<service name="tar_scm"> - <param name="url">https://github.com/ioquake/ioq3.git</param> - <param name="changesrevision">f2c61c14c4ee3d79907cdac5251706c2f96a4901</param></service></servicedata> \ No newline at end of file + <service name="tar_scm"> + <param name="url">https://github.com/ioquake/ioq3.git</param> + <param name="changesrevision">d1b7ab6b22cc99205ac890910e286859e30df40e</param> + </service> +</servicedata> \ No newline at end of file ++++++ ioquake3-1.36+git.20200211.tar.xz -> ioquake3-1.36+git.20201117.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ioquake3-1.36+git.20200211/.github/workflows/build.yml new/ioquake3-1.36+git.20201117/.github/workflows/build.yml --- old/ioquake3-1.36+git.20200211/.github/workflows/build.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/ioquake3-1.36+git.20201117/.github/workflows/build.yml 2020-11-17 19:08:13.000000000 +0100 @@ -0,0 +1,49 @@ +name: Build +on: [push, pull_request] + +jobs: + linux: + name: Linux + runs-on: ubuntu-16.04 + steps: + - uses: actions/checkout@v2 + - name: Install Dependencies + run: | + sudo apt-get update + sudo apt-get install libsdl2-dev + - name: Compile + run: make release + env: + ARCHIVE: 1 + - uses: actions/upload-artifact@v2 + with: + name: Linux + path: build/*.zip + windows: + name: Windows + runs-on: windows-2019 + steps: + - uses: actions/checkout@v2 + - name: Compile + run: | + choco install zip + make release + env: + ARCHIVE: 1 + - uses: actions/upload-artifact@v2 + with: + name: Windows + path: build/*.zip + macos: + name: macOS + runs-on: macos-10.15 + steps: + - uses: actions/checkout@v2 + - name: Compile + run: make release + env: + ARCHIVE: 1 + - uses: actions/upload-artifact@v2 + with: + name: macOS + path: build/*.zip diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ioquake3-1.36+git.20200211/.travis.yml new/ioquake3-1.36+git.20201117/.travis.yml --- old/ioquake3-1.36+git.20200211/.travis.yml 2020-02-11 23:41:56.000000000 +0100 +++ new/ioquake3-1.36+git.20201117/.travis.yml 1970-01-01 01:00:00.000000000 +0100 @@ -1,48 +0,0 @@ -# sudo is required for travis-ci to use ubuntu trusty -# ubuntu trusty is required for libsdl2-dev -sudo: required -dist: trusty - -language: c - -env: - global: - # coverity token - - secure: "a2pGsG/+LS12sD/vgCF912TKBDDiT8PwRTH50eE94trQoHmD+bubIc4mXR9rSuU/NKNPdn6KZlqrVkVuoIanjYaf+rg28VavGMcBrtVO2cI1yjTUxb5Eq/cT20m3KfZCSFw3iWXfiK1CpDkm9Pdrr2Yz99EGZse3Y6jRGJ6giWM=" - matrix: - # standard builds - - CC=gcc - - CC=clang - # extra libs - - CC=gcc USE_FREETYPE=1 - - CC=clang USE_FREETYPE=1 - # cross-compile using mingw - # dlopen curl to workaround link error because mingw-w64 in trusty is missing strtok_r required by libcurl.a - - CC= PLATFORM="mingw32" ARCH="x86" USE_CURL_DLOPEN=1 - - CC= PLATFORM="mingw32" ARCH="x86_64" USE_CURL_DLOPEN=1 - -script: ./travis-ci-build.sh - -notifications: - email: false - -addons: - apt: - packages: - - binutils-mingw-w64-i686 - - gcc-mingw-w64-i686 - - binutils-mingw-w64-x86-64 - - gcc-mingw-w64-x86-64 - - gcc-mingw-w64 - - mingw-w64 - - libgl1-mesa-dev - - libsdl2-dev - - libfreetype6-dev - coverity_scan: - project: - name: "ioquake/ioq3" - description: "Build submitted via Travis CI" - notification_email: [email protected] - build_command_prepend: "make clean" - build_command: "make release" - branch_pattern: coverity_scan diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ioquake3-1.36+git.20200211/Makefile new/ioquake3-1.36+git.20201117/Makefile --- old/ioquake3-1.36+git.20200211/Makefile 2020-02-11 23:41:56.000000000 +0100 +++ new/ioquake3-1.36+git.20201117/Makefile 2020-11-17 19:08:13.000000000 +0100 @@ -264,6 +264,7 @@ OPUSDIR=$(MOUNT_DIR)/opus-1.2.1 OPUSFILEDIR=$(MOUNT_DIR)/opusfile-0.9 ZDIR=$(MOUNT_DIR)/zlib +TOOLSDIR=$(MOUNT_DIR)/tools Q3ASMDIR=$(MOUNT_DIR)/tools/asm LBURGDIR=$(MOUNT_DIR)/tools/lcc/lburg Q3CPPDIR=$(MOUNT_DIR)/tools/lcc/cpp @@ -1222,9 +1223,7 @@ define DO_REF_STR $(echo_cmd) "REF_STR $<" $(Q)rm -f $@ -$(Q)echo "const char *fallbackShader_$(notdir $(basename $<)) =" >> $@ -$(Q)cat $< | sed -e 's/^/\"/;s/$$/\\n\"/' | tr -d '\r' >> $@ -$(Q)echo ";" >> $@ +$(Q)$(STRINGIFY) $< $@ endef define DO_BOT_CC @@ -1490,6 +1489,7 @@ Q3CPP = $(B)/tools/q3cpp$(TOOLS_BINEXT) Q3LCC = $(B)/tools/q3lcc$(TOOLS_BINEXT) Q3ASM = $(B)/tools/q3asm$(TOOLS_BINEXT) +STRINGIFY = $(B)/tools/stringify$(TOOLS_BINEXT) LBURGOBJ= \ $(B)/tools/lburg/lburg.o \ @@ -1583,6 +1583,10 @@ $(echo_cmd) "LD $@" $(Q)$(TOOLS_CC) $(TOOLS_CFLAGS) $(TOOLS_LDFLAGS) -o $@ $(Q3LCCOBJ) $(TOOLS_LIBS) +$(STRINGIFY): $(TOOLSDIR)/stringify.c + $(echo_cmd) "CC $@" + $(Q)$(TOOLS_CC) $(TOOLS_CFLAGS) $(TOOLS_LDFLAGS) -o $@ $(TOOLSDIR)/stringify.c $(TOOLS_LIBS) + define DO_Q3LCC $(echo_cmd) "Q3LCC $<" $(Q)$(Q3LCC) $(BASEGAME_CFLAGS) -o $@ $< @@ -2725,7 +2729,7 @@ $(B)/renderergl1/tr_altivec.o: $(RGL1DIR)/tr_altivec.c $(DO_REF_CC_ALTIVEC) -$(B)/renderergl2/glsl/%.c: $(RGL2DIR)/glsl/%.glsl +$(B)/renderergl2/glsl/%.c: $(RGL2DIR)/glsl/%.glsl $(STRINGIFY) $(DO_REF_STR) $(B)/renderergl2/glsl/%.o: $(B)/renderergl2/glsl/%.c @@ -2950,7 +2954,7 @@ @echo "TOOLS_CLEAN $(B)" @rm -f $(TOOLSOBJ) @rm -f $(TOOLSOBJ_D_FILES) - @rm -f $(LBURG) $(DAGCHECK_C) $(Q3RCC) $(Q3CPP) $(Q3LCC) $(Q3ASM) + @rm -f $(LBURG) $(DAGCHECK_C) $(Q3RCC) $(Q3CPP) $(Q3LCC) $(Q3ASM) $(STRINGIFY) distclean: clean toolsclean @rm -rf $(BUILD_DIR) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ioquake3-1.36+git.20200211/README.md new/ioquake3-1.36+git.20201117/README.md --- old/ioquake3-1.36+git.20200211/README.md 2020-02-11 23:41:56.000000000 +0100 +++ new/ioquake3-1.36+git.20201117/README.md 2020-11-17 19:08:13.000000000 +0100 @@ -1,3 +1,5 @@ + + ,---------------------------------------. | _ _ ____ | | (_)___ __ _ _ _ __ _| |_____|__ / | @@ -5,7 +7,7 @@ | |_\___/\__, |\_,_\__,_|_\_\___|___/ | | |_| | | | - `---------- http://ioquake3.org --------' + `--------- https://ioquake3.org --------' The intent of this project is to provide a baseline Quake 3 which may be used for further development and baseq3 fun. @@ -45,6 +47,27 @@ want to chat, please visit our forums: http://discourse.ioquake.org +# Thank You: + +<p> + <a href="https://www.digitalocean.com/";>Digital Ocean<br/> + <img src="https://opensource.nyc3.cdn.digitaloceanspaces.com/attribution/assets/PoweredByDO/DO_Powered_by_Badge_blue.svg"; width="201px"> + </a> +</p> +--- +<p> +<a href="https://www.discourse.org/";>Discourse<br/> +<img src= +"https://user-images.githubusercontent.com/1681963/52239617-e2683480-289c-11e9-922b-5da55472e5b4.png"; + width="300px"></a> +</p> +--- +<p> +<a href="https://icculus.org/";>icculus dot org<br/> +<img src="http://icculus.org/icculus-org-now.png"; width="300px"></a> +</p> + + # Compilation and installation For *nix @@ -359,11 +382,13 @@ Add the following code snippet to q_shared.h: - #ifdef Q3_VM - typedef int intptr_t; - #else - #include <stdint.h> - #endif +```c +#ifdef Q3_VM +typedef int intptr_t; +#else +#include <stdint.h> +#endif +``` Note if you simply wish to run mods on a 64bit platform you do not need to recompile anything since by default Q3 uses a virtual machine system. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ioquake3-1.36+git.20200211/code/renderergl1/tr_init.c new/ioquake3-1.36+git.20201117/code/renderergl1/tr_init.c --- old/ioquake3-1.36+git.20200211/code/renderergl1/tr_init.c 2020-02-11 23:41:56.000000000 +0100 +++ new/ioquake3-1.36+git.20201117/code/renderergl1/tr_init.c 2020-11-17 19:08:13.000000000 +0100 @@ -1081,7 +1081,7 @@ r_dynamiclight = ri.Cvar_Get( "r_dynamiclight", "1", CVAR_ARCHIVE ); r_dlightBacks = ri.Cvar_Get( "r_dlightBacks", "1", CVAR_ARCHIVE ); r_finish = ri.Cvar_Get ("r_finish", "0", CVAR_ARCHIVE); - r_textureMode = ri.Cvar_Get( "r_textureMode", "GL_LINEAR_MIPMAP_NEAREST", CVAR_ARCHIVE ); + r_textureMode = ri.Cvar_Get( "r_textureMode", "GL_LINEAR_MIPMAP_LINEAR", CVAR_ARCHIVE ); r_swapInterval = ri.Cvar_Get( "r_swapInterval", "0", CVAR_ARCHIVE | CVAR_LATCH ); r_gamma = ri.Cvar_Get( "r_gamma", "1", CVAR_ARCHIVE ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ioquake3-1.36+git.20200211/code/renderergl2/tr_init.c new/ioquake3-1.36+git.20201117/code/renderergl2/tr_init.c --- old/ioquake3-1.36+git.20200211/code/renderergl2/tr_init.c 2020-02-11 23:41:56.000000000 +0100 +++ new/ioquake3-1.36+git.20201117/code/renderergl2/tr_init.c 2020-11-17 19:08:13.000000000 +0100 @@ -1304,7 +1304,7 @@ r_dynamiclight = ri.Cvar_Get( "r_dynamiclight", "1", CVAR_ARCHIVE ); r_dlightBacks = ri.Cvar_Get( "r_dlightBacks", "1", CVAR_ARCHIVE ); r_finish = ri.Cvar_Get ("r_finish", "0", CVAR_ARCHIVE); - r_textureMode = ri.Cvar_Get( "r_textureMode", "GL_LINEAR_MIPMAP_NEAREST", CVAR_ARCHIVE ); + r_textureMode = ri.Cvar_Get( "r_textureMode", "GL_LINEAR_MIPMAP_LINEAR", CVAR_ARCHIVE ); r_swapInterval = ri.Cvar_Get( "r_swapInterval", "0", CVAR_ARCHIVE | CVAR_LATCH ); r_gamma = ri.Cvar_Get( "r_gamma", "1", CVAR_ARCHIVE ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ioquake3-1.36+git.20200211/code/sdl/sdl_glimp.c new/ioquake3-1.36+git.20201117/code/sdl/sdl_glimp.c --- old/ioquake3-1.36+git.20200211/code/sdl/sdl_glimp.c 2020-02-11 23:41:56.000000000 +0100 +++ new/ioquake3-1.36+git.20201117/code/sdl/sdl_glimp.c 2020-11-17 19:08:13.000000000 +0100 @@ -63,7 +63,7 @@ void (APIENTRYP qglLockArraysEXT) (GLint first, GLsizei count); void (APIENTRYP qglUnlockArraysEXT) (void); -#define GLE(ret, name, ...) name##proc * qgl##name; +#define GLE(ret, name, ...) name##proc * qgl##name = NULL; QGL_1_1_PROCS; QGL_1_1_FIXED_FUNCTION_PROCS; QGL_DESKTOP_1_1_PROCS; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ioquake3-1.36+git.20200211/code/tools/lcc/etc/bytecode.c new/ioquake3-1.36+git.20201117/code/tools/lcc/etc/bytecode.c --- old/ioquake3-1.36+git.20200211/code/tools/lcc/etc/bytecode.c 2020-02-11 23:41:56.000000000 +0100 +++ new/ioquake3-1.36+git.20201117/code/tools/lcc/etc/bytecode.c 2020-11-17 19:08:13.000000000 +0100 @@ -38,7 +38,10 @@ strncpy( basepath, lccBinary, basepathsz ); basepath[basepathsz] = 0; - p = strrchr( basepath, PATH_SEP ); + p = strrchr( basepath, '/' ); + + if( !p ) + p = strrchr( basepath, '\\' ); if( p ) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ioquake3-1.36+git.20200211/code/tools/stringify.c new/ioquake3-1.36+git.20201117/code/tools/stringify.c --- old/ioquake3-1.36+git.20200211/code/tools/stringify.c 1970-01-01 01:00:00.000000000 +0100 +++ new/ioquake3-1.36+git.20201117/code/tools/stringify.c 2020-11-17 19:08:13.000000000 +0100 @@ -0,0 +1,51 @@ +#include <stdio.h> +#include <ctype.h> +#include <string.h> +#include <libgen.h> + +int main(int argc, char **argv) +{ + FILE *ifp; + FILE *ofp; + char buffer[1024]; + + if(argc < 3) + return 1; + + char *inFile = argv[1]; + char *outFile = argv[2]; + + ifp = fopen(inFile, "r"); + if(!ifp) + return 2; + + ofp = fopen(outFile, "w"); + if(!ofp) + return 3; + + // Strip extension + char *base = basename(inFile); + *strrchr(base, '.') = '\0'; + + fprintf(ofp, "const char *fallbackShader_%s =\n", base); + + while(fgets(buffer, sizeof(buffer), ifp)) + { + // Strip trailing whitespace from line + char *end = buffer + strlen(buffer) - 1; + while(end >= buffer && isspace(*end)) + end--; + + end[1] = '\0'; + + // Write line enquoted, with a newline + fprintf(ofp, "\"%s\\n\"\n", buffer); + } + + fprintf(ofp, ";\n"); + + fclose(ifp); + fclose(ofp); + + return 0; +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ioquake3-1.36+git.20200211/jenkins-ci-build.sh new/ioquake3-1.36+git.20201117/jenkins-ci-build.sh --- old/ioquake3-1.36+git.20200211/jenkins-ci-build.sh 2020-02-11 23:41:56.000000000 +0100 +++ new/ioquake3-1.36+git.20201117/jenkins-ci-build.sh 1970-01-01 01:00:00.000000000 +0100 @@ -1,53 +0,0 @@ -#!/bin/bash - -UNAME=`uname` -MASTER_DIR=`dirname $0` -BUILD_DEFAULT="release" - -cd ${MASTER_DIR} - -if [ "${OPTIONS}" == "all_options" ]; -then - export USE_FREETYPE=1 -fi - -if [ "$UNAME" == "Darwin" ]; then - CORES=`sysctl -n hw.ncpu` -elif [ "$UNAME" == "Linux" ]; then - CORES=`awk '/^processor/ { N++} END { print N }' /proc/cpuinfo` -fi - -echo "platform : ${UNAME}" -echo "cores : ${CORES}" -if [ "${BUILD_TYPE}" == "" ]; then - BUILD_TYPE="${BUILD_DEFAULT}" - echo "build type : defaulting to ${BUILD_TYPE}" -else - echo "build type : ${BUILD_TYPE}" -fi - -echo "environment :" -export - -if [ -n "${CPPCHECK}" ]; then - if [ ! -f "${CPPCHECK}" ]; then - command -v cppcheck >/dev/null - if [ "$?" != "0" ]; then - echo "cppcheck not installed" - exit 1 - fi - - cppcheck --enable=all --max-configs=1 --xml --xml-version=2 code 2> ${CPPCHECK} - fi - - ln -sf ${CPPCHECK} cppcheck.xml -fi - -# Bit of a hack; only run scan-build with clang and all options enabled -if [ "${CC}" == "clang" ] && [ "${OPTIONS}" == "all_options" ]; then - MAKE_PREFIX="scan-build" -fi - -${MAKE_PREFIX} make -j${CORES} distclean ${BUILD_TYPE} - -exit $? diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ioquake3-1.36+git.20200211/travis-ci-build.sh new/ioquake3-1.36+git.20201117/travis-ci-build.sh --- old/ioquake3-1.36+git.20200211/travis-ci-build.sh 2020-02-11 23:41:56.000000000 +0100 +++ new/ioquake3-1.36+git.20201117/travis-ci-build.sh 1970-01-01 01:00:00.000000000 +0100 @@ -1,15 +0,0 @@ -#!/bin/sh - -failed=0; - -# Default Build -(make clean release) || failed=1; - -if [ $failed -eq 1 ]; then - echo "Build failure."; -else - echo "Build successful."; -fi - -exit $failed; - _______________________________________________ openSUSE Commits mailing list -- [email protected] To unsubscribe, email [email protected] List Netiquette: https://en.opensuse.org/openSUSE:Mailing_list_netiquette List Archives: https://lists.opensuse.org/archives/list/[email protected]
![https://opensource.nyc3.cdn.digitaloceanspaces.com/attribution/assets/PoweredByDO/DO_Powered_by_Badge_blue.svg"](https://opensource.nyc3.cdn.digitaloceanspaces.com/attribution/assets/PoweredByDO/DO_Powered_by_Badge_blue.svg"){kind=link}
![https://user-images.githubusercontent.com/1681963/52239617-e2683480-289c-11e9-922b-5da55472e5b4.png"](https://user-images.githubusercontent.com/1681963/52239617-e2683480-289c-11e9-922b-5da55472e5b4.png"){kind=link}
![http://icculus.org/icculus-org-now.png"](http://icculus.org/icculus-org-now.png"){kind=link}