svn commit: r371159 - in head: audio/atunes graphics/gimageview graphics/opencv graphics/osg graphics/osg-devel graphics/pornview multimedia/emotion multimedia/gxine multimedia/k9copy-kde4 multimed...

Juergen Lock nox at FreeBSD.org
Sat Oct 18 21:10:46 UTC 2014 

Author: nox
Date: Sat Oct 18 21:10:39 2014
New Revision: 371159
URL: https://svnweb.freebsd.org/changeset/ports/371159
QAT: https://qat.redports.org/buildarchive/r371159/

Log:
  - Update libxine to 1.2.6 - changelog is here:
  
  	http://anonscm.debian.org/hg/xine-lib/xine-lib-1.2/file/9aef7a72d009/ChangeLog
  
  - Remove an inline from include/xine/xineutils.h for the benefit
    of using libxine with base gcc 4.2 .
  
  - Bump PORTREVISIONs for ports depending on libxine. (now also non-default
    rdeps as per the new rule)

Added:
  head/multimedia/libxine/files/patch-include-xine-xineutils.h   (contents, props changed)
  head/multimedia/libxine/files/patch-src-post-planar-eq2.c   (contents, props changed)
Deleted:
  head/multimedia/libxine/files/patch-contrib-libdha-sysdep-pci_freebsd.c
  head/multimedia/libxine/files/patch-include-xine-post.h
  head/multimedia/libxine/files/patch-src-post-goom-mmx.h
Modified:
  head/audio/atunes/Makefile
  head/graphics/gimageview/Makefile
  head/graphics/opencv/Makefile
  head/graphics/osg-devel/Makefile
  head/graphics/osg/Makefile
  head/graphics/pornview/Makefile
  head/multimedia/emotion/Makefile
  head/multimedia/gxine/Makefile
  head/multimedia/k9copy-kde4/Makefile
  head/multimedia/kaffeine/Makefile
  head/multimedia/libxine/Makefile
  head/multimedia/libxine/distinfo
  head/multimedia/libxine/files/patch-src-combined-ffmpeg-Makefile.in.diff
  head/multimedia/libxine/pkg-plist
  head/multimedia/phonon-xine/Makefile
  head/multimedia/quark/Makefile
  head/multimedia/subtitlecomposer-kde4/Makefile
  head/multimedia/vdr-plugin-xineliboutput/Makefile
  head/multimedia/xine/Makefile
  head/www/npapi-xine/Makefile
  head/x11/eaglemode/Makefile

Modified: head/audio/atunes/Makefile
==============================================================================
--- head/audio/atunes/Makefile	Sat Oct 18 19:10:21 2014	(r371158)
+++ head/audio/atunes/Makefile	Sat Oct 18 21:10:39 2014	(r371159)
@@ -3,7 +3,7 @@
 
 PORTNAME=	atunes
 PORTVERSION=	3.1.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio java
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/aTunes%20${PORTVERSION}
 DISTNAME=	${PORTNAME}-${PORTVERSION}-bin

Modified: head/graphics/gimageview/Makefile
==============================================================================
--- head/graphics/gimageview/Makefile	Sat Oct 18 19:10:21 2014	(r371158)
+++ head/graphics/gimageview/Makefile	Sat Oct 18 21:10:39 2014	(r371159)
@@ -3,7 +3,7 @@
 
 PORTNAME=	gimageview
 PORTVERSION=	0.2.27
-PORTREVISION=	18
+PORTREVISION=	19
 CATEGORIES=	graphics
 MASTER_SITES=	SF/gtkmmviewer/${PORTNAME}/${PORTVERSION}
 

Modified: head/graphics/opencv/Makefile
==============================================================================
--- head/graphics/opencv/Makefile	Sat Oct 18 19:10:21 2014	(r371158)
+++ head/graphics/opencv/Makefile	Sat Oct 18 21:10:39 2014	(r371159)
@@ -3,7 +3,7 @@
 
 PORTNAME?=	opencv
 PORTVERSION=	2.4.9
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES=	graphics
 MASTER_SITES=	SF/${PORTNAME}library/${PORTNAME}-unix/${PORTVERSION}
 

