r15024 - in packages/trunk/love/debian: . patches
Miriam Ruiz
miriam at moszumanska.debian.org
Fri Apr 11 16:19:08 UTC 2014
Author: miriam
Date: 2014-04-11 16:19:07 +0000 (Fri, 11 Apr 2014)
New Revision: 15024
Added:
packages/trunk/love/debian/patches/configure-without-glee.patch
Modified:
packages/trunk/love/debian/changelog
packages/trunk/love/debian/control
packages/trunk/love/debian/copyright
packages/trunk/love/debian/patches/configure.patch
packages/trunk/love/debian/patches/fix-freetype-includes.patch
packages/trunk/love/debian/patches/glee_from_system.patch
packages/trunk/love/debian/patches/scripts_source.patch
packages/trunk/love/debian/patches/series
packages/trunk/love/debian/rules
Log:
New upstream release
Modified: packages/trunk/love/debian/changelog
===================================================================
--- packages/trunk/love/debian/changelog 2014-04-11 00:32:15 UTC (rev 15023)
+++ packages/trunk/love/debian/changelog 2014-04-11 16:19:07 UTC (rev 15024)
@@ -1,3 +1,18 @@
+love (0.9.1-1) UNRELEASED; urgency=medium
+
+ * New upstream release
+ + 0.9.1's API is fully backward compatible with existing 0.9.0 games.
+ + Most of the changes are bug fixes, internal code improvements, and
+ + some API additions and updates to flesh out LÖVE's features,
+ + especially in the love.graphics module.
+ + See http://love2d.org/forums/viewtopic.php?f=3&t=77609
+ + See https://www.love2d.org/wiki/0.9.1
+ * Refreshed patches
+ * Temporarily removed the patches to use Glee from system, as Glee 5.5 is
+ needed for the program to compile.
+
+ -- Miriam Ruiz <miriam at debian.org> Fri, 11 Apr 2014 08:02:09 +0200
+
love (0.9.0-1) unstable; urgency=low
[ Miriam Ruiz ]
Modified: packages/trunk/love/debian/control
===================================================================
--- packages/trunk/love/debian/control 2014-04-11 00:32:15 UTC (rev 15023)
+++ packages/trunk/love/debian/control 2014-04-11 16:19:07 UTC (rev 15024)
@@ -8,7 +8,7 @@
libopenal-dev, liblua5.1-0-dev, libphysfs-dev, libdevil-dev, libfreetype6-dev,
libmng-dev, libmodplug-dev, libmpg123-dev, libflac-dev, libflac++-dev,
libxpm-dev, libxcursor-dev, libxxf86vm-dev, libtiff-dev, libpng-dev,
- libluajit-5.1-dev, libvorbis-dev, libogg-dev, glee-dev
+ libluajit-5.1-dev, libvorbis-dev, libogg-dev, glee-dev, lua5.2 | lua5.1
Standards-Version: 3.9.5
Homepage: http://love2d.org/
Vcs-Svn: svn://anonscm.debian.org/pkg-games/packages/trunk/love/
Modified: packages/trunk/love/debian/copyright
===================================================================
--- packages/trunk/love/debian/copyright 2014-04-11 00:32:15 UTC (rev 15023)
+++ packages/trunk/love/debian/copyright 2014-04-11 16:19:07 UTC (rev 15024)
@@ -57,7 +57,7 @@
The documentation is licensed under the The FreeBSD Documentation license.
This is similar to ZLIB, but meant for written documents as opposed to
software.
-Comment: Downloaded from https://love2d.org/wiki/love on the 11nd of Jan. 2014
+Comment: Downloaded from https://love2d.org/wiki/love on the 11th of Apr. 2014
Files: src/libraries/utf8/*
Copyright: Copyright 2006 Nemanja Trifunovic
Added: packages/trunk/love/debian/patches/configure-without-glee.patch
===================================================================
--- packages/trunk/love/debian/patches/configure-without-glee.patch (rev 0)
+++ packages/trunk/love/debian/patches/configure-without-glee.patch 2014-04-11 16:19:07 UTC (rev 15024)
@@ -0,0 +1,60 @@
+Index: love-0.9.1/configure.ac
+===================================================================
+--- love-0.9.1.orig/configure.ac 2014-04-11 17:34:35.502982793 +0200
++++ love-0.9.1/configure.ac 2014-04-11 17:34:35.502982793 +0200
+@@ -134,10 +134,5 @@
+ AC_CONFIG_FILES([
+ Makefile
+ src/Makefile
+- platform/unix/debian/control
+- platform/unix/debian/changelog
+- platform/unix/debian/rules
+ ])
+ AC_OUTPUT
+-
+-chmod 755 platform/unix/debian/rules
+Index: love-0.9.1/src/Makefile.am
+===================================================================
+--- love-0.9.1.orig/src/Makefile.am 2014-04-11 17:34:35.502982793 +0200
++++ love-0.9.1/src/Makefile.am 2014-04-11 17:34:35.502982793 +0200
+@@ -7,7 +7,9 @@
+ # LÖVE executable
+ bin_PROGRAMS = love
+ #love_LDFLAGS =
+-love_LDADD = liblove.la $(lua_LIBS) -lglee
++love_LDADD = .libs/liblove.a \
++ $(SDL_LIBS) $(freetype2_LIBS) $(lua_LIBS) $(openal_LIBS) $(devil_LIBS) \
++ $(libmodplug_LIBS) $(vorbisfile_LIBS) -lglee
+ love_SOURCES = love.cpp
+
+ if LOVE_TARGET_OSX
+Index: love-0.9.1/Makefile.am
+===================================================================
+--- love-0.9.1.orig/Makefile.am 2014-04-11 17:34:35.502982793 +0200
++++ love-0.9.1/Makefile.am 2014-04-11 17:34:35.502982793 +0200
+@@ -1,24 +1,8 @@
+ ACLOCAL_AMFLAGS = -I platform/unix/m4
+ SUBDIRS = src
+-EXTRA_DIST = changes.txt license.txt readme.md \
+- platform/unix/love.desktop.in
+-dist_man1_MANS = platform/unix/love.1
++EXTRA_DIST = changes.txt license.txt readme.md
+
+ applicationsdir=$(datarootdir)/applications
+ mimeinfodir=$(datarootdir)/mime/packages
+ pixmapsdir=$(datarootdir)/pixmaps
+ mimeiconsdir=$(datarootdir)/icons/hicolor/scalable/mimetypes
+-
+-applications_DATA = platform/unix/love.desktop
+-dist_mimeinfo_DATA = platform/unix/love.xml
+-dist_pixmaps_DATA = platform/unix/love.svg
+-dist_mimeicons_DATA = platform/unix/application-x-love-game.svg
+-
+-platform/unix/love.desktop: platform/unix/love.desktop.in
+- $(MKDIR_P) platform/unix
+- rm -f $@ $@.tmp
+- $(SED) \
+- -e "s|@bindir[@]|$(bindir)|" \
+- ${srcdir}/$@.in > $@.tmp
+- chmod a-w $@.tmp
+- mv $@.tmp $@
Modified: packages/trunk/love/debian/patches/configure.patch
===================================================================
--- packages/trunk/love/debian/patches/configure.patch 2014-04-11 00:32:15 UTC (rev 15023)
+++ packages/trunk/love/debian/patches/configure.patch 2014-04-11 16:19:07 UTC (rev 15024)
@@ -1,8 +1,8 @@
-Index: love-0.9.0/configure.ac
+Index: love-0.9.1/configure.ac
===================================================================
---- love-0.9.0.orig/configure.ac 2014-01-12 16:55:45.389527362 +0100
-+++ love-0.9.0/configure.ac 2014-01-12 16:55:45.381527362 +0100
-@@ -129,10 +129,5 @@
+--- love-0.9.1.orig/configure.ac 2014-04-11 17:51:39.368424009 +0200
++++ love-0.9.1/configure.ac 2014-04-11 17:51:39.368424009 +0200
+@@ -134,10 +134,5 @@
AC_CONFIG_FILES([
Makefile
src/Makefile
@@ -13,25 +13,25 @@
AC_OUTPUT
-
-chmod 755 platform/unix/debian/rules
-Index: love-0.9.0/src/Makefile.am
+Index: love-0.9.1/src/Makefile.am
===================================================================
---- love-0.9.0.orig/src/Makefile.am 2014-01-12 16:55:45.389527362 +0100
-+++ love-0.9.0/src/Makefile.am 2014-01-12 17:07:23.849507164 +0100
-@@ -6,7 +6,9 @@
+--- love-0.9.1.orig/src/Makefile.am 2014-04-11 17:51:39.368424009 +0200
++++ love-0.9.1/src/Makefile.am 2014-04-11 18:01:06.861240099 +0200
+@@ -7,7 +7,9 @@
# LÖVE executable
bin_PROGRAMS = love
#love_LDFLAGS =
--love_LDADD = liblove.la $(lua_LIBS) -lglee
-+love_LDADD = .libs/liblove.a \
+-love_LDADD = liblove.la $(lua_LIBS)
++love_LDADD = .libs/liblove.a $(lua_LIBS) \
+ $(SDL_LIBS) $(freetype2_LIBS) $(lua_LIBS) $(openal_LIBS) $(devil_LIBS) \
-+ $(libmodplug_LIBS) $(vorbisfile_LIBS) -lglee
++ $(libmodplug_LIBS) $(vorbisfile_LIBS)
love_SOURCES = love.cpp
if LOVE_TARGET_OSX
-Index: love-0.9.0/Makefile.am
+Index: love-0.9.1/Makefile.am
===================================================================
---- love-0.9.0.orig/Makefile.am 2013-12-13 23:08:51.000000000 +0100
-+++ love-0.9.0/Makefile.am 2014-01-12 17:19:43.353485779 +0100
+--- love-0.9.1.orig/Makefile.am 2014-04-11 17:51:39.368424009 +0200
++++ love-0.9.1/Makefile.am 2014-04-11 17:51:39.368424009 +0200
@@ -1,24 +1,8 @@
ACLOCAL_AMFLAGS = -I platform/unix/m4
SUBDIRS = src
Modified: packages/trunk/love/debian/patches/fix-freetype-includes.patch
===================================================================
--- packages/trunk/love/debian/patches/fix-freetype-includes.patch 2014-04-11 00:32:15 UTC (rev 15023)
+++ packages/trunk/love/debian/patches/fix-freetype-includes.patch 2014-04-11 16:19:07 UTC (rev 15024)
@@ -2,10 +2,10 @@
Author: Juhani Numminen <juhaninumminen0 at gmail.com>
Bug-Debian: http://bugs.debian.org/733357
-Index: love-0.9.0/src/modules/font/freetype/Font.h
+Index: love-0.9.1/src/modules/font/freetype/Font.h
===================================================================
---- love-0.9.0.orig/src/modules/font/freetype/Font.h 2014-01-11 01:22:14.400926531 +0100
-+++ love-0.9.0/src/modules/font/freetype/Font.h 2014-01-11 01:22:14.388926531 +0100
+--- love-0.9.1.orig/src/modules/font/freetype/Font.h 2014-04-11 17:46:04.143947394 +0200
++++ love-0.9.1/src/modules/font/freetype/Font.h 2014-04-11 17:46:04.143947394 +0200
@@ -32,6 +32,8 @@
#endif
#include FT_FREETYPE_H
@@ -15,10 +15,10 @@
namespace love
{
-Index: love-0.9.0/src/modules/font/freetype/TrueTypeRasterizer.h
+Index: love-0.9.1/src/modules/font/freetype/TrueTypeRasterizer.h
===================================================================
---- love-0.9.0.orig/src/modules/font/freetype/TrueTypeRasterizer.h 2014-01-11 01:22:14.400926531 +0100
-+++ love-0.9.0/src/modules/font/freetype/TrueTypeRasterizer.h 2014-01-11 01:22:14.388926531 +0100
+--- love-0.9.1.orig/src/modules/font/freetype/TrueTypeRasterizer.h 2014-04-11 17:46:04.143947394 +0200
++++ love-0.9.1/src/modules/font/freetype/TrueTypeRasterizer.h 2014-04-11 17:46:04.143947394 +0200
@@ -29,6 +29,8 @@
#include <ft2build.h>
#include FT_FREETYPE_H
Modified: packages/trunk/love/debian/patches/glee_from_system.patch
===================================================================
--- packages/trunk/love/debian/patches/glee_from_system.patch 2014-04-11 00:32:15 UTC (rev 15023)
+++ packages/trunk/love/debian/patches/glee_from_system.patch 2014-04-11 16:19:07 UTC (rev 15024)
@@ -5,11 +5,11 @@
Forwarded: no
Last-Update: 2012-10-14
-Index: love-0.9.0/src/Makefile.am
+Index: love-0.9.1/src/Makefile.am
===================================================================
---- love-0.9.0.orig/src/Makefile.am 2014-01-12 12:30:16.536746539 +0100
-+++ love-0.9.0/src/Makefile.am 2014-01-12 13:55:57.379827397 +0100
-@@ -6,7 +6,7 @@
+--- love-0.9.1.orig/src/Makefile.am 2014-04-11 17:32:52.774840568 +0200
++++ love-0.9.1/src/Makefile.am 2014-04-11 17:34:08.410945278 +0200
+@@ -7,7 +7,7 @@
# LÖVE executable
bin_PROGRAMS = love
#love_LDFLAGS =
@@ -18,7 +18,7 @@
love_SOURCES = love.cpp
if LOVE_TARGET_OSX
-@@ -28,7 +28,7 @@
+@@ -27,7 +27,7 @@
# libLÖVE
lib_LTLIBRARIES = liblove.la
liblove_la_LDFLAGS = -module -export-dynamic $(LDFLAGS)
@@ -27,7 +27,7 @@
liblove_la_SOURCES = \
./common/Module.cpp \
./common/runtime.cpp \
-@@ -167,7 +167,6 @@
+@@ -166,7 +166,6 @@
./modules/graphics/opengl/OpenGL.h \
./modules/graphics/opengl/wrap_Shader.h \
./modules/graphics/opengl/Font.cpp \
@@ -40,13 +40,13 @@
./modules/graphics/opengl/wrap_Image.h \
./modules/graphics/opengl/Graphics.h \
- ./modules/graphics/opengl/GLee.h \
+ ./modules/graphics/opengl/wrap_Texture.cpp \
./modules/graphics/opengl/Image.cpp \
./modules/graphics/opengl/Graphics.cpp \
- ./modules/graphics/opengl/Canvas.cpp \
-Index: love-0.9.0/src/modules/graphics/opengl/OpenGL.h
+Index: love-0.9.1/src/modules/graphics/opengl/OpenGL.h
===================================================================
---- love-0.9.0.orig/src/modules/graphics/opengl/OpenGL.h 2014-01-12 12:30:16.536746539 +0100
-+++ love-0.9.0/src/modules/graphics/opengl/OpenGL.h 2014-01-12 12:30:16.396746539 +0100
+--- love-0.9.1.orig/src/modules/graphics/opengl/OpenGL.h 2014-04-11 17:32:52.774840568 +0200
++++ love-0.9.1/src/modules/graphics/opengl/OpenGL.h 2014-04-11 17:32:52.734840505 +0200
@@ -21,7 +21,7 @@
#ifndef LOVE_GRAPHICS_OPENGL_OPENGL_H
#define LOVE_GRAPHICS_OPENGL_OPENGL_H
@@ -56,9 +56,9 @@
// LOVE
#include "graphics/Color.h"
-Index: love-0.9.0/src/modules/graphics/opengl/GLee.c
+Index: love-0.9.1/src/modules/graphics/opengl/GLee.c
===================================================================
---- love-0.9.0.orig/src/modules/graphics/opengl/GLee.c 2014-01-12 12:30:16.536746539 +0100
+--- love-0.9.1.orig/src/modules/graphics/opengl/GLee.c 2014-04-11 17:32:13.438778846 +0200
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,25454 +0,0 @@
-/***************************************************************************
@@ -15486,12 +15486,12 @@
-#endif
-#ifndef GLEE_C_DEFINED_glXGetContextIDEXT
-#define GLEE_C_DEFINED_glXGetContextIDEXT
-- GLXContextID __stdcall GLee_Lazy_glXGetContextIDEXT(const GLXContext context) {if (GLeeInit()) return glXGetContextIDEXT(context); return (GLXContextID)0;}
+- GLEE_GLXContextID __stdcall GLee_Lazy_glXGetContextIDEXT(const GLXContext context) {if (GLeeInit()) return glXGetContextIDEXT(context); return (GLEE_GLXContextID)0;}
- GLEEPFNGLXGETCONTEXTIDEXTPROC GLeeFuncPtr_glXGetContextIDEXT=GLee_Lazy_glXGetContextIDEXT;
-#endif
-#ifndef GLEE_C_DEFINED_glXImportContextEXT
-#define GLEE_C_DEFINED_glXImportContextEXT
-- GLXContext __stdcall GLee_Lazy_glXImportContextEXT(Display * dpy, GLXContextID contextID) {if (GLeeInit()) return glXImportContextEXT(dpy, contextID); return (GLXContext)0;}
+- GLXContext __stdcall GLee_Lazy_glXImportContextEXT(Display * dpy, GLEE_GLXContextID contextID) {if (GLeeInit()) return glXImportContextEXT(dpy, contextID); return (GLXContext)0;}
- GLEEPFNGLXIMPORTCONTEXTEXTPROC GLeeFuncPtr_glXImportContextEXT=GLee_Lazy_glXImportContextEXT;
-#endif
-#ifndef GLEE_C_DEFINED_glXFreeContextEXT
@@ -25515,11 +25515,11 @@
- __GLeeExtList_clean(&extensionNames);
- return GL_TRUE;
-}
-Index: love-0.9.0/src/modules/graphics/opengl/GLee.h
+Index: love-0.9.1/src/modules/graphics/opengl/GLee.h
===================================================================
---- love-0.9.0.orig/src/modules/graphics/opengl/GLee.h 2014-01-12 12:30:16.536746539 +0100
+--- love-0.9.1.orig/src/modules/graphics/opengl/GLee.h 2014-04-11 17:32:13.458778878 +0200
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
-@@ -1,24526 +0,0 @@
+@@ -1,24528 +0,0 @@
-/***************************************************************************
-*
-* GLee.h
@@ -25587,6 +25587,8 @@
- #define GLX_GLXEXT_PROTOTYPES
- #include <GL/gl.h>
- #include <GL/glx.h>
+-
+- typedef XID GLEE_GLXContextID;
-#endif
-
-#ifndef APIENTRY
@@ -49205,13 +49207,13 @@
-#endif
-#ifndef GLEE_H_DEFINED_glXGetContextIDEXT
-#define GLEE_H_DEFINED_glXGetContextIDEXT
-- typedef GLXContextID (APIENTRYP GLEEPFNGLXGETCONTEXTIDEXTPROC) (const GLXContext context);
+- typedef GLEE_GLXContextID (APIENTRYP GLEEPFNGLXGETCONTEXTIDEXTPROC) (const GLXContext context);
- GLEE_EXTERN GLEEPFNGLXGETCONTEXTIDEXTPROC GLeeFuncPtr_glXGetContextIDEXT;
- #define glXGetContextIDEXT GLeeFuncPtr_glXGetContextIDEXT
-#endif
-#ifndef GLEE_H_DEFINED_glXImportContextEXT
-#define GLEE_H_DEFINED_glXImportContextEXT
-- typedef GLXContext (APIENTRYP GLEEPFNGLXIMPORTCONTEXTEXTPROC) (Display * dpy, GLXContextID contextID);
+- typedef GLXContext (APIENTRYP GLEEPFNGLXIMPORTCONTEXTEXTPROC) (Display * dpy, GLEE_GLXContextID contextID);
- GLEE_EXTERN GLEEPFNGLXIMPORTCONTEXTEXTPROC GLeeFuncPtr_glXImportContextEXT;
- #define glXImportContextEXT GLeeFuncPtr_glXImportContextEXT
-#endif
Modified: packages/trunk/love/debian/patches/scripts_source.patch
===================================================================
--- packages/trunk/love/debian/patches/scripts_source.patch 2014-04-11 00:32:15 UTC (rev 15023)
+++ packages/trunk/love/debian/patches/scripts_source.patch 2014-04-11 16:19:07 UTC (rev 15024)
@@ -1,11 +1,11 @@
-# https://bitbucket.org/rude/love/src/a8fba28fd847bcd2de699170ac5c321b89761b9c/src/scripts/?at=default
+# https://bitbucket.org/rude/love/src/35a1f71e263bae559b6dce2cb6403832228caecd/src/scripts/?at=default
# Refresh C code afterwards with: cd src/scripts/ && lua5.1 auto.lua boot graphics
-Index: love-0.9.0/src/scripts/auto.lua
+Index: love-0.9.1/src/scripts/auto.lua
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ love-0.9.0/src/scripts/auto.lua 2014-01-12 16:31:35.000000000 +0100
-@@ -0,0 +1,116 @@
++++ love-0.9.1/src/scripts/auto.lua 2014-04-11 17:37:06.319192258 +0200
+@@ -0,0 +1,118 @@
+-- Usage:
+-- lua auto.lua <name1> <name2> .. <nameN>
+--
@@ -15,7 +15,7 @@
+local max_width = 18
+local pattern = [[
+/**
-+ * Copyright (c) 2006-2013 LOVE Development Team
++ * Copyright (c) 2006-2014 LOVE Development Team
+ *
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
@@ -42,7 +42,8 @@
+{
+%s
+}; // [%s]
-+} // love]]
++} // love
++]]
+--formatting parameters:
+-- - input file name
+-- - c variable name
@@ -115,20 +116,21 @@
+for i, v in ipairs(arg) do
+ --run the auto function for every argument
+ --but do it with pcall, to catch errors
-+ local ok, err = pcall(auto, v:gsub("%.lua$",""))
++ v = v:gsub("%.lua$", ""):gsub("^(.+)/", "") -- normalize input
++ local ok, err = pcall(auto, v)
+ if not ok then
+ --inform people we've failed
+ print(v .. ": " .. err)
+ end
+end
+
-Index: love-0.9.0/src/scripts/boot.lua
+Index: love-0.9.1/src/scripts/boot.lua
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ love-0.9.0/src/scripts/boot.lua 2014-01-12 16:32:19.000000000 +0100
-@@ -0,0 +1,1616 @@
++++ love-0.9.1/src/scripts/boot.lua 2014-04-11 17:37:06.319192258 +0200
+@@ -0,0 +1,1637 @@
+--[[
-+Copyright (c) 2006-2013 LOVE Development Team
++Copyright (c) 2006-2014 LOVE Development Team
+
+This software is provided 'as-is', without any express or implied
+warranty. In no event will the authors be held liable for any damages
@@ -352,15 +354,14 @@
+
+end
+
-+local is_fused_game = false
-+local no_game_code = false
-+
+local function uridecode(s)
+ return s:gsub("%%%x%x", function(str)
+ return string.char(tonumber(str:sub(2), 16))
+ end)
+end
+
++local no_game_code = false
++
+-- This can't be overriden.
+function love.boot()
+
@@ -377,35 +378,45 @@
+
+ -- Is this one of those fancy "fused" games?
+ local can_has_game = pcall(love.filesystem.setSource, arg0)
-+ is_fused_game = can_has_game
++ local is_fused_game = can_has_game
+ if love.arg.options.fused.set then
+ is_fused_game = true
+ end
+
++ love.filesystem.setFused(is_fused_game)
++
++ local identity = ""
+ if not can_has_game and o.game.set and o.game.arg[1] then
+ local nouri = o.game.arg[1]
+ if nouri:sub(1, 7) == "file://" then
+ nouri = uridecode(nouri:sub(8))
+ end
+ local full_source = love.path.getfull(nouri)
-+ local leaf = love.path.leaf(full_source)
-+ leaf = leaf:gsub("^([%.]+)", "") -- strip leading "."'s
-+ leaf = leaf:gsub("%.([^%.]+)$", "") -- strip extension
-+ leaf = leaf:gsub("%.", "_") -- replace remaining "."'s with "_"
-+ love.filesystem.setIdentity(leaf)
+ can_has_game = pcall(love.filesystem.setSource, full_source)
++
++ -- Use the name of the source .love as the identity for now.
++ identity = love.path.leaf(full_source)
++ else
++ -- Use the name of the exe as the identity for now.
++ identity = love.path.leaf(arg0)
+ end
+
-+ if can_has_game and not (love.filesystem.exists("main.lua") or love.filesystem.exists("conf.lua")) then
++ identity = identity:gsub("^([%.]+)", "") -- strip leading "."'s
++ identity = identity:gsub("%.([^%.]+)$", "") -- strip extension
++ identity = identity:gsub("%.", "_") -- replace remaining "."'s with "_"
++ identity = #identity > 0 and identity or "lovegame"
++
++ -- When conf.lua is initially loaded, the main source should be checked
++ -- before the save directory (the identity should be appended.)
++ pcall(love.filesystem.setIdentity, identity, true)
++
++ if can_has_game and not (love.filesystem.isFile("main.lua") or love.filesystem.isFile("conf.lua")) then
+ no_game_code = true
+ end
+
-+ love.filesystem.setFused(is_fused_game)
-+
+ if not can_has_game then
+ love.nogame()
+ end
-+
+end
+
+function love.init()
@@ -429,6 +440,8 @@
+ borderless = false,
+ resizable = false,
+ centered = true,
++ highdpi = false,
++ srgb = false,
+ },
+ modules = {
+ event = true,
@@ -453,7 +466,7 @@
+ }
+
+ -- If config file exists, load it and allow it to update config table.
-+ if not love.conf and love.filesystem and love.filesystem.exists("conf.lua") then
++ if not love.conf and love.filesystem and love.filesystem.isFile("conf.lua") then
+ require("conf")
+ end
+
@@ -471,6 +484,11 @@
+ c.console = true
+ end
+
++ -- Console hack
++ if c.console and love._openConsole then
++ love._openConsole()
++ end
++
+ -- Gets desired modules.
+ for k,v in ipairs{
+ "thread",
@@ -498,11 +516,6 @@
+ love.createhandlers()
+ end
+
-+ -- Console hack
-+ if c.console and love._openConsole then
-+ love._openConsole()
-+ end
-+
+ -- Setup window here.
+ if c.window and c.modules.window then
+ assert(love.window.setMode(c.window.width, c.window.height,
@@ -517,6 +530,8 @@
+ borderless = c.window.borderless,
+ centered = c.window.centered,
+ display = c.window.display,
++ highdpi = c.window.highdpi,
++ srgb = c.window.srgb,
+ }), "Could not set window mode")
+ love.window.setTitle(c.window.title or c.title)
+ if c.window.icon then
@@ -532,7 +547,7 @@
+
+ if love.filesystem then
+ love.filesystem.setIdentity(c.identity or love.filesystem.getIdentity(), c.appendidentity)
-+ if love.filesystem.exists("main.lua") then
++ if love.filesystem.isFile("main.lua") then
+ require("main")
+ end
+ end
@@ -1502,8 +1517,9 @@
+ local ox = rain.ox
+ local oy = rain.oy
+
-+ local batch_w = 2 * math.ceil(love.graphics.getWidth() / sx) + 2
-+ local batch_h = 2 * math.ceil(love.graphics.getHeight() / sy) + 2
++ local m = 1 / love.window.getPixelScale()
++ local batch_w = 2 * math.ceil(m * love.graphics.getWidth() / sx) + 2
++ local batch_h = 2 * math.ceil(m * love.graphics.getHeight() / sy) + 2
+
+ batch:clear()
+
@@ -1538,8 +1554,9 @@
+ g_time = g_time + dt / 2
+ local int, frac = math.modf(g_time)
+ update_rain(frac)
-+ inspector.x = love.graphics.getWidth() * 0.45
-+ inspector.y = love.graphics.getHeight() * 0.55
++ local scale = love.window.getPixelScale()
++ inspector.x = love.graphics.getWidth() * 0.45 / scale
++ inspector.y = love.graphics.getHeight() * 0.55 / scale
+ end
+
+ local function draw_grid()
@@ -1610,8 +1627,13 @@
+ function love.draw()
+ love.graphics.setColor(255, 255, 255)
+
++ love.graphics.push()
++ love.graphics.scale(love.window.getPixelScale())
++
+ draw_grid()
+ draw_inspector()
++
++ love.graphics.pop()
+ end
+
+ function love.keyreleased(key)
@@ -1627,6 +1649,7 @@
+ t.modules.physics = false
+ t.modules.joystick = false
+ t.window.resizable = true
++ t.window.highdpi = true
+ end
+end
+
@@ -1743,13 +1766,13 @@
+
+ return tonumber(retval) or 0
+end
-Index: love-0.9.0/src/scripts/graphics.lua
+Index: love-0.9.1/src/scripts/graphics.lua
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ love-0.9.0/src/scripts/graphics.lua 2014-01-12 16:33:24.000000000 +0100
-@@ -0,0 +1,1455 @@
++++ love-0.9.1/src/scripts/graphics.lua 2014-04-11 17:37:06.319192258 +0200
+@@ -0,0 +1,1473 @@
+--[[
-+Copyright (c) 2006-2013 LOVE Development Team
++Copyright (c) 2006-2014 LOVE Development Team
+
+This software is provided 'as-is', without any express or implied
+warranty. In no event will the authors be held liable for any damages
@@ -3053,7 +3076,8 @@
+#define ProjectionMatrix gl_ProjectionMatrix
+#define TransformProjectionMatrix gl_ModelViewProjectionMatrix
+#define NormalMatrix gl_NormalMatrix
-+uniform sampler2D _tex0_;]]
++uniform sampler2D _tex0_;
++uniform vec4 love_ScreenSize;]]
+
+ local GLSL_VERTEX = {
+ HEADER = [[
@@ -3064,8 +3088,17 @@
+#define VertexColor gl_Color
+
+#define VaryingTexCoord gl_TexCoord[0]
-+#define VaryingColor gl_FrontColor]],
++#define VaryingColor gl_FrontColor
+
++// #if defined(GL_ARB_draw_instanced)
++// #extension GL_ARB_draw_instanced : enable
++// #define love_InstanceID gl_InstanceIDARB
++// #else
++// attribute float love_PseudoInstanceID;
++// int love_InstanceID = int(love_PseudoInstanceID);
++// #endif
++]],
++
+ FOOTER = [[
+void main() {
+ VaryingTexCoord = VertexTexCoord;
@@ -3085,14 +3118,22 @@
+void main() {
+ // fix crashing issue in OSX when _tex0_ is unused within effect()
+ float dummy = texture2D(_tex0_, vec2(.5)).r;
-+ gl_FragColor = effect(VaryingColor, _tex0_, VaryingTexCoord.st, gl_FragCoord.xy);
++
++ // See Shader::checkSetScreenParams in Shader.cpp.
++ vec2 pixelcoord = vec2(gl_FragCoord.x, (gl_FragCoord.y * love_ScreenSize.z) + love_ScreenSize.w);
++
++ gl_FragColor = effect(VaryingColor, _tex0_, VaryingTexCoord.st, pixelcoord);
+}]],
+
+ FOOTER_MULTI_CANVAS = [[
+void main() {
+ // fix crashing issue in OSX when _tex0_ is unused within effect()
+ float dummy = texture2D(_tex0_, vec2(.5)).r;
-+ effects(VaryingColor, _tex0_, VaryingTexCoord.st, gl_FragCoord.xy);
++
++ // See Shader::checkSetScreenParams in Shader.cpp.
++ vec2 pixelcoord = vec2(gl_FragCoord.x, (gl_FragCoord.y * love_ScreenSize.z) + love_ScreenSize.w);
++
++ effects(VaryingColor, _tex0_, VaryingTexCoord.st, pixelcoord);
+}]],
+ }
+
Modified: packages/trunk/love/debian/patches/series
===================================================================
--- packages/trunk/love/debian/patches/series 2014-04-11 00:32:15 UTC (rev 15023)
+++ packages/trunk/love/debian/patches/series 2014-04-11 16:19:07 UTC (rev 15024)
@@ -1,4 +1,4 @@
scripts_source.patch
-glee_from_system.patch
+#glee_from_system.patch
fix-freetype-includes.patch
configure.patch
Modified: packages/trunk/love/debian/rules
===================================================================
--- packages/trunk/love/debian/rules 2014-04-11 00:32:15 UTC (rev 15023)
+++ packages/trunk/love/debian/rules 2014-04-11 16:19:07 UTC (rev 15024)
@@ -26,6 +26,8 @@
CFLAGS="$(CFLAGS)" \
CXXFLAGS="$(CXXFLAGS)" \
LDFLAGS="$(LDFLAGS)"
+
+ cd src/scripts/ && lua auto.lua boot graphics
touch $@
build-arch: build-arch-stamp
@@ -54,7 +56,8 @@
rm -rfv obj/*
rm -fv `find . -name "*.o"`
rm -fv configure Makefile.in src/Makefile.in aclocal.m4
- rm -rfv platform/
+ rm -fv src/scripts/boot.lua.h src/scripts/graphics.lua.h
+ #rm -rfv platform/
dh_autoreconf_clean
dh_clean
More information about the Pkg-games-commits
mailing list