[gemrb] 01/01: Debian packaging for version 0.8.1-1

Beren Minor berenm-guest at moszumanska.debian.org
Thu Oct 9 22:20:03 UTC 2014 

This is an automated email from the git hooks/post-receive script.

berenm-guest pushed a commit to branch master
in repository gemrb.

commit 09fd4268ce118d71abc3331f93c7817d0dd817aa
Author: Beren Minor <beren.minor+git at gmail.com>
Date:   Thu Aug 14 22:40:29 2014 +0200

    Debian packaging for version 0.8.1-1
---
 debian/README.Debian                               | 59 +++++++++++++++++++
 debian/baldurs-gate-2-tob.cfg                      |  9 +--
 debian/baldurs-gate-2.cfg                          |  9 +--
 debian/baldurs-gate-tosc.cfg                       |  9 +--
 debian/baldurs-gate.cfg                            |  9 +--
 debian/changelog                                   | 14 +++++
 debian/control                                     | 11 ++--
 debian/copyright                                   |  6 +-
 debian/gemrb-data.install                          |  1 +
 debian/gemrb.docs                                  |  1 -
 debian/icewind-dale-2.cfg                          |  9 +--
 debian/icewind-dale-how.cfg                        |  9 +--
 debian/icewind-dale.cfg                            |  9 +--
 ...emRB-version-number-to-gemrb_core-librar.patch} | 18 +++---
 ...port-chmod-fix-related-to-HOME-folder-rig.patch | 25 --------
 ...e-unnecessary-links-against-various-libr.patch} |  8 +--
 ...-Add-Keywords-field-in-the-GemRB-desktop.patch} |  4 +-
 ...full-config-path-instead-of-the-16-char-b.patch | 25 ++++++++
 ...ge-SDL2MIXER_-to-SDLMIXER_-in-FindSDL2_mi.patch | 47 +++++++++++++++
 ...0GLVideo-plugin-uses-GemRBPath-to-look-fo.patch | 67 ++++++++++++++++++++++
 ...default-values-for-GemRBPath-and-PluginsP.patch | 32 +++++++++++
 ...plugins-SDLVideo-Shaders-to-GemRB-resourc.patch | 21 +++++++
 ...t-look-for-unnecessary-libvlccore-dev-whe.patch | 46 +++++++++++++++
 ...ckage-instead-of-including-the-FindPython.patch | 26 +++++++++
 debian/patches/series                              | 14 +++--
 debian/planescape-torment.cfg                      | 11 ++--
 debian/rules                                       |  3 +
 27 files changed, 416 insertions(+), 86 deletions(-)

diff --git a/debian/README.Debian b/debian/README.Debian
new file mode 100644
index 0000000..c284feb
--- /dev/null
+++ b/debian/README.Debian
@@ -0,0 +1,59 @@
+Debian packages for GemRB
+====================================
+
+These packages include all upstream GemRB sources, and can be used to run old
+Infinity Engine games natively on your Debian distribution.
+
+The packages do not contain any of the game data, except from the custom files
+provided by GemRB upstream sources.
+
+
+What to do next?
+-------------------------------------
+
+GemRB can be used to play to multiple games, but there is a bit of
+configuration to do upfront.
+
+Each game comes with its dedicated Debian package, containing the patches for
+the game, as well as a specific executable. There is a manpage for gemrb, and
+linked manpages for each of the game executables.
+
+When you run GemRB from one of the game executables, it will look for a
+configuration file with the same name as the executable in ~/.gemrb/, or use
+the configuration file provided with the -c flag on the command-line.
+
+A sample configuration files is also packaged in
+/usr/share/doc/<game-package>/examples folder that can be copied to ~/.gemrb/
+and ajusted.
+
+The main parameter to change in the provided example configuration files is
+the GamePath and CD# paths. These parameters should point to the game
+installation path, and the CD paths respectively.
+
+With most digital distributions of Infinity Engine games, the CD paths are
+meaningless, and only the CD1 path is required, usually pointing to the data/
+subfolder of the game installation.
+
+
+Installation hints
+-------------------------------------
+
+GoG: The digital distributions available on GoG are only provided in the form
+of a win32 setup application. There are multiple tools that can be used to
+install the games under Debian:
+  - wine: simply run the setup.exe with Wine
+  - playonlinux: there are some scripts available for GoG version of the games
+  - innoextract: it can extract the game data from the setup.exe directly
+
+Other: Sorry you're on your own, but it shouldn't be that hard.
+
+
+Can I have higher resolutions?
+-------------------------------------
+
+Well, you will need the widescreen path for that, which can be found on
+http://gibberlings3.net.
+
+Playonlinux has a script for its installation through Wine, and it should work
+with GemRB. Other community patches *may* be installable through Wine directly,
+but Linux support is generally scarce.
diff --git a/debian/baldurs-gate-2-tob.cfg b/debian/baldurs-gate-2-tob.cfg
index 6af34c4..d1dc94c 100644
--- a/debian/baldurs-gate-2-tob.cfg
+++ b/debian/baldurs-gate-2-tob.cfg
@@ -5,13 +5,14 @@
 GameName=GemRB - Baldur's Gate 2: Throne of Bhaal
 GameType=bg2
 
+# When the game's data is located in separate folders, more CDs paths
+# can be specified with CD2, CD3, ...
 GamePath=~/baldurs-gate-2-tob
 CD1=~/baldurs-gate-2-tob/cd1/
-CD2=~/baldurs-gate-2-tob/cd2/
-CD3=~/baldurs-gate-2-tob/cd3/
-CD4=~/baldurs-gate-2-tob/cd4/
-CD5=~/baldurs-gate-2-tob/cd5/
 
+# This is the maximum and ideal resolution for the original game
+# Higher resolution support requires a third-party community patch
+# More information about mods and patches can be found on http://gibberlings3.net/
 Fullscreen=0
 Width=1024
 Height=768
