rpms/openal/FC-4 openal-no-undefined.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 openal-pkgconfig.patch, 1.4, 1.5 openal.spec, 1.16, 1.17 sources, 1.6, 1.7

[Andreas Bierfert (awjb)]

Author: awjb

Update of /cvs/extras/rpms/openal/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6352/FC-4

Modified Files:
	.cvsignore openal-pkgconfig.patch openal.spec sources 
Added Files:
	openal-no-undefined.patch 
Log Message:
- avoid soname change
- fix pthread stuff


openal-no-undefined.patch:

--- NEW FILE openal-no-undefined.patch ---
--- src/Makefile.am.orig	2006-02-27 11:51:57.000000000 +0100
+++ src/Makefile.am	2006-02-27 11:53:13.000000000 +0100
@@ -214,9 +214,9 @@
 libopenal_la_CFLAGS = $(WARNINGCFLAGS) $(OPTIMIZATIONCFLAGS) $(FEATURECFLAGS)
 
 # The -no-undefined flag is neccessary for building DLLs on Windows.
-libopenal_la_LDFLAGS = -no-undefined $(PROFILINGLDFLAGS)
+libopenal_la_LDFLAGS = -no-undefined -Wl,--no-undefined $(PROFILINGLDFLAGS)
 
 # We use sin and friends, so we might need -lm, autoconf takes care of this.
-libopenal_la_LIBADD = $(LIBM) $(asm_ldadd)
+libopenal_la_LIBADD = $(LIBM) $(asm_ldadd) -lpthread
 
 SUBDIRS = $(X86_SUBDIR)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/openal/FC-4/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	26 Feb 2006 09:40:55 -0000	1.6
+++ .cvsignore	27 Feb 2006 11:35:14 -0000	1.7
@@ -1 +1 @@
-openal-cvs-20060226.tar.bz2
+openal-cvs-20060204.tar.bz2

openal-pkgconfig.patch:

Index: openal-pkgconfig.patch
===================================================================
RCS file: /cvs/extras/rpms/openal/FC-4/openal-pkgconfig.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- openal-pkgconfig.patch	26 Feb 2006 09:40:55 -0000	1.4
+++ openal-pkgconfig.patch	27 Feb 2006 11:35:14 -0000	1.5
@@ -1,26 +1,38 @@
---- admin/pkgconfig/openal.pc.in.orig	2006-02-05 01:54:57.000000000 +0100
-+++ admin/pkgconfig/openal.pc.in	2006-02-05 01:55:18.000000000 +0100
-@@ -5,8 +5,8 @@
- 
- Name: OpenAL
- Description:  OpenAL is a cross-platform 3D audio API.
--Requires: @requirements@
-+Requires:
- Version: @PACKAGE_VERSION@
--Libs: -L${libdir} -lopenal
-+Libs: -L${libdir} -lopenal -lpthread
- Cflags: -I${includedir}
- 
---- admin/pkgconfig/openal-config.in.orig	2006-02-26 10:25:37.000000000 +0100
-+++ admin/pkgconfig/openal-config.in	2006-02-26 10:27:28.000000000 +0100
-@@ -6,8 +6,8 @@
+--- admin/pkgconfig/openal-config.in.orig	2006-02-27 11:36:14.000000000 +0100
++++ admin/pkgconfig/openal-config.in	2006-02-27 11:36:55.000000000 +0100
+@@ -6,8 +6,6 @@
  includedir="@includedir@"
  libdir="@libdir@"
  PACKAGE_VERSION="@PACKAGE_VERSION@"
--# PTHREAD_CFLAGS="@PTHREAD_CFLAGS@"
--# PTHREAD_LIBS="@PTHREAD_LIBS@"
-+PTHREAD_CFLAGS="@PTHREAD_CFLAGS@"
-+PTHREAD_LIBS="@PTHREAD_LIBS@"
+-PTHREAD_CFLAGS="@PTHREAD_CFLAGS@"
+-PTHREAD_LIBS="@PTHREAD_LIBS@"
  
  openal_dynamic_ldflags="-lopenal"
  # TODO: configure should provide the following...
+@@ -158,7 +156,7 @@
+   else
+     incpath="-I${includedir}"
+   fi
+-  echo "${PTHREAD_CFLAGS} ${incpath}"
++  echo "${incpath}"
+ fi
+ 
+ if test "$echo_libs" = "yes"; then
+@@ -172,5 +170,5 @@
+   else
+      ldflags="${openal_dynamic_ldflags}"
+   fi
+-  echo "${libpathflag} ${ldflags} ${PTHREAD_LIBS}"
++  echo "${libpathflag} ${ldflags}"
+ fi
+--- admin/pkgconfig/openal.pc.in.orig	2006-02-27 11:36:18.000000000 +0100
++++ admin/pkgconfig/openal.pc.in	2006-02-27 11:37:30.000000000 +0100
+@@ -5,7 +5,7 @@
+ 
+ Name: OpenAL
+ Description:  OpenAL is a cross-platform 3D audio API.
+-Requires: @requirements@
++Requires: 
+ Version: @PACKAGE_VERSION@
+ Libs: -L${libdir} -lopenal
+ Cflags: -I${includedir}


Index: openal.spec
===================================================================
RCS file: /cvs/extras/rpms/openal/FC-4/openal.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- openal.spec	26 Feb 2006 09:40:55 -0000	1.16
+++ openal.spec	27 Feb 2006 11:35:14 -0000	1.17
@@ -1,6 +1,6 @@
 Name:           openal
 Version:        0.0.9
-Release:        0.3.20060226cvs%{?dist}
+Release:        0.4.20060204cvs%{?dist}
 Summary:        Open Audio Library
 
 Group:          System Environment/Libraries
@@ -10,10 +10,11 @@
 #cvs -d:pserver:guest at opensource.creative.com:/usr/local/cvs-repository login
 #(use password "guest")
 #cvs -d:pserver:guest at opensource.creative.com:/usr/local/cvs-repository co MODULE 
-Source0:        openal-cvs-20060226.tar.bz2
+Source0:        openal-cvs-20060204.tar.bz2
 Source1:        openalrc
 Patch0:         openal-arch.patch
-Patch1:         openal-pkgconfig.patch
+Patch1:         openal-no-undefined.patch
+Patch2:         openal-pkgconfig.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  alsa-lib-devel
@@ -50,9 +51,11 @@
 
 %prep
 %setup -q -n portable
+
+%patch1
+%patch2
 ./autogen.sh
 %patch0 -p1
-%patch1
 
 %build
 %configure --enable-arts                   \
@@ -98,6 +101,11 @@
 
 
 %changelog
+* Mon Feb 27 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.0.9-0.4.20060204
+- revert back to old cvs snapshot to avoid soname change for now...
+- fix openal-config and pkg-config in a better fashion
+
 * Sun Feb 26 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.0.9-0.3.20060226
 - fix #181989


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/openal/FC-4/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	26 Feb 2006 09:40:55 -0000	1.6
+++ sources	27 Feb 2006 11:35:14 -0000	1.7
@@ -1 +1 @@
-fd84c926f0ed419f653ddd95f7711fef  openal-cvs-20060226.tar.bz2
+bce099b3f19125bb31f9d4363149e773  openal-cvs-20060204.tar.bz2