From 07cbb6640b88b8f21439a924b2b96677c60469b4 Mon Sep 17 00:00:00 2001 From: Hicham HAOUARI Date: Thu, 27 Jan 2011 15:20:41 +0000 Subject: [PATCH 01/13] Initial import --- .gitignore | 1 + TMatrixFormatConversionProvider.java | 182 +++++++++++++++++++++++++++ sources | 1 + vorbisspi.spec | 84 +++++++++++++ 4 files changed, 268 insertions(+) create mode 100644 TMatrixFormatConversionProvider.java create mode 100644 vorbisspi.spec diff --git a/.gitignore b/.gitignore index e69de29..3c92601 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1 @@ +/vorbisspi1.0.3.tar.gz diff --git a/TMatrixFormatConversionProvider.java b/TMatrixFormatConversionProvider.java new file mode 100644 index 0000000..05dca90 --- /dev/null +++ b/TMatrixFormatConversionProvider.java @@ -0,0 +1,182 @@ +/* + * TMatrixFormatConversionProvider.java + */ + +/* + * Copyright (c) 1999, 2000 by Matthias Pfisterer + * + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Library General Public License as published + * by the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * + */ + + +package org.tritonus.share.sampled.convert; + + +import java.util.Collection; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.HashMap; +import java.util.ArrayList; +import java.util.Iterator; + +import javax.sound.sampled.AudioFormat; +import javax.sound.sampled.AudioInputStream; +import javax.sound.sampled.spi.FormatConversionProvider; + +import org.tritonus.share.sampled.AudioFormats; +import org.tritonus.share.ArraySet; + +/** + * Base class for arbitrary formatConversionProviders. + * + * @author Matthias Pfisterer + */ + + +public abstract class TMatrixFormatConversionProvider + extends TSimpleFormatConversionProvider +{ + /* + * keys: source AudioFormat + * values: collection of possible target encodings + * + * Note that accessing values with get() is not appropriate, + * since the equals() method in AudioFormat is not overloaded. + * The hashtable is just used as a convenient storage + * organization. + */ + private Map m_targetEncodingsFromSourceFormat; + + + /* + * keys: source AudioFormat + * values: a Map that contains a mapping from target encodings + * (keys) to a collection of target formats (values). + * + * Note that accessing values with get() is not appropriate, + * since the equals() method in AudioFormat is not overloaded. + * The hashtable is just used as a convenient storage + * organization. + */ + private Map m_targetFormatsFromSourceFormat; + + + + protected TMatrixFormatConversionProvider( + List sourceFormats, + List targetFormats, + boolean[][] abConversionPossible) + { + super(sourceFormats, + targetFormats); + m_targetEncodingsFromSourceFormat = new HashMap(); + m_targetFormatsFromSourceFormat = new HashMap(); + + for (int nSourceFormat = 0; + nSourceFormat < sourceFormats.size(); + nSourceFormat++) + { + AudioFormat sourceFormat = (AudioFormat) sourceFormats.get(nSourceFormat); + List supportedTargetEncodings = new ArraySet(); + m_targetEncodingsFromSourceFormat.put(sourceFormat, supportedTargetEncodings); + Map targetFormatsFromTargetEncodings = new HashMap(); + m_targetFormatsFromSourceFormat.put(sourceFormat, targetFormatsFromTargetEncodings); + for (int nTargetFormat = 0; + nTargetFormat < targetFormats.size(); + nTargetFormat++) + { + AudioFormat targetFormat = (AudioFormat) targetFormats.get(nTargetFormat); + if (abConversionPossible[nSourceFormat][nTargetFormat]) + { + AudioFormat.Encoding targetEncoding = targetFormat.getEncoding(); + supportedTargetEncodings.add(targetEncoding); + Collection supportedTargetFormats = (Collection) targetFormatsFromTargetEncodings.get(targetEncoding); + if (supportedTargetFormats == null) + { + supportedTargetFormats = new ArraySet(); + targetFormatsFromTargetEncodings.put(targetEncoding, supportedTargetFormats); + } + supportedTargetFormats.add(targetFormat); + } + } + } + } + + + + public AudioFormat.Encoding[] getTargetEncodings(AudioFormat sourceFormat) + { + Iterator iterator = m_targetEncodingsFromSourceFormat.entrySet().iterator(); + while (iterator.hasNext()) + { + Map.Entry entry = (Map.Entry) iterator.next(); + AudioFormat format = (AudioFormat) entry.getKey(); + if (AudioFormats.matches(format, sourceFormat)) + { + Collection targetEncodings = (Collection) entry.getValue(); + return (AudioFormat.Encoding[]) targetEncodings.toArray(EMPTY_ENCODING_ARRAY); + } + + } + return EMPTY_ENCODING_ARRAY; + } + + + + // TODO: this should work on the array returned by getTargetEncodings(AudioFormat) +/* + public boolean isConversionSupported(AudioFormat.Encoding targetEncoding, AudioFormat sourceFormat) + { + return isAllowedSourceFormat(sourceFormat) && + isTargetEncodingSupported(targetEncoding); + } +*/ + + + + public AudioFormat[] getTargetFormats(AudioFormat.Encoding targetEncoding, AudioFormat sourceFormat) + { + Iterator iterator = m_targetFormatsFromSourceFormat.entrySet().iterator(); + while (iterator.hasNext()) + { + Map.Entry entry = (Map.Entry) iterator.next(); + AudioFormat format = (AudioFormat) entry.getKey(); + if (AudioFormats.matches(format, sourceFormat)) + { + Map targetEncodings = (Map) entry.getValue(); + Collection targetFormats = (Collection) targetEncodings.get(targetEncoding); + if (targetFormats != null) + { + return (AudioFormat[]) targetFormats.toArray(EMPTY_FORMAT_ARRAY); + } + else + { + return EMPTY_FORMAT_ARRAY; + } + } + + } + return EMPTY_FORMAT_ARRAY; + } + + +} + + + +/*** TMatrixFormatConversionProvider.java ***/ diff --git a/sources b/sources index e69de29..8a6cfd8 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +636675d1746a4e41e186f2203685a6a0 vorbisspi1.0.3.tar.gz diff --git a/vorbisspi.spec b/vorbisspi.spec new file mode 100644 index 0000000..96e8adf --- /dev/null +++ b/vorbisspi.spec @@ -0,0 +1,84 @@ +Name: vorbisspi +Version: 1.0.3 +Release: 2%{?dist} +Summary: Java Service Provider Interface for the OGG Vorbis audio format + +Group: Development/Libraries +License: LGPLv2+ +URL: http://www.javazoom.net/vorbisspi/vorbisspi.html +Source0: http://www.javazoom.net/%{name}/sources/%{name}%{version}.tar.gz +# Sample class implementation removed from tritonus_share.jar currently shipped by fedora, +# but necessary to build this package +Source1: http://tritonus.cvs.sourceforge.net/viewvc/tritonus/tritonus/src/org/tritonus/share/sampled/convert/TMatrixFormatConversionProvider.java +BuildArch: noarch + +BuildRequires: jpackage-utils +BuildRequires: java-devel >= 1:1.6.0 +BuildRequires: ant +BuildRequires: tritonus +BuildRequires: jorbis + +Requires: jpackage-utils +Requires: java >= 1:1.6.0 +Requires: tritonus +Requires: jorbis + +%description +VorbisSPI is a Java Service Provider Interface that adds OGG Vorbis audio +format support to Java platform. It supports Icecast streaming. It is +based on JOrbis Java libraries. + +OGG Vorbis is a fully Open, non-proprietary, patent-and-royalty-free, +general-purpose compressed audio format for high quality (44.1-48.0kHz, +16+ bit, polyphonic) audio and music at fixed and variable bit rates from +16 to 128 Kbps/channel. This places Vorbis in the same class as audio +representations including MPEG-1 audio layer 3, MPEG-4 audio +(AAC and TwinVQ), and PAC. + +%package javadoc +Summary: Java docs for %{name} +Group: Documentation +Requires: jpackage-utils + +%description javadoc +This package contains the API documentation for %{name}. + +%prep +%setup -q -n VorbisSPI%{version} +# Make sure to remove all prebuilt classes and jars +find . \( -name '*.class' -o -name '*.jar' \) -exec rm -rf '{}' \; +# Remove the docs dir if it is already there +[ -d docs ] && rm -rf docs +# Fix end of line encoding +sed -i 's|\r||g' *.txt + +# Put the sample class where it should be +cp -p %{SOURCE1} src/javazoom/spi/vorbis/sampled/convert + +%build +%ant all -Dtritonusjar=%{_libdir}/tritonus/tritonus_share.jar \ + -Djorbisjar=$(build-classpath jorbis) \ + -Doggjar=$(build-classpath jogg) + +%install +install -Dpm 644 %{name}%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar +mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name} +cp -rp docs $RPM_BUILD_ROOT%{_javadocdir}/%{name} + + +%files +%defattr(-,root,root,-) +%doc LICENSE.txt README.txt +%{_javadir}/%{name}.jar + +%files javadoc +%defattr(-,root,root,-) +%doc LICENSE.txt +%{_javadocdir}/%{name} + +%changelog +* Tue Jan 25 2011 Hicham HAOUARI - 1.0.3-2 +- Spec cleanup per https://bugzilla.redhat.com/show_bug.cgi?id=664615#c2 + +* Mon Dec 20 2010 Hicham HAOUARI - 1.0.3-1 +- Initial package for Fedora From 424eb7f90976495bfda01b3a95adf116a19c4df5 Mon Sep 17 00:00:00 2001 From: Hicham HAOUARI Date: Thu, 27 Jan 2011 15:21:57 +0000 Subject: [PATCH 02/13] Initial import --- .gitignore | 1 + TMatrixFormatConversionProvider.java | 182 +++++++++++++++++++++++++++ sources | 1 + vorbisspi.spec | 84 +++++++++++++ 4 files changed, 268 insertions(+) create mode 100644 TMatrixFormatConversionProvider.java create mode 100644 vorbisspi.spec diff --git a/.gitignore b/.gitignore index e69de29..3c92601 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1 @@ +/vorbisspi1.0.3.tar.gz diff --git a/TMatrixFormatConversionProvider.java b/TMatrixFormatConversionProvider.java new file mode 100644 index 0000000..05dca90 --- /dev/null +++ b/TMatrixFormatConversionProvider.java @@ -0,0 +1,182 @@ +/* + * TMatrixFormatConversionProvider.java + */ + +/* + * Copyright (c) 1999, 2000 by Matthias Pfisterer + * + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Library General Public License as published + * by the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * + */ + + +package org.tritonus.share.sampled.convert; + + +import java.util.Collection; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.HashMap; +import java.util.ArrayList; +import java.util.Iterator; + +import javax.sound.sampled.AudioFormat; +import javax.sound.sampled.AudioInputStream; +import javax.sound.sampled.spi.FormatConversionProvider; + +import org.tritonus.share.sampled.AudioFormats; +import org.tritonus.share.ArraySet; + +/** + * Base class for arbitrary formatConversionProviders. + * + * @author Matthias Pfisterer + */ + + +public abstract class TMatrixFormatConversionProvider + extends TSimpleFormatConversionProvider +{ + /* + * keys: source AudioFormat + * values: collection of possible target encodings + * + * Note that accessing values with get() is not appropriate, + * since the equals() method in AudioFormat is not overloaded. + * The hashtable is just used as a convenient storage + * organization. + */ + private Map m_targetEncodingsFromSourceFormat; + + + /* + * keys: source AudioFormat + * values: a Map that contains a mapping from target encodings + * (keys) to a collection of target formats (values). + * + * Note that accessing values with get() is not appropriate, + * since the equals() method in AudioFormat is not overloaded. + * The hashtable is just used as a convenient storage + * organization. + */ + private Map m_targetFormatsFromSourceFormat; + + + + protected TMatrixFormatConversionProvider( + List sourceFormats, + List targetFormats, + boolean[][] abConversionPossible) + { + super(sourceFormats, + targetFormats); + m_targetEncodingsFromSourceFormat = new HashMap(); + m_targetFormatsFromSourceFormat = new HashMap(); + + for (int nSourceFormat = 0; + nSourceFormat < sourceFormats.size(); + nSourceFormat++) + { + AudioFormat sourceFormat = (AudioFormat) sourceFormats.get(nSourceFormat); + List supportedTargetEncodings = new ArraySet(); + m_targetEncodingsFromSourceFormat.put(sourceFormat, supportedTargetEncodings); + Map targetFormatsFromTargetEncodings = new HashMap(); + m_targetFormatsFromSourceFormat.put(sourceFormat, targetFormatsFromTargetEncodings); + for (int nTargetFormat = 0; + nTargetFormat < targetFormats.size(); + nTargetFormat++) + { + AudioFormat targetFormat = (AudioFormat) targetFormats.get(nTargetFormat); + if (abConversionPossible[nSourceFormat][nTargetFormat]) + { + AudioFormat.Encoding targetEncoding = targetFormat.getEncoding(); + supportedTargetEncodings.add(targetEncoding); + Collection supportedTargetFormats = (Collection) targetFormatsFromTargetEncodings.get(targetEncoding); + if (supportedTargetFormats == null) + { + supportedTargetFormats = new ArraySet(); + targetFormatsFromTargetEncodings.put(targetEncoding, supportedTargetFormats); + } + supportedTargetFormats.add(targetFormat); + } + } + } + } + + + + public AudioFormat.Encoding[] getTargetEncodings(AudioFormat sourceFormat) + { + Iterator iterator = m_targetEncodingsFromSourceFormat.entrySet().iterator(); + while (iterator.hasNext()) + { + Map.Entry entry = (Map.Entry) iterator.next(); + AudioFormat format = (AudioFormat) entry.getKey(); + if (AudioFormats.matches(format, sourceFormat)) + { + Collection targetEncodings = (Collection) entry.getValue(); + return (AudioFormat.Encoding[]) targetEncodings.toArray(EMPTY_ENCODING_ARRAY); + } + + } + return EMPTY_ENCODING_ARRAY; + } + + + + // TODO: this should work on the array returned by getTargetEncodings(AudioFormat) +/* + public boolean isConversionSupported(AudioFormat.Encoding targetEncoding, AudioFormat sourceFormat) + { + return isAllowedSourceFormat(sourceFormat) && + isTargetEncodingSupported(targetEncoding); + } +*/ + + + + public AudioFormat[] getTargetFormats(AudioFormat.Encoding targetEncoding, AudioFormat sourceFormat) + { + Iterator iterator = m_targetFormatsFromSourceFormat.entrySet().iterator(); + while (iterator.hasNext()) + { + Map.Entry entry = (Map.Entry) iterator.next(); + AudioFormat format = (AudioFormat) entry.getKey(); + if (AudioFormats.matches(format, sourceFormat)) + { + Map targetEncodings = (Map) entry.getValue(); + Collection targetFormats = (Collection) targetEncodings.get(targetEncoding); + if (targetFormats != null) + { + return (AudioFormat[]) targetFormats.toArray(EMPTY_FORMAT_ARRAY); + } + else + { + return EMPTY_FORMAT_ARRAY; + } + } + + } + return EMPTY_FORMAT_ARRAY; + } + + +} + + + +/*** TMatrixFormatConversionProvider.java ***/ diff --git a/sources b/sources index e69de29..8a6cfd8 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +636675d1746a4e41e186f2203685a6a0 vorbisspi1.0.3.tar.gz diff --git a/vorbisspi.spec b/vorbisspi.spec new file mode 100644 index 0000000..96e8adf --- /dev/null +++ b/vorbisspi.spec @@ -0,0 +1,84 @@ +Name: vorbisspi +Version: 1.0.3 +Release: 2%{?dist} +Summary: Java Service Provider Interface for the OGG Vorbis audio format + +Group: Development/Libraries +License: LGPLv2+ +URL: http://www.javazoom.net/vorbisspi/vorbisspi.html +Source0: http://www.javazoom.net/%{name}/sources/%{name}%{version}.tar.gz +# Sample class implementation removed from tritonus_share.jar currently shipped by fedora, +# but necessary to build this package +Source1: http://tritonus.cvs.sourceforge.net/viewvc/tritonus/tritonus/src/org/tritonus/share/sampled/convert/TMatrixFormatConversionProvider.java +BuildArch: noarch + +BuildRequires: jpackage-utils +BuildRequires: java-devel >= 1:1.6.0 +BuildRequires: ant +BuildRequires: tritonus +BuildRequires: jorbis + +Requires: jpackage-utils +Requires: java >= 1:1.6.0 +Requires: tritonus +Requires: jorbis + +%description +VorbisSPI is a Java Service Provider Interface that adds OGG Vorbis audio +format support to Java platform. It supports Icecast streaming. It is +based on JOrbis Java libraries. + +OGG Vorbis is a fully Open, non-proprietary, patent-and-royalty-free, +general-purpose compressed audio format for high quality (44.1-48.0kHz, +16+ bit, polyphonic) audio and music at fixed and variable bit rates from +16 to 128 Kbps/channel. This places Vorbis in the same class as audio +representations including MPEG-1 audio layer 3, MPEG-4 audio +(AAC and TwinVQ), and PAC. + +%package javadoc +Summary: Java docs for %{name} +Group: Documentation +Requires: jpackage-utils + +%description javadoc +This package contains the API documentation for %{name}. + +%prep +%setup -q -n VorbisSPI%{version} +# Make sure to remove all prebuilt classes and jars +find . \( -name '*.class' -o -name '*.jar' \) -exec rm -rf '{}' \; +# Remove the docs dir if it is already there +[ -d docs ] && rm -rf docs +# Fix end of line encoding +sed -i 's|\r||g' *.txt + +# Put the sample class where it should be +cp -p %{SOURCE1} src/javazoom/spi/vorbis/sampled/convert + +%build +%ant all -Dtritonusjar=%{_libdir}/tritonus/tritonus_share.jar \ + -Djorbisjar=$(build-classpath jorbis) \ + -Doggjar=$(build-classpath jogg) + +%install +install -Dpm 644 %{name}%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar +mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name} +cp -rp docs $RPM_BUILD_ROOT%{_javadocdir}/%{name} + + +%files +%defattr(-,root,root,-) +%doc LICENSE.txt README.txt +%{_javadir}/%{name}.jar + +%files javadoc +%defattr(-,root,root,-) +%doc LICENSE.txt +%{_javadocdir}/%{name} + +%changelog +* Tue Jan 25 2011 Hicham HAOUARI - 1.0.3-2 +- Spec cleanup per https://bugzilla.redhat.com/show_bug.cgi?id=664615#c2 + +* Mon Dec 20 2010 Hicham HAOUARI - 1.0.3-1 +- Initial package for Fedora From f010818079cbf8dea7e92bd01dd88d5aaa87e766 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Mon, 7 Feb 2011 19:50:50 -0600 Subject: [PATCH 03/13] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- vorbisspi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vorbisspi.spec b/vorbisspi.spec index 96e8adf..50b95e7 100644 --- a/vorbisspi.spec +++ b/vorbisspi.spec @@ -1,6 +1,6 @@ Name: vorbisspi Version: 1.0.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Java Service Provider Interface for the OGG Vorbis audio format Group: Development/Libraries @@ -77,6 +77,9 @@ cp -rp docs $RPM_BUILD_ROOT%{_javadocdir}/%{name} %{_javadocdir}/%{name} %changelog +* Mon Feb 07 2011 Fedora Release Engineering - 1.0.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Tue Jan 25 2011 Hicham HAOUARI - 1.0.3-2 - Spec cleanup per https://bugzilla.redhat.com/show_bug.cgi?id=664615#c2 From 3bf4b8ec9ea6c1860f69851375b301b3434e2312 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 14 Jan 2012 02:04:03 -0600 Subject: [PATCH 04/13] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- vorbisspi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vorbisspi.spec b/vorbisspi.spec index 50b95e7..4fda5ed 100644 --- a/vorbisspi.spec +++ b/vorbisspi.spec @@ -1,6 +1,6 @@ Name: vorbisspi Version: 1.0.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Java Service Provider Interface for the OGG Vorbis audio format Group: Development/Libraries @@ -77,6 +77,9 @@ cp -rp docs $RPM_BUILD_ROOT%{_javadocdir}/%{name} %{_javadocdir}/%{name} %changelog +* Sat Jan 14 2012 Fedora Release Engineering - 1.0.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Mon Feb 07 2011 Fedora Release Engineering - 1.0.3-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From e9d74b7af0783a43691934209ffe25cff24f92cf Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Tue, 10 Jul 2012 11:12:32 +0200 Subject: [PATCH 05/13] Fix FTBFS (rhbz#716071) --- vorbisspi.spec | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/vorbisspi.spec b/vorbisspi.spec index 4fda5ed..bb8986f 100644 --- a/vorbisspi.spec +++ b/vorbisspi.spec @@ -1,6 +1,6 @@ Name: vorbisspi Version: 1.0.3 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Java Service Provider Interface for the OGG Vorbis audio format Group: Development/Libraries @@ -17,7 +17,7 @@ BuildRequires: java-devel >= 1:1.6.0 BuildRequires: ant BuildRequires: tritonus BuildRequires: jorbis - + Requires: jpackage-utils Requires: java >= 1:1.6.0 Requires: tritonus @@ -56,7 +56,7 @@ sed -i 's|\r||g' *.txt cp -p %{SOURCE1} src/javazoom/spi/vorbis/sampled/convert %build -%ant all -Dtritonusjar=%{_libdir}/tritonus/tritonus_share.jar \ +%ant all -Dtritonusjar=$(build-classpath tritonus/tritonus_share) \ -Djorbisjar=$(build-classpath jorbis) \ -Doggjar=$(build-classpath jogg) @@ -67,16 +67,17 @@ cp -rp docs $RPM_BUILD_ROOT%{_javadocdir}/%{name} %files -%defattr(-,root,root,-) %doc LICENSE.txt README.txt %{_javadir}/%{name}.jar %files javadoc -%defattr(-,root,root,-) %doc LICENSE.txt %{_javadocdir}/%{name} %changelog +* Tue Jul 10 2012 Hans de Goede - 1.0.3-5 +- Fix FTBFS (rhbz#716071) + * Sat Jan 14 2012 Fedora Release Engineering - 1.0.3-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild From 7025eaea0cf0b585e01b8557c48bd3e8a1281c5a Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 21 Jul 2012 22:01:48 -0500 Subject: [PATCH 06/13] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- vorbisspi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vorbisspi.spec b/vorbisspi.spec index bb8986f..76b3dbf 100644 --- a/vorbisspi.spec +++ b/vorbisspi.spec @@ -1,6 +1,6 @@ Name: vorbisspi Version: 1.0.3 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Java Service Provider Interface for the OGG Vorbis audio format Group: Development/Libraries @@ -75,6 +75,9 @@ cp -rp docs $RPM_BUILD_ROOT%{_javadocdir}/%{name} %{_javadocdir}/%{name} %changelog +* Sun Jul 22 2012 Fedora Release Engineering - 1.0.3-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Tue Jul 10 2012 Hans de Goede - 1.0.3-5 - Fix FTBFS (rhbz#716071) From 7aa1c0f3df435dc2af73169122bba48cbf71927e Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 14 Feb 2013 20:54:15 -0600 Subject: [PATCH 07/13] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- vorbisspi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vorbisspi.spec b/vorbisspi.spec index 76b3dbf..969ccf1 100644 --- a/vorbisspi.spec +++ b/vorbisspi.spec @@ -1,6 +1,6 @@ Name: vorbisspi Version: 1.0.3 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Java Service Provider Interface for the OGG Vorbis audio format Group: Development/Libraries @@ -75,6 +75,9 @@ cp -rp docs $RPM_BUILD_ROOT%{_javadocdir}/%{name} %{_javadocdir}/%{name} %changelog +* Fri Feb 15 2013 Fedora Release Engineering - 1.0.3-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Sun Jul 22 2012 Fedora Release Engineering - 1.0.3-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild From 905046c91bdfe664663e22648ab00cd3a2e3a984 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 4 Aug 2013 01:27:29 -0500 Subject: [PATCH 08/13] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- vorbisspi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vorbisspi.spec b/vorbisspi.spec index 969ccf1..cd133f6 100644 --- a/vorbisspi.spec +++ b/vorbisspi.spec @@ -1,6 +1,6 @@ Name: vorbisspi Version: 1.0.3 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Java Service Provider Interface for the OGG Vorbis audio format Group: Development/Libraries @@ -75,6 +75,9 @@ cp -rp docs $RPM_BUILD_ROOT%{_javadocdir}/%{name} %{_javadocdir}/%{name} %changelog +* Sun Aug 04 2013 Fedora Release Engineering - 1.0.3-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Fri Feb 15 2013 Fedora Release Engineering - 1.0.3-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild From eb97e6e41ba7a53241163b089cc1a4ccb8604e4d Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 7 Jun 2014 22:59:03 -0500 Subject: [PATCH 09/13] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- vorbisspi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vorbisspi.spec b/vorbisspi.spec index cd133f6..95fcd15 100644 --- a/vorbisspi.spec +++ b/vorbisspi.spec @@ -1,6 +1,6 @@ Name: vorbisspi Version: 1.0.3 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Java Service Provider Interface for the OGG Vorbis audio format Group: Development/Libraries @@ -75,6 +75,9 @@ cp -rp docs $RPM_BUILD_ROOT%{_javadocdir}/%{name} %{_javadocdir}/%{name} %changelog +* Sun Jun 08 2014 Fedora Release Engineering - 1.0.3-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Sun Aug 04 2013 Fedora Release Engineering - 1.0.3-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild From 343ef891d247139be53d31fcbd4061c4f23c3b93 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 19 Jun 2015 02:08:40 +0000 Subject: [PATCH 10/13] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- vorbisspi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vorbisspi.spec b/vorbisspi.spec index 95fcd15..8ccc919 100644 --- a/vorbisspi.spec +++ b/vorbisspi.spec @@ -1,6 +1,6 @@ Name: vorbisspi Version: 1.0.3 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Java Service Provider Interface for the OGG Vorbis audio format Group: Development/Libraries @@ -75,6 +75,9 @@ cp -rp docs $RPM_BUILD_ROOT%{_javadocdir}/%{name} %{_javadocdir}/%{name} %changelog +* Fri Jun 19 2015 Fedora Release Engineering - 1.0.3-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Sun Jun 08 2014 Fedora Release Engineering - 1.0.3-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From 2d1b5dd9025649c119c8963816068c8705bbe99e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 5 Feb 2016 02:49:58 +0000 Subject: [PATCH 11/13] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- vorbisspi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vorbisspi.spec b/vorbisspi.spec index 8ccc919..60dbdac 100644 --- a/vorbisspi.spec +++ b/vorbisspi.spec @@ -1,6 +1,6 @@ Name: vorbisspi Version: 1.0.3 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Java Service Provider Interface for the OGG Vorbis audio format Group: Development/Libraries @@ -75,6 +75,9 @@ cp -rp docs $RPM_BUILD_ROOT%{_javadocdir}/%{name} %{_javadocdir}/%{name} %changelog +* Fri Feb 05 2016 Fedora Release Engineering - 1.0.3-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Fri Jun 19 2015 Fedora Release Engineering - 1.0.3-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From bbb7f4172800e58f02c976b284d6c208ecbde144 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 11 Feb 2017 17:10:53 +0000 Subject: [PATCH 12/13] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- vorbisspi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vorbisspi.spec b/vorbisspi.spec index 60dbdac..ea2cf9f 100644 --- a/vorbisspi.spec +++ b/vorbisspi.spec @@ -1,6 +1,6 @@ Name: vorbisspi Version: 1.0.3 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Java Service Provider Interface for the OGG Vorbis audio format Group: Development/Libraries @@ -75,6 +75,9 @@ cp -rp docs $RPM_BUILD_ROOT%{_javadocdir}/%{name} %{_javadocdir}/%{name} %changelog +* Sat Feb 11 2017 Fedora Release Engineering - 1.0.3-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Fri Feb 05 2016 Fedora Release Engineering - 1.0.3-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From 389310a08adb7619307cb12eae6dcd179a1617f4 Mon Sep 17 00:00:00 2001 From: Till Maas Date: Fri, 17 Feb 2017 19:50:25 +0100 Subject: [PATCH 13/13] 2017-02-17: Retired orphaned package, because it was orphaned for more than six weeks. --- .gitignore | 1 - TMatrixFormatConversionProvider.java | 182 --------------------------- dead.package | 3 + sources | 1 - vorbisspi.spec | 112 ----------------- 5 files changed, 3 insertions(+), 296 deletions(-) delete mode 100644 .gitignore delete mode 100644 TMatrixFormatConversionProvider.java create mode 100644 dead.package delete mode 100644 sources delete mode 100644 vorbisspi.spec diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 3c92601..0000000 --- a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/vorbisspi1.0.3.tar.gz diff --git a/TMatrixFormatConversionProvider.java b/TMatrixFormatConversionProvider.java deleted file mode 100644 index 05dca90..0000000 --- a/TMatrixFormatConversionProvider.java +++ /dev/null @@ -1,182 +0,0 @@ -/* - * TMatrixFormatConversionProvider.java - */ - -/* - * Copyright (c) 1999, 2000 by Matthias Pfisterer - * - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Library General Public License as published - * by the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * - */ - - -package org.tritonus.share.sampled.convert; - - -import java.util.Collection; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.HashMap; -import java.util.ArrayList; -import java.util.Iterator; - -import javax.sound.sampled.AudioFormat; -import javax.sound.sampled.AudioInputStream; -import javax.sound.sampled.spi.FormatConversionProvider; - -import org.tritonus.share.sampled.AudioFormats; -import org.tritonus.share.ArraySet; - -/** - * Base class for arbitrary formatConversionProviders. - * - * @author Matthias Pfisterer - */ - - -public abstract class TMatrixFormatConversionProvider - extends TSimpleFormatConversionProvider -{ - /* - * keys: source AudioFormat - * values: collection of possible target encodings - * - * Note that accessing values with get() is not appropriate, - * since the equals() method in AudioFormat is not overloaded. - * The hashtable is just used as a convenient storage - * organization. - */ - private Map m_targetEncodingsFromSourceFormat; - - - /* - * keys: source AudioFormat - * values: a Map that contains a mapping from target encodings - * (keys) to a collection of target formats (values). - * - * Note that accessing values with get() is not appropriate, - * since the equals() method in AudioFormat is not overloaded. - * The hashtable is just used as a convenient storage - * organization. - */ - private Map m_targetFormatsFromSourceFormat; - - - - protected TMatrixFormatConversionProvider( - List sourceFormats, - List targetFormats, - boolean[][] abConversionPossible) - { - super(sourceFormats, - targetFormats); - m_targetEncodingsFromSourceFormat = new HashMap(); - m_targetFormatsFromSourceFormat = new HashMap(); - - for (int nSourceFormat = 0; - nSourceFormat < sourceFormats.size(); - nSourceFormat++) - { - AudioFormat sourceFormat = (AudioFormat) sourceFormats.get(nSourceFormat); - List supportedTargetEncodings = new ArraySet(); - m_targetEncodingsFromSourceFormat.put(sourceFormat, supportedTargetEncodings); - Map targetFormatsFromTargetEncodings = new HashMap(); - m_targetFormatsFromSourceFormat.put(sourceFormat, targetFormatsFromTargetEncodings); - for (int nTargetFormat = 0; - nTargetFormat < targetFormats.size(); - nTargetFormat++) - { - AudioFormat targetFormat = (AudioFormat) targetFormats.get(nTargetFormat); - if (abConversionPossible[nSourceFormat][nTargetFormat]) - { - AudioFormat.Encoding targetEncoding = targetFormat.getEncoding(); - supportedTargetEncodings.add(targetEncoding); - Collection supportedTargetFormats = (Collection) targetFormatsFromTargetEncodings.get(targetEncoding); - if (supportedTargetFormats == null) - { - supportedTargetFormats = new ArraySet(); - targetFormatsFromTargetEncodings.put(targetEncoding, supportedTargetFormats); - } - supportedTargetFormats.add(targetFormat); - } - } - } - } - - - - public AudioFormat.Encoding[] getTargetEncodings(AudioFormat sourceFormat) - { - Iterator iterator = m_targetEncodingsFromSourceFormat.entrySet().iterator(); - while (iterator.hasNext()) - { - Map.Entry entry = (Map.Entry) iterator.next(); - AudioFormat format = (AudioFormat) entry.getKey(); - if (AudioFormats.matches(format, sourceFormat)) - { - Collection targetEncodings = (Collection) entry.getValue(); - return (AudioFormat.Encoding[]) targetEncodings.toArray(EMPTY_ENCODING_ARRAY); - } - - } - return EMPTY_ENCODING_ARRAY; - } - - - - // TODO: this should work on the array returned by getTargetEncodings(AudioFormat) -/* - public boolean isConversionSupported(AudioFormat.Encoding targetEncoding, AudioFormat sourceFormat) - { - return isAllowedSourceFormat(sourceFormat) && - isTargetEncodingSupported(targetEncoding); - } -*/ - - - - public AudioFormat[] getTargetFormats(AudioFormat.Encoding targetEncoding, AudioFormat sourceFormat) - { - Iterator iterator = m_targetFormatsFromSourceFormat.entrySet().iterator(); - while (iterator.hasNext()) - { - Map.Entry entry = (Map.Entry) iterator.next(); - AudioFormat format = (AudioFormat) entry.getKey(); - if (AudioFormats.matches(format, sourceFormat)) - { - Map targetEncodings = (Map) entry.getValue(); - Collection targetFormats = (Collection) targetEncodings.get(targetEncoding); - if (targetFormats != null) - { - return (AudioFormat[]) targetFormats.toArray(EMPTY_FORMAT_ARRAY); - } - else - { - return EMPTY_FORMAT_ARRAY; - } - } - - } - return EMPTY_FORMAT_ARRAY; - } - - -} - - - -/*** TMatrixFormatConversionProvider.java ***/ diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..1eda3ff --- /dev/null +++ b/dead.package @@ -0,0 +1,3 @@ +2017-02-17: Retired orphaned package, because it was orphaned for +more than six weeks. + diff --git a/sources b/sources deleted file mode 100644 index 8a6cfd8..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -636675d1746a4e41e186f2203685a6a0 vorbisspi1.0.3.tar.gz diff --git a/vorbisspi.spec b/vorbisspi.spec deleted file mode 100644 index ea2cf9f..0000000 --- a/vorbisspi.spec +++ /dev/null @@ -1,112 +0,0 @@ -Name: vorbisspi -Version: 1.0.3 -Release: 12%{?dist} -Summary: Java Service Provider Interface for the OGG Vorbis audio format - -Group: Development/Libraries -License: LGPLv2+ -URL: http://www.javazoom.net/vorbisspi/vorbisspi.html -Source0: http://www.javazoom.net/%{name}/sources/%{name}%{version}.tar.gz -# Sample class implementation removed from tritonus_share.jar currently shipped by fedora, -# but necessary to build this package -Source1: http://tritonus.cvs.sourceforge.net/viewvc/tritonus/tritonus/src/org/tritonus/share/sampled/convert/TMatrixFormatConversionProvider.java -BuildArch: noarch - -BuildRequires: jpackage-utils -BuildRequires: java-devel >= 1:1.6.0 -BuildRequires: ant -BuildRequires: tritonus -BuildRequires: jorbis - -Requires: jpackage-utils -Requires: java >= 1:1.6.0 -Requires: tritonus -Requires: jorbis - -%description -VorbisSPI is a Java Service Provider Interface that adds OGG Vorbis audio -format support to Java platform. It supports Icecast streaming. It is -based on JOrbis Java libraries. - -OGG Vorbis is a fully Open, non-proprietary, patent-and-royalty-free, -general-purpose compressed audio format for high quality (44.1-48.0kHz, -16+ bit, polyphonic) audio and music at fixed and variable bit rates from -16 to 128 Kbps/channel. This places Vorbis in the same class as audio -representations including MPEG-1 audio layer 3, MPEG-4 audio -(AAC and TwinVQ), and PAC. - -%package javadoc -Summary: Java docs for %{name} -Group: Documentation -Requires: jpackage-utils - -%description javadoc -This package contains the API documentation for %{name}. - -%prep -%setup -q -n VorbisSPI%{version} -# Make sure to remove all prebuilt classes and jars -find . \( -name '*.class' -o -name '*.jar' \) -exec rm -rf '{}' \; -# Remove the docs dir if it is already there -[ -d docs ] && rm -rf docs -# Fix end of line encoding -sed -i 's|\r||g' *.txt - -# Put the sample class where it should be -cp -p %{SOURCE1} src/javazoom/spi/vorbis/sampled/convert - -%build -%ant all -Dtritonusjar=$(build-classpath tritonus/tritonus_share) \ - -Djorbisjar=$(build-classpath jorbis) \ - -Doggjar=$(build-classpath jogg) - -%install -install -Dpm 644 %{name}%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar -mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name} -cp -rp docs $RPM_BUILD_ROOT%{_javadocdir}/%{name} - - -%files -%doc LICENSE.txt README.txt -%{_javadir}/%{name}.jar - -%files javadoc -%doc LICENSE.txt -%{_javadocdir}/%{name} - -%changelog -* Sat Feb 11 2017 Fedora Release Engineering - 1.0.3-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Fri Feb 05 2016 Fedora Release Engineering - 1.0.3-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Fri Jun 19 2015 Fedora Release Engineering - 1.0.3-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Sun Jun 08 2014 Fedora Release Engineering - 1.0.3-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Sun Aug 04 2013 Fedora Release Engineering - 1.0.3-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Fri Feb 15 2013 Fedora Release Engineering - 1.0.3-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Sun Jul 22 2012 Fedora Release Engineering - 1.0.3-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Tue Jul 10 2012 Hans de Goede - 1.0.3-5 -- Fix FTBFS (rhbz#716071) - -* Sat Jan 14 2012 Fedora Release Engineering - 1.0.3-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Mon Feb 07 2011 Fedora Release Engineering - 1.0.3-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Tue Jan 25 2011 Hicham HAOUARI - 1.0.3-2 -- Spec cleanup per https://bugzilla.redhat.com/show_bug.cgi?id=664615#c2 - -* Mon Dec 20 2010 Hicham HAOUARI - 1.0.3-1 -- Initial package for Fedora