Attachment 159822 Details for Bug 202280 – Patch.diff

[patch] Patch.diff

patch-libv4l.diff (text/plain), 4.09 KB, created by Andriy Voskoboinyk on 2015-08-12 22:19:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andriy Voskoboinyk

Created: 2015-08-12 22:19:58 UTC

Size: 4.09 KB

patch

obsolete

>Index: multimedia/libv4l/Makefile
>===================================================================
>--- multimedia/libv4l/Makefile	(revision 394040)
>+++ multimedia/libv4l/Makefile	(working copy)
>@@ -4,7 +4,7 @@
> 
> PORTNAME?=	libv4l
> PORTVERSION=	1.6.3
>-PORTREVISION?=	0
>+PORTREVISION?=	1
> CATEGORIES=	multimedia
> MASTER_SITES=	http://linuxtv.org/downloads/v4l-utils/:master \
> 		LOCAL/kwm:local
>@@ -24,7 +24,6 @@
> 
> .if ${LIBV4L_SLAVE} != compat
> BUILD_DEPENDS+=	v4l_compat>=${PORTVERSION}:${PORTSDIR}/multimedia/v4l_compat
>-LIB_DEPENDS+=	libargp.so:${PORTSDIR}/devel/argp-standalone
> 
> GNU_CONFIGURE=	yes
> CPPFLAGS+=	-I${LOCALBASE}/include
>@@ -38,12 +37,14 @@
> 
> . if ${LIBV4L_SLAVE} == utils
> BUILD_DEPENDS+=	libv4l>=${PORTVERSION}:${PORTSDIR}/multimedia/libv4l
>-LIB_DEPENDS+=	libv4l2.so:${PORTSDIR}/multimedia/libv4l
>-# Disabling building libv4l in the utils slave is too much hackery 
>+LIB_DEPENDS+=	libargp.so:${PORTSDIR}/devel/argp-standalone \
>+		libv4l2.so:${PORTSDIR}/multimedia/libv4l
>+# Disabling building libv4l in the utils slave is too much hackery
> # Lets wait for subpackages
>-CONFIGURE_ARGS+=--enable-v4l-utils 
>+CONFIGURE_ARGS+=--enable-v4l-utils
> . else
> CONFIGURE_ARGS+=--disable-v4l-utils --enable-libv4l
>+EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-configure
> . endif
> .endif
> 
>Index: multimedia/libv4l/files/extra-patch-configure
>===================================================================
>--- multimedia/libv4l/files/extra-patch-configure	(revision 0)
>+++ multimedia/libv4l/files/extra-patch-configure	(working copy)
>@@ -0,0 +1,78 @@
>+--- configure.orig	2015-08-12 21:40:16 UTC
>++++ configure
>+@@ -18563,75 +18563,6 @@ fi
>+ 
>+ LIBS=$dl_saved_libs
>+ 
>+-ac_fn_c_check_header_mongrel "$LINENO" "argp.h" "ac_cv_header_argp_h" "$ac_includes_default"
>+-if test "x$ac_cv_header_argp_h" = xyes; then :
>+-
>+-else
>+-  as_fn_error $? "Cannot continue: argp.h not found" "$LINENO" 5
>+-fi
>+-
>+-
>+-argp_saved_libs=$LIBS
>+-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing argp_parse" >&5
>+-$as_echo_n "checking for library containing argp_parse... " >&6; }
>+-if ${ac_cv_search_argp_parse+:} false; then :
>+-  $as_echo_n "(cached) " >&6
>+-else
>+-  ac_func_search_save_LIBS=$LIBS
>+-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
>+-/* end confdefs.h.  */
>+-
>+-/* Override any GCC internal prototype to avoid an error.
>+-   Use char because int might match the return type of a GCC
>+-   builtin and then its argument prototype would still apply.  */
>+-#ifdef __cplusplus
>+-extern "C"
>+-#endif
>+-char argp_parse ();
>+-int
>+-main ()
>+-{
>+-return argp_parse ();
>+-  ;
>+-  return 0;
>+-}
>+-_ACEOF
>+-for ac_lib in '' argp; do
>+-  if test -z "$ac_lib"; then
>+-    ac_res="none required"
>+-  else
>+-    ac_res=-l$ac_lib
>+-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
>+-  fi
>+-  if ac_fn_c_try_link "$LINENO"; then :
>+-  ac_cv_search_argp_parse=$ac_res
>+-fi
>+-rm -f core conftest.err conftest.$ac_objext \
>+-    conftest$ac_exeext
>+-  if ${ac_cv_search_argp_parse+:} false; then :
>+-  break
>+-fi
>+-done
>+-if ${ac_cv_search_argp_parse+:} false; then :
>+-
>+-else
>+-  ac_cv_search_argp_parse=no
>+-fi
>+-rm conftest.$ac_ext
>+-LIBS=$ac_func_search_save_LIBS
>+-fi
>+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_argp_parse" >&5
>+-$as_echo "$ac_cv_search_argp_parse" >&6; }
>+-ac_res=$ac_cv_search_argp_parse
>+-if test "$ac_res" != no; then :
>+-  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
>+-  test "$ac_cv_search_argp_parse" = "none required" || ARGP_LIBS=$ac_cv_search_argp_parse
>+-else
>+-  as_fn_error $? "unable to find the argp_parse() function" "$LINENO" 5
>+-fi
>+-
>+-
>+-LIBS=$argp_saved_libs
>+ 
>+ ac_fn_c_check_header_mongrel "$LINENO" "linux/i2c-dev.h" "ac_cv_header_linux_i2c_dev_h" "$ac_includes_default"
>+ if test "x$ac_cv_header_linux_i2c_dev_h" = xyes; then :
>
>Property changes on: multimedia/libv4l/files/extra-patch-configure
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 202280: 159822 | 159823 | 159824 | 159825 | 159826 | 159827