[libtheora] run autoreconf for aarch64 support (#925898)

Fri May 3 13:06:36 UTC 2013

commit 9dfbdf0b331469e339782e193ac7d53ee7f33014
Author: Hans de Goede <hdegoede at redhat.com>
Date:   Fri May 3 15:10:26 2013 +0200

    run autoreconf for aarch64 support (#925898)
    
    - add a patch from upstream fixing a crash when compiled with gcc-4.8 (#959001)
    - cleanup spec-file

 libtheora-1.1.1-fix-pp_sharp_mod-calc.patch |   27 ++++++++++
 libtheora.spec                              |   74 +++++++++++++--------------
 2 files changed, 62 insertions(+), 39 deletions(-)
---

diff --git a/libtheora-1.1.1-fix-pp_sharp_mod-calc.patch b/libtheora-1.1.1-fix-pp_sharp_mod-calc.patch
new file mode 100644
index 0000000..e797f2b
--- /dev/null
+++ b/libtheora-1.1.1-fix-pp_sharp_mod-calc.patch
@@ -0,0 +1,27 @@
+pp_sharp_modr18268 | tterribe | 2012-05-08 03:51:57 +0100 (Tue, 08 May 2012) | 8 lines
+
+Fix pp_sharp_mod calculation.
+
+This was broken when the dequant_tables indexing changed in commit
+ r16102, but it only affected post-processing quality, so we never
+ noticed.
+With gcc 4.8.0, this can now trigger a segfault during decoder
+ initialization.
+
+--- a/lib/decode.c	(revision 18267)
++++ b/lib/decode.c	(revision 18268)
+@@ -400,10 +400,10 @@
+     int qsum;
+     qsum=0;
+     for(qti=0;qti<2;qti++)for(pli=0;pli<3;pli++){
+-      qsum+=_dec->state.dequant_tables[qti][pli][qi][12]+
+-       _dec->state.dequant_tables[qti][pli][qi][17]+
+-       _dec->state.dequant_tables[qti][pli][qi][18]+
+-       _dec->state.dequant_tables[qti][pli][qi][24]<<(pli==0);
++      qsum+=_dec->state.dequant_tables[qi][pli][qti][12]+
++       _dec->state.dequant_tables[qi][pli][qti][17]+
++       _dec->state.dequant_tables[qi][pli][qti][18]+
++       _dec->state.dequant_tables[qi][pli][qti][24]<<(pli==0);
+     }
+     _dec->pp_sharp_mod[qi]=-(qsum>>11);
+   }
diff --git a/libtheora.spec b/libtheora.spec
index 40698ef..bcfb994 100644
--- a/libtheora.spec
+++ b/libtheora.spec
@@ -1,18 +1,19 @@
-Summary: Theora Video Compression Codec
-Name: libtheora
-Version: 1.1.1
-Release: 5%{?dist}
-Epoch: 1
-License: BSD
-Group: System Environment/Libraries
-URL: http://www.theora.org
-Source0: http://downloads.xiph.org/releases/theora/%{name}-%{version}.tar.xz
-BuildRequires: libogg-devel >= 2:1.1
-BuildRequires: libvorbis-devel
-BuildRequires: SDL-devel libpng-devel
-BuildRequires: doxygen
-BuildRequires: tetex-latex transfig
-
+Name:           libtheora
+Epoch:          1
+Version:        1.1.1
+Release:        6%{?dist}
+Summary:        Theora Video Compression Codec
+Group:          System Environment/Libraries
+License:        BSD
+URL:            http://www.theora.org
+Source0:        http://downloads.xiph.org/releases/theora/%{name}-%{version}.tar.xz
+Patch0:         libtheora-1.1.1-fix-pp_sharp_mod-calc.patch
+BuildRequires:  libogg-devel >= 2:1.1
+BuildRequires:  libvorbis-devel
+BuildRequires:  SDL-devel libpng-devel
+BuildRequires:  doxygen
+BuildRequires:  tetex-latex transfig
+BuildRequires:  libtool
 
 %description
 Theora is Xiph.Org's first publicly released video codec, intended
@@ -24,17 +25,16 @@ in the future to improve over what is possible with VP3.
 
 
 %package devel
-Summary: Development tools for Theora applications
-Group: Development/Libraries
-Requires:	libogg-devel >= 2:1.1
-Requires:	libtheora = %{epoch}:%{version}-%{release}
-Requires:	pkgconfig
+Summary:        Development tools for Theora applications
+Group:          Development/Libraries
+Requires:       libogg-devel >= 2:1.1
+Requires:       %{name}%{?_isa} = %{epoch}:%{version}-%{release}
 # the new experimental decoder is now part of the regular libtheora
 # we do not obsolete theora-exp itself as that had a different soname and we
 # do not want to break deps, however we do now provide the same headers as
 # theora-exp-devel did.
-Obsoletes:	theora-exp-devel
-Provides:	theora-exp-devel
+Obsoletes:      theora-exp-devel
+Provides:       theora-exp-devel
 
 %description devel
 The libtheora-devel package contains the header files needed to develop
@@ -42,10 +42,9 @@ applications with libtheora.
 
 
 %package devel-docs
-Summary: Documentation for developing Theora applications
-Group: Development/Libraries
-Requires: libtheora = %{epoch}:%{version}-%{release}
-BuildArch: noarch
+Summary:        Documentation for developing Theora applications
+Group:          Development/Libraries
+BuildArch:      noarch
 
 %description devel-docs
 The libtheora-devel-docs package contains the documentation needed
@@ -53,9 +52,9 @@ to develop applications with libtheora.
 
 
 %package -n theora-tools
-Summary: Command line tools for Theora videos
-Group: Applications/Multimedia
-Requires: libtheora = %{epoch}:%{version}-%{release}
+Summary:        Command line tools for Theora videos
+Group:          Applications/Multimedia
+Requires:       %{name}%{?_isa} = %{epoch}:%{version}-%{release}
 
 %description -n theora-tools
 The theora-tools package contains simple command line tools for use
@@ -64,6 +63,8 @@ with theora bitstreams.
 
 %prep
 %setup -q
+%patch0 -p1
+autoreconf -i -f -I m4
 # no custom CFLAGS please
 sed -i 's/CFLAGS="$CFLAGS $cflags_save"/CFLAGS="$cflags_save"/g' configure
 
@@ -78,7 +79,6 @@ make -C doc/spec
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
 rm $RPM_BUILD_ROOT/%{_libdir}/*.la
@@ -91,37 +91,33 @@ install -m 755 examples/.libs/player_example $RPM_BUILD_ROOT/%{_bindir}/theora_p
 install -m 755 examples/.libs/png2theora $RPM_BUILD_ROOT/%{_bindir}/png2theora
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
 %post -p /sbin/ldconfig
-
 %postun -p /sbin/ldconfig
 
 
 %files
-%defattr(-,root,root,-)
 %doc README COPYING
 %{_libdir}/*.so.*
 
 %files devel
-%defattr(-,root,root,-)
 %{_includedir}/theora
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/theora*.pc
 
 %files devel-docs
-%defattr(-,root,root,-)
 %doc doc/libtheora/html doc/vp3-format.txt doc/spec/Theora.pdf
 %doc doc/color.html doc/draft-ietf-avt-rtp-theora-00.txt
 
 %files -n theora-tools
-%defattr(-,root,root,-)
 %{_bindir}/*
 
 
 %changelog
+* Fri May  3 2013 Hans de Goede <hdegoede at redhat.com> - 1:1.1.1-6
+- run autoreconf for aarch64 support (#925898)
+- add a patch from upstream fixing a crash when compiled with gcc-4.8 (#959001)
+- cleanup spec-file
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.1.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 
