fix build and PLIST problems with the (optional) SDL plugin,

mostly from PR pkg/45209 by Matthew Mondor

5 files changed, 31 insertions, 7 deletions

diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile
index 69b2458dfed..9adcec0fdac 100644
--- a/multimedia/vlc/Makefile
+++ b/multimedia/vlc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.124 2012/01/09 17:12:57 drochner Exp $
+# $NetBSD: Makefile,v 1.125 2012/01/12 15:54:00 drochner Exp $
 #
 
 DISTNAME=		vlc-${VLC_VERSION}
@@ -127,6 +127,7 @@ CHECK_WRKREF_SKIP=	lib/libvlccore.a \
 .include "../../misc/libcdio/buildlink3.mk"
 
 .include "../../mk/jpeg.buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
 .include "../../net/liblive/buildlink3.mk"
 .include "../../converters/fribidi/buildlink3.mk"
 .include "../../devel/libebml/buildlink3.mk"
diff --git a/multimedia/vlc/PLIST b/multimedia/vlc/PLIST
index bfb9a17f81e..76c14689f04 100644
--- a/multimedia/vlc/PLIST
+++ b/multimedia/vlc/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.49 2012/01/10 12:37:32 drochner Exp $
+@comment $NetBSD: PLIST,v 1.50 2012/01/12 15:54:00 drochner Exp $
 bin/cvlc
 ${PLIST.x11}bin/qvlc
 bin/rvlc
@@ -137,6 +137,7 @@ lib/vlc/plugins/audio_mixer/libfloat32_mixer_plugin.la
 lib/vlc/plugins/audio_mixer/libspdif_mixer_plugin.la
 lib/vlc/plugins/audio_mixer/libtrivial_mixer_plugin.la
 lib/vlc/plugins/audio_output/libaout_file_plugin.la
+${PLIST.sdl}lib/vlc/plugins/audio_output/libaout_sdl_plugin.la
 lib/vlc/plugins/audio_output/liboss_plugin.la
 ${PLIST.pulseaudio}lib/vlc/plugins/audio_output/libpulse_plugin.la
 lib/vlc/plugins/codec/liba52_plugin.la
@@ -156,8 +157,9 @@ lib/vlc/plugins/codec/libinvmem_plugin.la
 lib/vlc/plugins/codec/liblibmpeg2_plugin.la
 lib/vlc/plugins/codec/liblpcm_plugin.la
 lib/vlc/plugins/codec/libmpeg_audio_plugin.la
-${PLIST.x11}lib/vlc/plugins/codec/libpng_plugin.la
+lib/vlc/plugins/codec/libpng_plugin.la
 lib/vlc/plugins/codec/librawvideo_plugin.la
+${PLIST.sdl}lib/vlc/plugins/codec/libsdl_image_plugin.la
 lib/vlc/plugins/codec/libspudec_plugin.la
 lib/vlc/plugins/codec/libsubsdec_plugin.la
 lib/vlc/plugins/codec/libsubsusf_plugin.la
@@ -227,7 +229,7 @@ lib/vlc/plugins/misc/libgnutls_plugin.la
 ${PLIST.dbus}lib/vlc/plugins/misc/libinhibit_plugin.la
 lib/vlc/plugins/misc/liblogger_plugin.la
 ${PLIST.dbus}lib/vlc/plugins/misc/libnotify_plugin.la
-${PLIST.x11}lib/vlc/plugins/misc/libosd_parser_plugin.la
+lib/vlc/plugins/misc/libosd_parser_plugin.la
 lib/vlc/plugins/misc/libstats_plugin.la
 ${PLIST.dbus}lib/vlc/plugins/misc/libtelepathy_plugin.la
 lib/vlc/plugins/misc/libvod_rtsp_plugin.la
@@ -319,7 +321,7 @@ lib/vlc/plugins/video_filter/libmosaic_plugin.la
 lib/vlc/plugins/video_filter/libmotionblur_plugin.la
 lib/vlc/plugins/video_filter/libmotiondetect_plugin.la
 lib/vlc/plugins/video_filter/libnoise_plugin.la