Modified: head/graphics/osg-devel/Makefile
==============================================================================
--- head/graphics/osg-devel/Makefile	Sat Oct 18 19:10:21 2014	(r371158)
+++ head/graphics/osg-devel/Makefile	Sat Oct 18 21:10:39 2014	(r371159)
@@ -3,6 +3,7 @@
 
 PORTNAME=	osg
 PORTVERSION=	3.3.2
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://trac.openscenegraph.org/downloads/developer_releases/ \
 		http://mirror.amdmi3.ru/distfiles/

Modified: head/graphics/osg/Makefile
==============================================================================
--- head/graphics/osg/Makefile	Sat Oct 18 19:10:21 2014	(r371158)
+++ head/graphics/osg/Makefile	Sat Oct 18 21:10:39 2014	(r371159)
@@ -3,6 +3,7 @@
 
 PORTNAME=	osg
 PORTVERSION=	3.2.1
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://trac.openscenegraph.org/downloads/developer_releases/ \
 		http://mirror.amdmi3.ru/distfiles/

Modified: head/graphics/pornview/Makefile
==============================================================================
--- head/graphics/pornview/Makefile	Sat Oct 18 19:10:21 2014	(r371158)
+++ head/graphics/pornview/Makefile	Sat Oct 18 21:10:39 2014	(r371159)
@@ -3,7 +3,7 @@
 
 PORTNAME=	pornview
 PORTVERSION=	0.2.0.p.1
-PORTREVISION=	29
+PORTREVISION=	30
 CATEGORIES=	graphics
 MASTER_SITES=	SF/${PORTNAME}/OldFiles
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/.p./pre/}

Modified: head/multimedia/emotion/Makefile
==============================================================================
--- head/multimedia/emotion/Makefile	Sat Oct 18 19:10:21 2014	(r371158)
+++ head/multimedia/emotion/Makefile	Sat Oct 18 21:10:39 2014	(r371159)
@@ -3,7 +3,7 @@
 
 PORTNAME=	emotion
 PORTVERSION=	1.7.9
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	multimedia enlightenment
 MASTER_SITES=	http://download.enlightenment.org/releases/ \

Modified: head/multimedia/gxine/Makefile
==============================================================================
--- head/multimedia/gxine/Makefile	Sat Oct 18 19:10:21 2014	(r371158)
+++ head/multimedia/gxine/Makefile	Sat Oct 18 21:10:39 2014	(r371159)
@@ -3,7 +3,7 @@
 
 PORTNAME=	gxine
 PORTVERSION=	0.5.908
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	multimedia
 MASTER_SITES=	SF/xine/${PORTNAME}/${PORTVERSION}
 

Modified: head/multimedia/k9copy-kde4/Makefile
==============================================================================
--- head/multimedia/k9copy-kde4/Makefile	Sat Oct 18 19:10:21 2014	(r371158)
+++ head/multimedia/k9copy-kde4/Makefile	Sat Oct 18 21:10:39 2014	(r371159)
@@ -3,7 +3,7 @@
 
 PORTNAME=	k9copy
 PORTVERSION=	2.3.4
-PORTREVISION=	13
+PORTREVISION=	14
 CATEGORIES=	multimedia kde
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-kde4/${PORTVERSION}
 DISTNAME=	${PORTNAME}-${PORTVERSION}-Source

Modified: head/multimedia/kaffeine/Makefile
==============================================================================
--- head/multimedia/kaffeine/Makefile	Sat Oct 18 19:10:21 2014	(r371158)
+++ head/multimedia/kaffeine/Makefile	Sat Oct 18 21:10:39 2014	(r371159)
@@ -3,7 +3,7 @@
 
 PORTNAME=	kaffeine
 PORTVERSION=	1.2.2
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	multimedia kde
 MASTER_SITES=	SF/kaffeine/current
 

Modified: head/multimedia/libxine/Makefile
==============================================================================
--- head/multimedia/libxine/Makefile	Sat Oct 18 19:10:21 2014	(r371158)
+++ head/multimedia/libxine/Makefile	Sat Oct 18 21:10:39 2014	(r371159)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	xine
-PORTVERSION=	1.2.4
-PORTREVISION=	15
+PORTVERSION=	1.2.6
 CATEGORIES=	multimedia ipv6
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-lib/${PORTVERSION}
 PKGNAMEPREFIX=	lib
