- Rename freetype.diff to system-packages.diff.

OBS-URL: https://build.opensuse.org/package/show/games/love-0_7_2?expand=0&rev=7

love-0_7_2.changes

@@ -2,6 +2,8 @@
 Mon Aug 28 23:17:52 UTC 2017 - jengelh@inai.de
 
 - Make build with new /usr/include/lua5.1 directory work again.
+- Rename freetype.diff to system-packages.diff.
+- system-packages.diff: search for lua with pkg-config.
 
 -------------------------------------------------------------------
 Tue Sep 13 17:57:56 UTC 2011 - jmatejek@suse.com

love-0_7_2.spec

@@ -27,14 +27,13 @@ Url:            http://love2d.org/
 Source:         https://bitbucket.org/rude/love/downloads/love-0.7.2-linux-src.tar.gz
 Patch1:         love-modplug.patch
 Patch2:         love-remove-mpg123.patch
-Patch3:         freetype.diff
+Patch3:         system-packages.diff
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  gcc-c++
 BuildRequires:  libmng-devel
 BuildRequires:  libtiff-devel
 BuildRequires:  libtool
-BuildRequires:  lua51-devel
 BuildRequires:  physfs-devel
 BuildRequires:  pkg-config
 BuildRequires:  pkgconfig(IL)
@@ -42,6 +41,7 @@ BuildRequires:  pkgconfig(freetype2)
 BuildRequires:  pkgconfig(gl)
 BuildRequires:  pkgconfig(glu)
 BuildRequires:  pkgconfig(libmodplug)
+BuildRequires:  pkgconfig(lua5.1)
 BuildRequires:  pkgconfig(openal)
 BuildRequires:  pkgconfig(sdl)
 BuildRequires:  pkgconfig(vorbisfile)
@@ -61,7 +61,7 @@ sed -i 's/\r$//' *.txt
 rm -f src/modules/sound/lullaby/Mpg123Decoder.{cpp,h}
 mv configure.{in,ac}
 autoreconf -fi
-%configure CPPFLAGS="$(pkg-config lua5.1 --cflags)"
+%configure
 make %{?_smp_mflags}
 
 %install

system-packages.diff

@@ -3,21 +3,22 @@ Date: 2015-01-20 20:46:39.043255730 +0100
 
 build: löve uses an undocumented way of including freetype headers
 
-Change it to the supported style. Hardcoding freetype/ is also
+Replace the (unsupported) #include <freetype/XX> paths by just <XX> as required
-wrong — use pkg-config to get paths instead.
+by upstream, and use pkg-config — not just for freetype, but also lua, and, by
+extension, opportunistically for SDL/GL.
 
 ---
- configure.in                                   |   18 +++++++++---------
+ configure.in                                   |   36 ++++++-------------------
- src/Makefile.am                                |    7 ++-----
+ src/Makefile.am                                |    7 +---
- src/modules/font/freetype/Font.h               |    8 ++++----
+ src/modules/font/freetype/Font.h               |    8 ++---
- src/modules/font/freetype/TrueTypeRasterizer.h |    8 ++++----
+ src/modules/font/freetype/TrueTypeRasterizer.h |    8 ++---
- 4 files changed, 19 insertions(+), 22 deletions(-)
+ 4 files changed, 20 insertions(+), 39 deletions(-)
 
 Index: love-HEAD/configure.in
 ===================================================================
 --- love-HEAD.orig/configure.in
 +++ love-HEAD/configure.in
-@@ -2,16 +2,16 @@ AC_INIT([love], [HEAD])
+@@ -2,40 +2,24 @@ AC_INIT([love], [HEAD])
  AC_CONFIG_HEADERS([config.h])
  AC_CONFIG_AUX_DIR([platform/unix])
  AC_CONFIG_SRCDIR([src/love.cpp])
