Attachment #172297 for bug #210952

View | Details | Raw Unified | Return to bug 210952
Collapse All | Expand All




# $FreeBSD$

PORTNAME=	opusfile
PORTVERSION=	0.8
CATEGORIES=	audio
MASTER_SITES=	http://downloads.xiph.org/releases/opus/ \
		MOZILLA/opus

LIB_DEPENDS=	libogg.so:audio/libogg \
		libopus.so:audio/opus

USES=		autoreconf gmake libtool pathfix pkgconfig ssl
USE_LDCONFIG=	yes
USE_OPENSSL=	yes
GNU_CONFIGURE=	yes
MAKE_JOBS_UNSAFE=	yes
PATHFIX_MAKEFILEIN=	Makefile.am

CONFIGURE_ARGS+=	--disable-examples
INSTALL_TARGET=	install-strip

.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|'

		>> ${WRKDIR}/PLIST.doc ; \
	(cd ${WRKDIR} ; ${SED} -i -e '/PLIST.doc/ r PLIST.doc' ${TMPPLIST})

.include <bsd.port.post.mk>

Lines 1-2 Link Here

(-)audio/opusfile/distinfo (-2 / +3 lines)
1	SHA256 (opusfile-0.7.tar.gz) = 9e2bed13bc729058591a0f1cab2505e8cfd8e7ac460bf10a78bcc3b125e7c301	1	TIMESTAMP = 1467984139
2	SIZE (opusfile-0.7.tar.gz) = 463581	2	SHA256 (opusfile-0.8.tar.gz) = 2c231ed3cfaa1b3173f52d740e5bbd77d51b9dfecb87014b404917fba4b855a4
		3	SIZE (opusfile-0.8.tar.gz) = 464600




--- 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])
 




--- 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])
 

Lines 2-12 Link Here

(-)audio/opusfile/pkg-plist (-2 / +2 lines)
2	lib/libopusfile.a	2	lib/libopusfile.a
3	lib/libopusfile.so	3	lib/libopusfile.so
4	lib/libopusfile.so.0	4	lib/libopusfile.so.0
5	lib/libopusfile.so.0.4.0	5	lib/libopusfile.so.0.4.1
6	lib/libopusurl.a	6	lib/libopusurl.a
7	lib/libopusurl.so	7	lib/libopusurl.so
8	lib/libopusurl.so.0	8	lib/libopusurl.so.0
9	lib/libopusurl.so.0.4.0	9	lib/libopusurl.so.0.4.1
10	libdata/pkgconfig/opusfile.pc	10	libdata/pkgconfig/opusfile.pc
11	libdata/pkgconfig/opusurl.pc	11	libdata/pkgconfig/opusurl.pc
12	@comment Insert PLIST.doc here	12	@comment Insert PLIST.doc here

Return to bug 210952

Lines 1-7 Link Here