diff --git a/debian/baldurs-gate-2.cfg b/debian/baldurs-gate-2.cfg
index d2490d5..8c99d50 100644
--- a/debian/baldurs-gate-2.cfg
+++ b/debian/baldurs-gate-2.cfg
@@ -5,13 +5,14 @@
 GameName=GemRB - Baldur's Gate 2
 GameType=bg2
 
+# When the game's data is located in separate folders, more CDs paths
+# can be specified with CD2, CD3, ...
 GamePath=~/baldurs-gate-2
 CD1=~/baldurs-gate-2/cd1/
-CD2=~/baldurs-gate-2/cd2/
-CD3=~/baldurs-gate-2/cd3/
-CD4=~/baldurs-gate-2/cd4/
-CD5=~/baldurs-gate-2/cd5/
 
+# This is the maximum and ideal resolution for the original game
+# Higher resolution support requires a third-party community patch
+# More information about mods and patches can be found on http://gibberlings3.net/
 Fullscreen=0
 Width=1024
 Height=768
diff --git a/debian/baldurs-gate-tosc.cfg b/debian/baldurs-gate-tosc.cfg
index f8fba60..234f092 100644
--- a/debian/baldurs-gate-tosc.cfg
+++ b/debian/baldurs-gate-tosc.cfg
@@ -5,13 +5,14 @@
 GameName=GemRB - Baldur's Gate: Tales of the Sword Coast
 GameType=bg1
 
+# When the game's data is located in separate folders, more CDs paths
+# can be specified with CD2, CD3, ...
 GamePath=~/baldurs-gate-tosc
 CD1=~/baldurs-gate-tosc/cd1/
-CD2=~/baldurs-gate-tosc/cd2/
-CD3=~/baldurs-gate-tosc/cd3/
-CD4=~/baldurs-gate-tosc/cd4/
-CD5=~/baldurs-gate-tosc/cd5/
 
+# This is the maximum and ideal resolution for the original game
+# Higher resolution support requires a third-party community patch
+# More information about mods and patches can be found on http://gibberlings3.net/
 Fullscreen=0
 Width=640
 Height=480
diff --git a/debian/baldurs-gate.cfg b/debian/baldurs-gate.cfg
index 1e86217..f176dd1 100644
--- a/debian/baldurs-gate.cfg
+++ b/debian/baldurs-gate.cfg
@@ -5,13 +5,14 @@
 GameName=GemRB - Baldur's Gate
 GameType=bg1
 
+# When the game's data is located in separate folders, more CDs paths
+# can be specified with CD2, CD3, ...
 GamePath=~/baldurs-gate
 CD1=~/baldurs-gate/cd1/
-CD2=~/baldurs-gate/cd2/
-CD3=~/baldurs-gate/cd3/
-CD4=~/baldurs-gate/cd4/
-CD5=~/baldurs-gate/cd5/
 
+# This is the maximum and ideal resolution for the original game
+# Higher resolution support requires a third-party community patch
+# More information about mods and patches can be found on http://gibberlings3.net/
 Fullscreen=0
 Width=640
 Height=480
