more ports that need faad removed from WANTLIB after ffmpeg update,

as noted on ports@.
avsm · Mar 29, 2011 · 72ea089 · 72ea089
1 parent 73837d9
commit 72ea089
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 25 deletions.
diff --git a/audio/xmms2/Makefile b/audio/xmms2/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.17 2011/02/10 03:14:43 jakemsr Exp $
+# $OpenBSD: Makefile,v 1.18 2011/03/29 23:22:17 jakemsr Exp $
 
 COMMENT =		audio player daemon with library management
 
 V =			0.7
 DISTNAME =		xmms2-${V}DrNo
 PKGNAME =		xmms2-${V}
-REVISION =		5
+REVISION =		6
 
 SHARED_LIBS +=		xmmsclient++		1.0 # 4.0.0
 SHARED_LIBS +=		xmmsclient++-glib	0.0 # 1.0.0
@@ -24,7 +24,7 @@ PERMIT_PACKAGE_FTP =	Yes
 PERMIT_DISTFILES_CDROM =Yes
 PERMIT_DISTFILES_FTP =	Yes
 
-WANTLIB += c gsm faac faad m mp3lame ncurses ogg orc-0.4 pthread readline
+WANTLIB += c gsm faac m mp3lame ncurses ogg orc-0.4 pthread readline
 WANTLIB += schroedinger-1.0 speex stdc++ theora util vorbis vorbisenc
 WANTLIB += vorbisfile x264 z gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0
 WANTLIB += gthread-2.0 avcodec avutil ao jack sqlite3 xml2 FLAC curl

diff --git a/graphics/amide/Makefile b/graphics/amide/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.12 2010/11/17 08:05:12 espie Exp $
+# $OpenBSD: Makefile,v 1.13 2011/03/29 23:22:17 jakemsr Exp $
 
 COMMENT =	Amide a Medical Imaging Data Examiner
 
 DISTNAME =	amide-0.9.2
-REVISION =	3
+REVISION =	4
 CATEGORIES =	graphics
 
 HOMEPAGE =	http://amide.sourceforge.net/
@@ -25,7 +25,7 @@ WANTLIB += gtk-x11-2.0 m pango-1.0 pangocairo-1.0 pangoft2-1.0
 WANTLIB += pcre pixman-1 png pthread ssl stdc++ util xml2 z
 WANTLIB += GL Xxf86vm drm xcb-shm gnomevfs-2
 WANTLIB += pthread-stubs xcb gsl gslcblas gnomecanvas-2
-WANTLIB += faac faad mp3lame ogg orc-0.4 schroedinger-1.0
+WANTLIB += faac mp3lame ogg orc-0.4 schroedinger-1.0
 WANTLIB += theora vorbis vorbisenc x264 mdc avcodec avutil
 WANTLIB += gsm speex xcb-render
 

diff --git a/graphics/gegl/Makefile b/graphics/gegl/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.27 2011/03/02 06:43:25 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.28 2011/03/29 23:22:17 jakemsr Exp $
 
 SHARED_ONLY=	Yes
 
@@ -11,6 +11,7 @@ CATEGORIES=	graphics devel
 
 PKGNAME-main=	gegl-${V}
 PKGNAME-plugins=gegl-plugins-${V}
+REVISION-plugins=0
 
 SHARED_LIBS=	gegl-0.1	1.0 # .105.1
 
@@ -55,7 +56,7 @@ LIB_DEPENDS-main= 	${LIB_DEPENDS} \
 			graphics/babl
 
 WANTLIB-plugins += ${WANTLIB}
-WANTLIB-plugins += Half Iex IlmThread Imath faac faad gsm mp3lame ogg
+WANTLIB-plugins += Half Iex IlmThread Imath faac gsm mp3lame ogg
 WANTLIB-plugins += orc-0.4 schroedinger-1.0 speex stdc++ theora
 WANTLIB-plugins += vorbis vorbisenc x264 IlmImf>=4 avcodec>=14
 WANTLIB-plugins += avformat avutil bz2

diff --git a/multimedia/ffmpeg2theora/Makefile b/multimedia/ffmpeg2theora/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.16 2011/01/16 19:53:17 naddy Exp $
+# $OpenBSD: Makefile,v 1.17 2011/03/29 23:22:17 jakemsr Exp $
 
 COMMENT=	reencode many media file formats to Ogg Theora
 
 N=		ffmpeg2theora
 DISTNAME=	${N}-0.27
-REVISION=	0
+REVISION=	1
 CATEGORIES=	multimedia
 EXTRACT_SUFX=	.tar.bz2
 
@@ -17,7 +17,7 @@ PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
 WANTLIB += X11 Xext Xfixes bz2 c gsm iconv m ogg pthread
-WANTLIB += faac faad mp3lame orc-0.4 sndio speex
+WANTLIB += faac mp3lame orc-0.4 sndio speex
 WANTLIB += schroedinger-1.0 x264 z avcodec avdevice avformat
 WANTLIB += avutil postproc swscale vorbis vorbisenc
 WANTLIB += theora theoradec theoraenc

diff --git a/telephony/iaxclient/Makefile b/telephony/iaxclient/Makefile
@@ -1,16 +1,16 @@
-# $OpenBSD: Makefile,v 1.11 2011/01/05 18:00:10 sebastia Exp $
+# $OpenBSD: Makefile,v 1.12 2011/03/29 23:22:17 jakemsr Exp $
 
 COMMENT-main=	IAX client library
 COMMENT-tcl=	IAX client library, tcl bindings
 COMMENT-iaxcomm=IAX softphone
 
 DISTNAME=	iaxclient-2.1beta3
 PKGNAME-main=	${DISTNAME}