@@ -37,9 +36,10 @@ LIB_DEPENDS=	libFLAC.so:${PORTSDIR}/audi
 LIB_DEPENDS+=	libdvdcss.so.2:${PORTSDIR}/multimedia/libdvdcss
 .endif
 
-USES=		compiler gmake iconv libtool:keepla pathfix perl5 pkgconfig tar:xz
+USES=		compiler gmake iconv libtool:keepla pathfix perl5 pkgconfig \
+		execinfo tar:xz
 GNU_CONFIGURE=	yes
-USE_XORG=	x11 xv xinerama
+USE_XORG=	x11 xv xinerama xext sm ice
 USE_GL=		gl glu
 USE_PERL5=	build
 USE_SDL=	sdl
@@ -65,7 +65,7 @@ OPTIONS_DEFINE=	CACA ESOUND JACK GNOMEVF
 DOCSDIR=	${PREFIX}/share/doc/xine-lib
 # Please sync with XINE_PLUGINSDIR in multimedia/xine
 # and multimedia/vdr-plugin-xineliboutput
-PLUGINSDIR=	lib/xine/plugins/2.3
+PLUGINSDIR=	lib/xine/plugins/2.5
 PLIST_SUB=	PLUGINSDIR="${PLUGINSDIR}"
 
 .include <bsd.port.options.mk>

Modified: head/multimedia/libxine/distinfo
==============================================================================
--- head/multimedia/libxine/distinfo	Sat Oct 18 19:10:21 2014	(r371158)
+++ head/multimedia/libxine/distinfo	Sat Oct 18 21:10:39 2014	(r371159)
@@ -1,2 +1,2 @@
-SHA256 (xine-lib-1.2.4.tar.xz) = 9c5b1b4ef7bd0591962c322a3afa709eeaa5bae664678548f1340e64f43abbdd
-SIZE (xine-lib-1.2.4.tar.xz) = 4954992
+SHA256 (xine-lib-1.2.6.tar.xz) = bd041d738817c7c0c6392a3c0e5bda5a664a47e035135b5a449364f8c9b6a005
+SIZE (xine-lib-1.2.6.tar.xz) = 5020964

