Attachment 247757 Details for Bug 276438 – Fix build with imlib2 1.12.1

[patch] Fix build with imlib2 1.12.1

camserv-0.5.1_22,1.diff (text/plain), 2.16 KB, created by Nuno Teixeira on 2024-01-18 20:24:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nuno Teixeira

Created: 2024-01-18 20:24:31 UTC

Size: 2.16 KB

patch

obsolete

>diff --git a/multimedia/camserv/Makefile b/multimedia/camserv/Makefile
>index ec612ebc6489..13c9df527aa2 100644
>--- a/multimedia/camserv/Makefile
>+++ b/multimedia/camserv/Makefile
>@@ -1,6 +1,6 @@
> PORTNAME=	camserv
> PORTVERSION=	0.5.1
>-PORTREVISION=	21
>+PORTREVISION=	22
> PORTEPOCH=	1
> CATEGORIES=	multimedia
> MASTER_SITES=	SF/cserv/${PORTNAME}/${PORTVERSION}
>@@ -14,7 +14,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
> 
> LIB_DEPENDS=	libltdl.so:devel/libltdl
> 
>-USES=		autoreconf jpeg libtool
>+USES=		autoreconf jpeg libtool pkgconfig
> GNU_CONFIGURE=	yes
> INSTALL_TARGET=	install-strip
> 
>diff --git a/multimedia/camserv/files/patch-configure.in b/multimedia/camserv/files/patch-configure.in
>index 476c7b0583ee..ab3c1282ee48 100644
>--- a/multimedia/camserv/files/patch-configure.in
>+++ b/multimedia/camserv/files/patch-configure.in
>@@ -1,6 +1,9 @@
>+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_INIT_AUTOMAKE(camserv,$CAMSERV_VER_MA
>+@@ -9,15 +9,13 @@ AM_MAINTAINER_MODE
>  AM_CONFIG_HEADER(include/camserv_config.h:config.in)
>  AM_MAINTAINER_MODE
>  
>@@ -19,7 +22,20 @@
>  
>  AC_CHECK_LIB(m,sqrt)
>  AC_CHECK_LIB(jpeg,jpeg_start_compress)
>-@@ -55,7 +53,7 @@ AC_PATH_PROG(GDKPIXBUF_CONFIG,gdk-pixbuf
>+@@ -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
>@@ -28,7 +44,7 @@
>  		 GDKPIXBUF_CFLAGS=`$GDKPIXBUF_CONFIG --cflags`
>  		 GDKPIXBUF_LIBS=`$GDKPIXBUF_CONFIG --libs`
>  		 CFLAGS="$CFLAGS $GDKPIXBUF_CFLAGS"
>-@@ -93,7 +91,7 @@ AC_CHECK_HEADERS(linux/videodev.h,
>+@@ -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)
>

Actions: View | Diff

Attachments on bug 276438: 247757