r839 - in /uniways/vlc/debian: ./ patches/
sho at users.alioth.debian.org
sho at users.alioth.debian.org
Thu Aug 2 12:57:27 UTC 2007
Author: sho
Date: Thu Aug 2 12:57:27 2007
New Revision: 839
URL: http://svn.debian.org/wsvn/pkg-multimedia/?sc=1&rev=839
Log:
* Merged Uniways changes with latest Etch package.
Added:
uniways/vlc/debian/patches/uniways-remove-verbosity.diff
uniways/vlc/debian/patches/uniways-stop-unviewed-streams.diff
uniways/vlc/debian/visiomobile-vlc.desktop
uniways/vlc/debian/visiomobile-vlc.dirs
uniways/vlc/debian/visiomobile-vlc.docs
uniways/vlc/debian/visiomobile-vlc.init.d (with props)
uniways/vlc/debian/visiomobile-vlc.install
uniways/vlc/debian/visiomobile-vlc.menu
uniways/vlc/debian/visiomobile-vlc.mime
uniways/vlc/debian/visiomobile-vlc.postinst
uniways/vlc/debian/visiomobile-vlc.postrm
uniways/vlc/debian/visiomobile-vlc.preinst
uniways/vlc/debian/visiomobile-vlc.prerm
uniways/vlc/debian/vlc.sh (with props)
Removed:
uniways/vlc/debian/vlc-nox.dirs
uniways/vlc/debian/vlc-nox.install
Modified:
uniways/vlc/debian/changelog
uniways/vlc/debian/control
uniways/vlc/debian/patches/series
uniways/vlc/debian/rules
Modified: uniways/vlc/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-multimedia/uniways/vlc/debian/changelog?rev=839&op=diff
==============================================================================
--- uniways/vlc/debian/changelog (original)
+++ uniways/vlc/debian/changelog Thu Aug 2 12:57:27 2007
@@ -1,4 +1,6 @@
vlc (0.8.6-svn20061012.debian-5uniways1) stable; urgency=low
+
+ * Merged Uniways changes with latest Etch package.
* debian/patches/uniways-grayscale-support.diff:
+ Backported grayscale support.
Modified: uniways/vlc/debian/control
URL: http://svn.debian.org/wsvn/pkg-multimedia/uniways/vlc/debian/control?rev=839&op=diff
==============================================================================
--- uniways/vlc/debian/control (original)
+++ uniways/vlc/debian/control Thu Aug 2 12:57:27 2007
@@ -11,7 +11,7 @@
Package: vlc
Section: graphics
Architecture: any
-Depends: vlc-nox (= ${Source-Version}), ${shlibs:Depends}, ${misc:Depends}, ttf-dejavu
+Depends: visiomobile-vlc (= ${Source-Version}), ${shlibs:Depends}, ${misc:Depends}, ttf-dejavu
Recommends: videolan-doc
Suggests: mozilla-plugin-vlc
Replaces: vlc-plugin-dvb (<< 0.5.2-2), vlc-plugin-xosd (<< 0.5.2-2), vlc-plugin-dv (<< 0.5.2-2), vlc-plugin-mad (<< 0.5.2-2), vlc-mad (<< 0.5.0), vlc-plugin-a52 (<< 0.5.2-2), vlc-plugin-ogg (<< 0.5.2-2), vlc-plugin-lirc (<< 0.5.2-2), vlc-lirc (<< 0.5.0), vlc-plugin-aa (<< 0.5.2-2), vlc-aa (<< 0.5.0), wxvlc (<< 0.8.5-test3.debian-4), vlc-plugin-alsa (<< 0.8.5-test3.debian-4)
@@ -34,7 +34,7 @@
vlc-plugin-glide, vlc-plugin-svgalib). There is also a web browser plugin
in the mozilla-plugin-vlc package.
-Package: vlc-nox
+Package: visiomobile-vlc
Section: net
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -89,7 +89,7 @@
Package: vlc-plugin-esd
Architecture: any
-Depends: vlc-nox, ${shlibs:Depends}, ${misc:Depends}
+Depends: visiomobile-vlc, ${shlibs:Depends}, ${misc:Depends}
Conflicts: vlc-esd (<< 0.5.0)
Replaces: vlc-esd (<< 0.5.0)
Description: Esound audio output plugin for VLC
@@ -113,7 +113,7 @@
Package: vlc-plugin-sdl
Architecture: any
-Depends: vlc-nox, ${shlibs:Depends}, ${misc:Depends}
+Depends: visiomobile-vlc, ${shlibs:Depends}, ${misc:Depends}
Conflicts: vlc-sdl (<< 0.5.0)
Replaces: vlc-sdl (<< 0.5.0)
Description: SDL video and audio output plugin for VLC
@@ -128,7 +128,7 @@
Package: vlc-plugin-ggi
Architecture: any
-Depends: vlc-nox, ${shlibs:Depends}, ${misc:Depends}
+Depends: visiomobile-vlc, ${shlibs:Depends}, ${misc:Depends}
Conflicts: vlc-ggi (<< 0.5.0)
Replaces: vlc-ggi (<< 0.5.0)
Description: GGI video output plugin for VLC
@@ -142,7 +142,7 @@
Package: vlc-plugin-glide
Architecture: i386
-Depends: vlc-nox, ${shlibs:Depends}, libglide2
+Depends: visiomobile-vlc, ${shlibs:Depends}, libglide2
Conflicts: vlc-glide (<< 0.5.0)
Replaces: vlc-glide (<< 0.5.0)
Description: Glide video output plugin for VLC
@@ -156,7 +156,7 @@
Package: vlc-plugin-arts
Architecture: any
-Depends: vlc-nox, ${shlibs:Depends}, ${misc:Depends}
+Depends: visiomobile-vlc, ${shlibs:Depends}, ${misc:Depends}
Conflicts: vlc-arts (<< 0.5.0)
Replaces: vlc-arts (<< 0.5.0)
Description: aRts audio output plugin for VLC
@@ -170,7 +170,7 @@
Package: mozilla-plugin-vlc
Architecture: any
-Depends: vlc-nox (= ${Source-Version}), vlc, ${shlibs:Depends}, ${misc:Depends}
+Depends: visiomobile-vlc (= ${Source-Version}), vlc, ${shlibs:Depends}, ${misc:Depends}
Description: multimedia plugin for web browsers based on VLC
This plugin adds support for MPEG, MPEG2, DVD, DivX, Ogg/Vorbis and many
more formats to your Gecko-based web browser (Firefox, Galeon, etc.). The
@@ -184,7 +184,7 @@
Package: vlc-plugin-svgalib
Architecture: i386
-Depends: vlc-nox (= ${Source-Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: visiomobile-vlc (= ${Source-Version}), ${shlibs:Depends}, ${misc:Depends}
Description: SVGAlib video output plugin for VLC
This plugin adds support for SVGAlib to the VLC media player. To
activate it, use the `--vout svgalib' flag or select the `svgalib' video
Modified: uniways/vlc/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-multimedia/uniways/vlc/debian/patches/series?rev=839&op=diff
==============================================================================
--- uniways/vlc/debian/patches/series (original)
+++ uniways/vlc/debian/patches/series Thu Aug 2 12:57:27 2007
@@ -25,4 +25,6 @@
patch-missingchecks-0.8.6debian-0.8.6c.diff
patch-overflows-0.8.6debian-0.8.6c.diff
patch-uninitialised-0.8.6debian-0.8.6c.diff
+uniways-remove-verbosity.diff
+uniways-stop-unviewed-streams.diff
uniways-grayscale-support.diff -p0
Added: uniways/vlc/debian/patches/uniways-remove-verbosity.diff
URL: http://svn.debian.org/wsvn/pkg-multimedia/uniways/vlc/debian/patches/uniways-remove-verbosity.diff?rev=839&op=file
==============================================================================
--- uniways/vlc/debian/patches/uniways-remove-verbosity.diff (added)
+++ uniways/vlc/debian/patches/uniways-remove-verbosity.diff Thu Aug 2 12:57:27 2007
@@ -1,0 +1,15 @@
+Index: vlc-0.8.5.debian/modules/demux/mjpeg.c
+===================================================================
+--- vlc-0.8.5.debian.orig/modules/demux/mjpeg.c 2006-09-15 15:44:18.000000000 +0200
++++ vlc-0.8.5.debian/modules/demux/mjpeg.c 2006-09-15 15:45:24.000000000 +0200
+@@ -234,6 +234,10 @@
+ b_jpeg = VLC_TRUE;
+ }
+ }
++ else if( !strncasecmp( psz_line, "Content-Length:", 15 ) )
++ {
++ /* Do nothing */ ;
++ }
+ else
+ {
+ msg_Dbg( p_demux, "discard MIME header: %s", psz_line );
Added: uniways/vlc/debian/patches/uniways-stop-unviewed-streams.diff
URL: http://svn.debian.org/wsvn/pkg-multimedia/uniways/vlc/debian/patches/uniways-stop-unviewed-streams.diff?rev=839&op=file
==============================================================================
--- uniways/vlc/debian/patches/uniways-stop-unviewed-streams.diff (added)
+++ uniways/vlc/debian/patches/uniways-stop-unviewed-streams.diff Thu Aug 2 12:57:27 2007
@@ -1,0 +1,158 @@
+Index: vlc-0.8.5.debian/modules/access_output/udp.c
+===================================================================
+--- vlc-0.8.5.debian.orig/modules/access_output/udp.c 2006-09-14 11:26:52.000000000 +0200
++++ vlc-0.8.5.debian/modules/access_output/udp.c 2006-09-14 11:27:13.000000000 +0200
+@@ -34,6 +34,7 @@
+
+ #include <vlc/vlc.h>
+ #include <vlc/sout.h>
++#include <vlc/input.h>
+
+ #ifdef HAVE_UNISTD_H
+ # include <unistd.h>
+@@ -173,6 +174,7 @@
+ {
+ sout_access_out_t *p_access = (sout_access_out_t*)p_this;
+ sout_access_out_sys_t *p_sys;
++ sout_instance_t *p_sout;
+
+ char *psz_parser;
+ char *psz_dst_addr;
+@@ -510,6 +512,15 @@
+ # define strerror( x ) winsock_strerror( strerror_buf )
+ #endif
+
++ mtime_t date_last_send_error = -1;
++ mtime_t time_without_send_error = -1;
++ mtime_t time_start_error = -1;
++ mtime_t date_last_cancelation = -1;
++ mtime_t error_delay = 3000000; /* 3s */
++ mtime_t stop_delay = 45000000; /* 45s */
++ mtime_t cancelation_delay = 5000000; /* 5s */
++ char b_error = VLC_FALSE;
++
+ while( !p_thread->b_die )
+ {
+ block_t *p_pk;
+@@ -557,10 +566,59 @@
+ mwait( i_date );
+ i_to_send = p_thread->i_group;
+ }
++
++ mtime_t now = mdate();
++
+ if( send( p_thread->i_handle, p_pk->p_buffer, p_pk->i_buffer, 0 )
+ == -1 )
+ {
+- msg_Warn( p_thread, "send error: %s", strerror(errno) );
++ date_last_send_error = now;
++ time_without_send_error = 0;
++ }
++ else
++ {
++ time_without_send_error = (now - date_last_send_error);
++ }
++
++ if (time_without_send_error > error_delay && b_error) {
++ b_error = VLC_FALSE;
++ } else {
++ if(!b_error) {
++ b_error = VLC_TRUE;
++ time_start_error = now;
++ }
++ }
++
++ if ( time_start_error != -1 && (now - time_start_error) > stop_delay && now > date_last_cancelation + cancelation_delay)
++ {
++ date_last_cancelation = now;
++ input_thread_t *p_input;
++
++ if( !p_thread->p_sout->psz_sdp_info )
++ {
++ msg_Err( p_this, "ouh putain ca craint" );
++ }
++ else
++ {
++ char command[BUFSIZ];
++ char *psz_server;
++
++ psz_server = getenv("VISIOMOBILE_HOST");
++ if( ! psz_server || ! *psz_server )
++ {
++ psz_server = "visiomobile.eu";
++ }
++
++ snprintf( command, BUFSIZ - 1, "%s%s%s%s%s", "wget -qO- \"http://", psz_server, "/tel_vlc.php?mode=cancel&sdp=", p_thread->p_sout->psz_sdp_info, "\" &" );
++ msg_Warn( p_thread, "in error mode for too long, canceling camera using `%s'", command);
++ system( command );
++ }
++
++ p_input = (input_thread_t *) vlc_object_find( p_thread, VLC_OBJECT_INPUT, FIND_PARENT );
++ if( p_input ) {
++ p_input->b_error = VLC_TRUE;
++ vlc_object_release( p_input );
++ }
+ }
+
+ if( i_dropped_packets )
+Index: vlc-0.8.5.debian/include/stream_output.h
+===================================================================
+--- vlc-0.8.5.debian.orig/include/stream_output.h 2006-09-14 11:26:52.000000000 +0200
++++ vlc-0.8.5.debian/include/stream_output.h 2006-09-14 11:26:54.000000000 +0200
+@@ -50,6 +50,9 @@
+
+ /* sout private */
+ sout_instance_sys_t *p_sys;
++
++ /* Ugly Uniways hack */
++ char *psz_sdp_info;
+ };
+
+ /****************************************************************************
+Index: vlc-0.8.5.debian/src/stream_output/stream_output.c
+===================================================================
+--- vlc-0.8.5.debian.orig/src/stream_output/stream_output.c 2006-09-14 11:26:52.000000000 +0200
++++ vlc-0.8.5.debian/src/stream_output/stream_output.c 2006-09-14 11:27:31.000000000 +0200
+@@ -126,6 +126,7 @@
+ p_sout->p_meta = NULL;
+ p_sout->i_out_pace_nocontrol = 0;
+ p_sout->p_sys = NULL;
++ p_sout->psz_sdp_info = NULL;
+
+ vlc_mutex_init( p_sout, &p_sout->lock );
+ if( psz_dest && psz_dest[0] == '#' )
+Index: vlc-0.8.5.debian/modules/stream_out/rtp.c
+===================================================================
+--- vlc-0.8.5.debian.orig/modules/stream_out/rtp.c 2006-09-14 11:26:52.000000000 +0200
++++ vlc-0.8.5.debian/modules/stream_out/rtp.c 2006-09-14 11:59:22.000000000 +0200
+@@ -744,6 +744,8 @@
+ }
+ else if( url.psz_protocol && !strcasecmp( url.psz_protocol, "file" ) )
+ {
++ char *psz_parser;
++
+ if( p_sys->b_export_sdp_file )
+ {
+ msg_Err( p_stream, "you can use sdp=file:// only once" );
+@@ -754,6 +756,21 @@
+ if( psz_url[0] == '/' && psz_url[1] == '/' )
+ psz_url += 2;
+ p_sys->psz_sdp_file = strdup( psz_url );
++
++ /* Found SDP file, parsing it (Uniways kludge) */
++ psz_parser = strrchr( psz_url, '/' );
++ if( psz_parser )
++ {
++ char *psz_sdp_info = psz_parser + 1;
++
++ psz_parser = strrchr( psz_parser, '.' );
++ if( psz_parser )
++ {
++ *psz_parser = '\0';
++ msg_Dbg( p_stream, "storing SDP info %s", psz_sdp_info );
++ p_stream->p_sout->psz_sdp_info = strdup( psz_sdp_info );
++ }
++ }
+ }
+ else
+ {
Modified: uniways/vlc/debian/rules
URL: http://svn.debian.org/wsvn/pkg-multimedia/uniways/vlc/debian/rules?rev=839&op=diff
==============================================================================
--- uniways/vlc/debian/rules (original)
+++ uniways/vlc/debian/rules Thu Aug 2 12:57:27 2007
@@ -163,10 +163,10 @@
clean:
dh_testdir
dh_testroot
- sed -e '/lib\(alsa\|dv\|v4l\|pvr\)_/d' debian/vlc-nox.install \
- > debian/vlc-nox.install.kfreebsd-i386
- cp debian/vlc-nox.install.kfreebsd-i386 \
- debian/vlc-nox.install.kfreebsd-amd64
+ sed -e '/lib\(alsa\|dv\|v4l\|pvr\)_/d' debian/visiomobile-vlc.install \
+ > debian/visiomobile-vlc.install.kfreebsd-i386
+ cp debian/visiomobile-vlc.install.kfreebsd-i386 \
+ debian/visiomobile-vlc.install.kfreebsd-amd64
rm -f configure-stamp build-stamp
# Check that we have an x264 tree in here (can be a symlink)
test -d extras/x264
@@ -213,10 +213,10 @@
# Install stuff
dh_install -si --fail-missing --sourcedir=debian/tmp
- # Check that we did not install a plugin linked with libX11 in vlc-nox
+ # Check that we did not install a plugin linked with libX11 in visiomobile-vlc
ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
BORKED=no; \
- for file in $$(find debian/vlc-nox/usr/lib/vlc -name '*.so'); do \
+ for file in $$(find debian/visiomobile-vlc/usr/lib/vlc -name '*.so'); do \
if ldd $$file | grep -q libX11; then \
BORKED=yes; \
echo $$file depends on libX11; \
@@ -230,7 +230,7 @@
ln -s vlc.1.gz debian/vlc/usr/share/man/man1/wxvlc.1.gz
# /usr/share/doc symlinks
- ln -s vlc debian/vlc-nox/usr/share/doc/vlc-nox
+ ln -s vlc debian/visiomobile-vlc/usr/share/doc/visiomobile-vlc
ln -s libvlc0 debian/libvlc0-dev/usr/share/doc/libvlc0-dev
ln -s vlc debian/vlc-plugin-esd/usr/share/doc/vlc-plugin-esd
ln -s vlc debian/vlc-plugin-sdl/usr/share/doc/vlc-plugin-sdl
@@ -270,15 +270,16 @@
dh_testdir
dh_testroot
# dh_installdebconf
- dh_installdocs -p vlc-nox
+ dh_installdocs -p visiomobile-vlc
dh_installdocs -p libvlc0
- dh_buildinfo -p vlc-nox
+ dh_buildinfo -p visiomobile-vlc
# dh_installexamples
+ dh_installinit
dh_installmenu -s
dh_installmime -s
- dh_installman doc/vlc.1 -p vlc-nox
+ dh_installman doc/vlc.1 -p visiomobile-vlc
dh_installman doc/vlc-config.1 -p libvlc0-dev
- dh_installchangelogs ChangeLog -p vlc-nox
+ dh_installchangelogs ChangeLog -p visiomobile-vlc
dh_installchangelogs ChangeLog -p libvlc0
dh_link -s
dh_strip -s
Added: uniways/vlc/debian/visiomobile-vlc.desktop
URL: http://svn.debian.org/wsvn/pkg-multimedia/uniways/vlc/debian/visiomobile-vlc.desktop?rev=839&op=file
==============================================================================
--- uniways/vlc/debian/visiomobile-vlc.desktop (added)
+++ uniways/vlc/debian/visiomobile-vlc.desktop Thu Aug 2 12:57:27 2007
@@ -1,0 +1,13 @@
+[Desktop Entry]
+Encoding=UTF-8
+Version=0.9.2
+Name=VLC media player
+Name[fr]=lecteur multimédia VLC
+Comment=Universal movies and music player
+Comment[fr]=Lecteur universel pour films et musique
+Exec=wxvlc
+Icon=vlc
+Terminal=false
+Type=Application
+Categories=Application;AudioVideo;Player;
+MimeType=video/dv;video/mpeg;video/x-mpeg;video/msvideo;video/quicktime;video/x-anim;video/x-avi;video/x-ms-asf;video/x-ms-wmv;video/x-msvideo;video/x-nsv;video/x-flc;video/x-fli;application/ogg;application/x-ogg;application/x-matroska;audio/x-mp3;audio/x-mpeg;audio/mpeg;audio/x-wav;audio/x-mpegurl;audio/x-scpls;audio/x-m4a;audio/x-ms-asf;audio/x-ms-asx;audio/x-ms-wax;application/vnd.rn-realmedia;audio/x-real-audio;audio/x-pn-realaudio;application/x-flac;audio/x-flac;application/x-shockwave-flash;misc/ultravox;application/x-matroska;audio/vnd.rn-realaudio;audio/x-pn-aiff;audio/x-pn-au;audio/x-pn-wav;audio/x-pn-windows-acm;image/vnd.rn-realpix;video/vnd.rn-realvideo;audio/x-pn-realaudio-plugin;
Added: uniways/vlc/debian/visiomobile-vlc.dirs
URL: http://svn.debian.org/wsvn/pkg-multimedia/uniways/vlc/debian/visiomobile-vlc.dirs?rev=839&op=file
==============================================================================
--- uniways/vlc/debian/visiomobile-vlc.dirs (added)
+++ uniways/vlc/debian/visiomobile-vlc.dirs Thu Aug 2 12:57:27 2007
@@ -1,0 +1,19 @@
+usr/bin
+usr/lib/vlc/access
+usr/lib/vlc/audio_filter
+usr/lib/vlc/audio_mixer
+usr/lib/vlc/audio_output
+usr/lib/vlc/codec
+usr/lib/vlc/control
+usr/lib/vlc/demux
+usr/lib/vlc/gui
+usr/lib/vlc/misc
+usr/lib/vlc/video_chroma
+usr/lib/vlc/video_filter
+usr/lib/vlc/video_output
+usr/lib/vlc/visualization
+usr/share/doc/visiomobile-vlc
+usr/share/applications
+usr/share/pixmaps
+usr/share/vlc
+usr/share/man/man1
Added: uniways/vlc/debian/visiomobile-vlc.docs
URL: http://svn.debian.org/wsvn/pkg-multimedia/uniways/vlc/debian/visiomobile-vlc.docs?rev=839&op=file
==============================================================================
--- uniways/vlc/debian/visiomobile-vlc.docs (added)
+++ uniways/vlc/debian/visiomobile-vlc.docs Thu Aug 2 12:57:27 2007
@@ -1,0 +1,6 @@
+debian/README.Debian
+AUTHORS
+MAINTAINERS
+NEWS
+README
+THANKS
Added: uniways/vlc/debian/visiomobile-vlc.init.d
URL: http://svn.debian.org/wsvn/pkg-multimedia/uniways/vlc/debian/visiomobile-vlc.init.d?rev=839&op=file
==============================================================================
--- uniways/vlc/debian/visiomobile-vlc.init.d (added)
+++ uniways/vlc/debian/visiomobile-vlc.init.d Thu Aug 2 12:57:27 2007
@@ -1,0 +1,34 @@
+#! /bin/sh
+# Script de démarrage des services VLC de videolan
+
+set -e
+
+#test $UID == 0 || test $UID == 1000 || echo "Denied" && exit 1
+
+VLC_SH=/usr/bin/vlc.sh
+
+case "$1" in
+
+ start)
+ echo -n "Starting VLC: "
+ screen -d -m -S vlc "$VLC_SH"
+ echo "done."
+ ;;
+
+ stop)
+ echo -n "Stopping VLC: "
+ pkill -f "SCREEN -d -m -S vlc" || true
+ echo "done."
+ ;;
+
+ force-reload|restart)
+ $0 stop
+ sleep 1
+ $0 start
+ ;;
+
+ *)
+ echo "Usage: /etc/init.d/videolan {start|stop|restart}"
+ ;;
+
+esac
Propchange: uniways/vlc/debian/visiomobile-vlc.init.d
------------------------------------------------------------------------------
svn:executable = *
Added: uniways/vlc/debian/visiomobile-vlc.install
URL: http://svn.debian.org/wsvn/pkg-multimedia/uniways/vlc/debian/visiomobile-vlc.install?rev=839&op=file
==============================================================================
--- uniways/vlc/debian/visiomobile-vlc.install (added)
+++ uniways/vlc/debian/visiomobile-vlc.install Thu Aug 2 12:57:27 2007
@@ -1,0 +1,68 @@
+../../debian/vlc.sh usr/bin
+usr/bin/vlc
+usr/share/doc
+usr/share/locale
+usr/share/vlc/http
+usr/share/vlc/osdmenu
+usr/lib/vlc/access/libdvb_plugin.so
+usr/lib/vlc/access/libpvr_plugin.so
+usr/lib/vlc/access/libv4l_plugin.so
+usr/lib/vlc/access/libvcd_plugin.so
+usr/lib/vlc/access/libvcdx_plugin.so
+usr/lib/vlc/access/libaccess_*.so
+usr/lib/vlc/access/libdvdnav_plugin.so
+usr/lib/vlc/access/libdvdread_plugin.so
+usr/lib/vlc/access/libcdda_plugin.so
+usr/lib/vlc/access_filter
+usr/lib/vlc/access_output
+usr/lib/vlc/audio_filter
+usr/lib/vlc/audio_mixer
+usr/lib/vlc/audio_output/libalsa_plugin.so
+usr/lib/vlc/audio_output/libaout_file_plugin.so
+usr/lib/vlc/audio_output/liboss_plugin.so
+usr/lib/vlc/codec/libcmml_plugin.so
+usr/lib/vlc/codec/libffmpeg_plugin.so
+usr/lib/vlc/codec/libspudec_plugin.so
+usr/lib/vlc/codec/liba52_plugin.so
+usr/lib/vlc/codec/libcinepak_plugin.so
+usr/lib/vlc/codec/libdts_plugin.so
+usr/lib/vlc/codec/libflacdec_plugin.so
+usr/lib/vlc/codec/liblpcm_plugin.so
+usr/lib/vlc/codec/libaraw_plugin.so
+usr/lib/vlc/codec/libvorbis_plugin.so
+usr/lib/vlc/codec/libspeex_plugin.so
+usr/lib/vlc/codec/libadpcm_plugin.so
+usr/lib/vlc/codec/libmpeg_audio_plugin.so
+usr/lib/vlc/codec/liblibmpeg2_plugin.so
+usr/lib/vlc/codec/librawvideo_plugin.so
+usr/lib/vlc/codec/libsubsdec_plugin.so
+usr/lib/vlc/codec/libdvbsub_plugin.so
+usr/lib/vlc/codec/libtwolame_plugin.so
+usr/lib/vlc/codec/libpng_plugin.so
+usr/lib/vlc/codec/libsvcdsub_plugin.so
+usr/lib/vlc/codec/libcvdsub_plugin.so
+usr/lib/vlc/codec/libfake_plugin.so
+usr/lib/vlc/control
+usr/lib/vlc/demux
+usr/lib/vlc/gui/libncurses_plugin.so
+usr/lib/vlc/misc/libscreensaver_plugin.so
+usr/lib/vlc/misc/libdummy_plugin.so
+usr/lib/vlc/misc/libmemcpy_plugin.so
+usr/lib/vlc/misc/libipv4_plugin.so
+usr/lib/vlc/misc/libipv6_plugin.so
+usr/lib/vlc/misc/libexport_plugin.so
+usr/lib/vlc/misc/libxtag_plugin.so
+usr/lib/vlc/misc/libxml_plugin.so
+usr/lib/vlc/misc/libfreetype_plugin.so
+usr/lib/vlc/misc/liblogger_plugin.so
+usr/lib/vlc/misc/libvod_rtsp_plugin.so
+usr/lib/vlc/misc/libgnutls_plugin.so
+usr/lib/vlc/misc/libgrowl_plugin.so
+usr/lib/vlc/mux
+usr/lib/vlc/packetizer
+usr/lib/vlc/services_discovery
+usr/lib/vlc/stream_out
+usr/lib/vlc/video_chroma
+usr/lib/vlc/video_filter
+usr/lib/vlc/video_output/libimage_plugin.so
+usr/lib/vlc/visualization/libvisual_plugin.so
Added: uniways/vlc/debian/visiomobile-vlc.menu
URL: http://svn.debian.org/wsvn/pkg-multimedia/uniways/vlc/debian/visiomobile-vlc.menu?rev=839&op=file
==============================================================================
--- uniways/vlc/debian/visiomobile-vlc.menu (added)
+++ uniways/vlc/debian/visiomobile-vlc.menu Thu Aug 2 12:57:27 2007
@@ -1,0 +1,3 @@
+?package(vlc):command="/usr/bin/vlc" hotkey="V" needs="X11" \
+ section="Apps/Viewers" title="VLC media player" \
+ icon="/usr/share/vlc/vlc.xpm" hints="Video"
Added: uniways/vlc/debian/visiomobile-vlc.mime
URL: http://svn.debian.org/wsvn/pkg-multimedia/uniways/vlc/debian/visiomobile-vlc.mime?rev=839&op=file
==============================================================================
--- uniways/vlc/debian/visiomobile-vlc.mime (added)
+++ uniways/vlc/debian/visiomobile-vlc.mime Thu Aug 2 12:57:27 2007
@@ -1,0 +1,43 @@
+video/mpeg; vlc %s; description="MPEG Video"; test=test -n "$DISPLAY"; priority=7
+video/mpeg; vlc -I rc -V caca %s; needsterminal; description="MPEG Video"; priority=4
+video/x-mpeg; vlc %s; description="MPEG Video"; test=test -n "$DISPLAY"; priority=7
+video/x-mpeg; vlc -I rc -V caca %s; needsterminal; description="MPEG Video"; priority=4
+video/mpeg-system; vlc %s; description="MPEG Video"; test=test -n "$DISPLAY"; priority=7
+video/mpeg-system; vlc -I rc -V caca %s; needsterminal; description="MPEG Video"; priority=4
+video/x-mpeg-system; vlc %s; description="MPEG Video"; test=test -n "$DISPLAY"; priority=7
+video/x-mpeg-system; vlc -I rc -V caca %s; needsterminal; description="MPEG Video"; priority=4
+
+audio/x-wav; vlc %s; description="WAV Audio"; nametemplate=%s.wav; test=test -n "$DISPLAY"; priority=7
+audio/x-wav; vlc -I rc -V caca %s; nametemplate=%s.wav; needsterminal; description="WAV Audio"; priority=4
+
+video/mpeg4; vlc %s; description="MPEG-4 Video"; test=test -n "$DISPLAY"; priority=7
+video/mpeg4; vlc -I rc -V caca %s; needsterminal; description="MPEG-4 Video"; priority=4
+audio/mpeg; vlc %s; description="MPEG Audio"; nametemplate=%s.mpg; test=test -n "$DISPLAY"; priority=7
+audio/mpeg; vlc -I rc -V caca %s; nametemplate=%s.mpg; needsterminal; description="MPEG Audio"; priority=4
+audio/mpegurl; vlc %s; description="MPEG Audio URL"; nametemplate=%s.m3u; test=test -n "$DISPLAY"; priority=7
+audio/mpegurl; vlc -I rc -V caca %s; nametemplate=%s.m3u; needsterminal; description="MPEG Audio URL"; priority=4
+audio/x-mp3; vlc %s; nametemplate=%s.mp3; description="MPEG Audio"; test=test -n "$DISPLAY"; priority=7
+audio/x-mp3; vlc -I rc -V caca %s; nametemplate=%s.mp3; needsterminal; description="MPEG Audio"; priority=4
+audio/mpeg4; vlc %s; description="MPEG-4 Audio"; test=test -n "$DISPLAY"; priority=7
+audio/mpeg4; vlc -I rc -V caca %s; needsterminal; description="MPEG-4 Audio"; priority=4
+application/mpeg4-iod; vlc %s; description="MPEG-4 Video"; test=test -n "$DISPLAY"; priority=7
+application/mpeg4-iod; vlc -I rc -V caca %s; needsterminal; description="MPEG-4 Video"; priority=4
+application/mpeg4-muxcodetable; vlc %s; description="MPEG-4 Video"; test=test -n "$DISPLAY"; priority=7
+application/mpeg4-muxcodetable; vlc -I rc -V caca %s; needsterminal; description="MPEG-4 Video"; priority=4
+
+video/x-msvideo; vlc %s; description="MS Video (AVI)"; test=test -n "$DISPLAY"; priority=4
+video/x-msvideo; vlc -I rc -V caca %s; needsterminal; description="MS Video (AVI)"; priority=3
+
+video/quicktime; vlc %s; description="Apple Quicktime Video"; test=test -n "$DISPLAY"; priority=4
+video/quicktime; vlc -I rc -V caca %s; needsterminal; description="Apple Quicktime Video"; priority=3
+
+application/ogg; vlc %s; nametemplate=%s.ogg; description="Ogg stream"; test=test -n "$DISPLAY"; priority=4
+application/ogg; vlc -I rc -V caca %s; nametemplate=%s.ogg; needsterminal; description="Ogg stream"; priority=3
+application/x-ogg; vlc %s; nametemplate=%s.ogg; description="Ogg stream"; test=test -n "$DISPLAY"; priority=4
+application/x-ogg; vlc -I rc -V caca %s; nametemplate=%s.ogg; needsterminal; description="Ogg stream"; priority=3
+
+application/x-ms-asf-plugin; vlc %s; description="Windows Media Video"; test=test -n "$DISPLAY"; priority=4
+application/x-ms-asf-plugin; vlc -I rc -V caca %s; needsterminal; description="Windows Media Video"; priority=3
+application/x-mplayer2; vlc %s; description="Windows Media"; test=test -n "$DISPLAY"; priority=4
+application/x-mplayer2; vlc -I rc -V caca %s; needsterminal; description="Windows Media"; priority=3
+
Added: uniways/vlc/debian/visiomobile-vlc.postinst
URL: http://svn.debian.org/wsvn/pkg-multimedia/uniways/vlc/debian/visiomobile-vlc.postinst?rev=839&op=file
==============================================================================
--- uniways/vlc/debian/visiomobile-vlc.postinst (added)
+++ uniways/vlc/debian/visiomobile-vlc.postinst Thu Aug 2 12:57:27 2007
@@ -1,0 +1,41 @@
+#!/bin/sh
+# postinst script for #PACKAGE#
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+# * <postinst> `configure' <most-recently-configured-version>
+# * <old-postinst> `abort-upgrade' <new version>
+# * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+# <new-version>
+# * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+# <failed-install-package> <version> `removing'
+# <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+#
+
+case "$1" in
+ configure)
+ ;;
+
+ abort-upgrade|abort-remove|abort-deconfigure)
+
+ ;;
+
+ *)
+ echo "postinst called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
+
Added: uniways/vlc/debian/visiomobile-vlc.postrm
URL: http://svn.debian.org/wsvn/pkg-multimedia/uniways/vlc/debian/visiomobile-vlc.postrm?rev=839&op=file
==============================================================================
--- uniways/vlc/debian/visiomobile-vlc.postrm (added)
+++ uniways/vlc/debian/visiomobile-vlc.postrm Thu Aug 2 12:57:27 2007
@@ -1,0 +1,38 @@
+#!/bin/sh
+# postrm script for #PACKAGE#
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+# * <postrm> `remove'
+# * <postrm> `purge'
+# * <old-postrm> `upgrade' <new-version>
+# * <new-postrm> `failed-upgrade' <old-version>
+# * <new-postrm> `abort-install'
+# * <new-postrm> `abort-install' <old-version>
+# * <new-postrm> `abort-upgrade' <old-version>
+# * <disappearer's-postrm> `disappear' <r>overwrit>r> <new-version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+ purge)
+ ;;
+ remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+ ;;
+
+ *)
+ echo "postrm called with unknown argument \`$1'" >&2
+ exit 1
+
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
Added: uniways/vlc/debian/visiomobile-vlc.preinst
URL: http://svn.debian.org/wsvn/pkg-multimedia/uniways/vlc/debian/visiomobile-vlc.preinst?rev=839&op=file
==============================================================================
--- uniways/vlc/debian/visiomobile-vlc.preinst (added)
+++ uniways/vlc/debian/visiomobile-vlc.preinst Thu Aug 2 12:57:27 2007
@@ -1,0 +1,82 @@
+#!/bin/sh
+# preinst script for #PACKAGE#
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+# * <new-preinst> `install'
+# * <new-preinst> `install' <old-version>
+# * <new-preinst> `upgrade' <old-version>
+# * <old-preinst> `abort-upgrade' <new-version>
+#
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+ install|upgrade)
+
+ # creating uniways group if it isn't already there
+ if ! getent group uniways >/dev/null; then
+ # Adding system group: uniways.
+ addgroup --system uniways >/dev/null
+ fi
+
+ # creating uniways user if it isn't already there
+ if ! getent passwd uniways >/dev/null; then
+ # Adding system user: uniways.
+ adduser \
+ --system \
+ --ingroup uniways \
+ --no-create-home \
+ --gecos "Uniways user" \
+ --shell /bin/false \
+ uniways >/dev/null
+ fi
+
+ # Create log directory
+ if ! test -d /var/log/visiomobile; then
+ mkdir -p /var/log/visiomobile
+ fi
+ if getent group www-data >/dev/null; then
+ chown uniways:www-data /var/log/visiomobile
+ else
+ chown uniways:uniways /var/log/visiomobile
+ fi
+ chmod g+w /var/log/visiomobile
+
+ # Set up syslog rule
+ if ! grep -q 'VLC' /etc/syslog-ng/syslog-ng.conf; then
+ sed -ne '/these rules provide/,$d;p' /etc/syslog-ng/syslog-ng.conf > /etc/syslog-ng/syslog-ng.conf.new
+ cat >> /etc/syslog-ng/syslog-ng.conf.new << EOF
+# VLC logging
+destination d_vlc { file("/var/log/visiomobile/vlc.log"); };
+filter f_vlc { program("VLC"); };
+log { source(s_all); filter(f_vlc); destination(d_vlc); flags(final); };
+
+EOF
+ sed -ne '/these rules provide/,$p' /etc/syslog-ng/syslog-ng.conf >> /etc/syslog-ng/syslog-ng.conf.new
+ mv /etc/syslog-ng/syslog-ng.conf.new /etc/syslog-ng/syslog-ng.conf
+ invoke-rc.d syslog-ng reload
+ fi
+ ;;
+
+ abort-upgrade)
+ ;;
+
+ *)
+ echo "preinst called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
+
Added: uniways/vlc/debian/visiomobile-vlc.prerm
URL: http://svn.debian.org/wsvn/pkg-multimedia/uniways/vlc/debian/visiomobile-vlc.prerm?rev=839&op=file
==============================================================================
--- uniways/vlc/debian/visiomobile-vlc.prerm (added)
+++ uniways/vlc/debian/visiomobile-vlc.prerm Thu Aug 2 12:57:27 2007
@@ -1,0 +1,38 @@
+#!/bin/sh
+# prerm script for #PACKAGE#
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+# * <prerm> `remove'
+# * <old-prerm> `upgrade' <new-version>
+# * <new-prerm> `failed-upgrade' <old-version>
+# * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
+# * <deconfigured's-prerm> `deconfigure' `in-favour'
+# <package-being-installed> <version> `removing'
+# <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+ remove|upgrade|deconfigure)
+ ;;
+ failed-upgrade)
+ ;;
+ *)
+ echo "prerm called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
+
Added: uniways/vlc/debian/vlc.sh
URL: http://svn.debian.org/wsvn/pkg-multimedia/uniways/vlc/debian/vlc.sh?rev=839&op=file
==============================================================================
--- uniways/vlc/debian/vlc.sh (added)
+++ uniways/vlc/debian/vlc.sh Thu Aug 2 12:57:27 2007
@@ -1,0 +1,31 @@
+#!/bin/sh
+
+SUDO_USER=uniways
+VISIOMOBILE_HOST="$(visiomobile-getkey web::host)"
+
+export SUDO_USER
+export VISIOMOBILE_HOST
+
+while : ; do
+ # Launch VLC
+ vlc -vv \
+ -I telnet --extraintf http --http-host 0.0.0.0:8081 \
+ --vlm-conf=/home/admin/scripts/vlm.config \
+ --http-caching 300 \
+ --syslog \
+ --no-osd --no-sout-transcode-osd \
+ --no-drop-late-frames --no-sout-transcode-hurry-up \
+ --marq-marquee "Streamed by Uniways" --color
+ # Oops, did we crash? Then try again after a while
+ sleep 2
+done
+
+# --logmode syslog \
+# --logfile /var/log/visiomobile/vlc.log \
+# --sout-ffmpeg-strict-rc \
+# --sout-ffmpeg-vt 1 \
+# --color
+# --logo-file "/opt/mobilite/logo-rond.png"
+# --marq-size 200
+# --http-reconnect \
+
Propchange: uniways/vlc/debian/vlc.sh
------------------------------------------------------------------------------
svn:executable = *
Propchange: uniways/vlc/debian/vlc.sh
------------------------------------------------------------------------------
svn:keywords = Id
More information about the pkg-multimedia-commits
mailing list