Attachment 172297 Details for Bug 210952 – Switch version from 0.7 to 0.8

[patch] Switch version from 0.7 to 0.8

opusfile08.diff (text/plain), 4.81 KB, created by SimaMoto,RyōTa on 2016-07-10 00:02:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: SimaMoto,RyōTa

Created: 2016-07-10 00:02:52 UTC

Size: 4.81 KB

patch

obsolete

>Index: audio/opusfile/Makefile
>===================================================================
>--- audio/opusfile/Makefile	(revision 418251)
>+++ audio/opusfile/Makefile	(working copy)
>@@ -1,7 +1,7 @@
> # $FreeBSD$
> 
> PORTNAME=	opusfile
>-PORTVERSION=	0.7
>+PORTVERSION=	0.8
> CATEGORIES=	audio
> MASTER_SITES=	http://downloads.xiph.org/releases/opus/ \
> 		MOZILLA/opus
>@@ -15,9 +15,8 @@
> LIB_DEPENDS=	libogg.so:audio/libogg \
> 		libopus.so:audio/opus
> 
>-USES=		autoreconf gmake libtool pathfix pkgconfig
>+USES=		autoreconf gmake libtool pathfix pkgconfig ssl
> USE_LDCONFIG=	yes
>-USE_OPENSSL=	yes
> GNU_CONFIGURE=	yes
> MAKE_JOBS_UNSAFE=	yes
> PATHFIX_MAKEFILEIN=	Makefile.am
>@@ -33,9 +32,18 @@
> CONFIGURE_ARGS+=	--disable-examples
> INSTALL_TARGET=	install-strip
> 
>-post-patch:
>+.include <bsd.port.pre.mk>
>+
>+.if ${SSL_DEFAULT} == base
>+EXTRA_PATCHES+=	${FILESDIR}/extra-patch-configure.ac
>+pre-patch:
> 	@${GREP} -l '@openssl@' ${WRKSRC}/opusurl.pc.in | \
> 		${XARGS} ${REINPLACE_CMD} -e 's| @openssl@||'
>+.endif
>+
>+post-patch:
>+	@${GREP} -l 'AC_SEARCH_LIBS(ftime' ${WRKSRC}/configure.ac | \
>+		${XARGS} ${REINPLACE_CMD} -e '/ftime/d'
> 	@${GREP} -L 'src/ftime.c' ${WRKSRC}/Makefile.am | \
> 		${XARGS} ${REINPLACE_CMD} -e '/dist_doc_DATA/s/COPYING//' \
> 		-e '/libopusurl_la_SOURCES/s|= $src/http\.c$|= src/ftime.c \1|'
>@@ -48,4 +56,4 @@
> 		>> ${WRKDIR}/PLIST.doc ; \
> 	(cd ${WRKDIR} ; ${SED} -i -e '/PLIST.doc/ r PLIST.doc' ${TMPPLIST})
> 
>-.include <bsd.port.mk>
>+.include <bsd.port.post.mk>
>Index: audio/opusfile/distinfo
>===================================================================
>--- audio/opusfile/distinfo	(revision 418251)
>+++ audio/opusfile/distinfo	(working copy)
>@@ -1,2 +1,3 @@
>-SHA256 (opusfile-0.7.tar.gz) = 9e2bed13bc729058591a0f1cab2505e8cfd8e7ac460bf10a78bcc3b125e7c301
>-SIZE (opusfile-0.7.tar.gz) = 463581
>+TIMESTAMP = 1467984139
>+SHA256 (opusfile-0.8.tar.gz) = 2c231ed3cfaa1b3173f52d740e5bbd77d51b9dfecb87014b404917fba4b855a4
>+SIZE (opusfile-0.8.tar.gz) = 464600
>Index: audio/opusfile/files/extra-patch-configure.ac
>===================================================================
>--- audio/opusfile/files/extra-patch-configure.ac	(nonexistent)
>+++ audio/opusfile/files/extra-patch-configure.ac	(working copy)
>@@ -0,0 +1,16 @@
>+--- configure.ac.orig	2016-01-01 01:42:01 UTC
>++++ configure.ac
>+@@ -81,10 +81,12 @@ AM_COND_IF(OP_WIN32,
>+ AS_IF([test "$enable_http" != "no"], [
>+    openssl="openssl"
>+    AC_DEFINE([OP_ENABLE_HTTP], [1], [Enable HTTP support])
>+-   PKG_CHECK_MODULES([URL_DEPS], [openssl])
>+ ])
>+ AM_CONDITIONAL(OP_ENABLE_HTTP, [test "$enable_http" != "no"])
>+ AC_SUBST([openssl])
>++AC_CHECK_LIB(ssl, SSL_read,
>++	[AC_CHECK_HEADERS(openssl/ssl.h, LIBS="$LIBS -lssl -lcrypto",,)],,
>++	-lcrypto -lssl)
>+ 
>+ PKG_CHECK_MODULES([DEPS], [ogg >= 1.3 opus >= 1.0.1])
>+ 
>
>Property changes on: audio/opusfile/files/extra-patch-configure.ac
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: audio/opusfile/files/patch-configure.ac
>===================================================================
>--- audio/opusfile/files/patch-configure.ac	(revision 418251)
>+++ audio/opusfile/files/patch-configure.ac	(nonexistent)
>@@ -1,21 +0,0 @@
>---- configure.ac.orig	2016-01-01 01:42:01 UTC
>-+++ configure.ac
>-@@ -86,15 +86,16 @@ AM_COND_IF(OP_WIN32,
>-     )
>-   )
>- )
>--AC_SEARCH_LIBS(ftime, [compat], , [enable_http=no])
>- 
>- AS_IF([test "$enable_http" != "no"], [
>-    openssl="openssl"
>-    AC_DEFINE([OP_ENABLE_HTTP], [1], [Enable HTTP support])
>--   PKG_CHECK_MODULES([URL_DEPS], [openssl])
>- ])
>- AM_CONDITIONAL(OP_ENABLE_HTTP, [test "$enable_http" != "no"])
>- AC_SUBST([openssl])
>-+AC_CHECK_LIB(ssl, SSL_read,
>-+	[AC_CHECK_HEADERS(openssl/ssl.h, LIBS="$LIBS -lssl -lcrypto",,)],,
>-+	-lcrypto -lssl)
>- 
>- PKG_CHECK_MODULES([DEPS], [ogg >= 1.3 opus >= 1.0.1])
>- 
>
>Property changes on: audio/opusfile/files/patch-configure.ac
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: audio/opusfile/pkg-plist
>===================================================================
>--- audio/opusfile/pkg-plist	(revision 418251)
>+++ audio/opusfile/pkg-plist	(working copy)
>@@ -2,11 +2,11 @@
> lib/libopusfile.a
> lib/libopusfile.so
> lib/libopusfile.so.0
>-lib/libopusfile.so.0.4.0
>+lib/libopusfile.so.0.4.1
> lib/libopusurl.a
> lib/libopusurl.so
> lib/libopusurl.so.0
>-lib/libopusurl.so.0.4.0
>+lib/libopusurl.so.0.4.1
> libdata/pkgconfig/opusfile.pc
> libdata/pkgconfig/opusurl.pc
> @comment Insert PLIST.doc here

Flags:

liangtai.s16: maintainer-approval+

Actions: View | Diff

Attachments on bug 210952: 172297 | 172303 | 172304 | 172305