diff options
| author | wiz <wiz> | 2014-08-13 08:23:50 +0000 |
|---|---|---|
| committer | wiz <wiz> | 2014-08-13 08:23:50 +0000 |
| commit | ed24bd6e0bd213e81e9fee6899e83958db475a4b (patch) | |
| tree | f85053a950dec93f8007d1b7da62a505098b57cb /multimedia | |
| parent | 9cbadfca26a55571a7cf96d0607121a24c9282d1 (diff) | |
| download | pkgsrc-ed24bd6e0bd213e81e9fee6899e83958db475a4b.tar.gz | |
Switch to ffmpeg2. Requested by Thierry Laronde on pkgsrc-users.
Bump PKGREVISION and ABI depends.
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/xine-lib/Makefile | 4 | ||||
| -rw-r--r-- | multimedia/xine-lib/Makefile.common | 4 | ||||
| -rw-r--r-- | multimedia/xine-lib/buildlink3.mk | 7 |
3 files changed, 7 insertions, 8 deletions
diff --git a/multimedia/xine-lib/Makefile b/multimedia/xine-lib/Makefile index 6fc9ec94320..d36cf436ab1 100644 --- a/multimedia/xine-lib/Makefile +++ b/multimedia/xine-lib/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.130 2014/08/11 23:09:46 wiz Exp $ +# $NetBSD: Makefile,v 1.131 2014/08/13 08:23:50 wiz Exp $ .include "Makefile.common" COMMENT= Multimedia player library -PKGREVISION= 4 +PKGREVISION= 5 CONFLICTS+= xine-xcb-[0-9]* diff --git a/multimedia/xine-lib/Makefile.common b/multimedia/xine-lib/Makefile.common index a5772acc1fc..4e96d7495e8 100644 --- a/multimedia/xine-lib/Makefile.common +++ b/multimedia/xine-lib/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.82 2014/08/11 23:09:46 wiz Exp $ +# $NetBSD: Makefile.common,v 1.83 2014/08/13 08:23:50 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/ffmpeg1/buildlink3.mk" +.include "../../multimedia/ffmpeg2/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 655cfa988a6..b2d2ef95ee7 100644 --- a/multimedia/xine-lib/buildlink3.mk +++ b/multimedia/xine-lib/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.28 2014/08/11 23:09:46 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.29 2014/08/13 08:23:50 wiz Exp $ BUILDLINK_TREE+= xine-lib @@ -6,11 +6,10 @@ BUILDLINK_TREE+= xine-lib XINE_LIB_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.xine-lib+= xine-lib>=1rc3c -BUILDLINK_ABI_DEPENDS.xine-lib+=xine-lib>=1.0.3a -BUILDLINK_ABI_DEPENDS.xine-lib+= xine-lib>=1.2.4nb3 +BUILDLINK_ABI_DEPENDS.xine-lib+= xine-lib>=1.2.5nb5 BUILDLINK_PKGSRCDIR.xine-lib?= ../../multimedia/xine-lib -.include "../../multimedia/ffmpeg1/buildlink3.mk" +.include "../../multimedia/ffmpeg2/buildlink3.mk" .endif # XINE_LIB_BUILDLINK3_MK BUILDLINK_TREE+= -xine-lib |