[arch-commits] Commit in libretro-blastem/trunk (2 files)

[Maxime Gauduin]

    Date: Sunday, November 14, 2021 @ 08:41:35
  Author: alucryd
Revision: 1047338

upgpkg: libretro-blastem 2052-1

Added:
  libretro-blastem/trunk/libretro-blastem-flags.patch
Modified:
  libretro-blastem/trunk/PKGBUILD

------------------------------+
 PKGBUILD                     |   22 +++++++++++----
 libretro-blastem-flags.patch |   59 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 76 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-11-14 08:26:58 UTC (rev 1047337)
+++ PKGBUILD	2021-11-14 08:41:35 UTC (rev 1047338)
@@ -1,7 +1,7 @@
 # Maintainer: Maxime Gauduin <alucryd at archlinux.org>
 
 pkgname=libretro-blastem
-pkgver=2042
+pkgver=2052
 pkgrel=1
 pkgdesc='Sega Mega Drive core'
 arch=(x86_64)
@@ -8,12 +8,24 @@
 url=https://github.com/libretro/blastem
 license=(GPL3)
 groups=(libretro)
-depends=(libretro-core-info)
+depends=(
+  glibc
+  libretro-core-info
+)
 makedepends=(git)
-_commit=e70b05bf5b5954140cba227fc996ab24c064d494
-source=(libretro-blastem::git+https://github.com/libretro/blastem.git#commit=${_commit})
-b2sums=(SKIP)
+_commit=0786858437ed71996f43b7af0fbe627eb88152fc
+source=(
+  libretro-blastem::git+https://github.com/libretro/blastem.git#commit=${_commit}
+  libretro-blastem-flags.patch
+)
+b2sums=('SKIP'
+        '35431a1ad2960c8fdfb266f049291557dc2c4956495f06a87daac7e6e6063d8606eb4abf64cc4e49467178c2e26fc9b5ba29fa43a3351f2f6de8e54c50846740')
 
+prepare() {
+  cd libretro-blastem
+  patch -Np1 -i ../libretro-blastem-flags.patch
+}
+
 pkgver() {
   cd libretro-blastem
   git rev-list --count HEAD

Added: libretro-blastem-flags.patch
===================================================================
--- libretro-blastem-flags.patch	                        (rev 0)
+++ libretro-blastem-flags.patch	2021-11-14 08:41:35 UTC (rev 1047338)
@@ -0,0 +1,59 @@
+diff '--color=auto' -rupN libretro-blastem.orig/Makefile libretro-blastem/Makefile
+--- libretro-blastem.orig/Makefile	2021-11-14 09:30:18.467211593 +0100
++++ libretro-blastem/Makefile	2021-11-14 09:37:57.666454954 +0100
+@@ -6,6 +6,9 @@ OS:=$(shell uname -s)
+ endif
+ FIXUP:=true
+ 
++CFLAGS:=$(CFLAGS)
++LDFLAGS:=$(LDFLAGS)
++
+ BUNDLED_LIBZ:=zlib/adler32.o zlib/compress.o zlib/crc32.o zlib/deflate.o zlib/gzclose.o zlib/gzlib.o zlib/gzread.o\
+ 	zlib/gzwrite.o zlib/infback.o zlib/inffast.o zlib/inflate.o zlib/inftrees.o zlib/trees.o zlib/uncompr.o zlib/zutil.o
+ 
+@@ -31,8 +34,8 @@ SDL2_PREFIX:="sdl/x86_64-w64-mingw32"
+ GLUDIR:=x64
+ endif
+ GLEW32S_LIB:=$(GLEW_PREFIX)/lib/Release/$(GLUDIR)/glew32s.lib
+-CFLAGS:=-std=gnu99 -Wreturn-type -Werror=return-type -Werror=implicit-function-declaration -Wpointer-arith -Werror=pointer-arith
+-LDFLAGS:=-lm -lmingw32 -lws2_32 -mwindows
++CFLAGS+= -std=gnu99 -Wreturn-type -Werror=return-type -Werror=implicit-function-declaration -Wpointer-arith -Werror=pointer-arith
++LDFLAGS+= -lm -lmingw32 -lws2_32 -mwindows
+ ifneq ($(MAKECMDGOALS),libblastem.dll)
+ CFLAGS+= -I"$(SDL2_PREFIX)/include/SDL2" -I"$(GLEW_PREFIX)/include" -DGLEW_STATIC
+ LDFLAGS+= $(GLEW32S_LIB) -L"$(SDL2_PREFIX)/lib" -lSDL2main -lSDL2 -lopengl32 -lglu32
+@@ -47,7 +50,7 @@ NET:=net.o
+ EXE:=
+ 
+ HAS_PROC:=$(shell if [ -d /proc ]; then /bin/echo -e -DHAS_PROC; fi)
+-CFLAGS:=-std=gnu99 -Wreturn-type -Werror=return-type -Werror=implicit-function-declaration -Wno-unused-value  -Wpointer-arith -Werror=pointer-arith $(HAS_PROC) -DHAVE_UNISTD_H
++CFLAGS+= -std=gnu99 -Wreturn-type -Werror=return-type -Werror=implicit-function-declaration -Wno-unused-value  -Wpointer-arith -Werror=pointer-arith $(HAS_PROC) -DHAVE_UNISTD_H
+ 
+ ifeq ($(OS),Darwin)
+ LIBS=sdl2 glew
+@@ -89,10 +92,10 @@ ifdef USE_GLES
+ ifndef GLES_LIB
+ GLES_LIB:=$(shell pkg-config --libs glesv2)
+ endif
+-LDFLAGS:=-lm $(GLES_LIB)
++LDFLAGS+= -lm $(GLES_LIB)
+ else
+ CFLAGS+= -DGLEW_STATIC -Iglew/include
+-LDFLAGS:=-lm glew/lib/libGLEW.a
++LDFLAGS+= -lm glew/lib/libGLEW.a
+ endif
+ 
+ ifeq ($(OS),Darwin)
+@@ -111,10 +114,10 @@ CFLAGS+= -I$(SDL_INCLUDE_PATH)
+ 
+ else
+ ifeq ($(MAKECMDGOALS),libblastem.$(SO))
+-LDFLAGS:=-lm
++LDFLAGS+= -lm
+ else
+ CFLAGS:=$(shell pkg-config --cflags-only-I $(LIBS)) $(CFLAGS)
+-LDFLAGS:=-lm $(shell pkg-config --libs $(LIBS))
++LDFLAGS:=-lm $(shell pkg-config --libs $(LIBS)) $(LDFLAGS)
+ ifdef USE_FBDEV
+ LDFLAGS+= -pthread
+ endif