From 2a1ffa637e629eba72409eca175953dd73fa536b Mon Sep 17 00:00:00 2001 From: Bradley Sepos Date: Mon, 10 Jul 2017 17:45:17 -0400 Subject: [PATCH] contrib: Update to libvorbis 1.3.5. --- contrib/libvorbis/A00-automake.patch | 12 ------------ contrib/libvorbis/P00-darwin-O4.patch | 21 --------------------- contrib/libvorbis/P01-darwin-automake.patch | 9 --------- contrib/libvorbis/module.defs | 10 +++------- 4 files changed, 3 insertions(+), 49 deletions(-) delete mode 100644 contrib/libvorbis/A00-automake.patch delete mode 100644 contrib/libvorbis/P00-darwin-O4.patch delete mode 100644 contrib/libvorbis/P01-darwin-automake.patch diff --git a/contrib/libvorbis/A00-automake.patch b/contrib/libvorbis/A00-automake.patch deleted file mode 100644 index 8c98fde69..000000000 --- a/contrib/libvorbis/A00-automake.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur aotuv-b6.03_20110424.orig/configure.ac aotuv-b6.03_20110424/configure.ac ---- aotuv-b6.03_20110424.orig/configure.ac 2010-11-01 15:27:12.000000000 -0400 -+++ aotuv-b6.03_20110424/configure.ac 2013-01-28 23:43:26.000000000 -0500 -@@ -13,7 +13,7 @@ - - AM_INIT_AUTOMAKE($PACKAGE_NAME,$PACKAGE_VERSION) - AM_MAINTAINER_MODE --AM_CONFIG_HEADER([config.h]) -+AC_CONFIG_HEADER([config.h]) - - dnl Add parameters for aclocal - AC_SUBST(ACLOCAL_AMFLAGS, "-I m4") diff --git a/contrib/libvorbis/P00-darwin-O4.patch b/contrib/libvorbis/P00-darwin-O4.patch deleted file mode 100644 index a8aba933c..000000000 --- a/contrib/libvorbis/P00-darwin-O4.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- aotuv-b6.03_20110424.orig/configure.ac 2010-11-01 12:27:12.000000000 -0700 -+++ aotuv-b6.03_20110424/configure.ac 2011-10-19 16:58:27.295806257 -0700 -@@ -7,6 +7,7 @@ - - AC_INIT([libvorbis],[1.3.2],[vorbis-dev@xiph.org]) - -+AC_CONFIG_MACRO_DIR([m4]) - AC_CONFIG_SRCDIR([lib/mdct.c]) - - AC_CANONICAL_TARGET([]) -@@ -199,8 +200,8 @@ - PROFILE="-pg -g -O20 -D__NO_MATH_INLINES -fsigned-char $sparc_cpu" ;; - *-*-darwin*) - DEBUG="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -O0 -fsigned-char" -- CFLAGS="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -O4 -ffast-math -fsigned-char" -- PROFILE="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -pg -O4 -ffast-math -fsigned-char";; -+ CFLAGS="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -O3 -ffast-math -fsigned-char" -+ PROFILE="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -pg -O3 -ffast-math -fsigned-char";; - *-*-os2*) - # 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" diff --git a/contrib/libvorbis/P01-darwin-automake.patch b/contrib/libvorbis/P01-darwin-automake.patch deleted file mode 100644 index 4626fcd45..000000000 --- a/contrib/libvorbis/P01-darwin-automake.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- aotuv-b6.03_20110424.orig/Makefile.am 2010-03-25 18:56:26.000000000 -0700 -+++ aotuv-b6.03_20110424/Makefile.am 2011-10-19 16:59:21.274432667 -0700 -@@ -1,5 +1,6 @@ - ## Process this file with automake to produce Makefile.in - -+ACLOCAL_AMFLAGS= -I m4 - AUTOMAKE_OPTIONS = 1.7 foreign dist-zip dist-bzip2 - - SUBDIRS = m4 include vq lib test doc diff --git a/contrib/libvorbis/module.defs b/contrib/libvorbis/module.defs index 6e80478eb..69db7d808 100644 --- a/contrib/libvorbis/module.defs +++ b/contrib/libvorbis/module.defs @@ -1,13 +1,9 @@ $(eval $(call import.MODULE.defs,LIBVORBIS,libvorbis,LIBOGG)) $(eval $(call import.CONTRIB.defs,LIBVORBIS)) -LIBVORBIS.FETCH.url = https://download.handbrake.fr/handbrake/contrib/libvorbis-aotuv_b6.03.tar.bz2 -LIBVORBIS.FETCH.sha256 = 95455420f07e4b3abdf32bda9f5921e9ed3f1afdc3739098dc090150a42fd7fd -LIBVORBIS.EXTRACT.tarbase = aotuv-b6.03_20110424 - -# TODO: libvorbis >= 1.3.5 (upstream variant aotuv no longer exists), tarbase unnecessary -#LIBVORBIS.FETCH.url = http://downloads.xiph.org/releases/vorbis/libvorbis-1.3.5.tar.gz -#LIBVORBIS.FETCH.sha256 = 6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce +LIBVORBIS.FETCH.url = https://download.handbrake.fr/handbrake/contrib/libvorbis-1.3.5.tar.gz +LIBVORBIS.FETCH.url += https://downloads.xiph.org/releases/vorbis/libvorbis-1.3.5.tar.gz +LIBVORBIS.FETCH.sha256 = 6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce LIBVORBIS.CONFIGURE.extra = --with-ogg=$(call fn.ABSOLUTE,$(CONTRIB.build/)) HAVE_PKG_CONFIG="no" -- 2.40.0