Attachment #247757 for bug #276438

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

Lines 1-6 Link Here

(-)b/multimedia/camserv/Makefile (-2 / +2 lines)
1	PORTNAME= camserv	1	PORTNAME= camserv
2	PORTVERSION= 0.5.1	2	PORTVERSION= 0.5.1
3	PORTREVISION= 21	3	PORTREVISION= 22
4	PORTEPOCH= 1	4	PORTEPOCH= 1
5	CATEGORIES= multimedia	5	CATEGORIES= multimedia
6	MASTER_SITES= SF/cserv/${PORTNAME}/${PORTVERSION}	6	MASTER_SITES= SF/cserv/${PORTNAME}/${PORTVERSION}
Lines 14-20 LICENSE_FILE= ${WRKSRC}/COPYING Link Here
14		14
15	LIB_DEPENDS= libltdl.so:devel/libltdl	15	LIB_DEPENDS= libltdl.so:devel/libltdl
16		16
17	USES= autoreconf jpeg libtool	17	USES= autoreconf jpeg libtool pkgconfig
18	GNU_CONFIGURE= yes	18	GNU_CONFIGURE= yes
19	INSTALL_TARGET= install-strip	19	INSTALL_TARGET= install-strip
20		20




Add minimal support to `pkg-config imlib2`; imlib2-config has been
dropped since imlib2-1.7.5.

--- configure.in.orig	2002-05-12 18:06:12 UTC
+++ configure.in
@@ -9,15 +9,13 @@ AM_MAINTAINER_MODE
 AM_CONFIG_HEADER(include/camserv_config.h:config.in)
 AM_MAINTAINER_MODE
 

 
 AC_CHECK_LIB(m,sqrt)
 AC_CHECK_LIB(jpeg,jpeg_start_compress)
@@ -35,6 +33,12 @@ if test "$IMLIB2_CONFIG"x != "x"; then
 		 CFLAGS="$CFLAGS $IMLIB2_CFLAGS"
 		 ;;
 	esac
+	else
+		if pkg-config imlib2; then
+			IMLIB2_CFLAGS=`pkg-config --cflags imlib2`
+		 	IMLIB2_LIBS=`pkg-config --libs imlib2`
+			AC_CHECK_HEADER(Imlib2.h,have_imlib2=yes)
+		fi
 fi	
 
 AC_SUBST(IMLIB2_CFLAGS)
@@ -55,7 +59,7 @@ if test "$GDKPIXBUF_CONFIG"x != "x"; then
 if test "$GDKPIXBUF_CONFIG"x != "x"; then
 	GDKPIXBUF_VERSION=`$GDKPIXBUF_CONFIG --version`
 	case "$GDKPIXBUF_VERSION" in

 		 GDKPIXBUF_CFLAGS=`$GDKPIXBUF_CONFIG --cflags`
 		 GDKPIXBUF_LIBS=`$GDKPIXBUF_CONFIG --libs`
 		 CFLAGS="$CFLAGS $GDKPIXBUF_CFLAGS"
@@ -93,7 +97,7 @@ AM_CONDITIONAL(VIDEO_V4L, test $video_v4l = yes)
 [video_v4l=yes],[video_v4l=no])
 AM_CONDITIONAL(VIDEO_V4L, test $video_v4l = yes)
 

Return to bug 276438

Lines 1-6 Link Here

(-)b/multimedia/camserv/files/patch-configure.in (-3 / +19 lines)
		1	Add minimal support to `pkg-config imlib2`; imlib2-config has been
		2	dropped since imlib2-1.7.5.
		3
1	--- configure.in.orig 2002-05-12 18:06:12 UTC	4	--- configure.in.orig 2002-05-12 18:06:12 UTC
2	+++ configure.in	5	+++ configure.in
3	@@ -9,15 +9,13 @@ AM_INIT_AUTOMAKE(camserv,$CAMSERV_VER_MA	6	@@ -9,15 +9,13 @@ AM_MAINTAINER_MODE
4	AM_CONFIG_HEADER(include/camserv_config.h:config.in)	7	AM_CONFIG_HEADER(include/camserv_config.h:config.in)
5	AM_MAINTAINER_MODE	8	AM_MAINTAINER_MODE
6		9
Lines 19-25 Link Here
19		22
20	AC_CHECK_LIB(m,sqrt)	23	AC_CHECK_LIB(m,sqrt)
21	AC_CHECK_LIB(jpeg,jpeg_start_compress)	24	AC_CHECK_LIB(jpeg,jpeg_start_compress)
22	@@ -55,7 +53,7 @@ AC_PATH_PROG(GDKPIXBUF_CONFIG,gdk-pixbuf	25	@@ -35,6 +33,12 @@ if test "$IMLIB2_CONFIG"x != "x"; then
		26	CFLAGS="$CFLAGS $IMLIB2_CFLAGS"
		27	;;
		28	esac
		29	+ else
		30	+ if pkg-config imlib2; then
		31	+ IMLIB2_CFLAGS=`pkg-config --cflags imlib2`
		32	+ IMLIB2_LIBS=`pkg-config --libs imlib2`
		33	+ AC_CHECK_HEADER(Imlib2.h,have_imlib2=yes)
		34	+ fi
		35	fi
		36
		37	AC_SUBST(IMLIB2_CFLAGS)
		38	@@ -55,7 +59,7 @@ if test "$GDKPIXBUF_CONFIG"x != "x"; then
23	if test "$GDKPIXBUF_CONFIG"x != "x"; then	39	if test "$GDKPIXBUF_CONFIG"x != "x"; then
24	GDKPIXBUF_VERSION=`$GDKPIXBUF_CONFIG --version`	40	GDKPIXBUF_VERSION=`$GDKPIXBUF_CONFIG --version`
25	case "$GDKPIXBUF_VERSION" in	41	case "$GDKPIXBUF_VERSION" in
Lines 28-34 Link Here
28	GDKPIXBUF_CFLAGS=`$GDKPIXBUF_CONFIG --cflags`	44	GDKPIXBUF_CFLAGS=`$GDKPIXBUF_CONFIG --cflags`
29	GDKPIXBUF_LIBS=`$GDKPIXBUF_CONFIG --libs`	45	GDKPIXBUF_LIBS=`$GDKPIXBUF_CONFIG --libs`
30	CFLAGS="$CFLAGS $GDKPIXBUF_CFLAGS"	46	CFLAGS="$CFLAGS $GDKPIXBUF_CFLAGS"
31	@@ -93,7 +91,7 @@ AC_CHECK_HEADERS(linux/videodev.h,	47	@@ -93,7 +97,7 @@ AM_CONDITIONAL(VIDEO_V4L, test $video_v4l = yes)
32	[video_v4l=yes],[video_v4l=no])	48	[video_v4l=yes],[video_v4l=no])
33	AM_CONDITIONAL(VIDEO_V4L, test $video_v4l = yes)	49	AM_CONDITIONAL(VIDEO_V4L, test $video_v4l = yes)
34		50