Author: qboosh Date: Tue Jul 12 17:25:31 2011 GMT Module: packages Tag: HEAD ---- Log message: - updated to 0.9.5 - updated link patch - removed outdated celt-rename patch (everything is now built as libopus library)
---- Files affected: packages/opus: opus-link.patch (1.1 -> 1.2) , opus.spec (1.2 -> 1.3) , opus-celt-rename.patch (1.1 -> NONE) (REMOVED) ---- Diffs: ================================================================ Index: packages/opus/opus-link.patch diff -u packages/opus/opus-link.patch:1.1 packages/opus/opus-link.patch:1.2 --- packages/opus/opus-link.patch:1.1 Fri Mar 11 21:12:49 2011 +++ packages/opus/opus-link.patch Tue Jul 12 19:25:26 2011 @@ -1,28 +1,10 @@ ---- opus-0.9.2/silk/Makefile.am.orig 2011-02-28 22:07:43.000000000 +0100 -+++ opus-0.9.2/silk/Makefile.am 2011-03-11 17:58:27.851418808 +0100 -@@ -212,7 +212,7 @@ - Decoder_LDFLAGS = $(LIBS) +--- opus-0.9.5/Makefile.am.orig 2011-07-09 15:37:18.000000000 +0200 ++++ opus-0.9.5/Makefile.am 2011-07-12 18:40:21.665294559 +0200 +@@ -11,6 +11,7 @@ + include opus_headers.txt - signalCompare_SOURCES = test/signalCompare.c $(top_builddir)/interface/SKP_Silk_SDK_API.h --signalCompare_LDADD = $(lib_LTLIBRARIES) -+signalCompare_LDADD = $(lib_LTLIBRARIES) -lm - signalCompare_LDFLAGS = $(LIBS) + libopus_la_SOURCES = $(CELT_SOURCES) $(SILK_SOURCES) $(OPUS_SOURCES) ++libopus_la_LIBADD = -lm - LIBS = ../celt/libcelt/libcelt0.la ---- opus-0.9.2/src/Makefile.am.orig 2011-03-02 21:42:36.000000000 +0100 -+++ opus-0.9.2/src/Makefile.am 2011-03-11 19:09:20.591416294 +0100 -@@ -3,6 +3,7 @@ - - lib_LTLIBRARIES = libietfcodec.la - libietfcodec_la_SOURCES = opus_decoder.c opus_encoder.c -+libietfcodec_la_LIBADD = $(top_builddir)/celt/libcelt/libopuscelt0.la $(top_builddir)/silk/libSKP_SILK_SDK.la - - noinst_HEADERS = opus_decoder.h opus_encoder.h - -@@ -11,5 +12,5 @@ - noinst_PROGRAMS = test_opus - - test_opus_SOURCES = test_opus.c --test_opus_LDADD = libietfcodec.la $(top_builddir)/celt/libcelt/libcelt0.la $(top_builddir)/silk/libSKP_SILK_SDK.la -+test_opus_LDADD = libietfcodec.la + pkginclude_HEADERS = src/opus.h ================================================================ Index: packages/opus/opus.spec diff -u packages/opus/opus.spec:1.2 packages/opus/opus.spec:1.3 --- packages/opus/opus.spec:1.2 Wed Mar 16 16:55:55 2011 +++ packages/opus/opus.spec Tue Jul 12 19:25:26 2011 @@ -2,19 +2,16 @@ Summary: IETF Opus Interactive Audio Codec Summary(pl.UTF-8): Opus - interaktywny kodek dźwięku wg projektu IETF Name: opus -Version: 0.9.3 +Version: 0.9.5 Release: 1 License: BSD Group: Libraries Source0: http://downloads.xiph.org/releases/opus/%{name}-%{version}.tar.gz -# Source0-md5: 934226d4f572d01c5848bd70538248f5 +# Source0-md5: 6bec090fd28996da0336e165b153ebd8 Patch0: %{name}-link.patch -Patch1: %{name}-celt-rename.patch URL: http://opus-codec.org/ BuildRequires: autoconf >= 2.59 BuildRequires: automake >= 1.6 -# for tools -BuildRequires: libogg-devel BuildRequires: libtool BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -56,25 +53,13 @@ %prep %setup -q %patch0 -p1 -%patch1 -p1 %build -cd celt %{__libtoolize} %{__aclocal} %{__autoconf} %{__autoheader} %{__automake} -cd ../silk -%{__libtoolize} -%{__aclocal} -%{__autoconf} -%{__automake} -cd .. -%{__libtoolize} -%{__aclocal} -%{__autoconf} -%{__automake} %configure %{__make} @@ -84,13 +69,6 @@ %{__make} install \ DESTDIR=$RPM_BUILD_ROOT -for f in Decoder Encoder signalCompare ; do - mv $RPM_BUILD_ROOT%{_bindir}/$f $RPM_BUILD_ROOT%{_bindir}/opus-$f -done -%{__rm} $RPM_BUILD_ROOT%{_bindir}/celt{dec,enc} -%{__rm} -r $RPM_BUILD_ROOT%{_includedir}/celt -%{__rm} $RPM_BUILD_ROOT%{_pkgconfigdir}/celt.pc - %clean rm -rf $RPM_BUILD_ROOT @@ -100,32 +78,18 @@ %files %defattr(644,root,root,755) %doc AUTHORS COPYING README TODO -%attr(755,root,root) %{_bindir}/opus-Decoder -%attr(755,root,root) %{_bindir}/opus-Encoder -%attr(755,root,root) %{_bindir}/opus-signalCompare -%attr(755,root,root) %{_libdir}/libSKP_SILK_SDK.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libSKP_SILK_SDK.so.0 -%attr(755,root,root) %{_libdir}/libietfcodec.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libietfcodec.so.0 -%attr(755,root,root) %{_libdir}/libopuscelt0.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libopuscelt0.so.2 +%attr(755,root,root) %{_libdir}/libopus.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/libopus.so.0 %files devel %defattr(644,root,root,755) -%attr(755,root,root) %{_libdir}/libSKP_SILK_SDK.so -%attr(755,root,root) %{_libdir}/libietfcodec.so -%attr(755,root,root) %{_libdir}/libopuscelt0.so -%{_libdir}/libSKP_SILK_SDK.la -%{_libdir}/libietfcodec.la -%{_libdir}/libopuscelt0.la +%attr(755,root,root) %{_libdir}/libopus.so +%{_libdir}/libopus.la %{_includedir}/opus -%{_includedir}/silk %files static %defattr(644,root,root,755) -%{_libdir}/libSKP_SILK_SDK.a -%{_libdir}/libietfcodec.a -%{_libdir}/libopuscelt0.a +%{_libdir}/libopus.a %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -133,6 +97,11 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.3 2011/07/12 17:25:26 qboosh +- updated to 0.9.5 +- updated link patch +- removed outdated celt-rename patch (everything is now built as libopus library) + Revision 1.2 2011/03/16 15:55:55 qboosh - updated to 0.9.3 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/opus/opus-link.patch?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/opus/opus.spec?r1=1.2&r2=1.3&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