diff --git a/debian/changelog b/debian/changelog
index 66cef49..1c160da 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+gemrb (0.8.1-1) unstable; urgency=medium
+
+  * Imported Upstream version 0.8.1
+  * Remove libvlccore-dev Build-Depends. (Closes: #759261)
+  * Fix GemRB default paths to match the Debian package split between plugins
+    in /usr/lib/gemrb and arch-independent files in /usr/share/gemrb.
+  * Add a README file with some hints regarding the configuration of GemRB and
+    installation of the game's data. (Closes: #755841)
+  * Remove deprecated python-support dependency.
+  * Replace libsdl1.2 dependency with libsdl2.
+  * Increase Standards-Version to 3.9.5.
+
+ -- Beren Minor <beren.minor+debian at gmail.com>  Thu, 14 Aug 2014 22:20:32 +0200
+
 gemrb (0.8.0-1) unstable; urgency=low
 
   * First packaging for Debian (Closes: #658887)
diff --git a/debian/control b/debian/control
index 48db18d..ef06452 100644
--- a/debian/control
+++ b/debian/control
@@ -2,17 +2,18 @@ Source: gemrb
 Section: contrib/games
 Priority: optional
 Maintainer: Beren Minor <beren.minor+debian at gmail.com>
-Build-Depends: debhelper (>= 9), cmake, python-dev, libsdl1.2-dev,
- libsdl-ttf2.0-dev, libsdl-mixer1.2-dev, libz-dev, libopenal-dev, libpng-dev,
- libogg-dev, libvorbis-dev, libvlc-dev, libvlccore-dev
-Standards-Version: 3.9.4
+Build-Depends: debhelper (>= 9), cmake, python-dev, libsdl2-dev,
+ libsdl2-mixer-dev, libz-dev, libopenal-dev, libpng-dev,
+ libogg-dev, libvorbis-dev, libvlc-dev, libglew-dev, libfreetype6-dev
+Standards-Version: 3.9.5
 Homepage: http://www.gemrb.org/
 Vcs-Git: git://anonscm.debian.org/pkg-games/gemrb.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-games/gemrb.git
 
 Package: gemrb
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, python-support (>= 0.90), gemrb-data (=${source:Version}), libgemrb (=${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, python, gemrb-data (=${source:Version}), libgemrb (=${binary:Version})
+Recommends: innoextract
 Description: Open-source engine to run Baldur's Gate, Icewind Dale and Planescape: Torment
  GemRB (Game Engine Made with preRendered Background) is a new implementation
  of the original Infinity Engine (the one of Baldur's Gate, Icewind Dale,
diff --git a/debian/copyright b/debian/copyright
index 1b5dc03..5d303c8 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,12 +3,12 @@ Upstream-Name: gemrb
 Source: http://www.gemrb.org/
 
 Files: *
-Copyright: 2003 - 2012 The GemRB Project
+Copyright: 2003 - 2014 The GemRB Project
 License: GPL-2.0+
 
 Files: gemrb/plugins/BIKPlayer/GetBitContext.cpp
        gemrb/plugins/BIKPlayer/BIKPlayer.cpp
-Copyright: 2003 - 2012 The GemRB Project
+Copyright: 2003 - 2014 The GemRB Project
            2004        Michael Niedermayer <michaelni at gmx.at> 
            2007 - 2009 Peter Ross <pross at xvid.org>
            2009        Daniel Verkamp <daniel at drv.nu>
@@ -53,7 +53,7 @@ Copyright: 1992, 1996, 1997 Free Software Foundation, Inc.
 License: LGPL-2.1+
 
 Files: debian/*
-Copyright: 2011 - 2012 Beren Minor <beren.minor+debian at gmail.com>
+Copyright: 2011 - 2014 Beren Minor <beren.minor+debian at gmail.com>
 License: GPL-2.0+
 
 License: GPL-2.0+
diff --git a/debian/gemrb-data.install b/debian/gemrb-data.install
index f81a29a..ec401e7 100644
--- a/debian/gemrb-data.install
+++ b/debian/gemrb-data.install
@@ -3,3 +3,4 @@ usr/share/gemrb/override/shared/
 usr/share/gemrb/unhardcoded/shared/
 usr/share/gemrb/GUIScripts/*.py
 usr/share/gemrb/GUIScripts/test/
+usr/share/gemrb/Shaders/
diff --git a/debian/gemrb.docs b/debian/gemrb.docs
index c17f037..6f83607 100644
--- a/debian/gemrb.docs
+++ b/debian/gemrb.docs
@@ -1,4 +1,3 @@
 AUTHORS
 NEWS
 README
-TODO
diff --git a/debian/icewind-dale-2.cfg b/debian/icewind-dale-2.cfg
index 382928f..bcf0998 100644
--- a/debian/icewind-dale-2.cfg
+++ b/debian/icewind-dale-2.cfg
@@ -5,13 +5,14 @@
 GameName=GemRB - Icewind Dale 2
 GameType=iwd2
 
+# When the game's data is located in separate folders, more CDs paths
+# can be specified with CD2, CD3, ...
 GamePath=~/icewind-dale-2
 CD1=~/icewind-dale-2/cd1/
-CD2=~/icewind-dale-2/cd2/
-CD3=~/icewind-dale-2/cd3/
-CD4=~/icewind-dale-2/cd4/
-CD5=~/icewind-dale-2/cd5/
 
+# This is the maximum and ideal resolution for the original game
+# Higher resolution support requires a third-party community patch
+# More information about mods and patches can be found on http://gibberlings3.net/
 Fullscreen=0
 Width=1024
 Height=768
diff --git a/debian/icewind-dale-how.cfg b/debian/icewind-dale-how.cfg
index e7edcb1..aec04a8 100644
--- a/debian/icewind-dale-how.cfg
+++ b/debian/icewind-dale-how.cfg
@@ -5,13 +5,14 @@
 GameName=GemRB - Icewind Dale: Heart of Winter
 GameType=how
 
+# When the game's data is located in separate folders, more CDs paths
+# can be specified with CD2, CD3, ...
 GamePath=~/icewind-dale-how
 CD1=~/icewind-dale-how/cd1/
-CD2=~/icewind-dale-how/cd2/
-CD3=~/icewind-dale-how/cd3/
-CD4=~/icewind-dale-how/cd4/
-CD5=~/icewind-dale-how/cd5/
 
+# This is the maximum and ideal resolution for the original game
+# Higher resolution support requires a third-party community patch
+# More information about mods and patches can be found on http://gibberlings3.net/
 Fullscreen=0
 Width=1024
 Height=768
diff --git a/debian/icewind-dale.cfg b/debian/icewind-dale.cfg
index 383f087..7654d1e 100644
--- a/debian/icewind-dale.cfg
+++ b/debian/icewind-dale.cfg
@@ -5,13 +5,14 @@
 GameName=GemRB - Icewind Dale
 GameType=iwd
 
+# When the game's data is located in separate folders, more CDs paths
+# can be specified with CD2, CD3, ...
 GamePath=~/icewind-dale
 CD1=~/icewind-dale/cd1/
-CD2=~/icewind-dale/cd2/
-CD3=~/icewind-dale/cd3/
-CD4=~/icewind-dale/cd4/
-CD5=~/icewind-dale/cd5/
 
+# This is the maximum and ideal resolution for the original game
+# Higher resolution support requires a third-party community patch
+# More information about mods and patches can be found on http://gibberlings3.net/
 Fullscreen=0
 Width=640
 Height=480
diff --git a/debian/patches/0002-DEBIAN-Add-GemRB-version-number-to-gemrb_core-librar.patch b/debian/patches/0001-DEBIAN-Add-GemRB-version-number-to-gemrb_core-librar.patch
similarity index 61%
rename from debian/patches/0002-DEBIAN-Add-GemRB-version-number-to-gemrb_core-librar.patch
rename to debian/patches/0001-DEBIAN-Add-GemRB-version-number-to-gemrb_core-librar.patch
index f74e957..dc5da8d 100644
--- a/debian/patches/0002-DEBIAN-Add-GemRB-version-number-to-gemrb_core-librar.patch
+++ b/debian/patches/0001-DEBIAN-Add-GemRB-version-number-to-gemrb_core-librar.patch
@@ -3,23 +3,23 @@ Date: Sun, 5 Feb 2012 20:41:37 +0100
 Subject: DEBIAN: Add GemRB version number to gemrb_core library.
 
 ---
- gemrb/core/CMakeLists.txt | 3 +++
- 1 file changed, 3 insertions(+)
+ gemrb/core/CMakeLists.txt | 6 ++++++
+ 1 file changed, 6 insertions(+)
 
 diff --git a/gemrb/core/CMakeLists.txt b/gemrb/core/CMakeLists.txt
-index bc27fd3..81dbdc2 100644
+index b6df12a..be592f9 100644
 --- a/gemrb/core/CMakeLists.txt
 +++ b/gemrb/core/CMakeLists.txt
-@@ -151,9 +151,12 @@ else (STATIC_LINK)
+@@ -152,6 +152,12 @@ else (STATIC_LINK)
  	ENDIF(WIN32)
  endif (STATIC_LINK)
  
 +STRING(REGEX REPLACE "\\..*$" "" GEMRB_SOVERSION "${GEMRB_VERSION}")
- SET_TARGET_PROPERTIES(gemrb_core PROPERTIES
- 	COMPILE_DEFINITIONS
- 	"PLUGINDIR=\"${PLUGIN_DIR}\";DATADIR=\"${DATA_DIR}\";SYSCONFDIR=\"${SYSCONF_DIR}\""
++SET_TARGET_PROPERTIES(gemrb_core PROPERTIES
 +	VERSION ${GEMRB_VERSION}
 +	SOVERSION ${GEMRB_SOVERSION}
- 	)
- 
++	)
++
  IF (APPLE)
+ 	SET_TARGET_PROPERTIES(gemrb_core PROPERTIES
+ 	INSTALL_NAME_DIR ${LIB_DIR}
diff --git a/debian/patches/0001-DEBIAN-Backport-chmod-fix-related-to-HOME-folder-rig.patch b/debian/patches/0001-DEBIAN-Backport-chmod-fix-related-to-HOME-folder-rig.patch
deleted file mode 100644
index 936a22d..0000000
--- a/debian/patches/0001-DEBIAN-Backport-chmod-fix-related-to-HOME-folder-rig.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From: Jaka Kranjc <lynxlupodian at users.sourceforge.net>
-Date: Sun, 26 May 2013 15:07:32 +0200
-Subject: DEBIAN: Backport chmod fix, related to HOME folder rights
- modifications.
-
-MakeDirectory: removed dubious chmodding
-
-also fixes [3612689] gemrb changes $HOME directory rights
----
- gemrb/core/System/VFS.cpp | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/gemrb/core/System/VFS.cpp b/gemrb/core/System/VFS.cpp
-index 3e68995..9c2f636 100644
---- a/gemrb/core/System/VFS.cpp
-+++ b/gemrb/core/System/VFS.cpp
-@@ -428,8 +428,6 @@ bool MakeDirectory(const char* path)
- 			return false;
- 		}
- 	}
--	// Ignore errors from chmod
--	chmod(path, S_IREAD|S_IWRITE|S_IEXEC);
- 	return true;
- #ifdef WIN32
- #undef mkdir
diff --git a/debian/patches/0003-DEBIAN-Remove-unnecessary-links-against-various-libr.patch b/debian/patches/0002-DEBIAN-Remove-unnecessary-links-against-various-libr.patch
similarity index 92%
rename from debian/patches/0003-DEBIAN-Remove-unnecessary-links-against-various-libr.patch
rename to debian/patches/0002-DEBIAN-Remove-unnecessary-links-against-various-libr.patch
index 406661a..cb976c5 100644
--- a/debian/patches/0003-DEBIAN-Remove-unnecessary-links-against-various-libr.patch
+++ b/debian/patches/0002-DEBIAN-Remove-unnecessary-links-against-various-libr.patch
@@ -8,7 +8,7 @@ Subject: DEBIAN: Remove unnecessary links against various libraries.
  2 files changed, 8 insertions(+), 5 deletions(-)
 
 diff --git a/gemrb/CMakeLists.txt b/gemrb/CMakeLists.txt
-index 1739f44..fbb897d 100644
+index d2fa234..992bbad 100644
 --- a/gemrb/CMakeLists.txt
 +++ b/gemrb/CMakeLists.txt
 @@ -81,18 +81,17 @@ ELSE(WIN32)
@@ -35,10 +35,10 @@ index 1739f44..fbb897d 100644
   ENDIF(APPLE)
  ENDIF(WIN32)
 diff --git a/gemrb/core/CMakeLists.txt b/gemrb/core/CMakeLists.txt
-index 81dbdc2..33399d1 100644
+index be592f9..0c493e0 100644
 --- a/gemrb/core/CMakeLists.txt
 +++ b/gemrb/core/CMakeLists.txt
-@@ -151,6 +151,10 @@ else (STATIC_LINK)
+@@ -152,6 +152,10 @@ else (STATIC_LINK)
  	ENDIF(WIN32)
  endif (STATIC_LINK)
  
@@ -48,4 +48,4 @@ index 81dbdc2..33399d1 100644
 +
  STRING(REGEX REPLACE "\\..*$" "" GEMRB_SOVERSION "${GEMRB_VERSION}")
  SET_TARGET_PROPERTIES(gemrb_core PROPERTIES
- 	COMPILE_DEFINITIONS
+ 	VERSION ${GEMRB_VERSION}
diff --git a/debian/patches/0004-DEBIAN-Add-Keywords-field-in-the-GemRB-desktop.patch b/debian/patches/0003-DEBIAN-Add-Keywords-field-in-the-GemRB-desktop.patch
similarity index 89%
rename from debian/patches/0004-DEBIAN-Add-Keywords-field-in-the-GemRB-desktop.patch
rename to debian/patches/0003-DEBIAN-Add-Keywords-field-in-the-GemRB-desktop.patch
index 488072d..8a54b0b 100644
--- a/debian/patches/0004-DEBIAN-Add-Keywords-field-in-the-GemRB-desktop.patch
+++ b/debian/patches/0003-DEBIAN-Add-Keywords-field-in-the-GemRB-desktop.patch
@@ -7,11 +7,11 @@ Subject: DEBIAN: Add Keywords field in the GemRB desktop.
  1 file changed, 1 insertion(+)
 
 diff --git a/gemrb.desktop b/gemrb.desktop
-index 9849f49..37b7792 100755
+index 9849f49..e939eed 100755
 --- a/gemrb.desktop
 +++ b/gemrb.desktop
 @@ -8,3 +8,4 @@ Icon=gemrb
  Terminal=true
  Exec=gemrb
  Categories=Game;RolePlaying;Emulator;
-+Keywords=roleplay;rpg;adventure;game;2d;isometric;gemrb;infinite engine;black isle;
++Keywords=roleplay;rpg;adventure;game;2d;isometric;gemrb;infinity engine;black isle;
diff --git a/debian/patches/0004-DEBIAN-Log-full-config-path-instead-of-the-16-char-b.patch b/debian/patches/0004-DEBIAN-Log-full-config-path-instead-of-the-16-char-b.patch
new file mode 100644
index 0000000..67420f2
--- /dev/null
+++ b/debian/patches/0004-DEBIAN-Log-full-config-path-instead-of-the-16-char-b.patch
@@ -0,0 +1,25 @@
+From: Beren Minor <beren.minor+git at gmail.com>
+Date: Fri, 15 Aug 2014 00:07:04 +0200
+Subject: DEBIAN: Log full config path instead of the 16-char buffer that
+ overflows.
+
+---
+ gemrb/core/InterfaceConfig.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/gemrb/core/InterfaceConfig.cpp b/gemrb/core/InterfaceConfig.cpp
+index c0a9b1e..2d97e54 100644
+--- a/gemrb/core/InterfaceConfig.cpp
++++ b/gemrb/core/InterfaceConfig.cpp
+@@ -180,9 +180,9 @@ bool CFGConfig::InitWithINIData(DataStream* const cfgStream)
+ 	}
+ 
+ 	if (isValid) {
+-		Log(WARNING, "Config", "attempting to replace config values with contents of %s", cfgStream->filename);
++		Log(WARNING, "Config", "attempting to replace config values with contents of %s", cfgStream->originalfile);
+ 	} else {
+-		Log(MESSAGE, "Config", "attempting to initialize config with %s", cfgStream->filename);
++		Log(MESSAGE, "Config", "attempting to initialize config with %s", cfgStream->originalfile);
+ 	}
+ 
+ 	isValid = false;
diff --git a/debian/patches/0005-DEBIAN-Change-SDL2MIXER_-to-SDLMIXER_-in-FindSDL2_mi.patch b/debian/patches/0005-DEBIAN-Change-SDL2MIXER_-to-SDLMIXER_-in-FindSDL2_mi.patch
new file mode 100644
index 0000000..1dfed61
--- /dev/null
+++ b/debian/patches/0005-DEBIAN-Change-SDL2MIXER_-to-SDLMIXER_-in-FindSDL2_mi.patch
@@ -0,0 +1,47 @@
+From: Beren Minor <beren.minor+git at gmail.com>
+Date: Thu, 14 Aug 2014 22:45:36 +0200
+Subject: DEBIAN: Change SDL2MIXER_* to SDLMIXER_* in FindSDL2_mixer CMake
+ file.
+
+---
+ cmake/modules/FindSDL2_mixer.cmake | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/cmake/modules/FindSDL2_mixer.cmake b/cmake/modules/FindSDL2_mixer.cmake
+index 0f7f778..e9f22b0 100644
+--- a/cmake/modules/FindSDL2_mixer.cmake
++++ b/cmake/modules/FindSDL2_mixer.cmake
+@@ -29,8 +29,8 @@
+ # (To distribute this file outside of CMake, substitute the full
+ #  License text for the above reference.)
+ 
+-if(NOT SDL2_MIXER_INCLUDE_DIR AND SDL2MIXER_INCLUDE_DIR)
+-  set(SDL2_MIXER_INCLUDE_DIR ${SDL2MIXER_INCLUDE_DIR} CACHE PATH "directory cache
++if(NOT SDL2_MIXER_INCLUDE_DIR AND SDLMIXER_INCLUDE_DIR)
++  set(SDL2_MIXER_INCLUDE_DIR ${SDLMIXER_INCLUDE_DIR} CACHE PATH "directory cache
+ entry initialized from old variable name")
+ endif()
+ find_path(SDL2_MIXER_INCLUDE_DIR SDL_mixer.h
+@@ -43,8 +43,8 @@ find_path(SDL2_MIXER_INCLUDE_DIR SDL_mixer.h
+     /Library/Frameworks/
+ )
+ 
+-if(NOT SDL2_MIXER_LIBRARY AND SDL2MIXER_LIBRARY)
+-  set(SDL2_MIXER_LIBRARY ${SDL2MIXER_LIBRARY} CACHE FILEPATH "file cache entry
++if(NOT SDL2_MIXER_LIBRARY AND SDLMIXER_LIBRARY)
++  set(SDL2_MIXER_LIBRARY ${SDLMIXER_LIBRARY} CACHE FILEPATH "file cache entry
+ initialized from old variable name")
+ endif()
+ find_library(SDL2_MIXER_LIBRARY
+@@ -81,8 +81,8 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(SDL2_mixer
+                                   VERSION_VAR SDL2_MIXER_VERSION_STRING)
+ 
+ # for backward compatiblity
+-set(SDL2MIXER_LIBRARY ${SDL2_MIXER_LIBRARIES})
+-set(SDL2MIXER_INCLUDE_DIR ${SDL2_MIXER_INCLUDE_DIRS})
+-set(SDL2MIXER_FOUND ${SDL2_MIXER_FOUND})
++set(SDLMIXER_LIBRARY ${SDL2_MIXER_LIBRARIES})
++set(SDLMIXER_INCLUDE_DIR ${SDL2_MIXER_INCLUDE_DIRS})
++set(SDLMIXER_FOUND ${SDL2_MIXER_FOUND})
+ 
+ mark_as_advanced(SDL2_MIXER_LIBRARY SDL2_MIXER_INCLUDE_DIR)
diff --git a/debian/patches/0006-DEBIAN-SDL20GLVideo-plugin-uses-GemRBPath-to-look-fo.patch b/debian/patches/0006-DEBIAN-SDL20GLVideo-plugin-uses-GemRBPath-to-look-fo.patch
new file mode 100644
index 0000000..e7683f0
--- /dev/null
+++ b/debian/patches/0006-DEBIAN-SDL20GLVideo-plugin-uses-GemRBPath-to-look-fo.patch
@@ -0,0 +1,67 @@
+From: Beren Minor <beren.minor+git at gmail.com>
+Date: Fri, 15 Aug 2014 00:08:04 +0200
+Subject: DEBIAN: SDL20GLVideo plugin uses GemRBPath to look for shader
+ sources.
+
+---
+ gemrb/plugins/SDLVideo/SDL20GLVideo.cpp | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/gemrb/plugins/SDLVideo/SDL20GLVideo.cpp b/gemrb/plugins/SDLVideo/SDL20GLVideo.cpp
+index 4f1e5e4..caaea3e 100644
+--- a/gemrb/plugins/SDLVideo/SDL20GLVideo.cpp
++++ b/gemrb/plugins/SDLVideo/SDL20GLVideo.cpp
+@@ -147,7 +147,7 @@ bool GLVideoDriver::createPrograms()
+ 	float matrix[16];
+ 	Matrix::SetIdentityM(matrix);
+ 
+-	program32 = GLSLProgram::CreateFromFiles("Shaders/Sprite.glslv", "Shaders/Sprite32.glslf");
++	program32 = GLSLProgram::CreateFromFiles(std::string(core->GemRBPath) + "/Shaders/Sprite.glslv", std::string(core->GemRBPath) + "/Shaders/Sprite32.glslf");
+ 	if (!program32)
+ 	{
+ 		msg = GLSLProgram::GetLastError();
+@@ -158,7 +158,7 @@ bool GLVideoDriver::createPrograms()
+ 	program32->SetUniformValue("s_texture", 1, 0);
+ 	program32->SetUniformMatrixValue("u_matrix", 4, 1, matrix);
+ 	
+-	programPal = GLSLProgram::CreateFromFiles("Shaders/Sprite.glslv", "Shaders/SpritePal.glslf");
++	programPal = GLSLProgram::CreateFromFiles(std::string(core->GemRBPath) + "/Shaders/Sprite.glslv", std::string(core->GemRBPath) + "/Shaders/SpritePal.glslf");
+ 	if (!programPal)
+ 	{
+ 		msg = GLSLProgram::GetLastError();
+@@ -171,7 +171,7 @@ bool GLVideoDriver::createPrograms()
+ 	programPal->SetUniformValue("s_mask", 1, 2);
+ 	programPal->SetUniformMatrixValue("u_matrix", 4, 1, matrix);
+ 
+-	programPalGrayed = GLSLProgram::CreateFromFiles("Shaders/Sprite.glslv", "Shaders/SpritePalGrayed.glslf");
++	programPalGrayed = GLSLProgram::CreateFromFiles(std::string(core->GemRBPath) + "/Shaders/Sprite.glslv", std::string(core->GemRBPath) + "/Shaders/SpritePalGrayed.glslf");
+ 	if (!programPalGrayed)
+ 	{
+ 		msg = GLSLProgram::GetLastError();
+@@ -184,7 +184,7 @@ bool GLVideoDriver::createPrograms()
+ 	programPal->SetUniformValue("s_mask", 1, 2);
+ 	programPalGrayed->SetUniformMatrixValue("u_matrix", 4, 1, matrix);
+ 
+-	programPalSepia = GLSLProgram::CreateFromFiles("Shaders/Sprite.glslv", "Shaders/SpritePalSepia.glslf");
++	programPalSepia = GLSLProgram::CreateFromFiles(std::string(core->GemRBPath) + "/Shaders/Sprite.glslv", std::string(core->GemRBPath) + "/Shaders/SpritePalSepia.glslf");
+ 	if (!programPalSepia)
+ 	{
+ 		msg = GLSLProgram::GetLastError();
+@@ -197,7 +197,7 @@ bool GLVideoDriver::createPrograms()
+ 	programPal->SetUniformValue("s_mask", 1, 2);;
+ 	programPalSepia->SetUniformMatrixValue("u_matrix", 4, 1, matrix);
+ 	
+-	programEllipse = GLSLProgram::CreateFromFiles("Shaders/Ellipse.glslv", "Shaders/Ellipse.glslf");
++	programEllipse = GLSLProgram::CreateFromFiles(std::string(core->GemRBPath) + "/Shaders/Ellipse.glslv", std::string(core->GemRBPath) + "/Shaders/Ellipse.glslf");
+ 	if (!programEllipse)
+ 	{
+ 		msg = GLSLProgram::GetLastError();
+@@ -207,7 +207,7 @@ bool GLVideoDriver::createPrograms()
+ 	programEllipse->Use();
+ 	programEllipse->SetUniformMatrixValue("u_matrix", 4, 1, matrix);
+ 
+-	programRect = GLSLProgram::CreateFromFiles("Shaders/Rect.glslv", "Shaders/Rect.glslf");
++	programRect = GLSLProgram::CreateFromFiles(std::string(core->GemRBPath) + "/Shaders/Rect.glslv", std::string(core->GemRBPath) + "/Shaders/Rect.glslf");
+ 	if (!programRect)
+ 	{
+ 		msg = GLSLProgram::GetLastError();
diff --git a/debian/patches/0007-DEBIAN-Fix-default-values-for-GemRBPath-and-PluginsP.patch b/debian/patches/0007-DEBIAN-Fix-default-values-for-GemRBPath-and-PluginsP.patch
new file mode 100644
index 0000000..db5c734
--- /dev/null
+++ b/debian/patches/0007-DEBIAN-Fix-default-values-for-GemRBPath-and-PluginsP.patch
@@ -0,0 +1,32 @@
+From: Beren Minor <beren.minor+git at gmail.com>
+Date: Fri, 15 Aug 2014 00:13:08 +0200
+Subject: DEBIAN: Fix default values for GemRBPath and PluginsPath to match
+ installation folders.
+
+---
+ gemrb/core/Interface.cpp | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/gemrb/core/Interface.cpp b/gemrb/core/Interface.cpp
+index 3fd47cc..a95f29e 100644
+--- a/gemrb/core/Interface.cpp
++++ b/gemrb/core/Interface.cpp
+@@ -1554,8 +1554,7 @@ int Interface::Init(InterfaceConfig* config)
+ 	CONFIG_PATH("GameSoundsPath", GameSoundsPath, "sounds");
+ 
+ 	// Path configureation
+-	CONFIG_PATH("GemRBPath", GemRBPath,
+-				CopyGemDataPath(GemRBPath, _MAX_PATH));
++	CONFIG_PATH("GemRBPath", GemRBPath, "/usr/share/gemrb");
+ 
+ 	CONFIG_PATH("CachePath", CachePath, "./Cache");
+ 	FixPath( CachePath, false );
+@@ -1568,7 +1567,7 @@ int Interface::Init(InterfaceConfig* config)
+ #ifdef PLUGINDIR
+ 	CONFIG_PATH("PluginsPath", PluginsPath, PLUGINDIR);
+ #else
+-	CONFIG_PATH("PluginsPath", PluginsPath, "");
++	CONFIG_PATH("PluginsPath", PluginsPath, "/usr/lib/gemrb/plugins");
+ 	if (!PluginsPath[0]) {
+ 		PathJoin( PluginsPath, GemRBPath, "plugins", NULL );
+ 	}
diff --git a/debian/patches/0008-DEBIAN-Add-plugins-SDLVideo-Shaders-to-GemRB-resourc.patch b/debian/patches/0008-DEBIAN-Add-plugins-SDLVideo-Shaders-to-GemRB-resourc.patch
new file mode 100644
index 0000000..aca0f08
--- /dev/null
+++ b/debian/patches/0008-DEBIAN-Add-plugins-SDLVideo-Shaders-to-GemRB-resourc.patch
@@ -0,0 +1,21 @@
+From: Beren Minor <beren.minor+git at gmail.com>
+Date: Fri, 15 Aug 2014 00:19:12 +0200
+Subject: DEBIAN: Add plugins/SDLVideo/Shaders to GemRB resources.
+
+---
+ gemrb/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gemrb/CMakeLists.txt b/gemrb/CMakeLists.txt
+index 992bbad..f4ffe89 100644
+--- a/gemrb/CMakeLists.txt
++++ b/gemrb/CMakeLists.txt
+@@ -1,7 +1,7 @@
+ ADD_SUBDIRECTORY( core )
+ 
+ # GUIScripts and override go directly in the bundle
+-SET(RESOURCE_LIST "GUIScripts" "override" "unhardcoded")
++SET(RESOURCE_LIST "GUIScripts" "override" "unhardcoded" "plugins/SDLVideo/Shaders")
+ SET(RESOURCE_FILES "")
+ 
+ FOREACH(RESOURCE_DIR_NAME ${RESOURCE_LIST})
diff --git a/debian/patches/0009-DEBIAN-Don-t-look-for-unnecessary-libvlccore-dev-whe.patch b/debian/patches/0009-DEBIAN-Don-t-look-for-unnecessary-libvlccore-dev-whe.patch
new file mode 100644
index 0000000..8a01ad2
--- /dev/null
+++ b/debian/patches/0009-DEBIAN-Don-t-look-for-unnecessary-libvlccore-dev-whe.patch
@@ -0,0 +1,46 @@
+From: Beren Minor <beren.minor+git at gmail.com>
+Date: Sat, 30 Aug 2014 14:54:37 +0200
+Subject: DEBIAN: Don't look for unnecessary libvlccore-dev when looking for
+ VLC.
+
+---
+ cmake/modules/FindLIBVLC.cmake | 13 ++-----------
+ 1 file changed, 2 insertions(+), 11 deletions(-)
+
+diff --git a/cmake/modules/FindLIBVLC.cmake b/cmake/modules/FindLIBVLC.cmake
+index 04f05f3..f842fd0 100644
+--- a/cmake/modules/FindLIBVLC.cmake
++++ b/cmake/modules/FindLIBVLC.cmake
+@@ -41,16 +41,8 @@ FIND_LIBRARY(LIBVLC_LIBRARY NAMES vlc PATHS
+   NO_DEFAULT_PATH
+   )
+ FIND_LIBRARY(LIBVLC_LIBRARY NAMES vlc)
+-FIND_LIBRARY(LIBVLCCORE_LIBRARY NAMES vlccore PATHS
+-  "$ENV{LIBVLC_LIBRARY_PATH}"
+-  "$ENV{LIB_DIR}/lib"
+-  #mingw
+-  c:/msys/local/lib
+-  NO_DEFAULT_PATH
+-  )
+-FIND_LIBRARY(LIBVLCCORE_LIBRARY NAMES vlccore)
+ 
+-IF (LIBVLC_INCLUDE_DIR AND LIBVLC_LIBRARY AND LIBVLCCORE_LIBRARY)
++IF (LIBVLC_INCLUDE_DIR AND LIBVLC_LIBRARY)
+   # we require this function from 2.0
+   execute_process(
+     COMMAND grep -sq libvlc_video_set_format_callbacks "${LIBVLC_INCLUDE_DIR}/vlc/libvlc_media_player.h" "${LIBVLC_INCLUDE_DIR}/libvlc_media_player.h"
+@@ -63,13 +55,12 @@ IF (LIBVLC_INCLUDE_DIR AND LIBVLC_LIBRARY AND LIBVLCCORE_LIBRARY)
+   ELSE (LIBVLC_GOOD EQUAL 0)
+      message ("The VLCPlayer plugin requires at least VLC 2.0.0 to build, skipping!")
+   ENDIF (LIBVLC_GOOD EQUAL 0)
+-ENDIF (LIBVLC_INCLUDE_DIR AND LIBVLC_LIBRARY AND LIBVLCCORE_LIBRARY)
++ENDIF (LIBVLC_INCLUDE_DIR AND LIBVLC_LIBRARY)
+ 
+ IF (LIBVLC_FOUND)
+    IF (NOT LIBVLC_FIND_QUIETLY)
+       MESSAGE(STATUS "Found LibVLC include-dir path: ${LIBVLC_INCLUDE_DIR}")
+       MESSAGE(STATUS "Found LibVLC library path:${LIBVLC_LIBRARY}")
+-      MESSAGE(STATUS "Found LibVLCcore library path:${LIBVLCCORE_LIBRARY}")
+    ENDIF (NOT LIBVLC_FIND_QUIETLY)
+ ELSE (LIBVLC_FOUND)
+    IF (LIBVLC_FIND_REQUIRED)
diff --git a/debian/patches/0010-Use-find_package-instead-of-including-the-FindPython.patch b/debian/patches/0010-Use-find_package-instead-of-including-the-FindPython.patch
new file mode 100644
index 0000000..8fbe8dc
--- /dev/null
+++ b/debian/patches/0010-Use-find_package-instead-of-including-the-FindPython.patch
@@ -0,0 +1,26 @@
+From: Beren Minor <beren.minor+git at gmail.com>
+Date: Wed, 8 Oct 2014 20:55:38 +0200
+Subject: Use find_package instead of including the FindPythonLibs file which
+ does not work.
+
+---
+ CMakeLists.txt | 6 +-----
+ 1 file changed, 1 insertion(+), 5 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index a54b37b..85dc60b 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -157,11 +157,7 @@ ENDIF()
+ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules/")
+ 
+ # Check for all the required and optional dependencies
+-IF((CMAKE_MAJOR_VERSION GREATER 1) AND (CMAKE_MINOR_VERSION GREATER 7))
+-	FIND_PACKAGE(PythonLibs 2.3 REQUIRED)
+-ELSE((CMAKE_MAJOR_VERSION GREATER 1) AND (CMAKE_MINOR_VERSION GREATER 7))
+-	INCLUDE(FindPythonLibs)
+-ENDIF((CMAKE_MAJOR_VERSION GREATER 1) AND (CMAKE_MINOR_VERSION GREATER 7))
++FIND_PACKAGE(PythonLibs 2.3 REQUIRED)
+ IF(PYTHONLIBS_FOUND)
+ 	MESSAGE(STATUS "Looking for Python libraries and headers: found")
+ ELSE()
diff --git a/debian/patches/series b/debian/patches/series
index fce26b4..4f92608 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,10 @@
-0001-DEBIAN-Backport-chmod-fix-related-to-HOME-folder-rig.patch
-0002-DEBIAN-Add-GemRB-version-number-to-gemrb_core-librar.patch
-0003-DEBIAN-Remove-unnecessary-links-against-various-libr.patch
-0004-DEBIAN-Add-Keywords-field-in-the-GemRB-desktop.patch
+0001-DEBIAN-Add-GemRB-version-number-to-gemrb_core-librar.patch
+0002-DEBIAN-Remove-unnecessary-links-against-various-libr.patch
+0003-DEBIAN-Add-Keywords-field-in-the-GemRB-desktop.patch
+0004-DEBIAN-Log-full-config-path-instead-of-the-16-char-b.patch
+0005-DEBIAN-Change-SDL2MIXER_-to-SDLMIXER_-in-FindSDL2_mi.patch
+0006-DEBIAN-SDL20GLVideo-plugin-uses-GemRBPath-to-look-fo.patch
+0007-DEBIAN-Fix-default-values-for-GemRBPath-and-PluginsP.patch
+0008-DEBIAN-Add-plugins-SDLVideo-Shaders-to-GemRB-resourc.patch
+0009-DEBIAN-Don-t-look-for-unnecessary-libvlccore-dev-whe.patch
+0010-Use-find_package-instead-of-including-the-FindPython.patch
diff --git a/debian/planescape-torment.cfg b/debian/planescape-torment.cfg
index f5665da..aa70f97 100644
--- a/debian/planescape-torment.cfg
+++ b/debian/planescape-torment.cfg
@@ -5,13 +5,14 @@
 GameName=GemRB - Planescape: Torment
 GameType=pst
 
+# When the game's data is located in separate folders, more CDs paths
+# can be specified with CD2, CD3, ...
 GamePath=~/planescape-torment
-CD1=~/planescape-torment/cd1/
-CD2=~/planescape-torment/cd2/
-CD3=~/planescape-torment/cd3/
-CD4=~/planescape-torment/cd4/
-CD5=~/planescape-torment/cd5/
+CD1=~/planescape-torment/data/
 
+# This is the maximum and ideal resolution for the original game
+# Higher resolution support requires a third-party community patch
+# More information about mods and patches can be found on http://gibberlings3.net/
 Fullscreen=0
 Width=640
 Height=480
diff --git a/debian/rules b/debian/rules
index cd1bccb..2f37dee 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,3 +6,6 @@
 
 override_dh_makeshlibs:
 	dh_makeshlibs -n
+
+override_dh_auto_configure:
+	dh_auto_configure -- -DUSE_SDL2=1 -DUSE_OPENGL=1

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/gemrb.git

More information about the Pkg-games-commits mailing list