Update to 0.8.6d (latest stable version), based on wip/vlc update done

by Adam Hoka (thank you!).

Changes between 0.8.6c and 0.8.6d:
----------------------------------------------------------

Various bugfixes:
* Mozilla plugin: supports a reasonable amount of MIME types on Windows
* Linux: Fixed S/PDIF passthrough with ALSA
* Automatic recovery on unexpected stream discontinuity (clock gap) occurrences in input
* Use field order (top/bottom) for correct bob/linear deinterlacing
* Fix invalid free in bookmarks loading code

Windows and Mac OS Binaries
* FLAC Security Update (CVE-2007-4619) to prevent multiple integer overflows

Active X plugin:
* Security update (VideoLAN-SA-0703)

Mac OS X Interface & Port:
* Apple Remote support on Mac OS X 10.5 Leopard with enhanced functionality
* Improved Video Output compatibility for Mac OS X 10.5 Leopard
* Improved behavior of the Fullscreen Controller and mode changes between
  Fullscreen and Windowed Video Output
* Softened the white flash artifacts that may appear during the transition
  of two different movies
* Support for current Ogg file formats
NOTE: This release requires Mac OS X 10.4 or higher. Mac OS X 10.3.9 is
not supported anymore.

Encoders:
* Improved H.264 encoding speed on Mac OS X

Other changes:
* The automatic updating facility was removed
* You now need to append --m3u-extvlcopt to your command line to enable
  EXTVLCOPT options parsing in m3u playlists.

...and more, see the NEWS file.

16 files changed, 141 insertions, 682 deletions

diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile
index 7c85837d989..73bb69ecb7f 100644
--- a/multimedia/vlc/Makefile
+++ b/multimedia/vlc/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.46 2007/10/31 15:35:30 sborrill Exp $
+# $NetBSD: Makefile,v 1.47 2008/02/20 13:11:00 xtraeme Exp $
 #
 
 DISTNAME=		vlc-${VLC_VER}
-PKGREVISION=		7
 CATEGORIES=		multimedia
 MASTER_SITES=		http://download.videolan.org/pub/videolan/vlc/${VLC_VER}/
 EXTRACT_SUFX=		.tar.bz2
@@ -17,56 +16,55 @@ USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
 PTHREAD_OPTS+=		require
 USE_LANGUAGES=		c c++
+USE_DIRS+=		xdg-1.4
 
-VLC_VER=		0.8.5
+VLC_VER=		0.8.6d
 
 .include "../../mk/bsd.prefs.mk"
-
 .include "options.mk"
 
 .if ${OPSYS} == "NetBSD"
 CONFIGURE_ARGS+=	--disable-vcd
 .endif
-BUILDLINK_API_DEPENDS.zlib+=	zlib>=1.2.0
+
+BUILDLINK_API_DEPENDS.zlib+=		zlib>=1.2.0
 BUILDLINK_API_DEPENDS.vcdimager+=	vcdimager>=0.7.20nb1
-BUILDLINK_API_DEPENDS.ffmpeg+=	ffmpeg>=0.4.8nb1 # Postprocess fix
 
 CONFIGURE_ARGS+=	--disable-speex # needs unstable 1.1.x branch
 CONFIGURE_ARGS+=	--disable-gtk
+CONFIGURE_ARGS+=	--enable-release
 CONFIGURE_ARGS+=	--disable-gnomevfs
 CONFIGURE_ARGS+=	--disable-gnutls
+CONFIGURE_ARGS+=	--with-ffmpeg-zlib
 CONFIGURE_ARGS+=	--disable-smb
-CONFIGURE_ARGS+=	--disable-mod
 CONFIGURE_ARGS+=	--disable-mpc
 CONFIGURE_ARGS+=	--disable-dts
-
-CONFIGURE_ARGS+=	--with-ffmpeg-tree=${BUILDLINK_PREFIX.ffmpeg}/lib
-CONFIGURE_ARGS+=	--with-ffmpeg-zlib
 CONFIGURE_ARGS+=	--enable-cddax
 CONFIGURE_ARGS+=	--enable-dvdread
 CONFIGURE_ARGS+=	--enable-faad
 CONFIGURE_ARGS+=	--enable-flac
 
+INSTALLATION_DIRS+=	${PREFIX}/share/vlc/http/dialogs \
+			${PREFIX}/share/vlc/http/images \
+			${PREFIX}/share/vlc/http/js \
+			${PREFIX}/share/vlc/http/old \
+			${PREFIX}/share/vlc/http/old/admin \
+			${PREFIX}/share/vlc/http/old/vlm \
+			${PREFIX}/share/vlc/http/requests \
+			${PREFIX}/share/vlc/osdmenu/default \
+			${PREFIX}/share/vlc/osdmenu/default/selected \
+			${PREFIX}/share/vlc/osdmenu/default/selection \
+			${PREFIX}/share/vlc/osdmenu/default/volume \
+			${PREFIX}/share/vlc/osdmenu/dvd/selected \
+			${PREFIX}/share/vlc/osdmenu/dvd/volume \
+			${PREFIX}/share/vlc/osdmenu/dvd/unselect \
+			${PREFIX}/share/vlc/osdmenu/dvd/selection \
+			${PREFIX}/share/vlc/skins2 \
+			${PREFIX}/share/vlc/skins2/fonts
+
 pre-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/vlc/http/dialogs
-	${INSTALL_DATA_DIR} ${PREFIX}/share/vlc/http/images
-	${INSTALL_DATA_DIR} ${PREFIX}/share/vlc/http/js
-	${INSTALL_DATA_DIR} ${PREFIX}/share/vlc/http/old
-	${INSTALL_DATA_DIR} ${PREFIX}/share/vlc/http/old/admin
-	${INSTALL_DATA_DIR} ${PREFIX}/share/vlc/http/old/vlm
-	${INSTALL_DATA_DIR} ${PREFIX}/share/vlc/http/requests
-	${INSTALL_DATA_DIR} ${PREFIX}/share/vlc/osdmenu/default
-	${INSTALL_DATA_DIR} ${PREFIX}/share/vlc/osdmenu/default/selected
-	${INSTALL_DATA_DIR} ${PREFIX}/share/vlc/osdmenu/default/selection
-	${INSTALL_DATA_DIR} ${PREFIX}/share/vlc/osdmenu/default/volume
-	${INSTALL_DATA_DIR} ${PREFIX}/share/vlc/osdmenu/dvd/selected
-	${INSTALL_DATA_DIR} ${PREFIX}/share/vlc/osdmenu/dvd/volume
-	${INSTALL_DATA_DIR} ${PREFIX}/share/vlc/osdmenu/dvd/unselect
-	${INSTALL_DATA_DIR} ${PREFIX}/share/vlc/osdmenu/dvd/selection
-	${INSTALL_DATA_DIR} ${PREFIX}/share/vlc/skins2
-	${INSTALL_DATA_DIR} ${PREFIX}/share/vlc/skins2/fonts
-	${INSTALL_DATA} ${WRKSRC}/doc/vlc.1 ${PREFIX}/${PKGMANDIR}/man1
-	${INSTALL_DATA} ${WRKSRC}/doc/vlc-config.1 ${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_DATA} ${WRKSRC}/doc/vlc.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_DATA} ${WRKSRC}/doc/vlc-config.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 
 ORIGFNT=		/usr/share/fonts/truetype/freefont/FreeSerifBold.ttf
 DEFAULT_FONT?=		${X11BASE}/lib/X11/fonts/TTF/luximb.ttf
