Attachment #239338 for bug #268819

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




PORTNAME=	libspice-server
DISTVERSION=	0.15.0
PORTREVISION=	1
CATEGORIES=	devel
MASTER_SITES=	https://www.spice-space.org/download/releases/spice-server/
DISTNAME=	spice-${PORTVERSION}

LICENSE=	GPLv2

LIB_DEPENDS=	libopus.so:audio/opus
BUILD_DEPENDS=	spice-protocol>=0.12.10:devel/spice-protocol
		spice-protocol>=0.12.10:devel/spice-protocol

OPTIONS_DEFINE=		GSTREAMER LZ4 SASL STATISTICS
OPTIONS_DEFAULT=	GSTREAMER LZ4 SASL


STATISTICS_CONFIGURE_ENABLE=	statistics

USES=		autoreconf compiler:c++11-lang cpe gmake gnome jpeg \
		libtool localbase:ldflag pkgconfig python ssl tar:bzip2 xorg

USE_GNOME=	glib20




--- configure.ac.orig	2021-04-17 06:49:29 UTC
+++ configure.ac
@@ -41,6 +41,7 @@ AC_PROG_CC_C99
 if test x"$ac_cv_prog_cc_c99" = xno; then
     AC_MSG_ERROR([C99 compiler is required.])
 fi
+AC_PROG_CPP
 AC_PROG_INSTALL
 AC_CANONICAL_HOST
 LT_INIT([disable-static])
