- updated to 1.3.1

- removed obsolete libtool patch

Changed files:
    crossmingw32-libvorbis-libtool.patch -> 1.2
    crossmingw32-libvorbis.spec -> 1.7
    libvorbis-ac_fixes.patch -> 1.4

diff --git a/crossmingw32-libvorbis-libtool.patch b/crossmingw32-libvorbis-libtool.patch
deleted file mode 100644 (file)
index 16d1c39..0000000
--- a/crossmingw32-libvorbis-libtool.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- libvorbis-1.2.0/lib/Makefile.am.orig       2007-08-05 15:27:50.470110000 +0200
-+++ libvorbis-1.2.0/lib/Makefile.am    2007-08-05 15:31:12.201606656 +0200
-@@ -20,11 +20,11 @@
- 
- libvorbisfile_la_SOURCES = vorbisfile.c
- libvorbisfile_la_LDFLAGS = -no-undefined -version-info @VF_LIB_CURRENT@:@VF_LIB_REVISION@:@VF_LIB_AGE@
--libvorbisfile_la_LIBADD = libvorbis.la
-+libvorbisfile_la_LIBADD = libvorbis.la @OGG_LIBS@ @VORBIS_LIBS@
- 
- libvorbisenc_la_SOURCES = vorbisenc.c 
- libvorbisenc_la_LDFLAGS = -no-undefined -version-info @VE_LIB_CURRENT@:@VE_LIB_REVISION@:@VE_LIB_AGE@
--libvorbisenc_la_LIBADD = libvorbis.la
-+libvorbisenc_la_LIBADD = libvorbis.la @OGG_LIBS@ @VORBIS_LIBS@
- 
- EXTRA_PROGRAMS = barkmel tone psytune
- CLEANFILES = $(EXTRA_PROGRAMS)

diff --git a/crossmingw32-libvorbis.spec b/crossmingw32-libvorbis.spec
index ed2b8ab42865c0c198e416242311d6fa0818bf02..932a2057eebe6d0a95a56d145be0c44f26e32c87 100644 (file)
--- a/crossmingw32-libvorbis.spec
+++ b/crossmingw32-libvorbis.spec
@@ -2,21 +2,20 @@
 Summary:       The Vorbis General Audio Compression Codec - Mingw32 cross version
 Summary(pl.UTF-8):     Kodek kompresji audio - Vorbis - wersja skrośna dla Mingw32
 Name:          crossmingw32-%{realname}
-Version:       1.2.0
+Version:       1.3.1
 Release:       1
 License:       BSD
 Group:         Libraries
 Source0:       http://downloads.xiph.org/releases/vorbis/%{realname}-%{version}.tar.bz2
-# Source0-md5: 7c6e409d7aa1fa8a5481dea571d5bde0
+# Source0-md5: 90b1eb86e6d57694ffdfc2e4d8c7a64e
 Patch0:                %{realname}-ac_fixes.patch
 Patch1:                %{realname}-make.patch
-Patch2:                %{name}-libtool.patch
 URL:           http://www.vorbis.com/
-BuildRequires: crossmingw32-gcc
-BuildRequires: crossmingw32-libogg
+BuildRequires: crossmingw32-gcc >= 3.0
+BuildRequires: crossmingw32-libogg >= 1.0
 BuildRequires: crossmingw32-w32api
 BuildRequires: pkgconfig >= 1:0.15
-Requires:      crossmingw32-libogg
+Requires:      crossmingw32-libogg >= 1.0
 Requires:      crossmingw32-runtime
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -33,9 +32,12 @@ BuildRoot:   %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define                __cc                    %{target}-gcc
 %define                __cxx                   %{target}-g++
 
-%ifarch alpha sparc sparc64 sparcv9
+%ifnarch %{ix86}
+# arch-specific flags (like alpha's -mieee) are not valid for i386 gcc
 %define                optflags        -O2
 %endif
+# -z options are invalid for mingw linker
+%define                filterout_ld    -Wl,-z,.*
 
 %description
 Ogg Vorbis is a fully open, non-proprietary, patent-and-royalty-free,
@@ -67,7 +69,7 @@ Statyczna biblioteka libvorbis (wersja skrośna mingw32).
 Summary:       DLL libvorbis library for Windows
 Summary(pl.UTF-8):     Biblioteka DLL libvorbis dla Windows
 Group:         Applications/Emulators
-Requires:      crossmingw32-libogg-dll
+Requires:      crossmingw32-libogg-dll >= 1.0
 Requires:      wine
 
 %description dll
@@ -80,12 +82,11 @@ Biblioteka DLL libvorbis dla Windows.
 %setup -q -n %{realname}-%{version}
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 %build
 export PKG_CONFIG_LIBDIR=%{_prefix}/lib/pkgconfig
 %{__libtoolize}
-%{__aclocal}
+%{__aclocal} -I m4
 %{__autoconf}
 %{__autoheader}
 %{__automake}
@@ -110,7 +111,7 @@ mv -f $RPM_BUILD_ROOT%{_prefix}/bin/*.dll $RPM_BUILD_ROOT%{_dlldir}
 %{target}-strip -g -R.comment -R.note $RPM_BUILD_ROOT%{_libdir}/*.a
 %endif
 
-rm -rf $RPM_BUILD_ROOT%{_datadir}/{aclocal,doc}
+%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/{aclocal,doc}
 
 %clean
 rm -rf $RPM_BUILD_ROOT

diff --git a/libvorbis-ac_fixes.patch b/libvorbis-ac_fixes.patch
index d060a79b981b7a71eabc8886a73a1a9a930eec9a..4ee2f82b0faa73a7fed72722e8d97067220515de 100644 (file)
--- a/libvorbis-ac_fixes.patch
+++ b/libvorbis-ac_fixes.patch
@@ -1,26 +1,34 @@
-diff -urN libvorbis-1.0rc1.org/configure.in libvorbis-1.0rc1/configure.in
---- libvorbis-1.0rc1.org/configure.in  Wed Jun 27 12:15:22 2001
-+++ libvorbis-1.0rc1/configure.in      Wed Jun 27 12:16:11 2001
-@@ -76,9 +76,9 @@
+diff -urN libvorbis-1.2.2/configure.ac libvorbis-1.2.2.new/configure.ac
+--- libvorbis-1.2.2/configure.ac       2009-06-24 17:23:47.000000000 +0200
++++ libvorbis-1.2.2.new/configure.ac   2009-07-01 22:02:18.620749535 +0200
+@@ -109,9 +109,9 @@
        case $host in 
        *86-*-linux*)
-               DEBUG="-g -Wall -W -D_REENTRANT -D__NO_MATH_INLINES -fsigned-char"
+               DEBUG="-g -Wall -Wextra -D_REENTRANT -D__NO_MATH_INLINES -fsigned-char"
 -              CFLAGS="-O20 -ffast-math -mno-ieee-fp -D_REENTRANT -fsigned-char"
 +              CFLAGS="$CFLAGS -ffast-math -mno-ieee-fp -D_REENTRANT -fsigned-char"
- #                     PROFILE="-Wall -W -pg -g -O20 -ffast-math -D_REENTRANT -fsigned-char -fno-inline -static"
--              PROFILE="-Wall -W -pg -g -O20 -ffast-math -mno-ieee-fp -D_REENTRANT -fsigned-char -fno-inline"
-+              PROFILE="-Wall -W -pg -g $CFLAGS -ffast-math -mno-ieee-fp -D_REENTRANT -fsigned-char -fno-inline"
+ #                     PROFILE="-Wall -Wextra -pg -g -O20 -ffast-math -D_REENTRANT -fsigned-char -fno-inline -static"
+-              PROFILE="-Wall -Wextra -pg -g -O20 -ffast-math -mno-ieee-fp -D_REENTRANT -fsigned-char -fno-inline"
++              PROFILE="-Wall -Wextra -pg -g $CFLAGS -ffast-math -mno-ieee-fp -D_REENTRANT -fsigned-char -fno-inline"
  
                # glibc < 2.1.3 has a serious FP bug in the math inline header
                # that will cripple Vorbis.  Look to see if the magic FP stack
-@@ -121,8 +121,8 @@
+@@ -153,13 +153,13 @@
+               PROFILE=${PROFILE}" -D__NO_MATH_INLINES"
                fi;;
+       powerpc-*-linux*)
+-              DEBUG="-g -Wall -Wextra -D_REENTRANT -D__NO_MATH_INLINES"
+-              CFLAGS="-O3 -Wall -Wextra -ffast-math -mfused-madd -mcpu=750 -D_REENTRANT"
+-              PROFILE="-pg -g -O3 -ffast-math -mfused-madd -mcpu=750 -D_REENTRANT";;
++              DEBUG="-g -Wall -Wextra -D_REENTRANT -D__NO_MATH_INLINES -fsigned-char"
++              CFLAGS="$CFLAGS -Wall -Wextra -mfused-madd -D_REENTRANT -fsigned-char"
++              PROFILE="-pg -g $CFLAGS -mfused-madd -D_REENTRANT -fsigned-char";;
        *-*-linux*)
-               DEBUG="-g -Wall -W -D_REENTRANT -D__NO_MATH_INLINES -fsigned-char"
--              CFLAGS="-O20 -ffast-math -D_REENTRANT -fsigned-char"
+               DEBUG="-g -Wall -Wextra -D_REENTRANT -D__NO_MATH_INLINES -fsigned-char"
+-              CFLAGS="-O20 -Wall -Wextra -ffast-math -D_REENTRANT -fsigned-char"
 -              PROFILE="-pg -g -O20 -ffast-math -D_REENTRANT -fsigned-char";;
-+              CFLAGS="$CFLAGS -ffast-math -D_REENTRANT -fsigned-char"
++              CFLAGS="$CFLAGS -Wall -Wextra -ffast-math -D_REENTRANT -fsigned-char"
 +              PROFILE="-pg -g $CFLAGS -ffast-math -D_REENTRANT -fsigned-char";;
        sparc-sun-*)
-               DEBUG="-g -Wall -W -D__NO_MATH_INLINES -fsigned-char -mv8"
-               CFLAGS="-O20 -ffast-math -D__NO_MATH_INLINES -fsigned-char -mv8"
+               sparc_cpu=""
+               AC_MSG_CHECKING([if gcc supports -mv8])