Hello community, here is the log from the commit of package love-0_7_2 for openSUSE:Factory checked in at 2017-08-29 11:47:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/love-0_7_2 (Old) and /work/SRC/openSUSE:Factory/.love-0_7_2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "love-0_7_2" Tue Aug 29 11:47:13 2017 rev:2 rq:519246 version:0.7.2 Changes: -------- --- /work/SRC/openSUSE:Factory/love-0_7_2/love-0_7_2.changes 2015-08-24 01:30:57.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.love-0_7_2.new/love-0_7_2.changes 2017-08-29 11:48:13.377289874 +0200 @@ -1,0 +2,9 @@ +Mon Aug 28 23:17:52 UTC 2017 - [email protected] + +- Make build with new /usr/include/lua5.1 directory work again. +- Rename freetype.diff to system-packages.diff. +- Remove love-remove-mpg123.patch: mpg123 is available in + openSUSE:Factory and can be used now. +- system-packages.diff: search for lua and mpg123 with pkg-config. + +------------------------------------------------------------------- Old: ---- freetype.diff love-remove-mpg123.patch New: ---- system-packages.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ love-0_7_2.spec ++++++ --- /var/tmp/diff_new_pack.DdBWdr/_old 2017-08-29 11:48:14.521128652 +0200 +++ /var/tmp/diff_new_pack.DdBWdr/_new 2017-08-29 11:48:14.525128089 +0200 @@ -1,7 +1,7 @@ # # spec file for package love-0_7_2 # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -26,15 +26,13 @@ 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 +Patch2: 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,23 +40,21 @@ BuildRequires: pkgconfig(gl) BuildRequires: pkgconfig(glu) BuildRequires: pkgconfig(libmodplug) +BuildRequires: pkgconfig(libmpg123) +BuildRequires: pkgconfig(lua5.1) BuildRequires: pkgconfig(openal) BuildRequires: pkgconfig(sdl) BuildRequires: pkgconfig(vorbisfile) -%if %{with mpg123} -BuildRequires: pkgconfig(libmpg123) -%endif %description LÖVE is a framework for making 2D games in Lua. %prep %setup -qn love-HEAD -%patch -P 1 -P 2 -P 3 -p1 +%patch -P 1 -P 2 -p1 %build sed -i 's/\r$//' *.txt -rm -f src/modules/sound/lullaby/Mpg123Decoder.{cpp,h} mv configure.{in,ac} autoreconf -fi %configure ++++++ system-packages.diff ++++++ From: Jan Engelhardt <[email protected]> Date: 2015-01-20 20:46:39.043255730 +0100 build: löve uses an undocumented way of including freetype headers Replace the (unsupported) #include <freetype/XX> paths by just <XX> as required by upstream, and use pkg-config — not just for freetype, but also lua, and, by extension, opportunistically for SDL/GL. --- configure.in | 38 ++++++------------------- src/Makefile.am | 7 +--- src/modules/font/freetype/Font.h | 8 ++--- src/modules/font/freetype/TrueTypeRasterizer.h | 8 ++--- 4 files changed, 20 insertions(+), 41 deletions(-) Index: love-HEAD/configure.in =================================================================== --- love-HEAD.orig/configure.in +++ love-HEAD/configure.in @@ -3,42 +3,24 @@ AC_CONFIG_HEADERS([config.h]) AC_CONFIG_AUX_DIR([platform/unix]) AC_CONFIG_MACRO_DIR([platform/unix/m4]) AC_CONFIG_SRCDIR([src/love.cpp]) -AM_INIT_AUTOMAKE([foreign -Wall foreign tar-ustar]) +AM_INIT_AUTOMAKE([foreign -Wall foreign tar-ustar subdir-objects]) AC_PREFIX_DEFAULT([/usr]) AC_PROG_LIBTOOL AC_PROG_CC AC_PROG_CXX AC_SEARCH_LIBS([sqrt], [m], [], AC_MSG_ERROR([Can't LÖVE without C math library])) -AC_SEARCH_LIBS([SDL_Init], [SDL], [], AC_MSG_ERROR([Can't LÖVE without SDL])) -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]) +PKG_CHECK_MODULES([al], [openal]) +PKG_CHECK_MODULES([lua], [lua5.1]) +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])) -AC_SEARCH_LIBS([FT_Load_Glyph], [freetype], [], AC_MSG_ERROR([Can't LÖVE without FreeType])) +PKG_CHECK_MODULES([ft], [freetype2]) AC_SEARCH_LIBS([PHYSFS_init], [physfs], [], AC_MSG_ERROR([Can't LÖVE without PhysicsFS])) -AC_SEARCH_LIBS([ModPlug_Load], [modplug], [], AC_MSG_ERROR([Can't LÖVE without ModPlug])) -AC_SEARCH_LIBS([mpg123_open_feed], [mpg123], [], AC_MSG_ERROR([Can't LÖVE without Mpg123])) -AC_SEARCH_LIBS([mpg123_seek_64], [mpg123], AC_SUBST([FILE_OFFSET],[-D_FILE_OFFSET_BITS=64]), AC_SUBST([FILE_OFFSET],[])) -AC_SEARCH_LIBS([ov_open], [vorbisfile], [], AC_MSG_ERROR([Can't LÖVE without VorbisFile])) +PKG_CHECK_MODULES([modplug], [libmodplug]) +PKG_CHECK_MODULES([mpg123], [libmpg123]) +PKG_CHECK_MODULES([vorbisfile], [vorbisfile]) AC_CONFIG_FILES([ Makefile src/Makefile Index: love-HEAD/src/Makefile.am =================================================================== --- love-HEAD.orig/src/Makefile.am +++ love-HEAD/src/Makefile.am @@ -1,12 +1,9 @@ -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} ${lua_CFLAGS} ${modplug_CFLAGS} ${mpg123_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} ${lua_LIBS} ${modplug_LIBS} ${mpg123_LIBS} ${sdl_LIBS} ${vorbisfile_LIBS} love_SOURCES = \ ./scripts/graphics.lua.h \ Index: love-HEAD/src/modules/font/freetype/Font.h =================================================================== --- love-HEAD.orig/src/modules/font/freetype/Font.h +++ love-HEAD/src/modules/font/freetype/Font.h @@ -30,10 +30,10 @@ #else #include <ft2build.h> #endif -#include <freetype/freetype.h> -#include <freetype/ftglyph.h> -#include <freetype/ftoutln.h> -#include <freetype/fttrigon.h> +#include FT_FREETYPE_H +#include FT_GLYPH_H +#include FT_OUTLINE_H +#include FT_TRIGONOMETRY_H namespace love { Index: love-HEAD/src/modules/font/freetype/TrueTypeRasterizer.h =================================================================== --- love-HEAD.orig/src/modules/font/freetype/TrueTypeRasterizer.h +++ love-HEAD/src/modules/font/freetype/TrueTypeRasterizer.h @@ -27,10 +27,10 @@ // TrueType2 #include <ft2build.h> -#include <freetype/freetype.h> -#include <freetype/ftglyph.h> -#include <freetype/ftoutln.h> -#include <freetype/fttrigon.h> +#include FT_FREETYPE_H +#include FT_GLYPH_H +#include FT_OUTLINE_H +#include FT_TRIGONOMETRY_H namespace love {
