[gemrb] 01/01: Debian packaging for version 0.8.2-1
Beren Minor
berenm-guest at moszumanska.debian.org
Wed Sep 9 18:40:53 UTC 2015
This is an automated email from the git hooks/post-receive script.
berenm-guest pushed a commit to branch master
in repository gemrb.
commit acba4323d27c3a31b39563e20f509788424be683
Author: Beren Minor <beren.minor+git at gmail.com>
Date: Fri Jan 2 01:09:12 2015 +0100
Debian packaging for version 0.8.2-1
---
cmake/modules/FindLIBVLC.cmake | 13 +----
debian/baldurs-gate-2-tob.desktop | 2 +-
debian/baldurs-gate-2.desktop | 2 +-
debian/baldurs-gate-tosc.desktop | 2 +-
debian/baldurs-gate.desktop | 2 +-
debian/changelog | 9 +++
debian/control | 2 +-
debian/copyright | 37 +++++++++++-
debian/gemrb.desktop | 2 +-
debian/icewind-dale-2.desktop | 2 +-
debian/icewind-dale-how.desktop | 2 +-
debian/icewind-dale.desktop | 2 +-
...GemRB-version-number-to-gemrb_core-librar.patch | 25 --------
...e-unnecessary-links-against-various-libr.patch} | 14 ++---
...ull-config-path-instead-of-the-16-char-b.patch} | 2 +-
...N-Add-Keywords-field-in-the-GemRB-desktop.patch | 17 ------
...efault-values-for-GemRBPath-and-PluginsP.patch} | 10 ++--
...-look-for-unnecessary-libvlccore-dev-whe.patch} | 0
...ge-SDL2MIXER_-to-SDLMIXER_-in-FindSDL2_mi.patch | 47 ---------------
...config-file-from-.gemrb-before-trying-fro.patch | 41 +++++++++++++
...0GLVideo-plugin-uses-GemRBPath-to-look-fo.patch | 67 ----------------------
...plugins-SDLVideo-Shaders-to-GemRB-resourc.patch | 21 -------
...ckage-instead-of-including-the-FindPython.patch | 26 ---------
debian/patches/series | 15 ++---
debian/planescape-torment.desktop | 2 +-
gemrb/CMakeLists.txt | 9 ++-
gemrb/core/CMakeLists.txt | 4 ++
gemrb/core/Interface.cpp | 5 +-
gemrb/core/InterfaceConfig.cpp | 20 +++----
29 files changed, 135 insertions(+), 267 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/baldurs-gate-2-tob.desktop b/debian/baldurs-gate-2-tob.desktop
index 40c557e..2b4be29 100644
--- a/debian/baldurs-gate-2-tob.desktop
+++ b/debian/baldurs-gate-2-tob.desktop
@@ -8,4 +8,4 @@ Icon=baldurs-gate-2-tob
Terminal=true
Exec=baldurs-gate-2-tob
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/baldurs-gate-2.desktop b/debian/baldurs-gate-2.desktop
index 97cf807..983d625 100644
--- a/debian/baldurs-gate-2.desktop
+++ b/debian/baldurs-gate-2.desktop
@@ -8,4 +8,4 @@ Icon=baldurs-gate-2
Terminal=true
Exec=baldurs-gate-2
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/baldurs-gate-tosc.desktop b/debian/baldurs-gate-tosc.desktop
index 24eca81..5567261 100644
--- a/debian/baldurs-gate-tosc.desktop
+++ b/debian/baldurs-gate-tosc.desktop
@@ -8,4 +8,4 @@ Icon=baldurs-gate-tosc
Terminal=true
Exec=baldurs-gate-tosc
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/baldurs-gate.desktop b/debian/baldurs-gate.desktop
index c25826a..b43ffd2 100644
--- a/debian/baldurs-gate.desktop
+++ b/debian/baldurs-gate.desktop
@@ -8,4 +8,4 @@ Icon=baldurs-gate
Terminal=true
Exec=baldurs-gate
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/changelog b/debian/changelog
index 1c160da..f83dea1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+gemrb (0.8.2-1) unstable; urgency=medium
+
+ * Imported Upstream version 0.8.2
+ * Increase Standards-Version to 3.9.6.
+ * Updated copyright information for SFMT.
+ * Updated copyright year for debian files.
+
+ -- Beren Minor <beren.minor+debian at gmail.com> Fri, 02 Jan 2015 01:08:34 +0100
+
gemrb (0.8.1-1) unstable; urgency=medium
* Imported Upstream version 0.8.1
diff --git a/debian/control b/debian/control
index ef06452..d8bde38 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Beren Minor <beren.minor+debian at gmail.com>
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
+Standards-Version: 3.9.6
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
diff --git a/debian/copyright b/debian/copyright
index 5d303c8..35dd63c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -48,12 +48,19 @@ Files: gemrb/core/Cache.h
Copyright: 2003 Avenger <avenger_teambg at users.sourceforge.net>
License: GPL-2.0+
+Files: gemrb/core/RNG/sfmt/*
+Copyright: 2006, 2007, 2012, 2013 Mutsuo Saito
+ 2006, 2007, 2012, 2013 Makoto Matsumoto
+ 2006, 2007, 2012, 2013 Hiroshima University
+ 2012 University of Tokyo
+License: BSD-3-Clause
+
Files: gemrb/core/System/swab.*
Copyright: 1992, 1996, 1997 Free Software Foundation, Inc.
License: LGPL-2.1+
Files: debian/*
-Copyright: 2011 - 2014 Beren Minor <beren.minor+debian at gmail.com>
+Copyright: 2011 - 2015 Beren Minor <beren.minor+debian at gmail.com>
License: GPL-2.0+
License: GPL-2.0+
@@ -96,3 +103,31 @@ License: LGPL-2.1+
.
On Debian systems, the complete text of the LGPL-2.1 can be found in
"/usr/share/common-licenses/LGPL-2.1".
+
+License: BSD-3-Clause
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+ .
+ 1) Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ .
+ 2) Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+ .
+ 3) Neither the name of the ORGANIZATION nor the names of its
+ contributors may be used to endorse or promote products derived from
+ this software without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/debian/gemrb.desktop b/debian/gemrb.desktop
index 37b7792..e939eed 100644
--- a/debian/gemrb.desktop
+++ b/debian/gemrb.desktop
@@ -8,4 +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/icewind-dale-2.desktop b/debian/icewind-dale-2.desktop
index 1611153..c5c71dd 100644
--- a/debian/icewind-dale-2.desktop
+++ b/debian/icewind-dale-2.desktop
@@ -8,4 +8,4 @@ Icon=icewind-dale-2
Terminal=true
Exec=icewind-dale-2
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/icewind-dale-how.desktop b/debian/icewind-dale-how.desktop
index f113b70..b5ef62e 100644
--- a/debian/icewind-dale-how.desktop
+++ b/debian/icewind-dale-how.desktop
@@ -8,4 +8,4 @@ Icon=icewind-dale-how
Terminal=true
Exec=icewind-dale-how
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/icewind-dale.desktop b/debian/icewind-dale.desktop
index 69b7231..286cd23 100644
--- a/debian/icewind-dale.desktop
+++ b/debian/icewind-dale.desktop
@@ -8,4 +8,4 @@ Icon=icewind-dale
Terminal=true
Exec=icewind-dale
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/0001-DEBIAN-Add-GemRB-version-number-to-gemrb_core-librar.patch b/debian/patches/0001-DEBIAN-Add-GemRB-version-number-to-gemrb_core-librar.patch
deleted file mode 100644
index dc5da8d..0000000
--- a/debian/patches/0001-DEBIAN-Add-GemRB-version-number-to-gemrb_core-librar.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From: Beren Minor <beren.minor+debian at gmail.com>
-Date: Sun, 5 Feb 2012 20:41:37 +0100
-Subject: DEBIAN: Add GemRB version number to gemrb_core library.
-
----
- gemrb/core/CMakeLists.txt | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/gemrb/core/CMakeLists.txt b/gemrb/core/CMakeLists.txt
-index b6df12a..be592f9 100644
---- a/gemrb/core/CMakeLists.txt
-+++ b/gemrb/core/CMakeLists.txt
-@@ -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
-+ VERSION ${GEMRB_VERSION}
-+ SOVERSION ${GEMRB_SOVERSION}
-+ )
-+
- IF (APPLE)
- SET_TARGET_PROPERTIES(gemrb_core PROPERTIES
- INSTALL_NAME_DIR ${LIB_DIR}
diff --git a/debian/patches/0002-DEBIAN-Remove-unnecessary-links-against-various-libr.patch b/debian/patches/0001-DEBIAN-Remove-unnecessary-links-against-various-libr.patch
similarity index 85%
rename from debian/patches/0002-DEBIAN-Remove-unnecessary-links-against-various-libr.patch
rename to debian/patches/0001-DEBIAN-Remove-unnecessary-links-against-various-libr.patch
index cb976c5..e0951c0 100644
--- a/debian/patches/0002-DEBIAN-Remove-unnecessary-links-against-various-libr.patch
+++ b/debian/patches/0001-DEBIAN-Remove-unnecessary-links-against-various-libr.patch
@@ -1,5 +1,5 @@
From: Beren Minor <beren.minor+git at gmail.com>
-Date: Fri, 1 Jun 2012 21:19:34 +0200
+Date: Fri, 2 Jan 2015 01:21:02 +0100
Subject: DEBIAN: Remove unnecessary links against various libraries.
---
@@ -8,10 +8,10 @@ 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 d2fa234..992bbad 100644
+index af58ede..e78e027 100644
--- a/gemrb/CMakeLists.txt
+++ b/gemrb/CMakeLists.txt
-@@ -81,18 +81,17 @@ ELSE(WIN32)
+@@ -84,18 +84,17 @@ ELSE(WIN32)
if (STATIC_LINK)
TARGET_LINK_LIBRARIES(gemrb
@@ -35,10 +35,10 @@ index d2fa234..992bbad 100644
ENDIF(APPLE)
ENDIF(WIN32)
diff --git a/gemrb/core/CMakeLists.txt b/gemrb/core/CMakeLists.txt
-index be592f9..0c493e0 100644
+index 3b7c39f..341869d 100644
--- a/gemrb/core/CMakeLists.txt
+++ b/gemrb/core/CMakeLists.txt
-@@ -152,6 +152,10 @@ else (STATIC_LINK)
+@@ -154,6 +154,10 @@ else (STATIC_LINK)
ENDIF(WIN32)
endif (STATIC_LINK)
@@ -46,6 +46,6 @@ index be592f9..0c493e0 100644
+ TARGET_LINK_LIBRARIES(gemrb_core ${CMAKE_DL_LIBS})
+ENDIF(NOT WIN32)
+
- STRING(REGEX REPLACE "\\..*$" "" GEMRB_SOVERSION "${GEMRB_VERSION}")
+ # make lintian happy
SET_TARGET_PROPERTIES(gemrb_core PROPERTIES
- VERSION ${GEMRB_VERSION}
+ VERSION "${GEMRB_VERSION}"
diff --git a/debian/patches/0004-DEBIAN-Log-full-config-path-instead-of-the-16-char-b.patch b/debian/patches/0002-DEBIAN-Log-full-config-path-instead-of-the-16-char-b.patch
similarity index 96%
rename from debian/patches/0004-DEBIAN-Log-full-config-path-instead-of-the-16-char-b.patch
rename to debian/patches/0002-DEBIAN-Log-full-config-path-instead-of-the-16-char-b.patch
index 67420f2..12f9cac 100644
--- a/debian/patches/0004-DEBIAN-Log-full-config-path-instead-of-the-16-char-b.patch
+++ b/debian/patches/0002-DEBIAN-Log-full-config-path-instead-of-the-16-char-b.patch
@@ -8,7 +8,7 @@ Subject: DEBIAN: Log full config path instead of the 16-char buffer that
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gemrb/core/InterfaceConfig.cpp b/gemrb/core/InterfaceConfig.cpp
-index c0a9b1e..2d97e54 100644
+index e37ed66..8aa9c23 100644
--- a/gemrb/core/InterfaceConfig.cpp
+++ b/gemrb/core/InterfaceConfig.cpp
@@ -180,9 +180,9 @@ bool CFGConfig::InitWithINIData(DataStream* const cfgStream)
diff --git a/debian/patches/0003-DEBIAN-Add-Keywords-field-in-the-GemRB-desktop.patch b/debian/patches/0003-DEBIAN-Add-Keywords-field-in-the-GemRB-desktop.patch
deleted file mode 100644
index 8a54b0b..0000000
--- a/debian/patches/0003-DEBIAN-Add-Keywords-field-in-the-GemRB-desktop.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-From: Beren Minor <beren.minor+debian at gmail.com>
-Date: Tue, 3 Sep 2013 21:45:22 +0200
-Subject: DEBIAN: Add Keywords field in the GemRB desktop.
-
----
- gemrb.desktop | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/gemrb.desktop b/gemrb.desktop
-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;infinity engine;black isle;
diff --git a/debian/patches/0007-DEBIAN-Fix-default-values-for-GemRBPath-and-PluginsP.patch b/debian/patches/0003-DEBIAN-Fix-default-values-for-GemRBPath-and-PluginsP.patch
similarity index 79%
rename from debian/patches/0007-DEBIAN-Fix-default-values-for-GemRBPath-and-PluginsP.patch
rename to debian/patches/0003-DEBIAN-Fix-default-values-for-GemRBPath-and-PluginsP.patch
index db5c734..21225ac 100644
--- a/debian/patches/0007-DEBIAN-Fix-default-values-for-GemRBPath-and-PluginsP.patch
+++ b/debian/patches/0003-DEBIAN-Fix-default-values-for-GemRBPath-and-PluginsP.patch
@@ -8,10 +8,10 @@ Subject: DEBIAN: Fix default values for GemRBPath and PluginsPath to match
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/gemrb/core/Interface.cpp b/gemrb/core/Interface.cpp
-index 3fd47cc..a95f29e 100644
+index 8d87b80..197180c 100644
--- a/gemrb/core/Interface.cpp
+++ b/gemrb/core/Interface.cpp
-@@ -1554,8 +1554,7 @@ int Interface::Init(InterfaceConfig* config)
+@@ -1553,8 +1553,7 @@ int Interface::Init(InterfaceConfig* config)
CONFIG_PATH("GameSoundsPath", GameSoundsPath, "sounds");
// Path configureation
@@ -21,9 +21,9 @@ index 3fd47cc..a95f29e 100644
CONFIG_PATH("CachePath", CachePath, "./Cache");
FixPath( CachePath, false );
-@@ -1568,7 +1567,7 @@ int Interface::Init(InterfaceConfig* config)
- #ifdef PLUGINDIR
- CONFIG_PATH("PluginsPath", PluginsPath, PLUGINDIR);
+@@ -1567,7 +1566,7 @@ int Interface::Init(InterfaceConfig* config)
+ #ifdef PLUGIN_DIR
+ CONFIG_PATH("PluginsPath", PluginsPath, PLUGIN_DIR);
#else
- CONFIG_PATH("PluginsPath", PluginsPath, "");
+ CONFIG_PATH("PluginsPath", PluginsPath, "/usr/lib/gemrb/plugins");
diff --git a/debian/patches/0009-DEBIAN-Don-t-look-for-unnecessary-libvlccore-dev-whe.patch b/debian/patches/0004-DEBIAN-Don-t-look-for-unnecessary-libvlccore-dev-whe.patch
similarity index 100%
rename from debian/patches/0009-DEBIAN-Don-t-look-for-unnecessary-libvlccore-dev-whe.patch
rename to debian/patches/0004-DEBIAN-Don-t-look-for-unnecessary-libvlccore-dev-whe.patch
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
deleted file mode 100644
index 1dfed61..0000000
--- a/debian/patches/0005-DEBIAN-Change-SDL2MIXER_-to-SDLMIXER_-in-FindSDL2_mi.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-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/0005-DEBIAN-Try-config-file-from-.gemrb-before-trying-fro.patch b/debian/patches/0005-DEBIAN-Try-config-file-from-.gemrb-before-trying-fro.patch
new file mode 100644
index 0000000..ea19d62
--- /dev/null
+++ b/debian/patches/0005-DEBIAN-Try-config-file-from-.gemrb-before-trying-fro.patch
@@ -0,0 +1,41 @@
+From: Beren Minor <beren.minor+git at gmail.com>
+Date: Fri, 2 Jan 2015 02:07:57 +0100
+Subject: DEBIAN: Try config file from ~/.gemrb before trying from /etc
+
+---
+ gemrb/core/InterfaceConfig.cpp | 16 +++++++---------
+ 1 file changed, 7 insertions(+), 9 deletions(-)
+
+diff --git a/gemrb/core/InterfaceConfig.cpp b/gemrb/core/InterfaceConfig.cpp
+index 8aa9c23..8f887f3 100644
+--- a/gemrb/core/InterfaceConfig.cpp
++++ b/gemrb/core/InterfaceConfig.cpp
+@@ -128,21 +128,19 @@ CFGConfig::CFGConfig(int argc, char *argv[])
+ strcpy( name, appName );
+ assert(name[0]);
+
+-#if TARGET_OS_MAC
+- // CopyGemDataPath would give us bundle resources dir
+- CopyHomePath(datadir, _MAX_PATH);
+- PathAppend(datadir, PACKAGE);
+-#else
+- CopyGemDataPath(datadir, _MAX_PATH);
+-#endif
+- PathJoinExt( path, datadir, name, "cfg" );
+-
+ #define ATTEMPT_INIT \
+ if (config->Open(path) \
+ && InitWithINIData(config)) { \
+ goto done; \
+ }
+
++ CopyHomePath(datadir, _MAX_PATH);
++ PathAppend(datadir, "." PACKAGE);
++ PathJoinExt( path, datadir, name, "cfg" );
++ ATTEMPT_INIT;
++
++ CopyGemDataPath(datadir, _MAX_PATH);
++ PathJoinExt( path, datadir, name, "cfg" );
+ ATTEMPT_INIT;
+
+ #ifdef SYSCONF_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
deleted file mode 100644
index e7683f0..0000000
--- a/debian/patches/0006-DEBIAN-SDL20GLVideo-plugin-uses-GemRBPath-to-look-fo.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-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/0008-DEBIAN-Add-plugins-SDLVideo-Shaders-to-GemRB-resourc.patch b/debian/patches/0008-DEBIAN-Add-plugins-SDLVideo-Shaders-to-GemRB-resourc.patch
deleted file mode 100644
index aca0f08..0000000
--- a/debian/patches/0008-DEBIAN-Add-plugins-SDLVideo-Shaders-to-GemRB-resourc.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-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/0010-Use-find_package-instead-of-including-the-FindPython.patch b/debian/patches/0010-Use-find_package-instead-of-including-the-FindPython.patch
deleted file mode 100644
index 8fbe8dc..0000000
--- a/debian/patches/0010-Use-find_package-instead-of-including-the-FindPython.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-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 4f92608..f0c98e1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,10 +1,5 @@
-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
+0001-DEBIAN-Remove-unnecessary-links-against-various-libr.patch
+0002-DEBIAN-Log-full-config-path-instead-of-the-16-char-b.patch
+0003-DEBIAN-Fix-default-values-for-GemRBPath-and-PluginsP.patch
+0004-DEBIAN-Don-t-look-for-unnecessary-libvlccore-dev-whe.patch
+0005-DEBIAN-Try-config-file-from-.gemrb-before-trying-fro.patch
diff --git a/debian/planescape-torment.desktop b/debian/planescape-torment.desktop
index bb1a568..6f1ced6 100644
--- a/debian/planescape-torment.desktop
+++ b/debian/planescape-torment.desktop
@@ -8,4 +8,4 @@ Icon=planescape-torment
Terminal=true
Exec=planescape-torment
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/gemrb/CMakeLists.txt b/gemrb/CMakeLists.txt
index af58ede..e78e027 100644
--- a/gemrb/CMakeLists.txt
+++ b/gemrb/CMakeLists.txt
@@ -84,18 +84,17 @@ ELSE(WIN32)
if (STATIC_LINK)
TARGET_LINK_LIBRARIES(gemrb
- ${COCOA_LIBRARY_PATH} ${CMAKE_DL_LIBS} ${CMAKE_THREAD_LIBS_INIT}
+ ${COCOA_LIBRARY_PATH}
gemrb_core ${plugins} -Wl,-all_load)
else (STATIC_LINK)
TARGET_LINK_LIBRARIES(gemrb gemrb_core
- ${COCOA_LIBRARY_PATH} ${CMAKE_DL_LIBS} ${CMAKE_THREAD_LIBS_INIT})
+ ${COCOA_LIBRARY_PATH})
endif (STATIC_LINK)
ELSE(APPLE)
if (STATIC_LINK)
- TARGET_LINK_LIBRARIES(gemrb ${CMAKE_DL_LIBS} ${CMAKE_THREAD_LIBS_INIT}
- -Wl,--whole-archive gemrb_core ${plugins} -Wl,--no-whole-archive)
+ TARGET_LINK_LIBRARIES(gemrb -Wl,--whole-archive gemrb_core ${plugins} -Wl,--no-whole-archive)
else (STATIC_LINK)
- TARGET_LINK_LIBRARIES(gemrb gemrb_core ${CMAKE_DL_LIBS} ${CMAKE_THREAD_LIBS_INIT})
+ TARGET_LINK_LIBRARIES(gemrb gemrb_core)
endif (STATIC_LINK)
ENDIF(APPLE)
ENDIF(WIN32)
diff --git a/gemrb/core/CMakeLists.txt b/gemrb/core/CMakeLists.txt
index 3b7c39f..341869d 100644
--- a/gemrb/core/CMakeLists.txt
+++ b/gemrb/core/CMakeLists.txt
@@ -154,6 +154,10 @@ else (STATIC_LINK)
ENDIF(WIN32)
endif (STATIC_LINK)
+IF(NOT WIN32)
+ TARGET_LINK_LIBRARIES(gemrb_core ${CMAKE_DL_LIBS})
+ENDIF(NOT WIN32)
+
# make lintian happy
SET_TARGET_PROPERTIES(gemrb_core PROPERTIES
VERSION "${GEMRB_VERSION}"
diff --git a/gemrb/core/Interface.cpp b/gemrb/core/Interface.cpp
index 8d87b80..197180c 100644
--- a/gemrb/core/Interface.cpp
+++ b/gemrb/core/Interface.cpp
@@ -1553,8 +1553,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 );
@@ -1567,7 +1566,7 @@ int Interface::Init(InterfaceConfig* config)
#ifdef PLUGIN_DIR
CONFIG_PATH("PluginsPath", PluginsPath, PLUGIN_DIR);
#else
- CONFIG_PATH("PluginsPath", PluginsPath, "");
+ CONFIG_PATH("PluginsPath", PluginsPath, "/usr/lib/gemrb/plugins");
if (!PluginsPath[0]) {
PathJoin( PluginsPath, GemRBPath, "plugins", NULL );
}
diff --git a/gemrb/core/InterfaceConfig.cpp b/gemrb/core/InterfaceConfig.cpp
index e37ed66..8f887f3 100644
--- a/gemrb/core/InterfaceConfig.cpp
+++ b/gemrb/core/InterfaceConfig.cpp
@@ -128,21 +128,19 @@ CFGConfig::CFGConfig(int argc, char *argv[])
strcpy( name, appName );
assert(name[0]);
-#if TARGET_OS_MAC
- // CopyGemDataPath would give us bundle resources dir
- CopyHomePath(datadir, _MAX_PATH);
- PathAppend(datadir, PACKAGE);
-#else
- CopyGemDataPath(datadir, _MAX_PATH);
-#endif
- PathJoinExt( path, datadir, name, "cfg" );
-
#define ATTEMPT_INIT \
if (config->Open(path) \
&& InitWithINIData(config)) { \
goto done; \
}
+ CopyHomePath(datadir, _MAX_PATH);
+ PathAppend(datadir, "." PACKAGE);
+ PathJoinExt( path, datadir, name, "cfg" );
+ ATTEMPT_INIT;
+
+ CopyGemDataPath(datadir, _MAX_PATH);
+ PathJoinExt( path, datadir, name, "cfg" );
ATTEMPT_INIT;
#ifdef SYSCONF_DIR
@@ -180,9 +178,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;
--
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