(-)audio/opusfile/Makefile (-5 / +13 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= opusfile	3	PORTNAME= opusfile
4	PORTVERSION= 0.7	4	PORTVERSION= 0.8
5	CATEGORIES= audio	5	CATEGORIES= audio
6	MASTER_SITES= http://downloads.xiph.org/releases/opus/ \	6	MASTER_SITES= http://downloads.xiph.org/releases/opus/ \
7	MOZILLA/opus	7	MOZILLA/opus
Lines 15-23 Link Here
15	LIB_DEPENDS= libogg.so:audio/libogg \	15	LIB_DEPENDS= libogg.so:audio/libogg \
16	libopus.so:audio/opus	16	libopus.so:audio/opus
17		17
18	USES= autoreconf gmake libtool pathfix pkgconfig	18	USES= autoreconf gmake libtool pathfix pkgconfig ssl
19	USE_LDCONFIG= yes	19	USE_LDCONFIG= yes
20	USE_OPENSSL= yes
21	GNU_CONFIGURE= yes	20	GNU_CONFIGURE= yes
22	MAKE_JOBS_UNSAFE= yes	21	MAKE_JOBS_UNSAFE= yes
23	PATHFIX_MAKEFILEIN= Makefile.am	22	PATHFIX_MAKEFILEIN= Makefile.am
Lines 33-41 Link Here
33	CONFIGURE_ARGS+= --disable-examples	32	CONFIGURE_ARGS+= --disable-examples
34	INSTALL_TARGET= install-strip	33	INSTALL_TARGET= install-strip
35		34
36	post-patch:	35	.include <bsd.port.pre.mk>
		36
		37	.if ${SSL_DEFAULT} == base
		38	EXTRA_PATCHES+= ${FILESDIR}/extra-patch-configure.ac
		39	pre-patch:
37	@${GREP} -l '@openssl@' ${WRKSRC}/opusurl.pc.in \| \	40	@${GREP} -l '@openssl@' ${WRKSRC}/opusurl.pc.in \| \
38	${XARGS} ${REINPLACE_CMD} -e 's\| @openssl@\|\|'	41	${XARGS} ${REINPLACE_CMD} -e 's\| @openssl@\|\|'
		42	.endif
		43
		44	post-patch:
		45	@${GREP} -l 'AC_SEARCH_LIBS(ftime' ${WRKSRC}/configure.ac \| \
		46	${XARGS} ${REINPLACE_CMD} -e '/ftime/d'
39	@${GREP} -L 'src/ftime.c' ${WRKSRC}/Makefile.am \| \	47	@${GREP} -L 'src/ftime.c' ${WRKSRC}/Makefile.am \| \
40	${XARGS} ${REINPLACE_CMD} -e '/dist_doc_DATA/s/COPYING//' \	48	${XARGS} ${REINPLACE_CMD} -e '/dist_doc_DATA/s/COPYING//' \
41	-e '/libopusurl_la_SOURCES/s\|= \(src/http\.c\)\|= src/ftime.c \1\|'	49	-e '/libopusurl_la_SOURCES/s\|= \(src/http\.c\)\|= src/ftime.c \1\|'
Lines 48-51 Link Here
48	>> ${WRKDIR}/PLIST.doc ; \	56	>> ${WRKDIR}/PLIST.doc ; \
49	(cd ${WRKDIR} ; ${SED} -i -e '/PLIST.doc/ r PLIST.doc' ${TMPPLIST})	57	(cd ${WRKDIR} ; ${SED} -i -e '/PLIST.doc/ r PLIST.doc' ${TMPPLIST})
50		58
51	.include <bsd.port.mk>	59	.include <bsd.port.post.mk>

Line 0 Link Here

(-)audio/opusfile/files/extra-patch-configure.ac (+16 lines)
	1	--- configure.ac.orig 2016-01-01 01:42:01 UTC
	2	+++ configure.ac
	3	@@ -81,10 +81,12 @@ AM_COND_IF(OP_WIN32,
	4	AS_IF([test "$enable_http" != "no"], [
	5	openssl="openssl"
	6	AC_DEFINE([OP_ENABLE_HTTP], [1], [Enable HTTP support])
	7	- PKG_CHECK_MODULES([URL_DEPS], [openssl])
	8	])
	9	AM_CONDITIONAL(OP_ENABLE_HTTP, [test "$enable_http" != "no"])
	10	AC_SUBST([openssl])
	11	+AC_CHECK_LIB(ssl, SSL_read,
	12	+ [AC_CHECK_HEADERS(openssl/ssl.h, LIBS="$LIBS -lssl -lcrypto",,)],,
	13	+ -lcrypto -lssl)
	14
	15	PKG_CHECK_MODULES([DEPS], [ogg >= 1.3 opus >= 1.0.1])
	16

Lines 1-21 Link Here

(-)audio/opusfile/files/patch-configure.ac (-21 lines)
1	--- configure.ac.orig 2016-01-01 01:42:01 UTC
2	+++ configure.ac
3	@@ -86,15 +86,16 @@ AM_COND_IF(OP_WIN32,
4	)
5	)
6	)
7	-AC_SEARCH_LIBS(ftime, [compat], , [enable_http=no])
8
9	AS_IF([test "$enable_http" != "no"], [
10	openssl="openssl"
11	AC_DEFINE([OP_ENABLE_HTTP], [1], [Enable HTTP support])
12	- PKG_CHECK_MODULES([URL_DEPS], [openssl])
13	])
14	AM_CONDITIONAL(OP_ENABLE_HTTP, [test "$enable_http" != "no"])
15	AC_SUBST([openssl])
16	+AC_CHECK_LIB(ssl, SSL_read,
17	+ [AC_CHECK_HEADERS(openssl/ssl.h, LIBS="$LIBS -lssl -lcrypto",,)],,
18	+ -lcrypto -lssl)
19
20	PKG_CHECK_MODULES([DEPS], [ogg >= 1.3 opus >= 1.0.1])
21