@@ -32,18 +33,29 @@ Index: love-HEAD/configure.in
 -AC_SEARCH_LIBS([glLoadIdentity], [GL], [], AC_MSG_ERROR([Can't LÖVE without OpenGL]))
 -#AC_SEARCH_LIBS([gluOrtho2D], [GLU], [], AC_MSG_ERROR([Can't LÖVE without OpenGL Utility Library]))
 -AC_SEARCH_LIBS([alSourcePlay], [openal], [], AC_MSG_ERROR([Can't LÖVE without OpenAL]))
+-AC_ARG_ENABLE([luajit],
+-	[  --enable-luajit Use LuaJIT instead of lua],
+-	AC_SEARCH_LIBS(
+-		[lua_pcall],
+-		[luajit luajit-5.1],
+-		AC_SUBST([INCLUDE_LUA], [-I/usr/include/luajit-2.0]),
+-		AC_MSG_ERROR([Can't LÖVE without LuaJIT])
+-	),
+-	AC_SEARCH_LIBS(
+-		[lua_pcall],
+-		[lua lua5.1],
+-		if test "$ac_cv_search_lua_pcall" = "-llua5.1"; then
+-			AC_SUBST([INCLUDE_LUA], [-I/usr/include/lua5.1])
+-		fi,
+-		AC_MSG_ERROR([Can't LÖVE without Lua])
+-	)
+-)
+-AC_SEARCH_LIBS([ilInit], [IL], [], AC_MSG_ERROR([Can't LÖVE without DevIL]))
 +PKG_CHECK_MODULES([sdl], [sdl])
 +PKG_CHECK_MODULES([gl], [gl])
 +dnl PKG_CHECK_MODULES([glu], [glu])
 +PKG_CHECK_MODULES([al], [openal])
- AC_ARG_ENABLE([luajit],
++PKG_CHECK_MODULES([lua], [lua5.1])
- 	[  --enable-luajit Use LuaJIT instead of lua],
- 	AC_SEARCH_LIBS(
-@@ -29,13 +29,13 @@ AC_ARG_ENABLE([luajit],
- 		AC_MSG_ERROR([Can't LÖVE without Lua])
- 	)
- )
--AC_SEARCH_LIBS([ilInit], [IL], [], AC_MSG_ERROR([Can't LÖVE without DevIL]))
 +PKG_CHECK_MODULES([il], [IL])
  AC_SEARCH_LIBS([mng_initialize], [mng], [], AC_MSG_ERROR([DevIL needs MNG]))
  AC_SEARCH_LIBS([TIFFOpen], [tiff], [], AC_MSG_ERROR([DevIL needs TIFF]))
@@ -65,14 +77,14 @@ Index: love-HEAD/src/Makefile.am
 -AM_CPPFLAGS = -I. -I./modules -I/usr/include/AL -I/usr/include/freetype2  $(INCLUDE_LUA) -I/usr/include/SDL $(FILE_OFFSET)
 -AUTOMAKE_OPTIONS = subdir-objects
 -DEFAULT_INCLUDES =
-+AM_CPPFLAGS = -I. -I./modules ${al_CFLAGS} ${ft_CFLAGS} ${gl_CFLAGS} ${glu_CFLAGS} ${il_CFLAGS} $(INCLUDE_LUA) ${modplug_CFLAGS} ${sdl_CFLAGS} ${vorbisfile_CFLAGS} $(FILE_OFFSET)
++AM_CPPFLAGS = -I. -I./modules ${al_CFLAGS} ${ft_CFLAGS} ${gl_CFLAGS} ${glu_CFLAGS} ${il_CFLAGS} ${lua_CFLAGS} ${modplug_CFLAGS} ${sdl_CFLAGS} ${vorbisfile_CFLAGS} $(FILE_OFFSET)
  SUBDIRS =
  
  # LÖVE executable
  bin_PROGRAMS = love
 -#love_LDFLAGS =
 -#love_LDADD =
-+love_LDADD = ${al_LIBS} ${ft_LIBS} ${gl_LIBS} ${glu_LIBS} ${il_LIBS} ${modplug_LIBS} ${sdl_LIBS} ${vorbisfile_LIBS}
++love_LDADD = ${al_LIBS} ${ft_LIBS} ${gl_LIBS} ${glu_LIBS} ${il_LIBS} ${lua_LIBS} ${modplug_LIBS} ${sdl_LIBS} ${vorbisfile_LIBS}
  
  love_SOURCES = \
  ./scripts/graphics.lua.h \