@@ -86,8 +84,6 @@ SUBST_SED.fnt=		-e "s,${ORIGFNT},${DEFAULT_FONT},"
 SUBST_FILES.fnt=	modules/misc/freetype.c
 SUBST_MESSAGE.fnt=	Fixing hardcoded paths.
 
-BUILDLINK_FNAME_TRANSFORM.ffmpeg+=	-e "s,include/ffmpeg,include/,g"
-
 .if ${OPSYS} == "NetBSD"
 PLIST_SUBST+=		COND_CDDA="@comment "
 PLIST_SUBST+=		COND_VCD="@comment "
@@ -114,7 +110,7 @@ CONFIGURE_ARGS+=	x_libraries=${PREFIX}/lib
 .include "../../graphics/SDL_image/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../misc/libcdio/buildlink3.mk"
-.include "../../multimedia/ffmpeg/buildlink3.mk"
+.include "../../multimedia/ffmpeg-devel/buildlink3.mk"
 .include "../../multimedia/libdvdplay/buildlink3.mk"
 .include "../../multimedia/libdvbpsi/buildlink3.mk"
 .include "../../multimedia/libdvdnav/buildlink3.mk"
@@ -125,6 +121,8 @@ CONFIGURE_ARGS+=	x_libraries=${PREFIX}/lib
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../x11/libXv/buildlink3.mk"
 .include "../../x11/libXxf86vm/buildlink3.mk"
+.include "../../x11/libXdamage/buildlink3.mk"
+.include "../../x11/libdrm/buildlink3.mk"
 
 .include "../../mk/oss.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
diff --git a/multimedia/vlc/PLIST b/multimedia/vlc/PLIST
index 608e3ce50e8..0fcacebf020 100644
--- a/multimedia/vlc/PLIST
+++ b/multimedia/vlc/PLIST
@@ -1,8 +1,7 @@
-@comment $NetBSD: PLIST,v 1.8 2007/10/31 15:35:30 sborrill Exp $
+@comment $NetBSD: PLIST,v 1.9 2008/02/20 13:11:00 xtraeme Exp $
 bin/vlc
-${COND_SKINS}bin/svlc
 bin/vlc-config
-${COND_WXWIDGETS}bin/wxvlc
+bin/wxvlc
 include/vlc/aout.h
 include/vlc/decoder.h
 include/vlc/input.h
@@ -22,12 +21,11 @@ lib/vlc/access/libaccess_http_plugin.so
 lib/vlc/access/libaccess_mms_plugin.so
 lib/vlc/access/libaccess_tcp_plugin.so
 lib/vlc/access/libaccess_udp_plugin.so
-${COND_CDDA}lib/vlc/access/libcdda_plugin.so
 lib/vlc/access/libcddax_plugin.so
 lib/vlc/access/libdvdnav_plugin.so
 lib/vlc/access/libdvdread_plugin.so
 lib/vlc/access/libscreen_plugin.so
-${COND_VCD}lib/vlc/access/libvcd_plugin.so
+lib/vlc/access_filter/libaccess_filter_dump_plugin.so
 lib/vlc/access_filter/libaccess_filter_record_plugin.so
 lib/vlc/access_filter/libaccess_filter_timeshift_plugin.so
 lib/vlc/access_output/libaccess_output_dummy_plugin.so
@@ -88,6 +86,7 @@ lib/vlc/codec/libsdl_image_plugin.so
 lib/vlc/codec/libspudec_plugin.so
 lib/vlc/codec/libsubsdec_plugin.so
 lib/vlc/codec/libsvcdsub_plugin.so
+lib/vlc/codec/libtelx_plugin.so
 lib/vlc/codec/libvorbis_plugin.so
 lib/vlc/control/libgestures_plugin.so
 lib/vlc/control/libhotkeys_plugin.so
@@ -110,6 +109,7 @@ lib/vlc/demux/libm3u_plugin.so
 lib/vlc/demux/libm4a_plugin.so
 lib/vlc/demux/libm4v_plugin.so
 lib/vlc/demux/libmjpeg_plugin.so
+lib/vlc/demux/libmkv_plugin.so
 lib/vlc/demux/libmp4_plugin.so
 lib/vlc/demux/libmpga_plugin.so
 lib/vlc/demux/libmpgv_plugin.so
@@ -125,13 +125,13 @@ lib/vlc/demux/libreal_plugin.so
 lib/vlc/demux/libsgimb_plugin.so
 lib/vlc/demux/libsubtitle_plugin.so
 lib/vlc/demux/libts_plugin.so
+lib/vlc/demux/libtta_plugin.so
 lib/vlc/demux/libty_plugin.so
 lib/vlc/demux/libvobsub_plugin.so
 lib/vlc/demux/libvoc_plugin.so
 lib/vlc/demux/libwav_plugin.so
 lib/vlc/demux/libxa_plugin.so
-${COND_SKINS}lib/vlc/gui/libskins2_plugin.so
-${COND_WXWIDGETS}lib/vlc/gui/libwxwidgets_plugin.so
+lib/vlc/gui/libwxwidgets_plugin.so
 lib/vlc/libffmpeg.a
 lib/vlc/libi420_rgb_mmx.a
 lib/vlc/libi420_ymga_mmx.a
@@ -140,7 +140,6 @@ lib/vlc/libi422_yuy2_mmx.a
 lib/vlc/libmemcpy3dn.a
 lib/vlc/libmemcpymmx.a
 lib/vlc/libmemcpymmxext.a
-lib/vlc/libmkv.a
 lib/vlc/libmux_ts.a
 lib/vlc/libstream_out_switcher.a
 lib/vlc/misc/libdummy_plugin.so
@@ -215,16 +214,24 @@ lib/vlc/video_output/libxvideo_plugin.so
 lib/vlc/visualization/libvisual_plugin.so
 man/man1/vlc-config.1
 man/man1/vlc.1
+share/applications/vlc.desktop
 share/doc/vlc/bugreport-howto.txt
 share/doc/vlc/fortunes.txt
 share/doc/vlc/intf-cdda.txt
 share/doc/vlc/intf-vcd.txt
+share/locale/af/LC_MESSAGES/vlc.mo
+share/locale/ar/LC_MESSAGES/vlc.mo
 share/locale/ca/LC_MESSAGES/vlc.mo
+share/locale/co/LC_MESSAGES/vlc.mo
+share/locale/cs/LC_MESSAGES/vlc.mo
 share/locale/da/LC_MESSAGES/vlc.mo
 share/locale/de/LC_MESSAGES/vlc.mo
 share/locale/en_GB/LC_MESSAGES/vlc.mo
 share/locale/es/LC_MESSAGES/vlc.mo
+share/locale/eu/LC_MESSAGES/vlc.mo
+share/locale/fa/LC_MESSAGES/vlc.mo
 share/locale/fr/LC_MESSAGES/vlc.mo
+share/locale/fur/LC_MESSAGES/vlc.mo
 share/locale/gl/LC_MESSAGES/vlc.mo
 share/locale/he/LC_MESSAGES/vlc.mo
 share/locale/hi/LC_MESSAGES/vlc.mo
@@ -233,12 +240,24 @@ share/locale/it/LC_MESSAGES/vlc.mo
 share/locale/ja/LC_MESSAGES/vlc.mo
 share/locale/ka/LC_MESSAGES/vlc.mo
 share/locale/ko/LC_MESSAGES/vlc.mo
