From 3727766cbe3b34cabe28aebfcc7ce08f1907e53e229b9ac3ddaeffb6bdc7261d Mon Sep 17 00:00:00 2001 From: Dave Plater Date: Tue, 7 Dec 2010 14:12:25 +0000 Subject: [PATCH] Accepting request 55018 from home:RedDwarf:branches:multimedia:libs Do you want to look after libogg as well? OBS-URL: https://build.opensuse.org/request/show/55018 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/libogg?expand=0&rev=9 --- _service | 14 +++ _service:download_url:libogg-1.2.1.tar.bz2 | 3 + _service:set_version:libogg.spec | 121 +++++++++++++++++++++ configure.dif | 17 --- libogg-1.1.4.tar.bz2 | 3 - libogg-compile-warning-fix.diff | 49 --------- libogg.changes | 24 ++++ libogg.spec | 103 +++++++----------- 8 files changed, 200 insertions(+), 134 deletions(-) create mode 100644 _service create mode 100644 _service:download_url:libogg-1.2.1.tar.bz2 create mode 100644 _service:set_version:libogg.spec delete mode 100644 configure.dif delete mode 100644 libogg-1.1.4.tar.bz2 delete mode 100644 libogg-compile-warning-fix.diff diff --git a/_service b/_service new file mode 100644 index 0000000..3c7e910 --- /dev/null +++ b/_service @@ -0,0 +1,14 @@ + + + + http + downloads.xiph.org + /releases/ogg/libogg-1.2.1.tar.bz2 + + + _service:download_url:libogg-1.2.1.tar.bz2 + sha256 + da222202be8be48149f0a0668f3d2445a166b1f9f40a25e27cd222bfa9c1d4d4 + + + diff --git a/_service:download_url:libogg-1.2.1.tar.bz2 b/_service:download_url:libogg-1.2.1.tar.bz2 new file mode 100644 index 0000000..bc98550 --- /dev/null +++ b/_service:download_url:libogg-1.2.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:da222202be8be48149f0a0668f3d2445a166b1f9f40a25e27cd222bfa9c1d4d4 +size 321690 diff --git a/_service:set_version:libogg.spec b/_service:set_version:libogg.spec new file mode 100644 index 0000000..98fb45d --- /dev/null +++ b/_service:set_version:libogg.spec @@ -0,0 +1,121 @@ +# +# spec file for package libogg (Version 1.2.1) +# +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# + + +%define _SO_nr 0 + +Name: libogg +Version: 1.2.1 +Release: 0 +Summary: Ogg Bitstream Library +License: BSD3c(or similar) +Url: http://www.vorbis.com/ +# +Group: System/Libraries +Source: %{name}-%{version}.tar.bz2 +Source2: baselibs.conf +Patch1: lib64.dif +Patch2: m4.diff +BuildRequires: pkgconfig +# bug437293 (SLES10 -> SLES11 upgrade path) +%ifarch ppc64 +Obsoletes: libogg-64bit +%endif +BuildRoot: %{_tmppath}/%{name}-%{version}-build + +%description +Libogg is a library for manipulating ogg bitstreams. It handles both +making ogg bitstreams and getting packets from ogg bitstreams. + +Ogg is the native bitstream format of the libvorbis (Ogg Vorbis audio +codec ) and the libtheora (Theora video codec) + +%package -n libogg%{_SO_nr} +Summary: Ogg Bitstream Library +Group: System/Libraries +# bug437293 (SLES10 -> SLES11 upgrade path) +%ifarch ppc64 +Obsoletes: libogg-64bit +%endif +# +Provides: %{name} = %{version} +#openSUSE 10.2 +Obsoletes: %{name} <= 1.1.3 + +%description -n libogg%{_SO_nr} +Libogg is a library for manipulating ogg bitstreams. It handles both +making ogg bitstreams and getting packets from ogg bitstreams. + +Ogg is the native bitstream format of the libvorbis (Ogg Vorbis audio +codec ) and the libtheora (Theora video codec) + +%package devel +License: BSD3c(or similar) +Summary: Include Files and Libraries mandatory for Ogg Development +Group: Development/Libraries/C and C++ +Requires: glibc-devel +Requires: libogg%{_SO_nr} = %{version} +# bug437293 (SLES10 -> SLES11 upgrade path) +%ifarch ppc64 +Obsoletes: libogg-devel-64bit +%endif +# + +%description devel +This package contains all necessary include files and libraries needed +to compile and develop applications that use libogg. + +%prep +%setup -q +%patch2 +if [ "%{_lib}" == "lib64" ]; then +%patch1 +fi + +%build +%configure --disable-static +%{__make} %{?_smp_mflags} + +%install +%{__make} DESTDIR=%{buildroot} docdir=%{_docdir}/%{name}-devel install +# remove unneeded files +%{__rm} -f %{buildroot}%{_libdir}/*.la + +%check +%{__make} check + +%post -n libogg%{_SO_nr} -p /sbin/ldconfig + +%postun -n libogg%{_SO_nr} -p /sbin/ldconfig + +%clean +%{__rm} -rf %{buildroot} + +%files -n libogg%{_SO_nr} +%defattr(0644,root,root,0755) +%doc AUTHORS CHANGES COPYING README +%{_libdir}/libogg.so.%{_SO_nr}* + +%files devel +%defattr(-,root,root) +%{_docdir}/%{name}-devel +%{_includedir}/ogg +%{_libdir}/libogg.so +%{_datadir}/aclocal/ogg.m4 +%{_libdir}/pkgconfig/ogg.pc + +%changelog diff --git a/configure.dif b/configure.dif deleted file mode 100644 index d8fa01d..0000000 --- a/configure.dif +++ /dev/null @@ -1,17 +0,0 @@ -Index: configure.in -=================================================================== ---- configure.in.orig -+++ configure.in -@@ -45,9 +45,9 @@ if test -z "$GCC"; then - else - case $host in - *-*-linux*) -- DEBUG="-g -Wall -fsigned-char" -- CFLAGS="-O20 -ffast-math -fsigned-char" -- PROFILE="-Wall -W -pg -g -O20 -ffast-math -fsigned-char" -+ DEBUG="-g -Wall" -+ CFLAGS="-ffast-math" -+ PROFILE="-Wall -W -pg -g -ffast-math" - ;; - sparc-sun-*) - sparc_cpu="" diff --git a/libogg-1.1.4.tar.bz2 b/libogg-1.1.4.tar.bz2 deleted file mode 100644 index e97d952..0000000 --- a/libogg-1.1.4.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bb40897ab7a15b4c6b7db3d8b08dbefa02fc22d32c3e6d99f630cec831f9fffa -size 313662 diff --git a/libogg-compile-warning-fix.diff b/libogg-compile-warning-fix.diff deleted file mode 100644 index a1fe924..0000000 --- a/libogg-compile-warning-fix.diff +++ /dev/null @@ -1,49 +0,0 @@ ---- src/framing.c 2009/08/01 15:24:55 1.1 -+++ src/framing.c 2009/08/01 15:25:06 -@@ -1374,7 +1374,7 @@ - if(ret<0)continue; - /* got a page. Happy happy. Verify that it's good. */ - -- fprintf(stderr,"(%ld), ",pageout); -+ fprintf(stderr,"(%ld), ",(long)pageout); - - check_page(data+deptr,headers[pageout],&og_de); - deptr+=og_de.body_len; ---- src/bitwise.c-dist 2005-07-07 16:03:37.000000000 +0200 -+++ src/bitwise.c 2005-07-07 16:04:17.000000000 +0200 -@@ -654,7 +654,7 @@ int main(void){ - fprintf(stderr,"ok."); - - fprintf(stderr,"\nTesting read past end (LSb): "); -- oggpack_readinit(&r,"\0\0\0\0\0\0\0\0",8); -+ oggpack_readinit(&r,(unsigned char *)"\0\0\0\0\0\0\0\0",8); - for(i=0;i<64;i++){ - if(oggpack_read(&r,1)!=0){ - fprintf(stderr,"failed; got -1 prematurely.\n"); -@@ -666,7 +666,7 @@ int main(void){ - fprintf(stderr,"failed; read past end without -1.\n"); - exit(1); - } -- oggpack_readinit(&r,"\0\0\0\0\0\0\0\0",8); -+ oggpack_readinit(&r,(unsigned char *)"\0\0\0\0\0\0\0\0",8); - if(oggpack_read(&r,30)!=0 || oggpack_read(&r,16)!=0){ - fprintf(stderr,"failed 2; got -1 prematurely.\n"); - exit(1); -@@ -740,7 +740,7 @@ int main(void){ - fprintf(stderr,"ok."); - - fprintf(stderr,"\nTesting read past end (MSb): "); -- oggpackB_readinit(&r,"\0\0\0\0\0\0\0\0",8); -+ oggpackB_readinit(&r,(unsigned char *)"\0\0\0\0\0\0\0\0",8); - for(i=0;i<64;i++){ - if(oggpackB_read(&r,1)!=0){ - fprintf(stderr,"failed; got -1 prematurely.\n"); -@@ -752,7 +752,7 @@ int main(void){ - fprintf(stderr,"failed; read past end without -1.\n"); - exit(1); - } -- oggpackB_readinit(&r,"\0\0\0\0\0\0\0\0",8); -+ oggpackB_readinit(&r,(unsigned char *)"\0\0\0\0\0\0\0\0",8); - if(oggpackB_read(&r,30)!=0 || oggpackB_read(&r,16)!=0){ - fprintf(stderr,"failed 2; got -1 prematurely.\n"); - exit(1); diff --git a/libogg.changes b/libogg.changes index 99b986b..6b04030 100644 --- a/libogg.changes +++ b/libogg.changes @@ -1,3 +1,27 @@ +------------------------------------------------------------------- +Tue Dec 7 13:27:44 UTC 2010 - reddwarf@opensuse.org + +- update to version 1.2.1 + * Various build updates (see SVN) + * Add ogg_stream_pageout_fill() to API to allow applications + greater explicit flexibility in page sizing. + * Documentation updates including multiplexing description, + terminology and API (incl. ogg_packet_clear(), + ogg_stream_pageout_fill()) + * Correct possible buffer overwrite in stream encoding on 32 bit + when a single packet exceed 250MB. + * Correct read-buffer overrun [without side effects] under + similar circumstances. + * Update unit testing to work properly with new page spill + heuristic. + * Alter default flushing behavior to span less often and use + larger page sizes when packet sizes are large. + * Build fixes for additional compilers + * Documentation updates +- run spec-cleaner +- removed configure.dif (reapply if -fsigned-char causes problems) +- removed libogg-compile-warning-fix.diff (upstreamed) + ------------------------------------------------------------------- Wed Dec 16 10:13:33 CET 2009 - jengelh@medozas.de diff --git a/libogg.spec b/libogg.spec index a7e406e..1501492 100644 --- a/libogg.spec +++ b/libogg.spec @@ -1,5 +1,5 @@ # -# spec file for package libogg (Version 1.1.4) +# spec file for package libogg (Version 1.2.1) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -15,28 +15,26 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild +%define _SO_nr 0 Name: libogg -BuildRequires: pkgconfig +Version: to_be_filled_by_service +Release: 0 Summary: Ogg Bitstream Library -Version: 1.1.4 -Release: 3 -# bug437293 +License: BSD3c(or similar) +Url: http://www.vorbis.com/ +# +Group: System/Libraries +Source: %{name}-%{version}.tar.bz2 +Source2: baselibs.conf +Patch1: lib64.dif +Patch2: m4.diff +BuildRequires: pkgconfig +# bug437293 (SLES10 -> SLES11 upgrade path) %ifarch ppc64 Obsoletes: libogg-64bit %endif -# -Group: System/Libraries -License: BSD3c(or similar) -Url: http://www.vorbis.com/ -Source: %{name}-%{version}.tar.bz2 -Source2: baselibs.conf -Patch: configure.dif -Patch1: lib64.dif -Patch2: m4.diff -Patch3: libogg-compile-warning-fix.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -46,18 +44,10 @@ making ogg bitstreams and getting packets from ogg bitstreams. Ogg is the native bitstream format of the libvorbis (Ogg Vorbis audio codec ) and the libtheora (Theora video codec) - - -Authors: --------- - Monty - Xiphophorus Company - -%package -n libogg0 -License: BSD3c(or similar) +%package -n libogg%{_SO_nr} Summary: Ogg Bitstream Library Group: System/Libraries -# bug437293 +# bug437293 (SLES10 -> SLES11 upgrade path) %ifarch ppc64 Obsoletes: libogg-64bit %endif @@ -66,26 +56,20 @@ Provides: %{name} = %{version} #openSUSE 10.2 Obsoletes: %{name} <= 1.1.3 -%description -n libogg0 +%description -n libogg%{_SO_nr} Libogg is a library for manipulating ogg bitstreams. It handles both making ogg bitstreams and getting packets from ogg bitstreams. Ogg is the native bitstream format of the libvorbis (Ogg Vorbis audio codec ) and the libtheora (Theora video codec) - - -Authors: --------- - Monty - Xiphophorus Company - %package devel License: BSD3c(or similar) -Summary: Include Files and Libraries mandatory for Ogg Development. +Summary: Include Files and Libraries mandatory for Ogg Development Group: Development/Libraries/C and C++ -Requires: libogg0 = %{version} glibc-devel -# bug437293 +Requires: glibc-devel +Requires: libogg%{_SO_nr} = %{version} +# bug437293 (SLES10 -> SLES11 upgrade path) %ifarch ppc64 Obsoletes: libogg-devel-64bit %endif @@ -95,54 +79,43 @@ Obsoletes: libogg-devel-64bit This package contains all necessary include files and libraries needed to compile and develop applications that use libogg. - - -Authors: --------- - Monty - Xiphophorus Company - %prep %setup -q -%patch %patch2 -%patch3 -if [ "%_lib" == "lib64" ]; then +if [ "%{_lib}" == "lib64" ]; then %patch1 fi %build -autoreconf --force --install -export CFLAGS="$RPM_OPT_FLAGS -g" -%configure --disable-static --with-pic -%{__make} %{?jobs:-j%jobs} +%configure --disable-static +%{__make} %{?_smp_mflags} %install -make DESTDIR=$RPM_BUILD_ROOT docdir=%{_docdir}/%{name}-devel install -cp AUTHORS CHANGES COPYING README $RPM_BUILD_ROOT%{_docdir}/%{name}-devel -# remove uneeded files -%{__rm} -f $RPM_BUILD_ROOT%{_libdir}/*.la +%{__make} DESTDIR=%{buildroot} docdir=%{_docdir}/%{name}-devel install +# remove unneeded files +%{__rm} -f %{buildroot}%{_libdir}/*.la %check %{__make} check -%post -n libogg0 -p /sbin/ldconfig +%post -n libogg%{_SO_nr} -p /sbin/ldconfig -%postun -n libogg0 -p /sbin/ldconfig +%postun -n libogg%{_SO_nr} -p /sbin/ldconfig %clean -%{__rm} -rf $RPM_BUILD_ROOT +%{__rm} -rf %{buildroot} -%files -n libogg0 -%defattr(-,root,root) -%{_libdir}/lib*.so.0* +%files -n libogg%{_SO_nr} +%defattr(0644,root,root,0755) +%doc AUTHORS CHANGES COPYING README +%{_libdir}/libogg.so.%{_SO_nr}* %files devel %defattr(-,root,root) -%doc %{_docdir}/%{name}-devel +%{_docdir}/%{name}-devel %{_includedir}/ogg -%{_libdir}/lib*.so -%{_datadir}/aclocal/*.m4 -%{_libdir}/pkgconfig/*.pc +%{_libdir}/libogg.so +%{_datadir}/aclocal/ogg.m4 +%{_libdir}/pkgconfig/ogg.pc %changelog