From 26fdc176b55a10a00a7ba0572f233e4891705ba8 Mon Sep 17 00:00:00 2001 From: Stefan Paletta Date: Wed, 31 Jan 2007 17:51:58 +0000 Subject: [PATCH] Stefan Paletta: split the ogg-vorbis package into separate packages [2006122017540524460] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@8174 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/base/libogg/libogg.desc | 44 +++++++++++++++++ package/base/libvorbis/libvorbis.desc | 49 +++++++++++++++++++ package/base/ogg-vorbis/ogg-vorbis.conf | 29 ----------- package/kasc/clanlib/subconfig-libs.in | 2 +- package/kasc/openal/subconfig-libs.hlp | 2 +- package/kasc/openal/subconfig-libs.in | 4 +- package/public/ffmpeg/ffmpeg.conf | 3 +- package/public/libao/libao.desc | 43 ++++++++++++++++ .../vorbis-tools/vorbis-tools.desc} | 32 ++++-------- package/stf/avview/ffmpeg/ffmpeg.conf | 3 +- 10 files changed, 154 insertions(+), 57 deletions(-) create mode 100644 package/base/libogg/libogg.desc create mode 100644 package/base/libvorbis/libvorbis.desc delete mode 100644 package/base/ogg-vorbis/ogg-vorbis.conf create mode 100644 package/public/libao/libao.desc rename package/{base/ogg-vorbis/ogg-vorbis.desc => public/vorbis-tools/vorbis-tools.desc} (53%) diff --git a/package/base/libogg/libogg.desc b/package/base/libogg/libogg.desc new file mode 100644 index 000000000..15e815eab --- /dev/null +++ b/package/base/libogg/libogg.desc @@ -0,0 +1,44 @@ + +[COPY] --- ROCK-COPYRIGHT-NOTE-BEGIN --- +[COPY] +[COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. +[COPY] Please add additional copyright information _after_ the line containing +[COPY] the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by +[COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text! +[COPY] +[COPY] ROCK Linux: rock-src/package/base/libogg/libogg.desc +[COPY] ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf +[COPY] +[COPY] This program is free software; you can redistribute it and/or modify +[COPY] it under the terms of the GNU General Public License as published by +[COPY] the Free Software Foundation; either version 2 of the License, or +[COPY] (at your option) any later version. A copy of the GNU General Public +[COPY] License can be found at Documentation/COPYING. +[COPY] +[COPY] Many people helped and are helping developing ROCK Linux. Please +[COPY] have a look at http://www.rocklinux.org/ and the Documentation/TEAM +[COPY] file for details. +[COPY] +[COPY] --- ROCK-COPYRIGHT-NOTE-END --- + +[I] The Ogg container format + +[T] Ogg is a multimedia container format, and the native file and +[T] stream format for the Xiph.org multimedia codecs. + +[U] http://www.xiph.org/ + +[A] xiph.org contributors +[M] The ROCK Linux Project + +[C] extra/multimedia + +[F] CORE +[L] BSD +[S] Stable +[V] 1.1.3 + +[P] X -?---5---9 120.801 + +[D] 1662594677 libogg-1.1.3.tar.gz http://downloads.xiph.org/releases/ogg/ + diff --git a/package/base/libvorbis/libvorbis.desc b/package/base/libvorbis/libvorbis.desc new file mode 100644 index 000000000..b24e8f25d --- /dev/null +++ b/package/base/libvorbis/libvorbis.desc @@ -0,0 +1,49 @@ + +[COPY] --- ROCK-COPYRIGHT-NOTE-BEGIN --- +[COPY] +[COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. +[COPY] Please add additional copyright information _after_ the line containing +[COPY] the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by +[COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text! +[COPY] +[COPY] ROCK Linux: rock-src/package/base/libvorbis/libvorbis.desc +[COPY] ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf +[COPY] +[COPY] This program is free software; you can redistribute it and/or modify +[COPY] it under the terms of the GNU General Public License as published by +[COPY] the Free Software Foundation; either version 2 of the License, or +[COPY] (at your option) any later version. A copy of the GNU General Public +[COPY] License can be found at Documentation/COPYING. +[COPY] +[COPY] Many people helped and are helping developing ROCK Linux. Please +[COPY] have a look at http://www.rocklinux.org/ and the Documentation/TEAM +[COPY] file for details. +[COPY] +[COPY] --- ROCK-COPYRIGHT-NOTE-END --- + +[I] The Vorbis audio compression codec + +[T] Ogg Vorbis is a fully open, non-proprietary, patent-and-royalty-free, +[T] general-purpose compressed audio format for mid to high quality +[T] (8kHz-48.0kHz, 16+ bit, polyphonic) audio and music at fixed and variable +[T] bitrates from 16 to 128 kbps/channel. This places Vorbis in the same +[T] competitive class as audio representations such as MPEG-4 (AAC), and +[T] similar to, but higher performance than MPEG-1/2 audio layer 3, +[T] MPEG-4 audio (TwinVQ), WMA and PAC. + +[U] http://www.xiph.org/ + +[A] xiph.org contributors +[M] The ROCK Linux Project + +[C] extra/multimedia + +[F] CORE +[L] BSD +[S] Stable +[V] 1.1.2 + +[P] X -?---5---9 120.802 + +[D] 2253347208 libvorbis-1.1.2.tar.gz http://downloads.xiph.org/releases/vorbis/ + diff --git a/package/base/ogg-vorbis/ogg-vorbis.conf b/package/base/ogg-vorbis/ogg-vorbis.conf deleted file mode 100644 index b3b1736d4..000000000 --- a/package/base/ogg-vorbis/ogg-vorbis.conf +++ /dev/null @@ -1,29 +0,0 @@ -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/base/ogg-vorbis/ogg-vorbis.conf -# ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. A copy of the GNU General Public -# License can be found at Documentation/COPYING. -# -# Many people helped and are helping developing ROCK Linux. Please -# have a look at http://www.rocklinux.org/ and the Documentation/TEAM -# file for details. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - -pkg_ogg_vorbis_pm() { - echo "Copying vorbisinfo perl script ..." - cp -v $archdir/vorbisinfo-0.3.pl $bindir/vorbisinfo - chmod +x $bindir/vorbisinfo -} - -hook_add postmake 3 "pkg_ogg_vorbis_pm" diff --git a/package/kasc/clanlib/subconfig-libs.in b/package/kasc/clanlib/subconfig-libs.in index 56a5b2ce1..983fa35ec 100644 --- a/package/kasc/clanlib/subconfig-libs.in +++ b/package/kasc/clanlib/subconfig-libs.in @@ -67,7 +67,7 @@ if pkgcheck clanlib X ; then fi bool 'Enable clanSmallJPEG support' ROCKCFG_PKG_CLANLIB_SMALLJPEG 1 " Enable clanSmallJPEG support" - if pkgcheck ogg-vorbis X ; then + if pkgcheck libvorbis X ; then bool 'Enable clanVorbis support' ROCKCFG_PKG_CLANLIB_VORBIS 1 " Enable clanVorbis support" fi diff --git a/package/kasc/openal/subconfig-libs.hlp b/package/kasc/openal/subconfig-libs.hlp index eb382f05c..5c5270d6e 100644 --- a/package/kasc/openal/subconfig-libs.hlp +++ b/package/kasc/openal/subconfig-libs.hlp @@ -14,7 +14,7 @@ ROCKCFG_PKG_OPENAL_SDL Compile with sdl output support ROCKCFG_PKG_OPENAL_VORBIS - Compile with ogg-vorbis output support + Compile with vorbis support ROCKCFG_PKG_OPENAL_SMPEG Compile with smpeg support diff --git a/package/kasc/openal/subconfig-libs.in b/package/kasc/openal/subconfig-libs.in index cb1eaaa82..b9823b2ab 100644 --- a/package/kasc/openal/subconfig-libs.in +++ b/package/kasc/openal/subconfig-libs.in @@ -39,9 +39,9 @@ if pkgcheck openal X ; then bool 'sdl support' ROCKCFG_PKG_OPENAL_SDL 1 \ "Compile with sdl output support" fi - if pkgcheck ogg-vorbis X ; then + if pkgcheck libvorbis X ; then bool 'vorbis support' ROCKCFG_PKG_OPENAL_VORBIS 1 \ - "Compile with ogg-vorbis output support" + "Compile with vorbis support" fi if pkgcheck smpeg X ; then bool 'smpeg support' ROCKCFG_PKG_OPENAL_SMPEG 1 \ diff --git a/package/public/ffmpeg/ffmpeg.conf b/package/public/ffmpeg/ffmpeg.conf index e50adb67e..ff04fc2ac 100644 --- a/package/public/ffmpeg/ffmpeg.conf +++ b/package/public/ffmpeg/ffmpeg.conf @@ -22,7 +22,8 @@ # fill options the configure does not attempt to detect ... pkginstalled lame && var_append extraconfopt " " "--enable-mp3lame" -pkginstalled ogg-vorbis && var_append extraconfopt " " "--enable-libogg --enable-vorbis" +pkginstalled libogg && var_append extraconfopt " " "--enable-libogg" +pkginstalled libvorbis && var_append extraconfopt " " "--enable-vorbis" pkginstalled libtheora && var_append extraconfopt " " "--enable-theora" pkginstalled faad2 && var_append extraconfopt " " "--enable-faad --enable-faadbin" pkginstalled faac && var_append extraconfopt " " "--enable-faac" diff --git a/package/public/libao/libao.desc b/package/public/libao/libao.desc new file mode 100644 index 000000000..9dfb0869e --- /dev/null +++ b/package/public/libao/libao.desc @@ -0,0 +1,43 @@ + +[COPY] --- ROCK-COPYRIGHT-NOTE-BEGIN --- +[COPY] +[COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. +[COPY] Please add additional copyright information _after_ the line containing +[COPY] the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by +[COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text! +[COPY] +[COPY] ROCK Linux: rock-src/package/base/libao/libao.desc +[COPY] ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf +[COPY] +[COPY] This program is free software; you can redistribute it and/or modify +[COPY] it under the terms of the GNU General Public License as published by +[COPY] the Free Software Foundation; either version 2 of the License, or +[COPY] (at your option) any later version. A copy of the GNU General Public +[COPY] License can be found at Documentation/COPYING. +[COPY] +[COPY] Many people helped and are helping developing ROCK Linux. Please +[COPY] have a look at http://www.rocklinux.org/ and the Documentation/TEAM +[COPY] file for details. +[COPY] +[COPY] --- ROCK-COPYRIGHT-NOTE-END --- + +[I] A cross-platform audio library + +[T] Libao is a cross-platform audio library that allows programs to +[T] output audio using a simple API on a wide variety of platforms. + +[U] http://www.xiph.org/ + +[A] xiph.org contributors +[M] The ROCK Linux Project + +[C] extra/multimedia + +[L] GPL +[S] Stable +[V] 0.8.6 + +[P] X -?---5---9 120.800 + +[D] 1280522933 libao-0.8.6.tar.gz http://downloads.xiph.org/releases/ao/ + diff --git a/package/base/ogg-vorbis/ogg-vorbis.desc b/package/public/vorbis-tools/vorbis-tools.desc similarity index 53% rename from package/base/ogg-vorbis/ogg-vorbis.desc rename to package/public/vorbis-tools/vorbis-tools.desc index 5413ca9c2..7b33b3145 100644 --- a/package/base/ogg-vorbis/ogg-vorbis.desc +++ b/package/public/vorbis-tools/vorbis-tools.desc @@ -21,37 +21,25 @@ [COPY] [COPY] --- ROCK-COPYRIGHT-NOTE-END --- -[I] Lossless audio compression tools using the ogg-vorbis algorithms +[I] Tools for working with Ogg Vorbis files -[T] ogg-vorbis is the open-source replacement of mp3. -[T] -[T] In Rock Linux, this package consists of the libao, libogg, libvorbis and -[T] the vorbis-tools based on the first-mentioned libraries. The last one -[T] includes oggenc (an encoder) and ogg123 (a playback tool). +[T] Contains ogg123, the ogg vorbis command line player, oggenc and +[T] oggdec for decoding and encoding vorbis audio, as well as the +[T] ogginfo and vorbiscomment tools. -[U] http://www.xiph.org +[U] http://www.xiph.org/ -[A] Xiphorus +[A] Michael Smith +[A] xiph.org contributors [M] The ROCK Linux Project -[M] Theis Peter Hansen [C] extra/multimedia -[F] CORE [L] GPL [S] Stable -[V] 1.1.3 +[V] 1.1.1 -# rebuild in stage 6 because of cyclic dep with speex -[P] X -?---56--9 120.800 +[P] X -?---5---9 148.801 -[SRC] lib tools - -[D] 124544025 libao-0.8.5.tar.gz http://downloads.xiph.org/releases/ao/ -[D] 1662594677 libogg-1.1.3.tar.gz http://downloads.xiph.org/releases/ogg/ -[D] 2253347208 libvorbis-1.1.2.tar.gz http://downloads.xiph.org/releases/vorbis/ -[D] 284826714 vorbis-tools-1.1.1.tar.gz http://downloads.xiph.org/releases/vorbis/ -[D] 2223100680 vorbisinfo-0.3.pl http://dl.rocklinux-consulting.de/oss/vorbisinfo/ - -[CV-URL] http://www.xiph.org/downloads/ +[D] 284826714 vorbis-tools-1.1.1.tar.gz http://downloads.xiph.org/releases/vorbis/ diff --git a/package/stf/avview/ffmpeg/ffmpeg.conf b/package/stf/avview/ffmpeg/ffmpeg.conf index a8eef627f..fe0ba360c 100644 --- a/package/stf/avview/ffmpeg/ffmpeg.conf +++ b/package/stf/avview/ffmpeg/ffmpeg.conf @@ -22,7 +22,8 @@ # fill options the configure does not attempt to detect ... pkginstalled lame && var_append extraconfopt " " "--enable-mp3lame" -pkginstalled ogg-vorbis && var_append extraconfopt " " "--enable-libogg --enable-vorbis" +pkginstalled libogg && var_append extraconfopt " " "--enable-libogg" +pkginstalled libvorbis && var_append extraconfopt " " "--enable-vorbis" pkginstalled libtheora && var_append extraconfopt " " "--enable-theora" pkginstalled faad2 && var_append extraconfopt " " "--enable-faad --enable-faadbin" pkginstalled faac && var_append extraconfopt " " "--enable-faac"