Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 30 Apr 2014 21:19:16 +0000 (UTC)
From:      Thierry Thomas <thierry@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r352700 - in head/sysutils/xvidcap: . files
Message-ID:  <201404302119.s3ULJGtK056730@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: thierry
Date: Wed Apr 30 21:19:16 2014
New Revision: 352700
URL: http://svnweb.freebsd.org/changeset/ports/352700
QAT: https://qat.redports.org/buildarchive/r352700/

Log:
  Finally upgrade to 1.1.7.
  
  Changelog at
  <http://sourceforge.net/p/xvidcap/news/2008/07/xvidcap-117-released/>.

Added:
  head/sysutils/xvidcap/files/patch-src_gnome_ui.c   (contents, props changed)
Deleted:
  head/sysutils/xvidcap/files/patch-configure
  head/sysutils/xvidcap/files/patch-ffmpeg_Makefile
  head/sysutils/xvidcap/files/patch-ffmpeg_configure
  head/sysutils/xvidcap/files/patch-ffmpeg_libavcodec_cabac.h
  head/sysutils/xvidcap/files/patch-ffmpeg_libavformat_grab-bktr.c
  head/sysutils/xvidcap/files/patch-src_Makefile.in
Modified:
  head/sysutils/xvidcap/Makefile
  head/sysutils/xvidcap/distinfo
  head/sysutils/xvidcap/pkg-plist

Modified: head/sysutils/xvidcap/Makefile
==============================================================================
--- head/sysutils/xvidcap/Makefile	Wed Apr 30 21:02:04 2014	(r352699)
+++ head/sysutils/xvidcap/Makefile	Wed Apr 30 21:19:16 2014	(r352700)
@@ -2,35 +2,34 @@
 # $FreeBSD$
 
 PORTNAME=		xvidcap
-DISTVERSION=		1.1.4p1
-PORTREVISION=	11
+PORTVERSION=		1.1.7
 PORTEPOCH=		1
 CATEGORIES=		sysutils multimedia
-MASTER_SITES=		SF/${PORTNAME}/OldFiles
+MASTER_SITES=		SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=		thierry@FreeBSD.org
 COMMENT=		Capture your X display to individual frames or MPEG video
 
-BUILD_DEPENDS=		rarian-sk-config:${PORTSDIR}/textproc/rarian	\
-			xml2po:${PORTSDIR}/textproc/gnome-doc-utils	\
-			texi2html:${PORTSDIR}/textproc/texi2html
-# To be reactivated when ffmpeg-devel will install libswscale.
-#LIB_DEPENDS=		avutil.1:${PORTSDIR}/multimedia/ffmpeg-devel
-LIB_DEPENDS=		mp3lame.0:${PORTSDIR}/audio/lame
-RUN_DEPENDS=		animate:${PORTSDIR}/graphics/ImageMagick
+LICENSE=		GPLv3
+
+BUILD_DEPENDS=		xml2po:${PORTSDIR}/textproc/gnome-doc-utils	\
+			scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper
+LIB_DEPENDS=		libswscale.so:${PORTSDIR}/multimedia/ffmpeg	\
+			libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib	\
+			libmp3lame.so:${PORTSDIR}/audio/lame
+RUN_DEPENDS=		animate:${PORTSDIR}/graphics/ImageMagick	\
+			gimp:${PORTSDIR}/graphics/gimp-app
 
 GNU_CONFIGURE=		yes
-# Remove MAKE="${GMAKE}" after ffmpeg-devel's upgrade
-CONFIGURE_ENV=		LOCALBASE="${LOCALBASE}"		\
-			MAKE="${GMAKE}"
 CPPFLAGS+=		-I${LOCALBASE}/include
-CONFIGURE_ARGS=		--with-forced-embedded-ffmpeg	# To be removed after ffmpeg-devel's upgrade
+# --export-dynamic fixes libglade problems
+LDFLAGS+=		-L${LOCALBASE}/lib -Wl,--export-dynamic
 
-USE_GMAKE=		yes	# To be removed after ffmpeg-devel's upgrade
 USE_GNOME=		glib20 libglade2
-USES=		gettext pkgconfig
-USE_XORG=		x11 xmu
+USES=			gettext gmake pkgconfig
+USE_XORG=		x11 xmu ice xfixes xdamage
 INSTALLS_OMF=		yes
+MANLANG=		"" de es it
 
 .if !defined(CFLAGS) || ${CFLAGS:M-fno-strict-aliasing*} == ""
 CFLAGS+=	-O2 -fno-strict-aliasing
@@ -39,18 +38,16 @@ CFLAGS+=	-O2 -fno-strict-aliasing
 PORTDOCS=		AUTHORS ChangeLog README
 NULLDOCS=		COPYING
 
-MAN1=			xvidcap.1
-
-NO_STAGE=	yes
 pre-configure:
 .if defined(NOPORTDOCS)
 	${REINPLACE_CMD} -e 's|pkgdataDATA install-xvidcapdocDATA|pkgdataDATA|'	\
 		${WRKSRC}/Makefile.in
 .endif
+	${REINPLACE_CMD} -e 's|/bin/bash | /bin/sh|' ${WRKSRC}/ppm2mpeg.sh
 
 post-install:
 .if !defined(NOPORTDOCS)
-	@${RM} ${NULLDOCS:S|^|${DOCSDIR}/|}
+	${RM} -f ${NULLDOCS:S|^|${STAGEDIR}${DOCSDIR}/|}
 .endif
 
 .include <bsd.port.mk>

