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

[Maxime Gauduin]

    Date: Friday, May 7, 2021 @ 07:31:42
  Author: alucryd
Revision: 928566

upgpkg: libretro-blastem 2042-1

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

------------------------------+
 PKGBUILD                     |   20 +++-------------
 libretro-blastem-flags.patch |   50 -----------------------------------------
 2 files changed, 4 insertions(+), 66 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-05-07 07:25:18 UTC (rev 928565)
+++ PKGBUILD	2021-05-07 07:31:42 UTC (rev 928566)
@@ -1,7 +1,7 @@
 # Maintainer: Maxime Gauduin <alucryd at archlinux.org>
 
 pkgname=libretro-blastem
-pkgver=1841
+pkgver=2042
 pkgrel=1
 pkgdesc='Sega Mega Drive core'
 arch=(x86_64)
@@ -10,27 +10,15 @@
 groups=(libretro)
 depends=(libretro-core-info)
 makedepends=(git)
-source=(
-  libretro-blastem::git+https://github.com/libretro/blastem.git#commit=4206da1f986ecda199c82d4a2404eff904397f55
-  libretro-blastem-flags.patch
-)
-sha256sums=(
-  SKIP
-  5ddea4412ad3f14da2eb918edbaf1e0e95bacdeaefdc2fc70b7137db4a77f5e8
-)
+_commit=e70b05bf5b5954140cba227fc996ab24c064d494
+source=(libretro-blastem::git+https://github.com/libretro/blastem.git#commit=${_commit})
+b2sums=(SKIP)
 
 pkgver() {
   cd libretro-blastem
-
   git rev-list --count HEAD
 }
 
-prepare() {
-  cd libretro-blastem
-
-  patch -Np1 -i ../libretro-blastem-flags.patch
-}
-
 build() {
   make -C libretro-blastem -f Makefile.libretro
 }

Deleted: libretro-blastem-flags.patch
===================================================================
--- libretro-blastem-flags.patch	2021-05-07 07:25:18 UTC (rev 928565)
+++ libretro-blastem-flags.patch	2021-05-07 07:31:42 UTC (rev 928566)
@@ -1,50 +0,0 @@
-diff -rupN libretro-blastem.orig/Makefile libretro-blastem/Makefile
---- libretro-blastem.orig/Makefile	2019-04-17 09:08:11.641638576 +0200
-+++ libretro-blastem/Makefile	2019-04-17 09:23:33.088550471 +0200
-@@ -31,8 +31,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
--LDFLAGS:=-lm -lmingw32 -lws2_32 -mwindows
-+CFLAGS:=$(CFLAGS) -std=gnu99 -Wreturn-type -Werror=return-type -Werror=implicit-function-declaration
-+LDFLAGS:=$(CFLAGS) -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 +47,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 $(HAS_PROC) -DHAVE_UNISTD_H
-+CFLAGS:=$(CFLAGS) -std=gnu99 -Wreturn-type -Werror=return-type -Werror=implicit-function-declaration -Wno-unused-value $(HAS_PROC) -DHAVE_UNISTD_H
- 
- ifeq ($(OS),Darwin)
- LIBS=sdl2 glew
-@@ -89,10 +89,10 @@ ifdef USE_GLES
- ifndef GLES_LIB
- GLES_LIB:=$(shell pkg-config --libs glesv2)
- endif
--LDFLAGS:=-lm $(GLES_LIB)
-+LDFLAGS:=$(LDFLAGS) -lm $(GLES_LIB)
- else
- CFLAGS+= -DGLEW_STATIC -Iglew/include
--LDFLAGS:=-lm glew/lib/libGLEW.a
-+LDFLAGS:=$(LDFLAGS) -lm glew/lib/libGLEW.a
- endif
- 
- ifeq ($(OS),Darwin)
-@@ -109,10 +109,10 @@ endif #Darwin
- 
- else
- ifeq ($(MAKECMDGOALS),libblastem.$(SO))
--LDFLAGS:=-lm
-+LDFLAGS:=$(LDFLAGS) -lm
- else
--CFLAGS:=$(shell pkg-config --cflags-only-I $(LIBS)) $(CFLAGS)
--LDFLAGS:=-lm $(shell pkg-config --libs $(LIBS))
-+CFLAGS:=$(CFLAGS) $(shell pkg-config --cflags-only-I $(LIBS)) $(CFLAGS)
-+LDFLAGS:=$(LDFLAGS) -lm $(shell pkg-config --libs $(LIBS))
- ifdef USE_FBDEV
- LDFLAGS+= -pthread
- endif