diff --git a/x11/vlc/Makefile b/x11/vlc/Makefile index 958d2f12349..f0e3baffcbd 100644 --- a/x11/vlc/Makefile +++ b/x11/vlc/Makefile @@ -1,19 +1,15 @@ -# $OpenBSD: Makefile,v 1.16 2004/10/05 20:49:08 naddy Exp $ +# $OpenBSD: Makefile,v 1.17 2004/12/16 07:40:20 jolan Exp $ NOT_FOR_ARCHS= ${NO_SHARED_ARCHS} COMMENT= "videolan client; multimedia player" - -V= 0.7.2 +V= 0.8.1 DISTNAME= vlc-${V} CATEGORIES= x11 -MASTER_SITES= http://www.videolan.org/pub/videolan/vlc/${V}/ \ - http://www.fr.videolan.org/pub/videolan/vlc/${V}/ +MASTER_SITES= http://download.videolan.org/pub/videolan/vlc/${V}/ HOMEPAGE= http://www.videolan.org/vlc/ -MAINTAINER= Jolan Luff - # GPL PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes @@ -22,42 +18,44 @@ PERMIT_DISTFILES_FTP= Yes USE_X11= Yes +WANTLIB= GL GLU X11 Xext Xinerama Xv c freetype m pthread usbhid z + MODULES= devel/gettext -LIB_DEPENDS= SDL::devel/sdl \ - gtk.1.2,gdk.1.2::x11/gtk+ \ - glib,gthread::devel/glib \ - png::graphics/png \ - id3tag.2::audio/libid3tag \ - mad.2::audio/libmad \ - ogg::audio/libogg \ - vorbis,vorbisenc::audio/libvorbis \ - mpeg2::graphics/libmpeg2 \ - avcodec::graphics/ffmpeg \ - fribidi::devel/fribidi \ - faad::audio/faad +BUILD_DEPENDS= :pkgconfig-*:devel/pkgconfig + +LIB_DEPENDS= SDL.3.0::devel/sdl \ + wx_gtk2.2.4::x11/wxWidgets/gtk2 \ + png.4.1::graphics/png \ + id3tag.3.0::audio/libid3tag \ + mad.2.1::audio/libmad \ + ogg.5.2::audio/libogg \ + vorbis.3.0,vorbisenc.2.0::audio/libvorbis \ + mpeg2.0.0::graphics/libmpeg2 \ + avcodec.4.9,avformat.4.9::graphics/ffmpeg \ + fribidi.0.0::devel/fribidi \ + faad.0.0::audio/faad CONFIGURE_STYLE=autoconf AUTOCONF_VERSION=2.59 CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" \ - LIBS="-logg" \ + LIBS="-logg -lm" \ + WXCONFIG="${LOCALBASE}/bin/wxgtk2-2.4-config" \ CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/libpng" CONFIGURE_ARGS+=--disable-altivec \ --disable-oss \ --enable-sdl \ --enable-mad \ --disable-optimizations \ - --disable-dvd \ - --disable-dvdnav \ --disable-dvbpsi \ --disable-vcd \ --disable-mod \ --disable-mkv \ --disable-dts \ - --disable-wxwindows \ --disable-cddax \ --disable-skins2 \ --disable-speex \ + --disable-x264 \ --enable-faad \ --disable-dvbpsi \ --disable-v4l \ @@ -83,12 +81,12 @@ CFLAGS+=-mhard-quad-float .endif .if ${FLAVOR:L:Mno_dvd} -CONFIGURE_ARGS+=--disable-a52 --disable-dvdplay --disable-dvdread +CONFIGURE_ARGS+=--disable-a52 --disable-dvdread --disable-dvdnav .else -CONFIGURE_ARGS+=--enable-a52 --enable-dvdplay --enable-dvdread -LIB_DEPENDS+= a52::audio/liba52 \ - dvdplay::devel/libdvdplay \ - dvdread::devel/libdvdread +CONFIGURE_ARGS+=--enable-a52 --enable-dvdread --enable-dvdnav +LIB_DEPENDS+= a52.0.0::audio/liba52 \ + dvdnav.3.0::multimedia/libdvdnav \ + dvdread.3.0::devel/libdvdread .endif .include diff --git a/x11/vlc/distinfo b/x11/vlc/distinfo index ad351884dfe..fab265de726 100644 --- a/x11/vlc/distinfo +++ b/x11/vlc/distinfo @@ -1,3 +1,3 @@ -MD5 (vlc-0.7.2.tar.gz) = 25dfcc804cb92f46c0b64ce1466515cc -RMD160 (vlc-0.7.2.tar.gz) = b14251b198ec92618bdfae56ae6e29946924a608 -SHA1 (vlc-0.7.2.tar.gz) = b79cd3e5d8f9293eafaf5e65ae0eca5f3665e86d +MD5 (vlc-0.8.1.tar.gz) = 3fb3ac4ed456f092d51a00d50159790f +RMD160 (vlc-0.8.1.tar.gz) = 1f799753bc79f14ea1dee138e63d6cf03f9ca358 +SHA1 (vlc-0.8.1.tar.gz) = 412746fcff9a49bd44dc26b72f9ad2da92b06550 diff --git a/x11/vlc/patches/patch-aclocal_m4 b/x11/vlc/patches/patch-aclocal_m4 index f16ee777038..7ea558d713e 100644 --- a/x11/vlc/patches/patch-aclocal_m4 +++ b/x11/vlc/patches/patch-aclocal_m4 @@ -1,7 +1,7 @@ -$OpenBSD: patch-aclocal_m4,v 1.1 2004/10/05 20:49:08 naddy Exp $ ---- aclocal.m4.orig Tue Oct 5 19:38:32 2004 -+++ aclocal.m4 Tue Oct 5 19:40:46 2004 -@@ -2212,9 +2212,9 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY], +$OpenBSD: patch-aclocal_m4,v 1.2 2004/12/16 07:40:20 jolan Exp $ +--- aclocal.m4.orig Sun Nov 14 11:45:32 2004 ++++ aclocal.m4 Wed Dec 15 22:42:59 2004 +@@ -2261,9 +2261,9 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY], found_so= found_a= if test $use_additional = yes; then @@ -13,7 +13,7 @@ $OpenBSD: patch-aclocal_m4,v 1.1 2004/10/05 20:49:08 naddy Exp $ if test -f "$additional_libdir/lib$name.la"; then found_la="$additional_libdir/lib$name.la" fi -@@ -2234,9 +2234,9 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY], +@@ -2283,9 +2283,9 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY], case "$x" in -L*) dir=`echo "X$x" | sed -e 's/^X-L//'` diff --git a/x11/vlc/patches/patch-include_vlc_config_h b/x11/vlc/patches/patch-include_vlc_config_h index 2ce8b46e8d9..ad836170305 100644 --- a/x11/vlc/patches/patch-include_vlc_config_h +++ b/x11/vlc/patches/patch-include_vlc_config_h @@ -1,7 +1,7 @@ -$OpenBSD: patch-include_vlc_config_h,v 1.2 2004/04/18 00:42:14 jolan Exp $ ---- include/vlc_config.h.orig 2004-01-25 12:17:08.000000000 -0600 -+++ include/vlc_config.h 2004-03-30 18:33:26.000000000 -0600 -@@ -118,7 +118,7 @@ +$OpenBSD: patch-include_vlc_config_h,v 1.3 2004/12/16 07:40:20 jolan Exp $ +--- include/vlc_config.h.orig Sat Nov 6 10:36:34 2004 ++++ include/vlc_config.h Wed Dec 15 22:42:47 2004 +@@ -119,7 +119,7 @@ /* DVD and VCD devices */ #if !defined( WIN32 ) && !defined( UNDER_CE ) diff --git a/x11/vlc/patches/patch-modules_demux_ogg_c b/x11/vlc/patches/patch-modules_demux_ogg_c index cdbbdefd7d8..437996bff89 100644 --- a/x11/vlc/patches/patch-modules_demux_ogg_c +++ b/x11/vlc/patches/patch-modules_demux_ogg_c @@ -1,7 +1,7 @@ -$OpenBSD: patch-modules_demux_ogg_c,v 1.1 2004/07/10 01:49:42 jolan Exp $ ---- modules/demux/ogg.c.orig 2004-04-28 12:57:49.000000000 -0500 -+++ modules/demux/ogg.c 2004-05-25 21:33:16.000000000 -0500 -@@ -1379,7 +1379,7 @@ static void Ogg_ReadAnnodexHeader( vlc_o +$OpenBSD: patch-modules_demux_ogg_c,v 1.2 2004/12/16 07:40:20 jolan Exp $ +--- modules/demux/ogg.c.orig Sat Nov 6 10:35:11 2004 ++++ modules/demux/ogg.c Wed Dec 15 22:42:47 2004 +@@ -1317,7 +1317,7 @@ static void Ogg_ReadAnnodexHeader( vlc_o /* we are guaranteed that the first header field will be * the content-type (by the Annodex standard) */ diff --git a/x11/vlc/pkg/PFRAG.no-no_dvd b/x11/vlc/pkg/PFRAG.no-no_dvd index b9745110eff..931bece526b 100644 --- a/x11/vlc/pkg/PFRAG.no-no_dvd +++ b/x11/vlc/pkg/PFRAG.no-no_dvd @@ -1,4 +1,4 @@ -@comment $OpenBSD: PFRAG.no-no_dvd,v 1.1.1.1 2003/07/20 21:09:29 jolan Exp $ -lib/vlc/access/libdvdplay_plugin.so +@comment $OpenBSD: PFRAG.no-no_dvd,v 1.2 2004/12/16 07:40:20 jolan Exp $ +lib/vlc/access/libdvdnav_plugin.so lib/vlc/access/libdvdread_plugin.so lib/vlc/audio_filter/liba52tofloat32_plugin.so diff --git a/x11/vlc/pkg/PLIST b/x11/vlc/pkg/PLIST index b7b0b3763eb..c42d5354ff5 100644 --- a/x11/vlc/pkg/PLIST +++ b/x11/vlc/pkg/PLIST @@ -1,8 +1,9 @@ -@comment $OpenBSD: PLIST,v 1.10 2004/09/15 19:23:50 espie Exp $ +@comment $OpenBSD: PLIST,v 1.11 2004/12/16 07:40:20 jolan Exp $ +%%SHARED%% %%i386%% -bin/gvlc bin/vlc bin/vlc-config +bin/wxvlc include/vlc/ include/vlc/aout.h include/vlc/decoder.h @@ -70,7 +71,7 @@ lib/vlc/codec/liblpcm_plugin.so lib/vlc/codec/libmpeg_audio_plugin.so lib/vlc/codec/librawvideo_plugin.so lib/vlc/codec/libspudec_plugin.so -@comment lib/vlc/codec/libsubsdec_plugin.so +lib/vlc/codec/libsubsdec_plugin.so lib/vlc/codec/libsvcdsub_plugin.so lib/vlc/codec/libvorbis_plugin.so lib/vlc/control/ @@ -86,9 +87,7 @@ lib/vlc/demux/libaiff_plugin.so lib/vlc/demux/libasf_plugin.so lib/vlc/demux/libau_plugin.so lib/vlc/demux/libavi_plugin.so -lib/vlc/demux/libdemux2_plugin.so lib/vlc/demux/libdemuxdump_plugin.so -lib/vlc/demux/libdemuxsub_plugin.so lib/vlc/demux/libdtssys_plugin.so lib/vlc/demux/libh264_plugin.so lib/vlc/demux/libid3_plugin.so @@ -96,30 +95,24 @@ lib/vlc/demux/libid3tag_plugin.so lib/vlc/demux/libm3u_plugin.so lib/vlc/demux/libm4v_plugin.so lib/vlc/demux/libmp4_plugin.so -lib/vlc/demux/libmpeg_system_plugin.so lib/vlc/demux/libmpga_plugin.so lib/vlc/demux/libmpgv_plugin.so lib/vlc/demux/libnsv_plugin.so lib/vlc/demux/libogg_plugin.so lib/vlc/demux/libplaylist_plugin.so -lib/vlc/demux/libps2_plugin.so lib/vlc/demux/libps_plugin.so lib/vlc/demux/libpva_plugin.so lib/vlc/demux/librawdv_plugin.so lib/vlc/demux/libreal_plugin.so lib/vlc/demux/libsgimb_plugin.so -lib/vlc/demux/libts_plugin.so lib/vlc/demux/libwav_plugin.so lib/vlc/gui/ -lib/vlc/gui/libgtk_plugin.so lib/vlc/libffmpeg.a -lib/vlc/libstream_out_transcode.a lib/vlc/libxvideo.a lib/vlc/misc/ lib/vlc/misc/libdummy_plugin.so lib/vlc/misc/libexport_plugin.so lib/vlc/misc/libfreetype_plugin.so -lib/vlc/misc/libgtk_main_plugin.so lib/vlc/misc/libipv4_plugin.so lib/vlc/misc/libipv6_plugin.so lib/vlc/misc/liblogger_plugin.so @@ -133,7 +126,6 @@ lib/vlc/mux/libmux_dummy_plugin.so lib/vlc/mux/libmux_mp4_plugin.so lib/vlc/mux/libmux_ogg_plugin.so lib/vlc/mux/libmux_ps_plugin.so -lib/vlc/mux/libmux_ts_plugin.so lib/vlc/packetizer/ lib/vlc/packetizer/libpacketizer_copy_plugin.so lib/vlc/packetizer/libpacketizer_h264_plugin.so @@ -174,8 +166,7 @@ share/doc/vlc/bugreport-howto.txt share/doc/vlc/fortunes.txt share/doc/vlc/intf-cdda.txt share/doc/vlc/intf-vcd.txt -share/doc/vlc/vlc-howto.sgml -share/doc/vlc/web-streaming.html +share/locale/da/LC_MESSAGES/vlc.mo share/locale/de/LC_MESSAGES/vlc.mo share/locale/en_GB/ share/locale/en_GB/LC_MESSAGES/ @@ -238,127 +229,8 @@ share/vlc/qvlc16x16.png share/vlc/qvlc32x32.png share/vlc/qvlc32x32.xpm share/vlc/qvlc48x48.png -share/vlc/skins/ -share/vlc/skins/default/ -share/vlc/skins/default/add1.bmp -share/vlc/skins/default/add2.bmp -share/vlc/skins/default/add3.bmp -share/vlc/skins/default/body.bmp -share/vlc/skins/default/del1.bmp -share/vlc/skins/default/del2.bmp -share/vlc/skins/default/del3.bmp -share/vlc/skins/default/next1.bmp -share/vlc/skins/default/next2.bmp -share/vlc/skins/default/next3.bmp -share/vlc/skins/default/next4.bmp -share/vlc/skins/default/open1.bmp -share/vlc/skins/default/open2.bmp -share/vlc/skins/default/open3.bmp -share/vlc/skins/default/pause1.bmp -share/vlc/skins/default/pause2.bmp -share/vlc/skins/default/pause3.bmp -share/vlc/skins/default/pause4.bmp -share/vlc/skins/default/play1.bmp -share/vlc/skins/default/play2.bmp -share/vlc/skins/default/play3.bmp -share/vlc/skins/default/play4.bmp -share/vlc/skins/default/playlist1.bmp -share/vlc/skins/default/playlist2.bmp -share/vlc/skins/default/playlist3.bmp -share/vlc/skins/default/playlist_body.bmp -share/vlc/skins/default/prefs1.bmp -share/vlc/skins/default/prefs2.bmp -share/vlc/skins/default/prefs3.bmp -share/vlc/skins/default/prev1.bmp -share/vlc/skins/default/prev2.bmp -share/vlc/skins/default/prev3.bmp -share/vlc/skins/default/prev4.bmp -share/vlc/skins/default/quit1.bmp -share/vlc/skins/default/quit2.bmp -share/vlc/skins/default/quit3.bmp -share/vlc/skins/default/slider1.bmp -share/vlc/skins/default/slider2.bmp -share/vlc/skins/default/stop1.bmp -share/vlc/skins/default/stop2.bmp -share/vlc/skins/default/stop3.bmp -share/vlc/skins/default/stop4.bmp -share/vlc/skins/default/theme.xml share/vlc/skins2/ -share/vlc/skins2/default/ -share/vlc/skins2/default/FreeSansBold.ttf -share/vlc/skins2/default/add_item.png -share/vlc/skins2/default/add_item_onclick.png -share/vlc/skins2/default/body.png -share/vlc/skins2/default/close.png -share/vlc/skins2/default/close_mouseover.png -share/vlc/skins2/default/close_onclick.png -share/vlc/skins2/default/delete_item.png -share/vlc/skins2/default/delete_item_onclick.png -share/vlc/skins2/default/disabled.png -share/vlc/skins2/default/fast.png -share/vlc/skins2/default/fast_disabled.png -share/vlc/skins2/default/fast_onclick.png -share/vlc/skins2/default/next.png -share/vlc/skins2/default/next_disabled.png -share/vlc/skins2/default/next_onclick.png -share/vlc/skins2/default/pause.png -share/vlc/skins2/default/pause_onclick.png -share/vlc/skins2/default/play.png -share/vlc/skins2/default/play_onclick.png -share/vlc/skins2/default/playlist.png -share/vlc/skins2/default/playlist_body1.png -share/vlc/skins2/default/playlist_body2.png -share/vlc/skins2/default/playlist_body3.png -share/vlc/skins2/default/playlist_body4.png -share/vlc/skins2/default/playlist_body6.png -share/vlc/skins2/default/playlist_body7.png -share/vlc/skins2/default/playlist_body8.png -share/vlc/skins2/default/playlist_body9.png -share/vlc/skins2/default/playlist_button.png -share/vlc/skins2/default/playlist_button2.png -share/vlc/skins2/default/playlist_button_onclick.png -share/vlc/skins2/default/playlist_button_onclick2.png -share/vlc/skins2/default/preferences.png -share/vlc/skins2/default/preferences_onclick.png -share/vlc/skins2/default/previous.png -share/vlc/skins2/default/previous_disabled.png -share/vlc/skins2/default/previous_onclick.png -share/vlc/skins2/default/reduce.png -share/vlc/skins2/default/reduce_disabled.png -share/vlc/skins2/default/reduce_onclick.png -share/vlc/skins2/default/resize.png -share/vlc/skins2/default/rev.png -share/vlc/skins2/default/rev_disabled.png -share/vlc/skins2/default/rev_onclick.png -share/vlc/skins2/default/slider.png -share/vlc/skins2/default/slider2.png -share/vlc/skins2/default/slider_onclick.png -share/vlc/skins2/default/slider_playlist.png -share/vlc/skins2/default/slider_volume.png -share/vlc/skins2/default/slider_volume_onclick.png -share/vlc/skins2/default/slow.png -share/vlc/skins2/default/slow_disabled.png -share/vlc/skins2/default/slow_onclick.png -share/vlc/skins2/default/sort.png -share/vlc/skins2/default/sort_onclick.png -share/vlc/skins2/default/stop.png -share/vlc/skins2/default/stop_disabled.png -share/vlc/skins2/default/stop_onclick.png -share/vlc/skins2/default/theme.xml -share/vlc/skins2/default/volume.png -share/vlc/skins2/default/vout.png -share/vlc/skins2/default/vout2.png -share/vlc/skins2/default/vout_body.png -share/vlc/skins2/default/vout_body1.png -share/vlc/skins2/default/vout_bottom.png -share/vlc/skins2/default/vout_bottom_left.png -share/vlc/skins2/default/vout_bottom_right.png -share/vlc/skins2/default/vout_left.png -share/vlc/skins2/default/vout_onclick.png -share/vlc/skins2/default/vout_right.png -share/vlc/skins2/default/vout_top.png -share/vlc/skins2/default/vout_top_left.png -share/vlc/skins2/default/vout_top_right.png +share/vlc/skins2/default.vlt share/vlc/skins2/fonts/ share/vlc/skins2/fonts/FreeSans.ttf share/vlc/skins2/skin.catalog