Skip to content

V
vlc
Commit 00bee693 authored by Sam Hocevar's avatar Sam Hocevar
Browse files
Options

* debian/rules: 

    + Disabled the GNOME, Qt, GTK+ and KDE interfaces in favour of the
      WxWidgets one.
parent f2ab6b69
Show whitespace changes
Inline Side-by-side
Showing with 90 additions and 76 deletions
debian/changelog
View file @ 00bee693
vlc (0.7.2.svn20040827-1) unstable; urgency=high
* New SVN snapshot.
* debian/rules:
+ Activated x264 support.
+ Re-enabled libmodplug support.
+ Build PIC plugins even on x86.
+ Disabled SLP because its code is broken.
+ Disabled the GNOME, Qt, GTK+ and KDE interfaces in favour of the
WxWidgets one.
+ Activated HAL support.
* debian/control:
+ Force the vlc-plugin-arts dependencies.
+ Build-depend on jam and nasm because of x264.
-- Sam Hocevar (Debian packages) <sam+deb@zoy.org> Fri, 27 Aug 2004 21:31:13 +0200
vlc (0.7.2.final-11) unstable; urgency=medium vlc (0.7.2.final-11) unstable; urgency=medium
* configure.ac: * configure.ac:
......
debian/control
View file @ 00bee693
...@@ -2,7 +2,7 @@ Source: vlc ...@@ -2,7 +2,7 @@ Source: vlc
Section: graphics Section: graphics
Priority: optional Priority: optional
Maintainer: Sam Hocevar (Debian packages) <sam+deb@zoy.org> 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, libgnome-dev, libggi2-dev, libglide2-dev [i386], libesd0-dev, libaudiofile-dev, libsdl1.2-dev (>= 1.2.7-5), libqt3-mt-dev, libqt3-compat-headers, 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, kdelibs4-dev, libxosd-dev (>= 2.2.4-1.3), svgalibg1-dev (>= 1.4.0) [i386], libogg-dev, libvorbis-dev, libwxgtk2.4-dev (>= 2.4.2.4), libdvdplay0-dev (>= 1.0.1-2), libdvdread3-dev, libslp-dev, libflac-dev (>= 1.1.0), libimlib2-dev, libmatroska-dev (>= 0.7.0), libfreetype6-dev, libspeex-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 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), libdvdplay0-dev (>= 1.0.1-2), libdvdread3-dev, libslp-dev, libflac-dev (>= 1.1.0), libimlib2-dev, libmatroska-dev (>= 0.7.0), libfreetype6-dev, libspeex-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
Build-Conflicts: libavcodec-dev Build-Conflicts: libavcodec-dev
Standards-Version: 3.6.1.1 Standards-Version: 3.6.1.1
...@@ -39,32 +39,30 @@ Description: development files for VLC ...@@ -39,32 +39,30 @@ Description: development files for VLC
streams from various network sources. streams from various network sources.
Package: gnome-vlc Package: gnome-vlc
Section: gnome Section: oldlibs
Architecture: any Architecture: any
Depends: vlc (= ${Source-Version}), ${shlibs:Depends}, ${misc:Depends} Depends: wxvlc, vlc (= ${Source-Version}), ${shlibs:Depends}, ${misc:Depends}
Recommends: vlc-plugin-esd
Conflicts: vlc-gnome (<< 0.5.0) Conflicts: vlc-gnome (<< 0.5.0)
Replaces: vlc-gnome (<< 0.5.0) Replaces: vlc-gnome (<< 0.5.0)
Description: GNOME frontend for VLC Description: GNOME frontend for VLC (dummy legacy package)
This plugin adds a GNOME interface to the VLC media player. To activate The gnome-vlc package has been discontinued. You should use the wxvlc
it, use the `--intf gnome' flag or run the `gnome-vlc' program. package instead.
. .
VLC is the VideoLAN project's media player. It plays MPEG, MPEG2, MPEG4, This package is only useful to ensure clean upgrades from old Debian
DivX, MOV, WMV, QuickTime, mp3, Ogg/Vorbis files, DVDs, VCDs, and multimedia releases and can be safely removed.
streams from various network sources.
Package: gvlc Package: gvlc
Section: oldlibs
Architecture: any Architecture: any
Depends: vlc (= ${Source-Version}), ${shlibs:Depends}, ${misc:Depends} Depends: wxvlc, vlc (= ${Source-Version}), ${shlibs:Depends}, ${misc:Depends}
Conflicts: vlc-gnome (<= 0.2.63-2), vlc-gtk (<< 0.5.0) Conflicts: vlc-gnome (<= 0.2.63-2), vlc-gtk (<< 0.5.0)
Replaces: vlc-gnome (<= 0.2.63-2), vlc-gtk (<< 0.5.0) Replaces: vlc-gnome (<= 0.2.63-2), vlc-gtk (<< 0.5.0)
Description: GTK+ frontend for VLC Description: GTK+ frontend for VLC (dummy legacy package)
This plugin adds a GTK+ interface to the VLC media player. To activate The gvlc package has been discontinued. You should use the wxvlc
it, use the `--intf gtk' flag or run the `gvlc' program. package instead.
. .
VLC is the VideoLAN project's media player. It plays MPEG, MPEG2, MPEG4, This package is only useful to ensure clean upgrades from old Debian
DivX, MOV, WMV, QuickTime, mp3, Ogg/Vorbis files, DVDs, VCDs, and multimedia releases and can be safely removed.
streams from various network sources.
Package: vlc-plugin-esd Package: vlc-plugin-esd
Architecture: any Architecture: any
...@@ -138,17 +136,17 @@ Description: Glide video output plugin for VLC ...@@ -138,17 +136,17 @@ Description: Glide video output plugin for VLC
streams from various network sources. streams from various network sources.
Package: qvlc Package: qvlc
Section: oldlibs
Architecture: any Architecture: any
Depends: vlc (= ${Source-Version}), libqt3c102-mt, ${misc:Depends} Depends: wxvlc, vlc (= ${Source-Version}), ${shlibs:Depends}, ${misc:Depends}
Conflicts: vlc-qt (<< 0.5.0) Conflicts: vlc-qt (<< 0.5.0)
Replaces: vlc-qt (<< 0.5.0) Replaces: vlc-qt (<< 0.5.0)
Description: Qt frontend for VLC Description: Qt frontend for VLC (dummy legacy package)
This plugin adds a Qt interface to the VLC media player. To activate it, The qvlc package has been discontinued. You should use the wxvlc
use the `--intf qt' flag or run the `qvlc' program. package instead.
. .
VLC is the VideoLAN project's media player. It plays MPEG, MPEG2, MPEG4, This package is only useful to ensure clean upgrades from old Debian
DivX, MOV, WMV, QuickTime, mp3, Ogg/Vorbis files, DVDs, VCDs, and multimedia releases and can be safely removed.
streams from various network sources.
Package: vlc-plugin-arts Package: vlc-plugin-arts
Architecture: any Architecture: any
...@@ -179,19 +177,18 @@ Description: multimedia plugin for Mozilla based on VLC ...@@ -179,19 +177,18 @@ Description: multimedia plugin for Mozilla based on VLC
streams from various network sources. streams from various network sources.
Package: kvlc Package: kvlc
Section: kde Section: oldlibs
Architecture: any Architecture: any
Depends: vlc (= ${Source-Version}), kdelibs4 (>= 4:3.1.5-1), ${misc:Depends} Depends: wxvlc, vlc (= ${Source-Version}), ${shlibs:Depends}, ${misc:Depends}
Recommends: vlc-plugin-arts Recommends: vlc-plugin-arts
Conflicts: vlc-kde (<< 0.5.0) Conflicts: vlc-kde (<< 0.5.0)
Replaces: vlc-kde (<< 0.5.0) Replaces: vlc-kde (<< 0.5.0)
Description: KDE frontend for VLC Description: KDE frontend for VLC (dummy legacy package)
This plugin adds a KDE interface to the VLC media player. To activate it, The kvlc package has been discontinued. You should use the wxvlc
use the `--intf kde' flag or run the `kvlc' program. package instead.
. .
VLC is the VideoLAN project's media player. It plays MPEG, MPEG2, MPEG4, This package is only useful to ensure clean upgrades from old Debian
DivX, MOV, WMV, QuickTime, mp3, Ogg/Vorbis files, DVDs, VCDs, and multimedia releases and can be safely removed.
streams from various network sources.
Package: vlc-plugin-svgalib Package: vlc-plugin-svgalib
Architecture: i386 Architecture: i386
......
debian/gnome-vlc.menu
View file @ 00bee693
?package(gnome-vlc):command="/usr/bin/gnome-vlc" hotkey="V" needs="X11" \ ?package(gnome-vlc):command="/usr/bin/wxvlc" hotkey="V" needs="X11" \
section="Apps/Viewers" title="VLC media player for GNOME" \ section="Apps/Viewers" title="VLC media player" \
icon="/usr/share/vlc/gnome-vlc.xpm" hints="Video" icon="/usr/share/vlc/gnome-vlc.xpm" hints="Video"
debian/gvlc.menu
View file @ 00bee693
?package(gvlc):command="/usr/bin/gvlc" hotkey="V" needs="X11" \ ?package(gvlc):command="/usr/bin/wxvlc" hotkey="V" needs="X11" \
section="Apps/Viewers" title="VLC media player for Gtk+" \ section="Apps/Viewers" title="VLC media player" \
icon="/usr/share/vlc/gvlc.xpm" hints="Video" icon="/usr/share/vlc/gvlc.xpm" hints="Video"
debian/kvlc.menu
View file @ 00bee693
?package(kvlc):command="/usr/bin/kvlc" hotkey="V" needs="X11" \ ?package(kvlc):command="/usr/bin/wxvlc" hotkey="V" needs="X11" \
section="Apps/Viewers" title="VLC media player for KDE" \ section="Apps/Viewers" title="VLC media player" \
icon="/usr/share/vlc/kvlc.xpm" hints="Video" icon="/usr/share/vlc/kvlc.xpm" hints="Video"
debian/qvlc.menu
View file @ 00bee693
?package(qvlc):command="/usr/bin/qvlc" hotkey="V" needs="X11" \ ?package(qvlc):command="/usr/bin/wxvlc" hotkey="V" needs="X11" \
section="Apps/Viewers" title="VLC media player for Qt" \ section="Apps/Viewers" title="VLC media player" \
icon="/usr/share/vlc/qvlc.xpm" hints="Video" icon="/usr/share/vlc/qvlc.xpm" hints="Video"
debian/rules
View file @ 00bee693
...@@ -13,14 +13,14 @@ include /usr/share/dpatch/dpatch.make ...@@ -13,14 +13,14 @@ include /usr/share/dpatch/dpatch.make
CONFIG_FLAGS = --enable-release --prefix=/usr CONFIG_FLAGS = --enable-release --prefix=/usr
CONFIG_FLAGS += \ CONFIG_FLAGS += \
--enable-gnome \ --disable-gnome \
--enable-gtk \ --disable-gtk \
--disable-familiar \ --disable-familiar \
--disable-fb \ --disable-fb \
--enable-ggi \ --enable-ggi \
--enable-sdl \ --enable-sdl \
--enable-esd \ --enable-esd \
--enable-qt \ --disable-qt \
--enable-mad \ --enable-mad \
--enable-arts \ --enable-arts \
--enable-alsa \ --enable-alsa \
...@@ -30,9 +30,9 @@ CONFIG_FLAGS += \ ...@@ -30,9 +30,9 @@ CONFIG_FLAGS += \
--enable-dvbpsi \ --enable-dvbpsi \
--enable-xosd \ --enable-xosd \
--enable-mozilla \ --enable-mozilla \
--enable-kde \ --disable-kde \
--enable-mp4 \ --enable-mp4 \
--disable-dvb \ --enable-dvb \
--enable-dv \ --enable-dv \
--disable-satellite \ --disable-satellite \
--enable-ogg \ --enable-ogg \
...@@ -98,7 +98,7 @@ configure-stamp: ...@@ -98,7 +98,7 @@ configure-stamp:
test -d extras/ffmpeg test -d extras/ffmpeg
if test ! '(' -d CVS -o -d .svn ')'; then \ if test ! '(' -d CVS -o -d .svn ')'; then \
cd extras/ffmpeg \ cd extras/ffmpeg \
&& CC=$(CC) ./configure --enable-pp --enable-gpl --enable-zlib --disable-debug --disable-mmx \ && CC=$(CC) ./configure --enable-pp --enable-gpl --enable-zlib --disable-debug --disable-mmx --disable-altivec \
&& cd libavcodec \ && cd libavcodec \
&& $(MAKE); \ && $(MAKE); \
fi fi
...@@ -232,32 +232,32 @@ install: build ...@@ -232,32 +232,32 @@ install: build
ln -s vlc debian/libvlc0-dev/usr/share/doc/libvlc0-dev ln -s vlc debian/libvlc0-dev/usr/share/doc/libvlc0-dev
# Package: gnome-vlc # Package: gnome-vlc
mv debian/vlc/usr/bin/gnome-vlc debian/gnome-vlc/usr/bin/ #mv debian/vlc/usr/bin/gnome-vlc debian/gnome-vlc/usr/bin/
ln -s vlc debian/gnome-vlc/usr/share/doc/gnome-vlc ln -s vlc debian/gnome-vlc/usr/share/doc/gnome-vlc
mv debian/vlc/usr/lib/vlc/misc/libgnome_main_plugin.so \ #mv debian/vlc/usr/lib/vlc/misc/libgnome_main_plugin.so \
debian/gnome-vlc/usr/lib/vlc/gui/ # debian/gnome-vlc/usr/lib/vlc/gui/
mv debian/vlc/usr/lib/vlc/gui/libgnome_plugin.so \ #mv debian/vlc/usr/lib/vlc/gui/libgnome_plugin.so \
debian/gnome-vlc/usr/lib/vlc/gui/ # debian/gnome-vlc/usr/lib/vlc/gui/
ln -s vlc.1.gz debian/gnome-vlc/usr/share/man/man1/gnome-vlc.1.gz #ln -s vlc.1.gz debian/gnome-vlc/usr/share/man/man1/gnome-vlc.1.gz
mv debian/vlc/$(VIDDIR)/gnome-vlc32x32.xpm debian/gnome-vlc/$(VIDDIR)/gnome-vlc.xpm #mv debian/vlc/$(VIDDIR)/gnome-vlc32x32.xpm debian/gnome-vlc/$(VIDDIR)/gnome-vlc.xpm
mv debian/vlc/$(VIDDIR)/gnome-vlc48x48.png debian/gnome-vlc/$(PIXDIR)/gnome-vlc.png #mv debian/vlc/$(VIDDIR)/gnome-vlc48x48.png debian/gnome-vlc/$(PIXDIR)/gnome-vlc.png
# Package: vlc-gnome # Package: vlc-gnome
mkdir -p debian/vlc-gnome/usr/share/doc/ mkdir -p debian/vlc-gnome/usr/share/doc/
ln -s vlc debian/vlc-gnome/usr/share/doc/vlc-gnome ln -s vlc debian/vlc-gnome/usr/share/doc/vlc-gnome
# Package: gvlc # Package: gvlc
mv debian/vlc/usr/bin/gvlc debian/gvlc/usr/bin/ #mv debian/vlc/usr/bin/gvlc debian/gvlc/usr/bin/
ln -s vlc debian/gvlc/usr/share/doc/gvlc ln -s vlc debian/gvlc/usr/share/doc/gvlc
mv debian/vlc/usr/lib/vlc/misc/libgtk_main_plugin.so \ #mv debian/vlc/usr/lib/vlc/misc/libgtk_main_plugin.so \
debian/gvlc/usr/lib/vlc/gui/ # debian/gvlc/usr/lib/vlc/gui/
mv debian/vlc/usr/lib/vlc/gui/libgtk_plugin.so \ #mv debian/vlc/usr/lib/vlc/gui/libgtk_plugin.so \
debian/gvlc/usr/lib/vlc/gui/ # debian/gvlc/usr/lib/vlc/gui/
#mv debian/vlc/usr/lib/vlc/gui/libfamiliar_plugin.so \ #mv debian/vlc/usr/lib/vlc/gui/libfamiliar_plugin.so \
# debian/gvlc/usr/lib/vlc/gui/ # debian/gvlc/usr/lib/vlc/gui/
ln -s vlc.1.gz debian/gvlc/usr/share/man/man1/gvlc.1.gz #ln -s vlc.1.gz debian/gvlc/usr/share/man/man1/gvlc.1.gz
mv debian/vlc/$(VIDDIR)/gvlc32x32.xpm debian/gvlc/$(VIDDIR)/gvlc.xpm #mv debian/vlc/$(VIDDIR)/gvlc32x32.xpm debian/gvlc/$(VIDDIR)/gvlc.xpm
mv debian/vlc/$(VIDDIR)/gvlc48x48.png debian/gvlc/$(PIXDIR)/gvlc.png #mv debian/vlc/$(VIDDIR)/gvlc48x48.png debian/gvlc/$(PIXDIR)/gvlc.png
# Package: vlc-gtk # Package: vlc-gtk
mkdir -p debian/vlc-gtk/usr/share/doc/ mkdir -p debian/vlc-gtk/usr/share/doc/
...@@ -313,13 +313,13 @@ ifeq ($(shell dpkg-architecture -qDEB_BUILD_GNU_CPU),i386) ...@@ -313,13 +313,13 @@ ifeq ($(shell dpkg-architecture -qDEB_BUILD_GNU_CPU),i386)
endif endif
# Package: qvlc # Package: qvlc
mv debian/vlc/usr/bin/qvlc debian/qvlc/usr/bin/ #mv debian/vlc/usr/bin/qvlc debian/qvlc/usr/bin/
ln -s vlc debian/qvlc/usr/share/doc/qvlc ln -s vlc debian/qvlc/usr/share/doc/qvlc
mv debian/vlc/usr/lib/vlc/gui/libqt_plugin.so \ #mv debian/vlc/usr/lib/vlc/gui/libqt_plugin.so \
debian/qvlc/usr/lib/vlc/gui/ # debian/qvlc/usr/lib/vlc/gui/
ln -s vlc.1.gz debian/qvlc/usr/share/man/man1/qvlc.1.gz #ln -s vlc.1.gz debian/qvlc/usr/share/man/man1/qvlc.1.gz
mv debian/vlc/$(VIDDIR)/qvlc32x32.xpm debian/qvlc/$(VIDDIR)/qvlc.xpm #mv debian/vlc/$(VIDDIR)/qvlc32x32.xpm debian/qvlc/$(VIDDIR)/qvlc.xpm
mv debian/vlc/$(VIDDIR)/qvlc48x48.png debian/qvlc/$(PIXDIR)/qvlc.png #mv debian/vlc/$(VIDDIR)/qvlc48x48.png debian/qvlc/$(PIXDIR)/qvlc.png
# Package: vlc-qt # Package: vlc-qt
mkdir -p debian/vlc-qt/usr/share/doc/ mkdir -p debian/vlc-qt/usr/share/doc/
...@@ -340,14 +340,14 @@ endif ...@@ -340,14 +340,14 @@ endif
ln -s ../../mozilla/components/vlcintf.xpt debian/mozilla-plugin-vlc/usr/lib/mozilla-firefox/components/ ln -s ../../mozilla/components/vlcintf.xpt debian/mozilla-plugin-vlc/usr/lib/mozilla-firefox/components/
# Package: kvlc # Package: kvlc
mv debian/vlc/usr/bin/kvlc debian/kvlc/usr/bin/ #mv debian/vlc/usr/bin/kvlc debian/kvlc/usr/bin/
ln -s vlc debian/kvlc/usr/share/doc/kvlc ln -s vlc debian/kvlc/usr/share/doc/kvlc
mv debian/vlc/usr/lib/vlc/gui/libkde_plugin.so \ #mv debian/vlc/usr/lib/vlc/gui/libkde_plugin.so \
debian/kvlc/usr/lib/vlc/gui/ # debian/kvlc/usr/lib/vlc/gui/
mv debian/vlc/$(VIDDIR)/ui.rc debian/kvlc/$(VIDDIR) #mv debian/vlc/$(VIDDIR)/ui.rc debian/kvlc/$(VIDDIR)
ln -s vlc.1.gz debian/kvlc/usr/share/man/man1/kvlc.1.gz #ln -s vlc.1.gz debian/kvlc/usr/share/man/man1/kvlc.1.gz
mv debian/vlc/$(VIDDIR)/kvlc32x32.xpm debian/kvlc/$(VIDDIR)/kvlc.xpm #mv debian/vlc/$(VIDDIR)/kvlc32x32.xpm debian/kvlc/$(VIDDIR)/kvlc.xpm
mv debian/vlc/$(VIDDIR)/kvlc48x48.png debian/kvlc/$(PIXDIR)/kvlc.png #mv debian/vlc/$(VIDDIR)/kvlc48x48.png debian/kvlc/$(PIXDIR)/kvlc.png
# Package: vlc-plugin-svgalib # Package: vlc-plugin-svgalib
ifeq ($(shell dpkg-architecture -qDEB_BUILD_GNU_CPU),i386) ifeq ($(shell dpkg-architecture -qDEB_BUILD_GNU_CPU),i386)
......
debian/wxvlc.menu
View file @ 00bee693
?package(wxvlc):command="/usr/bin/wxvlc" hotkey="V" needs="X11" \ ?package(wxvlc):command="/usr/bin/wxvlc" hotkey="V" needs="X11" \
section="Apps/Viewers" title="VLC media player for wxWindows" \ section="Apps/Viewers" title="VLC media player" \
icon="/usr/share/vlc/wxvlc.xpm" hints="Video" icon="/usr/share/vlc/wxvlc.xpm" hints="Video"
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment