- Update link-ogg patch for 1.1.4

This commit is contained in:
bnocera 2007-02-14 12:15:25 +00:00
parent 2acbfcfa5e
commit b5c29de2e5
2 changed files with 19 additions and 2 deletions

14
flac-1.1.4-link-ogg.patch Normal file
View File

@ -0,0 +1,14 @@
--- flac-1.1.4/src/libFLAC/Makefile.am.link-ogg 2007-02-07 01:13:45.000000000 +0000
+++ flac-1.1.4/src/libFLAC/Makefile.am 2007-02-14 12:09:23.000000000 +0000
@@ -92,9 +92,10 @@ extra_ogg_sources = \
ogg_encoder_aspect.c \
ogg_helper.c \
ogg_mapping.c
+OGG_LIBS=-logg
endif
# see 'http://www.gnu.org/software/libtool/manual.html#Libtool-versioning' for numbering convention
-libFLAC_la_LDFLAGS = -version-info 8:1:0 -lm $(LOCAL_EXTRA_LDFLAGS)
+libFLAC_la_LDFLAGS = -version-info 8:1:0 -lm $(OGG_LIBS) $(LOCAL_EXTRA_LDFLAGS)
libFLAC_la_SOURCES = \
bitmath.c \
bitreader.c \

View File

@ -1,13 +1,13 @@
Summary: An encoder/decoder for the Free Lossless Audio Codec Summary: An encoder/decoder for the Free Lossless Audio Codec
Name: flac Name: flac
Version: 1.1.4 Version: 1.1.4
Release: 1%{?dist} Release: 2%{?dist}
License: LGPL/GPL License: LGPL/GPL
Group: Applications/Multimedia Group: Applications/Multimedia
Source: http://prdownloads.sourceforge.net/flac/flac-%{version}.tar.gz Source: http://prdownloads.sourceforge.net/flac/flac-%{version}.tar.gz
Patch3: flac-1.1.3-gnu-stack.patch Patch3: flac-1.1.3-gnu-stack.patch
Patch4: flac-1.1.3-noxmms.patch Patch4: flac-1.1.3-noxmms.patch
Patch5: flac-1.1.3-link-ogg.patch Patch5: flac-1.1.4-link-ogg.patch
URL: http://flac.sourceforge.net/ URL: http://flac.sourceforge.net/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: glib2-devel, libogg-devel, doxygen, nasm BuildRequires: glib2-devel, libogg-devel, doxygen, nasm
@ -76,6 +76,9 @@ rm -rf %{buildroot}
%{_datadir}/aclocal/*.m4 %{_datadir}/aclocal/*.m4
%changelog %changelog
* Wed Feb 14 2007 - Bastien Nocera <bnocera@redhat.com> - 1.1.4-2
- Update link-ogg patch for 1.1.4
* Wed Feb 14 2007 - Bastien Nocera <bnocera@redhat.com> - 1.1.4-1 * Wed Feb 14 2007 - Bastien Nocera <bnocera@redhat.com> - 1.1.4-1
- Update to upstream 1.1.4 - Update to upstream 1.1.4