Modified: head/sysutils/xvidcap/distinfo
==============================================================================
--- head/sysutils/xvidcap/distinfo	Wed Apr 30 21:02:04 2014	(r352699)
+++ head/sysutils/xvidcap/distinfo	Wed Apr 30 21:19:16 2014	(r352700)
@@ -1,2 +1,2 @@
-SHA256 (xvidcap-1.1.4p1.tar.gz) = 861fdb75e5f78de9f160f6c475a32389d825227292b33a976cbc12e0446324bf
-SIZE (xvidcap-1.1.4p1.tar.gz) = 4006788
+SHA256 (xvidcap-1.1.7.tar.gz) = 154622801e8d5e91b834e7707e9e1cc65cf20d0161f6e0323bc3bf0efd85195d
+SIZE (xvidcap-1.1.7.tar.gz) = 4789924

Added: head/sysutils/xvidcap/files/patch-src_gnome_ui.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/xvidcap/files/patch-src_gnome_ui.c	Wed Apr 30 21:19:16 2014	(r352700)
@@ -0,0 +1,11 @@
+--- ./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 @@
+ {
+ #define DEBUGFUNCTION "xvc_init_pre()"
+     g_thread_init (NULL);
+-    gdk_threads_init ();
++    /*gdk_threads_init ();*/
+ 
+     gtk_init (&argc, &argv);
+     return TRUE;

Modified: head/sysutils/xvidcap/pkg-plist
==============================================================================
--- head/sysutils/xvidcap/pkg-plist	Wed Apr 30 21:02:04 2014	(r352699)
+++ head/sysutils/xvidcap/pkg-plist	Wed Apr 30 21:19:16 2014	(r352700)
@@ -1,5 +1,13 @@
 bin/xvidcap
+bin/xvidcap-dbus-client
+man/de/man1/xvidcap-dbus-client.1.gz
+man/de/man1/xvidcap.1.gz
+man/es/man1/xvidcap.1.gz
+man/it/man1/xvidcap.1.gz
+man/man1/xvidcap-dbus-client.1.gz
+man/man1/xvidcap.1.gz
 share/applications/xvidcap.desktop
+share/dbus-1/services/net.jarre_de_the.Xvidcap.service
 share/gnome/help/xvidcap/C/figures/back-button.png
 share/gnome/help/xvidcap/C/figures/edit-button.png
 share/gnome/help/xvidcap/C/figures/filename-button.png
@@ -16,6 +24,7 @@ share/gnome/help/xvidcap/C/figures/menu-
 share/gnome/help/xvidcap/C/figures/menu-quit.png
 share/gnome/help/xvidcap/C/figures/menu-save-prefs.png
 share/gnome/help/xvidcap/C/figures/menu-sf.png
+share/gnome/help/xvidcap/C/figures/menu-show-frame.png
 share/gnome/help/xvidcap/C/figures/menu.png
 share/gnome/help/xvidcap/C/figures/pause-toggle.png
 share/gnome/help/xvidcap/C/figures/prefs-commands.png
@@ -47,6 +56,7 @@ share/gnome/help/xvidcap/de/figures/menu
 share/gnome/help/xvidcap/de/figures/menu-quit.png
 share/gnome/help/xvidcap/de/figures/menu-save-prefs.png
 share/gnome/help/xvidcap/de/figures/menu-sf.png
+share/gnome/help/xvidcap/de/figures/menu-show-frame.png
 share/gnome/help/xvidcap/de/figures/menu.png
 share/gnome/help/xvidcap/de/figures/pause-toggle.png
 share/gnome/help/xvidcap/de/figures/prefs-commands.png
@@ -125,6 +135,10 @@ share/gnome/help/xvidcap/it/figures/xvid
 share/gnome/help/xvidcap/it/figures/xvidcap-main-ctrl.png
 share/gnome/help/xvidcap/it/figures/xvidcap-warning.png
 share/gnome/help/xvidcap/it/xvidcap.xml
+share/locale/de/LC_MESSAGES/xvidcap.mo
+share/locale/en/LC_MESSAGES/xvidcap.mo
+share/locale/es/LC_MESSAGES/xvidcap.mo
+share/locale/it/LC_MESSAGES/xvidcap.mo
 share/omf/xvidcap/xvidcap-C.omf
 share/omf/xvidcap/xvidcap-de.omf
 share/omf/xvidcap/xvidcap-es.omf
@@ -135,16 +149,21 @@ share/pixmaps/xvidcap.png
 %%DATADIR%%/ppm2mpeg.sh
 %%DATADIR%%/xvidcap.desktop
 %%DATADIR%%/xvidcap.png
-@dirrm %%DATADIR%%/glade
-@dirrm %%DATADIR%%
-@dirrm share/omf/xvidcap
-@dirrmtry share/omf
-@dirrm share/gnome/help/xvidcap/it/figures
-@dirrm share/gnome/help/xvidcap/it
-@dirrm share/gnome/help/xvidcap/es/figures
-@dirrm share/gnome/help/xvidcap/es
-@dirrm share/gnome/help/xvidcap/de/figures
-@dirrm share/gnome/help/xvidcap/de
+@dirrmtry man/de/man1
+@dirrmtry man/de
+@dirrmtry man/es/man1
+@dirrmtry man/es
+@dirrmtry man/it/man1
+@dirrmtry man/it
 @dirrm share/gnome/help/xvidcap/C/figures
 @dirrm share/gnome/help/xvidcap/C
+@dirrm share/gnome/help/xvidcap/de/figures
+@dirrm share/gnome/help/xvidcap/de
+@dirrm share/gnome/help/xvidcap/es/figures
+@dirrm share/gnome/help/xvidcap/es
+@dirrm share/gnome/help/xvidcap/it/figures
+@dirrm share/gnome/help/xvidcap/it
 @dirrm share/gnome/help/xvidcap
+@dirrm share/omf/xvidcap
+@dirrm %%DATADIR%%/glade
+@dirrm %%DATADIR%%



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201404302119.s3ULJGtK056730>