pkg/45209: pkgsrc-2011Q2 - multimedia/vlc - Multiple issues

[Matthew Mondor <mm_lists%pulsar-zone.net@localhost>]

>Number:         45209
>Category:       pkg
>Synopsis:       pkgsrc-2011Q2 - multimedia/vlc - Multiple issues
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Tue Aug 02 01:45:01 +0000 2011
>Originator:     Matthew Mondor
>Release:        NetBSD 5.1_STABLE
>Organization:
>Environment:
System: NetBSD behemoth.xisop 5.1_STABLE NetBSD 5.1_STABLE (GENERIC_MM) #0: Mon 
Aug 1 12:19:58 EDT 2011 
root@behemoth.xisop:/usr/obj/sys/arch/i386/compile/GENERIC_MM i386
Architecture: i386
Machine: i386
>Description:

- When building against the SDL frontend only, there were errors which
  seem like the configuration script was broken in finding the X11
  development headers or that the code was misusing the
  configuration-set variables.  I'm not exactly sure if my fix is right
  (possibly that the configuration is the part to fix) but I add
  patch-au (attached) which solved this for me.
  The original code #error triggered otherwise.

- Again when using the SDL backend, the PLIST was missing files, which
  I add in the attached pkgsrc-stub diff.

- Although the SDL backend is apparently enabled by default in the
  configure script, it's best to explicitely enabled/disable in the
  options.mk file, which the diff also adds.

>How-To-Repeat:

Build VLC with only the SDL frontend.

>Fix:
Review/apply the attached diffs :)

--MP_/9S4qrVPdILIvjVuE2FIs9WX
Content-Type: text/plain
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename=patch-au

$Id$

Fix configuration test bug

--- ./modules/video_output/sdl.c.orig   2010-07-16 19:23:41.000000000 -0400
+++ ./modules/video_output/sdl.c        2011-07-29 19:04:17.000000000 -0400
@@ -42,11 +42,10 @@
 #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
 
 /*****************************************************************************
  * Module descriptor

--MP_/9S4qrVPdILIvjVuE2FIs9WX
Content-Type: text/plain
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename=multimedia-vlc-diff.txt

Index: multimedia/vlc/PLIST
===================================================================
RCS file: /nfs/ginseng/home/data/cvsup/netbsd/pkgsrc/multimedia/vlc/PLIST,v
retrieving revision 1.42
diff -u -p -r1.42 PLIST
--- multimedia/vlc/PLIST        7 Jun 2011 13:59:17 -0000       1.42
+++ multimedia/vlc/PLIST        29 Jul 2011 22:37:11 -0000
@@ -135,6 +135,7 @@ lib/vlc/plugins/audio_mixer/libfloat32_m
 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
@@ -155,6 +156,8 @@ lib/vlc/plugins/codec/liblibmpeg2_plugin
 lib/vlc/plugins/codec/liblpcm_plugin.la
 lib/vlc/plugins/codec/libmpeg_audio_plugin.la
 ${PLIST.x11}lib/vlc/plugins/codec/libpng_plugin.la
+${PLIST.sdl}lib/vlc/plugins/codec/libpng_plugin.la
+${PLIST.sdl}lib/vlc/plugins/codec/libsdl_image_plugin.la
 lib/vlc/plugins/codec/librawvideo_plugin.la
 lib/vlc/plugins/codec/libspudec_plugin.la
 lib/vlc/plugins/codec/libsubsdec_plugin.la
@@ -221,11 +224,13 @@ lib/vlc/plugins/misc/libaudioscrobbler_p
 lib/vlc/plugins/misc/libdummy_plugin.la
 lib/vlc/plugins/misc/libexport_plugin.la
 ${PLIST.x11}lib/vlc/plugins/misc/libfreetype_plugin.la
+${PLIST.sdl}lib/vlc/plugins/misc/libfreetype_plugin.la
 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
+${PLIST.sdl}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
@@ -318,6 +323,7 @@ lib/vlc/plugins/video_filter/libmotionbl
 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
+${PLIST.sdl}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
@@ -339,6 +345,7 @@ lib/vlc/plugins/video_filter/libyuvp_plu
 ${PLIST.x11}lib/vlc/plugins/video_output/libsnapshot_plugin.la
 lib/vlc/plugins/video_output/libvmem_plugin.la
 lib/vlc/plugins/video_output/libvout_wrapper_plugin.la
+${PLIST.sdl}lib/vlc/plugins/video_output/libvout_sdl_plugin.la
 ${PLIST.x11}lib/vlc/plugins/video_output/libxcb_glx_plugin.la
 ${PLIST.x11}lib/vlc/plugins/video_output/libxcb_window_plugin.la
 ${PLIST.x11}lib/vlc/plugins/video_output/libxcb_x11_plugin.la
Index: multimedia/vlc/distinfo
===================================================================
RCS file: /nfs/ginseng/home/data/cvsup/netbsd/pkgsrc/multimedia/vlc/distinfo,v
retrieving revision 1.45
diff -u -p -r1.45 distinfo
--- multimedia/vlc/distinfo     7 Jun 2011 13:59:17 -0000       1.45
+++ multimedia/vlc/distinfo     29 Jul 2011 23:07:01 -0000
@@ -9,4 +9,5 @@ SHA1 (patch-ap) = 423b571ca8a1b740812aea
 SHA1 (patch-ar) = 25d22167cef8b8fa2a07ef633de196726eb354d2
 SHA1 (patch-as) = b53b074b2791d7bf69d5f09c7c32d873608f3086
 SHA1 (patch-at) = 5761ec0809d2b03511666ae81f7b4ae01b6f5930
+SHA1 (patch-au) = 1f61fdae351ad7bec889915de806d1845d464824
 SHA1 (patch-configure) = 83f476cc71d795a69f787713a04471e078c0ec52
Index: multimedia/vlc/options.mk
===================================================================
RCS file: /nfs/ginseng/home/data/cvsup/netbsd/pkgsrc/multimedia/vlc/options.mk,v
retrieving revision 1.21
diff -u -p -r1.21 options.mk
--- multimedia/vlc/options.mk   6 Apr 2011 08:14:21 -0000       1.21
+++ multimedia/vlc/options.mk   29 Jul 2011 22:56:50 -0000
@@ -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

--MP_/9S4qrVPdILIvjVuE2FIs9WX--

>Unformatted:
 --MP_/9S4qrVPdILIvjVuE2FIs9WX
 Content-Type: text/plain; charset=US-ASCII
 Content-Transfer-Encoding: 7bit
 Content-Disposition: inline