-${PLIST.x11}lib/vlc/plugins/video_filter/libosdmenu_plugin.la
+lib/vlc/plugins/video_filter/libosdmenu_plugin.la
 ${PLIST.x11}lib/vlc/plugins/video_filter/libpanoramix_plugin.la
 lib/vlc/plugins/video_filter/libpostproc_plugin.la
 lib/vlc/plugins/video_filter/libpsychedelic_plugin.la
@@ -340,6 +342,7 @@ lib/vlc/plugins/video_filter/libwave_plugin.la
 lib/vlc/plugins/video_filter/libyuvp_plugin.la
 ${PLIST.x11}lib/vlc/plugins/video_output/libsnapshot_plugin.la
 lib/vlc/plugins/video_output/libvmem_plugin.la
+${PLIST.sdl}lib/vlc/plugins/video_output/libvout_sdl_plugin.la
 lib/vlc/plugins/video_output/libvout_wrapper_plugin.la
 ${PLIST.x11}lib/vlc/plugins/video_output/libxcb_glx_plugin.la
 ${PLIST.x11}lib/vlc/plugins/video_output/libxcb_window_plugin.la
diff --git a/multimedia/vlc/distinfo b/multimedia/vlc/distinfo
index 0f5f5498ee4..a26149f9dee 100644
--- a/multimedia/vlc/distinfo
+++ b/multimedia/vlc/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.53 2012/01/09 17:12:57 drochner Exp $
+$NetBSD: distinfo,v 1.54 2012/01/12 15:54:00 drochner Exp $
 
 SHA1 (vlc-1.1.13.tar.bz2) = 05bbc7ff427f3b919b29a45ce014caff9ba92648
 RMD160 (vlc-1.1.13.tar.bz2) = c5aa438a9085ddbf28e849df442b75475693290d
@@ -8,4 +8,5 @@ SHA1 (patch-ap) = 423b571ca8a1b740812aea021e331912ba34c868
 SHA1 (patch-ar) = 153164870e9dc50ad32106d9f8ebd25b35ed3dd3
 SHA1 (patch-as) = b53b074b2791d7bf69d5f09c7c32d873608f3086
 SHA1 (patch-at) = 5761ec0809d2b03511666ae81f7b4ae01b6f5930
+SHA1 (patch-au) = 7e1d1e7f2734051fffb988cc4ea01a1a7b264b78
 SHA1 (patch-modules_audio__output_pulse.c) = 994389b214f3e2b7b8b7ccaf3bb535a94523f81b
diff --git a/multimedia/vlc/options.mk b/multimedia/vlc/options.mk
index 578c8a7da25..896f341524c 100644
--- a/multimedia/vlc/options.mk
+++ b/multimedia/vlc/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.23 2012/01/10 12:37:32 drochner Exp $
+# $NetBSD: options.mk,v 1.24 2012/01/12 15:54:00 drochner Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.vlc
 PKG_SUPPORTED_OPTIONS=		debug faad dbus hal skins sdl pulseaudio x11 gnome dts
@@ -21,6 +21,8 @@ CONFIGURE_ARGS+=	--disable-pulse
 ## SDL backend support
 
 .if !empty(PKG_OPTIONS:Msdl)
+CONFIGURE_ARGS+=	--enable-sdl
+CONFIGURE_ARGS+=	--enable-sdl-image
 .include "../../devel/SDL/buildlink3.mk"
 .include "../../graphics/SDL_image/buildlink3.mk"
 PLIST.sdl=		yes
diff --git a/multimedia/vlc/patches/patch-au b/multimedia/vlc/patches/patch-au
new file mode 100644
index 00000000000..fd7d66c1c02
--- /dev/null
+++ b/multimedia/vlc/patches/patch-au
@@ -0,0 +1,17 @@
+$NetBSD: patch-au,v 1.13 2012/01/12 15:54:00 drochner Exp $
+
+--- modules/video_output/sdl.c.orig	2010-08-08 17:47:49.000000000 +0000
++++ modules/video_output/sdl.c
+@@ -42,10 +42,9 @@
+ #include <SDL.h>
+ 
+ #ifndef WIN32
+-# ifdef X_DISPLAY_MISSING
+-#  error Xlib required due to XInitThreads
+-# endif
++# ifdef HAVE_X11_XLIB_H
+ # include <vlc_xlib.h>
++# endif
+ #endif
+ 
+ /*****************************************************************************