--- a/ChangeLog Wed Dec 10 02:47:22 2008 +0000
+++ b/ChangeLog Wed Dec 10 03:07:45 2008 +0000
@@ -1,3 +1,11 @@
+2008-12-10 Jerry Tan <[email protected]>
+
+ * SUNWlibtheora.spec
+ * base-specs/libtheora.spec
+ * patches/libtheora-01-fixtestlink.diff
+ * patches/libtheora-02-signed-short.diff
+ bump to 1.0
+
2008-12-10 Jeff Cai <[email protected]>
* SUNWgnome-keyring-manager.spec:
--- a/SUNWlibtheora.spec Wed Dec 10 02:47:22 2008 +0000
+++ b/SUNWlibtheora.spec Wed Dec 10 03:07:45 2008 +0000
@@ -7,7 +7,7 @@
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
-# Owner: yippi
+# Owner: jerrytan
#
%include Solaris.inc
%use theora = libtheora.spec
@@ -67,8 +67,8 @@
%{_includedir}/*
%dir %attr (0755, root, sys) %{_datadir}
%dir %attr (0755, root, other) %{_datadir}/doc
-%dir %attr (0755, root, other) %{_datadir}/doc/libtheora-1.0beta3
-%{_datadir}/doc/libtheora-1.0beta3/*
+%dir %attr (0755, root, other) %{_datadir}/doc/libtheora-1.0
+%{_datadir}/doc/libtheora-1.0/*
%changelog
* Fri Sep 12 2008 - [email protected]
--- a/base-specs/libtheora.spec Wed Dec 10 02:47:22 2008 +0000
+++ b/base-specs/libtheora.spec Wed Dec 10 03:07:45 2008 +0000
@@ -5,24 +5,19 @@
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
-# Owner: yippi
+# Owner: jerrytan
# bugdb: https://trac.xiph.org/
#
Name: libtheora
-License: Xiph
+License: Xiph.org BSD-style
Group: System Environment/Libraries
Version: 1.0
-%define tarball_version 1.0beta3
-#%define tarball_version 1.0alpha7
+%define tarball_version 1.0
Release: 2
Distribution: Java Desktop System
Vendor: Sun Microsystems, Inc.
Summary: The Theora Video Compression Codec.
Source: http://downloads.xiph.org/releases/theora/%{name}-%{tarball_version}.tar.gz
-#owner:yippi date:2008-05-02 type:bug bugid:1356 state:upstream
-Patch1: libtheora-01-fixtestlink.diff
-#owner:jerrytan date:2008-08-28 type:bug bugster:6722237
-Patch2: libtheora-02-signed-short.diff
URL: http://www.theora.org/
BuildRoot: %{_tmppath}/%{name}-%{tarball_version}-build
Docdir: %{_docdir}/%{name}
@@ -53,8 +48,6 @@
%prep
%setup -q -n %{name}-%{tarball_version}
-%patch1 -p1
-%patch2 -p1
%build
%ifos linux
@@ -108,6 +101,8 @@
%{_libdir}/pkgconfig/theora.pc
%changelog
+* Fri Nov 07 2008 - [email protected]
+- bump to 1.0, remove upstream patches
* Fri Aug 29 2008 - [email protected]
- add patch libtheora-02-signed-short.diff to bump to 1.0beta3
* Tue Apr 29 2008 - [email protected]
--- a/patches/libtheora-01-fixtestlink.diff Wed Dec 10 02:47:22 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
---- libtheora-1.0beta3/tests/Makefile.am-orig 2008-04-30 05:12:09.560271000 -0500
-+++ libtheora-1.0beta3/tests/Makefile.am 2008-04-30 05:14:01.824452000 -0500
-@@ -50,13 +50,13 @@ comment_theora_LDADD = $(THEORA_LIBS)
- comment_theora_CFLAGS = $(OGG_CFLAGS)
-
- granulepos_SOURCES = granulepos.c
--granulepos_LDADD = $(THEORAENC_LIBS)
-+granulepos_LDADD = $(THEORAENC_LIBS) -lm
- granulepos_CFLAGS = $(OGG_CFLAGS)
-
- granulepos_theoraenc_SOURCES = granulepos_theora.c
--granulepos_theoraenc_LDADD = $(THEORAENC_LIBS)
-+granulepos_theoraenc_LDADD = $(THEORAENC_LIBS) -lm
- granulepos_theoraenc_CFLAGS = $(OGG_CFLAGS)
-
- granulepos_theora_SOURCES = granulepos_theora.c
--granulepos_theora_LDADD = $(THEORA_LIBS)
-+granulepos_theora_LDADD = $(THEORA_LIBS) -lm
- granulepos_theora_CFLAGS = $(OGG_CFLAGS)
--- a/patches/libtheora-02-signed-short.diff Wed Dec 10 02:47:22 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +0,0 @@
---- libtheora-1.0beta3/lib/dec/state.c.old 2008-08-28 16:32:08.315618000 +0800
-+++ libtheora-1.0beta3/lib/dec/state.c 2008-08-28 16:32:13.006914000 +0800
-@@ -832,7 +832,7 @@
- /*Why is the iquant product rounded in this case and no others?
- Who knows.*/
-
-- p=(ogg_int16_t)((ogg_int32_t)_frag->dc*_dc_iquant+15>>5);
-+ p=(ogg_int16_t)((ogg_int32_t)(signed short)(_frag->dc)*_dc_iquant+15>>5);
- /*LOOP VECTORIZES.*/
- for(ci=0;ci<64;ci++)res_buf[ci]=p;
-
-@@ -863,7 +863,7 @@
- #endif
-
- /*First, dequantize the coefficients.*/
-- dct_buf[0]=(ogg_int16_t)((ogg_int32_t)_frag->dc*_dc_iquant);
-+ dct_buf[0]=(ogg_int16_t)((ogg_int32_t)(signed short)(_frag->dc)*_dc_iquant);
- for(zzi=1;zzi<_ncoefs;zzi++){
- int ci;
- ci=OC_FZIG_ZAG[zzi];
---- libtheora-1.0beta3/lib/dec/decode.c.old 2008-08-28 16:31:28.571642000 +0800
-+++ libtheora-1.0beta3/lib/dec/decode.c 2008-08-28 16:32:13.004314000 +0800
-@@ -1017,7 +1017,7 @@
- run_counts[skip-1]++;
- cfi++;
- eobs=0;
-- _dec->state.frags[*coded_fragi++].dc=oc_dct_token_dec1val(token,eb);
-+ _dec->state.frags[*coded_fragi++].dc=(ogg_int16_t)oc_dct_token_dec1val(token,eb);
- }
- }
- _dec->ti0[pli][0]=ti;
-@@ -1504,7 +1504,7 @@
- for(fragx=0;fragx<fplane->nhfrags;fragx++,frag++){
- if(!frag->coded)continue;
- #ifdef _TH_DEBUG_
-- frag->quant[0] = frag->dc; /* stash un-predicted dc for debug output */
-+ frag->quant[0] = (signed short)frag->dc; /* stash un-predicted dc for debug output */
- #endif
- pred_last[OC_FRAME_FOR_MODE[frag->mbmode]]=frag->dc+=
- oc_frag_pred_dc(frag,fplane,fragx,fragy,pred_last);
---- libtheora-1.0beta3/lib/dec/fragment.c.old 2008-08-28 16:31:58.138938000 +0800
-+++ libtheora-1.0beta3/lib/dec/fragment.c 2008-08-28 16:32:13.005838000 +0800
-@@ -179,7 +179,7 @@
- pflag=1<<i;
- if((BC_MASK[bc]&pflag)&&predfr[i]->coded&&
- OC_FRAME_FOR_MODE[predfr[i]->mbmode]==pred_frame){
-- p[np++]=predfr[i]->dc;
-+ p[np++]=(signed short)predfr[i]->dc;
- pflags|=pflag;
- }
- }