diff options
| author | wiz <wiz@pkgsrc.org> | 2010-06-13 22:43:46 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2010-06-13 22:43:46 +0000 |
| commit | 92e0cb52cb783546e352182244f761180817e141 (patch) | |
| tree | 4a9b97c2969a25f1eeb6596ee96fc25429cef7d5 /multimedia/vlc | |
| parent | 01bd00f60b043c603cfe4fa796bf28af3a849cca (diff) | |
| download | pkgsrc-92e0cb52cb783546e352182244f761180817e141.tar.gz | |
Bump PKGREVISION for libpng shlib name change.
Also add some patches to remove use of deprecated symbols and fix other
problems when looking for or compiling against libpng-1.4.x.
Diffstat (limited to 'multimedia/vlc')
| -rw-r--r-- | multimedia/vlc/buildlink3.mk | 4 | ||||
| -rw-r--r-- | multimedia/vlc/distinfo | 3 | ||||
| -rw-r--r-- | multimedia/vlc/patches/patch-ab | 22 |
3 files changed, 26 insertions, 3 deletions
diff --git a/multimedia/vlc/buildlink3.mk b/multimedia/vlc/buildlink3.mk index f656ccb8803..ac5902d5187 100644 --- a/multimedia/vlc/buildlink3.mk +++ b/multimedia/vlc/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.30 2010/01/18 09:59:18 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.31 2010/06/13 22:45:07 wiz Exp $ BUILDLINK_TREE+= vlc @@ -6,7 +6,7 @@ BUILDLINK_TREE+= vlc VLC_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.vlc?= vlc>=1.0.0 -BUILDLINK_ABI_DEPENDS.vlc?= vlc>=1.0.4nb1 +BUILDLINK_ABI_DEPENDS.vlc?= vlc>=1.0.6 BUILDLINK_PKGSRCDIR.vlc?= ../../multimedia/vlc pkgbase:= vlc diff --git a/multimedia/vlc/distinfo b/multimedia/vlc/distinfo index 217464deb4c..8f5b7f5aac1 100644 --- a/multimedia/vlc/distinfo +++ b/multimedia/vlc/distinfo @@ -1,8 +1,9 @@ -$NetBSD: distinfo,v 1.35 2010/05/04 18:30:10 drochner Exp $ +$NetBSD: distinfo,v 1.36 2010/06/13 22:45:07 wiz Exp $ SHA1 (vlc-1.0.6.tar.bz2) = 834346a84a71d915440b7741e04b6e02de451786 RMD160 (vlc-1.0.6.tar.bz2) = 2185eb418748f2aadfce5e61b7a9de66a62ef2d1 Size (vlc-1.0.6.tar.bz2) = 22149704 bytes SHA1 (patch-aa) = 76ef868076df4e423acfe5ca65999fbd26167bfe +SHA1 (patch-ab) = c7d5cde0f0e4a678360adfb43d027d25bdc147e1 SHA1 (patch-configure) = 508d9fc4ee8bc8526fb5cdf1b161c573216036c4 SHA1 (patch-v4l2) = 1f91206f8e2f78514056386977a6c2230a710211 diff --git a/multimedia/vlc/patches/patch-ab b/multimedia/vlc/patches/patch-ab new file mode 100644 index 00000000000..4397e7585ad --- /dev/null +++ b/multimedia/vlc/patches/patch-ab @@ -0,0 +1,22 @@ +$NetBSD: patch-ab,v 1.5 2010/06/13 22:45:07 wiz Exp $ + +--- modules/codec/png.c.orig 2010-03-07 18:38:01.000000000 +0000 ++++ modules/codec/png.c +@@ -155,7 +155,7 @@ static picture_t *DecodeBlock( decoder_t + p_info = png_create_info_struct( p_png ); + if( p_info == NULL ) + { +- png_destroy_read_struct( &p_png, png_infopp_NULL, png_infopp_NULL ); ++ png_destroy_read_struct( &p_png, NULL, NULL ); + block_Release( p_block ); *pp_block = NULL; + return NULL; + } +@@ -163,7 +163,7 @@ static picture_t *DecodeBlock( decoder_t + p_end_info = png_create_info_struct( p_png ); + if( p_end_info == NULL ) + { +- png_destroy_read_struct( &p_png, &p_info, png_infopp_NULL ); ++ png_destroy_read_struct( &p_png, &p_info, NULL ); + block_Release( p_block ); *pp_block = NULL; + return NULL; + } |