Hello community, here is the log from the commit of package libretro-2048 for openSUSE:Factory checked in at 2020-06-07 21:35:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libretro-2048 (Old) and /work/SRC/openSUSE:Factory/.libretro-2048.new.3606 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libretro-2048" Sun Jun 7 21:35:22 2020 rev:2 rq:812072 version:0~git20200520 Changes: -------- --- /work/SRC/openSUSE:Factory/libretro-2048/libretro-2048.changes 2020-02-11 22:22:26.647470234 +0100 +++ /work/SRC/openSUSE:Factory/.libretro-2048.new.3606/libretro-2048.changes 2020-06-07 21:35:43.116955639 +0200 @@ -1,0 +2,15 @@ +Sat May 30 15:11:59 UTC 2020 - [email protected] + +- Update to version 0~git20200520: + * Apply color correction ps2 + * Add CI/CD for PS2 + * preparing for new toolchain + * Add dos compilation + * Recognize platform=unix-armv7-hardfloat-neon + * Provide default values for CC and CXX on QNX + * Remove unused MSB_FIRST defines + * AppleTVOS platform build fix + * (MSVC 2017) Buildfix + * Better build compatibility + +------------------------------------------------------------------- Old: ---- libretro-2048-0~git20190902.tar.xz New: ---- libretro-2048-0~git20200520.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libretro-2048.spec ++++++ --- /var/tmp/diff_new_pack.8X9G1X/_old 2020-06-07 21:35:44.196959063 +0200 +++ /var/tmp/diff_new_pack.8X9G1X/_new 2020-06-07 21:35:44.200959076 +0200 @@ -1,7 +1,7 @@ # # spec file for package libretro-2048 # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: libretro-2048 -Version: 0~git20190902 +Version: 0~git20200520 Release: 0 Summary: 2048 libretro core License: MIT ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.8X9G1X/_old 2020-06-07 21:35:44.240959203 +0200 +++ /var/tmp/diff_new_pack.8X9G1X/_new 2020-06-07 21:35:44.240959203 +0200 @@ -1,4 +1,4 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/libretro/libretro-2048.git</param> - <param name="changesrevision">35e505643c9845c363aab8645a5eef51b906a4bf</param></service></servicedata> \ No newline at end of file + <param name="changesrevision">0ecbf29c432dbb46083cbd6b00dadb8ea712c5c4</param></service></servicedata> \ No newline at end of file ++++++ libretro-2048-0~git20190902.tar.xz -> libretro-2048-0~git20200520.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libretro-2048-0~git20190902/.github/workflows/compilation.yml new/libretro-2048-0~git20200520/.github/workflows/compilation.yml --- old/libretro-2048-0~git20190902/.github/workflows/compilation.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/libretro-2048-0~git20200520/.github/workflows/compilation.yml 2020-05-20 20:12:28.000000000 +0200 @@ -0,0 +1,33 @@ +name: CI + +on: + push: + pull_request: + repository_dispatch: + types: [run_build] + +jobs: + build-ps2: + runs-on: ubuntu-latest + container: ps2dev/ps2dev:latest + steps: + - uses: actions/checkout@v2 + + - name: Install dependencies + run: | + apk add build-base git bash + + - name: Compile project + run: | + make -f Makefile.libretro platform=ps2 clean all + + - name: Get short SHA + id: slug + run: echo "::set-output name=sha8::$(echo ${GITHUB_SHA} | cut -c1-8)" + + - name: Upload artifacts + if: ${{ success() }} + uses: actions/upload-artifact@v2 + with: + name: 20408_libretro_ps2-${{ steps.slug.outputs.sha8 }} + path: 2048_libretro_ps2.a diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libretro-2048-0~git20190902/Makefile.libretro new/libretro-2048-0~git20200520/Makefile.libretro --- old/libretro-2048-0~git20190902/Makefile.libretro 2019-09-02 03:27:31.000000000 +0200 +++ new/libretro-2048-0~git20200520/Makefile.libretro 2020-05-20 20:12:28.000000000 +0200 @@ -2,13 +2,17 @@ ifeq ($(platform),) platform = unix -ifeq ($(shell uname -a),) +ifeq ($(shell uname -s),) platform = win -else ifneq ($(findstring MINGW,$(shell uname -a)),) +else ifneq ($(findstring MINGW,$(shell uname -s)),) platform = win -else ifneq ($(findstring Darwin,$(shell uname -a)),) +else ifneq ($(findstring Darwin,$(shell uname -s)),) platform = osx -else ifneq ($(findstring win,$(shell uname -a)),) + arch = intel + ifeq ($(shell uname -p),powerpc) + arch = ppc + endif +else ifneq ($(findstring win,$(shell uname -s)),) platform = win endif endif @@ -21,9 +25,9 @@ else ifneq ($(findstring Darwin,$(shell uname -a)),) system_platform = osx arch = intel -ifeq ($(shell uname -p),powerpc) - arch = ppc -endif + ifeq ($(shell uname -p),powerpc) + arch = ppc + endif else ifneq ($(findstring MINGW,$(shell uname -a)),) system_platform = win endif @@ -41,14 +45,6 @@ endif fpic= -ifeq ($(ARCHFLAGS),) -ifeq ($(archs),ppc) - ARCHFLAGS = -arch ppc -arch ppc64 -else - ARCHFLAGS = -arch i386 -arch x86_64 -endif -endif - ifeq ($(STATIC_LINKING),1) EXT=a @@ -66,7 +62,7 @@ unixpath = $(subst \,/,$1) unixcygpath = /$(subst :,,$(call unixpath,$1)) -ifeq ($(platform), unix) +ifneq (,$(filter $(platform), unix unix-armv7-hardfloat-neon)) EXT?=so TARGET := $(TARGET_NAME)_libretro$(PLAT).$(EXT) fpic := -fPIC @@ -82,9 +78,6 @@ TARGET := $(TARGET_NAME)_libretro.$(EXT) fpic := -fPIC SHARED := -dynamiclib - ifeq ($(arch),ppc) - ENDIANNESS_DEFINES += -DMSB_FIRST - endif OSXVER = `sw_vers -productVersion | cut -d. -f 2` OSX_LT_MAVERICKS = `(( $(OSXVER) <= 9)) && echo "YES"` fpic += -mmacosx-version-min=10.1 @@ -124,6 +117,7 @@ ifeq ($(IOSSDK),) IOSSDK := $(shell xcodebuild -version -sdk appletvos Path) endif + CC = cc -arch arm64 -isysroot $(IOSSDK) else ifeq ($(platform), theos_ios) # Theos iOS DEPLOYMENT_IOSVERSION = 5.0 @@ -141,6 +135,8 @@ TARGET := $(TARGET_NAME)_libretro_$(platform).$(EXT) fpic := -fPIC SHARED := -shared -Wl,--no-undefined + CC = qcc -Vgcc_ntoarmv7le + CXX = QCC -Vgcc_ntoarmv7le_cpp # Emscripten else ifeq ($(platform), emscripten) @@ -184,8 +180,7 @@ TARGET := $(TARGET_NAME)_libretro_$(platform).$(EXT) CC = ee-gcc$(EXE_EXT) AR = ee-ar$(EXE_EXT) - PLATFORM_DEFINES := -DPS2 -G0 - CFLAGS := -Ips2 + PLATFORM_DEFINES := -DPS2 -G0 -DABGR8888 STATIC_LINKING = 1 # PSP @@ -205,6 +200,14 @@ AR = arm-vita-eabi-ar$(EXE_EXT) PLATFORM_DEFINES := -DVITA STATIC_LINKING = 1 +# DOS +else ifeq ($(platform), dos) + TARGET := $(TARGET_NAME)_libretro_$(platform).a + CC = i586-pc-msdosdjgpp-gcc + AR = i586-pc-msdosdjgpp-ar + CXX = i586-pc-msdosdjgpp-g++ + PLATFORM_DEFINES += -march=i386 + STATIC_LINKING=1 # CTR (3DS) else ifeq ($(platform), ctr) @@ -336,7 +339,6 @@ export INCLUDE := $(XEDK)/include/xbox export LIB := $(XEDK)/lib/xbox PSS_STYLE :=2 -ENDIANNESS_DEFINES += -DMSB_FIRST CFLAGS += -D_XBOX -D_XBOX360 CXXFLAGS += -D_XBOX -D_XBOX360 STATIC_LINKING=1 @@ -458,7 +460,7 @@ reg_query = $(call filter_out2,$(subst $2,,$(shell reg query "$2" -v "$1" 2>nul))) fix_path = $(subst $(SPACE),\ ,$(subst \,/,$1)) - ProgramFiles86w := $(shell cmd /c "echo %PROGRAMFILES(x86)%") + ProgramFiles86w := $(shell cmd //c "echo %PROGRAMFILES(x86)%") ProgramFiles86 := $(shell cygpath "$(ProgramFiles86w)") WindowsSdkDir ?= $(call reg_query,InstallationFolder,HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\Microsoft SDKs\Windows\v10.0) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libretro-2048-0~git20190902/game_noncairo.c new/libretro-2048-0~git20200520/game_noncairo.c --- old/libretro-2048-0~git20190902/game_noncairo.c 2019-09-02 03:27:31.000000000 +0200 +++ new/libretro-2048-0~git20200520/game_noncairo.c 2020-05-20 20:12:28.000000000 +0200 @@ -35,7 +35,11 @@ ctx_t nullctx={0,0,0}; #define PITCH 4 +#if defined(ABGR8888) +#define RGB32(r, g, b,a) ( (a)<<24 |((b) << (16)) | ((g) << 8) | ((r) << 0)) +#else #define RGB32(r, g, b,a) ( (a)<<24 |((r) << (16)) | ((g) << 8) | ((b) << 0)) +#endif #define nullctx_fontsize(a) nullctx.fontsize_x=nullctx.fontsize_y=a int VIRTUAL_WIDTH; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libretro-2048-0~git20190902/ps2/stdint.h new/libretro-2048-0~git20200520/ps2/stdint.h --- old/libretro-2048-0~git20190902/ps2/stdint.h 2019-09-02 03:27:31.000000000 +0200 +++ new/libretro-2048-0~git20200520/ps2/stdint.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,30 +0,0 @@ -#ifndef STDINT_H -#define STDINT_H - -typedef unsigned long uintptr_t; -typedef signed long intptr_t; - -typedef signed char int8_t; -typedef signed short int16_t; -typedef signed int int32_t; -typedef signed long int64_t; -typedef unsigned char uint8_t; -typedef unsigned short uint16_t; -typedef unsigned int uint32_t; -typedef unsigned long uint64_t; - -#define STDIN_FILENO 0 /* standard input file descriptor */ -#define STDOUT_FILENO 1 /* standard output file descriptor */ -#define STDERR_FILENO 2 /* standard error file descriptor */ - -#define INT8_C(val) val##c -#define INT16_C(val) val##h -#define INT32_C(val) val##i -#define INT64_C(val) val##l - -#define UINT8_C(val) val##uc -#define UINT16_C(val) val##uh -#define UINT32_C(val) val##ui -#define UINT64_C(val) val##ul - -#endif //STDINT_H
