[SCM] ALURE packaging branch, master, updated. upstream/1.1-21-gc529b5b

[Andres Mejia]

The following commit has been merged in the master branch:
commit c529b5b4d5055f4254c798343cd7376e09f5e2fa
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Thu Apr 14 17:35:30 2011 -0400

    Enable modplug support without sndfile.h conflict.

diff --git a/debian/control b/debian/control
index ee0a0fa..be82d39 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Uploaders: Andres Mejia <mcitadel at gmail.com>, Tobias Hansen <tobias.han at gmx.de>
 DM-Upload-Allowed: yes
 Build-Depends: debhelper (>= 7.0.50), cmake, libopenal-dev,
  libsndfile-dev, libvorbis-dev, libflac-dev, libmpg123-dev, libdumb1-dev,
- libfluidsynth-dev
+ libfluidsynth-dev, libmodplug-dev
 Standards-Version: 3.9.1
 Section: libs
 Vcs-Git: git://git.debian.org/git/pkg-games/alure.git
diff --git a/debian/patches/enable-modplug.patch b/debian/patches/enable-modplug.patch
new file mode 100644
index 0000000..3a218b4
--- /dev/null
+++ b/debian/patches/enable-modplug.patch
@@ -0,0 +1,59 @@
+Enable modplug. Manually check for library and header to avoid conflict
+with sndfile.h.
+==========================================================================
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -158,7 +158,7 @@
+ OPTION(FLAC       "FLAC support (for FLAC and Ogg FLAC)" ON)
+ OPTION(MPG123     "MPG123 support (for MP1/MP2/MP3)" ON)
+ OPTION(DUMB       "DUMB support (for IT/XM/S3M/MOD)" ON)
+-OPTION(MODPLUG    "ModPlug support (for IT/XM/S3M/MOD)" OFF)
++OPTION(MODPLUG    "ModPlug support (for IT/XM/S3M/MOD)" ON)
+ OPTION(FLUIDSYNTH "FluidSynth support (for MID)" ON)
+ 
+ IF(WIN32)
+@@ -344,23 +344,16 @@
+ 
+ # ModPlug support
+ IF(MODPLUG)
+-    PKG_CHECK_MODULES(MODPLUG libmodplug)
+-    IF(NOT MODPLUG_FOUND)
+-        CHECK_INCLUDE_FILE(modplug.h HAVE_MODPLUG_H)
+-        IF(HAVE_MODPLUG_H)
+-            CHECK_SHARED_LIBRARY_EXISTS(modplug ModPlug_Load "" HAVE_LIBMODPLUG)
+-            IF(DYNLOAD OR HAVE_LIBMODPLUG)
+-                SET(HAS_MODPLUG 1)
+-                IF(HAVE_LIBMODPLUG)
+-                    SET(MODPLUG_LIBRARIES "modplug")
+-                ENDIF(HAVE_LIBMODPLUG)
+-            ENDIF(DYNLOAD OR HAVE_LIBMODPLUG)
+-        ENDIF(HAVE_MODPLUG_H)
+-    ELSE(NOT MODPLUG_FOUND)
+-        SET(HAS_MODPLUG 1)
+-        INCLUDE_DIRECTORIES(${MODPLUG_INCLUDE_DIRS})
+-        LINK_DIRECTORIES(${MODPLUG_LIBRARY_DIRS})
+-    ENDIF(NOT MODPLUG_FOUND)
++    CHECK_INCLUDE_FILE(libmodplug/modplug.h HAVE_MODPLUG_H)
++    IF(HAVE_MODPLUG_H)
++        CHECK_SHARED_LIBRARY_EXISTS(modplug ModPlug_Load "" HAVE_LIBMODPLUG)
++        IF(DYNLOAD OR HAVE_LIBMODPLUG)
++            SET(HAS_MODPLUG 1)
++            IF(HAVE_LIBMODPLUG)
++                SET(MODPLUG_LIBRARIES "modplug")
++            ENDIF(HAVE_LIBMODPLUG)
++        ENDIF(DYNLOAD OR HAVE_LIBMODPLUG)
++    ENDIF(HAVE_MODPLUG_H)
+ ELSE(MODPLUG)
+     SET(MODPLUG_LIBRARIES "")
+ ENDIF(MODPLUG)
+--- a/src/codec_modplug.cpp
++++ b/src/codec_modplug.cpp
+@@ -30,7 +30,7 @@
+ 
+ #include <istream>
+ 
+-#include <modplug.h>
++#include <libmodplug/modplug.h>
+ 
+ 
+ #ifdef _WIN32
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..59c901d
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+enable-modplug.patch

-- 
ALURE packaging