Added: head/multimedia/libxine/files/patch-include-xine-xineutils.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/multimedia/libxine/files/patch-include-xine-xineutils.h	Sat Oct 18 21:10:39 2014	(r371159)
@@ -0,0 +1,11 @@
+--- include/xine/xineutils.h.orig
++++ include/xine/xineutils.h
+@@ -146,7 +146,7 @@ void *xine_xcalloc(size_t nmemb, size_t 
+  * Free allocated memory and set pointer to NULL
+  * @param ptr Pointer to the pointer to the memory block which should be freed.
+  */
+-static inline void _x_freep(void *ptr) {
++static void _x_freep(void *ptr) {
+   void **p = (void **)ptr;
+   free (*p);
+   *p = NULL;

Modified: head/multimedia/libxine/files/patch-src-combined-ffmpeg-Makefile.in.diff
==============================================================================
--- head/multimedia/libxine/files/patch-src-combined-ffmpeg-Makefile.in.diff	Sat Oct 18 19:10:21 2014	(r371158)
+++ head/multimedia/libxine/files/patch-src-combined-ffmpeg-Makefile.in.diff	Sat Oct 18 21:10:39 2014	(r371159)
@@ -1,13 +1,12 @@
 --- src/combined/ffmpeg/Makefile.in.orig	2013-09-23 15:58:14.000000000 -0500
 +++ src/combined/ffmpeg/Makefile.in	2013-09-25 03:25:33.000000000 -0500
-@@ -995,10 +995,7 @@
- avcodec_audio.list: AV_CODECS:=/CODEC_ID_PCM_S16LE/,/CODEC_ID_DVD_SUBTITLE/
+@@ -1037,9 +1037,7 @@ avcodec_audio.list: AV_CODECS:=/CODEC_ID
  avcodec_video.list: AV_CODECS:=/CODEC_ID_MPEG1VIDEO/,/CODEC_ID_PCM_S16LE/
  
--# that weird shell call just yields full path of the avcodec.h file
+ # that weird shell call just yields full path of the avcodec.h file
 -avcodec_audio.list avcodec_video.list: $(shell \
 - echo '#include "$(srcdir)/ffmpeg_decoder.h"' | $(AV_CPP) -M - |\
-- sed -e 's/ \+/\n/g;' | sed -n -e '/avcodec\.h/p;')
+- sed -e '/avcodec\.h/! d; s%^.* \([^ ]*/avcodec\.h\) .*%\1%')
 +avcodec_audio.list avcodec_video.list:
  	$(AM_V_GEN)echo '#include "$(srcdir)/ffmpeg_decoder.h"' | $(AV_CPP) - |\
  	  sed -e $(AV_CODECS)'! d; s/^[ \t]*//; s/[=,].*//; /^$$/ d' >$@

Added: head/multimedia/libxine/files/patch-src-post-planar-eq2.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/multimedia/libxine/files/patch-src-post-planar-eq2.c	Sat Oct 18 21:10:39 2014	(r371159)
@@ -0,0 +1,11 @@
+--- src/post/planar/eq2.c.orig
++++ src/post/planar/eq2.c
+@@ -129,7 +129,7 @@ void affine_1d_MMX (eq2_param_t *par, un
+     "movq (%1), %%mm4 \n\t"
+     "pxor %%mm0, %%mm0 \n\t"
+     :
+-    : "g" (brvec), "g" (contvec)
++    : "r" (brvec), "r" (contvec)
+   );
+ 
+   while (h-- > 0) {

Modified: head/multimedia/libxine/pkg-plist
==============================================================================
--- head/multimedia/libxine/pkg-plist	Sat Oct 18 19:10:21 2014	(r371158)
+++ head/multimedia/libxine/pkg-plist	Sat Oct 18 21:10:39 2014	(r371159)
@@ -44,7 +44,7 @@ include/xine/xmlparser.h
 lib/libxine.la
 lib/libxine.so
 lib/libxine.so.2
-lib/libxine.so.2.3.1
+lib/libxine.so.2.5.0
 lib/libxine-interface.la
 share/xine-lib/fonts/cetus-16.xinefont.gz
 share/xine-lib/fonts/cetus-20.xinefont.gz
@@ -106,6 +106,7 @@ share/xine-lib/fonts/serif-64.xinefont.g
 %%PLUGINSDIR%%/xineplug_decode_gsm610.so
 %%WITH_IMAGEMAGICK%%%%PLUGINSDIR%%/xineplug_decode_image.so
 %%PLUGINSDIR%%/xineplug_decode_libjpeg.so
+%%PLUGINSDIR%%/xineplug_decode_libvpx.so
 %%PLUGINSDIR%%/xineplug_decode_lpcm.so
 %%PLUGINSDIR%%/xineplug_decode_mad.so
 %%PLUGINSDIR%%/xineplug_decode_mpeg2.so
@@ -230,14 +231,3 @@ share/aclocal/xine.m4
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/libxine2.mo
 %%NLS%%share/locale/sk/LC_MESSAGES/libxine2.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/libxine2.mo
- at dirrm include/xine
- at dirrm %%PLUGINSDIR%%/post
- at dirrmtry %%PLUGINSDIR%%
- at dirrmtry lib/xine/plugins
- at dirrmtry lib/xine
- at dirrm %%DOCSDIR%%/hackersguide
- at dirrm %%DOCSDIR%%
-%%NLS%%@dirrmtry share/locale/en_US/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/en_US
- at dirrm share/xine-lib/fonts
- at dirrm share/xine-lib

Modified: head/multimedia/phonon-xine/Makefile
==============================================================================
--- head/multimedia/phonon-xine/Makefile	Sat Oct 18 19:10:21 2014	(r371158)
+++ head/multimedia/phonon-xine/Makefile	Sat Oct 18 21:10:39 2014	(r371159)
@@ -3,7 +3,7 @@
 
 PORTNAME=	phonon
 PORTVERSION=	4.4.4
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	multimedia kde
 MASTER_SITES=	KDE/stable/${PORTNAME}/${PORTNAME}-backend${PKGNAMESUFFIX}/${PORTVERSION}/src
 PKGNAMESUFFIX=	-xine

Modified: head/multimedia/quark/Makefile
==============================================================================
--- head/multimedia/quark/Makefile	Sat Oct 18 19:10:21 2014	(r371158)
+++ head/multimedia/quark/Makefile	Sat Oct 18 21:10:39 2014	(r371159)
@@ -3,7 +3,7 @@
 
 PORTNAME=	quark
 PORTVERSION=	3.24
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	multimedia gnome
 MASTER_SITES=	http://hsgg.github.com/quark/
 

Modified: head/multimedia/subtitlecomposer-kde4/Makefile
==============================================================================
--- head/multimedia/subtitlecomposer-kde4/Makefile	Sat Oct 18 19:10:21 2014	(r371158)
+++ head/multimedia/subtitlecomposer-kde4/Makefile	Sat Oct 18 21:10:39 2014	(r371159)
@@ -2,7 +2,7 @@
 
 PORTNAME=	subtitlecomposer
 PORTVERSION=	0.5.6
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	multimedia kde
 MASTER_SITES=	GITHUB
 

Modified: head/multimedia/vdr-plugin-xineliboutput/Makefile
==============================================================================
--- head/multimedia/vdr-plugin-xineliboutput/Makefile	Sat Oct 18 19:10:21 2014	(r371158)
+++ head/multimedia/vdr-plugin-xineliboutput/Makefile	Sat Oct 18 21:10:39 2014	(r371159)
@@ -3,7 +3,7 @@
 
 PORTNAME=	vdr-plugin-xineliboutput
 PORTVERSION=	1.0.90s20120511
-PORTREVISION=	12
+PORTREVISION=	13
 CATEGORIES=	multimedia
 MASTER_SITES=	SF:release \
 		LOCAL:snapshot
@@ -26,7 +26,7 @@ USE_GL=		gl glu glut
 PORTDOCS=	COPYING README HISTORY
 PORTEXAMPLES=	xine
 WRKSRC=		${WRKDIR}/vdr-${PLUGIN}
-XINE_PLUGINSDIR=	lib/xine/plugins/2.3
+XINE_PLUGINSDIR=	lib/xine/plugins/2.5
 
 OPTIONS_DEFINE=	LIBBLURAY LIBEXTRACTOR EXAMPLES DOCS
 

Modified: head/multimedia/xine/Makefile
==============================================================================
--- head/multimedia/xine/Makefile	Sat Oct 18 19:10:21 2014	(r371158)
+++ head/multimedia/xine/Makefile	Sat Oct 18 21:10:39 2014	(r371159)
@@ -2,7 +2,7 @@
 
 PORTNAME=	xine
 PORTVERSION=	0.99.9
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-ui/${PORTVERSION}
 DISTNAME=	${PORTNAME}-ui-${PORTVERSION}
@@ -55,7 +55,7 @@ WIN32_CODECS_RUN_DEPENDS=\
 XFT_USE=		XORG=xft
 XFT_CONFIGURE_ENABLE=	xft
 
-XINE_PLUGINSDIR=	lib/xine/plugins/2.3
+XINE_PLUGINSDIR=	lib/xine/plugins/2.5
 
 post-patch:
 	@${REINPLACE_CMD} -e \

Modified: head/www/npapi-xine/Makefile
==============================================================================
--- head/www/npapi-xine/Makefile	Sat Oct 18 19:10:21 2014	(r371158)
+++ head/www/npapi-xine/Makefile	Sat Oct 18 21:10:39 2014	(r371159)
@@ -3,7 +3,7 @@
 
 PORTNAME=	xine
 PORTVERSION=	1.0.2
-PORTREVISION=	9
+PORTREVISION=	10
 DISTVERSIONPREFIX=	plugin-
 CATEGORIES=	www multimedia
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-plugin/${PORTVERSION}

Modified: head/x11/eaglemode/Makefile
==============================================================================
--- head/x11/eaglemode/Makefile	Sat Oct 18 19:10:21 2014	(r371158)
+++ head/x11/eaglemode/Makefile	Sat Oct 18 21:10:39 2014	(r371159)
@@ -3,7 +3,7 @@
 
 PORTNAME=	eaglemode
 PORTVERSION=	0.85.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-${PORTVERSION}

More information about the svn-ports-head mailing list