diff --git a/media-libs/libvorbis/libvorbis-1.3.5.recipe b/media-libs/libvorbis/libvorbis-1.3.6.recipe similarity index 51% rename from media-libs/libvorbis/libvorbis-1.3.5.recipe rename to media-libs/libvorbis/libvorbis-1.3.6.recipe index 9809bc6eb..f3df04207 100644 --- a/media-libs/libvorbis/libvorbis-1.3.5.recipe +++ b/media-libs/libvorbis/libvorbis-1.3.6.recipe @@ -10,22 +10,34 @@ to, but higher performance than MPEG-1/2 audio layer 3, MPEG-4 audio \ 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/" -COPYRIGHT="1994-2010 Xiph.Org Foundation" +HOMEPAGE="https://www.xiph.org/vorbis/" +COPYRIGHT="1994-2018 Xiph.Org Foundation" LICENSE="BSD (3-clause)" -REVISION="5" -SOURCE_URI="http://downloads.xiph.org/releases/vorbis/libvorbis-$portVersion.tar.gz" -CHECKSUM_SHA256="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce" +REVISION="1" +SOURCE_URI="https://downloads.xiph.org/releases/vorbis/libvorbis-$portVersion.tar.gz" +CHECKSUM_SHA256="6ed40e0241089a42c48604dc00e362beee00036af2d8b3f46338031c9e0351cb" PATCHES="libvorbis-$portVersion.patchset" ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 x86" +vorbisLibs=" + libvorbis \ + libvorbisenc \ + libvorbisfile \ + " +libvorbisVersion="0.4.8" +libvorbisencVersion="2.0.11" +libvorbisfileVersion="3.3.7" +for i in $vorbisLibs; do + eval "${i}VersionCompat=\"\$${i}Version compat >= \${${i}Version%%.*}\"" +done + PROVIDES=" libvorbis$secondaryArchSuffix = $portVersion - lib:libvorbis$secondaryArchSuffix = 0.4.8 compat >= 0 - lib:libvorbisenc$secondaryArchSuffix = 2.0.11 compat >= 2 - lib:libvorbisfile$secondaryArchSuffix = 3.3.7 compat >= 3 + lib:libvorbis$secondaryArchSuffix = $libvorbisVersionCompat + lib:libvorbisenc$secondaryArchSuffix = $libvorbisencVersionCompat + lib:libvorbisfile$secondaryArchSuffix = $libvorbisfileVersionCompat " REQUIRES=" haiku$secondaryArchSuffix @@ -34,9 +46,9 @@ REQUIRES=" PROVIDES_devel=" libvorbis${secondaryArchSuffix}_devel = $portVersion - devel:libvorbis$secondaryArchSuffix = 0.4.7 compat >= 0 - devel:libvorbisenc$secondaryArchSuffix = 2.0.10 compat >= 2 - devel:libvorbisfile$secondaryArchSuffix = 3.3.6 compat >= 3 + devel:libvorbis$secondaryArchSuffix = $libvorbisVersionCompat + devel:libvorbisenc$secondaryArchSuffix = $libvorbisencVersionCompat + devel:libvorbisfile$secondaryArchSuffix = $libvorbisfileVersionCompat " REQUIRES_devel=" libvorbis$secondaryArchSuffix == $portVersion @@ -58,6 +70,21 @@ BUILD_PREREQUIRES=" cmd:pkg_config$secondaryArchSuffix " +defineDebugInfoPackage libvorbis$secondaryArchSuffix \ + "$libDir"/libvorbis.so.$libvorbisVersion \ + "$libDir"/libvorbisenc.so.$libvorbisencVersion \ + "$libDir"/libvorbisfile.so.$libvorbisfileVersion \ + +PATCH() +{ + # use developDocDir instead of a hard-coded docdir + sed -i -e "s|^\(docdir = \)\$(datadir)/doc/\$(PACKAGE)-\$(VERSION)|\1\$(prefix)/$relativeDevelopDocDir|;" \ + doc/libvorbis/Makefile.am \ + doc/vorbisenc/Makefile.am \ + doc/vorbisfile/Makefile.am \ + doc/Makefile.am +} + BUILD() { libtoolize -fci @@ -65,8 +92,7 @@ BUILD() aclocal --install -I m4 autoconf automake - runConfigure ./configure \ - --docdir=$developDocDir + runConfigure ./configure make $jobArgs } @@ -76,7 +102,11 @@ INSTALL() rm $libDir/libvorbis*.la - prepareInstalledDevelLibs libvorbis libvorbisenc libvorbisfile + if [ -n "$secondaryArchSuffix" ]; then + rm -rf "$developDir"/documentation + fi + + prepareInstalledDevelLibs $vorbisLibs fixPkgconfig # devel package @@ -84,3 +114,8 @@ INSTALL() $dataDir \ $developDir } + +TEST() +{ + make check +} diff --git a/media-libs/libvorbis/patches/libvorbis-1.3.5.patchset b/media-libs/libvorbis/patches/libvorbis-1.3.5.patchset deleted file mode 100644 index d8449f5e8..000000000 --- a/media-libs/libvorbis/patches/libvorbis-1.3.5.patchset +++ /dev/null @@ -1,109 +0,0 @@ -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 eddd02d..0f83750 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -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" - CFLAGS="-O" --- -1.8.3.4 - - -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 cfc9bbc..55c4321 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.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 - diff --git a/media-libs/libvorbis/patches/libvorbis-1.3.6.patchset b/media-libs/libvorbis/patches/libvorbis-1.3.6.patchset new file mode 100644 index 000000000..062fda338 --- /dev/null +++ b/media-libs/libvorbis/patches/libvorbis-1.3.6.patchset @@ -0,0 +1,50 @@ +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 28b0a14..ee245e6 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -120,6 +120,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" + CFLAGS="-O" +-- +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 ee245e6..1ab1c25 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -214,6 +214,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 +