Package: stratagus
Version: 2.1-8
Severity: wishlist
Tags: patch

Hi!

Please could you enable support for FLAC and CD audio tracks?  See attached
patch.

Note the changes in upstream code.  configure.in didn't honor
--with-cdaudio=sdlcd flag for a pair of trivial reasons so it needed fixing.

-- System Information:
Debian Release: testing/unstable
  APT prefers unstable
  APT policy: (500, 'unstable')
Architecture: i386 (i686)
Shell:  /bin/sh linked to /bin/bash
Kernel: Linux 2.6.11-1-k7
Locale: LANG=en_US, LC_CTYPE=en_US (charmap=ANSI_X3.4-1968) (ignored: LC_ALL 
set to C)

Versions of packages stratagus depends on:
ii  bos [stratagu 1.1-3                      Invasion: Battle of Survival data 
ii  libbz2-1.0    1.0.2-8                    high-quality block-sorting file co
ii  libc6         2.3.5-4                    GNU C Library: Shared libraries an
ii  libflac7      1.1.2-3                    Free Lossless Audio Codec - runtim
ii  liblua50      5.0.2-5                    Main interpreter library for the L
ii  liblualib50   5.0.2-5                    Extension library for the Lua 5.0 
ii  libogg0       1.1.2-1                    Ogg Bitstream Library
ii  libpng12-0    1.2.8rel-1                 PNG library - runtime
ii  libsdl1.2debi 1.2.7+1.2.8cvs20041007-5.3 Simple DirectMedia Layer
ii  libvorbis0a   1.1.0-1                    The Vorbis General Audio Compressi
ii  libvorbisfile 1.1.0-1                    The Vorbis General Audio Compressi
ii  libx11-6      6.8.2.dfsg.1-5             X Window System protocol client li
ii  xlibs         6.8.2.dfsg.1-5             X Window System client libraries m
ii  zlib1g        1:1.2.3-4                  compression library - runtime

stratagus recommends no packages.

-- no debconf information
diff -ur stratagus-2.1.old/configure stratagus-2.1/configure
--- stratagus-2.1.old/configure 2005-09-08 14:56:31.000000000 +0200
+++ stratagus-2.1/configure     2005-09-08 15:07:11.000000000 +0200
@@ -5481,8 +5481,8 @@
   withval="$with_cdaudio"
   CDAUDIO="$with_cdaudio"
 fi;
-if test "$CDAUDIO" = "sdl"; then
-    CDAUDIO_CFLAGS="`$SDLCONFIG --cflags`"
+if test "$CDAUDIO" = "sdlcd"; then
+    CDAUDIO_CFLAGS="`$SDLCONFIG --cflags` -DUSE_SDLCD"
     CDAUDIO_LIBS=""
 elif test "$CDAUDIO" = "cdda"; then
     CDAUDIO_CFLAGS="-DUSE_CDDA"
diff -ur stratagus-2.1.old/configure.in stratagus-2.1/configure.in
--- stratagus-2.1.old/configure.in      2005-09-08 14:56:31.000000000 +0200
+++ stratagus-2.1/configure.in  2005-09-08 15:07:17.000000000 +0200
@@ -225,8 +225,8 @@
 AC_ARG_WITH(cdaudio,
     [  --with-cdaudio=libcda,sdlcd,cdda,no
                          [Enable CD Audio support (default: no)]], 
CDAUDIO="$with_cdaudio")
-if test "$CDAUDIO" = "sdl"; then
-    CDAUDIO_CFLAGS="`$SDLCONFIG --cflags`"
+if test "$CDAUDIO" = "sdlcd"; then
+    CDAUDIO_CFLAGS="`$SDLCONFIG --cflags` -DUSE_SDLCD"
     CDAUDIO_LIBS=""
 elif test "$CDAUDIO" = "cdda"; then
     CDAUDIO_CFLAGS="-DUSE_CDDA"
diff -ur stratagus-2.1.old/debian/control stratagus-2.1/debian/control
--- stratagus-2.1.old/debian/control    2005-09-08 14:56:31.000000000 +0200
+++ stratagus-2.1/debian/control        2005-09-08 15:03:00.000000000 +0200
@@ -2,7 +2,7 @@
 Section: games
 Priority: optional
 Maintainer: David Martínez Moreno <[EMAIL PROTECTED]>
-Build-Depends: libglib1.2-dev, xlibs-dev (>> 4.1.0), libsdl1.2-dev (>> 1.2.2), 
libvorbis-dev, libpng12-dev (>= 1.2.5), libbz2-dev, liblualib50-dev, debhelper 
(>> 4.0.0)
+Build-Depends: libglib1.2-dev, xlibs-dev (>> 4.1.0), libsdl1.2-dev (>> 1.2.2), 
libvorbis-dev, libpng12-dev (>= 1.2.5), libbz2-dev, liblualib50-dev, debhelper 
(>> 4.0.0), libflac-dev
 Standards-Version: 3.6.1
 
 Package: stratagus
diff -ur stratagus-2.1.old/debian/rules stratagus-2.1/debian/rules
--- stratagus-2.1.old/debian/rules      2005-09-08 14:56:31.000000000 +0200
+++ stratagus-2.1/debian/rules  2005-09-08 15:44:47.000000000 +0200
@@ -6,6 +6,8 @@
 # Do you want verbosity...? Uncomment this.
 #export DH_VERBOSE=1
 
+CONFIGURE_FLAGS = --with-flac --with-cdaudio=sdlcd
+
 # We have to honor DEB_BUILD...
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 CONFIGURE_FLAGS += --enable-profile

Reply via email to