-REVISION-main=	2
+REVISION-main=	3
 PKGNAME-tcl=	${DISTNAME:S/iaxclient/iaxclient-tcl/}
-REVISION-tcl=	3
+REVISION-tcl=	4
 PKGNAME-iaxcomm= iaxcomm-1.1.0
-REVISION-iaxcomm= 3
+REVISION-iaxcomm= 4
 
 CATEGORIES=	telephony
 USE_LIBTOOL=	Yes
@@ -32,13 +32,13 @@ MODULES=	devel/gettext x11/tk
 
 cWANTLIB =	gsm>=1 portaudio speex>=8 speexdsp>=1 avcodec>=13 \
 		avutil>=6 vidcap
-WANTLIB-main 	+= c faac faad m mp3lame ogg orc-0.4 ossaudio pthread
+WANTLIB-main 	+= c faac m mp3lame ogg orc-0.4 ossaudio pthread
 WANTLIB-main 	+= schroedinger-1.0 sndio theora vorbis vorbisenc x264
 WANTLIB-main 	+= z $(cWANTLIB)
 
 WANTLIB-tcl 	+= X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes
 WANTLIB-tcl 	+= Xi Xinerama Xrandr Xrender atk-1.0 c cairo expat faac
-WANTLIB-tcl 	+= faad fontconfig freetype gio-2.0 glib-2.0 gmodule-2.0
+WANTLIB-tcl 	+= fontconfig freetype gio-2.0 glib-2.0 gmodule-2.0
 WANTLIB-tcl 	+= gobject-2.0 gthread-2.0 m mp3lame ogg orc-0.4 ossaudio
 WANTLIB-tcl 	+= pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pixman-1
 WANTLIB-tcl 	+= png pthread pthread-stubs schroedinger-1.0 sndio theora
@@ -48,7 +48,7 @@ WANTLIB-tcl	+= gtk-x11-2.0
 
 WANTLIB-iaxcomm += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes
 WANTLIB-iaxcomm += Xi Xinerama Xrandr Xrender atk-1.0 avcodec avutil c
-WANTLIB-iaxcomm += cairo expat faac faad fontconfig freetype gdk-x11-2.0
+WANTLIB-iaxcomm += cairo expat faac fontconfig freetype gdk-x11-2.0
 WANTLIB-iaxcomm += gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0
 WANTLIB-iaxcomm += gsm gthread-2.0 gtk-x11-2.0 m mp3lame ogg orc-0.4 ossaudio
 WANTLIB-iaxcomm += pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pixman-1

diff --git a/www/cherokee/Makefile b/www/cherokee/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.23 2011/01/08 08:47:53 landry Exp $
+# $OpenBSD: Makefile,v 1.24 2011/03/29 23:22:17 jakemsr Exp $
 
 SHARED_ONLY=	Yes
 
@@ -18,8 +18,9 @@ PKGNAME-mysql =	cherokee-mysql-${VERSION}
 PKGNAME-geoip =	cherokee-geoip-${VERSION}
 PKGNAME-streaming = cherokee-streaming-${VERSION}
 
-REVISION-main=	2
-REVISION-ldap=	0
+REVISION-main =	2
+REVISION-ldap =	0
+REVISION-streaming = 0
 
 SHARED_LIBS =	cherokee-base		0.0 \
 		cherokee-client		0.0 \
@@ -70,7 +71,7 @@ RUN_DEPENDS-mysql =	${BASE_PKGPATH}
 LIB_DEPENDS-streaming =	graphics/ffmpeg \
 			archivers/bzip2
 WANTLIB-streaming += avcodec>=13 avformat>=12 avutil>=6 bz2 crypto m
-WANTLIB-streaming += faac faad gsm mp3lame ogg orc-0.4 schroedinger-1.0
+WANTLIB-streaming += faac gsm mp3lame ogg orc-0.4 schroedinger-1.0
 WANTLIB-streaming += speex theora vorbis vorbisenc x264 z
 RUN_DEPENDS-streaming = ${BASE_PKGPATH}
 

diff --git a/x11/xfce4/tumbler/Makefile b/x11/xfce4/tumbler/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.2 2011/01/18 21:34:58 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.3 2011/03/29 23:22:17 jakemsr Exp $
 
 COMMENT=	D-Bus thumbnailing service
 
 XFCE_VERSION=	0.1.6
 XFCE_GOODIE=	tumbler
 
-REVISION=	0
+REVISION=	1
 
 SHARED_LIBS+=	tumbler-1 0.0
 
@@ -36,7 +36,7 @@ WANTLIB += Xi Xinerama Xrandr Xrender Xxf86vm cairo drm expat
 WANTLIB += fontconfig gdk-x11-2.0 lcms openjpeg pango-1.0 pangocairo-1.0
 WANTLIB += pangoft2-1.0 pixman-1 poppler poppler-glib pthread-stubs
 WANTLIB += xcb xcb-render xcb-shm xml2
-WANTLIB += avcodec avformat avutil bz2 faac faad ffmpegthumbnailer
+WANTLIB += avcodec avformat avutil bz2 faac ffmpegthumbnailer
 WANTLIB += gsm mp3lame ogg orc-0.4 schroedinger-1.0 speex swscale
 WANTLIB += theora vorbis vorbisenc x264