diff options
48 files changed, 123 insertions, 126 deletions
diff --git a/audio/amarok/Makefile b/audio/amarok/Makefile index e7d6fa33f6d..10712fd6d8b 100644 --- a/audio/amarok/Makefile +++ b/audio/amarok/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.146 2014/05/29 23:35:14 wiz Exp $ -# +# $NetBSD: Makefile,v 1.147 2014/08/11 23:09:44 wiz Exp $ DISTNAME= amarok-${VERS} VERS= 2.8.0 -PKGREVISION= 8 +PKGREVISION= 9 CATEGORIES= audio multimedia MASTER_SITES= ftp://ftp.kde.org/pub/kde/stable/amarok/${VERS}/src/ EXTRACT_SUFX= .tar.bz2 @@ -62,7 +61,7 @@ BUILDLINK_API_DEPENDS.taglib+= taglib>=1.6nb1 .include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../meta-pkgs/kde4/kde4.mk" .include "../../misc/nepomuk-core/buildlink3.mk" -.include "../../multimedia/ffmpeg/buildlink3.mk" +.include "../../multimedia/ffmpeg1/buildlink3.mk" .include "../../multimedia/libkcompactdisc/buildlink3.mk" .include "../../security/qca2/buildlink3.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" diff --git a/audio/chromaprint/Makefile b/audio/chromaprint/Makefile index daa76d7c934..26da9a5378d 100644 --- a/audio/chromaprint/Makefile +++ b/audio/chromaprint/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.5 2014/04/27 16:29:39 wiz Exp $ +# $NetBSD: Makefile,v 1.6 2014/08/11 23:09:44 wiz Exp $ DISTNAME= chromaprint-1.1 +PKGREVISION= 1 CATEGORIES= audio MASTER_SITES= https://bitbucket.org/acoustid/chromaprint/downloads/ @@ -13,8 +14,10 @@ USE_LANGUAGES= c c++ USE_CMAKE= yes # build and install "fpcalc" CMAKE_ARGS+= -DBUILD_EXAMPLES:BOOL=on +# tell it where to find ffmpeg +CMAKE_ARGS+= -DFFMPEG_ROOT:PATH=${BUILDLINK_PREFIX.ffmpeg1} PKGCONFIG_OVERRIDE= libchromaprint.pc.cmake -.include "../../multimedia/ffmpeg/buildlink3.mk" +.include "../../multimedia/ffmpeg1/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/chromaprint/buildlink3.mk b/audio/chromaprint/buildlink3.mk index 4f4569dc5d2..1835902eadd 100644 --- a/audio/chromaprint/buildlink3.mk +++ b/audio/chromaprint/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2014/04/30 14:09:54 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2014/08/11 23:09:44 wiz Exp $ BUILDLINK_TREE+= chromaprint @@ -8,7 +8,7 @@ CHROMAPRINT_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.chromaprint+= chromaprint>=1.1 BUILDLINK_PKGSRCDIR.chromaprint?= ../../audio/chromaprint -#.include "../../multimedia/ffmpeg/buildlink3.mk" +#.include "../../multimedia/ffmpeg1/buildlink3.mk" .endif # CHROMAPRINT_BUILDLINK3_MK BUILDLINK_TREE+= -chromaprint diff --git a/audio/chromaprint/distinfo b/audio/chromaprint/distinfo index ecb50ca87e6..044dbada29e 100644 --- a/audio/chromaprint/distinfo +++ b/audio/chromaprint/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.3 2014/04/27 16:27:09 wiz Exp $ +$NetBSD: distinfo,v 1.4 2014/08/11 23:09:44 wiz Exp $ SHA1 (chromaprint-1.1.tar.gz) = 5a250f761761d2ce08e2591b9daa909393552939 RMD160 (chromaprint-1.1.tar.gz) = f6b886b989b3de0d274c699696212c0350c1ad7a Size (chromaprint-1.1.tar.gz) = 542360 bytes +SHA1 (patch-cmake_modules_FindFFmpeg.cmake) = 0c751824ef25fa393f7e74f432d97d26a44354f0 diff --git a/audio/cmus/Makefile b/audio/cmus/Makefile index 403b6b259d0..81b96734c63 100644 --- a/audio/cmus/Makefile +++ b/audio/cmus/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.50 2014/06/09 14:18:05 ryoon Exp $ +# $NetBSD: Makefile,v 1.51 2014/08/11 23:09:44 wiz Exp $ DISTNAME= cmus-v2.5.0 PKGNAME= ${DISTNAME:S/-v/-/} -PKGREVISION= 7 +PKGREVISION= 8 CATEGORIES= audio MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=cmus/} EXTRACT_SUFX= .tar.bz2 diff --git a/audio/cmus/options.mk b/audio/cmus/options.mk index e74a71b5072..36570409404 100644 --- a/audio/cmus/options.mk +++ b/audio/cmus/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.12 2014/04/21 09:49:49 wiz Exp $ +# $NetBSD: options.mk,v 1.13 2014/08/11 23:09:44 wiz Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.cmus PKG_SUPPORTED_OPTIONS= flac mad vorbis arts libao musepack faad wavpack pulseaudio @@ -112,7 +112,7 @@ CONFIGURE_ARGS+= CONFIG_WAVPACK=n # FFMPEG support # .if !empty(PKG_OPTIONS:Mffmpeg) -.include "../../multimedia/ffmpeg/buildlink3.mk" +.include "../../multimedia/ffmpeg1/buildlink3.mk" CONFIGURE_ARGS+= CONFIG_FFMPEG=y PLIST.ffmpeg= yes .else diff --git a/audio/musicpd/Makefile b/audio/musicpd/Makefile index a71bc91fbb0..2a8308d71e8 100644 --- a/audio/musicpd/Makefile +++ b/audio/musicpd/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.85 2014/08/05 19:25:20 wiz Exp $ +# $NetBSD: Makefile,v 1.86 2014/08/11 23:09:44 wiz Exp $ DISTNAME= mpd-0.18.12 PKGNAME= ${DISTNAME:S/mpd/musicpd/} +PKGREVISION= 1 CATEGORIES= audio MASTER_SITES= http://www.musicpd.org/download/mpd/0.18/ #MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=musicpd/} diff --git a/audio/musicpd/options.mk b/audio/musicpd/options.mk index c6c8aca9572..2a0822e8cfa 100644 --- a/audio/musicpd/options.mk +++ b/audio/musicpd/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.22 2014/04/18 12:47:19 wiz Exp $ +# $NetBSD: options.mk,v 1.23 2014/08/11 23:09:44 wiz Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.musicpd PKG_SUPPORTED_OPTIONS= adplug audiofile avahi bzip2 curl faad ffmpeg flac fluidsynth id3 inet6 libao lame jack libmms libmpdclient libwildmidi mikmod modplug mpg123 musepack musicpd-soundcloud openal opus pulseaudio shout sqlite3 tremor twolame vorbis wavpack zziplib @@ -61,7 +61,7 @@ CONFIGURE_ARGS+= --disable-aac .endif .if !empty(PKG_OPTIONS:Mffmpeg) -. include "../../multimedia/ffmpeg/buildlink3.mk" +. include "../../multimedia/ffmpeg1/buildlink3.mk" CONFIGURE_ARGS+= --enable-ffmpeg .else CONFIGURE_ARGS+= --disable-ffmpeg diff --git a/audio/picard/Makefile b/audio/picard/Makefile index 74326ea5259..6482abe6b8d 100644 --- a/audio/picard/Makefile +++ b/audio/picard/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.21 2014/05/09 07:36:53 wiz Exp $ +# $NetBSD: Makefile,v 1.22 2014/08/11 23:09:44 wiz Exp $ DISTNAME= picard-1.2 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= audio MASTER_SITES= ftp://ftp.musicbrainz.org/pub/musicbrainz/picard/ @@ -26,7 +26,7 @@ CONFIGURE_ARGS+= config .include "../../lang/python/application.mk" .include "../../lang/python/distutils.mk" .include "../../audio/libofa/buildlink3.mk" -.include "../../multimedia/ffmpeg/buildlink3.mk" +.include "../../multimedia/ffmpeg1/buildlink3.mk" .include "../../textproc/expat/buildlink3.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/osg/Makefile b/graphics/osg/Makefile index 4ab400329f6..40358bf771b 100644 --- a/graphics/osg/Makefile +++ b/graphics/osg/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.47 2014/05/31 15:56:27 wiz Exp $ +# $NetBSD: Makefile,v 1.48 2014/08/11 23:09:44 wiz Exp $ DISTNAME= OpenSceneGraph-3.0.1 PKGNAME= osg-3.0.1 -PKGREVISION= 29 +PKGREVISION= 30 CATEGORIES= graphics devel MASTER_SITES= http://www.openscenegraph.org/downloads/stable_releases/OpenSceneGraph-${PKGVERSION_NOREV}/source/ EXTRACT_SUFX= .zip @@ -19,6 +19,7 @@ PKGCONFIG_OVERRIDE= packaging/pkgconfig/openscenegraph.pc.in PKGCONFIG_OVERRIDE+= packaging/pkgconfig/openthreads.pc.in CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release +CMAKE_ARGS+= -DFFMPEG_ROOT:PATH=${BUILDLINK_PREFIX.ffmpeg1} PLIST_VARS+= quartz x11 @@ -45,7 +46,7 @@ PLIST.x11= yes .include "../../graphics/jasper/buildlink3.mk" .include "../../graphics/librsvg/buildlink3.mk" .include "../../graphics/openexr/buildlink3.mk" -.include "../../multimedia/ffmpeg/buildlink3.mk" +.include "../../multimedia/ffmpeg1/buildlink3.mk" .include "../../www/curl/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/unicap/Makefile b/graphics/unicap/Makefile index 8660962d8fd..47b7347f154 100644 --- a/graphics/unicap/Makefile +++ b/graphics/unicap/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.33 2014/05/29 23:36:41 wiz Exp $ +# $NetBSD: Makefile,v 1.34 2014/08/11 23:09:44 wiz Exp $ DISTNAME= unicap-0.9.3 -PKGREVISION= 27 +PKGREVISION= 28 CATEGORIES= graphics MASTER_SITES= http://unicap-imaging.org/downloads/ @@ -27,7 +27,7 @@ CONFIGURE_ARGS+= --disable-v4l2 .include "../../devel/pango/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" -#.include "../../multimedia/ffmpeg/buildlink3.mk" +#.include "../../multimedia/ffmpeg1/buildlink3.mk" .include "../../multimedia/libtheora/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../x11/libICE/buildlink3.mk" diff --git a/graphics/wxsvg/Makefile b/graphics/wxsvg/Makefile index 6dd9f77f0b2..12c362af378 100644 --- a/graphics/wxsvg/Makefile +++ b/graphics/wxsvg/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.47 2014/05/05 00:48:01 ryoon Exp $ -# +# $NetBSD: Makefile,v 1.48 2014/08/11 23:09:44 wiz Exp $ DISTNAME= wxsvg-1.2.1 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=wxsvg/} EXTRACT_SUFX= .tar.bz2 @@ -19,7 +18,7 @@ USE_TOOLS+= gmake pkg-config .include "../../fonts/fontconfig/buildlink3.mk" .include "../../graphics/libart/buildlink3.mk" -.include "../../multimedia/ffmpeg/buildlink3.mk" +.include "../../multimedia/ffmpeg1/buildlink3.mk" .include "../../x11/wxGTK28/buildlink3.mk" .include "../../textproc/expat/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/mbone/vic-devel/Makefile b/mbone/vic-devel/Makefile index 979fa889a1e..fa74a1872c5 100644 --- a/mbone/vic-devel/Makefile +++ b/mbone/vic-devel/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.15 2014/04/10 05:39:15 obache Exp $ +# $NetBSD: Makefile,v 1.16 2014/08/11 23:09:44 wiz Exp $ DISTNAME= vic-2.8ucl1.4.0beta-4337 PKGNAME= vic-devel-2.8.1.4.0beta.4337 -PKGREVISION= 11 +PKGREVISION= 12 CATEGORIES= mbone tk MASTER_SITES= http://www.NetBSD.org/~sborrill/snapshots/ diff --git a/mbone/vic-devel/options.mk b/mbone/vic-devel/options.mk index b62cb472587..3570cba0172 100644 --- a/mbone/vic-devel/options.mk +++ b/mbone/vic-devel/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.3 2013/01/27 00:15:03 wiz Exp $ +# $NetBSD: options.mk,v 1.4 2014/08/11 23:09:44 wiz Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.vic PKG_SUPPORTED_OPTIONS= inet6 # vic-gpl @@ -19,7 +19,7 @@ CONFIGURE_ARGS+= --disable-ffmpeg-co CONFIGURE_ARGS+= --disable-x264-co CONFIGURE_ARGS+= --with-ffmpeginc=${BUILDLINK_PREFIX.ffmpeg}/include CONFIGURE_ARGS+= --with-ffmpeglib=${BUILDLINK_PREFIX.ffmpeg}/lib -.include "../../multimedia/ffmpeg/buildlink3.mk" +.include "../../multimedia/ffmpeg1/buildlink3.mk" CONFIGURE_ARGS+= --with-x264inc=${BUILDLINK_PREFIX.x264-devel}/include CONFIGURE_ARGS+= --with-x264lib=${BUILDLINK_PREFIX.x264-devel}/lib diff --git a/misc/nepomuk-core/Makefile b/misc/nepomuk-core/Makefile index 3047dfd686b..e3079d249d3 100644 --- a/misc/nepomuk-core/Makefile +++ b/misc/nepomuk-core/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.23 2014/06/07 12:11:24 wiz Exp $ +# $NetBSD: Makefile,v 1.24 2014/08/11 23:09:45 wiz Exp $ DISTNAME= nepomuk-core-${_KDE_VERSION} -PKGREVISION= 7 +PKGREVISION= 8 CATEGORIES= misc COMMENT= library for dealing with Nepomuk components @@ -21,7 +21,7 @@ USE_TOOLS+= gmake .include "../../audio/taglib/buildlink3.mk" .include "../../graphics/exiv2/buildlink3.mk" .include "../../lang/python/application.mk" -.include "../../multimedia/ffmpeg/buildlink3.mk" +.include "../../multimedia/ffmpeg1/buildlink3.mk" .include "../../print/poppler-qt4/buildlink3.mk" .include "../../textproc/ebook-tools/buildlink3.mk" .include "../../textproc/shared-desktop-ontologies/buildlink3.mk" diff --git a/multimedia/dvdstyler/Makefile b/multimedia/dvdstyler/Makefile index d2ed272d62c..08192a202f8 100644 --- a/multimedia/dvdstyler/Makefile +++ b/multimedia/dvdstyler/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.60 2014/05/05 00:48:10 ryoon Exp $ -# +# $NetBSD: Makefile,v 1.61 2014/08/11 23:09:45 wiz Exp $ DISTNAME= DVDStyler-2.7.1 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= multimedia MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=dvdstyler/} EXTRACT_SUFX= .tar.bz2 @@ -26,6 +25,7 @@ USE_PKGLOCALEDIR= yes USE_TOOLS+= gmake pkg-config msgfmt zip GNU_CONFIGURE= yes LDFLAGS+= -ljpeg +CONFIGURE_ARGS+= FFMPEG_PATH=${BUILDLINK_PREFIX.ffmpeg1}/bin/ffmpeg1 post-install: cd ${WRKSRC}/templates && ${SETENV} ${INSTALL_ENV} ${GMAKE} install @@ -34,7 +34,7 @@ post-install: .include "../../graphics/netpbm/buildlink3.mk" BUILDLINK_API_DEPENDS.wxsvg+= wxsvg>=1.1.14 .include "../../graphics/wxsvg/buildlink3.mk" -.include "../../multimedia/ffmpeg/buildlink3.mk" +.include "../../multimedia/ffmpeg1/buildlink3.mk" # needs mediactrl BUILDLINK_API_DEPENDS.wxGTK28+= wxGTK28>=2.8.10nb14 .include "../../x11/wxGTK28/buildlink3.mk" diff --git a/multimedia/ffmpeg010/DESCR b/multimedia/ffmpeg010/DESCR index 7f379ea9c4b..fb896dddfb7 100644 --- a/multimedia/ffmpeg010/DESCR +++ b/multimedia/ffmpeg010/DESCR @@ -1,3 +1,5 @@ FFmpeg is a complete, cross-platform solution to record, convert and stream audio and video. It includes libavcodec - the leading audio/video codec library. + +This package contains major version 0.10. diff --git a/multimedia/ffmpeg010/Makefile b/multimedia/ffmpeg010/Makefile index 1eccc1fd342..3f7c90888fd 100644 --- a/multimedia/ffmpeg010/Makefile +++ b/multimedia/ffmpeg010/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.18 2014/07/09 12:48:59 he Exp $ +# $NetBSD: Makefile,v 1.19 2014/08/11 23:09:45 wiz Exp $ PKGNAME= ffmpeg010-20140629.${DISTVERSION} MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://ffmpeg.mplayerhq.hu/ -COMMENT= Decoding, encoding and streaming software +COMMENT= Decoding, encoding and streaming software (v0.10) LICENSE= gnu-lgpl-v2.1 USE_GCC_RUNTIME= yes diff --git a/multimedia/ffmpeg2/DESCR b/multimedia/ffmpeg2/DESCR index 7f379ea9c4b..c378406db70 100644 --- a/multimedia/ffmpeg2/DESCR +++ b/multimedia/ffmpeg2/DESCR @@ -1,3 +1,5 @@ FFmpeg is a complete, cross-platform solution to record, convert and stream audio and video. It includes libavcodec - the leading audio/video codec library. + +This package contains major version 2. diff --git a/multimedia/ffmpeg2/Makefile b/multimedia/ffmpeg2/Makefile index 187b3d5dd40..28db0f3852b 100644 --- a/multimedia/ffmpeg2/Makefile +++ b/multimedia/ffmpeg2/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.9 2014/07/02 13:49:06 adam Exp $ +# $NetBSD: Makefile,v 1.10 2014/08/11 23:09:45 wiz Exp $ PKGNAME= ${DISTNAME:S/ffmpeg/ffmpeg2/} MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://ffmpeg.mplayerhq.hu/ -COMMENT= Decoding, encoding and streaming software +COMMENT= Decoding, encoding and streaming software (v2.x) CONFIGURE_ARGS+= --enable-avfilter #CONFIGURE_ARGS+= --enable-avfilter-lavf diff --git a/multimedia/ffmpegthumbnailer/Makefile b/multimedia/ffmpegthumbnailer/Makefile index 5c6201175d4..28057be290d 100644 --- a/multimedia/ffmpegthumbnailer/Makefile +++ b/multimedia/ffmpegthumbnailer/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.15 2014/04/10 05:39:15 obache Exp $ -# +# $NetBSD: Makefile,v 1.16 2014/08/11 23:09:45 wiz Exp $ DISTNAME= ffmpegthumbnailer-2.0.8 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= multimedia MASTER_SITES= http://ffmpegthumbnailer.googlecode.com/files/ @@ -20,5 +19,5 @@ PKGCONFIG_OVERRIDE+= libffmpegthumbnailer.pc.in .include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/png/buildlink3.mk" -.include "../../multimedia/ffmpeg/buildlink3.mk" +.include "../../multimedia/ffmpeg1/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/multimedia/ffmpegthumbnailer/buildlink3.mk b/multimedia/ffmpegthumbnailer/buildlink3.mk index 57234243642..7bc8954ebc7 100644 --- a/multimedia/ffmpegthumbnailer/buildlink3.mk +++ b/multimedia/ffmpegthumbnailer/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2013/02/16 11:18:02 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2014/08/11 23:09:45 wiz Exp $ BUILDLINK_TREE+= ffmpegthumbnailer @@ -10,7 +10,7 @@ BUILDLINK_ABI_DEPENDS.ffmpegthumbnailer?= ffmpegthumbnailer>=2.0.8nb1 BUILDLINK_PKGSRCDIR.ffmpegthumbnailer?= ../../multimedia/ffmpegthumbnailer #.include "../../graphics/png/buildlink3.mk" -#.include "../../multimedia/ffmpeg/buildlink3.mk" +#.include "../../multimedia/ffmpeg1/buildlink3.mk" .endif # FFMPEGTHUMBNAILER_BUILDLINK3_MK BUILDLINK_TREE+= -ffmpegthumbnailer diff --git a/multimedia/ffmpegthumbs/Makefile b/multimedia/ffmpegthumbs/Makefile index 5681dc93250..89c95e233be 100644 --- a/multimedia/ffmpegthumbs/Makefile +++ b/multimedia/ffmpegthumbs/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.14 2014/05/15 14:41:56 adam Exp $ +# $NetBSD: Makefile,v 1.15 2014/08/11 23:09:45 wiz Exp $ DISTNAME= ffmpegthumbs-${_KDE_VERSION} -PKGREVISION= 4 +PKGREVISION= 5 CATEGORIES= multimedia COMMENT= FFmpeg-based thumbnail creator for video files @@ -9,7 +9,7 @@ COMMENT= FFmpeg-based thumbnail creator for video files .include "../../meta-pkgs/kde4/kde4.mk" -.include "../../multimedia/ffmpeg/buildlink3.mk" +.include "../../multimedia/ffmpeg1/buildlink3.mk" .include "../../x11/kdelibs4/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/multimedia/ffplay/Makefile b/multimedia/ffplay/Makefile index c6f8dac8311..559e9c6b542 100644 --- a/multimedia/ffplay/Makefile +++ b/multimedia/ffplay/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2014/07/04 10:33:41 adam Exp $ +# $NetBSD: Makefile,v 1.14 2014/08/11 23:09:45 wiz Exp $ PKGNAME= ${DISTNAME:S/ffmpeg/ffplay/} MAINTAINER= pkgsrc-users@NetBSD.org @@ -27,5 +27,5 @@ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/ffplay ${DESTDIR}${PREFIX}/bin .include "../../devel/SDL/buildlink3.mk" -.include "../../multimedia/ffmpeg/buildlink3.mk" +.include "../../multimedia/ffmpeg1/buildlink3.mk" .include "../../multimedia/ffmpeg/Makefile.common" diff --git a/multimedia/fuppes/Makefile b/multimedia/fuppes/Makefile index 19208645b74..3849d62e9e9 100644 --- a/multimedia/fuppes/Makefile +++ b/multimedia/fuppes/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.49 2014/06/07 12:11:24 wiz Exp $ -# +# $NetBSD: Makefile,v 1.50 2014/08/11 23:09:45 wiz Exp $ DISTNAME= fuppes-0.660 -PKGREVISION= 17 +PKGREVISION= 18 CATEGORIES= multimedia MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=fuppes/} @@ -38,5 +37,5 @@ CONFIGURE_ARGS+= --enable-lame .include "../../graphics/exiv2/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" .include "../../graphics/simage/buildlink3.mk" -.include "../../multimedia/ffmpeg/buildlink3.mk" +.include "../../multimedia/ffmpeg1/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/multimedia/gnash/Makefile b/multimedia/gnash/Makefile index 49d4746e8da..9e8db5c95c6 100644 --- a/multimedia/gnash/Makefile +++ b/multimedia/gnash/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.87 2014/07/20 11:18:23 obache Exp $ -# +# $NetBSD: Makefile,v 1.88 2014/08/11 23:09:45 wiz Exp $ DISTNAME= gnash-0.8.10 -PKGREVISION= 35 +PKGREVISION= 36 CATEGORIES= multimedia MASTER_SITES= ${MASTER_SITE_GNU:=gnash/${PKGVERSION_NOREV}/} EXTRACT_SUFX= .tar.bz2 diff --git a/multimedia/gnash/options.mk b/multimedia/gnash/options.mk index fa653bc0946..12981a94ee8 100644 --- a/multimedia/gnash/options.mk +++ b/multimedia/gnash/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.19 2013/01/19 21:41:04 riastradh Exp $ +# $NetBSD: options.mk,v 1.20 2014/08/11 23:09:45 wiz Exp $ # # @@ -103,7 +103,7 @@ GNASH_MEDIA+= ffmpeg .include "../../audio/libdca/buildlink3.mk" .include "../../audio/SDL_mixer/buildlink3.mk" .include "../../devel/SDL/buildlink3.mk" -.include "../../multimedia/ffmpeg/buildlink3.mk" +.include "../../multimedia/ffmpeg1/buildlink3.mk" .endif .if !empty(PKG_OPTIONS:Mgstreamer) @@ -119,7 +119,7 @@ DEPENDS+= gst-plugins0.10-vorbis-[0-9]*:../../audio/gst-plugins0.10-vorbis CONFIGURE_ARGS+= --enable-media=${GNASH_MEDIA:Unone:tW:S/ /,/} .if !empty(PKG_OPTIONS:Mffmpeg) -.include "../../multimedia/ffmpeg/buildlink3.mk" +.include "../../multimedia/ffmpeg1/buildlink3.mk" CONFIGURE_ARGS+= --enable-device=VAAPI .else CONFIGURE_ARGS+= --enable-device=x11 diff --git a/multimedia/gpac/Makefile b/multimedia/gpac/Makefile index 46e1af6c95a..b3ad21023bf 100644 --- a/multimedia/gpac/Makefile +++ b/multimedia/gpac/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.38 2014/06/09 14:18:07 ryoon Exp $ -# +# $NetBSD: Makefile,v 1.39 2014/08/11 23:09:45 wiz Exp $ DISTNAME= gpac-0.5.0 -PKGREVISION= 10 +PKGREVISION= 11 CATEGORIES= multimedia MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gpac/} @@ -14,7 +13,7 @@ LICENSE= gnu-lgpl-v2.1 MAKE_JOBS_SAFE= no WRKSRC= ${WRKDIR}/gpac -USE_TOOLS+= gmake grep gsed +USE_TOOLS+= gmake grep gsed pkg-config USE_LANGUAGES= c c++ # not really GNU configure, but close enough GNU_CONFIGURE= yes @@ -37,7 +36,7 @@ CONFIGURE_ARGS+= --enable-pic .include "../../graphics/png/buildlink3.mk" # doesn't work yet #.include "../../lang/spidermonkey/buildlink3.mk" -.include "../../multimedia/ffmpeg/buildlink3.mk" +.include "../../multimedia/ffmpeg1/buildlink3.mk" .include "../../multimedia/libogg/buildlink3.mk" .include "../../multimedia/xvidcore/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" diff --git a/multimedia/libquicktime/Makefile b/multimedia/libquicktime/Makefile index 24f795c7dd4..172d227b398 100644 --- a/multimedia/libquicktime/Makefile +++ b/multimedia/libquicktime/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.10 2014/05/05 00:48:12 ryoon Exp $ -# +# $NetBSD: Makefile,v 1.11 2014/08/11 23:09:45 wiz Exp $ DISTNAME= libquicktime-1.2.4 -PKGREVISION= 8 +PKGREVISION= 9 CATEGORIES= multimedia MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=libquicktime/} @@ -29,7 +28,7 @@ CONFIGURE_ARGS+= --enable-gpl .include "../../audio/libvorbis/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../mk/jpeg.buildlink3.mk" -.include "../../multimedia/ffmpeg/buildlink3.mk" +.include "../../multimedia/ffmpeg1/buildlink3.mk" .include "../../audio/lame/buildlink3.mk" #.include "../../multimedia/libdv/buildlink3.mk" .include "../../multimedia/schroedinger/buildlink3.mk" diff --git a/multimedia/minidlna/Makefile b/multimedia/minidlna/Makefile index e247d89cd67..3c2936c7617 100644 --- a/multimedia/minidlna/Makefile +++ b/multimedia/minidlna/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.7 2014/04/10 05:39:16 obache Exp $ -# +# $NetBSD: Makefile,v 1.8 2014/08/11 23:09:45 wiz Exp $ DISTNAME= minidlna_1.0.25_src PKGNAME= minidlna-1.0.25 -PKGREVISION= 5 +PKGREVISION= 6 CATEGORIES= multimedia MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=minidlna/1.0.25/} @@ -38,7 +37,7 @@ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/minidlna ${DESTDIR}${PREFIX}/sbin ${INSTALL_DATA} ${WRKSRC}/minidlna.conf ${DESTDIR}${EGDIR} -.include "../../multimedia/ffmpeg/buildlink3.mk" +.include "../../multimedia/ffmpeg1/buildlink3.mk" .include "../../audio/flac/buildlink3.mk" .include "../../audio/libvorbis/buildlink3.mk" .include "../../multimedia/libogg/buildlink3.mk" diff --git a/multimedia/mkv2mp4/Makefile b/multimedia/mkv2mp4/Makefile index d08d8557cc9..eff2c747fcc 100644 --- a/multimedia/mkv2mp4/Makefile +++ b/multimedia/mkv2mp4/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.19 2014/05/17 16:10:47 wiz Exp $ -# +# $NetBSD: Makefile,v 1.20 2014/08/11 23:09:45 wiz Exp $ DISTNAME= mkv2mp4-20121208 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/-/-0.0./} -PKGREVISION= 3 +PKGREVISION= 4 CATEGORIES= multimedia MASTER_SITES= ${MASTER_SITE_LOCAL} @@ -27,7 +26,7 @@ do-install: ${DESTDIR}${PREFIX}/share/doc/mkv2mp4 .include "../../lang/python/application.mk" -.include "../../multimedia/ffmpeg/buildlink3.mk" +.include "../../multimedia/ffmpeg1/buildlink3.mk" .include "../../multimedia/gpac/buildlink3.mk" DEPENDS+= mkvtoolnix>=1.7.0:../../multimedia/mkvtoolnix .include "../../mk/bsd.pkg.mk" diff --git a/multimedia/mlt/Makefile b/multimedia/mlt/Makefile index 65a3ad13465..3eb0058689b 100644 --- a/multimedia/mlt/Makefile +++ b/multimedia/mlt/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.43 2014/06/09 14:18:07 ryoon Exp $ +# $NetBSD: Makefile,v 1.44 2014/08/11 23:09:45 wiz Exp $ DISTNAME= mlt-0.9.0 -PKGREVISION= 8 +PKGREVISION= 9 CATEGORIES= multimedia MASTER_SITES= http://downloads.sourceforge.net/project/mlt/mlt/ @@ -22,7 +22,7 @@ PKGCONFIG_OVERRIDE+= mlt-0.8.6/mlt-framework.pc.in .include "../../audio/libvorbis/buildlink3.mk" .include "../../audio/sox/buildlink3.mk" .include "../../devel/SDL/buildlink3.mk" -.include "../../multimedia/ffmpeg/buildlink3.mk" +.include "../../multimedia/ffmpeg1/buildlink3.mk" .include "../../multimedia/libdv/buildlink3.mk" .include "../../multimedia/swfdec/buildlink3.mk" .include "../../multimedia/xine-lib/buildlink3.mk" diff --git a/multimedia/phonon/Makefile b/multimedia/phonon/Makefile index c62917226e2..40c052857fe 100644 --- a/multimedia/phonon/Makefile +++ b/multimedia/phonon/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.43 2014/06/09 14:18:08 ryoon Exp $ +# $NetBSD: Makefile,v 1.44 2014/08/11 23:09:45 wiz Exp $ DISTNAME= phonon-4.7.1 PKGREVISION= 4 @@ -15,7 +15,7 @@ LICENSE= gnu-lgpl-v2.1 BUILD_DEPENDS+= automoc4>=0.9.83:../../devel/automoc4 -USE_TOOLS+= pkg-config +USE_TOOLS+= pkg-config gmake USE_LANGUAGES= c c++ USE_CMAKE= yes CMAKE_ARG_PATH= .. diff --git a/multimedia/pspvc/Makefile b/multimedia/pspvc/Makefile index 03769e8ae98..5d7930bf7dc 100644 --- a/multimedia/pspvc/Makefile +++ b/multimedia/pspvc/Makefile @@ -1,10 +1,9 @@ -# $NetBSD: Makefile,v 1.31 2014/05/05 00:48:12 ryoon Exp $ -# +# $NetBSD: Makefile,v 1.32 2014/08/11 23:09:45 wiz Exp $ DISTNAME= pspvc-install-0.3 PSPVCVER= pspvc-0.3 PKGNAME= ${PSPVCVER} -PKGREVISION= 26 +PKGREVISION= 27 CATEGORIES= multimedia MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pspvc/} @@ -28,7 +27,7 @@ post-install: ${LN} -s ${PREFIX}/bin/ffmpeg \ ${DESTDIR}${PREFIX}/share/pspvc/bin/ffmpeg -.include "../../multimedia/ffmpeg/buildlink3.mk" +.include "../../multimedia/ffmpeg1/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" .include "../../mk/bsd.pkg.mk" diff --git a/multimedia/transcode/Makefile b/multimedia/transcode/Makefile index 2d2aed77b12..9c6b855f1fe 100644 --- a/multimedia/transcode/Makefile +++ b/multimedia/transcode/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.91 2014/04/10 06:21:34 obache Exp $ +# $NetBSD: Makefile,v 1.92 2014/08/11 23:09:46 wiz Exp $ DISTNAME= transcode-1.1.7 -PKGREVISION= 10 +PKGREVISION= 11 CATEGORIES= multimedia #MASTER_SITES= http://download.berlios.de/tcforge/ MASTER_SITES= http://bitbucket.org/france/transcode-tcforge/downloads/ @@ -52,7 +52,7 @@ LIBS+= ${LIBOSSAUDIO} .include "../../devel/zlib/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" -.include "../../multimedia/ffmpeg/buildlink3.mk" +.include "../../multimedia/ffmpeg1/buildlink3.mk" .include "../../multimedia/libdvdread/buildlink3.mk" .include "../../multimedia/libmpeg2/buildlink3.mk" .include "../../multimedia/libogg/buildlink3.mk" diff --git a/multimedia/vlc2/Makefile b/multimedia/vlc2/Makefile index 21a0c541e46..51a2fc15604 100644 --- a/multimedia/vlc2/Makefile +++ b/multimedia/vlc2/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.58 2014/06/09 14:18:08 ryoon Exp $ +# $NetBSD: Makefile,v 1.59 2014/08/11 23:09:46 wiz Exp $ DISTNAME= vlc-${VLC_VERSION} -PKGREVISION= 12 +PKGREVISION= 13 CATEGORIES= multimedia MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=vlc/} \ http://download.videolan.org/pub/videolan/vlc/${VLC_VERSION}/ @@ -132,7 +132,7 @@ CHECK_WRKREF_SKIP= lib/libvlccore.a \ .include "../../security/libgcrypt/buildlink3.mk" .include "../../security/gnutls/buildlink3.mk" -.include "../../multimedia/ffmpeg/buildlink3.mk" +.include "../../multimedia/ffmpeg1/buildlink3.mk" .include "../../multimedia/libdvdplay/buildlink3.mk" .include "../../multimedia/libdvbpsi0/buildlink3.mk" .include "../../multimedia/libdvdnav/buildlink3.mk" diff --git a/multimedia/xine-lib/Makefile b/multimedia/xine-lib/Makefile index 40035d18c93..6fc9ec94320 100644 --- a/multimedia/xine-lib/Makefile +++ b/multimedia/xine-lib/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.129 2014/06/30 13:41:00 jperkin Exp $ +# $NetBSD: Makefile,v 1.130 2014/08/11 23:09:46 wiz Exp $ .include "Makefile.common" COMMENT= Multimedia player library -PKGREVISION= 3 +PKGREVISION= 4 CONFLICTS+= xine-xcb-[0-9]* diff --git a/multimedia/xine-lib/Makefile.common b/multimedia/xine-lib/Makefile.common index 4e10d03466b..a5772acc1fc 100644 --- a/multimedia/xine-lib/Makefile.common +++ b/multimedia/xine-lib/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.81 2014/04/17 13:53:47 wiz Exp $ +# $NetBSD: Makefile.common,v 1.82 2014/08/11 23:09:46 wiz Exp $ # # used by audio/xine-alsa/Makefile # used by audio/xine-esound/Makefile @@ -76,6 +76,6 @@ pre-configure: .include "../../converters/libiconv/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" -.include "../../multimedia/ffmpeg/buildlink3.mk" +.include "../../multimedia/ffmpeg1/buildlink3.mk" .include "../../mk/oss.buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" diff --git a/multimedia/xine-lib/buildlink3.mk b/multimedia/xine-lib/buildlink3.mk index 8914be1b3f8..655cfa988a6 100644 --- a/multimedia/xine-lib/buildlink3.mk +++ b/multimedia/xine-lib/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.27 2014/04/10 05:39:14 obache Exp $ +# $NetBSD: buildlink3.mk,v 1.28 2014/08/11 23:09:46 wiz Exp $ BUILDLINK_TREE+= xine-lib @@ -10,7 +10,7 @@ BUILDLINK_ABI_DEPENDS.xine-lib+=xine-lib>=1.0.3a BUILDLINK_ABI_DEPENDS.xine-lib+= xine-lib>=1.2.4nb3 BUILDLINK_PKGSRCDIR.xine-lib?= ../../multimedia/xine-lib -.include "../../multimedia/ffmpeg/buildlink3.mk" +.include "../../multimedia/ffmpeg1/buildlink3.mk" .endif # XINE_LIB_BUILDLINK3_MK BUILDLINK_TREE+= -xine-lib diff --git a/net/freerdp/Makefile b/net/freerdp/Makefile index b3e89a0f8f0..6b066e96524 100644 --- a/net/freerdp/Makefile +++ b/net/freerdp/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.9 2014/06/18 09:28:16 wiz Exp $ -# +# $NetBSD: Makefile,v 1.10 2014/08/11 23:09:46 wiz Exp $ DISTNAME= freerdp-1.0.2 -PKGREVISION= 8 +PKGREVISION= 9 CATEGORIES= net MASTER_SITES= http://pub.freerdp.com/releases/ diff --git a/net/freerdp/options.mk b/net/freerdp/options.mk index cc8e866ee85..68eeea7323e 100644 --- a/net/freerdp/options.mk +++ b/net/freerdp/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.4 2014/06/18 09:26:10 wiz Exp $ +# $NetBSD: options.mk,v 1.5 2014/08/11 23:09:46 wiz Exp $ # PKG_OPTIONS_VAR= PKG_OPTIONS.freerdp PKG_SUPPORTED_OPTIONS= alsa cups ffmpeg pcsc pulseaudio debug @@ -36,7 +36,7 @@ CMAKE_ARGS+= -DWITH_CUPS=OFF ### FFmpeg support ### .if !empty(PKG_OPTIONS:Mffmpeg) -. include "../../multimedia/ffmpeg/buildlink3.mk" +. include "../../multimedia/ffmpeg1/buildlink3.mk" CMAKE_ARGS+= -DWITH_FFMPEG=ON PLIST.ffmpeg= yes .else diff --git a/net/libdlna/Makefile b/net/libdlna/Makefile index ffb4b012241..769f8d0616c 100644 --- a/net/libdlna/Makefile +++ b/net/libdlna/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.8 2014/04/10 05:39:14 obache Exp $ -# +# $NetBSD: Makefile,v 1.9 2014/08/11 23:09:46 wiz Exp $ DISTNAME= libdlna-0.2.4 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= net MASTER_SITES= http://libdlna.geexbox.org/releases/ EXTRACT_SUFX= .tar.bz2 @@ -29,5 +28,5 @@ SUBST_STAGE.config= pre-configure SUBST_FILES.config= configure SUBST_SED.config= -e 's,/usr/bin/install,${INSTALL},' -.include "../../multimedia/ffmpeg/buildlink3.mk" +.include "../../multimedia/ffmpeg1/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/libdlna/buildlink3.mk b/net/libdlna/buildlink3.mk index 0733cf8cf8f..f287a304f11 100644 --- a/net/libdlna/buildlink3.mk +++ b/net/libdlna/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.6 2014/04/10 05:39:14 obache Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2014/08/11 23:09:46 wiz Exp $ # BUILDLINK_TREE+= libdlna @@ -10,7 +10,7 @@ BUILDLINK_API_DEPENDS.libdlna+= libdlna>=0.2.3 BUILDLINK_ABI_DEPENDS.libdlna+= libdlna>=0.2.4nb2 BUILDLINK_PKGSRCDIR.libdlna?= ../../net/libdlna -.include "../../multimedia/ffmpeg/buildlink3.mk" +.include "../../multimedia/ffmpeg1/buildlink3.mk" .endif # LIBDLNA_BUILDLINK3_MK BUILDLINK_TREE+= -libdlna diff --git a/sysutils/k3b/Makefile b/sysutils/k3b/Makefile index 30c51e455f3..4bb931da7c0 100644 --- a/sysutils/k3b/Makefile +++ b/sysutils/k3b/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.72 2014/05/29 23:37:28 wiz Exp $ +# $NetBSD: Makefile,v 1.73 2014/08/11 23:09:46 wiz Exp $ DISTNAME= k3b-2.0.2 -PKGREVISION= 28 +PKGREVISION= 29 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=k3b/} EXTRACT_SUFX= .tar.bz2 @@ -47,7 +47,7 @@ BUILDLINK_TRANSFORM+= opt:-ldl:${BUILDLINK_LDADD.dl:M*} .include "../../audio/libsamplerate/buildlink3.mk" .include "../../audio/taglib/buildlink3.mk" .include "../../graphics/hicolor-icon-theme/buildlink3.mk" -.include "../../multimedia/ffmpeg/buildlink3.mk" +.include "../../multimedia/ffmpeg1/buildlink3.mk" .include "../../multimedia/libdvdread/buildlink3.mk" .include "../../multimedia/libkcddb/buildlink3.mk" .include "../../security/polkit-qt/buildlink3.mk" diff --git a/www/cherokee/Makefile b/www/cherokee/Makefile index 92316744cf1..a01261acd46 100644 --- a/www/cherokee/Makefile +++ b/www/cherokee/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.28 2014/05/09 07:37:23 wiz Exp $ +# $NetBSD: Makefile,v 1.29 2014/08/11 23:09:46 wiz Exp $ DISTNAME= cherokee-1.2.101 -PKGREVISION= 6 +PKGREVISION= 7 CATEGORIES= www MASTER_SITES= http://www.cherokee-project.com/download/1.2/${PKGVERSION_NOREV}/ diff --git a/www/cherokee/options.mk b/www/cherokee/options.mk index 8c9aecc8133..af350e1e1a2 100644 --- a/www/cherokee/options.mk +++ b/www/cherokee/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.1 2010/07/11 12:18:55 obache Exp $ +# $NetBSD: options.mk,v 1.2 2014/08/11 23:09:46 wiz Exp $ # PKG_OPTIONS_VAR= PKG_OPTIONS.cherokee @@ -79,7 +79,7 @@ CONFIGURE_ARGS+= --without-geoip .if !empty(PKG_OPTIONS:Mffmpeg) PLIST.ffmpeg= yes CONFIGURE_ARGS+= --with-ffmpeg=${BUILDLINK_PREFIX.ffmpeg} -.include "../../multimedia/ffmpeg/buildlink3.mk" +.include "../../multimedia/ffmpeg1/buildlink3.mk" .else CONFIGURE_ARGS+= --without-ffmpeg .endif diff --git a/x11/xvidcap/Makefile b/x11/xvidcap/Makefile index 402c9b70e42..5d2c2ab6f4d 100644 --- a/x11/xvidcap/Makefile +++ b/x11/xvidcap/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.25 2014/04/10 05:39:17 obache Exp $ -# +# $NetBSD: Makefile,v 1.26 2014/08/11 23:09:46 wiz Exp $ .include "Makefile.common" -PKGREVISION= 16 +PKGREVISION= 17 COMMENT= Capture X display to individual frames or MPEG video CONFIGURE_ARGS+= --without-gtk2 diff --git a/x11/xvidcap/Makefile.common b/x11/xvidcap/Makefile.common index 587b6c6fd5d..0f670e247a5 100644 --- a/x11/xvidcap/Makefile.common +++ b/x11/xvidcap/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.9 2011/01/12 11:22:33 wiz Exp $ +# $NetBSD: Makefile.common,v 1.10 2014/08/11 23:09:46 wiz Exp $ # # used by x11/xvidcap/Makefile # used by x11/xvidcap-gtk2/Makefile @@ -19,7 +19,7 @@ CONFIGURE_ARGS+= --without-forced-embedded-ffmpeg .include "../../devel/zlib/buildlink3.mk" .include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/png/buildlink3.mk" -.include "../../multimedia/ffmpeg/buildlink3.mk" +.include "../../multimedia/ffmpeg1/buildlink3.mk" .include "../../x11/libXmu/buildlink3.mk" .include "../../x11/libXt/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" |