Merge branch 'master' of ssh://piernov.org/srv/git/nutyx-extra

6 files changed, 10 insertions, 27 deletions

diff --git a/vlc/.footprint.i686 b/vlc/.footprint.i686
index 6f009d19a..9d298f687 100644
--- a/vlc/.footprint.i686
+++ b/vlc/.footprint.i686
@@ -350,8 +350,6 @@ drwxr-xr-x	root/root	usr/lib/vlc/plugins/codec/
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/codec/libcvdsub_plugin.so
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/codec/libddummy_plugin.la
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/codec/libddummy_plugin.so
--rwxr-xr-x	root/root	usr/lib/vlc/plugins/codec/libdmo_plugin.la
--rwxr-xr-x	root/root	usr/lib/vlc/plugins/codec/libdmo_plugin.so
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/codec/libdts_plugin.la
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/codec/libdts_plugin.so
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/codec/libdvbsub_plugin.la
@@ -446,6 +444,8 @@ drwxr-xr-x	root/root	usr/lib/vlc/plugins/demux/
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/demux/libh264_plugin.so
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/demux/libimage_plugin.la
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/demux/libimage_plugin.so
+-rwxr-xr-x	root/root	usr/lib/vlc/plugins/demux/liblive555_plugin.la
+-rwxr-xr-x	root/root	usr/lib/vlc/plugins/demux/liblive555_plugin.so
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/demux/libmjpeg_plugin.la
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/demux/libmjpeg_plugin.so
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/demux/libmkv_plugin.la
@@ -883,6 +883,7 @@ drwxr-xr-x	root/root	usr/share/vlc/lua/http/
 -rw-r--r--	root/root	usr/share/vlc/lua/http/.hosts
 drwxr-xr-x	root/root	usr/share/vlc/lua/http/css/
 -rw-r--r--	root/root	usr/share/vlc/lua/http/css/main.css
+-rw-r--r--	root/root	usr/share/vlc/lua/http/css/mobile.css
 drwxr-xr-x	root/root	usr/share/vlc/lua/http/css/ui-lightness/
 drwxr-xr-x	root/root	usr/share/vlc/lua/http/css/ui-lightness/images/
 -rw-r--r--	root/root	usr/share/vlc/lua/http/css/ui-lightness/images/ui-bg_diagonals-thick_18_b81900_40x40.png
diff --git a/vlc/.footprint.x86_64 b/vlc/.footprint.x86_64
index 6f009d19a..9d298f687 100644
--- a/vlc/.footprint.x86_64
+++ b/vlc/.footprint.x86_64
@@ -350,8 +350,6 @@ drwxr-xr-x	root/root	usr/lib/vlc/plugins/codec/
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/codec/libcvdsub_plugin.so
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/codec/libddummy_plugin.la
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/codec/libddummy_plugin.so
--rwxr-xr-x	root/root	usr/lib/vlc/plugins/codec/libdmo_plugin.la
--rwxr-xr-x	root/root	usr/lib/vlc/plugins/codec/libdmo_plugin.so
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/codec/libdts_plugin.la
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/codec/libdts_plugin.so
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/codec/libdvbsub_plugin.la
@@ -446,6 +444,8 @@ drwxr-xr-x	root/root	usr/lib/vlc/plugins/demux/
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/demux/libh264_plugin.so
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/demux/libimage_plugin.la
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/demux/libimage_plugin.so
+-rwxr-xr-x	root/root	usr/lib/vlc/plugins/demux/liblive555_plugin.la
+-rwxr-xr-x	root/root	usr/lib/vlc/plugins/demux/liblive555_plugin.so
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/demux/libmjpeg_plugin.la
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/demux/libmjpeg_plugin.so
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/demux/libmkv_plugin.la
@@ -883,6 +883,7 @@ drwxr-xr-x	root/root	usr/share/vlc/lua/http/
 -rw-r--r--	root/root	usr/share/vlc/lua/http/.hosts
 drwxr-xr-x	root/root	usr/share/vlc/lua/http/css/
 -rw-r--r--	root/root	usr/share/vlc/lua/http/css/main.css
+-rw-r--r--	root/root	usr/share/vlc/lua/http/css/mobile.css
 drwxr-xr-x	root/root	usr/share/vlc/lua/http/css/ui-lightness/
 drwxr-xr-x	root/root	usr/share/vlc/lua/http/css/ui-lightness/images/
 -rw-r--r--	root/root	usr/share/vlc/lua/http/css/ui-lightness/images/ui-bg_diagonals-thick_18_b81900_40x40.png
