The following commit has been merged in the master branch:
commit fc9020facdfc5e4178da4846bf1cf7ac94f95fe8
Author: Stephen M. Webb <[email protected]>
Date: Wed Feb 8 13:07:04 2012 -0500
refreshed debian/patches/01-openal-pkgconfig.diff
diff --git a/debian/changelog b/debian/changelog
index 4c7005f..f95a8e8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ scorched3d (43.3+dfsg-1) precise; urgency=low
* new upstream release
* added myself as an uploader
+ * refreshed debian/patches/01-openal-pkgconfig.diff
- -- Stephen M. Webb <[email protected]> Wed, 08 Feb 2012 12:53:36
-0500
+ -- Stephen M. Webb <[email protected]> Wed, 08 Feb 2012 13:06:12
-0500
scorched3d (43.2a.dfsg-6) unstable; urgency=low
diff --git a/debian/patches/01-openal-pkgconfig.diff
b/debian/patches/01-openal-pkgconfig.diff
index a4fba24..3cff6ac 100644
--- a/debian/patches/01-openal-pkgconfig.diff
+++ b/debian/patches/01-openal-pkgconfig.diff
@@ -1,8 +1,9 @@
-Index: scorched3d/configure-al.m4
-===================================================================
---- scorched3d.orig/configure-al.m4 2010-07-28 15:46:26.000000000 -0400
-+++ scorched3d/configure-al.m4 2010-07-28 16:36:01.081996663 -0400
-@@ -1,109 +1,8 @@
+Description: make use of pkg-config instead of openal-config
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=533973
+
+--- a/configure-al.m4
++++ b/configure-al.m4
+@@ -1,118 +1,8 @@
dnl Checking for OpenAL
-AC_ARG_WITH([openal-static],
- AC_HELP_STRING([--with-openal-static],
@@ -14,24 +15,33 @@ Index: scorched3d/configure-al.m4
-AC_MSG_CHECKING(for OpenAL support)
-AC_PATH_PROG(OPENAL_CONFIG, openal-config, no)
-if test x$OPENAL_CONFIG = xno; then
-- echo "*** The openal-config script installed by OpenAL could not be
found"
-- echo "*** Make sure openal-config is in your path, or set the
OPENAL_CONFIG"
-- echo "*** environment variable to the full path to openal-config."
--
-- AC_MSG_ERROR([*** Can't find the openal library. Try:
http://www.openal.org/])
--else
--
-- if test x"$use_static_openal" = x"yes"; then
-- AL_LIBS="/usr/local/lib/libopenal.a"
+- echo "The openal-config script installed by OpenAL could not be found"
+- echo "Make sure openal-config is in your path, or set the OPENAL_CONFIG"
+- echo "environment variable to the full path to openal-config."
+- echo "Trying pkg-config instead."
+-
+- AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+- if test x$PKG_CONFIG = xno; then
+- echo "The pkg-config script could not be found"
+- echo "Make sure pkg-config is in your path, or set the
PKG_CONFIG"
+- echo "environment variable to the full path to pkg-config."
+-
+- AC_MSG_ERROR([*** Can't find the openal library. Try:
http://www.openal.org/])
- else
-- AL_LIBS="`$OPENAL_CONFIG --libs`"
+- OPENAL_CONFIG="$PKG_CONFIG openal";
- fi
+-fi
-
-- AL_CFLAGS="`$OPENAL_CONFIG --cflags`"
--
-- AC_MSG_RESULT(yes)
+-if test x"$use_static_openal" = x"yes"; then
+- AL_LIBS="/usr/local/lib/libopenal.a"
+-else
+- AL_LIBS="`$OPENAL_CONFIG --libs`"
-fi
-
+-AL_CFLAGS="`$OPENAL_CONFIG --cflags`"
+-
+-AC_MSG_RESULT(yes)
+-
-AC_MSG_CHECKING(for Freealut support)
-AC_PATH_PROG(FREEALUT_CONFIG, freealut-config, no)
-if test x$FREEALUT_CONFIG = xno; then
--
Packaging for scorched3d
_______________________________________________
Pkg-games-commits mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
