[jorbis/f14/master] - Provide a clean upgrade path from the old orphaned F-12 jorbis package
Hans de Goede
jwrdegoede at fedoraproject.org
Fri Nov 12 08:42:02 UTC 2010
commit bb3b6d1f47178b4c71f76be2fcb861b8dbc52a61
Author: Hans de Goede <hdegoede at redhat.com>
Date: Fri Nov 12 09:40:24 2010 +0100
- Provide a clean upgrade path from the old orphaned F-12 jorbis package
.gitignore | 1 +
dead.package | 1 -
jorbis-0.0.17-cortado-fixes.patch | 53 +++++++++++++++++++
jorbis.spec | 100 +++++++++++++++++++++++++++++++++++++
sources | 1 +
5 files changed, 155 insertions(+), 1 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ec9daf6..5e78b1a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
jorbis-0.0.17.zip
+/jorbis-0.0.17.zip
diff --git a/jorbis-0.0.17-cortado-fixes.patch b/jorbis-0.0.17-cortado-fixes.patch
new file mode 100644
index 0000000..946d89e
--- /dev/null
+++ b/jorbis-0.0.17-cortado-fixes.patch
@@ -0,0 +1,53 @@
+From: Maik Merten <maik at maik-desktop.(none)>
+Date: Wed, 28 Oct 2009 18:50:41 +0000 (+0100)
+Subject: apply a patch written by Philip Heron: "This fixes a bug where Cortado would die...
+X-Git-Tag: 0.5.1~21
+X-Git-Url: http://git.xiph.org/?p=cortado.git;a=commitdiff_plain;h=08bad890e3ff664fbb78dcb1c640bc739445369e
+
+apply a patch written by Philip Heron: "This fixes a bug where Cortado would die or display corrupt video when a Theora stream begins with an incomplete packet."
+
+ticket #1565
+---
+
+diff -up jorbis-0.0.17/com/jcraft/jogg/StreamState.java~ jorbis-0.0.17/com/jcraft/jogg/StreamState.java
+--- jorbis-0.0.17/com/jcraft/jogg/StreamState.java~ 2008-05-07 10:07:39.000000000 +0200
++++ jorbis-0.0.17/com/jcraft/jogg/StreamState.java 2010-11-04 14:09:06.019015004 +0100
+@@ -294,10 +294,13 @@ public class StreamState{
+ lacing_vals[lacing_fill++]=0x400;
+ lacing_packet++;
+ }
++ }
+
+- // are we a 'continued packet' page? If so, we'll need to skip
+- // some segments
+- if(continued!=0){
++ // are we a 'continued packet' page? If so, we'll need to skip
++ // some segments
++ if(continued!=0){
++ if(lacing_fill<1 ||
++ lacing_vals[lacing_fill-1]==0x400){
+ bos=0;
+ for(; segptr<segments; segptr++){
+ int val=(header_base[header+27+segptr]&0xff);
+From: Gregory Maxwell <greg at xiph.org>
+Date: Fri, 19 Feb 2010 04:45:21 +0000 (-0500)
+Subject: Fix jorbis for surround sound support. No fancy downmixing yet.
+X-Git-Tag: 0.6.0~30
+X-Git-Url: http://git.xiph.org/?p=cortado.git;a=commitdiff_plain;h=c1d9cef5129e0b452375d7da9129dad435d1a918
+
+Fix jorbis for surround sound support. No fancy downmixing yet.
+---
+
+diff -up jorbis-0.0.17/com/jcraft/jorbis/Util.java~ jorbis-0.0.17/com/jcraft/jorbis/Util.java
+--- jorbis-0.0.17/com/jcraft/jorbis/Util.java~ 2008-05-07 10:01:31.000000000 +0200
++++ jorbis-0.0.17/com/jcraft/jorbis/Util.java 2010-11-05 11:46:01.289337997 +0100
+@@ -12,7 +12,8 @@ class Util{
+
+ static int ilog2(int v){
+ int ret=0;
+- while(v>1){
++ if (v>0)v--;
++ while(v>0){
+ ret++;
+ v>>>=1;
+ }
diff --git a/jorbis.spec b/jorbis.spec
new file mode 100644
index 0000000..6298290
--- /dev/null
+++ b/jorbis.spec
@@ -0,0 +1,100 @@
+Name: jorbis
+Version: 0.0.17
+Release: 4%{?dist}
+Summary: Pure Java Ogg Vorbis Decoder
+URL: http://www.jcraft.com/jorbis/
+License: LGPLv2+
+Group: System Environment/Libraries
+Source0: http://www.jcraft.com/jorbis/%{name}-%{version}.zip
+# Some fixes from the jorbis copy embedded in cortada. I've mailed upstream
+# asking them to integrate these, for more info also see:
+# https://trac.xiph.org/ticket/1565
+# Note that although the original git headers were left in place for reference
+# the actual patches have been rebased to 0.0.17 !
+Patch0: jorbis-0.0.17-cortado-fixes.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildArch: noarch
+BuildRequires: jpackage-utils java-devel
+Requires: java jpackage-utils
+# We used to also package the comment editor example, but that is not so
+# useful to end users (esp. the passing of cmdline args as java defines)
+Obsoletes: %{name}-comment <= 0.0.17-3
+
+%description
+JOrbis is a pure Java Ogg Vorbis decoder.
+
+
+%package javadoc
+Summary: Java docs for jorbis
+Group: Documentation
+Requires: %{name} = %{version}-%{release}
+
+%description javadoc
+This package contains the API documentation for jorbis.
+
+
+%package player
+Summary: Java applet for playing ogg-vorbis files from a browser
+License: GPLv2+
+Group: Applications/Multimedia
+Requires: %{name} = %{version}-%{release}
+
+%description player
+This package contains JOrbisPlayer a simple java applet for playing
+ogg-vorbis files from a browser.
+See %{_docdir}/%{name}-player-%{version}/JOrbisPlayer.html for
+an example how to embed and use the applet.
+
+
+%prep
+%setup -q
+%patch0 -p1
+
+
+%build
+javac com/jcraft/jogg/*.java com/jcraft/jorbis/*.java player/*.java
+jar cf jogg.jar com/jcraft/jogg/*.class
+jar cf jorbis.jar com/jcraft/jorbis/*.class
+jar cf JOrbisPlayer.jar player/*.class
+javadoc -d doc -public \
+ com/jcraft/jogg/*.java com/jcraft/jorbis/*.java player/*.java
+
+
+%install
+rm -rf $RPM_BUILD_ROOT
+mkdir -p $RPM_BUILD_ROOT%{_javadir}
+mkdir -p $RPM_BUILD_ROOT%{_javadocdir}
+cp -a *.jar $RPM_BUILD_ROOT%{_javadir}
+cp -a doc $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+
+%files
+%defattr(-,root,root,-)
+%doc ChangeLog COPYING.LIB README
+%{_javadir}/jogg.jar
+%{_javadir}/jorbis.jar
+
+%files javadoc
+%defattr(-,root,root,-)
+%doc %{_javadocdir}/%{name}
+
+%files player
+%defattr(-,root,root,-)
+%doc player/JOrbisPlayer.html
+%{_javadir}/JOrbisPlayer.jar
+
+
+%changelog
+* Tue Nov 9 2010 Hans de Goede <hdegoede at redhat.com> 0.0.17-4
+- Provide a clean upgrade path from the old orphaned F-12 jorbis package
+
+* Fri Nov 5 2010 Hans de Goede <hdegoede at redhat.com> 0.0.17-2
+- Fix mixed use of spaces and tabs in spec file (#649777)
+- Improved ilog2 fix in jorbis-0.0.17-cortado-fixes.patch
+
+* Thu Nov 4 2010 Hans de Goede <hdegoede at redhat.com> 0.0.17-1
+- Initial Fedora package
diff --git a/sources b/sources
new file mode 100644
index 0000000..2b2cc9c
--- /dev/null
+++ b/sources
@@ -0,0 +1 @@
+6141edfb16d34412a86c95a97fd4b10f jorbis-0.0.17.zip
More information about the scm-commits
mailing list