From 841f09528a381b485c13431868cd5bf07eccf498 Mon Sep 17 00:00:00 2001 From: Christian Weisgerber Date: Thu, 13 Mar 2008 20:36:53 +0000 Subject: Update to 1.2.0. This release mostly includes accumulated patches and miscellaneous bug fixes. --- audio/vorbis-tools/Makefile | 16 +++---------- audio/vorbis-tools/distinfo | 9 +++----- audio/vorbis-tools/files/patch-configure | 22 ++++++++++++++++++ audio/vorbis-tools/files/patch-configure.ac | 25 --------------------- audio/vorbis-tools/files/patch-ogg123_Makefile.am | 26 ---------------------- audio/vorbis-tools/files/patch-ogg123_Makefile.in | 11 +++++++++ .../files/patch-ogg123_cfgfile__options.c | 14 ------------ .../files/patch-ogg123_http_transport.c | 12 ---------- audio/vorbis-tools/files/patch-oggenc_encode.c | 21 ----------------- audio/vorbis-tools/files/patch-share_charset.c | 16 ------------- audio/vorbis-tools/files/patch-share_iconvert.c | 16 ------------- audio/vorbis-tools/files/patch-share_utf8.c | 16 ------------- audio/vorbis-tools/pkg-descr | 2 +- 13 files changed, 40 insertions(+), 166 deletions(-) create mode 100644 audio/vorbis-tools/files/patch-configure delete mode 100644 audio/vorbis-tools/files/patch-configure.ac delete mode 100644 audio/vorbis-tools/files/patch-ogg123_Makefile.am create mode 100644 audio/vorbis-tools/files/patch-ogg123_Makefile.in delete mode 100644 audio/vorbis-tools/files/patch-ogg123_cfgfile__options.c delete mode 100644 audio/vorbis-tools/files/patch-ogg123_http_transport.c delete mode 100644 audio/vorbis-tools/files/patch-oggenc_encode.c delete mode 100644 audio/vorbis-tools/files/patch-share_charset.c delete mode 100644 audio/vorbis-tools/files/patch-share_iconvert.c delete mode 100644 audio/vorbis-tools/files/patch-share_utf8.c (limited to 'audio/vorbis-tools') diff --git a/audio/vorbis-tools/Makefile b/audio/vorbis-tools/Makefile index 2bfd4e7ac082..198cf1c031f1 100644 --- a/audio/vorbis-tools/Makefile +++ b/audio/vorbis-tools/Makefile @@ -6,16 +6,11 @@ # PORTNAME= vorbis-tools -PORTVERSION= 1.1.1 -PORTREVISION= 5 +PORTVERSION= 1.2.0 PORTEPOCH= 3 CATEGORIES= audio MASTER_SITES= http://downloads.xiph.org/releases/vorbis/ -PATCH_SITES= http://sites.inka.de/~mips/unix/distfiles/ -PATCHFILES= vorbis-tools-1.1.1-flac-1.1.3.patch -PATCH_DIST_STRIP=-p1 - MAINTAINER= naddy@FreeBSD.org COMMENT= Play, encode, and manage Ogg Vorbis files @@ -25,9 +20,9 @@ LIB_DEPENDS= ao.3:${PORTSDIR}/audio/libao \ speex.1:${PORTSDIR}/audio/speex \ vorbis.4:${PORTSDIR}/audio/libvorbis -USE_AUTOTOOLS= aclocal:19 autoconf:261 automake:19 libtool:15 USE_GETTEXT= yes -ACLOCAL_ARGS= -I ${LOCALBASE}/share/aclocal + +GNU_CONFIGURE= yes CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --enable-vcut CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ @@ -37,11 +32,6 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ MAN1= ogg123.1 oggdec.1 oggenc.1 ogginfo.1 vcut.1 vorbiscomment.1 -# after lib-depends -pre-configure: - ${CP} ${LOCALBASE}/share/gettext/po/Makefile.in.in \ - ${WRKSRC}/po/Makefile.in.in - post-install: ${MKDIR} ${PREFIX}/share/examples/vorbis-tools ${INSTALL_DATA} ${WRKSRC}/ogg123/ogg123rc-example \ diff --git a/audio/vorbis-tools/distinfo b/audio/vorbis-tools/distinfo index b8ea1961c4ff..a89c6d0afcea 100644 --- a/audio/vorbis-tools/distinfo +++ b/audio/vorbis-tools/distinfo @@ -1,6 +1,3 @@ -MD5 (vorbis-tools-1.1.1.tar.gz) = 47845fd76f5f2354a3619c4097575487 -SHA256 (vorbis-tools-1.1.1.tar.gz) = 617b4aa69e600c215b34fa3fd5764bc1d9d205d9d7d9fe7812bde7ec956fcaad -SIZE (vorbis-tools-1.1.1.tar.gz) = 948837 -MD5 (vorbis-tools-1.1.1-flac-1.1.3.patch) = 98f5ea16ff8ebd69b9ff3b25fad8dd30 -SHA256 (vorbis-tools-1.1.1-flac-1.1.3.patch) = 578b1ff0a76e73e1aa41f65b77ba76add35574b1d74de6b34bb6bab1cf6c2106 -SIZE (vorbis-tools-1.1.1-flac-1.1.3.patch) = 19301 +MD5 (vorbis-tools-1.2.0.tar.gz) = df976d24e51ef3d87cd462edf747bf9a +SHA256 (vorbis-tools-1.2.0.tar.gz) = dbe753ce0ae0797f25117720bb2ba0d848388d3f47af8db31ebc35552c3de07b +SIZE (vorbis-tools-1.2.0.tar.gz) = 1076814 diff --git a/audio/vorbis-tools/files/patch-configure b/audio/vorbis-tools/files/patch-configure new file mode 100644 index 000000000000..f3ce4550ae6e --- /dev/null +++ b/audio/vorbis-tools/files/patch-configure @@ -0,0 +1,22 @@ +--- configure.orig 2008-03-03 06:48:08.000000000 +0100 ++++ configure 2008-03-12 19:43:37.000000000 +0100 +@@ -27301,7 +27301,7 @@ + ;; + *) + DEBUG="-g" +- CFLAGS="-O" ++ CFLAGS="" + PROFILE="-g -p" + ;; + esac +@@ -27324,8 +27324,8 @@ + ;; + *) + DEBUG="-g -Wall -fsigned-char" +- CFLAGS="-O2 -fsigned-char" +- PROFILE="-O2 -g -pg -fsigned-char" ++ CFLAGS="-fsigned-char" ++ PROFILE="-g -pg -fsigned-char" + ;; + esac + fi diff --git a/audio/vorbis-tools/files/patch-configure.ac b/audio/vorbis-tools/files/patch-configure.ac deleted file mode 100644 index 3ddc0379e808..000000000000 --- a/audio/vorbis-tools/files/patch-configure.ac +++ /dev/null @@ -1,25 +0,0 @@ - -$FreeBSD$ - ---- configure.ac.orig -+++ configure.ac -@@ -51,7 +51,7 @@ - ;; - *) - DEBUG="-g" -- CFLAGS="-O" -+ CFLAGS="" - PROFILE="-g -p" - ;; - esac -@@ -74,8 +74,8 @@ - ;; - *) - DEBUG="-g -Wall -fsigned-char" -- CFLAGS="-O20 -fsigned-char" -- PROFILE="-O20 -g -pg -fsigned-char" -+ CFLAGS="-fsigned-char" -+ PROFILE="-g -pg -fsigned-char" - ;; - esac - fi diff --git a/audio/vorbis-tools/files/patch-ogg123_Makefile.am b/audio/vorbis-tools/files/patch-ogg123_Makefile.am deleted file mode 100644 index e2cb6bad7aaa..000000000000 --- a/audio/vorbis-tools/files/patch-ogg123_Makefile.am +++ /dev/null @@ -1,26 +0,0 @@ - -$FreeBSD$ - ---- ogg123/Makefile.am.orig -+++ ogg123/Makefile.am -@@ -16,7 +16,7 @@ - - datadir = @datadir@ - localedir = $(datadir)/locale --DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@ -+DEFS = -DSYSCONFDIR=\"$(sysconfdir)\" -DLOCALEDIR=\"$(localedir)\" @DEFS@ - - docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION) - mandir = @MANDIR@ -@@ -44,10 +44,9 @@ - $(flac_sources) $(speex_sources) - - man_MANS = ogg123.1 --doc_DATA = ogg123rc-example - - EXTRA_ogg123_SOURCES = \ -- $(man_MANS) $(doc_DATA) -+ $(man_MANS) - - debug: - $(MAKE) all CFLAGS="@DEBUG@" diff --git a/audio/vorbis-tools/files/patch-ogg123_Makefile.in b/audio/vorbis-tools/files/patch-ogg123_Makefile.in new file mode 100644 index 000000000000..c3c36dbe3585 --- /dev/null +++ b/audio/vorbis-tools/files/patch-ogg123_Makefile.in @@ -0,0 +1,11 @@ +--- ogg123/Makefile.in.orig 2008-03-03 06:47:58.000000000 +0100 ++++ ogg123/Makefile.in 2008-03-12 19:43:37.000000000 +0100 +@@ -605,7 +605,7 @@ + + info-am: + +-install-data-am: install-docDATA install-man ++install-data-am: install-man + + install-dvi: install-dvi-am + diff --git a/audio/vorbis-tools/files/patch-ogg123_cfgfile__options.c b/audio/vorbis-tools/files/patch-ogg123_cfgfile__options.c deleted file mode 100644 index 8f022ebd1fd4..000000000000 --- a/audio/vorbis-tools/files/patch-ogg123_cfgfile__options.c +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- ogg123/cfgfile_options.c.orig Sun Dec 14 00:26:21 2003 -+++ ogg123/cfgfile_options.c Sun Dec 14 00:26:41 2003 -@@ -441,7 +441,7 @@ - char filename[FILENAME_MAX]; - char *homedir = getenv("HOME"); - -- parse_config_file(opts, "/etc/ogg123rc"); -+ parse_config_file(opts, SYSCONFDIR "/ogg123rc"); - if (homedir && strlen(homedir) < FILENAME_MAX - 10) { - /* Try ~/.ogg123 */ - strncpy(filename, homedir, FILENAME_MAX); diff --git a/audio/vorbis-tools/files/patch-ogg123_http_transport.c b/audio/vorbis-tools/files/patch-ogg123_http_transport.c deleted file mode 100644 index 4d9d9e07b4ce..000000000000 --- a/audio/vorbis-tools/files/patch-ogg123_http_transport.c +++ /dev/null @@ -1,12 +0,0 @@ ---- ogg123/http_transport.c.orig Fri Dec 1 16:25:40 2006 -+++ ogg123/http_transport.c Fri Dec 1 16:29:16 2006 -@@ -116,7 +116,9 @@ - if (inputOpts.ProxyTunnel) - curl_easy_setopt (handle, CURLOPT_HTTPPROXYTUNNEL, inputOpts.ProxyTunnel); - */ -+#if LIBCURL_VERSION_NUM < 0x071000 - curl_easy_setopt(handle, CURLOPT_MUTE, 1); -+#endif - curl_easy_setopt(handle, CURLOPT_ERRORBUFFER, private->error); - curl_easy_setopt(handle, CURLOPT_PROGRESSFUNCTION, progress_callback); - curl_easy_setopt(handle, CURLOPT_PROGRESSDATA, private); diff --git a/audio/vorbis-tools/files/patch-oggenc_encode.c b/audio/vorbis-tools/files/patch-oggenc_encode.c deleted file mode 100644 index f03cc5942a5a..000000000000 --- a/audio/vorbis-tools/files/patch-oggenc_encode.c +++ /dev/null @@ -1,21 +0,0 @@ - -$FreeBSD$ - ---- oggenc/encode.c.orig -+++ oggenc/encode.c -@@ -160,6 +160,7 @@ - /* do we have optional hard bitrate restrictions? */ - if(opt->max_bitrate > 0 || opt->min_bitrate > 0){ - struct ovectl_ratemanage2_arg ai; -+ long bitrate; - vorbis_encode_ctl(&vi, OV_ECTL_RATEMANAGE2_GET, &ai); - - /* libvorbis 1.1 (and current svn) doesn't actually fill this in, -@@ -173,7 +174,6 @@ - Also, note that this won't work correctly unless you have a very - recent (2005/03/04 or later) version of libvorbis from svn). - */ -- long bitrate; - - { - vorbis_info vi2; diff --git a/audio/vorbis-tools/files/patch-share_charset.c b/audio/vorbis-tools/files/patch-share_charset.c deleted file mode 100644 index b06e5ddfa0f9..000000000000 --- a/audio/vorbis-tools/files/patch-share_charset.c +++ /dev/null @@ -1,16 +0,0 @@ - -$FreeBSD$ - ---- share/charset.c.orig -+++ share/charset.c -@@ -27,6 +27,10 @@ - * 8-bit char, 16-bit short and 32-bit int. - */ - -+#ifdef HAVE_CONFIG_H -+# include -+#endif -+ - #ifndef HAVE_ICONV /* should be ifdef USE_CHARSET_CONVERT */ - - #include diff --git a/audio/vorbis-tools/files/patch-share_iconvert.c b/audio/vorbis-tools/files/patch-share_iconvert.c deleted file mode 100644 index fdf48d1ebd62..000000000000 --- a/audio/vorbis-tools/files/patch-share_iconvert.c +++ /dev/null @@ -1,16 +0,0 @@ - -$FreeBSD$ - ---- share/iconvert.c.orig -+++ share/iconvert.c -@@ -16,6 +16,10 @@ - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -+#ifdef HAVE_CONFIG_H -+# include -+#endif -+ - #ifdef HAVE_ICONV - - #include diff --git a/audio/vorbis-tools/files/patch-share_utf8.c b/audio/vorbis-tools/files/patch-share_utf8.c deleted file mode 100644 index ed61f1f558a9..000000000000 --- a/audio/vorbis-tools/files/patch-share_utf8.c +++ /dev/null @@ -1,16 +0,0 @@ - -$FreeBSD$ - ---- share/utf8.c.orig -+++ share/utf8.c -@@ -21,6 +21,10 @@ - * Convert a string between UTF-8 and the locale's charset. - */ - -+#ifdef HAVE_CONFIG_H -+# include -+#endif -+ - #include - #include - diff --git a/audio/vorbis-tools/pkg-descr b/audio/vorbis-tools/pkg-descr index ef2dd7d8d1cf..9c856b6f1b17 100644 --- a/audio/vorbis-tools/pkg-descr +++ b/audio/vorbis-tools/pkg-descr @@ -10,4 +10,4 @@ patent concerns. This package contains utilities to encode, decode, and cut vorbis streams, and to add comments to them. -WWW: http://www.xiph.org/ogg/vorbis/ +WWW: http://www.vorbis.com/ -- cgit v1.2.3