+share/locale/lt/LC_MESSAGES/vlc.mo
+share/locale/lv/LC_MESSAGES/vlc.mo
+share/locale/ms/LC_MESSAGES/vlc.mo
+share/locale/nb/LC_MESSAGES/vlc.mo
+share/locale/ne/LC_MESSAGES/vlc.mo
 share/locale/nl/LC_MESSAGES/vlc.mo
+share/locale/nn/LC_MESSAGES/vlc.mo
 share/locale/oc/LC_MESSAGES/vlc.mo
+share/locale/pa/LC_MESSAGES/vlc.mo
+share/locale/pl/LC_MESSAGES/vlc.mo
 share/locale/pt_BR/LC_MESSAGES/vlc.mo
 share/locale/ro/LC_MESSAGES/vlc.mo
 share/locale/ru/LC_MESSAGES/vlc.mo
+share/locale/sk/LC_MESSAGES/vlc.mo
+share/locale/sl/LC_MESSAGES/vlc.mo
+share/locale/sq/LC_MESSAGES/vlc.mo
 share/locale/sv/LC_MESSAGES/vlc.mo
+share/locale/th/LC_MESSAGES/vlc.mo
 share/locale/tr/LC_MESSAGES/vlc.mo
 share/locale/zh_CN/LC_MESSAGES/vlc.mo
 share/locale/zh_TW/LC_MESSAGES/vlc.mo
@@ -279,6 +298,7 @@ share/vlc/http/images/slider_left.png
 share/vlc/http/images/slider_point.png
 share/vlc/http/images/slider_right.png
 share/vlc/http/images/slow.png
+share/vlc/http/images/snapshot.png
 share/vlc/http/images/sort.png
 share/vlc/http/images/sout.png
 share/vlc/http/images/speaker.png
@@ -418,7 +438,12 @@ share/vlc/vlc48x48.png
 @dirrm share/vlc/http/dialogs
 @dirrm share/vlc/http
 @dirrm share/vlc
+@dirrm share/locale/fur/LC_MESSAGES
+@dirrm share/locale/fur
+@dirrm share/locale/co/LC_MESSAGES
+@dirrm share/locale/co
 @dirrm share/doc/vlc
+@comment in xdg-dirs: @dirrm share/applications
 @dirrm lib/vlc/visualization
 @dirrm lib/vlc/video_output
 @dirrm lib/vlc/video_filter
diff --git a/multimedia/vlc/buildlink3.mk b/multimedia/vlc/buildlink3.mk
index d923b50f5fa..379fc367460 100644
--- a/multimedia/vlc/buildlink3.mk
+++ b/multimedia/vlc/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.15 2006/09/27 06:02:00 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2008/02/20 13:11:00 xtraeme Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 VLC_BUILDLINK3_MK:=	${VLC_BUILDLINK3_MK}+
@@ -12,11 +12,12 @@ BUILDLINK_PACKAGES+=	vlc
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}vlc
 
 .if ${VLC_BUILDLINK3_MK} == "+"
-BUILDLINK_API_DEPENDS.vlc+=	vlc>=0.8.5nb4
-BUILDLINK_PKGSRCDIR.vlc?=	../../multimedia/vlc
+BUILDLINK_API_DEPENDS.vlc+=	vlc>=0.8.6d
+BUILDLINK_PKGSRCDIR.vlc?=	../../wip/vlc
 .endif	# VLC_BUILDLINK3_MK
 
 .include "../../audio/faad2/buildlink3.mk"
+.include "../../audio/flac/buildlink3.mk"
 .include "../../audio/lame/buildlink3.mk"
 .include "../../audio/liba52/buildlink3.mk"
 .include "../../audio/libcddb/buildlink3.mk"
@@ -29,14 +30,16 @@ BUILDLINK_PKGSRCDIR.vlc?=	../../multimedia/vlc
 .include "../../graphics/SDL_image/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../misc/libcdio/buildlink3.mk"
-.include "../../multimedia/ffmpeg/buildlink3.mk"
+.include "../../wip/ffmpeg-devel/buildlink3.mk"
 .include "../../multimedia/libdvdplay/buildlink3.mk"
+.include "../../multimedia/libdvbpsi/buildlink3.mk"
 .include "../../multimedia/libdvdnav/buildlink3.mk"
 .include "../../multimedia/libdvdread/buildlink3.mk"
 .include "../../multimedia/libmatroska/buildlink3.mk"
 .include "../../multimedia/libmpeg2/buildlink3.mk"
 .include "../../multimedia/libogg/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
-.include "../../x11/wxGTK/buildlink3.mk"
+.include "../../x11/libXv/buildlink3.mk"
+.include "../../x11/libXxf86vm/buildlink3.mk"
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/multimedia/vlc/distinfo b/multimedia/vlc/distinfo
index 1e942c0c04d..d23904c3753 100644
--- a/multimedia/vlc/distinfo
+++ b/multimedia/vlc/distinfo
@@ -1,16 +1,8 @@
-$NetBSD: distinfo,v 1.12 2007/06/22 14:32:24 lkundrak Exp $
+$NetBSD: distinfo,v 1.13 2008/02/20 13:11:00 xtraeme Exp $
 
-SHA1 (vlc-0.8.5.tar.bz2) = 2f0a26a336a5211f32c7bcc653dfd0b27f1fb26b
-RMD160 (vlc-0.8.5.tar.bz2) = d24140a5b4bf771754028090e103bb5c171e4fd8
-Size (vlc-0.8.5.tar.bz2) = 8562996 bytes
-SHA1 (patch-aa) = a12d95fc0d6266969431a3c42d438b3cc11acc79
-SHA1 (patch-ab) = 3a0754638228d664570c7c437b5188195b23c734
-SHA1 (patch-ad) = 374f8deb5179c72b4055cdbd37d318a44b3c9e7e
-SHA1 (patch-ag) = 44061c0018d97c45d4edfdb2a16192f3c99024f8
-SHA1 (patch-ah) = 5a355a70b7b39c0a33db7cc37e3944f903686d3f
-SHA1 (patch-ai) = 655df187ab529eb30753531dafbf4b68f7a85785
-SHA1 (patch-aj) = ff16b192696f7a8517b2bf343697cb81c6041015
-SHA1 (patch-ak) = e9d9a6073134861033cb10820ec2307d3ca42e3d
-SHA1 (patch-al) = d363baa7a1d4150b2b12376652650295e546f0fe
-SHA1 (patch-am) = 7d212c47879c718a7685fe94660c9fa71a02f4c3
-SHA1 (patch-an) = 6388e50ad6b7c4cc6860759d514ca691b996ee45
+SHA1 (vlc-0.8.6d.tar.bz2) = 63afd15cc782795c8d8f3de5edc614389465c577
+RMD160 (vlc-0.8.6d.tar.bz2) = 16c1998dbc30ad96bebdd8792d135b5f7899166e
+Size (vlc-0.8.6d.tar.bz2) = 11170003 bytes
+SHA1 (patch-aa) = 497a83bb0f1e2c095a81aa84115e66b56dd47e2c
+SHA1 (patch-ab) = c311b82c00f1eea164189a9759c9ca576faec671
+SHA1 (patch-ac) = 54526feb8f88cd1f61e40abd62ed5f68ce6b934b
diff --git a/multimedia/vlc/patches/patch-aa b/multimedia/vlc/patches/patch-aa
index f9db0037bef..b0b81319f0b 100644
--- a/multimedia/vlc/patches/patch-aa
+++ b/multimedia/vlc/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.4 2006/09/26 07:27:19 martti Exp $
+$NetBSD: patch-aa,v 1.5 2008/02/20 13:11:00 xtraeme Exp $
 
