From: Jakub Bogusz Date: Tue, 18 Feb 2003 22:38:33 +0000 (+0000) Subject: - Loki is dead, but OpenAL lives - updated to todays CVS snapshot X-Git-Tag: auto/ac/OpenAL-0_0_6-1_20030806_0_10~13 X-Git-Url: https://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=9a996c84889a8cabbf5ba3fa887908a1627e4562;hp=68071dbf7d340a56a04a7bde6737c94b15b77679;p=packages%2FOpenAL.git - Loki is dead, but OpenAL lives - updated to todays CVS snapshot - updated prefix,acfix,info patches, removed obsolete build patch Changed files: OpenAL-acfix.patch -> 1.2 OpenAL-build.patch -> 1.2 OpenAL-info.patch -> 1.2 OpenAL-prefix.patch -> 1.3 OpenAL.spec -> 1.15 --- diff --git a/OpenAL-acfix.patch b/OpenAL-acfix.patch index 1c1d0c2..780e752 100644 --- a/OpenAL-acfix.patch +++ b/OpenAL-acfix.patch @@ -1,6 +1,6 @@ ---- tmp/openal/linux/configure.in.orig Fri Feb 14 20:52:54 2003 -+++ tmp/openal/linux/configure.in Fri Feb 14 20:59:11 2003 -@@ -75,23 +75,7 @@ +--- openal/linux/configure.in.orig Mon Jan 13 23:28:25 2003 ++++ openal/linux/configure.in Tue Feb 18 21:24:56 2003 +@@ -85,23 +85,7 @@ enable_paranoid_locks=no enable_empty_locks=no @@ -25,38 +25,38 @@ fi -@@ -229,7 +229,7 @@ +@@ -270,7 +254,7 @@ [ --enable-dmalloc enable DMALLOC support [default=no]], , enable_dmalloc=no) if test x$enable_dmalloc = xyes; then - AC_CHECK_HEADER(dmalloc.h, + AC_CHECK_HEADER(dmalloc.h,[ dnl header found - AC_DEFINE(DMALLOC) - AC_DEFINE(DMALLOC_FUNC_CHECK) -@@ -239,14 +239,14 @@ + AC_DEFINE(DMALLOC, 1, [undocumented]) + AC_DEFINE(DMALLOC_FUNC_CHECK, 1, [undocumented]) +@@ -280,14 +264,14 @@ REDUNDANT_DECLS_WARN=no, dnl header not found, check local/include dnl invalid cache -- AC_CHECK_HEADER(/usr/local/include/dmalloc.h, +- [AC_CHECK_HEADER(/usr/local/include/dmalloc.h, + AC_CHECK_HEADER(/usr/local/include/dmalloc.h,[ dnl header found in local/include - AC_DEFINE(DMALLOC) - AC_DEFINE(DMALLOC_FUNC_CHECK) + AC_DEFINE(DMALLOC, 1, [undocumented]) + AC_DEFINE(DMALLOC_FUNC_CHECK, 1, [undocumented]) INCLUDES="$CFLAGS -include \"/usr/local/include/dmalloc.h\"" LIBS="$LIBS -ldmallocth" SHOULD_USE_WERROR=no -- REDUNDANT_DECLS_WARN=no)) +- REDUNDANT_DECLS_WARN=no)]) + REDUNDANT_DECLS_WARN=no])]) fi dnl efence stuff -@@ -640,7 +640,7 @@ +@@ -685,7 +669,7 @@ if test x$enable_vorbis = xyes; then AC_CHECK_LIB(vorbisfile, ov_info, -- AC_DEFINE( VORBIS_SUPPORT ) -+ AC_DEFINE([VORBIS_SUPPORT]) +- AC_DEFINE( VORBIS_SUPPORT, 1, [undocumented] ) ++ AC_DEFINE([VORBIS_SUPPORT], 1, [undocumented] ) LIBS="$LIBS -lvorbis -lvorbisfile",, -lvorbis ) fi # enable_vorbis = no diff --git a/OpenAL-build.patch b/OpenAL-build.patch deleted file mode 100644 index 5dac076..0000000 --- a/OpenAL-build.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- linux/src/arch/alsa/alsa.c Fri Jan 26 19:04:33 2001 -+++ linux/src/arch/alsa/alsa.c.build Sun Aug 5 12:11:52 2001 -@@ -10,6 +10,8 @@ - #define _SVID_SOURCE - #endif /* _SVID_SOURCE */ - -+#include /*memset*/ -+ - #include "arch/interface/interface_sound.h" - #include "arch/alsa/alsa.h" - diff --git a/OpenAL-info.patch b/OpenAL-info.patch index ddc6db6..169087f 100644 --- a/OpenAL-info.patch +++ b/OpenAL-info.patch @@ -1,5 +1,5 @@ ---- tmp/openal/linux/doc/openal.texi.orig Sat Jan 27 01:04:32 2001 -+++ tmp/openal/linux/doc/openal.texi Fri Feb 14 22:01:25 2003 +--- openal/linux/doc/openal.texi.orig Sat Jan 27 01:04:32 2001 ++++ openal/linux/doc/openal.texi Fri Feb 14 22:01:25 2003 @@ -4,9 +4,9 @@ @ifinfo diff --git a/OpenAL-prefix.patch b/OpenAL-prefix.patch index 10bd35e..a383b3c 100644 --- a/OpenAL-prefix.patch +++ b/OpenAL-prefix.patch @@ -1,5 +1,5 @@ ---- tmp/openal/linux/Makefile.in.orig Fri Feb 14 21:50:11 2003 -+++ tmp/openal/linux/Makefile.in Fri Feb 14 21:53:11 2003 +--- openal/linux/Makefile.in.orig Fri Sep 6 00:54:36 2002 ++++ openal/linux/Makefile.in Tue Feb 18 21:22:22 2003 @@ -1,8 +1,10 @@ INSTALL=@INSTALL@ LN_S=@LN_S@ @@ -14,14 +14,14 @@ MAKE=@MAKE@ MAJOR_VERSION=@MAJOR_VERSION@ MINOR_VERSION=@MINOR_VERSION@ -@@ -43,8 +45,8 @@ +@@ -52,8 +54,8 @@ + install_minor_libs: + $(INSTALL) -d -m 755 $(DESTLIB) + $(INSTALL) -m 755 src/libopenal.$(SO_EXT).$(VERSION) $(DESTLIB) +- $(LN_S) -f $(DESTLIB)/libopenal.$(SO_EXT).$(VERSION) $(DESTLIB)/libopenal.$(SO_EXT).$(MAJOR_VERSION) +- $(LN_S) -f $(DESTLIB)/libopenal.$(SO_EXT).$(VERSION) $(DESTLIB)/libopenal.so ++ $(LN_S) -f libopenal.$(SO_EXT).$(VERSION) $(DESTLIB)/libopenal.$(SO_EXT).$(MAJOR_VERSION) ++ $(LN_S) -f libopenal.$(SO_EXT).$(VERSION) $(DESTLIB)/libopenal.so + + install_major_lib_only: $(INSTALL) -d -m 755 $(DESTLIB) - $(INSTALL) -m 755 src/libopenal.a $(DESTLIB) - $(INSTALL) -m 755 src/libopenal.so.$(VERSION) $(DESTLIB) -- $(LN_S) -f $(DESTLIB)/libopenal.so.$(VERSION) $(DESTLIB)/libopenal.so.$(MAJOR_VERSION) -- $(LN_S) -f $(DESTLIB)/libopenal.so.$(VERSION) $(DESTLIB)/libopenal.so -+ $(LN_S) -f libopenal.so.$(VERSION) $(DESTLIB)/libopenal.so.$(MAJOR_VERSION) -+ $(LN_S) -f libopenal.so.$(VERSION) $(DESTLIB)/libopenal.so - $(INSTALL) -m 444 ../include/AL/al.h $(DESTINC)/AL - $(INSTALL) -m 444 ../include/AL/alc.h $(DESTINC)/AL - $(INSTALL) -m 444 ../include/AL/alu.h $(DESTINC)/AL diff --git a/OpenAL.spec b/OpenAL.spec index 29a78ec..4f14559 100644 --- a/OpenAL.spec +++ b/OpenAL.spec @@ -14,17 +14,16 @@ Summary: Open Audio Library Summary(pl): Otwarta Biblioteka D¼wiêku Name: OpenAL Version: 0.0.6 -Release: 1 +%define snap 20030218 +Release: 1.%{snap}.1 License: LGPL Group: Libraries -Vendor: Loki Entertainment Software - http://www.lokigames.com/ -# This is tarball taken directly form Mandrake Cooker .src.rpm -Source0: %{name}-linuxonly-20010805.tar.bz2 -# Those patches came from Mandrake Cooker (only changed names) +# from CVS :pserver:guest@opensource.creative.com:/usr/local/cvs-repository /openal +# (without all Win and Mac stuff and demos) +Source0: %{name}-linuxonly-%{snap}.tar.bz2 Patch0: %{name}-prefix.patch -Patch1: %{name}-build.patch -Patch2: %{name}-acfix.patch -Patch3: %{name}-info.patch +Patch1: %{name}-acfix.patch +Patch2: %{name}-info.patch URL: http://www.openal.com/ BuildRequires: SDL-devel %{!?_without_alsa:BuildRequires: alsa-lib-devel} @@ -81,17 +80,15 @@ OpenAL static library. Biblioteka OpenAL do statycznego linkowania. %prep -%setup -q -n tmp +%setup -q -n openal %patch0 -p1 +%patch1 -p1 %patch2 -p1 -%patch3 -p1 -cd openal -%patch1 -p0 echo 'AC_DEFUN([AC_HAS_MMX],[$%{?_with_mmx:1}%{!?_with_mmx:2}])' >> linux/acinclude.m4 %build -cd openal/linux +cd linux %{__aclocal} %{__autoconf} %{__autoheader} @@ -114,7 +111,7 @@ cd ../docs rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT%{_infodir} -cd openal/linux +cd linux %{__make} install \ DESTDIR=$RPM_BUILD_ROOT @@ -134,12 +131,12 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(644,root,root,755) -%doc openal/linux/{CREDITS,ChangeLog,NOTES,TODO} +%doc linux/{CREDITS,ChangeLog,NOTES,TODO} %attr(755,root,root) %{_libdir}/lib*.so.*.* %files devel %defattr(644,root,root,755) -%doc openal/linux/doc/LOKI* %{!?_without_doc:openal/docs/oalspecs-full} +%doc linux/doc/LOKI* %{!?_without_doc:docs/oalspecs-full} %attr(755,root,root) %{_libdir}/lib*.so %{_includedir}/AL %{_infodir}/openal.info*