Date: Wed, 06 Aug 2008 15:16:08 -0700 From: Doug Barton <dougb@FreeBSD.org> To: Joe Marcus Clarke <marcus@freebsd.org> Cc: Alexander Botero-Lowry <alexbl@freebsd.org>, cvs-ports@freebsd.org, cvs-all@freebsd.org, ports-committers@freebsd.org Subject: Re: cvs commit: ports/graphics/swfdec Makefile distinfo Message-ID: <489A22A8.2020502@FreeBSD.org> In-Reply-To: <489A0901.3000401@freebsd.org> References: <200808061711.m76HBHjm071363@repoman.freebsd.org> <489A0828.70301@FreeBSD.org> <489A0901.3000401@freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --] Joe Marcus Clarke wrote: > Doug Barton wrote: >> Alexander Botero-Lowry wrote: >>> alexbl 2008-08-06 17:11:17 UTC >>> >>> FreeBSD ports repository >>> >>> Modified files: >>> graphics/swfdec Makefile distinfo Log: >>> - update to 0.6.8 >>> Revision Changes Path >>> 1.55 +1 -2 ports/graphics/swfdec/Makefile >>> 1.20 +3 -3 ports/graphics/swfdec/distinfo >>> >>> http://www.FreeBSD.org/cgi/cvsweb.cgi/ports/graphics/swfdec/Makefile.diff?&r1=1.54&r2=1.55&f=h >>> >>> http://www.FreeBSD.org/cgi/cvsweb.cgi/ports/graphics/swfdec/distinfo.diff?&r1=1.19&r2=1.20&f=h >>> >>> >> >> I get the same error as the tinderbox with this update. > > Try this patch to ffmpeg. It may not longer apply cleanly, but you > should be able to work it out. Yes to both. :) I attached a patch against the current state of the ports tree. With this change I also needed the attached patch to swfdec to get it to compile, but it works now in any case. Doug -- This .signature sanitized for your protection [-- Attachment #2 --] Index: Makefile =================================================================== RCS file: /home/pcvs/ports/multimedia/ffmpeg/Makefile,v retrieving revision 1.83 diff -u -r1.83 Makefile --- Makefile 5 Aug 2008 03:02:39 -0000 1.83 +++ Makefile 6 Aug 2008 22:13:59 -0000 @@ -7,7 +7,7 @@ PORTNAME= ffmpeg DISTVERSION= 2008-07-27 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= multimedia audio ipv6 net MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= ahze @@ -58,7 +58,10 @@ libavutil/mem.h \ libavutil/random.h \ libavutil/rational.h \ - libavutil/sha1.h + libavutil/sha1.h \ + libpostproc/postprocess.h \ + libswscale/rgb2rgb.h \ + libswscale/swscale.h .include <bsd.port.pre.mk> @@ -72,6 +75,7 @@ --extra-libs="${PTHREAD_LIBS}" \ --enable-gpl \ --enable-pthreads \ + --enable-swscale \ --mandir=${PREFIX}/man CONFIGURE_ENV+= LANG=C MAKE_ENV+= INSTALL="${INSTALL}" Index: pkg-plist =================================================================== RCS file: /home/pcvs/ports/multimedia/ffmpeg/pkg-plist,v retrieving revision 1.23 diff -u -r1.23 pkg-plist --- pkg-plist 5 Aug 2008 03:02:39 -0000 1.23 +++ pkg-plist 6 Aug 2008 22:13:59 -0000 @@ -22,9 +22,11 @@ include/ffmpeg/opt.h include/ffmpeg/random.h include/ffmpeg/rational.h +include/ffmpeg/rgb2rgb.h include/ffmpeg/rtsp.h include/ffmpeg/rtspcodes.h include/ffmpeg/sha1.h +include/ffmpeg/swscale.h include/libavcodec/avcodec.h include/libavcodec/opt.h include/libavdevice/avdevice.h @@ -50,6 +52,8 @@ include/libavutil/sha1.h include/libpostproc/postprocess.h include/postproc/postprocess.h +include/libswscale/rgb2rgb.h +include/libswscale/swscale.h lib/libavcodec.a lib/libavcodec.so lib/libavcodec.so.1 @@ -70,6 +74,10 @@ lib/libpostproc.so lib/libpostproc.so.1 lib/libpostproc.so.51.1.0 +lib/libswscale.a +lib/libswscale.so +lib/libswscale.so.0.5.1 +lib/libswscale.so.1 lib/vhook/fish.so lib/vhook/null.so lib/vhook/ppm.so @@ -79,6 +87,7 @@ libdata/pkgconfig/libavformat.pc libdata/pkgconfig/libavutil.pc libdata/pkgconfig/libpostproc.pc +libdata/pkgconfig/libswscale.pc @dirrm lib/vhook @dirrm include/postproc @dirrm include/libpostproc [-- Attachment #3 --] ? work Index: Makefile =================================================================== RCS file: /home/pcvs/ports/graphics/swfdec/Makefile,v retrieving revision 1.55 diff -u -r1.55 Makefile --- Makefile 6 Aug 2008 17:11:16 -0000 1.55 +++ Makefile 6 Aug 2008 22:14:47 -0000 @@ -8,6 +8,7 @@ PORTNAME= swfdec PORTVERSION= 0.6.8 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://swfdec.freedesktop.org/download/swfdec/0.6/ @@ -20,7 +21,8 @@ USE_GNOME= gnomehack gtk20 USE_AUTOTOOLS= libtool:15:env automake:19:env autoconf:261 GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include \ + -I${LOCALBASE}/include/ffmpeg" \ LDFLAGS="-Wl,-Bsymbolic -L${LOCALBASE}/lib" CONFIGURE_ARGS= --with-audio=oss USE_LDCONFIG= yes
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?489A22A8.2020502>