svn commit: r418438 - in head/audio/opusfile: . files
Dmitry Marakasov
amdmi3 at FreeBSD.org
Tue Jul 12 19:35:26 UTC 2016
Author: amdmi3
Date: Tue Jul 12 19:35:24 2016
New Revision: 418438
URL: https://svnweb.freebsd.org/changeset/ports/418438
Log:
- Update to 0.8
- Switch to USES=ssl
- Fix build with ports openssl
PR: 210952
Submitted by: liangtai.s16 at gmail.com (maintainer)
Added:
head/audio/opusfile/files/extra-patch-configure.ac (contents, props changed)
Deleted:
head/audio/opusfile/files/patch-configure.ac
Modified:
head/audio/opusfile/Makefile
head/audio/opusfile/distinfo
head/audio/opusfile/pkg-plist
Modified: head/audio/opusfile/Makefile
==============================================================================
--- head/audio/opusfile/Makefile Tue Jul 12 19:33:37 2016 (r418437)
+++ head/audio/opusfile/Makefile Tue Jul 12 19:35:24 2016 (r418438)
@@ -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 @@ LICENSE_FILE= ${WRKSRC}/COPYING
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 @@ DOXYGEN_BUILD_DEPENDS= doxygen:devel/dox
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 @@ post-install-DOXYGEN-on:
>> ${WRKDIR}/PLIST.doc ; \
(cd ${WRKDIR} ; ${SED} -i -e '/PLIST.doc/ r PLIST.doc' ${TMPPLIST})
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Modified: head/audio/opusfile/distinfo
==============================================================================
--- head/audio/opusfile/distinfo Tue Jul 12 19:33:37 2016 (r418437)
+++ head/audio/opusfile/distinfo Tue Jul 12 19:35:24 2016 (r418438)
@@ -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
Added: head/audio/opusfile/files/extra-patch-configure.ac
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/audio/opusfile/files/extra-patch-configure.ac Tue Jul 12 19:35:24 2016 (r418438)
@@ -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])
+
Modified: head/audio/opusfile/pkg-plist
==============================================================================
--- head/audio/opusfile/pkg-plist Tue Jul 12 19:33:37 2016 (r418437)
+++ head/audio/opusfile/pkg-plist Tue Jul 12 19:35:24 2016 (r418438)
@@ -2,11 +2,11 @@ include/opus/opusfile.h
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
More information about the svn-ports-all
mailing list