diff options
author | Max Khon <fjoe@FreeBSD.org> | 2003-11-05 16:51:06 +0000 |
---|---|---|
committer | Max Khon <fjoe@FreeBSD.org> | 2003-11-05 16:51:06 +0000 |
commit | 858eb47efe00fe531c2b475e142c4eb68bcadb88 (patch) | |
tree | 41c79c5ff35904923960a02289956203eec5defb /multimedia/vlc | |
parent | - Update to version 1.0.2 (diff) |
- update to 0.6.2
- add patches to not expect postprocessing in ffmpeg, our ffmpeg don't
have postprocessing built in
- use gtk2 variant of wxWindows
PR: 58969
Submitted by: Pav Lucistnik
Notes
Notes:
svn path=/head/; revision=93163
Diffstat (limited to 'multimedia/vlc')
-rw-r--r-- | multimedia/vlc/Makefile | 9 | ||||
-rw-r--r-- | multimedia/vlc/distinfo | 2 | ||||
-rw-r--r-- | multimedia/vlc/files/patch-configure | 9 | ||||
-rw-r--r-- | multimedia/vlc/files/patch-modules-codec-ffmpeg-ffmpeg.c | 12 | ||||
-rw-r--r-- | multimedia/vlc/files/patch-modules-codec-ffmpeg-ffmpeg.h | 14 | ||||
-rw-r--r-- | multimedia/vlc/files/patch-modules::codec::mpeg_video::parser.c | 11 | ||||
-rw-r--r-- | multimedia/vlc/files/patch-modules::gui::wxwindows::menus.cpp | 14 | ||||
-rw-r--r-- | multimedia/vlc/pkg-plist | 32 |
8 files changed, 55 insertions, 48 deletions
diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile index 19c992212bdf..09e07278171c 100644 --- a/multimedia/vlc/Makefile +++ b/multimedia/vlc/Makefile @@ -6,8 +6,7 @@ # PORTNAME= vlc -PORTVERSION= 0.6.0 -PORTREVISION= 1 +PORTVERSION= 0.6.2 CATEGORIES= multimedia MASTER_SITES= http://www.videolan.org/pub/videolan/vlc/${PORTVERSION}/ @@ -25,7 +24,7 @@ LIB_DEPENDS= dvdcss.2:${PORTSDIR}/multimedia/libdvdcss \ ogg.4:${PORTSDIR}/audio/libogg \ FLAC.5:${PORTSDIR}/audio/flac \ faad.0:${PORTSDIR}/audio/faad \ - wx_gtk-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk-devel \ + wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk2 \ slp.1:${PORTSDIR}/net/openslp # After libmpeg2 release 0.3.2 @@ -42,7 +41,7 @@ INSTALLS_SHLIB= yes GNU_CONFIGURE= yes CONFIGURE_ENV= PATH_GTKCONFIG="${GTK_CONFIG}" \ CPPFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \ - LDFLAGS=-L${LOCALBASE}/lib + LDFLAGS=-L${LOCALBASE}/lib WX_CONFIG=${X11BASE}/bin/wxgtk2-2.4-config CONFIGURE_ARGS+=--with-dvdcss=${LOCALBASE} \ --with-dvdread=${LOCALBASE} \ --with-mad=${LOCALBASE} \ @@ -54,7 +53,7 @@ CONFIGURE_ARGS+=--with-dvdcss=${LOCALBASE} \ --disable-libmpeg2 \ --program-prefix="" \ --without-libintl-prefix \ - --without-libiconv-prefix + --without-libiconv-prefix \ post-patch: @${REINPLACE_CMD} -e 's/-lc_r/${PTHREAD_LIBS}/' ${WRKSRC}/configure diff --git a/multimedia/vlc/distinfo b/multimedia/vlc/distinfo index a9274abdcee5..1024ef48d8e3 100644 --- a/multimedia/vlc/distinfo +++ b/multimedia/vlc/distinfo @@ -1 +1 @@ -MD5 (vlc-0.6.0.tar.gz) = a5e2f50ce6025fb8ff9e197b4ab5e12a +MD5 (vlc-0.6.2.tar.gz) = 619a45ca360d4a7bf935cb5ffd69989d diff --git a/multimedia/vlc/files/patch-configure b/multimedia/vlc/files/patch-configure index 2751c0139c98..5dfeef829dc6 100644 --- a/multimedia/vlc/files/patch-configure +++ b/multimedia/vlc/files/patch-configure @@ -8,12 +8,3 @@ ;; darwin*) SYS=darwin -@@ -14017,7 +14016,7 @@ - fi - - --#BUILTINS="${BUILTINS} mpeg_video_old idct idctclassic motion" -+BUILTINS="${BUILTINS} mpeg_video_old idct idctclassic motion" - PLUGINS="${PLUGINS} dummy rc logger gestures memcpy" - PLUGINS="${PLUGINS} es audio m4v mpeg_system ps ts avi asf aac mp4 rawdv" - PLUGINS="${PLUGINS} spudec mpeg_audio lpcm a52 dts cinepak" diff --git a/multimedia/vlc/files/patch-modules-codec-ffmpeg-ffmpeg.c b/multimedia/vlc/files/patch-modules-codec-ffmpeg-ffmpeg.c new file mode 100644 index 000000000000..23363319effa --- /dev/null +++ b/multimedia/vlc/files/patch-modules-codec-ffmpeg-ffmpeg.c @@ -0,0 +1,12 @@ +--- modules/codec/ffmpeg/ffmpeg.c.orig Fri Aug 8 19:08:32 2003 ++++ modules/codec/ffmpeg/ffmpeg.c Wed Nov 5 15:07:26 2003 +@@ -296,8 +296,7 @@ + avcodec_register_all(); + b_ffmpeginit = 1; + +- msg_Dbg( p_decoder->p_fifo, "libavcodec initialized (interface " +- LIBAVCODEC_BUILD_STR ")" ); ++ msg_Dbg( p_decoder->p_fifo, "libavcodec initialized" ); + } + else + { diff --git a/multimedia/vlc/files/patch-modules-codec-ffmpeg-ffmpeg.h b/multimedia/vlc/files/patch-modules-codec-ffmpeg-ffmpeg.h new file mode 100644 index 000000000000..b474a55d5747 --- /dev/null +++ b/multimedia/vlc/files/patch-modules-codec-ffmpeg-ffmpeg.h @@ -0,0 +1,14 @@ +--- modules/codec/ffmpeg/ffmpeg.h.orig Fri Aug 8 19:08:32 2003 ++++ modules/codec/ffmpeg/ffmpeg.h Wed Nov 5 15:10:17 2003 +@@ -49,11 +49,7 @@ + + } generic_thread_t; + +-#if LIBAVCODEC_BUILD >= 4663 +-# define LIBAVCODEC_PP +-#else + # undef LIBAVCODEC_PP +-#endif + + #define GetWLE( p ) \ + ( *(u8*)(p) + ( *((u8*)(p)+1) << 8 ) ) diff --git a/multimedia/vlc/files/patch-modules::codec::mpeg_video::parser.c b/multimedia/vlc/files/patch-modules::codec::mpeg_video::parser.c index 359baa7bf977..e69de29bb2d1 100644 --- a/multimedia/vlc/files/patch-modules::codec::mpeg_video::parser.c +++ b/multimedia/vlc/files/patch-modules::codec::mpeg_video::parser.c @@ -1,11 +0,0 @@ ---- modules/codec/mpeg_video/parser.c.orig Mon Jun 30 18:15:14 2003 -+++ modules/codec/mpeg_video/parser.c Mon Jun 30 18:16:37 2003 -@@ -143,7 +143,7 @@ - { - free( p_vpar ); - return( -1 ); -- ) -+ } - - /* - * Main loop - it is not executed if an error occured during diff --git a/multimedia/vlc/files/patch-modules::gui::wxwindows::menus.cpp b/multimedia/vlc/files/patch-modules::gui::wxwindows::menus.cpp index 4f9da4eca5a5..e69de29bb2d1 100644 --- a/multimedia/vlc/files/patch-modules::gui::wxwindows::menus.cpp +++ b/multimedia/vlc/files/patch-modules::gui::wxwindows::menus.cpp @@ -1,14 +0,0 @@ ---- modules/gui/wxwindows/menus.cpp.orig Mon Jun 30 15:22:03 2003 -+++ modules/gui/wxwindows/menus.cpp Mon Jun 30 15:24:40 2003 -@@ -516,9 +516,8 @@ - menuitem = - new wxMenuItemExt( menu, ++i_item_id, - text_list.p_list->p_values[i].psz_string ? -- wxU(text_list.p_list->p_values[i].psz_string): -- wxString::Format(wxT("%d"), -- val_list.p_list->p_values[i].i_int), -+ (wxString)wxU(text_list.p_list->p_values[i].psz_string): -+ (wxString)wxString::Format(wxT("%d"), val_list.p_list->p_values[i].i_int), - wxT(""), wxITEM_RADIO, strdup(psz_var), - p_object->i_object_id, - val_list.p_list->p_values[i], i_type ); diff --git a/multimedia/vlc/pkg-plist b/multimedia/vlc/pkg-plist index e450bd4c72f8..713dc928e654 100644 --- a/multimedia/vlc/pkg-plist +++ b/multimedia/vlc/pkg-plist @@ -62,6 +62,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 +lib/vlc/codec/libsubsdec_plugin.so lib/vlc/codec/libvorbis_plugin.so lib/vlc/control/libgestures_plugin.so lib/vlc/control/libhttp_plugin.so @@ -70,7 +71,6 @@ lib/vlc/demux/liba52sys_plugin.so lib/vlc/demux/libaac_plugin.so lib/vlc/demux/libasf_plugin.so lib/vlc/demux/libau_plugin.so -lib/vlc/demux/libaudio_plugin.so lib/vlc/demux/libavi_plugin.so lib/vlc/demux/libdemuxdump_plugin.so lib/vlc/demux/libdemuxsub_plugin.so @@ -81,6 +81,7 @@ 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/libogg_plugin.so lib/vlc/demux/libps_plugin.so lib/vlc/demux/librawdv_plugin.so @@ -88,18 +89,17 @@ lib/vlc/demux/libts_plugin.so lib/vlc/demux/libwav_plugin.so lib/vlc/gui/libgtk_plugin.so lib/vlc/gui/libwxwindows_plugin.so +lib/vlc/libffmpeg.a lib/vlc/libi420_rgb_mmx.a lib/vlc/libi420_ymga_mmx.a lib/vlc/libi420_yuy2_mmx.a lib/vlc/libi422_yuy2_mmx.a -lib/vlc/libidct.a -lib/vlc/libidctclassic.a lib/vlc/libmemcpy3dn.a lib/vlc/libmemcpymmx.a lib/vlc/libmemcpymmxext.a -lib/vlc/libmotion.a -lib/vlc/libmpeg_video_old.a +lib/vlc/libstream_out_transcode.a lib/vlc/misc/libdummy_plugin.so +lib/vlc/misc/libfreetype_plugin.so lib/vlc/misc/libgtk_main_plugin.so lib/vlc/misc/libhttpd_plugin.so lib/vlc/misc/libipv4_plugin.so @@ -110,6 +110,7 @@ lib/vlc/misc/libsap_plugin.so lib/vlc/misc/libscreensaver_plugin.so lib/vlc/mux/libmux_avi_plugin.so 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 @@ -119,6 +120,7 @@ lib/vlc/packetizer/libpacketizer_mpeg4audio_plugin.so lib/vlc/packetizer/libpacketizer_mpeg4video_plugin.so lib/vlc/packetizer/libpacketizer_mpegaudio_plugin.so lib/vlc/packetizer/libpacketizer_mpegvideo_plugin.so +lib/vlc/packetizer/libpacketizer_vorbis_plugin.so lib/vlc/stream_out/libstream_out_display_plugin.so lib/vlc/stream_out/libstream_out_dummy_plugin.so lib/vlc/stream_out/libstream_out_duplicate_plugin.so @@ -134,8 +136,8 @@ lib/vlc/video_filter/libcrop_plugin.so lib/vlc/video_filter/libdeinterlace_plugin.so lib/vlc/video_filter/libdistort_plugin.so lib/vlc/video_filter/libinvert_plugin.so +lib/vlc/video_filter/liblogo_plugin.so lib/vlc/video_filter/libmotionblur_plugin.so -lib/vlc/video_filter/libosdtext_plugin.so lib/vlc/video_filter/libtransform_plugin.so lib/vlc/video_filter/libwall_plugin.so lib/vlc/video_output/libvout_sdl_plugin.so @@ -155,11 +157,10 @@ share/vlc/familiar-forwardb16x16.xpm share/vlc/familiar-openb16x16.xpm share/vlc/familiar-pauseb16x16.xpm share/vlc/familiar-playb16x16.xpm +share/vlc/familiar-playlistb16x16.xpm share/vlc/familiar-preferencesb16x16.xpm share/vlc/familiar-rewindb16x16.xpm share/vlc/familiar-stopb16x16.xpm -share/vlc/font-eutopiabold21.rle -share/vlc/font-eutopiabold36.rle share/vlc/gnome-vlc16x16.png share/vlc/gnome-vlc32x32.png share/vlc/gnome-vlc32x32.xpm @@ -169,10 +170,23 @@ share/vlc/gvlc32x32.png share/vlc/gvlc32x32.xpm share/vlc/gvlc48x48.ico share/vlc/gvlc48x48.png +share/vlc/http/admin/browse.html +share/vlc/http/admin/index.html +share/vlc/http/admin/.access +share/vlc/http/index.html +share/vlc/http/info.html share/vlc/kvlc16x16.png share/vlc/kvlc32x32.png share/vlc/kvlc32x32.xpm share/vlc/kvlc48x48.png +share/vlc/pda-forwardb16x16.xpm +share/vlc/pda-openb16x16.xpm +share/vlc/pda-pauseb16x16.xpm +share/vlc/pda-playb16x16.xpm +share/vlc/pda-playlistb16x16.xpm +share/vlc/pda-preferencesb16x16.xpm +share/vlc/pda-rewindb16x16.xpm +share/vlc/pda-stopb16x16.xpm share/vlc/qvlc16x16.png share/vlc/qvlc32x32.png share/vlc/qvlc32x32.xpm @@ -229,6 +243,8 @@ share/vlc/vlc48x48.ico share/vlc/vlc48x48.png @dirrm share/vlc/skins/default @dirrm share/vlc/skins +@dirrm share/vlc/http/admin +@dirrm share/vlc/http @dirrm share/vlc @dirrm lib/vlc/visualization @dirrm lib/vlc/video_output |