From b5c29de2e5cb7aa682d0e1992262f6e8444d7b37 Mon Sep 17 00:00:00 2001 From: bnocera Date: Wed, 14 Feb 2007 12:15:25 +0000 Subject: [PATCH] - Update link-ogg patch for 1.1.4 --- flac-1.1.4-link-ogg.patch | 14 ++++++++++++++ flac.spec | 7 +++++-- 2 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 flac-1.1.4-link-ogg.patch diff --git a/flac-1.1.4-link-ogg.patch b/flac-1.1.4-link-ogg.patch new file mode 100644 index 0000000..ebfbe00 --- /dev/null +++ b/flac-1.1.4-link-ogg.patch @@ -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 \ diff --git a/flac.spec b/flac.spec index b22ace8..801a906 100644 --- a/flac.spec +++ b/flac.spec @@ -1,13 +1,13 @@ Summary: An encoder/decoder for the Free Lossless Audio Codec Name: flac Version: 1.1.4 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPL/GPL Group: Applications/Multimedia Source: http://prdownloads.sourceforge.net/flac/flac-%{version}.tar.gz Patch3: flac-1.1.3-gnu-stack.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/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: glib2-devel, libogg-devel, doxygen, nasm @@ -76,6 +76,9 @@ rm -rf %{buildroot} %{_datadir}/aclocal/*.m4 %changelog +* Wed Feb 14 2007 - Bastien Nocera - 1.1.4-2 +- Update link-ogg patch for 1.1.4 + * Wed Feb 14 2007 - Bastien Nocera - 1.1.4-1 - Update to upstream 1.1.4