---- include/vlc_common.h.orig	2006-05-19 19:46:18.000000000 +0000
-+++ include/vlc_common.h
-@@ -873,7 +873,7 @@ static inline void _SetQWBE( uint8_t *p,
- #   define vlc_strtoll NULL
- #endif
+--- configure.orig	2007-11-27 20:22:58.000000000 +0100
++++ configure
+@@ -64116,7 +64116,7 @@ fi
  
--#if defined(SYS_BEOS)
-+#if defined(SYS_BEOS) || defined(__DragonFly__)
-     typedef struct {
-         long long quot; /* Quotient. */
-         long long rem;  /* Remainder. */
+ if test "${enable_java_bindings}" = "yes"
+ then
+-  if test "x${JAVA_HOME}" == "x"; then
++  if test "x${JAVA_HOME}" = "x"; then
+   { { echo "$as_me:$LINENO: error: Please set the JAVA_HOME variable to your JDK environment" >&5
+ echo "$as_me: error: Please set the JAVA_HOME variable to your JDK environment" >&2;}
+    { (exit 1); exit 1; }; }
diff --git a/multimedia/vlc/patches/patch-ab b/multimedia/vlc/patches/patch-ab
index cc10f25e144..500604272b1 100644
--- a/multimedia/vlc/patches/patch-ab
+++ b/multimedia/vlc/patches/patch-ab
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.2 2006/09/26 07:27:19 martti Exp $
+$NetBSD: patch-ab,v 1.3 2008/02/20 13:11:00 xtraeme Exp $
 
---- src/extras/libc.c.orig	2006-05-19 20:06:19.000000000 +0000
-+++ src/extras/libc.c
-@@ -346,7 +346,7 @@ int64_t vlc_atoll( const char *nptr )
- /*****************************************************************************
-  * lldiv: returns quotient and remainder
-  *****************************************************************************/
--#if defined(SYS_BEOS)
-+#if defined(SYS_BEOS) || defined(__DragonFly__)
- lldiv_t vlc_lldiv( long long numer, long long denom )
- {
-     lldiv_t d;
+--- modules/gui/wxwidgets/dialogs.cpp.orig	2007-11-26 14:08:05.000000000 +0100
++++ modules/gui/wxwidgets/dialogs.cpp
+@@ -376,7 +376,7 @@ void DialogsProvider::OnOpenFileGeneric(
+     {
+         p_file_generic_dialog->SetMessage( wxU(p_arg->psz_title) );
+         p_file_generic_dialog->SetWildcard( wxU(p_arg->psz_extensions) );
+-        p_file_generic_dialog->SetStyle( (p_arg->b_save ? wxSAVE : wxOPEN) |
++        p_file_generic_dialog->SetWindowStyle( (p_arg->b_save ? wxSAVE : wxOPEN) |
+                                          (p_arg->b_multiple ? wxMULTIPLE:0) );
+     }
+ 
diff --git a/multimedia/vlc/patches/patch-ac b/multimedia/vlc/patches/patch-ac
new file mode 100644
index 00000000000..a66bf64bf94
--- /dev/null
+++ b/multimedia/vlc/patches/patch-ac
@@ -0,0 +1,40 @@
+$NetBSD: patch-ac,v 1.3 2008/02/20 13:11:00 xtraeme Exp $
+
+--- include/vlc_threads_funcs.h.orig	2007-11-26 14:08:12.000000000 +0100
++++ include/vlc_threads_funcs.h
+@@ -111,7 +111,7 @@ static inline int __vlc_mutex_lock( cons
+     i_result = pthread_mutex_lock( &p_mutex->mutex );
+     if ( i_result )
+     {
+-        i_thread = (int)pthread_self();
++        i_thread = (intptr_t)pthread_self();
+         psz_error = strerror(i_result);
+     }
+ 
+@@ -184,7 +184,7 @@ static inline int __vlc_mutex_unlock( co
+     i_result = pthread_mutex_unlock( &p_mutex->mutex );
+     if ( i_result )
+     {
+-        i_thread = (int)pthread_self();
++        i_thread = (intptr_t)pthread_self();
+         psz_error = strerror(i_result);
+     }
+ 
+@@ -322,7 +322,7 @@ static inline int __vlc_cond_signal( con
+     i_result = pthread_cond_signal( &p_condvar->cond );
+     if ( i_result )
+     {
+-        i_thread = (int)pthread_self();
++        i_thread = (intptr_t)pthread_self();
+         psz_error = strerror(i_result);
+     }
+ 
+@@ -512,7 +512,7 @@ static inline int __vlc_cond_wait( const
+ 
+     if ( i_result )
+     {
+-        i_thread = (int)pthread_self();
++        i_thread = (intptr_t)pthread_self();
+         psz_error = strerror(i_result);
+     }
+ 
diff --git a/multimedia/vlc/patches/patch-ad b/multimedia/vlc/patches/patch-ad
deleted file mode 100644
index 0bca85fa98e..00000000000
--- a/multimedia/vlc/patches/patch-ad
+++ /dev/null
@@ -1,165 +0,0 @@
-$NetBSD: patch-ad,v 1.3 2007/01/13 07:32:36 wiz Exp $
-
---- modules/codec/flac.c.orig	2006-05-06 15:52:19.000000000 +0000
-+++ modules/codec/flac.c
-@@ -33,6 +33,12 @@
- #   include <FLAC/stream_decoder.h>
- #   include <FLAC/stream_encoder.h>
- #   define USE_LIBFLAC
-+    /* by LEGACY_FLAC we mean before FLAC 1.1.3 when the decoder/encoder APIs were simplified */
-+#   if !defined(FLAC_API_VERSION_CURRENT) || FLAC_API_VERSION_CURRENT < 8
-+#      define LEGACY_FLAC
-+#   else
-+#      undef LEGACY_FLAC
-+#   endif
- #endif
- 
- #include "vlc_block_helper.h"
-@@ -133,7 +139,12 @@ static int SyncInfo( decoder_t *, uint8_
- #ifdef USE_LIBFLAC
- static FLAC__StreamDecoderReadStatus
- DecoderReadCallback( const FLAC__StreamDecoder *decoder,
--                     FLAC__byte buffer[], unsigned *bytes, void *client_data );
-+#ifdef LEGACY_FLAC
-+                     FLAC__byte buffer[], unsigned *bytes,
-+#else
-+                     FLAC__byte buffer[], size_t *bytes,
-+#endif
-+                     void *client_data );
- 
- static FLAC__StreamDecoderWriteStatus
- DecoderWriteCallback( const FLAC__StreamDecoder *decoder,
-@@ -223,6 +234,7 @@ static int OpenDecoder( vlc_object_t *p_
-         return VLC_EGENERIC;
-     }
- 
-+#ifdef LEGACY_FLAC
-     FLAC__stream_decoder_set_read_callback( p_sys->p_flac,
-                                             DecoderReadCallback );
-     FLAC__stream_decoder_set_write_callback( p_sys->p_flac,
-@@ -233,7 +245,12 @@ static int OpenDecoder( vlc_object_t *p_
-                                              DecoderErrorCallback );
-     FLAC__stream_decoder_set_client_data( p_sys->p_flac, p_dec );
- 
-+    /* really should check the return value here */
-     FLAC__stream_decoder_init( p_sys->p_flac );
-+#else
-+    /* really should check the return value here */
-+    FLAC__stream_decoder_init_stream( p_sys->p_flac, DecoderReadCallback, NULL, NULL, NULL, NULL, DecoderWriteCallback, DecoderMetadataCallback, DecoderErrorCallback, p_dec );
-+#endif
- #endif
- 
-     /* Set output properties */
-@@ -535,7 +552,12 @@ static aout_buffer_t *DecodeBlock( decod
-  *****************************************************************************/
- static FLAC__StreamDecoderReadStatus
- DecoderReadCallback( const FLAC__StreamDecoder *decoder, FLAC__byte buffer[],
--                     unsigned *bytes, void *client_data )
-+#ifdef LEGACY_FLAC
-+                     unsigned *bytes,
-+#else
-+                     size_t *bytes,
-+#endif
-+                     void *client_data )
- {
-     decoder_t *p_dec = (decoder_t *)client_data;
-     decoder_sys_t *p_sys = p_dec->p_sys;
-@@ -660,6 +682,11 @@ static void DecoderErrorCallback( const 
-         msg_Err( p_dec, "frame's data did not match the CRC in the "
-                  "footer." );
-         break;
-+#ifndef LEGACY_FLAC
-+    case FLAC__STREAM_DECODER_ERROR_STATUS_UNPARSEABLE_STREAM:
-+        msg_Err( p_dec, "the decoder encountered reserved fields in use in the stream." );
-+        break;
-+#endif
-     default:
-         msg_Err( p_dec, "got decoder error: %d", status );
-     }
-@@ -722,16 +749,11 @@ static void decoder_state_error( decoder
-     case FLAC__STREAM_DECODER_END_OF_STREAM:
-         msg_Dbg( p_dec, "the decoder has reached the end of the stream." );
-         break;
--    case FLAC__STREAM_DECODER_ABORTED:
--        msg_Warn( p_dec, "the decoder was aborted by the read callback." );
--        break;
-+#ifdef LEGACY_FLAC
-     case FLAC__STREAM_DECODER_UNPARSEABLE_STREAM:
-         msg_Warn( p_dec, "the decoder encountered reserved fields in use "
-                  "in the stream." );
-         break;
--    case FLAC__STREAM_DECODER_MEMORY_ALLOCATION_ERROR:
--        msg_Err( p_dec, "error when allocating memory." );
--        break;
-     case FLAC__STREAM_DECODER_ALREADY_INITIALIZED:
-         msg_Err( p_dec, "FLAC__stream_decoder_init() was called when the "
-                  "decoder was already initialized, usually because "
-@@ -741,6 +763,20 @@ static void decoder_state_error( decoder
-         msg_Err( p_dec, "FLAC__stream_decoder_init() was called without "
-                  "all callbacks being set." );
-         break;
-+#else
-+    case FLAC__STREAM_DECODER_OGG_ERROR:
-+        msg_Warn( p_dec, "an error occurred in the underlying Ogg layer." );
-+        break;
-+    case FLAC__STREAM_DECODER_SEEK_ERROR:
-+        msg_Warn( p_dec, "an error occurred while seeking." );
-+        break;
-+#endif
-+    case FLAC__STREAM_DECODER_ABORTED:
-+        msg_Warn( p_dec, "the decoder was aborted by the read callback." );
-+        break;
-+    case FLAC__STREAM_DECODER_MEMORY_ALLOCATION_ERROR:
-+        msg_Err( p_dec, "error when allocating memory." );
-+        break;
-     case FLAC__STREAM_DECODER_UNINITIALIZED:
-         msg_Err( p_dec, "decoder in uninitialized state." );
-         break;
-@@ -1138,7 +1174,11 @@ static block_t *Encode( encoder_t *, aou
- static FLAC__StreamEncoderWriteStatus
- EncoderWriteCallback( const FLAC__StreamEncoder *encoder,
-                       const FLAC__byte buffer[],
-+#ifdef LEGACY_FLAC
-                       unsigned bytes, unsigned samples,
-+#else
-+                      size_t bytes, unsigned samples,
-+#endif
-                       unsigned current_frame, void *client_data );
- 
- static void EncoderMetadataCallback( const FLAC__StreamEncoder *encoder,
-@@ -1185,15 +1225,23 @@ static int OpenEncoder( vlc_object_t *p_
-     FLAC__stream_encoder_set_bits_per_sample( p_sys->p_flac, 16 );
-     p_enc->fmt_in.i_codec = AOUT_FMT_S16_NE;
- 
-+#ifdef LEGACY_FLAC
-     FLAC__stream_encoder_set_write_callback( p_sys->p_flac,
-         EncoderWriteCallback );
-     FLAC__stream_encoder_set_metadata_callback( p_sys->p_flac,
-         EncoderMetadataCallback );
-     FLAC__stream_encoder_set_client_data( p_sys->p_flac, p_enc );
-+#endif
- 
-     /* Get and store the STREAMINFO metadata block as a p_extra */
-     p_sys->p_chain = 0;
-+#ifdef LEGACY_FLAC
-+    /* really should check the return value here */
-     FLAC__stream_encoder_init( p_sys->p_flac );
-+#else
-+    /* really should check the return value here */
-+    FLAC__stream_encoder_init_stream( p_sys->p_flac, EncoderWriteCallback, NULL, NULL, EncoderMetadataCallback, p_enc );
-+#endif
- 
-     return VLC_SUCCESS;
- }
-@@ -1270,7 +1318,11 @@ static void EncoderMetadataCallback( con
- static FLAC__StreamEncoderWriteStatus
- EncoderWriteCallback( const FLAC__StreamEncoder *encoder,
-                       const FLAC__byte buffer[],
-+#ifdef LEGACY_FLAC
-                       unsigned bytes, unsigned samples,
-+#else
-+                      size_t bytes, unsigned samples,
-+#endif
-                       unsigned current_frame, void *client_data )
- {
-     encoder_t *p_enc = (encoder_t *)client_data;
diff --git a/multimedia/vlc/patches/patch-ag b/multimedia/vlc/patches/patch-ag
deleted file mode 100644
index 77ce033c73b..00000000000
--- a/multimedia/vlc/patches/patch-ag
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ag,v 1.2 2007/01/13 07:32:36 wiz Exp $
-
---- modules/gui/wxwidgets/menus.cpp.orig	2006-05-04 14:22:54.000000000 +0200
-+++ modules/gui/wxwidgets/menus.cpp
-@@ -1013,7 +1013,6 @@ void MenuEvtHandler::OnMenuEvent( wxComm
-                                        p_menuitemext->i_object_id );
-         if( p_object == NULL ) return;
- 
--        wxMutexGuiLeave(); // We don't want deadlocks
-         var_Set( p_object, p_menuitemext->psz_var, p_menuitemext->val );
-         //wxMutexGuiEnter();
- 
diff --git a/multimedia/vlc/patches/patch-ah b/multimedia/vlc/patches/patch-ah
deleted file mode 100644
index edac89481bd..00000000000
--- a/multimedia/vlc/patches/patch-ah
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2006/09/26 07:27:19 martti Exp $
-
---- src/misc/charset.c.orig	2006-05-06 17:52:13.000000000 +0200
-+++ src/misc/charset.c
-@@ -37,10 +37,9 @@
- #if !defined WIN32
- # if HAVE_LANGINFO_CODESET
- #  include <langinfo.h>
--# else
--#  if HAVE_SETLOCALE
--#   include <locale.h>
--#  endif
-+# endif
-+# if HAVE_SETLOCALE
-+#  include <locale.h>
- # endif
- #elif defined WIN32
- # include <windows.h>
diff --git a/multimedia/vlc/patches/patch-ai b/multimedia/vlc/patches/patch-ai
deleted file mode 100644
index dc52decfc38..00000000000
--- a/multimedia/vlc/patches/patch-ai
+++ /dev/null
@@ -1,202 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2006/09/26 07:27:19 martti Exp $
-
---- configure.orig	2006-05-06 15:54:17.000000000 +0000
-+++ configure
-@@ -30035,13 +30035,13 @@ fi
- if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"; then
- THREAD_LIB=error
- if test "${THREAD_LIB}" = "error"; then
--  echo "$as_me:$LINENO: checking for main in -lpthread" >&5
--echo $ECHO_N "checking for main in -lpthread... $ECHO_C" >&6
-+  echo "$as_me:$LINENO: checking for main in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" >&5
-+echo $ECHO_N "checking for main in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}... $ECHO_C" >&6
- if test "${ac_cv_lib_pthread_main+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lpthread  $LIBS"
-+LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -30093,7 +30093,7 @@ fi
- echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_main" >&5
- echo "${ECHO_T}$ac_cv_lib_pthread_main" >&6
- if test $ac_cv_lib_pthread_main = yes; then
--  THREAD_LIB="-lpthread"
-+  THREAD_LIB="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}"
- fi
- 
- fi
-@@ -36628,7 +36628,7 @@ fi;
- test "${enable_debug}" != "yes" && enable_debug="no"
- 
- 
--if test "x${enable_debug}" == "xno"; then
-+if test "x${enable_debug}" = "xno"; then
-   cat >>confdefs.h <<\_ACEOF
- #define NDEBUG 1
- _ACEOF
-@@ -37311,7 +37311,7 @@ echo "${ECHO_T}yes" >&6
- 
- 
-   for element in access_dv; do
--    eval "LDFLAGS_${element}="'"'"-L${with_dv_raw1394}/lib -lraw1394 -lpthread "'$'"{LDFLAGS_${element}} "'"'
-+    eval "LDFLAGS_${element}="'"'"-L${with_dv_raw1394}/lib -lraw1394 ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} "'$'"{LDFLAGS_${element}} "'"'
-     am_modules_with_ldflags="${am_modules_with_ldflags} ${element}"
-   done
- 
-@@ -37563,7 +37563,7 @@ echo $ECHO_N "checking for avc1394 heade
- echo "${ECHO_T}yes" >&6
- 
-   for element in access_dv; do
--    eval "LDFLAGS_${element}="'"'"-L${with_dv_avc1394}/lib -lavc1394 -lrom1394 -lpthread "'$'"{LDFLAGS_${element}} "'"'
-+    eval "LDFLAGS_${element}="'"'"-L${with_dv_avc1394}/lib -lavc1394 -lrom1394 ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} "'$'"{LDFLAGS_${element}} "'"'
-     am_modules_with_ldflags="${am_modules_with_ldflags} ${element}"
-   done
- 
-@@ -37727,7 +37727,7 @@ if test `eval echo '${'$as_ac_Header'}'`
- _ACEOF
- 
-   for element in access_dv; do
--    eval "LDFLAGS_${element}="'"'"-lavc1394 -lrom1394 -lpthread "'$'"{LDFLAGS_${element}} "'"'
-+    eval "LDFLAGS_${element}="'"'"-lavc1394 -lrom1394 ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} "'$'"{LDFLAGS_${element}} "'"'
-     am_modules_with_ldflags="${am_modules_with_ldflags} ${element}"
-   done
- 
-@@ -37766,7 +37766,7 @@ echo "$as_me: error: cannot cd to ${real
- echo "${ECHO_T}${real_dv_avc1394_tree}/src/.libs/libavc1394.a" >&6
- 
-   for element in access_dv; do
--    eval "LDFLAGS_${element}="'"'"-L${real_dv_avc1394_tree}/src/.libs -lavc1394 -lrom1394 -lpthread "'$'"{LDFLAGS_${element}} "'"'
-+    eval "LDFLAGS_${element}="'"'"-L${real_dv_avc1394_tree}/src/.libs -lavc1394 -lrom1394 ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} "'$'"{LDFLAGS_${element}} "'"'
-     am_modules_with_ldflags="${am_modules_with_ldflags} ${element}"
-   done
- 
-@@ -43126,14 +43126,14 @@ echo "${ECHO_T}no" >&6
- echo "$as_me: error: cannot cd to ${with_ffmpeg_tree}" >&2;}
-    { (exit 1); exit 1; }; }
-    fi
--   if ! test -f "${real_ffmpeg_tree}/libavcodec/libavcodec.a"; then
-+   if ! test -f "${real_ffmpeg_tree}/libavcodec.a"; then
-           echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6
--     { { echo "$as_me:$LINENO: error: cannot find ${real_ffmpeg_tree}/libavcodec/libavcodec.a, make sure you compiled libavcodec in ${with_ffmpeg_tree}" >&5
--echo "$as_me: error: cannot find ${real_ffmpeg_tree}/libavcodec/libavcodec.a, make sure you compiled libavcodec in ${with_ffmpeg_tree}" >&2;}
-+     { { echo "$as_me:$LINENO: error: cannot find ${real_ffmpeg_tree}/libavcodec.a, make sure you compiled libavcodec in ${with_ffmpeg_tree}" >&5
-+echo "$as_me: error: cannot find ${real_ffmpeg_tree}/libavcodec.a, make sure you compiled libavcodec in ${with_ffmpeg_tree}" >&2;}
-    { (exit 1); exit 1; }; }
-    fi
--   if ! fgrep -s "pp_get_context" "${real_ffmpeg_tree}/libavcodec/libavcodec.a"; then
-+   if ! fgrep -s "pp_get_context" "${real_ffmpeg_tree}/libavcodec.a"; then
-      if test -f "${real_ffmpeg_tree}/libavcodec/libpostproc/libpostproc.a"; then
- 
-   for element in ffmpeg; do
-@@ -43144,13 +43144,13 @@ echo "$as_me: error: cannot find ${real_
-      else
-               echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6
--       { { echo "$as_me:$LINENO: error: ${real_ffmpeg_tree}/libavcodec/libavcodec.a was not compiled with postprocessing support, make sure you configured ffmpeg with --enable-pp" >&5
--echo "$as_me: error: ${real_ffmpeg_tree}/libavcodec/libavcodec.a was not compiled with postprocessing support, make sure you configured ffmpeg with --enable-pp" >&2;}
-+       { { echo "$as_me:$LINENO: error: ${real_ffmpeg_tree}/libavcodec.a was not compiled with postprocessing support, make sure you configured ffmpeg with --enable-pp" >&5
-+echo "$as_me: error: ${real_ffmpeg_tree}/libavcodec.a was not compiled with postprocessing support, make sure you configured ffmpeg with --enable-pp" >&2;}
-    { (exit 1); exit 1; }; }
-      fi
-    fi
--      echo "$as_me:$LINENO: result: ${real_ffmpeg_tree}/libavcodec/libavcodec.a" >&5
--echo "${ECHO_T}${real_ffmpeg_tree}/libavcodec/libavcodec.a" >&6
-+      echo "$as_me:$LINENO: result: ${real_ffmpeg_tree}/libavcodec.a" >&5
-+echo "${ECHO_T}${real_ffmpeg_tree}/libavcodec.a" >&6
- 
-    if fgrep -s "CONFIG_ZLIB=yes" "${real_ffmpeg_tree}/config.mak"; then
-      if test "${with_ffmpeg_zlib}" != "yes"; then
-@@ -43318,7 +43318,7 @@ fi
- 
- 
-   for element in ffmpeg; do
--    eval "LDFLAGS_${element}="'"'"-L${real_ffmpeg_tree}/libavcodec ${real_ffmpeg_tree}/libavcodec/libavcodec.a "'$'"{LDFLAGS_${element}} "'"'
-+    eval "LDFLAGS_${element}="'"'"-L${real_ffmpeg_tree}/libavcodec ${real_ffmpeg_tree}/libavcodec.a "'$'"{LDFLAGS_${element}} "'"'
-     am_modules_with_ldflags="${am_modules_with_ldflags} ${element}"
-   done
- 
-@@ -55864,7 +55864,7 @@ fi
- 
- 
-   for element in directfb; do
--    eval "LDFLAGS_${element}="'"'"-ldirectfb -lfusion -ldirect -lpthread -ljpeg -lz -ldl "'$'"{LDFLAGS_${element}} "'"'
-+    eval "LDFLAGS_${element}="'"'"-ldirectfb -lfusion -ldirect ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} -ljpeg -lz -ldl "'$'"{LDFLAGS_${element}} "'"'
-     am_modules_with_ldflags="${am_modules_with_ldflags} ${element}"
-   done
- 
-@@ -56043,7 +56043,7 @@ if test "${with_directfb+set}" = set; th
- 
- 
-   for element in directfb; do
--    eval "LDFLAGS_${element}="'"'"-L${with_directfb}/lib -ldirectfb -lfusion -ldirect -lpthread -ljpeg -lz -ldl "'$'"{LDFLAGS_${element}} "'"'
-+    eval "LDFLAGS_${element}="'"'"-L${with_directfb}/lib -ldirectfb -lfusion -ldirect ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} -ljpeg -lz -ldl "'$'"{LDFLAGS_${element}} "'"'
-     am_modules_with_ldflags="${am_modules_with_ldflags} ${element}"
-   done
- 
-@@ -58056,7 +58056,7 @@ echo $ECHO_N "checking for XML parser to
-       LIBS_save="$LIBS"
-       LIBS_cclink="no"
-       for l in "`xml2-config --libs`" -lexpat -lxerces-c; do
--        LIBS="$LIBS_save ${real_cyberlink_tree}/lib/unix/libclink.a -lpthread $l"
-+        LIBS="$LIBS_save ${real_cyberlink_tree}/lib/unix/libclink.a ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} $l"
-         cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -58120,7 +58120,7 @@ rm -f conftest.err conftest.$ac_objext \
-       conftest$ac_exeext conftest.$ac_ext
-       done
-       LIBS="${LIBS_save}"
--            if test "${LIBS_cclink}" == "no"; then
-+            if test "${LIBS_cclink}" = "no"; then
-   { { echo "$as_me:$LINENO: error: cannot find XML parser for CyberLink
- See \`config.log' for more details." >&5
- echo "$as_me: error: cannot find XML parser for CyberLink
-@@ -58132,7 +58132,7 @@ fi
- echo "${ECHO_T}${LIBS_cclink}" >&6
- 
-   for element in upnp_cc; do
--    eval "LDFLAGS_${element}="'"'"${real_cyberlink_tree}/lib/unix/libclink.a -lpthread ${LIBS_cclink} "'$'"{LDFLAGS_${element}} "'"'
-+    eval "LDFLAGS_${element}="'"'"${real_cyberlink_tree}/lib/unix/libclink.a ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} ${LIBS_cclink} "'$'"{LDFLAGS_${element}} "'"'
-     am_modules_with_ldflags="${am_modules_with_ldflags} ${element}"
-   done
- 
-@@ -58181,7 +58181,7 @@ if test "${ac_cv_lib_upnp_UpnpInit+set}"
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lupnp -lpthread $LIBS"
-+LIBS="-lupnp ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -58244,7 +58244,7 @@ else
-   has_upnp="no"
- fi
- 
--  if test "x${enable_upnp}" != "x" && test "${has_upnp}" == "no"; then
-+  if test "x${enable_upnp}" != "x" && test "${has_upnp}" = "no"; then
-    
-     { { echo "$as_me:$LINENO: error: cannot find Intel UPnP SDK (libupnp)" >&5
- echo "$as_me: error: cannot find Intel UPnP SDK (libupnp)" >&2;}
-@@ -58252,7 +58252,7 @@ echo "$as_me: error: cannot find Intel U
- 
- fi
- 
--  if test "${has_upnp}" == "yes"; then
-+  if test "${has_upnp}" = "yes"; then
- 
- 
-   for element in upnp_intel; do
-@@ -58271,7 +58271,7 @@ else
- fi
- 
- 
--if test "${has_upnp}" == "yes"; then
-+if test "${has_upnp}" = "yes"; then
- 
- 
-   PLUGINS="${PLUGINS} upnp_intel"
diff --git a/multimedia/vlc/patches/patch-aj b/multimedia/vlc/patches/patch-aj
deleted file mode 100644
index 8357c4308f0..00000000000
--- a/multimedia/vlc/patches/patch-aj
+++ /dev/null
@@ -1,123 +0,0 @@
-$NetBSD: patch-aj,v 1.1 2007/02/22 16:36:10 drochner Exp $
-
---- include/vlc_threads_funcs.h.orig	2006-05-06 17:52:25.000000000 +0200
-+++ include/vlc_threads_funcs.h
-@@ -69,7 +69,7 @@ static inline int __vlc_mutex_lock( cons
- {
-     int i_result;
-     /* In case of error : */
--    int i_thread = -1;
-+    pthread_t i_thread = NULL;
-     const char * psz_error = "";
- 
- #if defined( PTH_INIT_IN_PTH_H )
-@@ -111,7 +111,7 @@ static inline int __vlc_mutex_lock( cons
-     i_result = pthread_mutex_lock( &p_mutex->mutex );
-     if ( i_result )
-     {
--        i_thread = (int)pthread_self();
-+        i_thread = pthread_self();
-         psz_error = strerror(i_result);
-     }
- 
-@@ -124,7 +124,7 @@ static inline int __vlc_mutex_lock( cons
-     if( i_result )
-     {
-         msg_Err( p_mutex->p_this,
--                 "thread %u: mutex_lock failed at %s:%d (%d:%s)",
-+                 "thread %p: mutex_lock failed at %s:%d (%d:%s)",
-                  i_thread, psz_file, i_line, i_result, psz_error );
-     }
-     return i_result;
-@@ -141,7 +141,7 @@ static inline int __vlc_mutex_unlock( co
- {
-     int i_result;
-     /* In case of error : */
--    int i_thread = -1;
-+    pthread_t i_thread = NULL;
-     const char * psz_error = "";
- 
- #if defined( PTH_INIT_IN_PTH_H )
-@@ -184,7 +184,7 @@ static inline int __vlc_mutex_unlock( co
-     i_result = pthread_mutex_unlock( &p_mutex->mutex );
-     if ( i_result )
-     {
--        i_thread = (int)pthread_self();
-+        i_thread = pthread_self();
-         psz_error = strerror(i_result);
-     }
- 
-@@ -197,7 +197,7 @@ static inline int __vlc_mutex_unlock( co
-     if( i_result )
-     {
-         msg_Err( p_mutex->p_this,
--                 "thread %u: mutex_unlock failed at %s:%d (%d:%s)",
-+                 "thread %p: mutex_unlock failed at %s:%d (%d:%s)",
-                  i_thread, psz_file, i_line, i_result, psz_error );
-     }
- 
-@@ -227,7 +227,7 @@ static inline int __vlc_cond_signal( con
- {
-     int i_result;
-     /* In case of error : */
--    int i_thread = -1;
-+    pthread_t i_thread = NULL;
-     const char * psz_error = "";
- 
- #if defined( PTH_INIT_IN_PTH_H )
-@@ -322,7 +322,7 @@ static inline int __vlc_cond_signal( con
-     i_result = pthread_cond_signal( &p_condvar->cond );
-     if ( i_result )
-     {
--        i_thread = (int)pthread_self();
-+        i_thread = pthread_self();
-         psz_error = strerror(i_result);
-     }
- 
-@@ -339,7 +339,7 @@ static inline int __vlc_cond_signal( con
-     if( i_result )
-     {
-         msg_Err( p_condvar->p_this,
--                 "thread %u: cond_signal failed at %s:%d (%d:%s)",
-+                 "thread %p: cond_signal failed at %s:%d (%d:%s)",
-                  i_thread, psz_file, i_line, i_result, psz_error );
-     }
- 
-@@ -357,7 +357,7 @@ static inline int __vlc_cond_wait( const
- {
-     int i_result;
-     /* In case of error : */
--    int i_thread = -1;
-+    pthread_t i_thread = NULL;
-     const char * psz_error = "";
- 
- #if defined( PTH_INIT_IN_PTH_H )
-@@ -499,8 +499,8 @@ static inline int __vlc_cond_wait( const
-     {
-         /* People keep pissing me off with this. --Meuuh */
-         msg_Dbg( p_condvar->p_this,
--                  "thread %u: secret message triggered "
--                  "at %s:%d (%s)", (int)pthread_self(),
-+                  "thread %p: secret message triggered "
-+                  "at %s:%d (%s)", pthread_self(),
-                   psz_file, i_line, strerror(i_result) );
- 
-         i_result = pthread_cond_wait( &p_condvar->cond, &p_mutex->mutex );
-@@ -512,7 +512,7 @@ static inline int __vlc_cond_wait( const
- 
-     if ( i_result )
-     {
--        i_thread = (int)pthread_self();
-+        i_thread = pthread_self();
-         psz_error = strerror(i_result);
-     }
- 
-@@ -525,7 +525,7 @@ static inline int __vlc_cond_wait( const
-     if( i_result )
-     {
-         msg_Err( p_condvar->p_this,
--                 "thread %u: cond_wait failed at %s:%d (%d:%s)",
-+                 "thread %p: cond_wait failed at %s:%d (%d:%s)",
-                  i_thread, psz_file, i_line, i_result, psz_error );
-     }
- 
diff --git a/multimedia/vlc/patches/patch-ak b/multimedia/vlc/patches/patch-ak
deleted file mode 100644
index 330570f54c1..00000000000
--- a/multimedia/vlc/patches/patch-ak
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-ak,v 1.2 2007/06/22 14:32:24 lkundrak Exp $
-
-Fix for CVE-2007-3316 format-string vulnerability in CDDA module described
-by VideoLAN-SA-0702 advisory.  Backported from 0.8.6c.
-
---- modules/access/cdda.c.orig	2006-05-06 17:52:18.000000000 +0200
-+++ modules/access/cdda.c
-@@ -630,7 +630,7 @@ static int GetTracks( access_t *p_access
-                     {
-                         vlc_input_item_AddInfo( &p_item->input,
-                                             _(VLC_META_INFO_CAT),
--                                            _(VLC_META_TITLE),
-+                                            _(VLC_META_TITLE), "%s", 
-                                             cddb_track_get_title( t ) );
-                         if( p_item->input.psz_name )
-                             free( p_item->input.psz_name );
-@@ -641,7 +641,7 @@ static int GetTracks( access_t *p_access
-                     if( psz_result )
-                     {
-                         vlc_input_item_AddInfo( &p_item->input,
--                                            _(VLC_META_INFO_CAT),
-+                                            _(VLC_META_INFO_CAT), "%s",
-                                             _(VLC_META_ARTIST), psz_result );
-                     }
-                 }
diff --git a/multimedia/vlc/patches/patch-al b/multimedia/vlc/patches/patch-al
deleted file mode 100644
index acc6ea81132..00000000000
--- a/multimedia/vlc/patches/patch-al
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-al,v 1.1 2007/06/22 14:13:16 lkundrak Exp $
-
-Fix for CVE-2007-3316 format-string vulnerability in Vorbis module described
-by VideoLAN-SA-0702 advisory.  Backported from 0.8.6c.
-
---- modules/codec/vorbis.c.orig	2007-06-22 16:03:12.000000000 +0200
-+++ modules/codec/vorbis.c
-@@ -614,7 +614,7 @@ static void ParseVorbisComments( decoder
-             *psz_value = '\0';
-             psz_value++;
-             input_Control( p_input, INPUT_ADD_INFO, _("Vorbis comment"),
--                           psz_name, psz_value );
-+                           psz_name, "%s", psz_value );
-             if( strcasestr( psz_name, "artist" ) )
-             {
-                 vlc_input_item_AddInfo( p_input->input.p_item,
diff --git a/multimedia/vlc/patches/patch-am b/multimedia/vlc/patches/patch-am
deleted file mode 100644
index 52f8e31a18d..00000000000
--- a/multimedia/vlc/patches/patch-am
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-am,v 1.1 2007/06/22 14:13:16 lkundrak Exp $
-
-Fix for CVE-2007-3316 format-string vulnerability in Theora module described
-by VideoLAN-SA-0702 advisory.  Backported from 0.8.6c.
-
---- modules/codec/theora.c.orig	2007-06-22 16:04:59.000000000 +0200
-+++ modules/codec/theora.c
-@@ -510,7 +510,7 @@ static void ParseTheoraComments( decoder
-             *psz_value = '\0';
-             psz_value++;
-             input_Control( p_input, INPUT_ADD_INFO, _("Theora comment"),
--                           psz_name, psz_value );
-+                           psz_name, "%s", psz_value );
-         }
-         free( psz_comment );
-         i++;
diff --git a/multimedia/vlc/patches/patch-an b/multimedia/vlc/patches/patch-an
deleted file mode 100644
index 23226b07059..00000000000
--- a/multimedia/vlc/patches/patch-an
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-an,v 1.1 2007/06/22 14:13:17 lkundrak Exp $
-
-Fix for CVE-2007-3316 format-string vulnerability in SAP module described
-by VideoLAN-SA-0702 advisory.  Backported from 0.8.6c.
-
---- modules/services_discovery/sap.c.orig	2007-06-22 16:06:09.000000000 +0200
-+++ modules/services_discovery/sap.c
-@@ -818,12 +818,12 @@ sap_announce_t *CreateAnnounce( services
-     if( psz_value != NULL )
-     {
-         vlc_input_item_AddInfo( &p_item->input, _("Session"),
--                                _("Tool"), psz_value );
-+                                _("Tool"), "%s", psz_value );
-     }
-     if( strcmp( p_sdp->psz_username, "-" ) )
-     {
-         vlc_input_item_AddInfo( &p_item->input, _("Session"),
--                                _("User"), p_sdp->psz_username );
-+                                _("User"), "%s", p_sdp->psz_username );
-     }
- 
-     psz_value = GetAttribute( p_sap->p_sdp, "x-plgroup" );