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

[Maxime Gauduin]

    Date: Wednesday, April 17, 2019 @ 07:26:39
  Author: alucryd
Revision: 451845

upgpkg: libretro-blastem 1813-1

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

------------------------------+
 PKGBUILD                     |   17 +++-------
 libretro-blastem-flags.patch |   68 ++++++++++++++++++++++++++++-------------
 2 files changed, 53 insertions(+), 32 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-04-17 07:08:54 UTC (rev 451844)
+++ PKGBUILD	2019-04-17 07:26:39 UTC (rev 451845)
@@ -1,23 +1,22 @@
 # Maintainer: Maxime Gauduin <alucryd at archlinux.org>
 
 pkgname=libretro-blastem
-pkgver=944
+pkgver=1813
 pkgrel=1
 pkgdesc='Sega Mega Drive core'
 arch=(x86_64)
-url='https://github.com/libretro/blastem-libretro'
+url=https://github.com/libretro/blastem-libretro
 license=(GPL3)
 groups=(libretro)
 depends=(libretro-core-info)
 makedepends=(git)
-_commit='ccc11186b008fd674263812e37361df2b89166a9'
 source=(
-  libretro-blastem::git+https://github.com/libretro/blastem-libretro.git#commit=${_commit}
+  libretro-blastem::git+https://github.com/libretro/blastem.git#commit=f5583a4f1d7272adde0d406b5affb6046e3f6d6e
   libretro-blastem-flags.patch
 )
 sha256sums=(
   SKIP
-  2289a7f76626bed09f5e191643a1ffeaaa2191245573eaa336824c0e9a45c35e
+  5ddea4412ad3f14da2eb918edbaf1e0e95bacdeaefdc2fc70b7137db4a77f5e8
 )
 
 pkgver() {
@@ -33,15 +32,11 @@
 }
 
 build() {
-  cd libretro-blastem/libretro
-
-  make
+  make -C libretro-blastem -f Makefile.libretro
 }
 
 package() {
-  cd libretro-blastem/libretro
-
-  install -Dm 644 blastem_libretro.so -t "${pkgdir}"/usr/lib/libretro/
+  install -Dm 644 libretro-blastem/blastem_libretro.so -t "${pkgdir}"/usr/lib/libretro/
 }
 
 # vim: ts=2 sw=2 et:

Modified: libretro-blastem-flags.patch
===================================================================
--- libretro-blastem-flags.patch	2019-04-17 07:08:54 UTC (rev 451844)
+++ libretro-blastem-flags.patch	2019-04-17 07:26:39 UTC (rev 451845)
@@ -1,24 +1,50 @@
-Binary files libretro-blastem.orig/.git/index and libretro-blastem/.git/index differ
-diff -rupN libretro-blastem.orig/libretro/Makefile libretro-blastem/libretro/Makefile
---- libretro-blastem.orig/libretro/Makefile	2018-12-07 10:09:11.171250785 +0100
-+++ libretro-blastem/libretro/Makefile	2018-12-07 10:19:39.402863430 +0100
-@@ -1,7 +1,7 @@
- DEBUG := 0
- NAME  := blastem_libretro
- SOEXT := .so
--FLTO  :=
-+FLTO  := -flto
- WITH_Z80      := 1
- WITH_DYNAREC  :=
- OPTIMIZE_FLAG :=
-@@ -29,8 +29,8 @@ ifneq ($(SANITIZER),)
-    LDFLAGS := -fsanitize=$(SANITIZER) $(LDLAGS)
+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:=
  
--CFLAGS  := $(OPTIMIZE_FLAG) -std=gnu99 -Wall -D__LIBRETRO__ -I. -I.. -Ilibco $(SANITIZER)
--LDFLAGS := $(SANITIZER) -shared -Wl,--no-undefined
-+CFLAGS  := $(CFLAGS) -std=gnu99 -Wall -D__LIBRETRO__ -I. -I.. -Ilibco
-+LDFLAGS := $(LDFLAGS) -shared -Wl,--no-undefined
- LIBS    := -lm
+ 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 ($(platform),)
+ 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