From 5555b97ba3d0b5ba31323e34ab8964ab5a665206 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Sat, 14 Mar 2015 10:55:48 +0000 Subject: [PATCH] libvorbis: bump version --- media-libs/libvorbis/libvorbis-1.3.2.recipe | 84 ------------ ...is-1.3.4.recipe => libvorbis-1.3.5.recipe} | 12 +- .../patches/libvorbis-1.3.2.patchset | 127 ------------------ ....3.4.patchset => libvorbis-1.3.5.patchset} | 54 ++++++-- 4 files changed, 46 insertions(+), 231 deletions(-) delete mode 100644 media-libs/libvorbis/libvorbis-1.3.2.recipe rename media-libs/libvorbis/{libvorbis-1.3.4.recipe => libvorbis-1.3.5.recipe} (87%) delete mode 100644 media-libs/libvorbis/patches/libvorbis-1.3.2.patchset rename media-libs/libvorbis/patches/{libvorbis-1.3.4.patchset => libvorbis-1.3.5.patchset} (66%) diff --git a/media-libs/libvorbis/libvorbis-1.3.2.recipe b/media-libs/libvorbis/libvorbis-1.3.2.recipe deleted file mode 100644 index 5539fc299..000000000 --- a/media-libs/libvorbis/libvorbis-1.3.2.recipe +++ /dev/null @@ -1,84 +0,0 @@ -SUMMARY="Ogg Vorbis audio compression format library" -DESCRIPTION=" -Ogg Vorbis is a fully open, non-proprietary, patent-and-royalty-free, \ -general-purpose compressed audio format for mid to high quality (8kHz-48.0kHz, \ -16+ bit, polyphonic) audio and music at fixed and variable bitrates from 16 to \ -128 kbps/channel. This places Vorbis in the same competitive class as audio \ -representations such as MPEG-4 (AAC), and similar to, but higher performance \ -than MPEG-1/2 audio layer 3, MPEG-4 audio (TwinVQ), WMA and PAC. -The bitstream format for Vorbis I was frozen Monday, May 8th 2000. All \ -bitstreams encoded since will remain compatible with all future releases of \ -Vorbis. -" -HOMEPAGE="http://www.xiph.org/vorbis/" -LICENSE="BSD (3-clause)" -COPYRIGHT="1994-2010 Xiph.Org Foundation" -SRC_URI="http://downloads.xiph.org/releases/vorbis/libvorbis-1.3.2.tar.gz" -CHECKSUM_SHA256="eeb4dcada143846dfba760d982954a02f82e08845cbc33871f5dac547b8b6124" -REVISION="3" -ARCHITECTURES="x86_gcc2 x86 x86_64" -SECONDARY_ARCHITECTURES="x86_gcc2 x86" - -PATCHES="libvorbis-1.3.2.patchset" - -PROVIDES=" - libvorbis$secondaryArchSuffix = $portVersion - lib:libvorbis$secondaryArchSuffix = 0.4.5 compat >= 0 - lib:libvorbisenc$secondaryArchSuffix = 2.0.8 compat >= 2 - lib:libvorbisfile$secondaryArchSuffix = 3.3.4 compat >= 3 - " -REQUIRES=" - haiku$secondaryArchSuffix - lib:libogg$secondaryArchSuffix - " -BUILD_REQUIRES=" - devel:libogg$secondaryArchSuffix - " -BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel - cmd:aclocal - cmd:autoconf - cmd:automake - cmd:gcc$secondaryArchSuffix - cmd:ld$secondaryArchSuffix - cmd:libtoolize - cmd:make - cmd:pkg_config$secondaryArchSuffix - " - -BUILD() -{ - libtoolize -fci - mkdir -p m4 - aclocal --install -I m4 - autoconf - automake - runConfigure ./configure \ - --docdir $developDocDir - make $jobArgs -} - -INSTALL() -{ - make install - - prepareInstalledDevelLibs libvorbis libvorbisenc libvorbisfile - fixPkgconfig - - # devel package - packageEntries devel \ - $dataDir \ - $developDir -} - -# ----- devel package ------------------------------------------------------- - -PROVIDES_devel=" - libvorbis${secondaryArchSuffix}_devel = $portVersion - devel:libvorbis$secondaryArchSuffix = 0.4.5 compat >= 0 - devel:libvorbisenc$secondaryArchSuffix = 2.0.8 compat >= 2 - devel:libvorbisfile$secondaryArchSuffix = 3.3.4 compat >= 3 - " -REQUIRES_devel=" - libvorbis$secondaryArchSuffix == $portVersion - " diff --git a/media-libs/libvorbis/libvorbis-1.3.4.recipe b/media-libs/libvorbis/libvorbis-1.3.5.recipe similarity index 87% rename from media-libs/libvorbis/libvorbis-1.3.4.recipe rename to media-libs/libvorbis/libvorbis-1.3.5.recipe index 8eb8a30e4..363abdc77 100644 --- a/media-libs/libvorbis/libvorbis-1.3.4.recipe +++ b/media-libs/libvorbis/libvorbis-1.3.5.recipe @@ -14,18 +14,18 @@ HOMEPAGE="http://www.xiph.org/vorbis/" LICENSE="BSD (3-clause)" COPYRIGHT="1994-2010 Xiph.Org Foundation" SRC_URI="http://downloads.xiph.org/releases/vorbis/libvorbis-$portVersion.tar.gz" -CHECKSUM_SHA256="eee09a0a13ec38662ff949168fe897a25d2526529bc7e805305f381c219a1ecb" -REVISION="2" +CHECKSUM_SHA256="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce" +REVISION="1" ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 x86" -PATCHES="libvorbis-1.3.4.patchset" +PATCHES="libvorbis-$portVersion.patchset" PROVIDES=" libvorbis$secondaryArchSuffix = $portVersion - lib:libvorbis$secondaryArchSuffix = 0.4.7 compat >= 0 - lib:libvorbisenc$secondaryArchSuffix = 2.0.10 compat >= 2 - lib:libvorbisfile$secondaryArchSuffix = 3.3.6 compat >= 3 + lib:libvorbis$secondaryArchSuffix = 0.4.8 compat >= 0 + lib:libvorbisenc$secondaryArchSuffix = 2.0.11 compat >= 2 + lib:libvorbisfile$secondaryArchSuffix = 3.3.7 compat >= 3 " REQUIRES=" haiku$secondaryArchSuffix diff --git a/media-libs/libvorbis/patches/libvorbis-1.3.2.patchset b/media-libs/libvorbis/patches/libvorbis-1.3.2.patchset deleted file mode 100644 index 8bac20948..000000000 --- a/media-libs/libvorbis/patches/libvorbis-1.3.2.patchset +++ /dev/null @@ -1,127 +0,0 @@ -From 70dcb91819b2acac447344c2ad6b0c5c89dfa630 Mon Sep 17 00:00:00 2001 -From: Ingo Weinhold -Date: Tue, 11 Jun 2013 17:54:49 +0200 -Subject: applying patch libvorbis-1.3.2.patch - - -diff --git a/configure.ac b/configure.ac -index 98b78ac..4b881b6 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -206,6 +206,10 @@ else - DEBUG="-g -Wall -W -D_REENTRANT -D__NO_MATH_INLINES -fsigned-char" - CFLAGS="-O20 -Wall -W -ffast-math -D_REENTRANT -fsigned-char" - PROFILE="-pg -g -O20 -ffast-math -D_REENTRANT -fsigned-char";; -+ *-*-haiku*) -+ DEBUG="-g -Wall -D__NO_MATH_INLINES -fsigned-char" -+ CFLAGS="-O20 -Wall -D__NO_MATH_INLINES -fsigned-char" -+ PROFILE="-O20 -g -pg -D__NO_MATH_INLINES -fsigned-char" ;; - *) - DEBUG="-g -Wall -Wextra -D__NO_MATH_INLINES -fsigned-char" - CFLAGS="-O20 -Wall -Wextra -D__NO_MATH_INLINES -fsigned-char" --- -1.7.5 - - -From c5e8052a27c7c178afbc25194eeb48b7d1394ad7 Mon Sep 17 00:00:00 2001 -From: Ingo Weinhold -Date: Tue, 11 Jun 2013 17:58:19 +0200 -Subject: configure.ac: AM_CONFIG_HEADER -> AC_CONFIG_HEADERS - - -diff --git a/configure.ac b/configure.ac -index 4b881b6..64858d1 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -13,7 +13,7 @@ AC_CANONICAL_TARGET([]) - - AM_INIT_AUTOMAKE($PACKAGE_NAME,$PACKAGE_VERSION) - AM_MAINTAINER_MODE --AM_CONFIG_HEADER([config.h]) -+AC_CONFIG_HEADERS([config.h]) - - dnl Add parameters for aclocal - AC_SUBST(ACLOCAL_AMFLAGS, "-I m4") --- -1.7.5 - - -From 3e8abf19defbbef8ac44abc602112f8b5b2c4273 Mon Sep 17 00:00:00 2001 -From: Ingo Weinhold -Date: Tue, 11 Jun 2013 17:58:44 +0200 -Subject: vorbis.pc.in: remove -lm - - -diff --git a/vorbis.pc.in b/vorbis.pc.in -index 259abe7..54dca60 100644 ---- a/vorbis.pc.in -+++ b/vorbis.pc.in -@@ -10,5 +10,5 @@ Description: vorbis is the primary Ogg Vorbis library - Version: @VERSION@ - Requires: ogg - Conflicts: --Libs: -L${libdir} -lvorbis -lm -+Libs: -L${libdir} -lvorbis - Cflags: -I${includedir} --- -1.7.5 - - -From ef7dac90d78c39bb3990d66ff932d50bc1ea98d3 Mon Sep 17 00:00:00 2001 -From: Ingo Weinhold -Date: Tue, 11 Jun 2013 18:06:31 +0200 -Subject: doc/*/Makefile.am: remove hard-coded docdir - - -diff --git a/doc/Makefile.am b/doc/Makefile.am -index 2870528..6d7851b 100644 ---- a/doc/Makefile.am -+++ b/doc/Makefile.am -@@ -2,8 +2,6 @@ - - SUBDIRS = libvorbis vorbisfile vorbisenc - --docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION) -- - ### all of the static docs, commited to SVN and included as is - static_docs = \ - rfc5215.xml \ -diff --git a/doc/libvorbis/Makefile.am b/doc/libvorbis/Makefile.am -index 0bcc135..aea57e9 100644 ---- a/doc/libvorbis/Makefile.am -+++ b/doc/libvorbis/Makefile.am -@@ -1,7 +1,5 @@ - ## Process this file with automake to produce Makefile.in - --docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/libvorbis -- - doc_DATA = index.html reference.html style.css vorbis_comment.html\ - vorbis_info.html vorbis_analysis_blockout.html vorbis_analysis_buffer.html\ - vorbis_analysis_headerout.html vorbis_analysis_init.html \ -diff --git a/doc/vorbisenc/Makefile.am b/doc/vorbisenc/Makefile.am -index bbab3c5..008586e 100644 ---- a/doc/vorbisenc/Makefile.am -+++ b/doc/vorbisenc/Makefile.am -@@ -1,7 +1,5 @@ - ## Process this file with automake to produce Makefile.in - --docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/vorbisenc -- - doc_DATA = changes.html examples.html index.html ovectl_ratemanage2_arg.html \ - ovectl_ratemanage_arg.html overview.html reference.html style.css\ - vorbis_encode_ctl.html vorbis_encode_init.html vorbis_encode_setup_init.html \ -diff --git a/doc/vorbisfile/Makefile.am b/doc/vorbisfile/Makefile.am -index fb27d44..faa6352 100644 ---- a/doc/vorbisfile/Makefile.am -+++ b/doc/vorbisfile/Makefile.am -@@ -1,7 +1,5 @@ - ## Process this file with automake to produce Makefile.in - --docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/vorbisfile -- - doc_DATA = OggVorbis_File.html callbacks.html chaining_example_c.html\ - chainingexample.html crosslap.html datastructures.html decoding.html\ - example.html exampleindex.html fileinfo.html index.html\ --- -1.7.5 - diff --git a/media-libs/libvorbis/patches/libvorbis-1.3.4.patchset b/media-libs/libvorbis/patches/libvorbis-1.3.5.patchset similarity index 66% rename from media-libs/libvorbis/patches/libvorbis-1.3.4.patchset rename to media-libs/libvorbis/patches/libvorbis-1.3.5.patchset index b3f3167d7..d8449f5e8 100644 --- a/media-libs/libvorbis/patches/libvorbis-1.3.4.patchset +++ b/media-libs/libvorbis/patches/libvorbis-1.3.5.patchset @@ -1,36 +1,36 @@ -From 70dcb91819b2acac447344c2ad6b0c5c89dfa630 Mon Sep 17 00:00:00 2001 +From cd0f780a679c7dbbb027cb3445da077982bfcdb5 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Tue, 11 Jun 2013 17:54:49 +0200 Subject: applying patch libvorbis-1.3.2.patch diff --git a/configure.ac b/configure.ac -index 98b78ac..4b881b6 100644 +index eddd02d..0f83750 100644 --- a/configure.ac +++ b/configure.ac -@@ -206,6 +206,10 @@ else - DEBUG="-g -Wall -W -D_REENTRANT -D__NO_MATH_INLINES -fsigned-char" - CFLAGS="-O20 -Wall -W -ffast-math -D_REENTRANT -fsigned-char" - PROFILE="-pg -g -O20 -ffast-math -D_REENTRANT -fsigned-char";; -+ *-*-haiku*) +@@ -115,6 +115,10 @@ if test -z "$GCC"; then + DEBUG="-v -g" + CFLAGS="-xO4 -fast -w -fsimple -native -xcg92" + PROFILE="-v -xpg -g -xO4 -fast -native -fsimple -xcg92 -Dsuncc" ;; ++ *-*-haiku*) + DEBUG="-g -Wall -D__NO_MATH_INLINES -fsigned-char" + CFLAGS="-O20 -Wall -D__NO_MATH_INLINES -fsigned-char" + PROFILE="-O20 -g -pg -D__NO_MATH_INLINES -fsigned-char" ;; - *) - DEBUG="-g -Wall -Wextra -D__NO_MATH_INLINES -fsigned-char" - CFLAGS="-O20 -Wall -Wextra -D__NO_MATH_INLINES -fsigned-char" + *) + DEBUG="-g" + CFLAGS="-O" -- -1.7.5 +1.8.3.4 -From ef7dac90d78c39bb3990d66ff932d50bc1ea98d3 Mon Sep 17 00:00:00 2001 +From f89e5adf10ec7f6482d727badf61e34957b482de Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Tue, 11 Jun 2013 18:06:31 +0200 Subject: doc/*/Makefile.am: remove hard-coded docdir diff --git a/doc/Makefile.am b/doc/Makefile.am -index 2870528..6d7851b 100644 +index cfc9bbc..55c4321 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -2,8 +2,6 @@ @@ -79,5 +79,31 @@ index fb27d44..faa6352 100644 chainingexample.html crosslap.html datastructures.html decoding.html\ example.html exampleindex.html fileinfo.html index.html\ -- -1.7.5 +1.8.3.4 + + +From d74109227b4c79aaef02ee35f59610da0e7d6c2f Mon Sep 17 00:00:00 2001 +From: Jerome Duval +Date: Sat, 14 Mar 2015 10:50:31 +0000 +Subject: Haiku gcc2 hasn't Wextra + + +diff --git a/configure.ac b/configure.ac +index 0f83750..391157b 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -209,6 +209,11 @@ else + DEBUG="-g -Wall -W -D_REENTRANT -D__NO_MATH_INLINES -fsigned-char" + CFLAGS="-O3 -Wall -W -ffast-math -D_REENTRANT -fsigned-char" + PROFILE="-pg -g -O3 -ffast-math -D_REENTRANT -fsigned-char";; ++ *-*-haiku*) ++ # Use -W instead of -Wextra because gcc on OS/2 is an old version. ++ DEBUG="-g -Wall -W -D_REENTRANT -D__NO_MATH_INLINES -fsigned-char" ++ CFLAGS="-O3 -Wall -W -ffast-math -D_REENTRANT -fsigned-char" ++ PROFILE="-pg -g -O3 -ffast-math -D_REENTRANT -fsigned-char";; + *) + DEBUG="-g -Wall -Wextra -D__NO_MATH_INLINES -fsigned-char" + CFLAGS="-O3 -Wall -Wextra -D__NO_MATH_INLINES -fsigned-char" +-- +1.8.3.4