@@ -204,7 +205,8 @@ AS_VAR_APPEND([SPICE_REQUIRES], [" pixman-1 >= $PIXMAN
 PKG_CHECK_MODULES(SSL, openssl >= 1.0.0)
 AC_SUBST(SSL_CFLAGS)
 AC_SUBST(SSL_LIBS)
-AS_VAR_APPEND([SPICE_REQUIRES], [" openssl"])
+dnl OpenSSL in the base system is not managed by pkgconfig
+dnl AS_VAR_APPEND([SPICE_REQUIRES], [" openssl"])
 
 save_CFLAGS="$CFLAGS"
 CFLAGS="$CFLAGS $SSL_CFLAGS"
@@ -217,15 +219,16 @@ CFLAGS="$save_CFLAGS"
 
 AC_CHECK_LIB(jpeg, jpeg_destroy_decompress,
     AC_MSG_CHECKING([for jpeglib.h])
-    AC_TRY_CPP(
-[#include <stdio.h>
+    AC_PREPROC_IFELSE(
+[AC_LANG_SOURCE([[
+#include <stdio.h>
 #undef PACKAGE
 #undef VERSION
 #undef HAVE_STDLIB_H
-#include <jpeglib.h>],
-        JPEG_LIBS='-ljpeg'
-        AC_MSG_RESULT($jpeg_ok),
-	AC_MSG_ERROR([jpeglib.h not found])),
+#include <jpeglib.h>]])],
+        [JPEG_LIBS='-ljpeg'
+        AC_MSG_RESULT($jpeg_ok)],
+	[AC_MSG_ERROR([jpeglib.h not found])]),
     AC_MSG_ERROR([libjpeg not found]))
 AC_SUBST(JPEG_LIBS)
 

Return to bug 268819

Lines 1-5 Link Here

(-)b/devel/libspice-server/Makefile (-3 / +3 lines)
1	PORTNAME= libspice-server	1	PORTNAME= libspice-server
2	DISTVERSION= 0.15.0	2	DISTVERSION= 0.15.0
		3	PORTREVISION= 1
3	CATEGORIES= devel	4	CATEGORIES= devel
4	MASTER_SITES= https://www.spice-space.org/download/releases/spice-server/	5	MASTER_SITES= https://www.spice-space.org/download/releases/spice-server/
5	DISTNAME= spice-${PORTVERSION}	6	DISTNAME= spice-${PORTVERSION}
Lines 11-18 WWW= https://spice-space.org/ Link Here
11	LICENSE= GPLv2	12	LICENSE= GPLv2
12		13
13	LIB_DEPENDS= libopus.so:audio/opus	14	LIB_DEPENDS= libopus.so:audio/opus
14	BUILD_DEPENDS= autoconf-archive>=0:devel/autoconf-archive \	15	BUILD_DEPENDS= spice-protocol>=0.12.10:devel/spice-protocol
15	spice-protocol>=0.12.10:devel/spice-protocol
16		16
17	OPTIONS_DEFINE= GSTREAMER LZ4 SASL STATISTICS	17	OPTIONS_DEFINE= GSTREAMER LZ4 SASL STATISTICS
18	OPTIONS_DEFAULT= GSTREAMER LZ4 SASL	18	OPTIONS_DEFAULT= GSTREAMER LZ4 SASL
Lines 31-37 SASL_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 Link Here
31		31
32	STATISTICS_CONFIGURE_ENABLE= statistics	32	STATISTICS_CONFIGURE_ENABLE= statistics
33		33
34	USES= autoreconf:2.69 compiler:c++11-lang cpe gmake gnome jpeg \	34	USES= autoreconf compiler:c++11-lang cpe gmake gnome jpeg \
35	libtool localbase:ldflag pkgconfig python ssl tar:bzip2 xorg	35	libtool localbase:ldflag pkgconfig python ssl tar:bzip2 xorg
36		36
37	USE_GNOME= glib20	37	USE_GNOME= glib20

Added Link Here

(-)b/devel/libspice-server/files/patch-configure.ac (+43 lines)
1	--- configure.ac.orig 2021-04-17 06:49:29 UTC
2	+++ configure.ac
3	@@ -41,6 +41,7 @@ AC_PROG_CC_C99
4	if test x"$ac_cv_prog_cc_c99" = xno; then
5	AC_MSG_ERROR([C99 compiler is required.])
6	fi
7	+AC_PROG_CPP
8	AC_PROG_INSTALL
9	AC_CANONICAL_HOST
10	LT_INIT([disable-static])
11	@@ -204,7 +205,8 @@ AS_VAR_APPEND([SPICE_REQUIRES], [" pixman-1 >= $PIXMAN
12	PKG_CHECK_MODULES(SSL, openssl >= 1.0.0)
13	AC_SUBST(SSL_CFLAGS)
14	AC_SUBST(SSL_LIBS)
15	-AS_VAR_APPEND([SPICE_REQUIRES], [" openssl"])
16	+dnl OpenSSL in the base system is not managed by pkgconfig
17	+dnl AS_VAR_APPEND([SPICE_REQUIRES], [" openssl"])
18
19	save_CFLAGS="$CFLAGS"
20	CFLAGS="$CFLAGS $SSL_CFLAGS"
21	@@ -217,15 +219,16 @@ CFLAGS="$save_CFLAGS"
22
23	AC_CHECK_LIB(jpeg, jpeg_destroy_decompress,
24	AC_MSG_CHECKING([for jpeglib.h])
25	- AC_TRY_CPP(
26	-[#include <stdio.h>
27	+ AC_PREPROC_IFELSE(
28	+[AC_LANG_SOURCE([[
29	+#include <stdio.h>
30	#undef PACKAGE
31	#undef VERSION
32	#undef HAVE_STDLIB_H
33	-#include <jpeglib.h>],
34	- JPEG_LIBS='-ljpeg'
35	- AC_MSG_RESULT($jpeg_ok),
36	- AC_MSG_ERROR([jpeglib.h not found])),
37	+#include <jpeglib.h>]])],
38	+ [JPEG_LIBS='-ljpeg'
39	+ AC_MSG_RESULT($jpeg_ok)],
40	+ [AC_MSG_ERROR([jpeglib.h not found])]),
41	AC_MSG_ERROR([libjpeg not found]))
42	AC_SUBST(JPEG_LIBS)
43