From owner-svn-ports-head@freebsd.org Sat Feb 23 16:57:03 2019 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B6463151C6F2; Sat, 23 Feb 2019 16:57:02 +0000 (UTC) (envelope-from thierry@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 597D893294; Sat, 23 Feb 2019 16:57:02 +0000 (UTC) (envelope-from thierry@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 35C222021B; Sat, 23 Feb 2019 16:57:02 +0000 (UTC) (envelope-from thierry@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x1NGv2Re049266; Sat, 23 Feb 2019 16:57:02 GMT (envelope-from thierry@FreeBSD.org) Received: (from thierry@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x1NGv1fQ049263; Sat, 23 Feb 2019 16:57:01 GMT (envelope-from thierry@FreeBSD.org) Message-Id: <201902231657.x1NGv1fQ049263@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: thierry set sender to thierry@FreeBSD.org using -f From: Thierry Thomas Date: Sat, 23 Feb 2019 16:57:01 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r493711 - in head/sysutils/xvidcap: . files X-SVN-Group: ports-head X-SVN-Commit-Author: thierry X-SVN-Commit-Paths: in head/sysutils/xvidcap: . files X-SVN-Commit-Revision: 493711 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 597D893294 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.97)[-0.968,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 Feb 2019 16:57:03 -0000 Author: thierry Date: Sat Feb 23 16:57:01 2019 New Revision: 493711 URL: https://svnweb.freebsd.org/changeset/ports/493711 Log: Unbreak video recording. Since I'm here, make some cleaning and add some explicit dependencies. PR: 235951 Submitted by: romain Added: head/sysutils/xvidcap/files/patch-configure (contents, props changed) head/sysutils/xvidcap/files/patch-src_gnome__ui.c - copied, changed from r493710, head/sysutils/xvidcap/files/patch-src_gnome_ui.c Deleted: head/sysutils/xvidcap/files/patch-src_gnome_ui.c Modified: head/sysutils/xvidcap/Makefile Modified: head/sysutils/xvidcap/Makefile ============================================================================== --- head/sysutils/xvidcap/Makefile Sat Feb 23 16:46:51 2019 (r493710) +++ head/sysutils/xvidcap/Makefile Sat Feb 23 16:57:01 2019 (r493711) @@ -3,7 +3,7 @@ PORTNAME= xvidcap PORTVERSION= 1.1.7 -PORTREVISION= 9 +PORTREVISION= 10 PORTEPOCH= 1 CATEGORIES= sysutils multimedia MASTER_SITES= SF @@ -15,22 +15,26 @@ LICENSE= GPLv3 BUILD_DEPENDS= xml2po:textproc/gnome-doc-utils \ scrollkeeper-config:textproc/rarian -LIB_DEPENDS= libswscale.so:multimedia/ffmpeg \ +LIB_DEPENDS= libdbus-1.so:devel/dbus \ + libfreetype.so:print/freetype2 \ + libswscale.so:multimedia/ffmpeg \ libdbus-glib-1.so:devel/dbus-glib \ + libfontconfig.so:x11-fonts/fontconfig \ libmp3lame.so:audio/lame RUN_DEPENDS= animate:graphics/ImageMagick6 \ gimp:graphics/gimp-app -GNU_CONFIGURE= yes -# --export-dynamic fixes libglade problems -LDFLAGS+= -Wl,--export-dynamic - -USE_GNOME= glib20 libglade2 intltool USES= gettext gmake gnome localbase pkgconfig -USE_XORG= x11 xmu ice xfixes xdamage + +USE_GNOME= cairo gdkpixbuf2 glib20 libglade2 intltool +USE_XORG= x11 xext xmu ice xfixes xdamage INSTALLS_OMF= yes MANLANG= "" de es it +GNU_CONFIGURE= yes +# --export-dynamic fixes libglade problems +LDFLAGS+= -L${LOCALBASE}/lib -Wl,--export-dynamic -lz + .if !defined(CFLAGS) || ${CFLAGS:M-fno-strict-aliasing*} == "" CFLAGS+= -O2 -fno-strict-aliasing .endif @@ -40,12 +44,14 @@ NULLDOCS= COPYING OPTIONS_DEFINE= DOCS -post-patch: +pre-configure: ${REINPLACE_CMD} -e 's|/bin/bash | /bin/sh|' ${WRKSRC}/ppm2mpeg.sh - @${REINPLACE_CMD} '/^xvidcap_LDADD =/s/$$/ -lXext -lX11/' \ + ${REINPLACE_CMD} '/^xvidcap_LDADD =/s/$$/ -lXext -lX11/' \ ${WRKSRC}/src/Makefile.in + ${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|g' \ + ${WRKSRC}/${CONFIGURE_SCRIPT} -post-patch-DOCS-on: +pre-configure-DOCS-on: ${REINPLACE_CMD} -e 's|pkgdataDATA install-xvidcapdocDATA|pkgdataDATA|' \ ${WRKSRC}/Makefile.in Added: head/sysutils/xvidcap/files/patch-configure ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/xvidcap/files/patch-configure Sat Feb 23 16:57:01 2019 (r493711) @@ -0,0 +1,24 @@ +--- configure.orig 2008-07-09 07:28:25 UTC ++++ configure +@@ -11280,7 +11280,7 @@ if ( `test \( \( x${ac_cv_lib_avutil_av_rescale+set} = + # build embedded ffmpeg + echo "${MAKE-make}-ing prerequisite ffmpeg libraries" && \ + ( cd ./ffmpeg/ && \ +- ./configure --cc=${CC} --enable-gpl ${ac_my_ffmpeg_cfg_lib_switch} --enable-pthreads --enable-swscale --disable-ffserver --disable-ffplay && \ ++ ./configure --cc=${CC} --enable-gpl ${ac_my_ffmpeg_cfg_lib_switch} --enable-pthreads --enable-swscale --disable-ffserver --disable-ffplay --extra-cflags=-I%%LOCALBASE%%/include --extra-ldflags=-L%%LOCALBASE%%/lib --disable-demuxer=v4l2 --disable-mmx && \ + ln -s libavcodec/avcodec.h ./ && \ + ln -s libavcodec/dsputil.h ./ && \ + ln -s libavformat/avformat.h ./ && \ +@@ -11296,10 +11296,10 @@ if ( `test \( \( x${ac_cv_lib_avutil_av_rescale+set} = + ln -s libswscale/swscale.h ./ && \ + ln -s libswscale/rgb2rgb.h ./ && \ + ln -s libavdevice/avdevice.h ./ && \ +- ${MAKE-make} ) ++ ${MAKE-gmake} ) + # try to link it statically, or reset cache, set static_avcodec=no + top_srcdir=`pwd` +- ac_my_ldflags_save=${LDFLAGS} ; LDFLAGS="${LDFLAGS} -L$top_srcdir/ffmpeg/libavcodec -L$top_srcdir/ffmpeg/libavformat -L$top_srcdir/ffmpeg/libavutil -L$top_srcdir/ffmpeg/libswscale -L$top_srcdir/ffmpeg/libavdevice" ++ ac_my_ldflags_save=${LDFLAGS} ; LDFLAGS="-L$top_srcdir/ffmpeg/libavcodec -L$top_srcdir/ffmpeg/libavformat -L$top_srcdir/ffmpeg/libavutil -L$top_srcdir/ffmpeg/libswscale -L$top_srcdir/ffmpeg/libavdevice ${LDFLAGS}" + ac_my_cflags_save=${CFLAGS} ; CFLAGS="${CFLAGS} -I $top_srcdir -I$top_srcdir/ffmpeg/libavcodec -I$top_srcdir/ffmpeg/libavformat -I$top_srcdir/ffmpeg/libavutil -I$top_srcdir/ffmpeg/libswscale -I$top_srcdir/ffmpeg/libavdevice" + + Copied and modified: head/sysutils/xvidcap/files/patch-src_gnome__ui.c (from r493710, head/sysutils/xvidcap/files/patch-src_gnome_ui.c) ============================================================================== --- head/sysutils/xvidcap/files/patch-src_gnome_ui.c Sat Feb 23 16:46:51 2019 (r493710, copy source) +++ head/sysutils/xvidcap/files/patch-src_gnome__ui.c Sat Feb 23 16:57:01 2019 (r493711) @@ -1,6 +1,6 @@ ---- ./src/gnome_ui.c.orig 2008-06-12 22:48:03.000000000 +0200 -+++ ./src/gnome_ui.c 2014-04-30 22:44:15.000000000 +0200 -@@ -1679,7 +1679,7 @@ +--- src/gnome_ui.c.orig 2008-06-12 20:48:03 UTC ++++ src/gnome_ui.c +@@ -1679,7 +1679,7 @@ xvc_init_pre (int argc, char **argv) { #define DEBUGFUNCTION "xvc_init_pre()" g_thread_init (NULL);