* Updated Debian packaging information.

This commit is contained in:
Sam Hocevar 2005-03-14 13:54:04 +00:00
parent 0439df65ba
commit 0205dd6b47
9 changed files with 105 additions and 171 deletions

61
debian/changelog vendored
View File

@ -1,3 +1,64 @@
vlc (0.8.1.svn20050314-1) unstable; urgency=low
* More recent SVN snapshot.
* This snapshot fixes issues in modules/gui/wxwindows/streamout.cpp that
caused FTBFS on 64-bit architectures (Closes: #289923).
* debian/control:
+ Build-depend on new libmatroska and libavcodec versions.
+ Unfortunate return to wxwidgets 2.4 until 2.5 enters testing.
+ Upgraded libflac-dev build dependency to (>= 1.1.1-5) to resolve
dependency issues (Closes: #298067).
* debian/vlc.mime: merged Guido Guenthers contribution (Closes: #297261).
-- Sam Hocevar (Debian packages) <sam+deb@zoy.org> Mon, 14 Mar 2005 10:53:59 +0100
vlc (0.8.1-3) unstable; urgency=low
* debian/control:
+ Build-depend on fixed ffmpeg packages (Closes: #289444).
+ Build-depend on a newer libflac-dev so that resulting packages use
libflac6 (Closes: #289490).
* modules/gui/wxwindows/open.cpp:
+ Compilation fix for 64 bits systems.
-- Sam Hocevar (Debian packages) <sam+deb@zoy.org> Mon, 10 Jan 2005 11:10:02 +0100
vlc (0.8.1-2) unstable; urgency=low
* debian/control:
+ Use ffmpeg from Debian instead of the contrib one.
+ Use wxgtk2.5 instead of 2.4.
+ Activated the ncurses UI (Closes: #286962).
* debian/gnome-vlc.desktop debian/gvlc.desktop:
+ Fixed the icon location.
-- Sam Hocevar (Debian packages) <sam+deb@zoy.org> Thu, 6 Jan 2005 18:00:00 +0100
vlc (0.8.1-1) unstable; urgency=low
* New upstream release.
* debian/gnome-vlc.desktop:
+ Fixed program path (Closes: #280290).
* debian/control:
+ Require an up-to-date liblivemedia.
+ Build-depend on libgnutls11-dev.
-- Sam Hocevar (Debian packages) <sam+deb@zoy.org> Sun, 14 Nov 2004 22:21:23 +0100
vlc (0.8.0.final-1) unstable; urgency=low
* Final 0.8.0 upstream release.
* src/misc/modules.c:
+ Fixed a startup issue with the svlc shortcut (Closes: #274376).
* debian/control:
+ Suggest the Mozilla and ALSA plugins. Only mentioned the others in
the package description because they are not of notable usefulness
(Closes: #275160).
* modules/access/http.c:
+ Fix HTTP proxy handling (Closes: #278381).
-- Sam Hocevar (Debian packages) <sam+deb@zoy.org> Wed, 3 Nov 2004 14:52:05 +0100
vlc (0.8.0-test1-1) unstable; urgency=high
* New upstream tarball.

13
debian/control vendored
View File

@ -2,8 +2,7 @@ Source: vlc
Section: graphics
Priority: optional
Maintainer: Sam Hocevar (Debian packages) <sam+deb@zoy.org>
Build-Depends: debhelper (>= 4.0), dpatch, gettext, libx11-dev, libxext-dev, libxt-dev, libxv-dev, xlibs-static-pic, libggi2-dev, libglide2-dev [i386], libesd0-dev, libaudiofile-dev, libsdl1.2-dev (>= 1.2.7-5), libasound2-dev (>= 0.9.0beta10a), libarts1-dev, libmad0-dev, liblircclient-dev, liba52-0.7.4-dev, aalib1-dev, libdvbpsi3-dev, mozilla-dev, libidl0, libglib2.0-0, libxosd-dev (>= 2.2.4-1.3), svgalibg1-dev (>= 1.4.0) [i386], libogg-dev, libvorbis-dev, libwxgtk2.4-dev (>= 2.4.2.4), libdvdread3-dev, libslp-dev, libflac-dev (>= 1.1.0), libimlib2-dev, libmatroska-dev (>= 0.7.0), libfreetype6-dev, linux-kernel-headers (>= 2.5.999-test7-bk-7), libcaca-dev (>= 0.9), liblivemedia-dev (>= 2004.04.23-1), libmpeg2-4-dev, zlib1g-dev, libdts-dev, libfribidi-dev, libcdio-dev, libxml2-dev, libid3tag0-dev, libtheora-dev, jam, nasm, libmodplug-dev, libhal-dev, libtar-dev, libdvdnav-dev
Build-Conflicts: libavcodec-dev
Build-Depends: debhelper (>= 4.0), dpatch, gettext, libx11-dev, libxext-dev, libxt-dev, libxv-dev, xlibs-static-pic, libggi2-dev, libglide2-dev [i386], libesd0-dev, libaudiofile-dev, libsdl1.2-dev (>= 1.2.7-5), libasound2-dev (>= 0.9.0beta10a), libarts1-dev, libmad0-dev, liblircclient-dev, liba52-0.7.4-dev, aalib1-dev, libdvbpsi3-dev, mozilla-dev, libidl0, libglib2.0-0, libxosd-dev (>= 2.2.4-1.3), svgalibg1-dev (>= 1.4.0) [i386], libogg-dev, libvorbis-dev, libwxgtk2.4-dev (>= 2.4.2.6), libdvdread3-dev, libslp-dev, libflac-dev (>= 1.1.1-5), libimlib2-dev, libmatroska-dev (>= 0.7.5), libfreetype6-dev, linux-kernel-headers (>= 2.5.999-test7-bk-7), libcaca-dev (>= 0.9), liblivemedia-dev (>= 2004.11.11a-1), libmpeg2-4-dev, zlib1g-dev, libdts-dev, libfribidi-dev, libcdio-dev, libxml2-dev, libid3tag0-dev, libtheora-dev, jam, nasm, libmodplug-dev, libhal-dev, libtar-dev, libdvdnav-dev, libgnutls11-dev, libavcodec-dev (>= 0.cvs20050313-1), libavformat-dev (>= 0.cvs20050313-1), libpostproc-dev (>= 0.cvs20050313-1), libncurses5-dev
Standards-Version: 3.6.1.1
Package: vlc
@ -11,6 +10,7 @@ Section: graphics
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, wxvlc, ttf-freefont
Recommends: ttf-thryomanes, videolan-doc
Suggests: vlc-plugin-alsa, 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)
Conflicts: 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)
Provides: mp3-decoder
@ -23,8 +23,13 @@ Description: multimedia player for all audio and video formats
reads and multicasts them through the network to other clients, or serves
them through HTTP.
.
VLC has support for on-the-fly transcoding of audio and video formats,
either for broadcasting purposes or for movie format transformations.
VLC has support for on-the-fly transcoding of audio and video formats, either
for broadcasting purposes or for movie format transformations. Support for
most output methods is provided by this package, but features can be added
by installing additional audio plugins (vlc-plugin-esd, vlc-plugin-alsa,
vlc-plugin-arts) or video plugins (vlc-plugin-sdl, vlc-plugin-ggi,
vlc-plugin-glide, vlc-plugin-svgalib). There is also a web browser plugin
in the mozilla-plugin-vlc package.
Package: libvlc0-dev
Section: libdevel

11
debian/copyright vendored
View File

@ -1,8 +1,8 @@
This package was debianized by Sam Hocevar <sam@zoy.org> on
Mon, 13 Mar 2000 02:21:45 +0100.
It was taken from http://download.videolan.org/pub/vlc/0.7.1/, and the source
tarball also contains the ffmpeg, faad2 and x264 trees.
It was taken from http://download.videolan.org/pub/vlc/, and the source
tarball also contains the faad2 and x264 trees.
Upstream authors: The VideoLAN Team <videolan@videolan.org>
@ -10,13 +10,6 @@ faad2 authors: M. Bakker (mbakker(at)nero.com)
Alexander Kurpiers (a.kurpiers(at)nt.tu-darmstadt.de)
Volker Fischer (v.fischer(at)nt.tu-darmstadt.de)
ffmpeg authors: Fabrice Bellard, BERO, Mario Brito, Alex Beregszaszi,
Tim Ferguson, Brian Foley, Arpad Gereoffy, Philip Gladstone,
Vladimir Gneushev, Falk Hueffner, Zdenek Kabelac, Robin Kay,
Nick Kurshev, Mike Melanson, Michael Niedermayer,
François Revol, Roman Shaposhnik, Dieter Shirley,
Juan J. Sierralta, Ewald Snel, Roberto Togni, Lionel Ulmer
x264 authors: Laurent Aimar <fenrir@via.ecp.fr>
Eric Petit <titer@videolan.org>
Min Chen <chenm001@163.com>

View File

@ -3,7 +3,7 @@ Name=VLC for GNOME
Name[fr]=VLC pour GNOME
Comment=GNOME media player
Comment[fr]=Lecteur multimédia pour GNOME
Exec=gnome-vlc
Icon=gnome-vlc.png
Exec=wxvlc
Icon=vlc.png
Terminal=0
Type=Application

4
debian/gvlc.desktop vendored
View File

@ -3,7 +3,7 @@ Name=VLC for Gtk+
Name[fr]=VLC pour Gtk+
Comment=Gtk+ multimedia player
Comment[fr]=Lecteur multimédia pour Gtk+
Exec=gvlc
Icon=gvlc.png
Exec=wxvlc
Icon=vlc.png
Terminal=0
Type=Application

View File

@ -1,2 +1 @@
20_ffmpeg
20_interfaces

View File

@ -1,105 +0,0 @@
#! /bin/sh -e
## 20_ffmpeg.dpatch by <sam+deb@zoy.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: No description.
if [ $# -lt 1 ]; then
echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
exit 1
fi
[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
case "$1" in
-patch) patch -p1 ${patch_opts} < $0;;
-unpatch) patch -R -p1 ${patch_opts} < $0;;
*)
echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
exit 1;;
esac
exit 0
@DPATCH@
diff -urNad /home/sam/debian/official/vlc/debian/vlc-0.7.2.final/extras/ffmpeg/configure vlc-0.7.2.final/extras/ffmpeg/configure
--- /home/sam/debian/official/vlc/debian/vlc-0.7.2.final/extras/ffmpeg/configure 2004-05-20 12:35:16.000000000 +0200
+++ vlc-0.7.2.final/extras/ffmpeg/configure 2004-07-29 17:11:45.000000000 +0200
@@ -124,6 +124,12 @@
sh4)
cpu="sh4"
;;
+ parisc|parisc64)
+ cpu="parisc"
+ ;;
+ s390)
+ cpu="s390"
+ ;;
*)
cpu="unknown"
;;
@@ -1051,6 +1057,12 @@
elif test "$cpu" = "sh4" ; then
echo "TARGET_ARCH_SH4=yes" >> config.mak
echo "#define ARCH_SH4 1" >> $TMPH
+elif test "$cpu" = "parisc" ; then
+ echo "TARGET_ARCH_PARISC=yes" >> config.mak
+ echo "#define ARCH_PARISC 1" >> $TMPH
+elif test "$cpu" = "s390" ; then
+ echo "TARGET_ARCH_S390=yes" >> config.mak
+ echo "#define ARCH_S390 1" >> $TMPH
fi
echo "#define TUNECPU $TUNECPU" >> $TMPH
if test "$bigendian" = "yes" ; then
diff -urNad /home/sam/debian/official/vlc/debian/vlc-0.7.2.final/extras/ffmpeg/libavcodec/Makefile vlc-0.7.2.final/extras/ffmpeg/libavcodec/Makefile
--- /home/sam/debian/official/vlc/debian/vlc-0.7.2.final/extras/ffmpeg/libavcodec/Makefile 2004-05-10 10:31:52.000000000 +0200
+++ vlc-0.7.2.final/extras/ffmpeg/libavcodec/Makefile 2004-07-29 17:11:45.000000000 +0200
@@ -205,6 +205,11 @@
libpostproc/libpostproc.a:
$(MAKE) -C libpostproc
+ifeq ($(TARGET_ARCH_PARISC),yes)
+motion_est.o: motion_est.c
+ $(CC) $(CFLAGS) -O1 -c -o $@ $<
+endif
+
%.o: %.c
$(CC) $(CFLAGS) -c -o $@ $<
diff -urNad /home/sam/debian/official/vlc/debian/vlc-0.7.2.final/extras/ffmpeg/libavcodec/svq1.c vlc-0.7.2.final/extras/ffmpeg/libavcodec/svq1.c
--- /home/sam/debian/official/vlc/debian/vlc-0.7.2.final/extras/ffmpeg/libavcodec/svq1.c 2004-05-20 12:35:25.000000000 +0200
+++ vlc-0.7.2.final/extras/ffmpeg/libavcodec/svq1.c 2004-07-29 17:11:45.000000000 +0200
@@ -970,17 +970,17 @@
int best_vector_score= INT_MAX;
int best_vector_sum=-999, best_vector_mean=-999;
const int stage= count-1;
- const int8_t *vector;
+ const int8_t *vect;
for(i=0; i<16; i++){
int sum= codebook_sum[stage*16 + i];
int sqr=0;
int diff, mean, score;
- vector = codebook + stage*size*16 + i*size;
+ vect = codebook + stage*size*16 + i*size;
for(j=0; j<size; j++){
- int v= vector[j];
+ int v= vect[j];
sqr += (v - block[stage][j])*(v - block[stage][j]);
}
diff= block_sum[stage] - sum;
@@ -997,9 +997,9 @@
}
}
assert(best_vector_mean != -999);
- vector= codebook + stage*size*16 + best_vector[stage]*size;
+ vect= codebook + stage*size*16 + best_vector[stage]*size;
for(j=0; j<size; j++){
- block[stage+1][j] = block[stage][j] - vector[j];
+ block[stage+1][j] = block[stage][j] - vect[j];
}
block_sum[stage+1]= block_sum[stage] - best_vector_sum;
best_vector_score +=

38
debian/rules vendored
View File

@ -38,6 +38,7 @@ CONFIG_FLAGS += \
--enable-ogg \
--enable-vorbis \
--enable-wxwindows \
--with-wx-config=wxgtk-2.4-config \
--disable-slp \
--enable-flac \
--disable-skins \
@ -58,11 +59,12 @@ CONFIG_FLAGS += \
--enable-theora \
--enable-modplug \
--enable-dvdnav \
--enable-gnutls \
--enable-ffmpeg \
--enable-ncurses \
$(NULL)
# These ones are currently shipped with VLC
CONFIG_FLAGS += --enable-ffmpeg --with-ffmpeg-tree=extras/ffmpeg
#CONFIG_FLAGS += --enable-ffmpegaltivec
CONFIG_FLAGS += --enable-faad --with-faad-tree=extras/faad2
CONFIG_FLAGS += --enable-x264 --with-x264-tree=extras/x264
@ -95,17 +97,6 @@ configure-stamp:
touch config.h.in
touch `find . -name Makefile.in`
# Check that we have an ffmpeg tree in here (can be a symlink)
test -d extras/ffmpeg
if test ! '(' -d CVS -o -d .svn ')'; then \
cd extras/ffmpeg \
&& CC=$(CC) ./configure --enable-pp --enable-gpl --enable-zlib --disable-debug --disable-mmx --disable-altivec \
&& cd libavcodec \
&& $(MAKE) \
&& cd ../libavformat \
&& $(MAKE); \
fi
# Check that we have an x264 tree in here (can be a symlink)
test -d extras/x264
if test ! '(' -d CVS -o -d .svn ')'; then \
@ -142,22 +133,6 @@ build-stamp: patch configure-stamp
cd modules && AM_MAKEFLAGS='plugin=no pic=no' $(MAKE)
$(MAKE) vlc
# Hackety hackety hack
if test ! '(' -d CVS -o -d .svn ')'; then \
cd extras/ffmpeg/libavcodec \
&& $(MAKE) clean \
&& rm -f Makefile.pic \
&& sed 's/^CFLAGS *=/&-fPIC -DPIC /' <Makefile >Makefile.pic \
&& $(MAKE) -f Makefile.pic \
&& rm -f Makefile.pic \
&& cd ../libavformat \
&& $(MAKE) clean \
&& rm -f Makefile.pic \
&& sed 's/^CFLAGS *=/&-fPIC -DPIC /' <Makefile >Makefile.pic \
&& $(MAKE) -f Makefile.pic \
&& rm -f Makefile.pic; \
fi
# Hackety hackety hack
if test ! '(' -d CVS -o -d .svn ')'; then \
cd extras/x264 \
@ -185,11 +160,6 @@ clean: unpatch
dh_testroot
rm -f configure-stamp build-stamp
# Check that we have an ffmpeg tree in here (can be a symlink)
test -d extras/ffmpeg
-if test ! '(' -d CVS -o -d .svn ')'; then \
cd extras/ffmpeg && $(MAKE) distclean; \
fi
# Check that we have an x264 tree in here (can be a symlink)
test -d extras/x264
-if test ! '(' -d CVS -o -d .svn ')'; then \

39
debian/vlc.mime vendored
View File

@ -1,32 +1,43 @@
video/mpeg; vlc %s; description="MPEG Video"; test=test -n "$DISPLAY"; priority=7
video/mpeg; vlc -I rc -V aalib %s; needsterminal; description="MPEG Video"; priority=4
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 aalib %s; needsterminal; description="MPEG Video"; priority=4
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 aalib %s; needsterminal; description="MPEG Video"; priority=4
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 aalib %s; needsterminal; description="MPEG Video"; priority=4
video/x-mpeg-system; vlc -I rc -V caca %s; needsterminal; description="MPEG Video"; priority=4
audio/x-wav; nametemplate=%s.wav; vlc %s; description="WAV Audio"; test=test -n "$DISPLAY"; priority=7
audio/x-wav; nametemplate=%s.wav; vlc -I rc -V caca %s; 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 aalib %s; needsterminal; description="MPEG-4 Video"; priority=4
video/mpeg4; vlc -I rc -V caca %s; needsterminal; description="MPEG-4 Video"; priority=4
audio/mpeg; nametemplate=%s.mpg; vlc %s; description="MPEG Audio"; test=test -n "$DISPLAY"; priority=7
audio/mpeg; nametemplate=%s.mpg; vlc -I rc -V caca %s; needsterminal; description="MPEG Audio"; priority=4
audio/mpegurl; nametemplate=%s.m3u; vlc %s; description="MPEG Audio URL"; test=test -n "$DISPLAY"; priority=7
audio/mpegurl; nametemplate=%s.m3u; vlc -I rc -V caca %s; needsterminal; description="MPEG Audio URL"; priority=4
audio/x-mp3; nametemplate=%s.mp3; vlc %s; description="MPEG Audio"; test=test -n "$DISPLAY"; priority=7
audio/x-mp3; nametemplate=%s.mp3; vlc -I rc -V caca %s; 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 aalib %s; needsterminal; description="MPEG-4 Audio"; priority=4
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 aalib %s; needsterminal; description="MPEG-4 Video"; priority=4
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 aalib %s; needsterminal; description="MPEG-4 Video"; priority=4
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 aalib %s; needsterminal; description="MS Video (AVI)"; priority=3
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 aalib %s; needsterminal; description="Apple Quicktime Video"; priority=3
video/quicktime; vlc -I rc -V caca %s; needsterminal; description="Apple Quicktime Video"; priority=3
application/x-ogg; vlc %s; description="Ogg stream"; test=test -n "$DISPLAY"; priority=4
application/x-ogg; vlc -I rc -V aalib %s; needsterminal; description="Ogg stream"; priority=3
application/ogg; nametemplate=%s.ogg; vlc %s; description="Ogg stream"; test=test -n "$DISPLAY"; priority=4
application/ogg; nametemplate=%s.ogg; vlc -I rc -V caca %s; needsterminal; description="Ogg stream"; priority=3
application/x-ogg; nametemplate=%s.ogg; vlc %s; description="Ogg stream"; test=test -n "$DISPLAY"; priority=4
application/x-ogg; nametemplate=%s.ogg; vlc -I rc -V caca %s; 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 aalib %s; needsterminal; description="Windows Media Video"; priority=3
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 aalib %s; needsterminal; description="Windows Media"; priority=3
application/x-mplayer2; vlc -I rc -V caca %s; needsterminal; description="Windows Media"; priority=3