diff --git a/vlc/.md5sum.i686 b/vlc/.md5sum.i686
index 76887c6c4..ac4f07488 100644
--- a/vlc/.md5sum.i686
+++ b/vlc/.md5sum.i686
@@ -1,2 +1 @@
-975f8f9fe9b187512ed8dabb0b8aa6b8  access_smb_link_to_smbclient.patch
-8806bff2ea9c76791123d444a92f708c  vlc-2.0.0.tar.xz
+5ad114755670e4881a2b35354e2f79bc  vlc-2.0.1.tar.xz
diff --git a/vlc/.md5sum.x86_64 b/vlc/.md5sum.x86_64
index 76887c6c4..ac4f07488 100644
--- a/vlc/.md5sum.x86_64
+++ b/vlc/.md5sum.x86_64
@@ -1,2 +1 @@
-975f8f9fe9b187512ed8dabb0b8aa6b8  access_smb_link_to_smbclient.patch
-8806bff2ea9c76791123d444a92f708c  vlc-2.0.0.tar.xz
+5ad114755670e4881a2b35354e2f79bc  vlc-2.0.1.tar.xz
diff --git a/vlc/Pkgfile b/vlc/Pkgfile
index 9c8e747cb..d4bae86db 100644
--- a/vlc/Pkgfile
+++ b/vlc/Pkgfile
@@ -6,16 +6,14 @@
 # Run on: libshout,lua,ffmpeg,flac,freetype,fribidi,lame,libcdio,libdvbpsi,libdvdcss,libdvdread,libdvdnav,libebml,libiconv,libid3tag,libmad,libmatroska,libogg,libpng,speex,libtheora,libvorbis,libxml2,libmpeg2,openslp,portaudio,lame,vcdimager,x264,aalib,libcaca,libmpeg2,libopendaap,libmp4v2,live,libdca,sdl_image,qt,libnotify,libmpcdec,librsvg,libraw1394,libavc1394,samba3,taglib,gnutls,pulseaudio,gnome-vfs,vdpau-video,sdl_image
 
 name=vlc
-version=2.0.0
+version=2.0.1
 release=1
-source=(http://download.videolan.org/pub/videolan/vlc/$version/vlc-$version.tar.xz
-	access_smb_link_to_smbclient.patch)
+source=(http://download.videolan.org/pub/videolan/vlc/$version/vlc-$version.tar.xz)
 
 build() {
 	cd vlc-$version
 
 	sed -i -e 's|truetype/freefont/FreeSerifBold.ttf|TTF/DejaVuSerif-Bold.ttf|' modules/text_renderer/freetype.c
-	patch -p1 < ../access_smb_link_to_smbclient.patch
 
 	case `uname -m` in
 		x86_64)
diff --git a/vlc/access_smb_link_to_smbclient.patch b/vlc/access_smb_link_to_smbclient.patch
deleted file mode 100644
index 7cd6ea7b9..000000000
--- a/vlc/access_smb_link_to_smbclient.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-X-Git-Url: http://git.videolan.org/?p=vlc.git;a=blobdiff_plain;f=modules%2Faccess%2FModules.am;h=be8c47b8fee03e5f4fc42c61b8e13f2d6ad587df;hp=81d8e78edc214026ceff3b17996b7bdbc47b3c26;hb=718b1f9901e5077b50c2189604afba883ca87bf7;hpb=84a1a3461adf901ff134a09eb4341cc301fdc6dd
-
-diff --git a/modules/access/Modules.am b/modules/access/Modules.am
-index 81d8e78..be8c47b 100644
---- a/modules/access/Modules.am
-+++ b/modules/access/Modules.am
-@@ -36,7 +36,7 @@ libsdp_plugin_la_DEPENDENCIES =
-
- libaccess_smb_plugin_la_SOURCES = smb.c
- libaccess_smb_plugin_la_CFLAGS = $(AM_CFLAGS)
--libaccess_smb_plugin_la_LIBADD = $(AM_LIBADD)
-+libaccess_smb_plugin_la_LIBADD = $(AM_LIBADD) $(LIBS_access_smb)
- if HAVE_WIN32
- libaccess_smb_plugin_la_LIBADD += -lmpr
- endif