rpms/openalpp/devel openalpp-20060405-link.patch,NONE,1.1

[Christopher Stone (xulchris)]

Author: xulchris

Update of /cvs/extras/rpms/openalpp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32227

Added Files:
	openalpp-20060405-link.patch 
Log Message:
add new patch

openalpp-20060405-link.patch:

--- NEW FILE openalpp-20060405-link.patch ---
Index: configure.in
===================================================================
RCS file: /cvs/underware/openalpp/configure.in,v
retrieving revision 1.11
diff -b -B -u -r1.11 configure.in
--- configure.in	7 Apr 2006 17:16:29 -0000	1.11
+++ configure.in	12 Jul 2006 09:30:47 -0000
@@ -70,6 +70,11 @@
 AC_CHECK_LIB(openal,main)
 AC_CHECK_LIB(alut,main)
 
+if test "$ac_cv_lib_alut_main" = "yes" ; then
+   ALUT_LIB=-lalut
+fi
+AC_SUBST(ALUT_LIB)
+
 #
 # Was introduced sometime in 2005, does not show pre-2005
 # #define ALC_STEREO_SOURCES                       0x1011
@@ -98,6 +103,8 @@
                [OPENAL_VERSION=2005],
                [OPENAL_VERSION=2006])
 fi
+
+PKG_CHECK_MODULES(OPENTHREADS, openthreads >= 0.9.8, , [AC_MSG_ERROR(openthreads is a mandatory library)])
 
 AC_DEFINE_UNQUOTED(OPENAL_VERSION, [$OPENAL_VERSION], [OpenAL CVS version (rough estimate)])
 
Index: openalpp.pc.in
===================================================================
RCS file: /cvs/underware/openalpp/openalpp.pc.in,v
retrieving revision 1.3
diff -b -B -u -r1.3 openalpp.pc.in
--- openalpp.pc.in	28 Oct 2004 15:20:15 -0000	1.3
+++ openalpp.pc.in	12 Jul 2006 09:30:47 -0000
@@ -7,5 +7,5 @@
 Description: OpenAL C++ Abstraction Layer
 Version: @VERSION@
 Requires: openthreads, vorbis, vorbisfile
-Libs: -L${libdir} -lopenalpp -lopenal
+Libs: -L${libdir} -lopenalpp -lopenal @ALUT_LIB@
 Cflags: -I${includedir} 
Index: src/Makefile.am
===================================================================
RCS file: /cvs/underware/openalpp/src/Makefile.am,v
retrieving revision 1.6
diff -b -B -u -r1.6 Makefile.am
--- src/Makefile.am	21 Mar 2006 15:32:15 -0000	1.6
+++ src/Makefile.am	12 Jul 2006 09:30:47 -0000
@@ -5,7 +5,7 @@
 	openalpp.cpp \
 	nostreaming.cpp
 
-INCLUDES = -I$(top_srcdir)/include
+INCLUDES = -I$(top_srcdir)/include @OPENTHREADS_CFLAGS@
 
 basicfiles = \
     audioenvironment.cpp \
@@ -38,8 +38,16 @@
 endif
 #streamfiles=nostreaming.cpp noinputdevice.cpp nofilestream.cpp
 
+if WITH_PORTAUDIO
+portaudiolibs = -lportaudio
+endif
+if WITH_OGGVORBIS
+ogglibs = -lvorbisfile -lvorbis -logg
+endif
+
 libopenalpp_la_SOURCES = $(basicfiles) $(streamfiles) $(devicefiles) $(oggfiles)
 libopenalpp_la_LDFLAGS = -version-info 1:0:0
+libopenalpp_la_LIBADD = @OPENTHREADS_LIBS@ $(portaudiolibs) $(ogglibs)
 
 lib_LTLIBRARIES = libopenalpp.la
 
Index: src/sourcebase.cpp
===================================================================
RCS file: /cvs/underware/openalpp/src/sourcebase.cpp,v
retrieving revision 1.1.1.3
diff -b -B -u -r1.1.1.3 sourcebase.cpp
--- src/sourcebase.cpp	7 Sep 2005 12:21:42 -0000	1.1.1.3
+++ src/sourcebase.cpp	12 Jul 2006 09:30:47 -0000
@@ -168,7 +168,7 @@
   ALint state;
   alGetSourceiv(sourcename_,AL_SOURCE_STATE,&state);
 
-  if (ALenum errorCode = alGetError() != AL_FALSE)
+  if (alGetError() != AL_FALSE)
   {
       /** error occurs here when switching files
       fprintf(stderr, "SourceBase::getState() - Warning - Error getting state (%d)\n",
Index: tests/Makefile.am
===================================================================
RCS file: /cvs/underware/openalpp/tests/Makefile.am,v
retrieving revision 1.7
diff -b -B -u -r1.7 Makefile.am
--- tests/Makefile.am	11 Jan 2006 16:49:21 -0000	1.7
+++ tests/Makefile.am	12 Jul 2006 09:30:47 -0000
@@ -1,6 +1,6 @@
 EXTRA_DIST = a.wav bee.wav high-e.wav low-e.wav thx.ogg CMakeLists.txt teststream.cpp testsend.cpp one_ten_b.ogg test1.ogg test2.ogg test3.ogg
 
-INCLUDES = -I$(top_srcdir)/include
+INCLUDES = -I$(top_srcdir)/include @OPENTHREADS_CFLAGS@
 
 if WITH_PORTAUDIO
 portaudiolibs = -lportaudio
@@ -10,7 +10,7 @@
 endif
 
 
-LDADD = ../src/libopenalpp.la -lopenal $(portaudiolibs) $(ogglibs) -lOpenThreads
+LDADD = ../src/libopenalpp.la -lopenal $(portaudiolibs) $(ogglibs) @OPENTHREADS_LIBS@
 
 
 noinst_PROGRAMS = testfstream multiple testmic simple moving